Merge branch 'master' into feature/gsoc2011_wizards

Conflicts:
automation/source/inc/cmdbasestream.hxx
automation/source/server/cmdbasestream.cxx
automation/source/server/retstrm.hxx
automation/source/testtool/cmdstrm.cxx
automation/source/testtool/cmdstrm.hxx
automation/source/testtool/tcommuni.cxx
basctl/prj/d.lst
basctl/uiconfig/basicide/toolbar/findbar.xml
cui/source/dialogs/about.cxx
cui/source/dialogs/about.src
cui/source/inc/about.hxx
extensions/source/abpilot/abpservices.cxx
extensions/source/dbpilots/dbpservices.cxx
extensions/source/propctrlr/pcrservices.cxx
extensions/source/svg/makefile.mk
forms/Library_frm.mk
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
lingucomponent/source/spellcheck/spell/sspellimp.cxx
package/prj/d.lst
package/source/zipapi/XMemoryStream.cxx
package/source/zipapi/XMemoryStream.hxx
setup_native/prj/d.lst
setup_native/source/win32/customactions/relnotes/makefile.mk
tools/test/export.map
wizards/com/sun/star/wizards/common/ConfigGroup.py
wizards/com/sun/star/wizards/common/ConfigNode.py
wizards/com/sun/star/wizards/common/Configuration.py
wizards/com/sun/star/wizards/common/Desktop.py
wizards/com/sun/star/wizards/common/FileAccess.py
wizards/com/sun/star/wizards/common/Helper.py
wizards/com/sun/star/wizards/common/SystemDialog.py
wizards/com/sun/star/wizards/document/OfficeDocument.py
wizards/com/sun/star/wizards/fax/FaxDocument.py
wizards/com/sun/star/wizards/fax/FaxWizardDialog.py
wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.py
wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py
wizards/com/sun/star/wizards/letter/LetterDocument.py
wizards/com/sun/star/wizards/letter/LetterWizardDialog.py
wizards/com/sun/star/wizards/letter/LetterWizardDialogConst.py
wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py
wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py
wizards/com/sun/star/wizards/text/TextDocument.py
wizards/com/sun/star/wizards/text/TextFieldHandler.py
wizards/com/sun/star/wizards/text/TextSectionHandler.py
wizards/com/sun/star/wizards/text/ViewHandler.py
wizards/com/sun/star/wizards/ui/UnoDialog.py
wizards/com/sun/star/wizards/ui/UnoDialog2.py
wizards/com/sun/star/wizards/ui/WizardDialog.py
wizards/com/sun/star/wizards/ui/event/CommonListener.py
wizards/com/sun/star/wizards/ui/event/DataAware.py
wizards/com/sun/star/wizards/ui/event/RadioDataAware.py
wizards/com/sun/star/wizards/ui/event/UnoDataAware.py
wizards/util/helpids.h
wizards/util/hidother.src
xmlsecurity/prj/build.lst
xmlsecurity/prj/d.lst
xmlsecurity/qa/certext/SanCertExt.cxx

36 files changed, 270 insertions, 200 deletions

diff --git a/cui/AllLangResTarget_cui.mk b/cui/AllLangResTarget_cui.mk
index 107b1f7eefa8..5784412b7d29 100644
--- a/cui/AllLangResTarget_cui.mk
+++ b/cui/AllLangResTarget_cui.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 # Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
 # The contents of this file are subject to the Mozilla Public License Version
@@ -131,4 +132,4 @@ $(eval $(call gb_SrsTarget_add_files,cui/res,\
     cui/source/tabpages/transfrm.src \
 ))
 
-# vim: set noet ts=4 sw=4:
+# vim: set noet sw=4 ts=4:
diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk
index 6e3bf195b58a..406dd7499cfb 100644
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 # Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
 # The contents of this file are subject to the Mozilla Public License Version
@@ -38,8 +39,7 @@ $(eval $(call gb_Library_set_include,cui,\
     -I$(OUTDIR)/inc/offuh \
 ))
 
-$(eval $(call gb_Library_set_defs,cui,\
-    $$(DEFS) \
+$(eval $(call gb_Library_add_defs,cui,\
     $(if $(filter TRUE,$(ENABLE_GTK)),-DENABLE_GTK) \
     $(if $(filter TRUE,$(ENABLE_KDE)),-DENABLE_KDE) \
     $(if $(filter TRUE,$(ENABLE_KDE4)),-DENABLE_KDE4) \
@@ -57,7 +57,6 @@ $(eval $(call gb_Library_add_linked_libs,cui,\
     cppuhelper \
     editeng \
     i18nisolang1 \
-    icuuc \
     jvmfwk \
     lng \
     sal \
@@ -77,6 +76,10 @@ $(eval $(call gb_Library_add_linked_libs,cui,\
     $(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Library_use_externals,cui,\
+    icuuc \
+))
+
 ifeq ($(GUI),WNT)
 $(eval $(call gb_Library_add_linked_libs,cui,\
     advapi32 \
@@ -214,4 +217,4 @@ $(eval $(call gb_Library_add_exception_objects,cui,\
 ))
 endif
 
-# vim: set noet ts=4 sw=4:
+# vim: set noet sw=4 ts=4:
diff --git a/cui/Makefile b/cui/Makefile
index a79aff831024..8d71119918b6 100644
--- a/cui/Makefile
+++ b/cui/Makefile
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/cui/Module_cui.mk b/cui/Module_cui.mk
index aaab8dfbdfda..8b7117bdc062 100644
--- a/cui/Module_cui.mk
+++ b/cui/Module_cui.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 # Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
 # The contents of this file are subject to the Mozilla Public License Version
@@ -32,4 +33,4 @@ $(eval $(call gb_Module_add_targets,cui,\
 	Library_cui \
 ))
 
-# vim: set noet ts=4 sw=4:
+# vim: set noet sw=4 ts=4:
diff --git a/cui/prj/makefile.mk b/cui/prj/makefile.mk
index e312a7ccab65..ffd9fb276d8a 100755
--- a/cui/prj/makefile.mk
+++ b/cui/prj/makefile.mk
@@ -37,4 +37,4 @@ VERBOSEFLAG := -s
 .ENDIF
 
 all:
-    cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
+    cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index c0a53730baca..c3591b92255b 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -1522,7 +1522,7 @@ long SentenceEditWindow_Impl::PreNotify( NotifyEvent& rNEvt )
                 //text has been added on the right and only the 'error attribute has to be corrected
                 if(pErrorAttrLeft)
                 {
-                    TextAttrib* pNewError =  pErrorAttrLeft->GetAttr().Clone();
+                    TextAttrib* pNewError =  NULL;
                     sal_uInt16 nStart = pErrorAttrLeft->GetStart();
                     sal_uInt16 nEnd = pErrorAttrLeft->GetEnd();
                     pTextEngine->RemoveAttrib( 0, *pErrorAttrLeft );
@@ -1542,7 +1542,7 @@ long SentenceEditWindow_Impl::PreNotify( NotifyEvent& rNEvt )
                     //determine the change
                     sal_uInt16 nAddedChars = GetText().Len() - nCurrentLen;
 
-                    TextAttrib* pNewError =  pErrorAttr->GetAttr().Clone();
+                    TextAttrib* pNewError = NULL;
                     sal_uInt16 nStart = pErrorAttr->GetStart();
                     sal_uInt16 nEnd = pErrorAttr->GetEnd();
                     pTextEngine->RemoveAttrib( 0, *pErrorAttr );
@@ -1558,7 +1558,7 @@ long SentenceEditWindow_Impl::PreNotify( NotifyEvent& rNEvt )
 
                     if(pBackAttrLeft)
                     {
-                        TextAttrib* pNewBack =  pBackAttrLeft->GetAttr().Clone();
+                        TextAttrib* pNewBack = NULL;
                         sal_uInt16 _nStart = pBackAttrLeft->GetStart();
                         sal_uInt16 _nEnd = pBackAttrLeft->GetEnd();
                         pTextEngine->RemoveAttrib( 0, *pBackAttrLeft );
@@ -1585,7 +1585,7 @@ long SentenceEditWindow_Impl::PreNotify( NotifyEvent& rNEvt )
                     m_nErrorEnd = pFontColor->GetEnd();
                     if(pErrorAttrib->GetStart() != m_nErrorStart || pErrorAttrib->GetEnd() != m_nErrorEnd)
                     {
-                        TextAttrib* pNewError =  pErrorAttrib->GetAttr().Clone();
+                        TextAttrib* pNewError = NULL;
                         pTextEngine->RemoveAttrib( 0, *pErrorAttr );
                         SetAttrib( *pNewError, 0, m_nErrorStart, m_nErrorEnd );
                         delete pNewError;
@@ -1740,7 +1740,7 @@ void SentenceEditWindow_Impl::ChangeMarkedWord(const String& rNewWord, LanguageT
     // undo expanded attributes!
     if( pBackAttrib && pBackAttrib->GetStart() < m_nErrorStart && pBackAttrib->GetEnd() == m_nErrorEnd + nDiffLen)
     {
-        TextAttrib* pNewBackground = pBackAttrib->GetAttr().Clone();
+        TextAttrib* pNewBackground = NULL;
         sal_uInt16 nStart = pBackAttrib->GetStart();
         pTextEngine->RemoveAttrib(0, *pBackAttrib);
         pTextEngine->SetAttrib(*pNewBackground, 0, nStart, m_nErrorStart);
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 33e8276cc2d5..e4a4b293e2a6 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -55,6 +55,7 @@
 #include "about.hrc"
 #include <sfx2/sfxdefs.hxx>
 #include <sfx2/app.hxx>
+#include <rtl/ustrbuf.hxx>
 
 using namespace ::com::sun::star;
 
@@ -146,14 +147,12 @@ AboutDialog::AboutDialog( Window* pParent, const ResId& rId) :
     aVersionText    ( this,     ResId( ABOUT_FTXT_VERSION, *rId.GetResMgr() ) ),
     aCopyrightText  ( this,     ResId( ABOUT_FTXT_COPYRIGHT, *rId.GetResMgr() ) ),
     aInfoLink       ( this,     ResId( ABOUT_FTXT_LINK, *rId.GetResMgr() ) ),
-    aAccelStr       (           ResId( ABOUT_STR_ACCEL, *rId.GetResMgr() ) ),
-    aVersionTextStr(            ResId( ABOUT_STR_VERSION, *rId.GetResMgr() ) ),
-    aCopyrightTextStr(          ResId( ABOUT_STR_COPYRIGHT, *rId.GetResMgr() ) ),
-    aLinkStr        (           ResId( ABOUT_STR_LINK, *rId.GetResMgr() ) ),
-    aTimer          (),
-    nOff            ( 0 ),
-    m_nDeltaWidth   ( 0 ),
-    m_nPendingScrolls( 0 )
+    aVersionTextStr(ResId(ABOUT_STR_VERSION, *rId.GetResMgr())),
+    m_aVendorTextStr(ResId(ABOUT_STR_VENDOR, *rId.GetResMgr())),
+    m_aOracleCopyrightTextStr(ResId(ABOUT_STR_COPYRIGHT_ORACLE_DERIVED, *rId.GetResMgr())),
+    m_aAcknowledgementTextStr(ResId(ABOUT_STR_ACKNOWLEDGEMENT, *rId.GetResMgr())),
+    m_aLinkStr(ResId( ABOUT_STR_LINK, *rId.GetResMgr())),
+    m_sBuildStr(ResId(ABOUT_STR_BUILD, *rId.GetResMgr()))
 {
     rtl::OUString sProduct;
     utl::ConfigManager::GetDirectConfigProperty(utl::ConfigManager::PRODUCTNAME) >>= sProduct;
@@ -213,7 +212,7 @@ AboutDialog::AboutDialog( Window* pParent, const ResId& rId) :
 
     aVersionText.SetBackground();
     aCopyrightText.SetBackground();
-    aInfoLink.SetURL( aLinkStr );
+    aInfoLink.SetURL(m_aLinkStr);
     aInfoLink.SetBackground();
     aInfoLink.SetClickHdl( LINK( this, AboutDialog, HandleHyperlink ) );
 
@@ -221,7 +220,17 @@ AboutDialog::AboutDialog( Window* pParent, const ResId& rId) :
     aVersionText.SetControlForeground( aTextColor );
     aCopyrightText.SetControlForeground( aTextColor );
 
-    aCopyrightText.SetText( aCopyrightTextStr );
+    rtl::OUStringBuffer sText(m_aVendorTextStr);
+    sText.appendAscii(RTL_CONSTASCII_STRINGPARAM("\n\n"));
+    sal_uInt32 nCopyrightId = sProduct.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("LibreOffice" )) ?
+        ABOUT_STR_COPYRIGHT : ABOUT_STR_COPYRIGHT_DERIVED;
+    String aProductCopyrightTextStr(ResId(nCopyrightId, *rId.GetResMgr()));
+    sText.append(aProductCopyrightTextStr);
+    sText.appendAscii(RTL_CONSTASCII_STRINGPARAM("\n\n"));
+    sText.append(m_aOracleCopyrightTextStr);
+    sText.appendAscii(RTL_CONSTASCII_STRINGPARAM("\n\n"));
+    sText.append(m_aAcknowledgementTextStr);
+    aCopyrightText.SetText(sText.makeStringAndClear());
 
     // determine size and position of the dialog & elements
     Size aAppLogoSiz = aAppLogo.GetSizePixel();
@@ -238,9 +247,26 @@ AboutDialog::AboutDialog( Window* pParent, const ResId& rId) :
     // preferred Version widget size
     Size aVTSize = aVersionText.CalcMinimumSize();
     long nY          = aAppLogoSiz.Height() + ( a6Size.Height() * 2 );
-    long nDlgMargin  = a6Size.Width() * 3 ;
-    long nCtrlMargin = aVTSize.Height() + ( a6Size.Height() * 2 );
-    long nTextWidth  = aOutSiz.Width() - nDlgMargin;
+    long nDlgMargin  = a6Size.Width() * 2;
+    long nCtrlMargin = a6Size.Height() * 2;
+
+    aVersionText.SetSizePixel(Size(800, 600));
+    Size aVersionTextSize = aVersionText.CalcMinimumSize();
+    aVersionTextSize.Width() += nDlgMargin;
+
+    Size aOutSiz = GetOutputSizePixel();
+    aOutSiz.Width() = aAppLogoSiz.Width();
+
+    if (aOutSiz.Width() < aVersionTextSize.Width())
+        aOutSiz.Width() = aVersionTextSize.Width();
+
+    if (aOutSiz.Width() < 300)
+        aOutSiz.Width() = 300;
+
+    //round up to nearest even
+    aOutSiz.Width() += aOutSiz.Width() & 1;
+
+    long nTextWidth = (aOutSiz.Width() - nDlgMargin);
 
     // finally set the aVersionText widget position and size
     Size aVTCopySize = aVTSize;
diff --git a/cui/source/dialogs/about.hrc b/cui/source/dialogs/about.hrc
index 349a5e13b498..2f7e97484c6b 100644
--- a/cui/source/dialogs/about.hrc
+++ b/cui/source/dialogs/about.hrc
@@ -34,5 +34,9 @@
 
 #define ABOUT_FTXT_LINK     5
 #define ABOUT_STR_VERSION   6
-#define ABOUT_STR_COPYRIGHT 7
-#define ABOUT_STR_LINK      8
+#define ABOUT_STR_VENDOR    7
+#define ABOUT_STR_COPYRIGHT 8
+#define ABOUT_STR_COPYRIGHT_DERIVED 9
+#define ABOUT_STR_COPYRIGHT_ORACLE_DERIVED 10
+#define ABOUT_STR_ACKNOWLEDGEMENT 11
+#define ABOUT_STR_LINK      12
diff --git a/cui/source/dialogs/about.src b/cui/source/dialogs/about.src
index 75a81e265033..607460c37604 100644
--- a/cui/source/dialogs/about.src
+++ b/cui/source/dialogs/about.src
@@ -70,9 +70,25 @@ ModalDialog RID_DEFAULTABOUT
     {
         Text[ en-US ] = "%PRODUCTNAME %ABOUTBOXPRODUCTVERSION %PRODUCTEXTENSION";
     };
+    String ABOUT_STR_VENDOR
+    {
+        Text[ en-US ] = "This product was supplied by %OOOVENDOR.";
+    };
     String ABOUT_STR_COPYRIGHT
     {
-        Text[ en-US ] = "Copyright © 2000, 2010 LibreOffice contributors and/or their affiliates. All rights reserved.\nThis product was created by %OOOVENDOR, based on OpenOffice.org, which is Copyright 2000, 2010 Oracle and/or its affiliates.\n%OOOVENDOR acknowledges all community members, please find more info at the link below:";
+        Text[ en-US ] = "LibreOffice is copyright © 2000, 2011 LibreOffice contributors and/or their affiliates. All rights reserved.";
+    };
+    String ABOUT_STR_COPYRIGHT_DERIVED
+    {
+        Text[ en-US ] = "%PRODUCTNAME is derived from LibreOffice. LibreOffice is copyright © 2000, 2011 LibreOffice contributors and/or their affiliates. All rights reserved.";
+    };
+    String ABOUT_STR_COPYRIGHT_ORACLE_DERIVED
+    {
+        Text[ en-US ] = "LibreOffice is derived from OpenOffice.org. OpenOffice.org is copyright © 2000, 2011 Oracle and/or its affiliates. All rights reserved.";
+    };
+    String ABOUT_STR_ACKNOWLEDGEMENT
+    {
+        Text[ en-US ] = "%OOOVENDOR acknowledges all community members, please find more info at the link below:";
     };
     String ABOUT_STR_LINK
     {
diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx
index fb6aea37e4a0..08d8bc7d77e0 100644
--- a/cui/source/dialogs/multipat.cxx
+++ b/cui/source/dialogs/multipat.cxx
@@ -192,7 +192,8 @@ SvxMultiPathDialog::SvxMultiPathDialog( Window* pParent, sal_Bool bEmptyAllowed
 
     aPathFL     ( this, CUI_RES( FL_MULTIPATH) ),
     aPathLB     ( this, CUI_RES( LB_MULTIPATH ) ),
-    aRadioLB    ( this, CUI_RES( LB_RADIOBUTTON ) ),
+    m_aRadioLBContainer(this, CUI_RES(LB_RADIOBUTTON)),
+    aRadioLB(m_aRadioLBContainer),
     aRadioFT    ( this, CUI_RES( FT_RADIOBUTTON ) ),
     aAddBtn     ( this, CUI_RES( BTN_ADD_MULTIPATH ) ),
     aDelBtn     ( this, CUI_RES( BTN_DEL_MULTIPATH ) ),
diff --git a/cui/source/dialogs/winpluginlib.cxx b/cui/source/dialogs/winpluginlib.cxx
index 242607952c99..25fa4a3c5f41 100644
--- a/cui/source/dialogs/winpluginlib.cxx
+++ b/cui/source/dialogs/winpluginlib.cxx
@@ -33,8 +33,8 @@
 #if defined _MSC_VER
 #pragma warning(pop)
 #endif
-#include <Winreg.h>
-#include <Shlwapi.h>
+#include <winreg.h>
+#include <shlwapi.h>
 #include <stdio.h>
 
 #define SO_PATH_SIZE        4096
diff --git a/cui/source/inc/about.hxx b/cui/source/inc/about.hxx
index bb18c7c24c2b..036787e4c88e 100644
--- a/cui/source/inc/about.hxx
+++ b/cui/source/inc/about.hxx
@@ -53,19 +53,13 @@ private:
     MultiLineEdit       aCopyrightText;
     svt::FixedHyperlink aInfoLink;
 
-//    ResStringArray    aDeveloperAry; // RIP ...
-    String          aAccelStr;
-    String          aVersionData;
-    String          aVersionTextStr;
-    String          aCopyrightTextStr;
-    String          aLinkStr;
-
-    AccelList       aAccelList;
-
-    AutoTimer       aTimer;
-    long            nOff;
-    long            m_nDeltaWidth;
-    int             m_nPendingScrolls;
+    String aVersionData;
+    String aVersionTextStr;
+    String m_aVendorTextStr;
+    String m_aOracleCopyrightTextStr;
+    String m_aAcknowledgementTextStr;
+    String m_aLinkStr;
+    String m_sBuildStr;
 
 protected:
     virtual sal_Bool Close();
diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx
index 91e97c25eac9..a22d7b34fe3a 100644
--- a/cui/source/inc/autocdlg.hxx
+++ b/cui/source/inc/autocdlg.hxx
@@ -83,8 +83,10 @@ class OfaACorrCheckListBox : public SvxSimpleTable
         virtual void    KeyInput( const KeyEvent& rKEvt );
 
     public:
-        OfaACorrCheckListBox(Window* pParent, const ResId& rResId ) :
-            SvxSimpleTable( pParent, rResId ){}
+        OfaACorrCheckListBox(SvxSimpleTableContainer& rParent, WinBits nBits = WB_BORDER)
+            : SvxSimpleTable(rParent, nBits)
+        {
+        }
 
         inline void *GetUserData(sal_uLong nPos) { return GetEntry(nPos)->GetUserData(); }
         inline void SetUserData(sal_uLong nPos, void *pData ) { GetEntry(nPos)->SetUserData(pData); }
@@ -136,6 +138,7 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage
 {
     using TabPage::ActivatePage;
 
+    SvxSimpleTableContainer m_aCheckLBContainer;
     OfaACorrCheckListBox    aCheckLB;
     PushButton      aEditPB;
     FixedText       aHeader1Expl;
@@ -334,6 +337,7 @@ private:
     SvxCheckListBox aCheckLB;
 
     // Just for writer
+    SvxSimpleTableContainer m_aSwCheckLBContainer;
     OfaACorrCheckListBox    aSwCheckLB;
     String          sHeader1;
     String          sHeader2;
diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc
index dff73253b086..e0415de30ef7 100644
--- a/cui/source/inc/helpid.hrc
+++ b/cui/source/inc/helpid.hrc
@@ -104,6 +104,7 @@
 #define HID_COLORPAGE_WRITERNOTESINDICATOR_LB "CUI_HID_COLORPAGE_WRITERNOTESINDICATOR_LB"
 #define HID_COLORPAGE_WRITERSCRIPTINDICATOR_LB "CUI_HID_COLORPAGE_WRITERSCRIPTINDICATOR_LB"
 #define HID_COLORPAGE_WRITERSECTIONBOUNDARIES_LB "CUI_HID_COLORPAGE_WRITERSECTIONBOUNDARIES_LB"
+#define HID_COLORPAGE_WRITERHEADERFOOTERMARK_LB "CUI_HID_COLORPAGE_WRITERHEADERFOOTERMARK_LB"
 #define HID_COLORPAGE_WRITERPAGEBREAKS_LB "CUI_HID_COLORPAGE_WRITERPAGEBREAKS_LB"
 #define HID_COLORPAGE_HTMLSGML_LB "CUI_HID_COLORPAGE_HTMLSGML_LB"
 #define HID_COLORPAGE_HTMLCOMMENT_LB "CUI_HID_COLORPAGE_HTMLCOMMENT_LB"
@@ -145,6 +146,7 @@
 #define HID_COLORPAGE_WRITERNOTESINDICATOR_CB "CUI_HID_COLORPAGE_WRITERNOTESINDICATOR_CB"
 #define HID_COLORPAGE_WRITERSCRIPTINDICATOR_CB "CUI_HID_COLORPAGE_WRITERSCRIPTINDICATOR_CB"
 #define HID_COLORPAGE_WRITERSECTIONBOUNDARIES_CB "CUI_HID_COLORPAGE_WRITERSECTIONBOUNDARIES_CB"
+#define HID_COLORPAGE_WRITERHEADERFOOTERMARK_CB "CUI_HID_COLORPAGE_WRITERHEADERFOOTERMARK_CB"
 #define HID_COLORPAGE_WRITERPAGEBREAKS_CB "CUI_HID_COLORPAGE_WRITERPAGEBREAKS_CB"
 #define HID_COLORPAGE_HTMLSGML_CB "CUI_HID_COLORPAGE_HTMLSGML_CB"
 #define HID_COLORPAGE_HTMLCOMMENT_CB "CUI_HID_COLORPAGE_HTMLCOMMENT_CB"
diff --git a/cui/source/inc/multipat.hxx b/cui/source/inc/multipat.hxx
index ac4afbfceaf6..ec6f8ef4e709 100644
--- a/cui/source/inc/multipat.hxx
+++ b/cui/source/inc/multipat.hxx
@@ -58,6 +58,7 @@ class SvxMultiPathDialog : public ModalDialog
 protected:
     FixedLine                   aPathFL;
     ListBox                     aPathLB;
+    SvxSimpleTableContainer m_aRadioLBContainer;
     svx::SvxRadioButtonListBox  aRadioLB;
     FixedText                   aRadioFT;
     PushButton                  aAddBtn;
diff --git a/cui/source/inc/radiobtnbox.hxx b/cui/source/inc/radiobtnbox.hxx
index 0a67dcf9fd95..f7f8aea4a8bd 100644
--- a/cui/source/inc/radiobtnbox.hxx
+++ b/cui/source/inc/radiobtnbox.hxx
@@ -49,7 +49,7 @@ protected:
     virtual void        KeyInput( const KeyEvent& rKEvt );
 
 public:
-    SvxRadioButtonListBox( Window* _pParent, const ResId& _rId );
+    SvxRadioButtonListBox(SvxSimpleTableContainer& rParent, WinBits nBits = WB_BORDER);
     ~SvxRadioButtonListBox();
 
     void                HandleEntryChecked( SvLBoxEntry* _pEntry );
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index 87a150288035..92d3fbb08c51 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -57,7 +57,8 @@ SvxFontSubstTabPage::SvxFontSubstTabPage( Window* pParent,
     aFont2FT            (this,  CUI_RES(FT_FONT2)),
     aFont2CB            (this,  CUI_RES(CB_FONT2)),
     aNewDelTBX          (this,  CUI_RES(TBX_SUBSTNEWDEL)),
-    aCheckLB            (this,  CUI_RES(CLB_SUBSTITUTES)),
+    m_aCheckLBContainer(this, CUI_RES(CLB_SUBSTITUTES)),
+    aCheckLB(m_aCheckLBContainer),
 
     aSourceViewFontsFL (this,  CUI_RES(FL_SOURCEVIEW  )),
     aFontNameFT        (this,  CUI_RES(FT_FONTNAME    )),
diff --git a/cui/source/options/fontsubs.hxx b/cui/source/options/fontsubs.hxx
index bfd30c36d23e..2ed4787240e2 100644
--- a/cui/source/options/fontsubs.hxx
+++ b/cui/source/options/fontsubs.hxx
@@ -53,8 +53,10 @@ class SvxFontSubstCheckListBox : public SvxSimpleTable
         virtual void    KeyInput( const KeyEvent& rKEvt );
 
     public:
-        SvxFontSubstCheckListBox(Window* pParent, const ResId& rResId ) :
-            SvxSimpleTable( pParent, rResId ){}
+        SvxFontSubstCheckListBox(SvxSimpleTableContainer& rParent, WinBits nBits = WB_BORDER)
+            : SvxSimpleTable(rParent, nBits)
+        {
+        }
 
         inline void     *GetUserData(sal_uLong nPos) { return GetEntry(nPos)->GetUserData(); }
         inline void     SetUserData(sal_uLong nPos, void *pData ) { GetEntry(nPos)->SetUserData(pData); }
@@ -78,6 +80,7 @@ class SvxFontSubstTabPage : public SfxTabPage
     FixedText                   aFont2FT;
     FontNameBox                 aFont2CB;
     ToolBox                     aNewDelTBX;
+    SvxSimpleTableContainer m_aCheckLBContainer;
     SvxFontSubstCheckListBox    aCheckLB;
 
     FixedLine                   aSourceViewFontsFL;
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index 7180cd6b241c..7199c229ec1e 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -77,6 +77,7 @@ const char* aColorLBHids[] =
      HID_COLORPAGE_WRITERNOTESINDICATOR_LB,
      HID_COLORPAGE_WRITERSCRIPTINDICATOR_LB,
      HID_COLORPAGE_WRITERSECTIONBOUNDARIES_LB,
+     HID_COLORPAGE_WRITERHEADERFOOTERMARK_LB,
      HID_COLORPAGE_WRITERPAGEBREAKS_LB,
      HID_COLORPAGE_HTMLSGML_LB,
      HID_COLORPAGE_HTMLCOMMENT_LB,
@@ -121,6 +122,7 @@ const char* aColorCBHids[] =
      HID_COLORPAGE_WRITERNOTESINDICATOR_CB,
      HID_COLORPAGE_WRITERSCRIPTINDICATOR_CB,
      HID_COLORPAGE_WRITERSECTIONBOUNDARIES_CB,
+     HID_COLORPAGE_WRITERHEADERFOOTERMARK_CB,
      HID_COLORPAGE_WRITERPAGEBREAKS_CB,
      HID_COLORPAGE_HTMLSGML_CB,
      HID_COLORPAGE_HTMLCOMMENT_CB,
@@ -218,6 +220,9 @@ class ColorConfigWindow_Impl : public Window
     CheckBox        aWrtSectionBoundCB;
     ColorListBox    aWrtSectionBoundLB;
     Window          aWrtSectionBoundWN;
+    FixedText       aWrtHeaderFooterMarkFT;
+    ColorListBox    aWrtHeaderFooterMarkLB;
+    Window          aWrtHeaderFooterMarkWN;
     FixedText       aWrtPageBreaksFT;
     ColorListBox    aWrtPageBreaksLB;
     Window          aWrtPageBreaksWN;
@@ -524,6 +529,9 @@ ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent, const ResId& rRe
         aWrtSectionBoundCB(this, ResId(      CB_WRITERSECTIONBOUNDARIES, *rResId.GetResMgr())),
         aWrtSectionBoundLB(this, ResId(      LB_WRITERSECTIONBOUNDARIES, *rResId.GetResMgr())),
         aWrtSectionBoundWN(this, ResId(      WN_WRITERSECTIONBOUNDARIES, *rResId.GetResMgr())),
+        aWrtHeaderFooterMarkFT(this, ResId(      FT_WRITERHEADERFOOTERMARK, *rResId.GetResMgr())),
+        aWrtHeaderFooterMarkLB(this, ResId(      LB_WRITERHEADERFOOTERMARK, *rResId.GetResMgr())),
+        aWrtHeaderFooterMarkWN(this, ResId(      WN_WRITERHEADERFOOTERMARK, *rResId.GetResMgr())),
         aWrtPageBreaksFT(this, ResId(      FT_WRITERPAGEBREAKS, *rResId.GetResMgr())),
         aWrtPageBreaksLB(this, ResId(      LB_WRITERPAGEBREAKS, *rResId.GetResMgr())),
         aWrtPageBreaksWN(this, ResId(      WN_WRITERPAGEBREAKS, *rResId.GetResMgr())),
@@ -664,6 +672,7 @@ ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent, const ResId& rRe
     aFixedTexts[CALCREFERENCE    ]=& aCalcReferenceFT;
     aFixedTexts[CALCNOTESBACKGROUND  ]=& aCalcNotesBackFT;
     aFixedTexts[WRITERPAGEBREAKS] = &aWrtPageBreaksFT;
+    aFixedTexts[WRITERHEADERFOOTERMARK] = &aWrtHeaderFooterMarkFT;
     aFixedTexts[DRAWGRID            ] = &aDrawGridFT             ;
     aFixedTexts[BASICIDENTIFIER ] = &aBasicIdentifierFT;
     aFixedTexts[BASICCOMMENT    ] = &aBasicCommentFT;
@@ -698,6 +707,7 @@ ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent, const ResId& rRe
     aColorBoxes[WRITERSCRIPTINDICATOR    ] = &aWrtScriptIndicatorLB           ;
     aColorBoxes[WRITERSECTIONBOUNDARIES  ] = &aWrtSectionBoundLB           ;
     aColorBoxes[WRITERPAGEBREAKS] = &aWrtPageBreaksLB;
+    aColorBoxes[WRITERHEADERFOOTERMARK] = &aWrtHeaderFooterMarkLB;
     aColorBoxes[HTMLSGML            ] = &aHTMLSGMLLB             ;
     aColorBoxes[HTMLCOMMENT         ] = &aHTMLCommentLB          ;
     aColorBoxes[HTMLKEYWORD         ] = &aHTMLKeywdLB            ;
@@ -744,6 +754,7 @@ ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent, const ResId& rRe
     aWindows[WRITERSCRIPTINDICATOR    ] = &aWrtScriptIndicatorWN           ;
     aWindows[WRITERSECTIONBOUNDARIES  ] = &aWrtSectionBoundWN           ;
     aWindows[WRITERPAGEBREAKS] = &aWrtPageBreaksWN;
+    aWindows[WRITERHEADERFOOTERMARK] = &aWrtHeaderFooterMarkWN;
     aWindows[HTMLSGML            ] = &aHTMLSGMLWN             ;
     aWindows[HTMLCOMMENT         ] = &aHTMLCommentWN          ;
     aWindows[HTMLKEYWORD         ] = &aHTMLKeywdWN            ;
@@ -935,7 +946,6 @@ ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent, const ResId& rRe
     }
 
     XColorTable aColorTable( SvtPathOptions().GetPalettePath() );
-    aColorBoxes[0]->InsertAutomaticEntry();
     for( sal_Int32 i = 0; i < aColorTable.Count(); i++ )
     {
         XColorEntry* pEntry = aColorTable.GetColor(i);
@@ -952,8 +962,10 @@ ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent, const ResId& rRe
             aColorBoxes[i]->CopyEntries( *aColorBoxes[0] );
             if( i < sal_Int32(sizeof(aColorLBHids)/sizeof(aColorLBHids[0])) )
                aColorBoxes[i]->SetHelpId( aColorLBHids[i] );
+            aColorBoxes[i]->InsertAutomaticEntryColor(ColorConfig::GetDefaultColor((ColorConfigEntry) i));
         }
     }
+    aColorBoxes[0]->InsertAutomaticEntryColor(ColorConfig::GetDefaultColor((ColorConfigEntry) 0));
 }
 
 ColorConfigWindow_Impl::~ColorConfigWindow_Impl()
@@ -1414,7 +1426,7 @@ IMPL_LINK(ColorConfigCtrl_Impl, ColorHdl, ColorListBox*, pBox)
         if(pBox && aScrollWindow.aColorBoxes[i] == pBox)
         {
             ColorConfigValue aColorEntry = pColorConfig->GetColorValue(ColorConfigEntry(i));
-            if(!pBox->GetSelectEntryPos())
+            if(pBox->IsAutomaticSelected())
             {
                 aColorEntry.nColor = COL_AUTO;
                 if(aScrollWindow.aWindows[i])
diff --git a/cui/source/options/optcolor.hrc b/cui/source/options/optcolor.hrc
index 3b96231d71d6..c0aedb12e4fe 100644
--- a/cui/source/options/optcolor.hrc
+++ b/cui/source/options/optcolor.hrc
@@ -96,20 +96,23 @@
 #define LB_WRITERPAGEBREAKS         83
 #define FT_WRITERPAGEBREAKS         84
 #define WN_WRITERPAGEBREAKS         85
-
-#define FT_HTML                     88
-#define FT_HTMLSGML                 89
-#define LB_HTMLSGML                 90
-#define WN_HTMLSGML                 91
-#define FT_HTMLCOMMENT              92
-#define LB_HTMLCOMMENT              93
-#define WN_HTMLCOMMENT              94
-#define FT_HTMLKEYWORD              95
-#define LB_HTMLKEYWORD              96
-#define WN_HTMLKEYWORD              97
-#define FT_HTMLUNKNOWN              98
-#define LB_HTMLUNKNOWN              99
-#define WN_HTMLUNKNOWN             100
+#define LB_WRITERHEADERFOOTERMARK   86
+#define FT_WRITERHEADERFOOTERMARK   87
+#define WN_WRITERHEADERFOOTERMARK   88
+
+#define FT_HTML                     89
+#define FT_HTMLSGML                 90
+#define LB_HTMLSGML                 91
+#define WN_HTMLSGML                 92
+#define FT_HTMLCOMMENT              93
+#define LB_HTMLCOMMENT              94
+#define WN_HTMLCOMMENT              95
+#define FT_HTMLKEYWORD              96
+#define LB_HTMLKEYWORD              97
+#define WN_HTMLKEYWORD              98
+#define FT_HTMLUNKNOWN              99
+#define LB_HTMLUNKNOWN             100
+#define WN_HTMLUNKNOWN             101
 
 #define FT_CALC                    103
 #define FT_CALCGRID                104
diff --git a/cui/source/options/optcolor.src b/cui/source/options/optcolor.src
index 201495f5c1fa..284be8a6ed1e 100644
--- a/cui/source/options/optcolor.src
+++ b/cui/source/options/optcolor.src
@@ -271,238 +271,245 @@ TabPage RID_SVXPAGE_COLORCONFIG
             };
             LB_WN( WRITERSECTIONBOUNDARIES, 17 )
 
-            FixedText FT_WRITERPAGEBREAKS
+            FixedText FT_WRITERHEADERFOOTERMARK
             {
                 FT_POS_SIZE( 18 );
+                Text [ en-US ] = "Headers and Footer delimiter";
+            };
+            LB_WN( WRITERHEADERFOOTERMARK, 18 )
+
+            FixedText FT_WRITERPAGEBREAKS
+            {
+                FT_POS_SIZE( 19 );
                 Text [ en-US ] = "Page and column breaks";
             };
-            LB_WN( WRITERPAGEBREAKS, 18 )
+            LB_WN( WRITERPAGEBREAKS, 19 )
 
             FixedText FT_WRITERDIRECTCURSOR
             {
-                FT_POS_SIZE( 19 );
+                FT_POS_SIZE( 20 );
                 Text [ en-US ] = "Direct cursor";
             };
-            LB_WN( WRITERDIRECTCURSOR, 19 )
+            LB_WN( WRITERDIRECTCURSOR, 20 )
 
             FixedText FT_HTML
             {
-                FT_SEP_POS_SIZE( 20 );
+                FT_SEP_POS_SIZE( 21 );
                 Text [ en-US ] = "HTML Document";
             };
 
             FixedText FT_HTMLSGML
             {
-                FT_POS_SIZE( 21 );
+                FT_POS_SIZE( 22 );
                 Text [ en-US ] = "SGML syntax highlighting";
             };
-            LB_WN( HTMLSGML, 21 )
+            LB_WN( HTMLSGML, 22 )
 
             FixedText FT_HTMLCOMMENT
             {
-                FT_POS_SIZE( 22 );
+                FT_POS_SIZE( 23 );
                 Text [ en-US ] = "Comment highlighting";
             };
-            LB_WN( HTMLCOMMENT, 22 )
+            LB_WN( HTMLCOMMENT, 23 )
 
             FixedText FT_HTMLKEYWORD
             {
-                FT_POS_SIZE( 23 );
+                FT_POS_SIZE( 24 );
                 Text [ en-US ] = "Keyword highlighting";
             };
-            LB_WN( HTMLKEYWORD, 23 )
+            LB_WN( HTMLKEYWORD, 24 )
 
             FixedText FT_HTMLUNKNOWN
             {
-                FT_POS_SIZE( 24 );
+                FT_POS_SIZE( 25 );
                 Text [ en-US ] = "Text";
             };
-            LB_WN( HTMLUNKNOWN, 24 )
+            LB_WN( HTMLUNKNOWN, 25 )
 
             FixedText FT_CALC
             {
-                FT_SEP_POS_SIZE( 25 );
+                FT_SEP_POS_SIZE( 26 );
                 Text [ en-US ] = "Spreadsheet";
             };
 
             FixedText FT_CALCGRID
             {
-                FT_POS_SIZE( 26 );
+                FT_POS_SIZE( 27 );
                 Text [ en-US ] = "Grid lines";
             };
-            LB_WN( CALCGRID, 26 )
+            LB_WN( CALCGRID, 27 )
 
             FixedText FT_CALCPAGEBREAK
             {
-                FT_POS_SIZE( 27 );
+                FT_POS_SIZE( 28 );
                 Text [ en-US ] = "Page breaks";
             };
-            LB_WN( CALCPAGEBREAK, 27 )
+            LB_WN( CALCPAGEBREAK, 28 )
 
             FixedText FT_CALCPAGEBREAKMANUAL
             {
-                FT_POS_SIZE( 28 );
+                FT_POS_SIZE( 29 );
                 Text [ en-US ] = "Manual page breaks";
             };
-            LB_WN( CALCPAGEBREAKMANUAL, 28 )
+            LB_WN( CALCPAGEBREAKMANUAL, 29 )
 
             FixedText FT_CALCPAGEBREAKAUTO
             {
-                FT_POS_SIZE( 29 );
+                FT_POS_SIZE( 30 );
                 Text [ en-US ] = "Automatic page breaks";
             };
-            LB_WN( CALCPAGEBREAKAUTO, 29)
+            LB_WN( CALCPAGEBREAKAUTO, 30)
 
             FixedText FT_CALCDETECTIVE
             {
-                FT_POS_SIZE( 30 );
+                FT_POS_SIZE( 31 );
                 Text [ en-US ] = "Detective";
             };
-            LB_WN( CALCDETECTIVE, 30 )
+            LB_WN( CALCDETECTIVE, 31 )
 
             FixedText FT_CALCDETECTIVEERROR
             {
-                FT_POS_SIZE( 31 );
+                FT_POS_SIZE( 32 );
                 Text [ en-US ] = "Detective error";
             };
-            LB_WN( CALCDETECTIVEERROR, 31 )
+            LB_WN( CALCDETECTIVEERROR, 32 )
 
             FixedText FT_CALCREFERENCE
             {
-                FT_POS_SIZE( 32 );
+                FT_POS_SIZE( 33 );
                 Text [ en-US ] = "References";
             };
-            LB_WN( CALCREFERENCE, 32 )
+            LB_WN( CALCREFERENCE, 33 )
 
             FixedText FT_CALCNOTESBACKGROUND
             {
-                FT_POS_SIZE( 33 );
+                FT_POS_SIZE( 34 );
                 Text [ en-US ] = "Notes background";
             };
-            LB_WN( CALCNOTESBACKGROUND, 33 )
+            LB_WN( CALCNOTESBACKGROUND, 34 )
 
             FixedText FT_DRAW
             {
-                FT_SEP_POS_SIZE( 34 );
+                FT_SEP_POS_SIZE( 35 );
                 Text [ en-US ] = "Drawing / Presentation";
             };
 
             FixedText FT_DRAWGRID
             {
-                FT_POS_SIZE( 35 );
+                FT_POS_SIZE( 36 );
                 Text [ en-US ] = "Grid";
             };
-            LB_WN( DRAWGRID, 35 )
+            LB_WN( DRAWGRID, 36 )
 
             FixedText FT_BASIC
             {
-                FT_SEP_POS_SIZE( 36 );
+                FT_SEP_POS_SIZE( 37 );
                 Text [ en-US ] = "Basic Syntax Highlighting";
             };
 
             FixedText FT_BASICIDENTIFIER
             {
-                FT_POS_SIZE( 37 );
+                FT_POS_SIZE( 38 );
                 Text [ en-US ] = "Identifier";
             };
-            LB_WN( BASICIDENTIFIER, 37 )
+            LB_WN( BASICIDENTIFIER, 38 )
 
             FixedText FT_BASICCOMMENT
             {
-                FT_POS_SIZE( 38 );
+                FT_POS_SIZE( 39 );
                 Text [ en-US ] = "Comment";
             };
-            LB_WN( BASICCOMMENT, 38 )
+            LB_WN( BASICCOMMENT, 39 )
 
             FixedText FT_BASICNUMBER
             {
-                FT_POS_SIZE( 39 );
+                FT_POS_SIZE( 40 );
                 Text [ en-US ] = "Number";
             };
-            LB_WN( BASICNUMBER, 39)
+            LB_WN( BASICNUMBER, 40)
 
             FixedText FT_BASICSTRING
             {
-                FT_POS_SIZE( 40 );
+                FT_POS_SIZE( 41 );
                 Text [ en-US ] = "String";
             };
-            LB_WN( BASICSTRING, 40 )
+            LB_WN( BASICSTRING, 41 )
 
             FixedText FT_BASICOPERATOR
             {
-                FT_POS_SIZE( 41 );
+                FT_POS_SIZE( 42 );
                 Text [ en-US ] = "Operator";
             };
-            LB_WN( BASICOPERATOR, 41 )
+            LB_WN( BASICOPERATOR, 42 )
 
             FixedText FT_BASICKEYWORD
             {
-                FT_POS_SIZE( 42 );
+                FT_POS_SIZE( 43 );
                 Text [ en-US ] = "Reserved expression";
             };
-            LB_WN( BASICKEYWORD, 42 )
+            LB_WN( BASICKEYWORD, 43 )
 
             FixedText FT_BASICERROR
             {
-                FT_POS_SIZE( 43 );
+                FT_POS_SIZE( 44 );
                 Text [ en-US ] = "Error";
             };
-            LB_WN( BASICERROR, 43 )
+            LB_WN( BASICERROR, 44 )
 
             FixedText FT_SQL_COMMAND
             {
-                FT_SEP_POS_SIZE( 44 );
+                FT_SEP_POS_SIZE( 45 );
                 Text [ en-US ] = "SQL Syntax Highlighting";
             };
 
             FixedText FT_SQLIDENTIFIER
             {
-                FT_POS_SIZE( 45 );
+                FT_POS_SIZE( 46 );
                 Text [ en-US ] = "Identifier";
             };
-            LB_WN( SQLIDENTIFIER, 45 )
+            LB_WN( SQLIDENTIFIER, 46 )
 
             FixedText FT_SQLNUMBER
             {
-                FT_POS_SIZE( 46 );
+                FT_POS_SIZE( 47 );
                 Text [ en-US ] = "Number";
             };
-            LB_WN( SQLNUMBER, 46 )
+            LB_WN( SQLNUMBER, 47 )
 
             FixedText FT_SQLSTRING
             {
-                FT_POS_SIZE( 47 );
+                FT_POS_SIZE( 48 );
                 Text [ en-US ] = "String";
             };
-            LB_WN( SQLSTRING, 47 )
+            LB_WN( SQLSTRING, 48 )
 
             FixedText FT_SQLOPERATOR
             {
-                FT_POS_SIZE( 48 );
+                FT_POS_SIZE( 49 );
                 Text [ en-US ] = "Operator";
             };
-            LB_WN( SQLOPERATOR, 48 )
+            LB_WN( SQLOPERATOR, 49 )
 
             FixedText FT_SQLKEYWORD
             {
-                FT_POS_SIZE( 49 );
+                FT_POS_SIZE( 50 );
                 Text [ en-US ] = "Keyword";
             };
-            LB_WN( SQLKEYWORD, 49 )
+            LB_WN( SQLKEYWORD, 50 )
 
             FixedText FT_SQLPARAMETER
             {
-                FT_POS_SIZE( 50 );
+                FT_POS_SIZE( 51 );
                 Text [ en-US ] = "Parameter";
             };
-            LB_WN( SQLPARAMETER, 50 )
+            LB_WN( SQLPARAMETER, 51 )
 
             FixedText FT_SQLCOMMENT
             {
-                FT_POS_SIZE( 51 );
+                FT_POS_SIZE( 52 );
                 Text [ en-US ] = "Comment";
             };
-            LB_WN( SQLCOMMENT, 51 )
+            LB_WN( SQLCOMMENT, 52 )
 
             String ST_EXTENSION
             {
diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx
index a18c791b20c4..b5f33837ae1f 100644
--- a/cui/source/options/optfltr.cxx
+++ b/cui/source/options/optfltr.cxx
@@ -92,62 +92,62 @@ SfxTabPage* OfaMSFilterTabPage::Create( Window* pParent,
 
 sal_Bool OfaMSFilterTabPage::FillItemSet( SfxItemSet& )
 {
-    SvtFilterOptions* pOpt = SvtFilterOptions::Get();
+    SvtFilterOptions& rOpt = SvtFilterOptions::Get();
 
     sal_Bool bFlag;
     if( aWBasicCodeCB.GetSavedValue() != (bFlag = aWBasicCodeCB.IsChecked()))
-        pOpt->SetLoadWordBasicCode( bFlag );
+        rOpt.SetLoadWordBasicCode( bFlag );
     if( aWBasicWbctblCB.GetSavedValue() != (bFlag = aWBasicWbctblCB.IsChecked()))
-        pOpt->SetLoadWordBasicExecutable( bFlag );
+        rOpt.SetLoadWordBasicExecutable( bFlag );
     if( aWBasicStgCB.GetSavedValue() != (bFlag = aWBasicStgCB.IsChecked()))
-        pOpt->SetLoadWordBasicStorage( bFlag );
+        rOpt.SetLoadWordBasicStorage( bFlag );
 
     if( aEBasicCodeCB.GetSavedValue() != (bFlag = aEBasicCodeCB.IsChecked()))
-        pOpt->SetLoadExcelBasicCode( bFlag );
+        rOpt.SetLoadExcelBasicCode( bFlag );
     if( aEBasicExectblCB.GetSavedValue() != (bFlag = aEBasicExectblCB.IsChecked()))
-        pOpt->SetLoadExcelBasicExecutable( bFlag );
+        rOpt.SetLoadExcelBasicExecutable( bFlag );
     if( aEBasicStgCB.GetSavedValue() != (bFlag = aEBasicStgCB.IsChecked()))
-        pOpt->SetLoadExcelBasicStorage( bFlag );
+        rOpt.SetLoadExcelBasicStorage( bFlag );
 
     if( aPBasicCodeCB.GetSavedValue() != (bFlag = aPBasicCodeCB.IsChecked()))
-        pOpt->SetLoadPPointBasicCode( bFlag );
+        rOpt.SetLoadPPointBasicCode( bFlag );
     if( aPBasicStgCB.GetSavedValue() != (bFlag = aPBasicStgCB.IsChecked()))
-        pOpt->SetLoadPPointBasicStorage( bFlag );
+        rOpt.SetLoadPPointBasicStorage( bFlag );
 
     return sal_False;
 }
 
 void OfaMSFilterTabPage::Reset( const SfxItemSet& )
 {
-    SvtFilterOptions* pOpt = SvtFilterOptions::Get();
+    const SvtFilterOptions& rOpt = SvtFilterOptions::Get();
 
-    aWBasicCodeCB.Check( pOpt->IsLoadWordBasicCode() );
+    aWBasicCodeCB.Check( rOpt.IsLoadWordBasicCode() );
     aWBasicCodeCB.SaveValue();
-    aWBasicWbctblCB.Check( pOpt->IsLoadWordBasicExecutable() );
+    aWBasicWbctblCB.Check( rOpt.IsLoadWordBasicExecutable() );
     aWBasicWbctblCB.SaveValue();
-    aWBasicStgCB.Check( pOpt->IsLoadWordBasicStorage() );
+    aWBasicStgCB.Check( rOpt.IsLoadWordBasicStorage() );
     aWBasicStgCB.SaveValue();
     LoadWordBasicCheckHdl_Impl( &aWBasicCodeCB );
 
-    aEBasicCodeCB.Check( pOpt->IsLoadExcelBasicCode() );
+    aEBasicCodeCB.Check( rOpt.IsLoadExcelBasicCode() );
     aEBasicCodeCB.SaveValue();
-    aEBasicExectblCB.Check( pOpt->IsLoadExcelBasicExecutable() );
+    aEBasicExectblCB.Check( rOpt.IsLoadExcelBasicExecutable() );
     aEBasicExectblCB.SaveValue();
-    aEBasicStgCB.Check( pOpt->IsLoadExcelBasicStorage() );
+    aEBasicStgCB.Check( rOpt.IsLoadExcelBasicStorage() );
     aEBasicStgCB.SaveValue();
     LoadExcelBasicCheckHdl_Impl( &aEBasicCodeCB );
 
-    aPBasicCodeCB.Check( pOpt->IsLoadPPointBasicCode() );
+    aPBasicCodeCB.Check( rOpt.IsLoadPPointBasicCode() );
     aPBasicCodeCB.SaveValue();
-    aPBasicStgCB.Check( pOpt->IsLoadPPointBasicStorage() );
+    aPBasicStgCB.Check( rOpt.IsLoadPPointBasicStorage() );
     aPBasicStgCB.SaveValue();
-
 }
 
 OfaMSFilterTabPage2::OfaMSFilterTabPage2( Window* pParent,
                                         const SfxItemSet& rSet )
     : SfxTabPage( pParent, CUI_RES( RID_OFAPAGE_MSFILTEROPT2 ), rSet ),
-    aCheckLB            ( this, CUI_RES( CLB_SETTINGS   )),
+    m_aCheckLBContainer(this, CUI_RES( CLB_SETTINGS)),
+    aCheckLB(m_aCheckLBContainer),
     aHeader1FT          ( this, CUI_RES( FT_HEADER1_EXPLANATION )),
     aHeader2FT          ( this, CUI_RES( FT_HEADER2_EXPLANATION )),
     sHeader1            ( CUI_RES( ST_HEADER1 )),
@@ -185,7 +185,7 @@ SfxTabPage* OfaMSFilterTabPage2::Create( Window* pParent,
 
 sal_Bool OfaMSFilterTabPage2::FillItemSet( SfxItemSet& )
 {
-    SvtFilterOptions* pOpt = SvtFilterOptions::Get();
+    SvtFilterOptions& rOpt = SvtFilterOptions::Get();
 
     static struct ChkCBoxEntries{
         MSFltrPg2_CheckBoxEntries eType;
@@ -226,8 +226,8 @@ sal_Bool OfaMSFilterTabPage2::FillItemSet( SfxItemSet& )
                 bCheck = SV_BUTTON_CHECKED ==
                         pCheckButtonData->ConvertToButtonState( nButtonFlags );
 
-                if( bCheck != (pOpt->*pArr->FnIs)() )
-                    (pOpt->*pArr->FnSet)( bCheck );
+                if( bCheck != (rOpt.*pArr->FnIs)() )
+                    (rOpt.*pArr->FnSet)( bCheck );
             }
         }
     }
@@ -237,7 +237,7 @@ sal_Bool OfaMSFilterTabPage2::FillItemSet( SfxItemSet& )
 
 void OfaMSFilterTabPage2::Reset( const SfxItemSet& )
 {
-    SvtFilterOptions* pOpt = SvtFilterOptions::Get();
+    SvtFilterOptions& rOpt = SvtFilterOptions::Get();
 
     aCheckLB.SetUpdateMode(sal_False);
     aCheckLB.Clear();
@@ -280,7 +280,7 @@ void OfaMSFilterTabPage2::Reset( const SfxItemSet& )
             SvLBoxButton* pItem = (SvLBoxButton*)(pEntry->GetItem( nCol ));
             if( pItem && ((SvLBoxItem*)pItem)->IsA() == SV_ITEM_ID_LBOXBUTTON )
             {
-                if( (pOpt->*pArr->FnIs)() )
+                if( (rOpt.*pArr->FnIs)() )
                     pItem->SetStateChecked();
                 else
                     pItem->SetStateUnchecked();
diff --git a/cui/source/options/optfltr.hxx b/cui/source/options/optfltr.hxx
index f62f92d062b1..aab983270fb6 100644
--- a/cui/source/options/optfltr.hxx
+++ b/cui/source/options/optfltr.hxx
@@ -81,10 +81,13 @@ class OfaMSFilterTabPage2 : public SfxTabPage
         virtual void    KeyInput( const KeyEvent& rKEvt );
 
     public:
-        MSFltrSimpleTable(Window* pParent, const ResId& rResId ) :
-            SvxSimpleTable( pParent, rResId ){}
+        MSFltrSimpleTable(SvxSimpleTableContainer& rParent, WinBits nBits = WB_BORDER)
+            : SvxSimpleTable(rParent, nBits)
+        {
+        }
     };
 
+    SvxSimpleTableContainer m_aCheckLBContainer;
     MSFltrSimpleTable aCheckLB;
     FixedText aHeader1FT, aHeader2FT;
     String sHeader1, sHeader2;
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index 87979ed9b402..cf63dc133674 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -52,7 +52,6 @@
 #include <tools/urlobj.hxx>
 #include <unotools/pathoptions.hxx>
 #include <unotools/securityoptions.hxx>
-#include <unotools/javaoptions.hxx>
 #include <unotools/localfilehelper.hxx>
 #include <unotools/extendedsecurityoptions.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
@@ -94,6 +93,7 @@
 #include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/util/XChangesBatch.hpp>
 #include <comphelper/processfactory.hxx>
+#include <comphelper/string.hxx>
 
 #include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
 #include "com/sun/star/task/XMasterPasswordHandling2.hpp"
@@ -165,7 +165,7 @@ void SvxNoSpaceEdit::Modify()
     {
         XubString aValue = GetText();
 
-        if ( !ByteString(::rtl::OUStringToOString(aValue,RTL_TEXTENCODING_UTF8)).IsNumericAscii() || (long)aValue.ToInt32() > USHRT_MAX )
+        if ( !comphelper::string::isAsciiDecimalString(aValue) || (long)aValue.ToInt32() > USHRT_MAX )
             // der H�chstwert einer Portnummer ist USHRT_MAX
             ErrorBox( this, CUI_RES( RID_SVXERR_OPT_PROXYPORTS ) ).Execute();
     }
@@ -629,7 +629,7 @@ IMPL_LINK( SvxProxyTabPage, LoseFocusHdl_Impl, Edit *, pEdit )
 {
     XubString aValue = pEdit->GetText();
 
-    if ( !ByteString(::rtl::OUStringToOString(aValue,RTL_TEXTENCODING_UTF8)).IsNumericAscii() || (long)aValue.ToInt32() > USHRT_MAX )
+    if ( !comphelper::string::isAsciiDecimalString(aValue) || (long)aValue.ToInt32() > USHRT_MAX )
         pEdit->SetText( '0' );
     return 0;
 }
diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx
index a7f7816d2e0e..751fb00f40cd 100644
--- a/cui/source/options/optinet2.hxx
+++ b/cui/source/options/optinet2.hxx
@@ -36,7 +36,7 @@
 #include <svtools/stdctrl.hxx>
 #include <svtools/svtabbx.hxx>
 #include <sfx2/tabdlg.hxx>
-#include <svl/srchcfg.hxx>
+#include <unotools/configitem.hxx>
 
 #ifdef _SVX_OPTINET2_CXX
 #include <svtools/headbar.hxx>
@@ -226,7 +226,6 @@ protected:
 
 // class SvxSecurityTabPage ---------------------------------------------
 
-class SvtJavaOptions;
 class SvtSecurityOptions;
 
 class SvxSecurityTabPage : public SfxTabPage
@@ -250,7 +249,6 @@ private:
     FixedInfo           maMacroSecFI;
     PushButton          maMacroSecPB;
 
-
     SvtSecurityOptions*         mpSecOptions;
     svx::SecurityOptionsDialog* mpSecOptDlg;
 
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 14f122cfe78f..733d9eea6310 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -99,7 +99,8 @@ SvxJavaOptionsPage::SvxJavaOptionsPage( Window* pParent, const SfxItemSet& rSet
     m_aJavaLine         ( this, CUI_RES( FL_JAVA ) ),
     m_aJavaEnableCB     ( this, CUI_RES( CB_JAVA_ENABLE ) ),
     m_aJavaFoundLabel   ( this, CUI_RES( FT_JAVA_FOUND ) ),
-    m_aJavaList         ( this, CUI_RES( LB_JAVA ) ),
+    m_aJavaListContainer(this, CUI_RES(LB_JAVA)),
+    m_aJavaList(m_aJavaListContainer),
     m_aJavaPathText     ( this, CUI_RES( FT_JAVA_PATH ) ),
     m_aAddBtn           ( this, CUI_RES( PB_ADD ) ),
     m_aParameterBtn     ( this, CUI_RES( PB_PARAMETER ) ),
@@ -169,9 +170,9 @@ SvxJavaOptionsPage::SvxJavaOptionsPage( Window* pParent, const SfxItemSet& rSet
         aPos = m_aParameterBtn.GetPosPixel();
         aPos.X() -= nDiff;
         m_aParameterBtn.SetPosSizePixel(aPos, aButtonSize);
-        Size aSize = m_aJavaList.GetSizePixel();
+        Size aSize = m_aJavaListContainer.GetSizePixel();
         aSize.Width() -= nDiff;
-        m_aJavaList.SetSizePixel(aSize);
+        m_aJavaListContainer.SetSizePixel(aSize);
     }
 }
 
diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx
index 2c9681a29ce8..3bbfbb67d4e2 100644
--- a/cui/source/options/optjava.hxx
+++ b/cui/source/options/optjava.hxx
@@ -56,6 +56,7 @@ private:
     FixedLine                   m_aJavaLine;
     CheckBox                    m_aJavaEnableCB;
     FixedText                   m_aJavaFoundLabel;
+    SvxSimpleTableContainer     m_aJavaListContainer;
     svx::SvxRadioButtonListBox  m_aJavaList;
     FixedText                   m_aJavaPathText;
     PushButton                  m_aAddBtn;
diff --git a/cui/source/options/radiobtnbox.cxx b/cui/source/options/radiobtnbox.cxx
index 06c0352864c0..ca30c33ea6e0 100644
--- a/cui/source/options/radiobtnbox.cxx
+++ b/cui/source/options/radiobtnbox.cxx
@@ -35,9 +35,8 @@ namespace svx {
 
 // class SvxRadioButtonListBox ----------------------------------------------------
 
-SvxRadioButtonListBox::SvxRadioButtonListBox( Window* _pParent, const ResId& _rId ) :
-
-    SvxSimpleTable( _pParent, _rId )
+SvxRadioButtonListBox::SvxRadioButtonListBox(SvxSimpleTableContainer& rParent, WinBits nBits)
+    : SvxSimpleTable(rParent, nBits)
 
 {
     EnableCheckButton( new SvLBoxButtonData( this, true ) );
@@ -50,16 +49,6 @@ SvxRadioButtonListBox::~SvxRadioButtonListBox()
 void SvxRadioButtonListBox::SetTabs()
 {
     SvxSimpleTable::SetTabs();
-/*
-    sal_uInt16 nAdjust = SV_LBOXTAB_ADJUST_RIGHT | SV_LBOXTAB_ADJUST_LEFT |
-                     SV_LBOXTAB_ADJUST_CENTER | SV_LBOXTAB_ADJUST_NUMERIC | SV_LBOXTAB_FORCE;
-    if ( aTabs.Count() > 0 )
-    {
-        SvLBoxTab* pTab = (SvLBoxTab*)aTabs.GetObject(0);
-        pTab->nFlags &= ~nAdjust;
-        pTab->nFlags |= SV_LBOXTAB_PUSHABLE | SV_LBOXTAB_ADJUST_CENTER | SV_LBOXTAB_FORCE;
-    }
-*/
 }
 
 void SvxRadioButtonListBox::MouseButtonUp( const MouseEvent& _rMEvt )
diff --git a/cui/source/options/webconninfo.cxx b/cui/source/options/webconninfo.cxx
index dcd2afa7140b..d14141fc788c 100644
--- a/cui/source/options/webconninfo.cxx
+++ b/cui/source/options/webconninfo.cxx
@@ -48,10 +48,9 @@ namespace svx
 
 // class PasswordTable ---------------------------------------------------
 
-PasswordTable::PasswordTable( Window* pParent, const ResId& rResId ) :
-    SvxSimpleTable( pParent, rResId )
+PasswordTable::PasswordTable(SvxSimpleTableContainer& rParent, WinBits nBits)
+    : SvxSimpleTable(rParent, nBits | WB_NOINITIALSELECTION)
 {
-    SetStyle( GetStyle() | WB_NOINITIALSELECTION );
 }
 
 void PasswordTable::InsertHeaderItem( sal_uInt16 nColumn, const String& rText, HeaderBarItemBits nBits )
@@ -97,7 +96,8 @@ void PasswordTable::Resort( bool bForced )
 WebConnectionInfoDialog::WebConnectionInfoDialog( Window* pParent ) :
      ModalDialog( pParent, CUI_RES( RID_SVXDLG_WEBCONNECTION_INFO ) )
     ,m_aNeverShownFI    ( this, CUI_RES( FI_NEVERSHOWN ) )
-    ,m_aPasswordsLB     ( this, CUI_RES( LB_PASSWORDS ) )
+    ,m_aPasswordsLBContainer(this, CUI_RES( LB_PASSWORDS))
+    ,m_aPasswordsLB(m_aPasswordsLBContainer)
     ,m_aRemoveBtn       ( this, CUI_RES( PB_REMOVE ) )
     ,m_aRemoveAllBtn    ( this, CUI_RES( PB_REMOVEALL ) )
     ,m_aChangeBtn       ( this, CUI_RES( PB_CHANGE ) )
diff --git a/cui/source/options/webconninfo.hxx b/cui/source/options/webconninfo.hxx
index b5ad4a3777ba..08aadd6b3858 100644
--- a/cui/source/options/webconninfo.hxx
+++ b/cui/source/options/webconninfo.hxx
@@ -42,7 +42,7 @@ namespace svx
     class PasswordTable : public SvxSimpleTable
     {
     public:
-        PasswordTable( Window* pParent, const ResId& rResId );
+        PasswordTable(SvxSimpleTableContainer& rParent, WinBits nBits = WB_BORDER);
 
         void InsertHeaderItem( sal_uInt16 nColumn, const String& rText, HeaderBarItemBits nBits );
         void ResetTabs();
@@ -56,6 +56,7 @@ namespace svx
     {
     private:
         FixedInfo           m_aNeverShownFI;
+        SvxSimpleTableContainer m_aPasswordsLBContainer;
         PasswordTable       m_aPasswordsLB;
         PushButton          m_aRemoveBtn;
         PushButton          m_aRemoveAllBtn;
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 4eb25d799bc1..1df841d22ae1 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -428,7 +428,8 @@ enum OfaAutoFmtOptions
 OfaSwAutoFmtOptionsPage::OfaSwAutoFmtOptionsPage( Window* pParent,
                                 const SfxItemSet& rSet ) :
     SfxTabPage(pParent, CUI_RES(RID_OFAPAGE_AUTOFMT_APPLY), rSet),
-    aCheckLB            (this,  CUI_RES(CLB_SETTINGS)),
+    m_aCheckLBContainer(this, CUI_RES(CLB_SETTINGS)),
+    aCheckLB(m_aCheckLBContainer),
     aEditPB             (this,  CUI_RES(PB_EDIT)),
     aHeader1Expl        (this,  CUI_RES(FT_HEADER1_EXPLANATION)),
     aHeader2Expl        (this,  CUI_RES(FT_HEADER2_EXPLANATION)),
@@ -1897,7 +1898,8 @@ SvLBoxEntry* OfaQuoteTabPage::CreateEntry(String& rTxt, sal_uInt16 nCol)
 OfaQuoteTabPage::OfaQuoteTabPage( Window* pParent, const SfxItemSet& rSet ) :
     SfxTabPage(pParent, CUI_RES( RID_OFAPAGE_AUTOCORR_QUOTE ), rSet),
     aCheckLB            (this, CUI_RES(CLB_SETTINGS     )),
-    aSwCheckLB          (this, CUI_RES(CLB_SETTINGS     )),
+    m_aSwCheckLBContainer(this, CUI_RES(CLB_SETTINGS)),
+    aSwCheckLB(m_aSwCheckLBContainer),
     sHeader1            (CUI_RES( STR_HEADER1           )),
     sHeader2            (CUI_RES( STR_HEADER2           )),
     sNonBrkSpace        (CUI_RES( ST_NON_BREAK_SPACE    )),
diff --git a/cui/source/tabpages/autocdlg.src b/cui/source/tabpages/autocdlg.src
index e9b4769b8caf..d252bdff156f 100644
--- a/cui/source/tabpages/autocdlg.src
+++ b/cui/source/tabpages/autocdlg.src
@@ -434,7 +434,6 @@ TabPage RID_OFAPAGE_AUTOCORR_EXCEPT
         Pos = MAP_APPFONT ( 137 , 78 ) ;
         Size = MAP_APPFONT ( 111 , 10 ) ;
         Text [ en-US ] = "~AutoInclude";
-        Text [ en-US ] = "~AutoInclude" ;
         TabStop = TRUE ;
     };
     FixedLine FL_DOUBLECAPS
@@ -483,7 +482,6 @@ TabPage RID_OFAPAGE_AUTOCORR_EXCEPT
         Pos = MAP_APPFONT ( 137 , 169 ) ;
         Size = MAP_APPFONT ( 111 , 10 ) ;
         Text [ en-US ] = "A~utoInclude";
-        Text [ en-US ] = "A~utoInclude" ;
     };
     String STR_PB_NEWABBREV
     {
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 8ce4f844dfa9..87a0a6a01efe 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -1835,9 +1835,9 @@ void SvxCharEffectsPage::Initialize()
         if ( !pFrame ||
              SFX_ITEM_DEFAULT > pFrame->GetBindings().QueryState( SID_ATTR_AUTO_COLOR_INVALID, pDummy ) )
         {
-            m_aUnderlineColorLB.InsertAutomaticEntry();
-            m_aOverlineColorLB.InsertAutomaticEntry();
-            m_aFontColorLB.InsertAutomaticEntry();
+            m_aUnderlineColorLB.InsertAutomaticEntryColor( Color( COL_AUTO ) );
+            m_aOverlineColorLB.InsertAutomaticEntryColor( Color( COL_AUTO ) );
+            m_aFontColorLB.InsertAutomaticEntryColor( Color( COL_AUTO ) );
         }
     }
     for ( long i = 0; i < pColorTable->Count(); i++ )
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index 2fa12f871019..058aa991c14b 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -782,7 +782,7 @@ sal_Bool SvxNumberFormatTabPage::FillItemSet( SfxItemSet& rCoreAttrs )
         // --------------------------------------------------------------
         // List of changed user defined formats:
         // -------------------------------------
-        const sal_uInt32 nDelCount = pNumFmtShell->GetUpdateDataCount();
+        const size_t nDelCount = pNumFmtShell->GetUpdateDataCount();
 
         if ( nDelCount > 0 )
         {
@@ -960,8 +960,8 @@ void SvxNumberFormatTabPage::UpdateOptions_Impl( sal_Bool bCheckCatChange /*= sa
     sal_uInt16  nCategory           = nCurCategory;
     sal_uInt16  nDecimals           = 0;
     sal_uInt16  nZeroes             = 0;
-    sal_Bool    bNegRed             = sal_False;
-    sal_Bool    bThousand           = sal_False;
+    bool        bNegRed             = false;
+    bool        bThousand           = false;
     sal_uInt16  nCurrencyPos        =aLbCurrency.GetSelectEntryPos();
 
     if(bOneAreaFlag)
@@ -1394,6 +1394,10 @@ IMPL_LINK( SvxNumberFormatTabPage, ClickHdl_Impl, ImageButton*, pIB)
 
         if ( !nErrPos ) // Syntax ok?
         {
+            // May be sorted under a different locale if LCID was parsed.
+            if (bAdded)
+                aLbLanguage.SelectLanguage( pNumFmtShell->GetCurLanguage() );
+
             if(nCatLbSelPos==CAT_CURRENCY)
             {
                 aLbCurrency.SelectEntryPos((sal_uInt16)pNumFmtShell->GetCurrencySymbol());
diff --git a/cui/source/uno/services.cxx b/cui/source/uno/services.cxx
index cb67736a3140..a63fd3c1e444 100644
--- a/cui/source/uno/services.cxx
+++ b/cui/source/uno/services.cxx
@@ -57,10 +57,4 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( char const
     return cppu::component_getFactoryHelper(implName, serviceManager, registryKey, entries);
 }
 
-
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment ( const sal_Char ** ppEnvTypeName, uno_Environment ** )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/util/cui.map b/cui/util/cui.map
index f4c89f960ae6..e0809cfbd396 100644
--- a/cui/util/cui.map
+++ b/cui/util/cui.map
@@ -2,7 +2,6 @@ UDK_3_0_0 {
     global:
         CreateDialogFactory;
         GetSpecialCharsForEdit;
-        component_getImplementationEnvironment;
         component_getFactory;
     local:
         *;