codecleanup02: merge with DEV300_m84

25 files changed, 662 insertions, 907 deletions

diff --git a/svtools/inc/svtools/accessibletable.hxx b/svtools/inc/svtools/accessibletable.hxx
index 198a24b8eb62..8ff17a2b71c7 100755
--- a/svtools/inc/svtools/accessibletable.hxx
+++ b/svtools/inc/svtools/accessibletable.hxx
@@ -124,7 +124,7 @@ public:
     virtual ::com::sun::star::uno::Any GetCellContent( sal_Int32 _nRowPos, sal_Int32 _nColPos) const = 0;
     virtual std::vector<sal_Int32>& GetSelectedRows() = 0;
     virtual void RemoveSelectedRow(sal_Int32 _nRowPos) = 0;
-    virtual ::rtl::OUString GetAccessibleCellText(sal_Int32 _nRowPos, sal_Int32 _nColPos) = 0;
+    virtual ::rtl::OUString GetAccessibleCellText(sal_Int32 _nRowPos, sal_Int32 _nColPos) const = 0;
 };
 
 // ----------------------------------------------------------------------------
diff --git a/svtools/inc/svtools/logindlg.hxx b/svtools/inc/svtools/logindlg.hxx
deleted file mode 100644
index 9cf12dd70610..000000000000
--- a/svtools/inc/svtools/logindlg.hxx
+++ /dev/null
@@ -1,118 +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 _SVTOOLS_LOGINDLG_HXX_
-#define _SVTOOLS_LOGINDLG_HXX_
-
-#include "svtools/svtdllapi.h"
-#include <svtools/stdctrl.hxx>
-#ifndef _SV_BUTTON_HXX
-#include <vcl/button.hxx>
-#endif
-#include <vcl/dialog.hxx>
-#include <vcl/edit.hxx>
-#include <vcl/fixed.hxx>
-
-//============================================================================
-#define LF_NO_PATH              0x0001  // hide "path"
-#define LF_NO_USERNAME          0x0002  // hide "name"
-#define LF_NO_PASSWORD          0x0004  // hide "password"
-#define LF_NO_SAVEPASSWORD      0x0008  // hide "save password"
-#define LF_NO_ERRORTEXT         0x0010  // hide message
-#define LF_PATH_READONLY        0x0020  // "path" readonly
-#define LF_USERNAME_READONLY    0x0040  // "name" readonly
-#define LF_NO_ACCOUNT           0x0080  // hide "account"
-
-//............................................................................
-namespace svt
-{
-//............................................................................
-
-//============================================================================
-class SVT_DLLPUBLIC LoginDialog : public ModalDialog
-{
-    FixedInfo       aErrorInfo;
-    FixedLine       aErrorGB;
-    FixedInfo       aRequestInfo;
-    FixedText       aPathFT;
-    Edit            aPathED;
-    FixedInfo       aPathInfo;
-    PushButton      aPathBtn;
-    FixedText       aNameFT;
-    Edit            aNameED;
-    FixedInfo       aNameInfo;
-    FixedText       aPasswordFT;
-    Edit            aPasswordED;
-    FixedText       aAccountFT;
-    Edit            aAccountED;
-    CheckBox        aSavePasswdBtn;
-    FixedLine       aLoginGB;
-    OKButton        aOKBtn;
-    CancelButton    aCancelBtn;
-    HelpButton      aHelpBtn;
-
-    SVT_DLLPRIVATE void         HideControls_Impl( USHORT nFlags );
-
-    DECL_DLLPRIVATE_LINK( OKHdl_Impl, OKButton * );
-    DECL_DLLPRIVATE_LINK( PathHdl_Impl, PushButton * );
-
-public:
-    LoginDialog( Window* pParent, USHORT nFlags,
-                 const String& rServer, const String* pRealm = NULL );
-
-    String          GetPath() const { return aPathED.GetText(); }
-    void            SetPath( const String& rNewPath )
-                        { aPathED.SetText( rNewPath );
-                          aPathInfo.SetText( rNewPath );}
-    String          GetName() const { return aNameED.GetText(); }
-    void            SetName( const String& rNewName );
-    String          GetPassword() const { return aPasswordED.GetText(); }
-    void            SetPassword( const String& rNew )
-                        { aPasswordED.SetText( rNew ); }
-    String          GetAccount() const { return aAccountED.GetText(); }
-    void            SetAccount( const String& rNew )
-                        { aAccountED.SetText( rNew ); }
-    BOOL            IsSavePassword() const
-                        { return aSavePasswdBtn.IsChecked(); }
-    void            SetSavePassword( BOOL bSave )
-                        { aSavePasswdBtn.Check( bSave ); }
-    void            SetSavePasswordText( const String& rTxt )
-                        { aSavePasswdBtn.SetText( rTxt ); }
-    void            SetErrorText( const String& rTxt )
-                        { aErrorInfo.SetText( rTxt ); }
-    void            SetLoginRequestText( const String& rTxt )
-                        { aRequestInfo.SetText( rTxt ); }
-    void            ClearPassword();
-    void            ClearAccount();
-};
-
-//............................................................................
-}   // namespace svt
-//............................................................................
-
-#endif // _SVTOOLS_LOGINDLG_HXX_
-
diff --git a/svtools/inc/svtools/table/abstracttablecontrol.hxx b/svtools/inc/svtools/table/abstracttablecontrol.hxx
index 2b3951f6aaf3..9206f20ecbcb 100644
--- a/svtools/inc/svtools/table/abstracttablecontrol.hxx
+++ b/svtools/inc/svtools/table/abstracttablecontrol.hxx
@@ -116,6 +116,7 @@ namespace svt { namespace table
     /** returns selection engine*/
     virtual SelectionEngine* getSelEngine() = 0;
     virtual void setCursorAtCurrentCell(const Point& rPoint) = 0;
+    virtual bool isTooltipActive() = 0;
     virtual rtl::OUString& setTooltip(const Point& rPoint ) = 0;
     virtual RowPos getCurrentRow(const Point& rPoint ) = 0;
     virtual void resizeColumn(const Point& rPoint ) = 0;
diff --git a/svtools/inc/svtools/table/tablecontrol.hxx b/svtools/inc/svtools/table/tablecontrol.hxx
index 6eb7f063f9fa..f3b7ed88b565 100644
--- a/svtools/inc/svtools/table/tablecontrol.hxx
+++ b/svtools/inc/svtools/table/tablecontrol.hxx
@@ -79,6 +79,7 @@ namespace svt { namespace table
         ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aText;
         Link m_aSelectHdl;
         bool m_bSelectionChanged;
+        bool m_bTooltip;
     public:
         ::std::auto_ptr< AccessibleTableControl_Impl > m_pAccessTable;
 
@@ -217,12 +218,13 @@ namespace svt { namespace table
     virtual sal_Bool isAccessibleAlive( ) const;
     virtual void commitGridControlEvent( sal_Int16 _nEventId, const com::sun::star::uno::Any& _rNewValue, const com::sun::star::uno::Any& _rOldValue );
     virtual void RemoveSelectedRow(RowPos _nRowPos);
-    virtual ::rtl::OUString GetAccessibleCellText(sal_Int32 _nRowPos, sal_Int32 _nColPos);
+    virtual ::rtl::OUString GetAccessibleCellText(sal_Int32 _nRowPos, sal_Int32 _nColPos) const;
     ::com::sun::star::uno::Sequence< sal_Int32 >& getColumnsForTooltip();
     ::com::sun::star::uno::Sequence< ::rtl::OUString >& getTextForTooltip();
     void setTooltip(const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aText, const ::com::sun::star::uno::Sequence< sal_Int32 >& nCols);
     void clearSelection();
     void selectionChanged(bool _bChanged);
+    bool isTooltip();
 
     protected:
     /// retrieves the XAccessible implementation associated with the GridControl instance
diff --git a/svtools/inc/svtools/table/tabledatawindow.hxx b/svtools/inc/svtools/table/tabledatawindow.hxx
index c9f96483d943..9a6ece489119 100644
--- a/svtools/inc/svtools/table/tabledatawindow.hxx
+++ b/svtools/inc/svtools/table/tabledatawindow.hxx
@@ -74,6 +74,11 @@ namespace svt { namespace table
         virtual void        CaptureMouse();
         virtual void        ReleaseMouse();
         virtual long        Notify(NotifyEvent& rNEvt);
+        virtual void        SetControlBackground(const Color& rColor);
+        virtual void        SetControlBackground();
+
+        void                SetBackground(const Wallpaper& rColor);
+        void                SetBackground();
     };
 //........................................................................
 } } // namespace svt::table
diff --git a/svtools/inc/svtools/xwindowitem.hxx b/svtools/inc/svtools/xwindowitem.hxx
new file mode 100755
index 000000000000..eca425cf1369
--- /dev/null
+++ b/svtools/inc/svtools/xwindowitem.hxx
@@ -0,0 +1,70 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: chrtitem.hxx,v $
+ * $Revision: 1.9 $
+ *
+ * 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 _XWINDOWITEM_HXX_
+#define _XWINDOWITEM_HXX_
+
+
+#include "svtools/svtdllapi.h"
+
+#include <svl/poolitem.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
+
+#include <com/sun/star/awt/XWindow.hpp>
+
+class Window;
+
+//////////////////////////////////////////////////////////////////////
+
+class SVT_DLLPUBLIC XWindowItem : public SfxPoolItem
+{
+    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >      m_xWin;
+
+    // disallow use assignment operator
+    XWindowItem & operator = ( const XWindowItem & );
+
+public:
+    TYPEINFO();
+    XWindowItem();
+    explicit XWindowItem( USHORT nWhich, Window * pWin );
+    XWindowItem( USHORT nWhich, com::sun::star::uno::Reference< com::sun::star::awt::XWindow > & rxWin );
+    XWindowItem( const XWindowItem &rItem );
+    ~XWindowItem();
+
+    virtual SfxPoolItem*    Clone(SfxItemPool* pPool = 0) const;
+    virtual int operator == ( const SfxPoolItem& rAttr ) const;
+
+    Window *        GetWindowPtr() const    { return VCLUnoHelper::GetWindow( m_xWin ); }
+    com::sun::star::uno::Reference< com::sun::star::awt::XWindow >  GetXWindow() const  { return m_xWin; }
+};
+
+//////////////////////////////////////////////////////////////////////
+
+#endif
+
diff --git a/svtools/inc/tabbar.hxx b/svtools/inc/tabbar.hxx
index cf89d4426726..e036f4c2f045 100644
--- a/svtools/inc/tabbar.hxx
+++ b/svtools/inc/tabbar.hxx
@@ -320,9 +320,6 @@ typedef USHORT TabBarPageBits;
 // - TabBar-Types -
 // ----------------
 
-#define TABBAR_APPEND          ((USHORT)0xFFFF)
-#define TABBAR_PAGE_NOTFOUND   ((USHORT)0xFFFF)
-
 #define TABBAR_RENAMING_YES    ((long)TRUE)
 #define TABBAR_RENAMING_NO     ((long)FALSE)
 #define TABBAR_RENAMING_CANCEL ((long)2)
@@ -400,6 +397,9 @@ private:
                     DECL_DLLPRIVATE_LINK( ImplClickHdl, ImplTabButton* );
 
 public:
+    static const sal_uInt16 APPEND;
+    static const sal_uInt16 PAGE_NOT_FOUND;
+
                     TabBar( Window* pParent, WinBits nWinStyle = WB_STDTABBAR );
     virtual         ~TabBar();
 
@@ -424,9 +424,14 @@ public:
 
     void            InsertPage( USHORT nPageId, const XubString& rText,
                                 TabBarPageBits nBits = 0,
-                                USHORT nPos = TABBAR_APPEND );
+                                USHORT nPos = TabBar::APPEND );
     void            RemovePage( USHORT nPageId );
     void            MovePage( USHORT nPageId, USHORT nNewPos );
+
+    Color           GetTabBgColor( USHORT nPageId ) const;
+    void            SetTabBgColor( USHORT nPageId, const Color& aTabBgColor );
+    BOOL            IsDefaultTabBgColor( USHORT nPageId );
+
     void            Clear();
 
     void            EnablePage( USHORT nPageId, BOOL bEnable = TRUE );
@@ -453,7 +458,7 @@ public:
     void            SelectPage( USHORT nPageId, BOOL bSelect = TRUE );
     void            SelectPageRange( BOOL bSelect = FALSE,
                                      USHORT nStartPos = 0,
-                                     USHORT nEndPos = TABBAR_APPEND );
+                                     USHORT nEndPos = TabBar::APPEND );
     USHORT          GetSelectPage( USHORT nSelIndex = 0 ) const;
     USHORT          GetSelectPageCount() const;
     BOOL            IsPageSelected( USHORT nPageId ) const;
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index 843de83f7710..af19379d8b8f 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -54,6 +54,9 @@
 #include <vcl/waitobj.hxx>
 #include <com/sun/star/io/XPersist.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/ucb/XCommandInfo.hpp>
+#include <com/sun/star/beans/XPropertySetInfo.hpp>
+#include <com/sun/star/beans/PropertyAttribute.hpp>
 
 #include <algorithm>
 #include <memory>
@@ -100,7 +103,7 @@ using ::rtl::OUString;
 
 DECLARE_LIST( StringList_Impl, OUString* )
 
-#define ROW_HEIGHT  17  // the height of a row has to be a little higher than the bitmap
+#define ROW_HEIGHT                17    // the height of a row has to be a little higher than the bitmap
 #define QUICK_SEARCH_TIMEOUT    1500    // time in mSec before the quicksearch string will be reseted
 
 namespace
@@ -210,6 +213,7 @@ private:
     sal_Bool                mbResizeDisabled        : 1;
     sal_Bool                mbAutoResize            : 1;
     sal_Bool                mbEnableDelete          : 1;
+    sal_Bool                mbEnableRename          : 1;
 
     void            DeleteEntries();
     void            DoQuickSearch( const xub_Unicode& rChar );
@@ -232,6 +236,7 @@ public:
 
     void            EnableAutoResize() { mbAutoResize = sal_True; }
     void            EnableDelete( sal_Bool bEnable ) { mbEnableDelete = bEnable; }
+    void            EnableRename( sal_Bool bEnable ) { mbEnableRename = bEnable; }
     sal_Bool        IsDeleteOrContextMenuEnabled() { return mbEnableDelete || IsContextMenuHandlingEnabled(); }
 
     Reference< XCommandEnvironment >    GetCommandEnvironment() const { return mxCmdEnv; }
@@ -299,11 +304,11 @@ inline const OUString& HashedEntry::GetName() const
 class HashedEntryList : protected List
 {// provides a list of _unique_ Entries
 protected:
-    inline HashedEntry*     First();
-    inline HashedEntry*     Next();
-    inline void             Append( HashedEntry* pNewEntry );
+    inline HashedEntry*         First();
+    inline HashedEntry*         Next();
+    inline void                 Append( HashedEntry* pNewEntry );
 public:
-    virtual                 ~HashedEntryList();
+    virtual                     ~HashedEntryList();
 
     const HashedEntry*      Find( const OUString& rNameToSearchFor );
     const HashedEntry*      Find( const HashedEntry& rToSearchFor );
@@ -338,7 +343,7 @@ HashedEntryList::~HashedEntryList()
 
 const HashedEntry* HashedEntryList::Find( const OUString& rRefName )
 {   // simple linear search, which should be fast enough for this purpose
-    HashedEntry aRef( rRefName );
+    HashedEntry  aRef( rRefName );
     HashedEntry* pIter = First();
     while( pIter && *pIter != aRef )
         pIter = Next();
@@ -419,12 +424,12 @@ class NameTranslationList : protected HashedEntryList
 {   // contains a list of substitutes of strings for a given folder (as URL)
     // explanation of the circumstances see in remarks for Init();
 protected:
-    INetURLObject           maTransFile;    // URL of file with translation entries
-    HashedEntry             maHashedURL;    // for future purposes when dealing with a set of cached
-                                            //  NameTranslationLists
+    INetURLObject               maTransFile;    // URL of file with translation entries
+    HashedEntry                 maHashedURL;    // for future purposes when dealing with a set of cached
+                                                //  NameTranslationLists
 private:
     const String            maTransFileName;
-    void                    Init();         // reads the translation file and fills the (internal) list
+    void                    Init();             // reads the translation file and fills the (internal) list
 
 public:
                             NameTranslationList( const INetURLObject& rBaseURL );
@@ -436,12 +441,12 @@ public:
     using List::operator!=;
     inline sal_Bool operator    !=( const HashedEntry& rRef ) const;
 
-    const OUString*         Translate( const OUString& rName ) const;
+    const OUString*             Translate( const OUString& rName ) const;
                                             // returns NULL, if rName can't be found
 
-    inline void             Update();       // clears list and init
+    inline void                 Update();   // clears list and init
 
-    inline const String&    GetTransTableFileName() const;
+    inline const String&        GetTransTableFileName() const;
                                             // returns the name for the file, which contains the translation strings
 };
 
@@ -463,7 +468,7 @@ void NameTranslationList::Init()
 
         if( aTestContent.isDocument() )
         {// ... also tests the existence of maTransFile by throwing an Exception
-            const sal_Char* pSection = "TRANSLATIONNAMES";
+            const sal_Char*     pSection = "TRANSLATIONNAMES";
             String          aFsysName( maTransFile.getFSysPath( INetURLObject::FSYS_DETECT ) );
             Config          aConfig( aFsysName );
 
@@ -475,7 +480,7 @@ void NameTranslationList::Init()
                 Insert( new NameTranslationEntry( aConfig.GetKeyName( nCnt ), aConfig.ReadKey( nCnt ) ) );
         }
     }
-    catch( Exception& ) {}
+    catch( Exception const & ) {}
 }
 
 NameTranslationList::NameTranslationList( const INetURLObject& rBaseURL ):
@@ -527,7 +532,7 @@ public:
      // IContentTitleTranslation
     virtual sal_Bool        GetTranslation( const OUString& rOriginalName, OUString& rTranslatedName ) const;
 
-    void                    UpdateTranslationTable();   // reads the translation file again
+    void                    UpdateTranslationTable(); // reads the translation file again
 
     void                    SetActualFolder( const INetURLObject& rActualFolder );
     const String*           GetTransTableFileName() const;
@@ -600,7 +605,7 @@ public:
 
     void                    OpenFolder_Impl();
     // #83004# -------
-    void                    ReplaceTabWithString( OUString& aValue );
+    void                        ReplaceTabWithString( OUString& aValue );
     void                    CreateDisplayText_Impl();
     void                    CreateVector_Impl( const Sequence < OUString > &rList );
     void                    SortFolderContent_Impl();
@@ -661,11 +666,13 @@ inline void SvtFileView_Impl::EnableDelete( sal_Bool bEnable )
 
 inline sal_Bool SvtFileView_Impl::EnableNameReplacing( sal_Bool bEnable )
 {
+    mpView->EnableRename( bEnable );
+
     sal_Bool bRet;
     if( mpView->IsDeleteOrContextMenuEnabled() )
     {
         DBG_ASSERT( !mbReplaceNames, "SvtFileView_Impl::EnableNameReplacing(): state should be not possible!" );
-        bRet = !bEnable;    // only for enabling this is an unsuccessful result
+        bRet = !bEnable; // only for enabling this is an unsuccessful result
     }
     else
     {
@@ -744,7 +751,8 @@ ViewTabListBox_Impl::ViewTabListBox_Impl( Window* pParentWin,
     mnSearchIndex       ( 0 ),
     mbResizeDisabled    ( sal_False ),
     mbAutoResize        ( sal_False ),
-    mbEnableDelete      ( sal_True )
+    mbEnableDelete      ( sal_True ),
+    mbEnableRename      ( sal_True )
 
 {
     Size aBoxSize = pParentWin->GetSizePixel();
@@ -824,7 +832,7 @@ void ViewTabListBox_Impl::Resize()
         mbResizeDisabled = sal_True;
         Point aPos = GetPosPixel();
         SetPosSizePixel( Point( 0, aBarSize.Height() ),
-                         Size( aBoxSize.Width(), aBoxSize.Height() - aBarSize.Height() ) );
+                        Size( aBoxSize.Width(), aBoxSize.Height() - aBarSize.Height() ) );
         mbResizeDisabled = sal_False;
     }
 }
@@ -870,20 +878,90 @@ void ViewTabListBox_Impl::KeyInput( const KeyEvent& rKEvt )
 
 PopupMenu* ViewTabListBox_Impl::CreateContextMenu( void )
 {
-    PopupMenu* pRet;
-    sal_Int32 nSelectedEntries = GetSelectionCount();
+    bool bEnableDelete = mbEnableDelete;
+    bool bEnableRename = mbEnableRename;
+
+    if ( bEnableDelete || bEnableRename )
+    {
+        sal_Int32 nSelectedEntries = GetSelectionCount();
+        bEnableDelete &= nSelectedEntries > 0;
+        bEnableRename &= nSelectedEntries == 1;
+    }
+
+    if ( bEnableDelete || bEnableRename )
+    {
+        SvLBoxEntry* pEntry = FirstSelected();
+        while ( pEntry )
+        {
+            ::ucbhelper::Content aCnt;
+            try
+            {
+                OUString aURL( static_cast< SvtContentEntry * >(
+                    pEntry->GetUserData() )->maURL );
+                aCnt = ::ucbhelper::Content( aURL, mxCmdEnv );
+            }
+            catch( Exception const & )
+            {
+                bEnableDelete = bEnableRename = false;
+            }
+
+            if ( bEnableDelete )
+            {
+                try
+                {
+                    Reference< XCommandInfo > aCommands = aCnt.getCommands();
+                    if ( aCommands.is() )
+                        bEnableDelete
+                            = aCommands->hasCommandByName(
+                                OUString::createFromAscii( "delete" ) );
+                    else
+                        bEnableDelete = false;
+                }
+                catch( Exception const & )
+                {
+                    bEnableDelete = false;
+                }
+            }
+
+            if ( bEnableRename )
+            {
+                try
+                {
+                    Reference< XPropertySetInfo > aProps = aCnt.getProperties();
+                    if ( aProps.is() )
+                    {
+                        Property aProp
+                            = aProps->getPropertyByName(
+                                OUString::createFromAscii( "Title" ) );
+                        bEnableRename
+                            = !( aProp.Attributes & PropertyAttribute::READONLY );
+                    }
+                    else
+                        bEnableRename = false;
+                }
+                catch( Exception const & )
+                {
+                    bEnableRename = false;
+                }
+            }
+
+            pEntry = ( bEnableDelete || bEnableRename )
+                ? NextSelected( pEntry )
+                : 0;
+        }
+    }
 
-    if ( nSelectedEntries )
+    if ( bEnableDelete || bEnableRename )
     {
-        pRet = new PopupMenu( SvtResId( RID_FILEVIEW_CONTEXTMENU ) );
-        pRet->EnableItem( MID_FILEVIEW_DELETE, 0 < nSelectedEntries );
-        pRet->EnableItem( MID_FILEVIEW_RENAME, 1 == nSelectedEntries );
+        PopupMenu * pRet
+            = new PopupMenu( SvtResId( RID_FILEVIEW_CONTEXTMENU ) );
+        pRet->EnableItem( MID_FILEVIEW_DELETE, bEnableDelete );
+        pRet->EnableItem( MID_FILEVIEW_RENAME, bEnableRename );
         pRet->RemoveDisabledEntries( sal_True, sal_True );
+        return pRet;
     }
-    else
-        pRet = NULL;
 
-    return pRet;
+    return NULL;
 }
 
 // -----------------------------------------------------------------------
@@ -928,12 +1006,31 @@ void ViewTabListBox_Impl::DeleteEntries()
             aURL = ( (SvtContentEntry*)pCurEntry->GetUserData() )->maURL;
 
         if ( !aURL.Len() )
-            return;
+            continue;
+
+        bool canDelete = true;
+        try
+        {
+            ::ucbhelper::Content aCnt( aURL, mxCmdEnv );
+            Reference< XCommandInfo > aCommands = aCnt.getCommands();
+            if ( aCommands.is() )
+                canDelete
+                    = aCommands->hasCommandByName(
+                        OUString::createFromAscii( "delete" ) );
+            else
+                canDelete = false;
+        }
+        catch( Exception const & )
+        {
+            canDelete = false;
+        }
 
-        INetURLObject aObj( aURL );
+        if (!canDelete)
+            continue; // process next entry
 
         if ( eResult != svtools::QUERYDELETE_ALL )
         {
+            INetURLObject aObj( aURL );
             svtools::QueryDeleteDlg_Impl aDlg( NULL, aObj.GetName( INetURLObject::DECODE_WITH_CHARSET ) );
             if ( sDialogPosition.Len() )
                 aDlg.SetWindowState( sDialogPosition );
@@ -979,22 +1076,44 @@ BOOL ViewTabListBox_Impl::EditedEntry( SvLBoxEntry* pEntry,
 
     try
     {
+        OUString aPropName = OUString::createFromAscii( "Title" );
+        bool canRename = true;
         ::ucbhelper::Content aContent( aURL, mxCmdEnv );
 
-        OUString aPropName = OUString::createFromAscii( "Title" );
-        Any aValue;
-        aValue <<= OUString( rNewText );
-        aContent.setPropertyValue( aPropName, aValue );
-        mpParent->EntryRenamed( aURL, rNewText );
+        try
+        {
+            Reference< XPropertySetInfo > aProps = aContent.getProperties();
+            if ( aProps.is() )
+            {
+                Property aProp = aProps->getPropertyByName( aPropName );
+                canRename = !( aProp.Attributes & PropertyAttribute::READONLY );
+            }
+            else
+            {
+                canRename = false;
+            }
+        }
+        catch ( Exception const & )
+        {
+            canRename = false;
+        }
+
+        if ( canRename )
+        {
+            Any aValue;
+            aValue <<= OUString( rNewText );
+            aContent.setPropertyValue( aPropName, aValue );
+            mpParent->EntryRenamed( aURL, rNewText );
 
-        pData->maURL = aURL;
-        pEntry->SetUserData( pData );
+            pData->maURL = aURL;
+            pEntry->SetUserData( pData );
 
-        bRet = TRUE;
+            bRet = TRUE;
+        }
+    }
+    catch( Exception const & )
+    {
     }
-    catch( ::com::sun::star::ucb::ContentCreationException ) {}
-    catch( ::com::sun::star::ucb::CommandAbortedException ) {}
-    catch( ::com::sun::star::uno::Exception ) {}
 
     return bRet;
 }
@@ -1095,12 +1214,12 @@ sal_Bool ViewTabListBox_Impl::Kill( const OUString& rContent )
         ::ucbhelper::Content aCnt( rContent, mxCmdEnv );
         aCnt.executeCommand( OUString::createFromAscii( "delete" ), makeAny( sal_Bool( sal_True ) ) );
     }
-    catch( ::com::sun::star::ucb::CommandAbortedException& )
+    catch( ::com::sun::star::ucb::CommandAbortedException const & )
     {
         DBG_WARNING( "CommandAbortedException" );
         bRet = sal_False;
     }
-    catch( ::com::sun::star::uno::Exception& )
+    catch( Exception const & )
     {
         DBG_WARNING( "Any other exception" );
         bRet = sal_False;
@@ -1314,7 +1433,7 @@ sal_Bool SvtFileView::GetParentURL( String& rParentURL ) const
             }
         }
     }
-    catch( ::com::sun::star::uno::Exception )
+    catch( Exception const & )
     {
         // perhaps an unkown url protocol (e.g. "private:newdoc")
     }
@@ -1366,7 +1485,7 @@ sal_Bool SvtFileView::Initialize( const ::com::sun::star::uno::Reference< ::com:
 
     mpImp->FilterFolderContent_Impl( rFilter );
 
-    mpImp->SortFolderContent_Impl();    // possibly not necessary!!!!!!!!!!
+    mpImp->SortFolderContent_Impl(); // possibly not necessary!!!!!!!!!!
     mpImp->CreateDisplayText_Impl();
     mpImp->OpenFolder_Impl();
 
@@ -1999,7 +2118,7 @@ void SvtFileView_Impl::FilterFolderContent_Impl( const OUString &rFilter )
         {
             // normalize the content title (we always match case-insensitive)
             // 91872 - 11.09.2001 - frank.schoenheit@sun.com
-            sCompareString = (*aContentLoop)->GetFileName();    // filter works on file name, not on title!
+            sCompareString = (*aContentLoop)->GetFileName(); // filter works on file name, not on title!
             sal_Bool bDelete;
 
             if( bHideTransFile && sCompareString == sHideEntry )
@@ -2643,12 +2762,12 @@ QueryDeleteDlg_Impl::QueryDeleteDlg_Impl
 
     ModalDialog( pParent, SvtResId( DLG_SVT_QUERYDELETE ) ),
 
-    _aEntryLabel    ( this, SvtResId( TXT_ENTRY ) ),
-    _aEntry     ( this, SvtResId( TXT_ENTRYNAME ) ),
-    _aQueryMsg  ( this, SvtResId( TXT_QUERYMSG ) ),
-    _aYesButton ( this, SvtResId( BTN_YES ) ),
-    _aAllButton ( this, SvtResId( BTN_ALL ) ),
-    _aNoButton  ( this, SvtResId( BTN_NO ) ),
+    _aEntryLabel  ( this, SvtResId( TXT_ENTRY ) ),
+    _aEntry       ( this, SvtResId( TXT_ENTRYNAME ) ),
+    _aQueryMsg    ( this, SvtResId( TXT_QUERYMSG ) ),
+    _aYesButton   ( this, SvtResId( BTN_YES ) ),
+    _aAllButton   ( this, SvtResId( BTN_ALL ) ),
+    _aNoButton    ( this, SvtResId( BTN_NO ) ),
     _aCancelButton( this, SvtResId( BTN_CANCEL ) )
 
 {
@@ -2671,12 +2790,6 @@ QueryDeleteDlg_Impl::QueryDeleteDlg_Impl
 // -----------------------------------------------------------------------
 
 IMPL_STATIC_LINK( QueryDeleteDlg_Impl, ClickLink, PushButton*, pBtn )
-
-/*  [Beschreibung]
-
-    Die Methode wertet das Resultat der Abfrage aus.
-*/
-
 {
     if ( pBtn == &pThis->_aYesButton )
         pThis->_eResult = QUERYDELETE_YES;
diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx
index c4896ba8b812..2ad81da40716 100644..100755
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -39,6 +39,8 @@
 #include <vcl/edit.hxx>
 #include "svtaccessiblefactory.hxx"
 
+#include <limits>
+
 // =======================================================================
 
 #define TABBAR_OFFSET_X         7
@@ -62,6 +64,10 @@ struct ImplTabBarItem
     BOOL            mbShort;
     BOOL            mbSelect;
     BOOL            mbEnable;
+    Color           maTabBgColor;
+    bool            IsDefaultTabBgColor() const { return maTabBgColor == Color(COL_AUTO) ? TRUE : FALSE; };
+    Color           maTabTextColor;
+    bool            IsDefaultTabTextColor() const { return maTabTextColor == Color(COL_AUTO) ? TRUE : FALSE; };
 
                     ImplTabBarItem( USHORT nItemId, const XubString& rText,
                                     TabBarPageBits nPageBits ) :
@@ -74,6 +80,8 @@ struct ImplTabBarItem
                         mbShort  = FALSE;
                         mbSelect = FALSE;
                         mbEnable = TRUE;
+                        maTabBgColor = Color( COL_AUTO );
+                        maTabTextColor = Color( COL_AUTO );
                     }
 };
 
@@ -348,6 +356,9 @@ struct TabBar_Impl
 
 // =======================================================================
 
+const sal_uInt16 TabBar::APPEND         = ::std::numeric_limits<sal_uInt16>::max();
+const sal_uInt16 TabBar::PAGE_NOT_FOUND = ::std::numeric_limits<sal_uInt16>::max();
+
 void TabBar::ImplInit( WinBits nWinStyle )
 {
     mpItemList      = new ImplTabBarList;
@@ -1046,7 +1057,8 @@ void TabBar::Paint( const Rectangle& )
     // Font selektieren
     Font aFont = GetFont();
     Font aLightFont = aFont;
-    aLightFont.SetWeight( WEIGHT_LIGHT );
+    //aLightFont.SetWeight( WEIGHT_LIGHT ); //TODO Make font weight light on custom color only?
+    aLightFont.SetWeight( WEIGHT_NORMAL );
 
     // #i36013# exclude push buttons from painting area
     Rectangle aClipRect( Point( mnOffX, 0 ), Point( mnLastOffX, GetOutputHeightPixel() - 1 ) );
@@ -1120,15 +1132,23 @@ void TabBar::Paint( const Rectangle& )
                     SetFont( aLightFont );
 
                 // Je nach Status die richtige FillInBrush setzen
+                // Set the correct FillInBrush depending upon status
                 if ( pItem->mbSelect || (pItem->mnId == mnCurPageId) )
                 {
+                    // Currently selected Tab
                     SetFillColor( aSelectColor );
                     SetTextColor( aSelectTextColor );
                 }
                 else
                 {
-                    SetFillColor( aFaceColor );
-                    SetTextColor( aFaceTextColor );
+                    if ( !pItem->IsDefaultTabBgColor() && !rStyleSettings.GetHighContrastMode() )
+                    {
+                        SetFillColor( pItem->maTabBgColor );
+                        SetTextColor( pItem->maTabTextColor );
+                    } else {
+                        SetFillColor( aFaceColor );
+                        SetTextColor( aFaceTextColor );
+                    }
                 }
 
                 // Muss Font Kursiv geschaltet werden
@@ -1160,21 +1180,38 @@ void TabBar::Paint( const Rectangle& )
                 long    nTextHeight = GetTextHeight();
                 Point   aTxtPos( aRect.Left()+(aRectSize.Width()-nTextWidth)/2,
                                  (aRectSize.Height()-nTextHeight)/2 );
-                if ( !pItem->mbEnable )
-                    DrawCtrlText( aTxtPos, aText, 0, STRING_LEN, (TEXT_DRAW_DISABLE | TEXT_DRAW_MNEMONIC) );
-                else
-                    DrawText( aTxtPos, aText );
-
+                if ( pItem->IsDefaultTabBgColor() || (!pItem->mbSelect) )
+                {
+                     if ( !pItem->mbEnable )
+                         DrawCtrlText( aTxtPos, aText, 0, STRING_LEN, (TEXT_DRAW_DISABLE | TEXT_DRAW_MNEMONIC) );
+                    else
+                         DrawText( aTxtPos, aText );
+                }
                 // Jetzt im Inhalt den 3D-Effekt ausgeben
                 aPos0.X()++;
                 aPos1.X()++;
                 aPos2.X()--;
                 aPos3.X()--;
-                SetLineColor( rStyleSettings.GetLightColor() );
+
+                // If this is the current tab, draw the left inner shadow the default color,
+                // otherwise make it the same as the custom background color
+                if ( pItem->mbSelect || (pItem->mnId == mnCurPageId) ) {
+                    SetLineColor( rStyleSettings.GetLightColor() );
+                } else {
+                    if ( !pItem->IsDefaultTabBgColor() && ! rStyleSettings.GetHighContrastMode() )
+                    {
+                        SetLineColor( pItem->maTabBgColor );
+                    } else {
+                        SetLineColor( rStyleSettings.GetLightColor() );
+                    }
+                }
+                // Draw the left side of the tab
                 DrawLine( aPos0, aPos1 );
 
                 if ( !pItem->mbSelect && (pItem->mnId != mnCurPageId) )
                 {
+                    // Draw the top inner shadow
+                    // ToDo: Change from this static color to tab custom bg color
                     DrawLine( Point( aPos0.X(), aPos0.Y()+1 ),
                                 Point( aPos3.X(), aPos3.Y()+1 ) );
                 }
@@ -1184,8 +1221,27 @@ void TabBar::Paint( const Rectangle& )
                 aPos1.X()--;
                 aPos1.Y()--;
                 aPos2.Y()--;
+                if ( !pItem->IsDefaultTabBgColor() && ( pItem->mbSelect || (pItem->mnId == mnCurPageId) ) )
+                {
+                    SetLineColor( pItem->maTabBgColor );
+                    DrawLine( Point(aPos1.X()-1, aPos1.Y()-1), Point(aPos2.X(), aPos2.Y()-1) );
+                }
                 DrawLine( aPos1, aPos2 );
 
+                // draw a small 2px sliver of the original background color at the bottom of the selected tab
+
+                if ( !pItem->IsDefaultTabBgColor() )
+                {
+                    if ( pItem->mbSelect || (pItem->mnId == mnCurPageId) || rStyleSettings.GetHighContrastMode() ) {
+                        SetLineColor( pItem->maTabBgColor );
+                        DrawLine( Point(aPos1.X()-1, aPos1.Y()-1), Point(aPos2.X(), aPos2.Y()-1) );
+                        if ( !pItem->mbEnable )
+                            DrawCtrlText( aTxtPos, aText, 0, STRING_LEN, (TEXT_DRAW_DISABLE | TEXT_DRAW_MNEMONIC) );
+                        else
+                            DrawText( aTxtPos, aText );
+                    }
+                }
+
                 // Da etwas uebermalt werden konnte, muessen wir die Polygon-
                 // umrandung nocheinmal ausgeben
                 SetLineColor( rStyleSettings.GetDarkShadowColor() );
@@ -1540,7 +1596,7 @@ void TabBar::InsertPage( USHORT nPageId, const XubString& rText,
                          TabBarPageBits nBits, USHORT nPos )
 {
     DBG_ASSERT( nPageId, "TabBar::InsertPage(): PageId == 0" );
-    DBG_ASSERT( GetPagePos( nPageId ) == TABBAR_PAGE_NOTFOUND,
+    DBG_ASSERT( GetPagePos( nPageId ) == PAGE_NOT_FOUND,
                 "TabBar::InsertPage(): PageId already exists" );
     DBG_ASSERT( nBits <= TPB_SPECIAL, "TabBar::InsertPage(): nBits is wrong" );
 
@@ -1562,12 +1618,47 @@ void TabBar::InsertPage( USHORT nPageId, const XubString& rText,
 
 // -----------------------------------------------------------------------
 
+Color TabBar::GetTabBgColor( USHORT nPageId ) const
+{
+    USHORT nPos = GetPagePos( nPageId );
+
+    if ( nPos != PAGE_NOT_FOUND )
+        return mpItemList->GetObject( nPos )->maTabBgColor;
+    else
+        return Color( COL_AUTO );
+}
+
+void TabBar::SetTabBgColor( USHORT nPageId, const Color& aTabBgColor )
+{
+    USHORT nPos = GetPagePos( nPageId );
+    ImplTabBarItem* pItem;
+    if ( nPos != PAGE_NOT_FOUND )
+    {
+        pItem = mpItemList->GetObject( nPos );
+        if ( aTabBgColor != Color( COL_AUTO )  )
+        {
+            pItem->maTabBgColor = aTabBgColor;
+            if ( aTabBgColor.GetLuminance() <= 128 ) //Do not use aTabBgColor.IsDark(), because that threshold is way too low...
+                pItem->maTabTextColor = Color( COL_WHITE );
+            else
+                pItem->maTabTextColor = Color( COL_BLACK );
+        }
+        else
+        {
+            pItem->maTabBgColor = Color( COL_AUTO );
+            pItem->maTabTextColor = Color( COL_AUTO );
+        }
+    }
+}
+
+// -----------------------------------------------------------------------
+
 void TabBar::RemovePage( USHORT nPageId )
 {
     USHORT nPos = GetPagePos( nPageId );
 
     // Existiert Item
-    if ( nPos != TABBAR_PAGE_NOTFOUND )
+    if ( nPos != PAGE_NOT_FOUND )
     {
         if ( mnCurPageId == nPageId )
             mnCurPageId = 0;
@@ -1602,7 +1693,7 @@ void TabBar::MovePage( USHORT nPageId, USHORT nNewPos )
         return;
 
     // Existiert Item
-    if ( nPos != TABBAR_PAGE_NOTFOUND )
+    if ( nPos != PAGE_NOT_FOUND )
     {
         // TabBar-Item in der Liste verschieben
         ImplTabBarItem* pItem = mpItemList->Remove( nPos );
@@ -1640,7 +1731,7 @@ void TabBar::Clear()
     if ( IsReallyVisible() && IsUpdateMode() )
         Invalidate();
 
-    CallEventListeners( VCLEVENT_TABBAR_PAGEREMOVED, (void*) TABBAR_PAGE_NOTFOUND );
+    CallEventListeners( VCLEVENT_TABBAR_PAGEREMOVED, (void*) PAGE_NOT_FOUND );
 }
 
 // -----------------------------------------------------------------------
@@ -1649,7 +1740,7 @@ void TabBar::EnablePage( USHORT nPageId, BOOL bEnable )
 {
     USHORT nPos = GetPagePos( nPageId );
 
-    if ( nPos != TABBAR_PAGE_NOTFOUND )
+    if ( nPos != PAGE_NOT_FOUND )
     {
         ImplTabBarItem* pItem = mpItemList->GetObject( nPos );
 
@@ -1672,7 +1763,7 @@ BOOL TabBar::IsPageEnabled( USHORT nPageId ) const
 {
     USHORT nPos = GetPagePos( nPageId );
 
-    if ( nPos != TABBAR_PAGE_NOTFOUND )
+    if ( nPos != PAGE_NOT_FOUND )
         return mpItemList->GetObject( nPos )->mbEnable;
     else
         return FALSE;
@@ -1684,7 +1775,7 @@ void TabBar::SetPageBits( USHORT nPageId, TabBarPageBits nBits )
 {
     USHORT nPos = GetPagePos( nPageId );
 
-    if ( nPos != TABBAR_PAGE_NOTFOUND )
+    if ( nPos != PAGE_NOT_FOUND )
     {
         ImplTabBarItem* pItem = mpItemList->GetObject( nPos );
 
@@ -1705,7 +1796,7 @@ TabBarPageBits TabBar::GetPageBits( USHORT nPageId ) const
 {
     USHORT nPos = GetPagePos( nPageId );
 
-    if ( nPos != TABBAR_PAGE_NOTFOUND )
+    if ( nPos != PAGE_NOT_FOUND )
         return mpItemList->GetObject( nPos )->mnBits;
     else
         return FALSE;
@@ -1742,7 +1833,7 @@ USHORT TabBar::GetPagePos( USHORT nPageId ) const
         pItem = mpItemList->Next();
     }
 
-    return TABBAR_PAGE_NOTFOUND;
+    return PAGE_NOT_FOUND;
 }
 
 // -----------------------------------------------------------------------
@@ -1767,7 +1858,7 @@ Rectangle TabBar::GetPageRect( USHORT nPageId ) const
 {
     USHORT nPos = GetPagePos( nPageId );
 
-    if ( nPos != TABBAR_PAGE_NOTFOUND )
+    if ( nPos != PAGE_NOT_FOUND )
         return mpItemList->GetObject( nPos )->maRect;
     else
         return Rectangle();
@@ -1780,7 +1871,7 @@ void TabBar::SetCurPageId( USHORT nPageId )
     USHORT nPos = GetPagePos( nPageId );
 
     // Wenn Item nicht existiert, dann nichts machen
-    if ( nPos != TABBAR_PAGE_NOTFOUND )
+    if ( nPos != PAGE_NOT_FOUND )
     {
         // Wenn sich aktuelle Page nicht geaendert hat, dann muessen wir
         // jetzt nichts mehr machen
@@ -1872,7 +1963,7 @@ void TabBar::MakeVisible( USHORT nPageId )
     USHORT nPos = GetPagePos( nPageId );
 
     // Wenn Item nicht existiert, dann nichts machen
-    if ( nPos != TABBAR_PAGE_NOTFOUND )
+    if ( nPos != PAGE_NOT_FOUND )
     {
         if ( nPos < mnFirstPos )
             SetFirstPageId( nPageId );
@@ -1921,7 +2012,7 @@ void TabBar::SetFirstPageId( USHORT nPageId )
     USHORT nPos = GetPagePos( nPageId );
 
     // Wenn Item nicht existiert, dann FALSE zurueckgeben
-    if ( nPos != TABBAR_PAGE_NOTFOUND )
+    if ( nPos != PAGE_NOT_FOUND )
     {
         if ( nPos != mnFirstPos )
         {
@@ -1955,7 +2046,7 @@ void TabBar::SelectPage( USHORT nPageId, BOOL bSelect )
 {
     USHORT nPos = GetPagePos( nPageId );
 
-    if ( nPos != TABBAR_PAGE_NOTFOUND )
+    if ( nPos != PAGE_NOT_FOUND )
     {
         ImplTabBarItem* pItem = mpItemList->GetObject( nPos );
 
@@ -2036,7 +2127,7 @@ USHORT TabBar::GetSelectPageCount() const
 BOOL TabBar::IsPageSelected( USHORT nPageId ) const
 {
     USHORT nPos = GetPagePos( nPageId );
-    if ( nPos != TABBAR_PAGE_NOTFOUND )
+    if ( nPos != PAGE_NOT_FOUND )
         return mpItemList->GetObject( nPos )->mbSelect;
     else
         return FALSE;
@@ -2047,7 +2138,7 @@ BOOL TabBar::IsPageSelected( USHORT nPageId ) const
 BOOL TabBar::StartEditMode( USHORT nPageId )
 {
     USHORT nPos = GetPagePos( nPageId );
-    if ( mpEdit || (nPos == TABBAR_PAGE_NOTFOUND) || (mnLastOffX < 8) )
+    if ( mpEdit || (nPos == PAGE_NOT_FOUND) || (mnLastOffX < 8) )
         return FALSE;
 
     mnEditId = nPageId;
@@ -2268,7 +2359,7 @@ void TabBar::SetSelectTextColor( const Color& rColor )
 void TabBar::SetPageText( USHORT nPageId, const XubString& rText )
 {
     USHORT nPos = GetPagePos( nPageId );
-    if ( nPos != TABBAR_PAGE_NOTFOUND )
+    if ( nPos != PAGE_NOT_FOUND )
     {
         mpItemList->GetObject( nPos )->maText = rText;
         mbSizeFormat = TRUE;
@@ -2286,7 +2377,7 @@ void TabBar::SetPageText( USHORT nPageId, const XubString& rText )
 XubString TabBar::GetPageText( USHORT nPageId ) const
 {
     USHORT nPos = GetPagePos( nPageId );
-    if ( nPos != TABBAR_PAGE_NOTFOUND )
+    if ( nPos != PAGE_NOT_FOUND )
         return mpItemList->GetObject( nPos )->maText;
     else
         return XubString();
@@ -2297,7 +2388,7 @@ XubString TabBar::GetPageText( USHORT nPageId ) const
 void TabBar::SetHelpText( USHORT nPageId, const XubString& rText )
 {
     USHORT nPos = GetPagePos( nPageId );
-    if ( nPos != TABBAR_PAGE_NOTFOUND )
+    if ( nPos != PAGE_NOT_FOUND )
         mpItemList->GetObject( nPos )->maHelpText = rText;
 }
 
@@ -2306,7 +2397,7 @@ void TabBar::SetHelpText( USHORT nPageId, const XubString& rText )
 XubString TabBar::GetHelpText( USHORT nPageId ) const
 {
     USHORT nPos = GetPagePos( nPageId );
-    if ( nPos != TABBAR_PAGE_NOTFOUND )
+    if ( nPos != PAGE_NOT_FOUND )
     {
         ImplTabBarItem* pItem = mpItemList->GetObject( nPos );
         if ( !pItem->maHelpText.Len() && pItem->mnHelpId )
@@ -2327,7 +2418,7 @@ XubString TabBar::GetHelpText( USHORT nPageId ) const
 void TabBar::SetHelpId( USHORT nPageId, ULONG nHelpId )
 {
     USHORT nPos = GetPagePos( nPageId );
-    if ( nPos != TABBAR_PAGE_NOTFOUND )
+    if ( nPos != PAGE_NOT_FOUND )
         mpItemList->GetObject( nPos )->mnHelpId = nHelpId;
 }
 
@@ -2336,7 +2427,7 @@ void TabBar::SetHelpId( USHORT nPageId, ULONG nHelpId )
 ULONG TabBar::GetHelpId( USHORT nPageId ) const
 {
     USHORT nPos = GetPagePos( nPageId );
-    if ( nPos != TABBAR_PAGE_NOTFOUND )
+    if ( nPos != PAGE_NOT_FOUND )
         return mpItemList->GetObject( nPos )->mnHelpId;
     else
         return 0;
@@ -2483,9 +2574,12 @@ USHORT TabBar::ShowDropPos( const Point& rPos )
             nX--;
         else
             nX++;
+        if ( !pItem->IsDefaultTabBgColor() && !pItem->mbSelect)
+            SetLineColor( pItem->maTabTextColor );
         DrawLine( Point( nX, nY ), Point( nX, nY ) );
         DrawLine( Point( nX+1, nY-1 ), Point( nX+1, nY+1 ) );
         DrawLine( Point( nX+2, nY-2 ), Point( nX+2, nY+2 ) );
+        SetLineColor( aBlackColor );
     }
     if ( (mnDropPos > 0) && (mnDropPos < nItemCount+1) )
     {
@@ -2493,6 +2587,8 @@ USHORT TabBar::ShowDropPos( const Point& rPos )
         nX = pItem->maRect.Right()-TABBAR_OFFSET_X;
         if ( mnDropPos == nCurPos )
             nX++;
+        if ( !pItem->IsDefaultTabBgColor() && !pItem->mbSelect)
+            SetLineColor( pItem->maTabTextColor );
         DrawLine( Point( nX, nY ), Point( nX, nY ) );
         DrawLine( Point( nX-1, nY-1 ), Point( nX-1, nY+1 ) );
         DrawLine( Point( nX-2, nY-2 ), Point( nX-2, nY+2 ) );
diff --git a/svtools/source/control/toolbarmenu.cxx b/svtools/source/control/toolbarmenu.cxx
index f07ebd7fe8cd..fa393da3d5a8 100644
--- a/svtools/source/control/toolbarmenu.cxx
+++ b/svtools/source/control/toolbarmenu.cxx
@@ -481,6 +481,9 @@ void ToolbarMenu::implInit(const Reference< XFrame >& rFrame)
 {
     mpImpl = new ToolbarMenu_Impl( *this, rFrame );
 
+    const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
+    SetControlBackground( rStyleSettings.GetMenuColor() );
+
     initWindow();
 
     Window* pWindow = GetTopMostParentSystemWindow( this );
@@ -638,8 +641,6 @@ void ToolbarMenu::initWindow()
 {
     const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
 
-    SetControlBackground( GetSettings().GetStyleSettings().GetFaceGradientColor() );
-
     SetPointFont( rStyleSettings.GetMenuFont() );
     SetBackground( Wallpaper( GetControlBackground() ) );
     SetTextColor( rStyleSettings.GetMenuTextColor() );
diff --git a/svtools/source/dialogs/logindlg.cxx b/svtools/source/dialogs/logindlg.cxx
deleted file mode 100644
index 036d5d71a4cf..000000000000
--- a/svtools/source/dialogs/logindlg.cxx
+++ /dev/null
@@ -1,312 +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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
-#include <filedlg.hxx>
-#include <vcl/msgbox.hxx>
-#include <svtools/logindlg.hxx>
-
-#ifndef _SVTOOLS_LOGINDLG_HRC_
-#include "logindlg.hrc"
-#endif
-#ifndef _SVTOOLS_HRC
-#include <svtools/svtools.hrc>
-#endif
-#include <svtools/svtdata.hxx>
-
-#ifdef UNX
-#include <limits.h>
-#define _MAX_PATH PATH_MAX
-#endif
-
-// LoginDialog -------------------------------------------------------
-
-//............................................................................
-namespace svt
-{
-//............................................................................
-
-void LoginDialog::HideControls_Impl( USHORT nFlags )
-{
-    FASTBOOL bPathHide = FALSE;
-    FASTBOOL bErrorHide = FALSE;
-    FASTBOOL bAccountHide = FALSE;
-
-    if ( ( nFlags & LF_NO_PATH ) == LF_NO_PATH )
-    {
-        aPathFT.Hide();
-        aPathED.Hide();
-        aPathBtn.Hide();
-        bPathHide = TRUE;
-    }
-    else if ( ( nFlags & LF_PATH_READONLY ) == LF_PATH_READONLY )
-    {
-        aPathED.Hide();
-        aPathInfo.Show();
-        aPathBtn.Hide();
-    }
-
-    if ( ( nFlags & LF_NO_USERNAME ) == LF_NO_USERNAME )
-    {
-        aNameFT.Hide();
-        aNameED.Hide();
-    }
-    else if ( ( nFlags & LF_USERNAME_READONLY ) == LF_USERNAME_READONLY )
-    {
-        aNameED.Hide();
-        aNameInfo.Show();
-    }
-
-    if ( ( nFlags & LF_NO_PASSWORD ) == LF_NO_PASSWORD )
-    {
-        aPasswordFT.Hide();
-        aPasswordED.Hide();
-    }
-
-    if ( ( nFlags & LF_NO_SAVEPASSWORD ) == LF_NO_SAVEPASSWORD )
-        aSavePasswdBtn.Hide();
-
-    if ( ( nFlags & LF_NO_ERRORTEXT ) == LF_NO_ERRORTEXT )
-    {
-        aErrorInfo.Hide();
-        aErrorGB.Hide();
-        bErrorHide = TRUE;
-    }
-
-    if ( ( nFlags & LF_NO_ACCOUNT ) == LF_NO_ACCOUNT )
-    {
-        aAccountFT.Hide();
-        aAccountED.Hide();
-        bAccountHide = TRUE;
-    }
-
-    if ( bErrorHide )
-    {
-        long nOffset = aLoginGB.GetPosPixel().Y() -
-                       aErrorGB.GetPosPixel().Y();
-        Point aNewPnt = aRequestInfo.GetPosPixel();
-        aNewPnt.Y() -= nOffset;
-        aRequestInfo.SetPosPixel( aNewPnt );
-        aNewPnt = aPathFT.GetPosPixel();
-        aNewPnt.Y() -= nOffset;
-        aPathFT.SetPosPixel( aNewPnt );
-        aNewPnt = aPathED.GetPosPixel();
-        aNewPnt.Y() -= nOffset;
-        aPathED.SetPosPixel( aNewPnt );
-        aNewPnt = aPathInfo.GetPosPixel();
-        aNewPnt.Y() -= nOffset;
-        aPathInfo.SetPosPixel( aNewPnt );
-        aNewPnt = aPathBtn.GetPosPixel();
-        aNewPnt.Y() -= nOffset;
-        aPathBtn.SetPosPixel( aNewPnt );
-        aNewPnt = aNameFT.GetPosPixel();
-        aNewPnt.Y() -= nOffset;
-        aNameFT.SetPosPixel( aNewPnt );
-        aNewPnt = aNameED.GetPosPixel();
-        aNewPnt.Y() -= nOffset;
-        aNameED.SetPosPixel( aNewPnt );
-        aNewPnt = aNameInfo.GetPosPixel();
-        aNewPnt.Y() -= nOffset;
-        aNameInfo.SetPosPixel( aNewPnt );
-        aNewPnt = aPasswordFT.GetPosPixel();
-        aNewPnt.Y() -= nOffset;
-        aPasswordFT.SetPosPixel( aNewPnt );
-        aNewPnt = aPasswordED.GetPosPixel();
-        aNewPnt.Y() -= nOffset;
-        aPasswordED.SetPosPixel( aNewPnt );
-        aNewPnt = aAccountFT.GetPosPixel();
-        aNewPnt.Y() -= nOffset;
-        aAccountFT.SetPosPixel( aNewPnt );
-        aNewPnt = aAccountED.GetPosPixel();
-        aNewPnt.Y() -= nOffset;
-        aAccountED.SetPosPixel( aNewPnt );
-        aNewPnt = aSavePasswdBtn.GetPosPixel();
-        aNewPnt.Y() -= nOffset;
-        aSavePasswdBtn.SetPosPixel( aNewPnt );
-        aNewPnt = aLoginGB.GetPosPixel();
-        aNewPnt.Y() -= nOffset;
-        aLoginGB.SetPosPixel( aNewPnt );
-        Size aNewSiz = GetSizePixel();
-        aNewSiz.Height() -= nOffset;
-        SetSizePixel( aNewSiz );
-    }
-
-    if ( bPathHide )
-    {
-        long nOffset = aNameED.GetPosPixel().Y() -
-                       aPathED.GetPosPixel().Y();
-
-        Point aTmpPnt1 = aNameFT.GetPosPixel();
-        Point aTmpPnt2 = aPasswordFT.GetPosPixel();
-        aNameFT.SetPosPixel( aPathFT.GetPosPixel() );
-        aPasswordFT.SetPosPixel( aTmpPnt1 );
-        aAccountFT.SetPosPixel( aTmpPnt2 );
-        aTmpPnt1 = aNameED.GetPosPixel();
-        aTmpPnt2 = aPasswordED.GetPosPixel();
-        aNameED.SetPosPixel( aPathED.GetPosPixel() );
-        aPasswordED.SetPosPixel( aTmpPnt1 );
-        aAccountED.SetPosPixel( aTmpPnt2 );
-        aNameInfo.SetPosPixel( aPathInfo.GetPosPixel() );
-        aTmpPnt1 = aSavePasswdBtn.GetPosPixel();
-        aTmpPnt1.Y() -= nOffset;
-        aSavePasswdBtn.SetPosPixel( aTmpPnt1 );
-        Size aNewSz = GetSizePixel();
-        aNewSz.Height() -= nOffset;
-        SetSizePixel( aNewSz );
-    }
-
-    if ( bAccountHide )
-    {
-        long nOffset = aAccountED.GetPosPixel().Y() - aPasswordED.GetPosPixel().Y();
-
-        Point aTmpPnt = aSavePasswdBtn.GetPosPixel();
-        aTmpPnt.Y() -= nOffset;
-        aSavePasswdBtn.SetPosPixel( aTmpPnt );
-        Size aNewSz = GetSizePixel();
-        aNewSz.Height() -= nOffset;
-        SetSizePixel( aNewSz );
-    }
-};
-
-// -----------------------------------------------------------------------
-
-IMPL_LINK( LoginDialog, OKHdl_Impl, OKButton *, EMPTYARG )
-{
-    // trim the strings
-    aNameED.SetText( aNameED.GetText().EraseLeadingChars().
-        EraseTrailingChars() );
-    aPasswordED.SetText( aPasswordED.GetText().EraseLeadingChars().
-        EraseTrailingChars() );
-    EndDialog( RET_OK );
-    return 1;
-}
-
-// -----------------------------------------------------------------------
-
-IMPL_LINK( LoginDialog, PathHdl_Impl, PushButton *, EMPTYARG )
-{
-    PathDialog* pDlg = new PathDialog( this, WB_3DLOOK );
-//  DirEntry aEntry;
-//  aEntry.ToAbs();
-//  pDlg->SetPath( aEntry.GetFull() );
-
-    if ( pDlg->Execute() == RET_OK )
-        aPathED.SetText( pDlg->GetPath() );
-
-    delete pDlg;
-    return 1;
-}
-
-// -----------------------------------------------------------------------
-
-LoginDialog::LoginDialog
-(
-    Window* pParent,
-    USHORT nFlags,
-    const String& rServer,
-    const String* pRealm
-) :
-
-    ModalDialog( pParent, SvtResId( DLG_LOGIN ) ),
-
-    aErrorInfo      ( this, SvtResId( INFO_LOGIN_ERROR ) ),
-    aErrorGB        ( this, SvtResId( GB_LOGIN_ERROR ) ),
-    aRequestInfo    ( this, SvtResId( INFO_LOGIN_REQUEST ) ),
-    aPathFT         ( this, SvtResId( FT_LOGIN_PATH ) ),
-    aPathED         ( this, SvtResId( ED_LOGIN_PATH ) ),
-    aPathInfo       ( this, SvtResId( INFO_LOGIN_PATH ) ),
-    aPathBtn        ( this, SvtResId( BTN_LOGIN_PATH ) ),
-    aNameFT         ( this, SvtResId( FT_LOGIN_USERNAME ) ),
-    aNameED         ( this, SvtResId( ED_LOGIN_USERNAME ) ),
-    aNameInfo       ( this, SvtResId( INFO_LOGIN_USERNAME ) ),
-    aPasswordFT     ( this, SvtResId( FT_LOGIN_PASSWORD ) ),
-    aPasswordED     ( this, SvtResId( ED_LOGIN_PASSWORD ) ),
-    aAccountFT      ( this, SvtResId( FT_LOGIN_ACCOUNT ) ),
-    aAccountED      ( this, SvtResId( ED_LOGIN_ACCOUNT ) ),
-    aSavePasswdBtn  ( this, SvtResId( CB_LOGIN_SAVEPASSWORD ) ),
-    aLoginGB        ( this, SvtResId( GB_LOGIN_LOGIN ) ),
-    aOKBtn          ( this, SvtResId( BTN_LOGIN_OK ) ),
-    aCancelBtn      ( this, SvtResId( BTN_LOGIN_CANCEL ) ),
-    aHelpBtn        ( this, SvtResId( BTN_LOGIN_HELP ) )
-
-{
-    // Einlog-Ort eintragen
-    String aServer;
-
-    if ( ( ( nFlags & LF_NO_ACCOUNT ) == LF_NO_ACCOUNT ) && pRealm && pRealm->Len() )
-    {
-        aServer = *pRealm;
-        ( ( aServer += ' ' ) += String( SvtResId( STR_LOGIN_AT ) ) ) += ' ';
-    }
-    aServer += rServer;
-    String aTxt = aRequestInfo.GetText();
-    aTxt.SearchAndReplaceAscii( "%1", aServer );
-    aRequestInfo.SetText( aTxt );
-
-    FreeResource();
-
-    aPathED.SetMaxTextLen( _MAX_PATH );
-    aNameED.SetMaxTextLen( _MAX_PATH );
-
-    aOKBtn.SetClickHdl( LINK( this, LoginDialog, OKHdl_Impl ) );
-    aPathBtn.SetClickHdl( LINK( this, LoginDialog, PathHdl_Impl ) );
-
-    HideControls_Impl( nFlags );
-};
-
-// -----------------------------------------------------------------------
-
-void LoginDialog::SetName( const String& rNewName )
-{
-    aNameED.SetText( rNewName );
-    aNameInfo.SetText( rNewName );
-}
-
-// -----------------------------------------------------------------------
-
-void LoginDialog::ClearPassword()
-{
-    aPasswordED.SetText( String() );
-
-    if ( 0 == aNameED.GetText().Len() )
-        aNameED.GrabFocus();
-    else
-        aPasswordED.GrabFocus();
-};
-
-// -----------------------------------------------------------------------
-
-void LoginDialog::ClearAccount()
-{
-    aAccountED.SetText( String() );
-    aAccountED.GrabFocus();
-};
-
-//............................................................................
-}   // namespace svt
-//............................................................................
diff --git a/svtools/source/dialogs/logindlg.hrc b/svtools/source/dialogs/logindlg.hrc
deleted file mode 100644
index 7baf6010f531..000000000000
--- a/svtools/source/dialogs/logindlg.hrc
+++ /dev/null
@@ -1,57 +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 _SVTOOLS_LOGINDLG_HRC_
-#define _SVTOOLS_LOGINDLG_HRC_
-
-//============================================================================
-#define INFO_LOGIN_ERROR        10
-#define GB_LOGIN_ERROR          11
-
-#define INFO_LOGIN_REQUEST      20
-#define FT_LOGIN_PATH           21
-#define ED_LOGIN_PATH           22
-#define INFO_LOGIN_PATH         23
-#define BTN_LOGIN_PATH          24
-#define FT_LOGIN_USERNAME       25
-#define ED_LOGIN_USERNAME       26
-#define INFO_LOGIN_USERNAME     27
-#define FT_LOGIN_PASSWORD       28
-#define ED_LOGIN_PASSWORD       29
-#define FT_LOGIN_ACCOUNT        30
-#define ED_LOGIN_ACCOUNT        31
-#define CB_LOGIN_SAVEPASSWORD   32
-#define GB_LOGIN_LOGIN          33
-
-#define BTN_LOGIN_OK            50
-#define BTN_LOGIN_CANCEL        51
-#define BTN_LOGIN_HELP          52
-
-#define STR_LOGIN_AT            60
-
-#endif // _SVTOOLS_LOGINDLG_HRC_
diff --git a/svtools/source/dialogs/logindlg.src b/svtools/source/dialogs/logindlg.src
deleted file mode 100644
index f6e3565d8cd9..000000000000
--- a/svtools/source/dialogs/logindlg.src
+++ /dev/null
@@ -1,200 +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 _SVTOOLS_HRC
-#include <svtools/svtools.hrc>
-#endif
-
-#ifndef _SVTOOLS_LOGINDLG_HRC_
-#include "logindlg.hrc"
-#endif
-
-ModalDialog DLG_LOGIN
-{
-//  HelpId = HID_DLG_LOGIN ;
-    Border = TRUE ;
-    Moveable = TRUE ;
-    OutputSize = TRUE ;
-    SVLook = TRUE ;
-    Size = MAP_APPFONT ( 265 , 158 ) ;
-    FixedText INFO_LOGIN_ERROR
-    {
-        Pos = MAP_APPFONT ( 12 , 14 ) ;
-        Size = MAP_APPFONT ( 185 , 18 ) ;
-        WordBreak = TRUE ;
-    };
-    FixedLine GB_LOGIN_ERROR
-    {
-        Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 197 , 8 ) ;
-        Text [ en-US ] = "Message from server" ;
-    };
-    FixedText INFO_LOGIN_REQUEST
-    {
-        Pos = MAP_APPFONT ( 12 , 55 ) ;
-        Size = MAP_APPFONT ( 185 , 18 ) ;
-        WordBreak = TRUE ;
-        Text [ en-US ] = "Please enter user name and password for %1." ;
-    };
-    FixedText FT_LOGIN_PATH
-    {
-        Pos = MAP_APPFONT ( 12 , 77 ) ;
-        Size = MAP_APPFONT ( 57 , 10 ) ;
-        Text [ en-US ] = "~Path" ;
-    };
-    Edit ED_LOGIN_PATH
-    {
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 72 , 76 ) ;
-        Size = MAP_APPFONT ( 108 , 12 ) ;
-    };
-    FixedText INFO_LOGIN_PATH
-    {
-        Hide = TRUE ;
-        Pos = MAP_APPFONT ( 72 , 77 ) ;
-        Size = MAP_APPFONT ( 125 , 10 ) ;
-    };
-    PushButton BTN_LOGIN_PATH
-    {
-        Pos = MAP_APPFONT ( 183 , 75 ) ;
-        Size = MAP_APPFONT ( 14 , 14 ) ;
-        Text = "~..." ;
-    };
-    FixedText FT_LOGIN_USERNAME
-    {
-        Pos = MAP_APPFONT ( 12 , 92 ) ;
-        Size = MAP_APPFONT ( 57 , 10 ) ;
-        Text [ en-US ] = "~User name" ;
-    };
-    Edit ED_LOGIN_USERNAME
-    {
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 72 , 91 ) ;
-        Size = MAP_APPFONT ( 125 , 12 ) ;
-    };
-    FixedText INFO_LOGIN_USERNAME
-    {
-        Hide = TRUE ;
-        Pos = MAP_APPFONT ( 72 , 92 ) ;
-        Size = MAP_APPFONT ( 125 , 10 ) ;
-    };
-    FixedText FT_LOGIN_PASSWORD
-    {
-        Pos = MAP_APPFONT ( 12 , 107 ) ;
-        Size = MAP_APPFONT ( 57 , 10 ) ;
-        Text [ en-US ] = "Pass~word" ;
-    };
-    Edit ED_LOGIN_PASSWORD
-    {
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 72 , 106 ) ;
-        Size = MAP_APPFONT ( 125 , 12 ) ;
-        PassWord = TRUE ;
-    };
-    FixedText FT_LOGIN_ACCOUNT
-    {
-        Pos = MAP_APPFONT ( 12 , 122 ) ;
-        Size = MAP_APPFONT ( 57 , 10 ) ;
-        Text [ en-US ] = "A~ccount";
-    };
-    Edit ED_LOGIN_ACCOUNT
-    {
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 72 , 121 ) ;
-        Size = MAP_APPFONT ( 125 , 12 ) ;
-        PassWord = TRUE ;
-    };
-    CheckBox CB_LOGIN_SAVEPASSWORD
-    {
-        Pos = MAP_APPFONT ( 12 , 136 ) ;
-        Size = MAP_APPFONT ( 185 , 10 ) ;
-        Text [ en-US ] = "~Save password" ;
-    };
-    FixedLine GB_LOGIN_LOGIN
-    {
-        Pos = MAP_APPFONT ( 7 , 44 ) ;
-        Size = MAP_APPFONT ( 197 , 8 ) ;
-        Text [ en-US ] = "Log in" ;
-    };
-    OKButton BTN_LOGIN_OK
-    {
-        Pos = MAP_APPFONT ( 209 , 6 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        DefButton = TRUE ;
-    };
-    CancelButton BTN_LOGIN_CANCEL
-    {
-        Pos = MAP_APPFONT ( 209 , 23 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-    };
-    HelpButton BTN_LOGIN_HELP
-    {
-        Pos = MAP_APPFONT ( 209 , 43 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-    };
-    String STR_LOGIN_AT
-    {
-        Text [ en-US ] = "to " ;
-    };
-    Text [ en-US ] = "User Name and Password Required" ;
-};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/svtools/source/dialogs/makefile.mk b/svtools/source/dialogs/makefile.mk
index 16528ee7d4cd..99c4b59b76ae 100644..100755
--- a/svtools/source/dialogs/makefile.mk
+++ b/svtools/source/dialogs/makefile.mk
@@ -44,7 +44,6 @@ SRC1FILES=		filedlg2.src	\
                 prnsetup.src	\
                 printdlg.src	\
                 colrdlg.src		\
-                logindlg.src	\
                 addresstemplate.src	\
                 wizardmachine.src
 
@@ -69,8 +68,7 @@ SLOFILES=	\
                     $(SLO)$/colrdlg.obj 	\
                     $(SLO)$/property.obj	\
                     $(SLO)$/wizdlg.obj		\
-                    $(SLO)$/mcvmath.obj		\
-                    $(SLO)$/logindlg.obj
+                    $(SLO)$/mcvmath.obj
 
 # --- Targets ------------------------------------------------------
 
diff --git a/svtools/source/misc/errtxt.src b/svtools/source/misc/errtxt.src
index 6c1a90ae6412..f33896e20003 100644
--- a/svtools/source/misc/errtxt.src
+++ b/svtools/source/misc/errtxt.src
@@ -328,23 +328,23 @@ Resource RID_ERRHDL
     };
     String ERRCODE_INET_CONNECT
     {
-        Text [ en-US ] = "Could not establish Internet connection to $(ARG1)." ;
+        Text [ en-US ] = "Could not establish network connection to $(ARG1)." ;
     };
     String ERRCODE_INET_READ
     {
-        Text [ en-US ] = "Error reading data from the Internet.\nServer error message: $(ARG1)." ;
+        Text [ en-US ] = "Error reading data from the network.\nServer error message: $(ARG1)." ;
     };
     String ERRCODE_INET_WRITE
     {
-        Text [ en-US ] = "Error transferring data to the Internet.\nServer error message: $(ARG1)." ;
+        Text [ en-US ] = "Error transferring data to the network.\nServer error message: $(ARG1)." ;
     };
     String ERRCODE_INET_GENERAL
     {
-        Text [ en-US ] = "General Internet error has occurred." ;
+        Text [ en-US ] = "General network error has occurred." ;
     };
     String ERRCODE_INET_OFFLINE
     {
-        Text [ en-US ] = "The requested Internet data is not available in the cache and cannot be transmitted as the Online mode has not be activated." ;
+        Text [ en-US ] = "The requested network data is not available in the cache and cannot be transmitted as the Online mode has not be activated." ;
     };
     String ERRCODE_SFXMSG_STYLEREPLACE
     {
diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index 1cb20d27fc12..067eb601a5af 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@ -319,6 +319,10 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
         < "Sardinian, Logudorese" ; LANGUAGE_USER_SARDINIAN_LOGUDORESE ; > ;
         < "Sardinian, Sassarese" ; LANGUAGE_USER_SARDINIAN_SASSARESE ; > ;
         < "Bafia" ; LANGUAGE_USER_BAFIA ; > ;
+        < "Gikuyu" ; LANGUAGE_USER_GIKUYU ; > ;
+        < "Yoruba" ; LANGUAGE_YORUBA ; > ;
+        < "Rusyn (Ukraine)" ; LANGUAGE_USER_RUSYN_UKRAINE ; > ;
+        < "Rusyn (Slovakia)" ; LANGUAGE_USER_RUSYN_SLOVAKIA ; > ;
     };
 };
 
diff --git a/svtools/source/misc/makefile.mk b/svtools/source/misc/makefile.mk
index 65e43747a586..32781dbfefb1 100644..100755
--- a/svtools/source/misc/makefile.mk
+++ b/svtools/source/misc/makefile.mk
@@ -75,7 +75,8 @@ SLOFILES=\
     $(SLO)$/transfer.obj            \
     $(SLO)$/transfer2.obj           \
     $(SLO)$/unitconv.obj           \
-    $(SLO)$/wallitem.obj
+    $(SLO)$/wallitem.obj           \
+    $(SLO)$/xwindowitem.obj
 
 # --- Targets -------------------------------------------------------
 
diff --git a/svtools/source/misc/xwindowitem.cxx b/svtools/source/misc/xwindowitem.cxx
new file mode 100755
index 000000000000..a382d8293617
--- /dev/null
+++ b/svtools/source/misc/xwindowitem.cxx
@@ -0,0 +1,97 @@
+/*************************************************************************
+ *
+ * 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_svtools.hxx"
+
+#include "svtools/xwindowitem.hxx"
+
+#include <vcl/window.hxx>
+
+
+using namespace ::com::sun::star;
+
+//////////////////////////////////////////////////////////////////////
+
+TYPEINIT1_FACTORY( XWindowItem, SfxPoolItem, new XWindowItem );
+
+
+XWindowItem::XWindowItem() :
+    SfxPoolItem()
+{
+}
+
+
+XWindowItem::XWindowItem( USHORT nWhichId, Window * pWin ) :
+    SfxPoolItem( nWhichId )
+{
+    if (pWin)
+    {
+        m_xWin = uno::Reference< awt::XWindow >( pWin->GetComponentInterface(), uno::UNO_QUERY );
+        // the assertion can't possibly fails since VCLXWindow implements XWindow...
+        DBG_ASSERT( m_xWin.is(), "failed to get XWindow" );
+    }
+}
+
+
+XWindowItem::XWindowItem( USHORT nWhichId, uno::Reference< awt::XWindow > & rxWin ) :
+    SfxPoolItem( nWhichId ),
+    m_xWin( rxWin )
+{
+}
+
+
+XWindowItem::XWindowItem( const XWindowItem &rItem ) :
+    SfxPoolItem( Which() ),
+    m_xWin( rItem.m_xWin )
+{
+}
+
+
+XWindowItem::~XWindowItem()
+{
+}
+
+
+SfxPoolItem * XWindowItem::Clone( SfxItemPool* /*pPool*/ ) const
+{
+    return new XWindowItem( *this );
+}
+
+
+int XWindowItem::operator == ( const SfxPoolItem & rAttr ) const
+{
+    DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" );
+
+    const XWindowItem * pItem = dynamic_cast< const XWindowItem * >(&rAttr);
+    return pItem ? m_xWin == pItem->m_xWin : 0;
+}
+
+
+//////////////////////////////////////////////////////////////////////
+
+
diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx
index 67fc5f619fdf..ade58688dc55 100644
--- a/svtools/source/svhtml/parhtml.cxx
+++ b/svtools/source/svhtml/parhtml.cxx
@@ -2118,11 +2118,7 @@ enum eHtmlMetas {
 };
 
 // <META NAME=xxx>
-#ifdef __MINGW32__ // for runtime pseudo reloc
-static HTMLOptionEnum aHTMLMetaNameTable[] =
-#else
 static HTMLOptionEnum __READONLY_DATA aHTMLMetaNameTable[] =
-#endif
 {
     { OOO_STRING_SVTOOLS_HTML_META_author,        HTML_META_AUTHOR        },
     { OOO_STRING_SVTOOLS_HTML_META_changed,       HTML_META_CHANGED       },
diff --git a/svtools/source/table/gridtablerenderer.cxx b/svtools/source/table/gridtablerenderer.cxx
index a3f954e0bef5..8e5bd181a583 100644
--- a/svtools/source/table/gridtablerenderer.cxx
+++ b/svtools/source/table/gridtablerenderer.cxx
@@ -109,7 +109,10 @@ namespace svt { namespace table
         DBG_ASSERT( !!pColumn, "GridTableRenderer::PaintColumnHeader: invalid column model object!" );
         if ( !!pColumn )
             sHeaderText = pColumn->getName();
-        _rDevice.SetTextColor(m_pImpl->rModel.getTextColor());
+        if(m_pImpl->rModel.getTextColor() != 0x000000)
+            _rDevice.SetTextColor(m_pImpl->rModel.getTextColor());
+        else
+            _rDevice.SetTextColor(_rStyle.GetFieldTextColor());
         ULONG nHorFlag = TEXT_DRAW_LEFT;
         ULONG nVerFlag = TEXT_DRAW_TOP;
         if(m_pImpl->rModel.getVerticalAlign() == 1)
@@ -146,6 +149,11 @@ namespace svt { namespace table
         Color aRowBackground = m_pImpl->rModel.getOddRowBackgroundColor();
         Color line =  m_pImpl->rModel.getLineColor();
         Color aRowBackground2 = m_pImpl->rModel.getEvenRowBackgroundColor();
+        Color fieldColor = _rStyle.GetFieldColor();
+        if(aRowBackground == 0xFFFFFF)
+            aRowBackground = fieldColor;
+        if(aRowBackground2 == 0xFFFFFF)
+            aRowBackground2 = fieldColor;
         //if row is selected background color becomes blue, and lines should be also blue
         //if they aren't user defined
         if(_bSelected)
@@ -161,7 +169,7 @@ namespace svt { namespace table
         //and set line color to be the same
         else
         {
-            if(aRowBackground2 != 0xFFFFFF && _nRow%2)
+            if(aRowBackground2 != fieldColor && _nRow%2)
             {
                 aRowBackground = aRowBackground2;
                 if(line == 0xFFFFFF)
@@ -170,7 +178,7 @@ namespace svt { namespace table
                     _rDevice.SetLineColor(line);
             }
             //fill the rows with alternating background colors if second background color is specified
-            else if(aRowBackground != 0xFFFFFF && line == 0xFFFFFF)
+            else if(aRowBackground != fieldColor && line == 0xFFFFFF)
                 _rDevice.SetLineColor(aRowBackground);
             else
             {
@@ -195,7 +203,10 @@ namespace svt { namespace table
         _rDevice.Push( PUSH_LINECOLOR);
         _rDevice.SetLineColor(_rStyle.GetSeparatorColor());
         _rDevice.DrawLine( _rArea.BottomLeft(), _rArea.BottomRight() );
-        _rDevice.SetTextColor(m_pImpl->rModel.getTextColor());
+        if(m_pImpl->rModel.getTextColor() != 0x000000)
+            _rDevice.SetTextColor(m_pImpl->rModel.getTextColor());
+        else
+            _rDevice.SetTextColor(_rStyle.GetFieldTextColor());
         ULONG nHorFlag = TEXT_DRAW_LEFT;
         ULONG nVerFlag = TEXT_DRAW_TOP;
         if(m_pImpl->rModel.getVerticalAlign() == 1)
@@ -221,44 +232,42 @@ namespace svt { namespace table
     void GridTableRenderer::PaintCellImage( ColPos _nColumn, bool _bSelected, bool _bActive,
         OutputDevice& _rDevice, const Rectangle& _rArea, const StyleSettings& _rStyle, Image* _pCellData )
    {
-        _rDevice.Push( PUSH_LINECOLOR | PUSH_FILLCOLOR | PUSH_CLIPREGION);
-    _rDevice.IntersectClipRegion( _rArea );
-    Color background1 = m_pImpl->rModel.getOddRowBackgroundColor();
-    Color background2 = m_pImpl->rModel.getEvenRowBackgroundColor();
-    Color line = m_pImpl->rModel.getLineColor();
-    //if row is selected and line color isn't user specified, set it blue
-    if(_bSelected)
-    {
-        if(line == 0xFFFFFF)
-            _rDevice.SetLineColor(_rStyle.GetHighlightColor());
-        else
-            _rDevice.SetLineColor(line);
-    }
-    //else set line color to the color of row background
-    else
-    {
-        if(background2 != 0xFFFFFF && m_pImpl->nCurrentRow%2)
+        _rDevice.Push( PUSH_LINECOLOR | PUSH_FILLCOLOR);
+        Color background1 = m_pImpl->rModel.getOddRowBackgroundColor();
+        Color background2 = m_pImpl->rModel.getEvenRowBackgroundColor();
+        Color line = m_pImpl->rModel.getLineColor();
+        //if row is selected and line color isn't user specified, set it blue
+        if(_bSelected)
         {
             if(line == 0xFFFFFF)
-                _rDevice.SetLineColor(background2);
+                _rDevice.SetLineColor(_rStyle.GetHighlightColor());
             else
                 _rDevice.SetLineColor(line);
         }
-        else if(background1 != 0xFFFFFF && line == 0xFFFFFF)
-            _rDevice.SetLineColor(background1);
+        //else set line color to the color of row background
         else
         {
-            //if line color is set, then it was user defined and should be visible
-            //if it wasn't set, it'll be the same as the default background color, so lines still won't be visible
-            _rDevice.SetLineColor(line);
+            if(background2 != 0xFFFFFF && m_pImpl->nCurrentRow%2)
+            {
+                if(line == 0xFFFFFF)
+                    _rDevice.SetLineColor(background2);
+                else
+                    _rDevice.SetLineColor(line);
+            }
+            else if(background1 != 0xFFFFFF && line == 0xFFFFFF)
+                _rDevice.SetLineColor(background1);
+            else
+            {
+                //if line color is set, then it was user defined and should be visible
+                //if it wasn't set, it'll be the same as the default background color, so lines still won't be visible
+                _rDevice.SetLineColor(line);
+            }
         }
-    }
-    _rDevice.DrawLine( _rArea.BottomRight(), _rArea.TopRight() );
-    {
-            // TODO: remove those temporary place holders
-            Rectangle aRect( _rArea );
-            ++aRect.Left(); --aRect.Right();
-            aRect.Top(); aRect.Bottom();
+        _rDevice.DrawLine( _rArea.BottomRight(), _rArea.TopRight() );
+
+        Rectangle aRect( _rArea );
+        ++aRect.Left(); --aRect.Right();
+        aRect.Top(); aRect.Bottom();
         Point imagePos(Point(aRect.Left(), aRect.Top()));
         Size imageSize = _pCellData->GetSizePixel();
         if(aRect.GetWidth() > imageSize.Width())
@@ -281,8 +290,7 @@ namespace svt { namespace table
             imageSize.Height() = aRect.GetHeight()-1;
         Image& image (*_pCellData);
         _rDevice.DrawImage(imagePos, imageSize, image, 0);
-        }
-    _rDevice.Pop();
+        _rDevice.Pop();
 
         (void)_bActive;
         // no special painting for the active cell at the moment
@@ -293,48 +301,47 @@ namespace svt { namespace table
         OutputDevice& _rDevice, const Rectangle& _rArea, const StyleSettings& _rStyle, rtl::OUString& _rText )
    {
         _rDevice.Push( PUSH_LINECOLOR | PUSH_FILLCOLOR );
-    Color background1 = m_pImpl->rModel.getOddRowBackgroundColor();
-    Color background2 = m_pImpl->rModel.getEvenRowBackgroundColor();
-    Color line = m_pImpl->rModel.getLineColor();
-    //if row is selected and line color isn't user specified, set it blue
-    if(_bSelected)
-    {
-        if(line == 0xFFFFFF)
-            _rDevice.SetLineColor(_rStyle.GetHighlightColor());
-        else
-            _rDevice.SetLineColor(line);
-    }
-    //else set line color to the color of row background
-    else
-    {
-        if(background2 != 0xFFFFFF && m_pImpl->nCurrentRow%2)
+        Color background1 = m_pImpl->rModel.getOddRowBackgroundColor();
+        Color background2 = m_pImpl->rModel.getEvenRowBackgroundColor();
+        Color line = m_pImpl->rModel.getLineColor();
+        //if row is selected and line color isn't user specified, set it blue
+        if(_bSelected)
         {
             if(line == 0xFFFFFF)
-                _rDevice.SetLineColor(background2);
+                _rDevice.SetLineColor(_rStyle.GetHighlightColor());
             else
                 _rDevice.SetLineColor(line);
         }
-        else if(background1 != 0xFFFFFF && line == 0xFFFFFF)
-            _rDevice.SetLineColor(background1);
+        //else set line color to the color of row background
         else
         {
-            //if Line color is set, then it was user defined and should be visible
-            //if it wasn't set, it'll be the same as the default background color, so lines still won't be visible
-            _rDevice.SetLineColor(line);
+            if(background2 != 0xFFFFFF && m_pImpl->nCurrentRow%2)
+            {
+                if(line == 0xFFFFFF)
+                    _rDevice.SetLineColor(background2);
+                else
+                    _rDevice.SetLineColor(line);
+            }
+            else if(background1 != 0xFFFFFF && line == 0xFFFFFF)
+                _rDevice.SetLineColor(background1);
+            else
+            {
+                //if Line color is set, then it was user defined and should be visible
+                //if it wasn't set, it'll be the same as the default background color, so lines still won't be visible
+                _rDevice.SetLineColor(line);
+            }
         }
-    }
-    _rDevice.DrawLine( _rArea.BottomRight(), _rArea.TopRight() );
-        {
-           //  TODO: remove those temporary place holders
-            Rectangle aRect( _rArea );
-            ++aRect.Left(); --aRect.Right();
-            aRect.Top(); aRect.Bottom();
+        _rDevice.DrawLine( _rArea.BottomRight(), _rArea.TopRight() );
+
+        Rectangle aRect( _rArea );
+        ++aRect.Left(); --aRect.Right();
+        aRect.Top(); aRect.Bottom();
         if(_bSelected)
-        {
             _rDevice.SetTextColor(_rStyle.GetHighlightTextColor());
-        }
-        else
+        else if(m_pImpl->rModel.getTextColor() != 0x000000)
             _rDevice.SetTextColor(m_pImpl->rModel.getTextColor());
+        else
+            _rDevice.SetTextColor(_rStyle.GetFieldTextColor());
         ULONG nHorFlag = TEXT_DRAW_LEFT;
         ULONG nVerFlag = TEXT_DRAW_TOP;
         if(m_pImpl->rModel.getVerticalAlign() == 1)
@@ -348,8 +355,8 @@ namespace svt { namespace table
         Rectangle textRect(_rArea);
         textRect.Left()+=4; textRect.Right()-=4;
         textRect.Bottom()-=2;
-            _rDevice.DrawText( textRect, _rText, nHorFlag | nVerFlag | TEXT_DRAW_CLIP);
-        }
+        _rDevice.DrawText( textRect, _rText, nHorFlag | nVerFlag | TEXT_DRAW_CLIP);
+
         _rDevice.Pop();
         (void)_bActive;
         // no special painting for the active cell at the moment
diff --git a/svtools/source/table/tablecontrol.cxx b/svtools/source/table/tablecontrol.cxx
index 1770bfd7dd02..33c80e642118 100644
--- a/svtools/source/table/tablecontrol.cxx
+++ b/svtools/source/table/tablecontrol.cxx
@@ -70,6 +70,7 @@ namespace svt { namespace table
         :Control( _pParent, _nStyle )
         ,m_pImpl( new TableControl_Impl( *this ) )
         ,m_bSelectionChanged(false)
+        ,m_bTooltip(false)
     {
         TableDataWindow* aTableData = m_pImpl->getDataWindow();
         aTableData->SetMouseButtonDownHdl( LINK( this, TableControl, ImplMouseButtonDownHdl ) );
@@ -306,7 +307,7 @@ namespace svt { namespace table
                 aRetText = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ColumnHeaderBar" ) );
                 break;
             case TCTYPE_TABLECELL:
-                aRetText = GetRowName(_nRow);
+                aRetText = GetAccessibleCellText(_nRow, _nCol);
                 break;
             case TCTYPE_ROWHEADERCELL:
                 aRetText = GetRowName(_nRow);
@@ -389,9 +390,9 @@ namespace svt { namespace table
 }
 // -----------------------------------------------------------------------------
 
-::rtl::OUString TableControl::GetAccessibleCellText( sal_Int32 _nRowPos, sal_Int32 _nColPos)
+::rtl::OUString TableControl::GetAccessibleCellText( sal_Int32 _nRowPos, sal_Int32 _nColPos) const
 {
-    ::com::sun::star::uno::Any cellContent = GetCellContent(_nRowPos, _nColPos);
+    const ::com::sun::star::uno::Any cellContent = GetCellContent(_nRowPos, _nColPos);
     return m_pImpl->convertToString(cellContent);
 }
 // -----------------------------------------------------------------------------
@@ -589,6 +590,7 @@ void TableControl::setTooltip(const ::com::sun::star::uno::Sequence< ::rtl::OUSt
 {
     m_aText = aText;
     m_nCols = nCols;
+    m_bTooltip = true;
 }
 // -----------------------------------------------------------------------
 void TableControl::selectionChanged(bool _bChanged)
@@ -596,6 +598,11 @@ void TableControl::selectionChanged(bool _bChanged)
     m_bSelectionChanged = _bChanged;
 }
 // -----------------------------------------------------------------------
+bool TableControl::isTooltip()
+{
+    return m_bTooltip;
+}
+// -----------------------------------------------------------------------
 IMPL_LINK( TableControl, ImplSelectHdl, void*, EMPTYARG )
 {
     Select();
diff --git a/svtools/source/table/tablecontrol_impl.cxx b/svtools/source/table/tablecontrol_impl.cxx
index 3288ab6a4284..90bc4899209b 100644
--- a/svtools/source/table/tablecontrol_impl.cxx
+++ b/svtools/source/table/tablecontrol_impl.cxx
@@ -609,10 +609,10 @@ namespace svt { namespace table
                 if(pColumn->getMinWidth() == 0 && bResizable)
                 {
                     pColumn->setMinWidth(1);
-                    minColWithoutFixedSum+=m_rAntiImpl.LogicToPixel( Size( 1, 0 ), MAP_APPFONT ).Width();
+                    minColWithoutFixedSum+=m_rAntiImpl.PixelToLogic( Size( 1, 0 ), MAP_APPFONT ).Width();
                 }
                 if(pColumn->getMaxWidth() == 0 && bResizable)
-                    pColumn->setMaxWidth(m_rAntiImpl.LogicToPixel( Size( (int)gridWidth, 0 ), MAP_APPFONT ).Width());
+                    pColumn->setMaxWidth(m_rAntiImpl.PixelToLogic( Size( (int)gridWidth, 0 ), MAP_APPFONT ).Width());
                 if( colPrefWidth != 0)
                 {
                     if(m_bResizingGrid)
@@ -884,6 +884,16 @@ namespace svt { namespace table
         // position it
         if ( m_pHScroll )
         {
+            TableSize nVisibleUnits = lcl_getColumnsVisibleWithin( aDataCellPlayground, m_nLeftColumn, *this, false );
+            int nRange = m_nColumnCount;
+            if( m_nLeftColumn + nVisibleUnits == nRange-1)
+            {
+                if(m_aAccColumnWidthsPixel[nRange-2] - m_aAccColumnWidthsPixel[m_nLeftColumn] + m_aColumnWidthsPixel[nRange-1]>aDataCellPlayground.GetWidth())
+                {
+                    m_pHScroll->SetVisibleSize( nVisibleUnits -1 );
+                    m_pHScroll->SetPageSize(nVisibleUnits -1);
+                }
+            }
             Rectangle aScrollbarArea(
                 Point( 0, aDataCellPlayground.Bottom() + 1 ),
                 Size( aDataCellPlayground.Right() + 1, nScrollbarMetrics )
@@ -1000,7 +1010,6 @@ namespace svt { namespace table
                     *m_pDataWindow, aCell.getRect(), rStyle );
             }
         }
-
         // the area occupied by the row header, if any
         Rectangle aRowHeaderArea;
         if ( m_pModel->hasRowHeaders() )
@@ -1014,12 +1023,13 @@ namespace svt { namespace table
             //to avoid double lines when scrolling vertically
             if(m_nTopRow != 0)
                 --aRowHeaderArea.Top();
+            --aRowHeaderArea.Right();
             pRenderer->PaintHeaderArea(*m_pDataWindow, aRowHeaderArea, false, true, rStyle);
             // Note that strictly, aRowHeaderArea also contains the intersection between column
             // and row header area. However, below we go to paint this intersection, again,
             // so this hopefully doesn't hurt if we already paint it here.
 
-            if ( getModel()->hasColumnHeaders() )
+            if ( m_pModel->hasColumnHeaders() )
             {
                 TableCellGeometry aIntersection( *this, Rectangle( Point( 0, 0 ),
                     aAllCellsWithHeaders.BottomRight() ), COL_ROW_HEADERS, ROW_COL_HEADERS );
@@ -1030,6 +1040,7 @@ namespace svt { namespace table
                     --aInters.Top();
                     --aInters.Bottom();
                 }
+                --aInters.Right();
                 pRenderer->PaintHeaderArea(
                     *m_pDataWindow, aInters, true, true, rStyle
                 );
@@ -1068,6 +1079,11 @@ namespace svt { namespace table
                 --aRect.Top();
             if(m_nLeftColumn != 0)
                 --aRect.Left();
+            else
+            {
+                if(m_pModel->hasRowHeaders())
+                    --aRect.Left();
+            }
             // give the redenderer a chance to prepare the row
             pRenderer->PrepareRow( aRowIterator.getRow(), isActiveRow, isSelectedRow,
             *m_pDataWindow, aRect, rStyle );
@@ -1908,6 +1924,11 @@ namespace svt { namespace table
         return -1;
     }
     //-------------------------------------------------------------------------------
+    bool TableControl_Impl::isTooltipActive()
+    {
+        return m_rAntiImpl.isTooltip();
+    }
+    //-------------------------------------------------------------------------------
     ::rtl::OUString& TableControl_Impl::setTooltip(const Point& rPoint )
     {
         ::rtl::OUString aTooltipText;
@@ -2033,8 +2054,8 @@ namespace svt { namespace table
         {
             m_pDataWindow->HideTracking();
             PColumnModel pColumn = m_pModel->getColumnModel(m_nResizingColumn);
-            int maxWidth = pColumn->getMaxWidth();
-            int minWidth = pColumn->getMinWidth();
+            int maxWidth = m_rAntiImpl.LogicToPixel( Size( pColumn->getMaxWidth(), 0 ), MAP_APPFONT ).Width();
+            int minWidth = m_rAntiImpl.LogicToPixel( Size( pColumn->getMinWidth(), 0 ), MAP_APPFONT ).Width();
             int resizeCol = m_nResizingColumn-m_nLeftColumn;
             //new position of mouse
             int actX = rPoint.X();
@@ -2044,7 +2065,7 @@ namespace svt { namespace table
             int leftX = 0;
             if(m_nResizingColumn > m_nLeftColumn)
                 leftX = m_aVisibleColumnWidthsPixel[resizeCol-1];
-            else if(m_nResizingColumn == 0 && m_pModel->hasRowHeaders())
+            else if(m_nResizingColumn == m_nLeftColumn && m_pModel->hasRowHeaders())
                 leftX = m_rAntiImpl.LogicToPixel( Size( m_pModel->getRowHeaderWidth(), 0 ), MAP_APPFONT ).Width();
             int actWidth = actX - leftX;
             int newActWidth = 0;
@@ -2057,7 +2078,7 @@ namespace svt { namespace table
                     pColumn->setPreferredWidth(newActWidth);
                 }
                 else
-                    pColumn->setPreferredWidth(minWidth);
+                    pColumn->setPreferredWidth(pColumn->getMinWidth());
                 if(m_nLeftColumn != 0)
                     impl_updateLeftColumn();
         }
@@ -2069,7 +2090,7 @@ namespace svt { namespace table
                 pColumn->setPreferredWidth(newActWidth);
             }
             else
-                pColumn->setPreferredWidth(maxWidth);
+                pColumn->setPreferredWidth(pColumn->getMaxWidth());
         }
         m_nCurColumn = m_nResizingColumn;
         impl_ni_updateColumnWidths();
diff --git a/svtools/source/table/tablecontrol_impl.hxx b/svtools/source/table/tablecontrol_impl.hxx
index 12b518aa3578..053766d92841 100644
--- a/svtools/source/table/tablecontrol_impl.hxx
+++ b/svtools/source/table/tablecontrol_impl.hxx
@@ -210,6 +210,7 @@ namespace svt { namespace table
         virtual void    showCursor();
         virtual bool    dispatchAction( TableControlAction _eAction );
     virtual SelectionEngine* getSelEngine();
+    virtual bool isTooltipActive();
     virtual rtl::OUString& setTooltip(const Point& rPoint );
     virtual void resizeColumn(const Point& rPoint);
     virtual bool startResizeColumn(const Point& rPoint);
diff --git a/svtools/source/table/tabledatawindow.cxx b/svtools/source/table/tabledatawindow.cxx
index 3245b7e84aac..e2e1ce5353fe 100644
--- a/svtools/source/table/tabledatawindow.cxx
+++ b/svtools/source/table/tabledatawindow.cxx
@@ -58,14 +58,33 @@ namespace svt { namespace table
     {
         m_rTableControl.doPaintContent( rUpdateRect );
     }
-
+    //--------------------------------------------------------------------
+    void TableDataWindow::SetBackground( const Wallpaper& rColor )
+    {
+        Window::SetBackground( rColor );
+    }
+    //--------------------------------------------------------------------
+    void TableDataWindow::SetControlBackground( const Color& rColor )
+    {
+        Window::SetControlBackground( rColor );
+    }
+    //--------------------------------------------------------------------
+    void TableDataWindow::SetBackground()
+    {
+        Window::SetBackground();
+    }
+    //--------------------------------------------------------------------
+    void TableDataWindow::SetControlBackground()
+    {
+        Window::SetControlBackground();
+    }
     //--------------------------------------------------------------------
     void TableDataWindow::MouseMove( const MouseEvent& rMEvt )
     {
         Point aPoint = rMEvt.GetPosPixel();
         if ( !m_rTableControl.getInputHandler()->MouseMove( m_rTableControl, rMEvt ) )
         {
-            if(m_rTableControl.getCurrentRow(aPoint)>=0 )
+            if(m_rTableControl.getCurrentRow(aPoint)>=0 && m_rTableControl.isTooltipActive() )
             {
                 SetPointer(POINTER_ARROW);
                 rtl::OUString& rHelpText = m_rTableControl.setTooltip(aPoint);
@@ -102,12 +121,9 @@ namespace svt { namespace table
                     m_nRowAlreadySelected = nCurRow;
                     m_aSelectHdl.Call( NULL );
                 }
-                else
-                    m_aMouseButtonDownHdl.Call((MouseEvent*) &rMEvt);
             }
-            else
-                m_aMouseButtonDownHdl.Call((MouseEvent*) &rMEvt);
         }
+        m_aMouseButtonDownHdl.Call((MouseEvent*) &rMEvt);
         m_rTableControl.getAntiImpl().LoseFocus();
     }
     //--------------------------------------------------------------------
@@ -115,8 +131,7 @@ namespace svt { namespace table
     {
         if ( !m_rTableControl.getInputHandler()->MouseButtonUp( m_rTableControl, rMEvt ) )
             Window::MouseButtonUp( rMEvt );
-        else
-            m_aMouseButtonUpHdl.Call((MouseEvent*) &rMEvt);
+        m_aMouseButtonUpHdl.Call((MouseEvent*) &rMEvt);
         m_rTableControl.getAntiImpl().GetFocus();
     }
     //--------------------------------------------------------------------
diff --git a/svtools/source/uno/svtxgridcontrol.cxx b/svtools/source/uno/svtxgridcontrol.cxx
index 99b36c390f23..f5bc837f60b0 100755
--- a/svtools/source/uno/svtxgridcontrol.cxx
+++ b/svtools/source/uno/svtxgridcontrol.cxx
@@ -191,7 +191,7 @@ void SVTXGridControl::setProperty( const ::rtl::OUString& PropertyName, const An
         }
         case BASEPROPERTY_GRID_HEADER_BACKGROUND:
         {
-            sal_Int32 colorHeader = 0x000000;
+            sal_Int32 colorHeader = 0xFFFFFF;
             if( aValue >>= colorHeader )
             {
                 m_pTableModel->setHeaderBackgroundColor(colorHeader);
@@ -200,7 +200,7 @@ void SVTXGridControl::setProperty( const ::rtl::OUString& PropertyName, const An
         }
         case BASEPROPERTY_GRID_LINE_COLOR:
         {
-            sal_Int32 colorLine = 0x000000;
+            sal_Int32 colorLine = 0xFFFFFF;
             if( aValue >>= colorLine )
             {
                 m_pTableModel->setLineColor(colorLine);
@@ -209,7 +209,7 @@ void SVTXGridControl::setProperty( const ::rtl::OUString& PropertyName, const An
         }
         case BASEPROPERTY_GRID_EVEN_ROW_BACKGROUND:
         {
-            sal_Int32 colorEvenRow = 0x000000;
+            sal_Int32 colorEvenRow = 0xFFFFFF;
             if( aValue >>= colorEvenRow )
             {
                 m_pTableModel->setEvenRowBackgroundColor(colorEvenRow);
@@ -218,7 +218,7 @@ void SVTXGridControl::setProperty( const ::rtl::OUString& PropertyName, const An
         }
         case BASEPROPERTY_GRID_ROW_BACKGROUND:
         {
-            sal_Int32 colorBackground = 0x000000;
+            sal_Int32 colorBackground = 0xFFFFFF;
             if( aValue >>= colorBackground )
             {
                 m_pTableModel->setOddRowBackgroundColor(colorBackground);
@@ -227,7 +227,7 @@ void SVTXGridControl::setProperty( const ::rtl::OUString& PropertyName, const An
         }
         case BASEPROPERTY_TEXTCOLOR:
         {
-            sal_Int32 colorText = 0xFFFFFF;
+            sal_Int32 colorText = 0x000000;
             if( aValue >>= colorText )
             {
                 m_pTableModel->setTextColor(colorText);
@@ -673,10 +673,10 @@ void SAL_CALL SVTXGridControl::selectRows(const ::com::sun::star::uno::Sequence<
         if((start >= 0 && start < m_pTableModel->getRowCount()) && (end >= 0 && end < m_pTableModel->getRowCount()))
         {
             std::vector<RowPos>& selectedRows = pTable->GetSelectedRows();
-            if(!selectedRows.empty())
-                selectedRows.clear();
             if(eSelMode == SINGLE_SELECTION)
             {
+                if(!selectedRows.empty())
+                    selectedRows.clear();
                 if(rangeOfRows.getLength() == 1)
                     selectedRows.push_back(start);
                 else
@@ -685,7 +685,10 @@ void SAL_CALL SVTXGridControl::selectRows(const ::com::sun::star::uno::Sequence<
             else
             {
                 for(int i=0;i<seqSize;i++)
-                    selectedRows.push_back(rangeOfRows[i]);
+                {
+                    if(!isSelectedIndex(rangeOfRows[i]))
+                        selectedRows.push_back(rangeOfRows[i]);
+                }
             }
             pTable->selectionChanged(true);
             pTable->InvalidateDataWindow(start, end, false);
@@ -713,24 +716,23 @@ void SAL_CALL SVTXGridControl::selectAllRows() throw (::com::sun::star::uno::Run
         SetSynthesizingVCLEvent( sal_False );
     }
 }
+
 void SAL_CALL SVTXGridControl::deselectRows(const ::com::sun::star::uno::Sequence< ::sal_Int32 >& rangeOfRows) throw (::com::sun::star::uno::RuntimeException)
 {
     TableControl* pTable = (TableControl*)GetWindow();
     std::vector<RowPos>& selectedRows = pTable->GetSelectedRows();
     std::vector<RowPos>::iterator itStart = selectedRows.begin();
     std::vector<RowPos>::iterator itEnd = selectedRows.end();
-    sal_Int32 start = rangeOfRows[0];
-    sal_Int32 end = rangeOfRows[rangeOfRows.getLength()-1];
-    if((start >= 0 && start < m_pTableModel->getRowCount()) && (end >= 0 && end < m_pTableModel->getRowCount()))
+    for(int i = 0; i < rangeOfRows.getLength(); i++ )
     {
-        std::vector<RowPos>::iterator iter = std::find(itStart, itEnd, start);
-        selectedRows.erase(iter, iter+(end-start)+1);
-        pTable->selectionChanged(true);
-        pTable->InvalidateDataWindow(start, end, false);
-        SetSynthesizingVCLEvent( sal_True );
-        pTable->Select();
-        SetSynthesizingVCLEvent( sal_False );
+        std::vector<RowPos>::iterator iter = std::find(itStart, itEnd, rangeOfRows[i]);
+        selectedRows.erase(iter);
     }
+    pTable->selectionChanged(true);
+    pTable->Invalidate();
+    SetSynthesizingVCLEvent( sal_True );
+    pTable->Select();
+    SetSynthesizingVCLEvent( sal_False );
 }
 
 void SAL_CALL SVTXGridControl::deselectAllRows() throw (::com::sun::star::uno::RuntimeException)
@@ -869,7 +871,7 @@ void SVTXGridControl::ImplCallItemListeners()
             aEvent.Range = diff;
         }
         //selected row changed
-        else if(diff == 0)
+        else if(diff == 0 && actSelRowCount != 0)
         {
             aEvent.Row = selRows[actSelRowCount-1];
             aEvent.Action = com::sun::star::awt::grid::SelectionEventType(2);