cbosdo02: merging changesets up to DEV300_m69

17 files changed, 392 insertions, 765 deletions

diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx
index 8ff008eaf7e4..481f6f2ceeae 100644
--- a/svtools/source/control/calendar.cxx
+++ b/svtools/source/control/calendar.cxx
@@ -62,7 +62,7 @@
 #include <com/sun/star/i18n/CalendarFieldIndex.hpp>
 
 #define _SV_CALENDAR_CXX
-#include <svtools/svtools.hrc>
+#include <svl/svtools.hrc>
 #include <svtools/svtdata.hxx>
 #include <calendar.hxx>
 
diff --git a/svtools/source/control/calendar.src b/svtools/source/control/calendar.src
index 44bffd361847..043dd9808663 100644
--- a/svtools/source/control/calendar.src
+++ b/svtools/source/control/calendar.src
@@ -28,7 +28,7 @@
  *
  ************************************************************************/
 
-#include <svtools/svtools.hrc>
+#include <svl/svtools.hrc>
 String STR_SVT_CALENDAR_DAY
 {
     Text [ en-US ] = "Day" ;
diff --git a/svtools/source/control/collatorres.cxx b/svtools/source/control/collatorres.cxx
index 692d470b8f5b..c976d7442bc0 100644
--- a/svtools/source/control/collatorres.cxx
+++ b/svtools/source/control/collatorres.cxx
@@ -32,7 +32,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
 #include <svtools/svtdata.hxx>
-#include <svtools/svtools.hrc>
+#include <svl/svtools.hrc>
 
 
 #include <collatorres.hxx>
diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index 5be239a5593e..b0d20bf7ce30 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -43,7 +43,7 @@
 #include <unotools/charclass.hxx>
 
 #include <svtools/svtdata.hxx>
-#include <svtools/svtools.hrc>
+#include <svl/svtools.hrc>
 #include <ctrlbox.hxx>
 #include <ctrltool.hxx>
 
@@ -644,8 +644,7 @@ void FontNameBox::DataChanged( const DataChangedEvent& rDCEvt )
 
 void FontNameBox::InitBitmaps( void )
 {
-    Color   aCol = GetSettings().GetStyleSettings().GetWindowColor();
-    BOOL    bHC = aCol.IsDark();
+    BOOL bHC = GetSettings().GetStyleSettings().GetHighContrastMode();
 
     maImagePrinterFont = Image( SvtResId( bHC? RID_IMG_PRINTERFONT_HC : RID_IMG_PRINTERFONT ) );
     maImageBitmapFont = Image( SvtResId( bHC? RID_IMG_BITMAPFONT_HC : RID_IMG_BITMAPFONT ) );
diff --git a/svtools/source/control/ctrlbox.src b/svtools/source/control/ctrlbox.src
index 5cfee79e5f11..05c75577cdbf 100644
--- a/svtools/source/control/ctrlbox.src
+++ b/svtools/source/control/ctrlbox.src
@@ -27,7 +27,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include <svtools/svtools.hrc>
+#include <svl/svtools.hrc>
 
 #ifndef IMAGE_STDBTN_COLOR
 #define IMAGE_STDBTN_COLOR Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; }
diff --git a/svtools/source/control/ctrltool.cxx b/svtools/source/control/ctrltool.cxx
index 77bb996584bd..1573ed531662 100644
--- a/svtools/source/control/ctrltool.cxx
+++ b/svtools/source/control/ctrltool.cxx
@@ -45,7 +45,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/wrkwin.hxx>
 
-#include <svtools/svtools.hrc>
+#include <svl/svtools.hrc>
 #include <svtools/svtdata.hxx>
 #include <ctrltool.hxx>
 
diff --git a/svtools/source/control/ctrltool.src b/svtools/source/control/ctrltool.src
index 267a65e98517..ab8005cd9698 100644
--- a/svtools/source/control/ctrltool.src
+++ b/svtools/source/control/ctrltool.src
@@ -27,7 +27,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include <svtools/svtools.hrc>
+#include <svl/svtools.hrc>
 
 String STR_SVT_STYLE_LIGHT
 {
diff --git a/svtools/source/control/fileurlbox.cxx b/svtools/source/control/fileurlbox.cxx
index 936f8b3e25c5..554f713fd4d6 100644
--- a/svtools/source/control/fileurlbox.cxx
+++ b/svtools/source/control/fileurlbox.cxx
@@ -32,7 +32,7 @@
 #include "precompiled_svtools.hxx"
 #include <svtools/fileurlbox.hxx>
 #include <osl/file.h>
-#include "filenotation.hxx"
+#include "svl/filenotation.hxx"
 
 //.........................................................................
 namespace svt
diff --git a/svtools/source/control/fmtfield.cxx b/svtools/source/control/fmtfield.cxx
index 387c1db34fc1..bbf00329cf93 100644
--- a/svtools/source/control/fmtfield.cxx
+++ b/svtools/source/control/fmtfield.cxx
@@ -36,7 +36,7 @@
 #include <comphelper/processfactory.hxx>
 #include <unotools/localedatawrapper.hxx>
 #include <vcl/svapp.hxx>
-#include <svtools/zformat.hxx>
+#include <svl/zformat.hxx>
 #include <svtools/fmtfield.hxx>
 #include <i18npool/mslangid.hxx>
 #include <com/sun/star/lang/Locale.hpp>
@@ -45,7 +45,7 @@
 #include <com/sun/star/util/SearchResult.hpp>
 #include <com/sun/star/util/SearchFlags.hpp>
 #include <com/sun/star/lang/Locale.hpp>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 
 #ifndef REGEXP_SUPPORT
 #include <map>
diff --git a/svtools/source/control/hyperlabel.cxx b/svtools/source/control/hyperlabel.cxx
index ec8387ecb662..7d7477130e0d 100644
--- a/svtools/source/control/hyperlabel.cxx
+++ b/svtools/source/control/hyperlabel.cxx
@@ -107,35 +107,16 @@ namespace svt
     }
 
 
-    void HyperLabel::SetLabelAndSize(::rtl::OUString _rText, const Size& _rNewSize )
+    Size HyperLabel::CalcMinimumSize( long nMaxWidth ) const
     {
-        Size rLocSize = _rNewSize;
-        Size rLogicLocSize = PixelToLogic( _rNewSize, MAP_APPFONT );
-        SetLabel( _rText );
-        ImplCalcMinimumSize( rLocSize );
-        rLocSize.Height() = ( m_pImpl->m_aMinSize.Height());
-//        else
-//            rLocSize = LogicToPixel( Size( rLogicLocSize.Width(), LABELBASEMAPHEIGHT ), MAP_APPFONT );
-        SetSizePixel( rLocSize );
-        Show();
-    }
-
-    sal_Bool HyperLabel::ImplCalcMinimumSize(const Size& _rCompSize )
-    {
-        sal_Bool b_AdjustMinWidth = sal_False;
-        m_pImpl->m_aMinSize = CalcMinimumSize( );
-        if ( m_pImpl->m_aMinSize.Width() >= _rCompSize.Width() )    // the MinimumSize is used to size the FocusRectangle
-        {
-            m_pImpl->m_aMinSize.Width() = _rCompSize.Width();       // and for the MouseMove method
-            m_pImpl->m_aMinSize = CalcMinimumSize(_rCompSize.Width() );
-            b_AdjustMinWidth = sal_True;
-        }
+        m_pImpl->m_aMinSize = FixedText::CalcMinimumSize( nMaxWidth );
+        // the MinimumSize is used to size the FocusRectangle
+        // and for the MouseMove method
         m_pImpl->m_aMinSize.Height() += 2;
         m_pImpl->m_aMinSize.Width() += 1;
-        return b_AdjustMinWidth;
+        return m_pImpl->m_aMinSize;
     }
 
-
     void HyperLabel::implInit()
     {
         ToggleBackgroundColor( COL_TRANSPARENT );
@@ -234,17 +215,6 @@ namespace svt
         m_pImpl->bInteractive = ( _bInteractive && IsEnabled() );
     }
 
-    void HyperLabel::SetHyperLabelPosition(sal_uInt16 XPos, sal_uInt16 YPos)
-    {
-        SetPosPixel( LogicToPixel( Point( XPos, YPos ), MAP_APPFONT ) );
-    }
-
-    Point HyperLabel::GetLogicalPosition()
-    {
-        Point aPoint = GetPosPixel( );
-        return PixelToLogic( aPoint, MAP_APPFONT );
-    }
-
     sal_Int16 HyperLabel::GetID() const
     {
         return m_pImpl->ID;
@@ -270,10 +240,9 @@ namespace svt
         return GetText();
     }
 
-    void HyperLabel::SetLabel( ::rtl::OUString _rText )
+    void HyperLabel::SetLabel( const ::rtl::OUString& _rText )
     {
         SetText(_rText);
-        Show();
     }
 
 
diff --git a/svtools/source/control/indexentryres.cxx b/svtools/source/control/indexentryres.cxx
index 49096144b215..f69e9b34e5ea 100644
--- a/svtools/source/control/indexentryres.cxx
+++ b/svtools/source/control/indexentryres.cxx
@@ -32,7 +32,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
 #include <svtools/svtdata.hxx>
-#include <svtools/svtools.hrc>
+#include <svl/svtools.hrc>
 
 
 #include <indexentryres.hxx>
diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx
index 4a01a03ad759..b4904afee418 100644
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -66,16 +66,16 @@
 #include <vos/mutex.hxx>
 #endif
 #include <vcl/svapp.hxx>
-#include <svtools/historyoptions.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/cancel.hxx>
-#include <svtools/itemset.hxx>
-#include "urihelper.hxx"
-#include <svtools/pathoptions.hxx>
+#include <unotools/historyoptions.hxx>
+#include <svl/eitem.hxx>
+#include <svl/stritem.hxx>
+#include <svl/cancel.hxx>
+#include <svl/itemset.hxx>
+#include "svl/urihelper.hxx"
+#include <unotools/pathoptions.hxx>
 
 #define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
 #include <ucbhelper/commandenvironment.hxx>
 #include <ucbhelper/content.hxx>
 #include <unotools/localfilehelper.hxx>
@@ -83,7 +83,7 @@
 
 #include "iodlg.hrc"
 #include <asynclink.hxx>
-#include <svtools/urlfilter.hxx>
+#include <svl/urlfilter.hxx>
 
 #include <vector>
 #include <algorithm>
diff --git a/svtools/source/control/makefile.mk b/svtools/source/control/makefile.mk
index 10bb6beb50e4..eecf983ab756 100644
--- a/svtools/source/control/makefile.mk
+++ b/svtools/source/control/makefile.mk
@@ -77,7 +77,6 @@ SLOFILES=\
         $(SLO)$/calendar.obj \
         $(SLO)$/filectrl.obj \
         $(SLO)$/scrwin.obj       \
-        $(SLO)$/reginfo.obj     \
         $(SLO)$/collatorres.obj \
         $(SLO)$/indexentryres.obj \
         $(SLO)$/hyperlabel.obj  \
diff --git a/svtools/source/control/reginfo.cxx b/svtools/source/control/reginfo.cxx
deleted file mode 100644
index 24daba5e6123..000000000000
--- a/svtools/source/control/reginfo.cxx
+++ /dev/null
@@ -1,375 +0,0 @@
-/*************************************************************************
- *
- * 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: reginfo.cxx,v $
- * $Revision: 1.8 $
- *
- * 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 "reginfo.hxx"
-#include <tools/debug.hxx>
-#include <osl/thread.h>
-
-#define MAXREGVALUE 200
-
-// *****************************************************************************
-#if defined(WIN) || defined(WNT)
-
-#include <tools/svwin.h>
-
-#define DBG_HDL DBG_ASSERT(pImp->bValidGroup, "Keine Gruppe gesetzt"); \
-    if( !pImp->bValidGroup ) return
-
-struct RegInfo_Impl
-{
-    HKEY aGroupHdl;
-    BOOL bValidGroup;
-};
-
-RegInfo::RegInfo()
-{
-    pImp=new RegInfo_Impl;
-    pImp->bValidGroup = FALSE;
-}
-
-RegInfo::~RegInfo()
-{
-    if(pImp->bValidGroup)
-        RegCloseKey( pImp->aGroupHdl );
-    delete pImp;
-}
-
-String RegInfo::GetKeyName( USHORT nKey ) const
-{
-    DBG_HDL String::EmptyString();
-    char aBuffer[MAXREGVALUE];
-    RegEnumKey( pImp->aGroupHdl, nKey, aBuffer, MAXREGVALUE );
-    return String( UniString::CreateFromAscii(aBuffer) );
-}
-
-USHORT RegInfo::GetKeyCount() const
-{
-    DBG_HDL 0;
-#ifdef WNT
-    DWORD nKeys;
-    DWORD Dum1=10, Dum2, Dum3, Dum4, Dum5, Dum6, Dum7;
-    char s[10];
-    FILETIME aDumFileTime;
-    RegQueryInfoKey( pImp->aGroupHdl, s, &Dum1, 0, &nKeys, &Dum2, &Dum3,
-                    &Dum4, &Dum5, &Dum6, &Dum7, &aDumFileTime );
-    return (USHORT) nKeys;
-#else
-    char aBuffer[MAXREGVALUE];
-    USHORT n=0;
-    while(RegEnumKey(
-        pImp->aGroupHdl, n, aBuffer, MAXREGVALUE) == ERROR_SUCCESS)
-        n++;
-    return n;
-#endif
-}
-
-inline String MakeAppGroupString_Impl( const String &rGroup )
-{
-    String aGroup( UniString::CreateFromAscii("SvAppGroups\\") );
-    aGroup+=rGroup;
-    return aGroup;
-}
-
-void RegInfo::SetAppGroup( const String& rGroup )
-{
-    aCurrentGroup = MakeAppGroupString_Impl(rGroup);
-    if( pImp->bValidGroup )
-    {
-        RegCloseKey( pImp->aGroupHdl );
-        pImp->bValidGroup = FALSE;
-    }
-    ByteString aBStr( aCurrentGroup, osl_getThreadTextEncoding() );
-    RegCreateKey( HKEY_CLASSES_ROOT, aBStr.GetBuffer(), &pImp->aGroupHdl );
-    pImp->bValidGroup = TRUE;
-}
-
-void RegInfo::DeleteAppGroup( const String &rGroup )
-{
-    String aOldGroup = aCurrentGroup;
-    SetAppGroup( rGroup );
-    DBG_HDL;
-    USHORT nMax = GetKeyCount();
-    for( USHORT n = nMax; n--; )
-    {
-        String aKey( GetKeyName( n ));
-        DeleteKey( aKey );
-    }
-    RegCloseKey( pImp->aGroupHdl );
-
-    ByteString aBStr( rGroup, osl_getThreadTextEncoding() );
-    RegDeleteKey( HKEY_CLASSES_ROOT, aBStr.GetBuffer() );
-    pImp->bValidGroup = FALSE;
-    if( rGroup != aOldGroup )
-        SetAppGroup( aOldGroup );
-}
-
-BOOL ReadKey_Impl( const String& rKey,
-                  HKEY aHdl, String& rResult )
-{
-    char s[MAXREGVALUE];
-    LONG aLen=MAXREGVALUE;
-
-    ByteString aBStr( rKey, osl_getThreadTextEncoding() );
-    LONG nRes = RegQueryValue( aHdl, aBStr.GetBuffer(), s, &aLen);
-    if(nRes == ERROR_SUCCESS)
-    {
-        rResult = UniString::CreateFromAscii(s);
-        return TRUE;
-    }
-    else
-        return FALSE;
-}
-
-String  RegInfo::ReadKey( const String& rKey ) const
-{
-    DBG_HDL String::EmptyString();
-    String aRes;
-    if(ReadKey_Impl( rKey, pImp->aGroupHdl, aRes))
-        return aRes;
-    else
-        return String::EmptyString();
-}
-
-String  RegInfo::ReadKey( const String& rKey, const String &rDefault ) const
-{
-    DBG_HDL String::EmptyString();
-    String aRes;
-    if(ReadKey_Impl( rKey, pImp->aGroupHdl, aRes))
-        return aRes;
-    else
-        return rDefault;
-}
-
-void RegInfo::WriteKey( const String& rKey, const String& rValue )
-{
-    DBG_HDL;
-    ByteString aBStr( rKey, osl_getThreadTextEncoding() );
-    ByteString aBStr1( rValue, osl_getThreadTextEncoding() );
-    RegSetValue( pImp->aGroupHdl, aBStr.GetBuffer(), REG_SZ, aBStr1.GetBuffer(), 0);
-}
-
-
-void RegInfo::DeleteKey( const String& rKey )
-{
-    DBG_HDL;
-    ByteString aBStr( rKey, osl_getThreadTextEncoding() );
-    RegDeleteKey( pImp->aGroupHdl, aBStr.GetBuffer() );
-}
-
-// *****************************************************************************
-#elif defined(OS2)
-
-#define INCL_WINSHELLDATA
-#include <svpm.h>
-
-struct RegInfo_Impl
-{
-    char *pKeyList;
-    String aCurrentApp;
-    void BuildKeyList( const String &rGroup );
-};
-
-void RegInfo_Impl::BuildKeyList( const String &rGroup )
-{
-    ByteString aBStr( rGroup, osl_getThreadTextEncoding() );
-    USHORT nLen = 0;
-    do
-    {
-        nLen+=1000;
-        delete[] pKeyList;
-        pKeyList = new char[nLen];
-        *(int *)pKeyList = 0;
-    }
-    while( PrfQueryProfileString(
-        HINI_USERPROFILE, (PCSZ)aBStr.GetBuffer(),
-        0, 0, pKeyList, nLen) == nLen);
-}
-
-
-RegInfo::RegInfo()
-{
-    pImp=new RegInfo_Impl;
-    pImp->pKeyList = 0;
-}
-
-RegInfo::~RegInfo()
-{
-    delete[] pImp->pKeyList;
-    delete pImp;
-}
-
-inline String MakeAppGroupString_Impl( const String &rGroup )
-{
-    String aGroup(UniString::CreateFromAscii("SvAppGroups:"));
-    aGroup+=rGroup;
-    return aGroup;
-}
-
-String RegInfo::GetKeyName( USHORT nKey ) const
-{
-    if( !pImp->pKeyList )
-        pImp->BuildKeyList(pImp->aCurrentApp);
-
-    const char *pc=pImp->pKeyList;
-    for( USHORT n=0; n<nKey; n++ )
-        while(*pc++);
-
-    return String(UniString::CreateFromAscii(pc));
-}
-
-USHORT RegInfo::GetKeyCount() const
-{
-    if( !pImp->pKeyList )
-        pImp->BuildKeyList( pImp->aCurrentApp);
-
-    const char *pc=pImp->pKeyList;
-    USHORT nRet=0;
-    while(*pc)
-    {
-        while(*pc++);
-        nRet++;
-    }
-    return nRet;
-}
-
-void RegInfo::SetAppGroup( const String& rGroup )
-{
-    delete[] pImp->pKeyList;
-    pImp->pKeyList = 0;
-    aCurrentGroup = rGroup;
-    pImp->aCurrentApp = MakeAppGroupString_Impl( rGroup );
-}
-
-void RegInfo::DeleteAppGroup( const String &rGroup )
-{
-    ByteString aBStr( MakeAppGroupString_Impl( rGroup ), osl_getThreadTextEncoding() );
-    PrfWriteProfileString(
-        HINI_USERPROFILE, (PCSZ)aBStr.GetBuffer(), 0, 0);
-}
-
-
-String  RegInfo::ReadKey( const String& rKey ) const
-{
-    ULONG    ulBufferMax = MAXREGVALUE;
-    char *pBuffer= new char[MAXREGVALUE];
-    ByteString aBStr( pImp->aCurrentApp, osl_getThreadTextEncoding() );
-    ByteString aBStr1( rKey, osl_getThreadTextEncoding() );
-    *pBuffer=0;
-    PrfQueryProfileData(
-        HINI_USERPROFILE, (PCSZ)aBStr.GetBuffer(), (PCSZ)aBStr1.GetBuffer(), pBuffer, &ulBufferMax);
-    String aRet(UniString::CreateFromAscii(pBuffer));
-    delete[] pBuffer;
-    return aRet;
-}
-
-
-String  RegInfo::ReadKey( const String& rKey, const String &rDefault ) const
-{
-    String aResult = ReadKey(rKey);
-    if (!aResult.Len())
-        return rDefault;
-    else
-        return aResult;
-}
-
-
-void RegInfo::WriteKey( const String& rKey, const String& rValue )
-{
-    ByteString aBStr( pImp->aCurrentApp, osl_getThreadTextEncoding() );
-    ByteString aBStr1( rKey, osl_getThreadTextEncoding() );
-    PrfWriteProfileData(
-        HINI_USERPROFILE, (PCSZ)aBStr.GetBuffer(), (PCSZ)aBStr1.GetBuffer(), (PVOID)rValue.GetBuffer(), rValue.Len()*2);
-}
-
-void RegInfo::DeleteKey( const String& rKey )
-{
-    ByteString aBStr( pImp->aCurrentApp, osl_getThreadTextEncoding() );
-    ByteString aBStr1( rKey, osl_getThreadTextEncoding() );
-    PrfWriteProfileString(
-        HINI_USERPROFILE, (PCSZ)aBStr.GetBuffer(), (PCSZ)rKey.GetBuffer(), 0);
-}
-
-// *****************************************************************************
-
-#else
-
-RegInfo::RegInfo()
-{
-}
-
-
-RegInfo::~RegInfo()
-{
-}
-
-String RegInfo::GetKeyName( USHORT ) const
-{
-    return String::EmptyString();
-}
-
-USHORT RegInfo::GetKeyCount() const
-{
-    return 0;
-}
-
-void RegInfo::SetAppGroup( const String& )
-{
-    return ;
-}
-
-void RegInfo::DeleteAppGroup( const String& )
-{
-    return;
-}
-
-String  RegInfo::ReadKey( const String& ) const
-{
-    return String::EmptyString();
-}
-
-String  RegInfo::ReadKey( const String&, const String& ) const
-{
-    return String::EmptyString();
-}
-
-void RegInfo::WriteKey( const String&, const String& )
-{
-    return;
-}
-
-void RegInfo::DeleteKey( const String& )
-{
-    return;
-}
-
-#endif
diff --git a/svtools/source/control/roadmap.cxx b/svtools/source/control/roadmap.cxx
index b0e178e631d9..693bca733813 100644
--- a/svtools/source/control/roadmap.cxx
+++ b/svtools/source/control/roadmap.cxx
@@ -49,11 +49,10 @@
 #endif
 #include <memory>
 
-#define RMENTRYPOINT_X      4
-#define RMENTRYPOINT_Y      27
-#define RMITEMDISTANCE_Y    6
+#define ROADMAP_INDENT_X        4
+#define ROADMAP_INDENT_Y        27
+#define ROADMAP_ITEM_DISTANCE_Y 6
 #define RMINCOMPLETE        -1
-#define NREMOVERMITEM       -1
 #define NADDITEM            1
 #define INCOMPLETELABEL     ::String::CreateFromAscii("...")        // TODO: Cast to String
 
@@ -63,30 +62,18 @@ namespace svt
 //.........................................................................
 
     typedef std::vector< ::rtl::OUString > S_Vector;
-    typedef std::vector< ORoadmapHyperLabel* > HL_Vector;
+    typedef std::vector< RoadmapItem* > HL_Vector;
 
     //=====================================================================
-    //= FontChanger
+    //= ColorChanger
     //=====================================================================
-//  class FontChanger
-//  {
-//  protected:
-//      OutputDevice*   m_pDev;
-//
-//  public:
-//      FontChanger( OutputDevice* _pDev, const Font& _rNewFont )
-//          :m_pDev( _pDev )
-//      {
-//          m_pDev->Push( PUSH_FONT );
-//          m_pDev->SetFont( _rNewFont );
-//      }
-//
-//      ~FontChanger()
-//      {
-//          m_pDev->Pop( );
-//      }
-//  };
-
+    class IDLabel :  public FixedText
+    {
+    public:
+        IDLabel( Window* _pParent, WinBits _nWinStyle = 0 );
+        ~IDLabel( );
+        virtual void    DataChanged( const DataChangedEvent& rDCEvt );
+    };
 
     //=====================================================================
     //= ColorChanger
@@ -111,6 +98,51 @@ namespace svt
         }
     };
 
+    //=====================================================================
+    //= RoadmapItem
+    //=====================================================================
+    class RoadmapItem : public RoadmapTypes
+    {
+    private:
+        IDLabel*                mpID;
+        HyperLabel*             mpDescription;
+        const Size              m_aItemPlayground;
+
+    public:
+        RoadmapItem( ORoadmap& _rParent, const Size& _rItemPlayground );
+        ~RoadmapItem( );
+
+        void                    SetID( sal_Int16 _ID );
+        sal_Int16               GetID() const;
+
+        void                    SetIndex( ItemIndex _Index );
+        ItemIndex               GetIndex() const;
+
+        void                    SetLabel( const ::rtl::OUString& _rText );
+        ::rtl::OUString         GetLabel( );
+
+        void                    Update( ItemIndex _RMIndex, const ::rtl::OUString& _rText );
+
+        void                    SetPosition( RoadmapItem* OldHyperLabel );
+
+        void                    ToggleBackgroundColor( const Color& _rGBColor );
+        void                    SetInteractive( sal_Bool _bInteractive );
+
+        void                    SetClickHdl( const Link& rLink );
+        const Link&             GetClickHdl() const;
+        void                    SetZOrder( RoadmapItem* pRefRoadmapHyperLabel, USHORT nFlags );
+        void                    Enable( BOOL bEnable = TRUE);
+        BOOL                    IsEnabled() const;
+        void                    GrabFocus();
+
+        bool                    Contains( const Window* _pWindow ) const;
+
+        HyperLabel*             GetDescriptionHyperLabel() const { return mpDescription; }
+
+    private:
+        void                    ImplUpdateIndex( const ItemIndex _nIndex );
+        void                    ImplUpdatePosSize();
+    };
 
     //=====================================================================
     //= RoadmapImpl
@@ -118,27 +150,32 @@ namespace svt
     class RoadmapImpl : public RoadmapTypes
     {
     protected:
+        const ORoadmap&     m_rAntiImpl;
         Link                m_aSelectHdl;
         BitmapEx            m_aPicture;
         HL_Vector           m_aRoadmapSteps;
         ItemId              m_iCurItemID;
         sal_Bool            m_bInteractive;
         sal_Bool            m_bComplete;
+        Size                m_aItemSizePixel;
 
     public:
-        RoadmapImpl() :
-            m_bInteractive( sal_True ),
-            m_bComplete( sal_True ) {}
+        RoadmapImpl( const ORoadmap& _rAntiImpl )
+            :m_rAntiImpl( _rAntiImpl )
+            ,m_iCurItemID( -1 )
+            ,m_bInteractive( sal_True )
+            ,m_bComplete( sal_True )
+        {
+        }
 
-        Size aHyperLabelPixelSize;
-        ORoadmapHyperLabel* InCompleteHyperLabel;
+        RoadmapItem* InCompleteHyperLabel;
 
-        void                addHyperLabel( ORoadmapHyperLabel*  _rRoadmapStep ) { m_aRoadmapSteps.push_back(_rRoadmapStep); }
+        void                addHyperLabel( RoadmapItem*  _rRoadmapStep ) { m_aRoadmapSteps.push_back(_rRoadmapStep); }
 
         HL_Vector&          getHyperLabels() { return m_aRoadmapSteps; }
         const HL_Vector&    getHyperLabels() const { return m_aRoadmapSteps; }
 
-        void                insertHyperLabel( ItemIndex _Index, ORoadmapHyperLabel* _rRoadmapStep ) { m_aRoadmapSteps.insert( m_aRoadmapSteps.begin() + _Index, _rRoadmapStep ); }
+        void                insertHyperLabel( ItemIndex _Index, RoadmapItem* _rRoadmapStep ) { m_aRoadmapSteps.insert( m_aRoadmapSteps.begin() + _Index, _rRoadmapStep ); }
 
         ItemIndex           getItemCount() const { return m_aRoadmapSteps.size();}
 
@@ -157,6 +194,9 @@ namespace svt
         void                setSelectHdl( const Link& _rHdl ) { m_aSelectHdl = _rHdl; }
         const Link&         getSelectHdl( ) const { return m_aSelectHdl; }
 
+        void                initItemSize();
+        const Size&         getItemSize() const { return m_aItemSizePixel; }
+
         void removeHyperLabel( ItemIndex _Index )
         {
             if ( ( _Index > -1 ) && ( _Index < getItemCount() ) )
@@ -172,8 +212,21 @@ namespace svt
     //= Roadmap
     //=====================================================================
     //---------------------------------------------------------------------
-    ORoadmap::ORoadmap( Window* _pParent, const ResId& _rId ):Control( _pParent, _rId )
-                                                            ,m_pImpl( new RoadmapImpl() )
+    void RoadmapImpl::initItemSize()
+    {
+        Size aLabelSize( m_rAntiImpl.GetOutputSizePixel() );
+        aLabelSize.Height() = m_rAntiImpl.LogicToPixel( Size( 0, LABELBASEMAPHEIGHT ), MAP_APPFONT ).Height();
+        aLabelSize.Width() -= m_rAntiImpl.LogicToPixel( Size( 2 * ROADMAP_INDENT_X, 0 ), MAP_APPFONT ).Width();
+        m_aItemSizePixel = aLabelSize;
+    }
+
+    //=====================================================================
+    //= Roadmap
+    //=====================================================================
+    //---------------------------------------------------------------------
+    ORoadmap::ORoadmap( Window* _pParent, const ResId& _rId )
+        :Control( _pParent, _rId )
+        ,m_pImpl( new RoadmapImpl( *this ) )
     {
         implInit();
     }
@@ -181,7 +234,7 @@ namespace svt
     //---------------------------------------------------------------------
     ORoadmap::ORoadmap( Window* _pParent, WinBits _nWinStyle )
         :Control( _pParent, _nWinStyle )
-        , m_pImpl( new RoadmapImpl() )
+        ,m_pImpl( new RoadmapImpl( *this ) )
 
     {
         implInit();
@@ -216,14 +269,15 @@ namespace svt
 // on this with calculating a new bold font.
 // Unfortunately, the OutputDevice does not offer a notify mechanism for a changed font.
 // So settings the font from outside is simply a forbidded scenario at the moment
+        EnableMapMode( sal_False );
     }
 
     //---------------------------------------------------------------------
     ORoadmap::~ORoadmap( )
     {
-        HL_Vector pLocRoadmapItems = m_pImpl->getHyperLabels();
+        HL_Vector aItemsCopy = m_pImpl->getHyperLabels();
         m_pImpl->getHyperLabels().clear();
-        for ( HL_Vector::iterator i = pLocRoadmapItems.begin(); i< pLocRoadmapItems.end(); i++)
+        for ( HL_Vector::iterator i = aItemsCopy.begin(); i< aItemsCopy.end(); ++i )
         {
             delete *i;
         }
@@ -240,54 +294,43 @@ namespace svt
     }
 
 
-    void ORoadmap::InitializeHyperLabelSize()
+    RoadmapItem* ORoadmap::GetPreviousHyperLabel( ItemIndex _Index)
     {
-        Size aSize = GetSizePixel();
-        Size aLogicSize = PixelToLogic( aSize, MAP_APPFONT );
-        aLogicSize.Height() = LABELBASEMAPHEIGHT;
-        aLogicSize.Width() -= (2*RMENTRYPOINT_X);
-        m_pImpl->aHyperLabelPixelSize = LogicToPixel( aLogicSize, MAP_APPFONT );
-        EnableMapMode( sal_False );
-    }
-
-
-    ORoadmapHyperLabel* ORoadmap::GetPreviousHyperLabel( ItemIndex _Index)
-    {
-        ORoadmapHyperLabel* OldHyperLabel = NULL;
-        if (_Index > 0)
-            OldHyperLabel = m_pImpl->getHyperLabels().at( _Index - 1 );
-        return OldHyperLabel;
+        RoadmapItem* pOldItem = NULL;
+        if ( _Index > 0 )
+            pOldItem = m_pImpl->getHyperLabels().at( _Index - 1 );
+        return pOldItem;
     }
 
 
        //---------------------------------------------------------------------
 
-    ORoadmapHyperLabel* ORoadmap::InsertHyperLabel( ItemIndex _Index, ::rtl::OUString _sLabel, ItemId _RMID, sal_Bool _bEnabled)
+    RoadmapItem* ORoadmap::InsertHyperLabel( ItemIndex _Index, const ::rtl::OUString& _sLabel, ItemId _RMID, sal_Bool _bEnabled)
     {
-        if (m_pImpl->getItemCount() == 0 )
-            InitializeHyperLabelSize();
-        ORoadmapHyperLabel* CurHyperLabel;
-        ORoadmapHyperLabel* OldHyperLabel = GetPreviousHyperLabel( _Index);
+        if ( m_pImpl->getItemCount() == 0 )
+            m_pImpl->initItemSize();
+
+        RoadmapItem* pItem = NULL;
+        RoadmapItem* pOldItem = GetPreviousHyperLabel( _Index );
 
-        if (_RMID != RMINCOMPLETE )
+        pItem = new RoadmapItem( *this, m_pImpl->getItemSize() );
+        if ( _RMID != RMINCOMPLETE )
         {
-            CurHyperLabel = new ORoadmapHyperLabel(this, WB_WORDBREAK);
-            CurHyperLabel->SetInteractive( m_pImpl->isInteractive() );
-            m_pImpl->insertHyperLabel(_Index, CurHyperLabel );
+            pItem->SetInteractive( m_pImpl->isInteractive() );
+            m_pImpl->insertHyperLabel( _Index, pItem );
         }
         else
         {
-            CurHyperLabel = new ORoadmapHyperLabel(this);
-            CurHyperLabel->SetInteractive( sal_False );
+            pItem->SetInteractive( sal_False );
         }
-        CurHyperLabel->SetPosition( OldHyperLabel );
-        CurHyperLabel->SetLabelAndSize( _Index, _sLabel, m_pImpl->aHyperLabelPixelSize );
-        CurHyperLabel->SetClickHdl(LINK( this, ORoadmap, ImplClickHdl ) );
-        CurHyperLabel->SetID( _RMID );
-        CurHyperLabel->SetIndex( _Index );
+        pItem->SetPosition( pOldItem );
+        pItem->Update( _Index, _sLabel );
+        pItem->SetClickHdl(LINK( this, ORoadmap, ImplClickHdl ) );
+        pItem->SetID( _RMID );
+        pItem->SetIndex( _Index );
         if (!_bEnabled)
-            CurHyperLabel->Enable( _bEnabled );
-        return CurHyperLabel;
+            pItem->Enable( _bEnabled );
+        return pItem;
     }
 
     //---------------------------------------------------------------------
@@ -308,12 +351,14 @@ namespace svt
     void ORoadmap::SetRoadmapInteractive( sal_Bool _bInteractive )
     {
         m_pImpl->setInteractive( _bInteractive );
-        ORoadmapHyperLabel* CurHyperLabel;
-        HL_Vector pLocRoadmapItems = m_pImpl->getHyperLabels();
-        for ( HL_Vector::iterator i = pLocRoadmapItems.begin(); i< pLocRoadmapItems.end(); i++)
+
+        const HL_Vector& rItems = m_pImpl->getHyperLabels();
+        for (   HL_Vector::const_iterator i = rItems.begin();
+                i < rItems.end();
+                ++i
+            )
         {
-            CurHyperLabel = *i;
-            CurHyperLabel->SetInteractive( _bInteractive );
+            (*i)->SetInteractive( _bInteractive );
         }
     }
 
@@ -326,76 +371,55 @@ namespace svt
     //---------------------------------------------------------------------
     void ORoadmap::SetRoadmapComplete( sal_Bool _bComplete )
     {
-        sal_Bool OldbComplete = m_pImpl->isComplete();
-        m_pImpl->setComplete( _bComplete);
-        if (_bComplete)
+        sal_Bool bWasComplete = m_pImpl->isComplete();
+        m_pImpl->setComplete( _bComplete );
+        if ( _bComplete )
         {
             if ( m_pImpl->InCompleteHyperLabel != NULL)
             {
-                if (m_pImpl->getItemCount() > 0)
-                {
-                    HL_Vector pLocRoadmapItems = m_pImpl->getHyperLabels();
-                    pLocRoadmapItems.pop_back();
-                    delete m_pImpl->InCompleteHyperLabel;
-                }
+                delete m_pImpl->InCompleteHyperLabel;
                 m_pImpl->InCompleteHyperLabel = NULL;
             }
         }
-        else if (OldbComplete)
-            m_pImpl->InCompleteHyperLabel = InsertHyperLabel( m_pImpl->getItemCount(), ::String::CreateFromAscii("..."), RMINCOMPLETE );
+        else if ( bWasComplete )
+            m_pImpl->InCompleteHyperLabel = InsertHyperLabel( m_pImpl->getItemCount(), ::String::CreateFromAscii( "..." ), RMINCOMPLETE );
     }
 
     //---------------------------------------------------------------------
-    void ORoadmap::SetRoadmapLabel(ORoadmapHyperLabel* CurHyperLabel, sal_Int32 _nPrefix, String _sDescription)
+    void ORoadmap::UpdatefollowingHyperLabels( ItemIndex _nIndex )
     {
-        const xub_StrLen n_Pos = _sDescription.Search( String::CreateFromAscii(".") );
-        if ( n_Pos != STRING_NOTFOUND )
+        const HL_Vector& rItems = m_pImpl->getHyperLabels();
+        if ( _nIndex < (ItemIndex)rItems.size() )
         {
-            const String sID = ::String::CreateFromInt32( _nPrefix );
-            _sDescription.Replace(0 , n_Pos, sID );
-        }
-        CurHyperLabel->SetLabelAndSize( _nPrefix, _sDescription, m_pImpl->aHyperLabelPixelSize );
-    }
-
-    //---------------------------------------------------------------------
-    void ORoadmap::UpdatefollowingHyperLabels( ItemIndex _Index, sal_Int16 )
-    {
-        if ( _Index < ( m_pImpl->getItemCount() ) )
-        {
-            Point aPos;
-            String sLabel;
-            HL_Vector pLocRoadmapItems = m_pImpl->getHyperLabels();
-            ORoadmapHyperLabel* CurHyperLabel = NULL;
-            ItemIndex n_CurPrefix = _Index + 1 ;
-            for ( HL_Vector::iterator i = pLocRoadmapItems.begin()+ _Index; i< pLocRoadmapItems.end(); i++)
+            RoadmapItem* pItem = NULL;
+            for (   HL_Vector::const_iterator i = rItems.begin() + _nIndex;
+                    i< rItems.end();
+                    ++i, ++_nIndex
+                )
             {
-                CurHyperLabel = *i;
-                aPos = CurHyperLabel->GetLogicalPosition();
-                CurHyperLabel->SetIndex( n_CurPrefix - 1);
-                sLabel = CurHyperLabel->GetLabel();
-                SetRoadmapLabel(CurHyperLabel, n_CurPrefix, sLabel);
-                ORoadmapHyperLabel* OldHyperLabel = GetPreviousHyperLabel( n_CurPrefix-1);
-                CurHyperLabel->SetPosition( OldHyperLabel);
-                n_CurPrefix++;
+                pItem = *i;
+
+                pItem->SetIndex( _nIndex );
+                pItem->SetPosition( GetPreviousHyperLabel( _nIndex ) );
             }
         }
         if ( ! m_pImpl->isComplete() )
         {
-            ORoadmapHyperLabel* OldHyperLabel = GetPreviousHyperLabel( m_pImpl->getItemCount());
-            m_pImpl->InCompleteHyperLabel->SetPosition( OldHyperLabel );
-            m_pImpl->InCompleteHyperLabel->SetLabelAndSize( m_pImpl->getItemCount(), ::String::CreateFromAscii("..."), m_pImpl->aHyperLabelPixelSize );
+            RoadmapItem* pOldItem = GetPreviousHyperLabel( m_pImpl->getItemCount() );
+            m_pImpl->InCompleteHyperLabel->SetPosition( pOldItem );
+            m_pImpl->InCompleteHyperLabel->Update( m_pImpl->getItemCount(), ::String::CreateFromAscii("...") );
         }
     }
 
     //---------------------------------------------------------------------
-    void ORoadmap::ReplaceRoadmapItem( ItemIndex _Index, ::rtl::OUString _RoadmapItem, ItemId _RMID, sal_Bool _bEnabled )
+    void ORoadmap::ReplaceRoadmapItem( ItemIndex _Index, const ::rtl::OUString& _RoadmapItem, ItemId _RMID, sal_Bool _bEnabled )
     {
-        ORoadmapHyperLabel* CurHyperLabel = GetByIndex( _Index);
-        if ( CurHyperLabel != NULL )
+        RoadmapItem* pItem = GetByIndex( _Index);
+        if ( pItem != NULL )
         {
-            CurHyperLabel->SetLabelAndSize( _Index,  _RoadmapItem, m_pImpl->aHyperLabelPixelSize );
-            CurHyperLabel->SetID( _RMID );
-            CurHyperLabel->Enable( _bEnabled );
+            pItem->Update( _Index,  _RoadmapItem );
+            pItem->SetID( _RMID );
+            pItem->Enable( _bEnabled );
         }
     }
 
@@ -408,7 +432,7 @@ namespace svt
     //---------------------------------------------------------------------
     RoadmapTypes::ItemId ORoadmap::GetItemID( ItemIndex _nIndex ) const
     {
-        const ORoadmapHyperLabel* pHyperLabel = GetByIndex( _nIndex );
+        const RoadmapItem* pHyperLabel = GetByIndex( _nIndex );
         if ( pHyperLabel )
             return pHyperLabel->GetID();
         return -1;
@@ -417,28 +441,26 @@ namespace svt
     //---------------------------------------------------------------------
     RoadmapTypes::ItemIndex ORoadmap::GetItemIndex( ItemId _nID ) const
     {
-        ORoadmapHyperLabel* CurHyperLabel;
         ItemId nLocID = 0;
-        HL_Vector &LocHyperLabels = m_pImpl->getHyperLabels();
-        ItemIndex nResult = 0;
-        for ( HL_Vector::iterator i = LocHyperLabels.begin(); i< LocHyperLabels.end(); i++)
+        const HL_Vector& rItems = m_pImpl->getHyperLabels();
+        for (   HL_Vector::const_iterator i = rItems.begin();
+                i < rItems.end();
+                ++i
+            )
         {
-            CurHyperLabel = *i;
-            nLocID = CurHyperLabel->GetID();
+            nLocID = (*i)->GetID();
             if ( nLocID == _nID )
-                return nResult;
-            nResult++;
+                return ItemIndex( i - rItems.begin() );
         }
         return -1;
     }
 
     //---------------------------------------------------------------------
-    void ORoadmap::InsertRoadmapItem( ItemIndex _Index, ::rtl::OUString _RoadmapItem, ItemId _nUniqueId, sal_Bool _bEnabled )
+    void ORoadmap::InsertRoadmapItem( ItemIndex _Index, const ::rtl::OUString& _RoadmapItem, ItemId _nUniqueId, sal_Bool _bEnabled )
     {
-        ORoadmapHyperLabel* CurHyperLabel;
-        CurHyperLabel = InsertHyperLabel(_Index, _RoadmapItem, _nUniqueId, _bEnabled);
+        InsertHyperLabel( _Index, _RoadmapItem, _nUniqueId, _bEnabled );
             // Todo: YPos is superfluous, if items are always appended
-        UpdatefollowingHyperLabels( _Index + 1);
+        UpdatefollowingHyperLabels( _Index + 1 );
     }
 
     //---------------------------------------------------------------------
@@ -447,7 +469,7 @@ namespace svt
         if ( m_pImpl->getItemCount() > 0 && ( _Index > -1)  &&  ( _Index < m_pImpl->getItemCount() ) )
         {
             m_pImpl->removeHyperLabel( _Index );
-            UpdatefollowingHyperLabels( _Index, NREMOVERMITEM);
+            UpdatefollowingHyperLabels( _Index );
         }
     }
 
@@ -460,33 +482,33 @@ namespace svt
     //---------------------------------------------------------------------
     sal_Bool ORoadmap::IsRoadmapItemEnabled( ItemId _nItemId, ItemIndex _nStartIndex  ) const
     {
-        const ORoadmapHyperLabel* _pLabelItem = GetByID( _nItemId, _nStartIndex  );
+        const RoadmapItem* _pLabelItem = GetByID( _nItemId, _nStartIndex  );
         return _pLabelItem ? _pLabelItem->IsEnabled() : sal_False;
     }
 
     //---------------------------------------------------------------------
     void ORoadmap::EnableRoadmapItem( ItemId _nItemId, sal_Bool _bEnable, ItemIndex _nStartIndex )
     {
-        ORoadmapHyperLabel* CurHyperLabel = GetByID( _nItemId, _nStartIndex );
-        if ( CurHyperLabel != NULL )
-            CurHyperLabel->Enable( _bEnable );
+        RoadmapItem* pItem = GetByID( _nItemId, _nStartIndex );
+        if ( pItem != NULL )
+            pItem->Enable( _bEnable );
     }
 
     //---------------------------------------------------------------------
-    void ORoadmap::ChangeRoadmapItemLabel( ItemId _nID, ::rtl::OUString _sLabel, ItemIndex _nStartIndex )
+    void ORoadmap::ChangeRoadmapItemLabel( ItemId _nID, const ::rtl::OUString& _sLabel, ItemIndex _nStartIndex )
     {
-        ORoadmapHyperLabel* CurHyperLabel = GetByID( _nID, _nStartIndex );
-        if ( CurHyperLabel != NULL )
+        RoadmapItem* pItem = GetByID( _nID, _nStartIndex );
+        if ( pItem != NULL )
         {
-            CurHyperLabel->SetLabelAndSize( CurHyperLabel->GetIndex(), _sLabel, m_pImpl->aHyperLabelPixelSize );
-            HL_Vector pLocRoadmapItems = m_pImpl->getHyperLabels();
-            ItemIndex Index = _nStartIndex;
-            for ( HL_Vector::iterator i = pLocRoadmapItems.begin()+ Index; i< pLocRoadmapItems.end(); i++)
+            pItem->Update( pItem->GetIndex(), _sLabel );
+
+            const HL_Vector& rItems = m_pImpl->getHyperLabels();
+            for (   HL_Vector::const_iterator i = rItems.begin() + _nStartIndex;
+                    i < rItems.end();
+                    ++i
+                )
             {
-                CurHyperLabel = *i;
-                ORoadmapHyperLabel* OldHyperLabel = GetPreviousHyperLabel( Index );
-                CurHyperLabel->SetPosition( OldHyperLabel);
-                Index++;
+                (*i)->SetPosition( GetPreviousHyperLabel( i - rItems.begin() ) );
             }
         }
     }
@@ -495,9 +517,9 @@ namespace svt
 
     ::rtl::OUString ORoadmap::GetRoadmapItemLabel( ItemId _nID, ItemIndex _nStartIndex )
     {
-        ORoadmapHyperLabel* CurHyperLabel = GetByID( _nID, _nStartIndex );
-        if ( CurHyperLabel != NULL )
-            return CurHyperLabel->GetLabel();
+        RoadmapItem* pItem = GetByID( _nID, _nStartIndex );
+        if ( pItem != NULL )
+            return pItem->GetLabel();
         else
             return ::rtl::OUString();
     }
@@ -505,47 +527,47 @@ namespace svt
     //---------------------------------------------------------------------
     void ORoadmap::ChangeRoadmapItemID( ItemId _nID, ItemId _NewID, ItemIndex _nStartIndex )
     {
-        ORoadmapHyperLabel* CurHyperLabel = GetByID( _nID, _nStartIndex );
-        if ( CurHyperLabel != NULL )
-            CurHyperLabel->SetID( _NewID );
+        RoadmapItem* pItem = GetByID( _nID, _nStartIndex );
+        if ( pItem != NULL )
+            pItem->SetID( _NewID );
     }
 
     //---------------------------------------------------------------------
-    ORoadmapHyperLabel* ORoadmap::GetByID( ItemId _nID, ItemIndex _nStartIndex)
+    RoadmapItem* ORoadmap::GetByID( ItemId _nID, ItemIndex _nStartIndex)
     {
-        ORoadmapHyperLabel* CurHyperLabel;
         ItemId nLocID = 0;
-        HL_Vector &LocHyperLabels = m_pImpl->getHyperLabels();
-        for ( HL_Vector::iterator i = LocHyperLabels.begin()+ _nStartIndex; i< LocHyperLabels.end(); i++)
+        const HL_Vector& rItems = m_pImpl->getHyperLabels();
+        for (   HL_Vector::const_iterator i = rItems.begin() + _nStartIndex;
+                i < rItems.end();
+                ++i
+            )
         {
-            CurHyperLabel = *i;
-            nLocID = CurHyperLabel->GetID();
+            nLocID = (*i)->GetID();
             if ( nLocID == _nID )
-                return CurHyperLabel;
+                return *i;
         }
         return NULL;
     }
 
     //---------------------------------------------------------------------
-    const ORoadmapHyperLabel* ORoadmap::GetByID( ItemId _nID, ItemIndex _nStartIndex  ) const
+    const RoadmapItem* ORoadmap::GetByID( ItemId _nID, ItemIndex _nStartIndex  ) const
     {
         return const_cast< ORoadmap* >( this )->GetByID( _nID, _nStartIndex );
     }
 
     //---------------------------------------------------------------------
-    ORoadmapHyperLabel* ORoadmap::GetByIndex( ItemIndex _nItemIndex)
+    RoadmapItem* ORoadmap::GetByIndex( ItemIndex _nItemIndex)
     {
-        HL_Vector &LocHyperLabels = m_pImpl->getHyperLabels();
-        if ((_nItemIndex > -1) && (_nItemIndex < m_pImpl->getItemCount( ) ) )
+        const HL_Vector& rItems = m_pImpl->getHyperLabels();
+        if ( ( _nItemIndex > -1 ) && ( _nItemIndex < (ItemIndex)rItems.size() ) )
         {
-            ORoadmapHyperLabel* CurHyperLabel = LocHyperLabels.at(_nItemIndex);    // Vectors are one-based
-            return CurHyperLabel;
+            return rItems.at( _nItemIndex );
         }
         return NULL;
     }
 
     //---------------------------------------------------------------------
-    const ORoadmapHyperLabel* ORoadmap::GetByIndex( ItemIndex _nItemIndex ) const
+    const RoadmapItem* ORoadmap::GetByIndex( ItemIndex _nItemIndex ) const
     {
         return const_cast< ORoadmap* >( this )->GetByIndex( _nItemIndex );
     }
@@ -553,14 +575,14 @@ namespace svt
     //---------------------------------------------------------------------
     RoadmapTypes::ItemId ORoadmap::GetNextAvailableItemId( ItemIndex _nNewIndex )
     {
-        ORoadmapHyperLabel* CurHyperLabel;
+        RoadmapItem* pItem = NULL;
 
         ItemIndex searchIndex = ++_nNewIndex;
         while ( searchIndex < m_pImpl->getItemCount() )
         {
-            CurHyperLabel = GetByIndex( searchIndex );
-            if ( CurHyperLabel->IsEnabled() )
-                return CurHyperLabel->GetID( );
+            pItem = GetByIndex( searchIndex );
+            if ( pItem->IsEnabled() )
+                return pItem->GetID( );
 
             ++searchIndex;
         }
@@ -570,13 +592,13 @@ namespace svt
     //---------------------------------------------------------------------
     RoadmapTypes::ItemId ORoadmap::GetPreviousAvailableItemId( ItemIndex _nNewIndex )
     {
-        ORoadmapHyperLabel* CurHyperLabel;
+        RoadmapItem* pItem = NULL;
         ItemIndex searchIndex = --_nNewIndex;
         while ( searchIndex > -1 )
         {
-            CurHyperLabel = GetByIndex( searchIndex );
-            if ( CurHyperLabel->IsEnabled() )
-                return CurHyperLabel->GetID( );
+            pItem = GetByIndex( searchIndex );
+            if ( pItem->IsEnabled() )
+                return pItem->GetID( );
 
             searchIndex--;
         }
@@ -586,12 +608,13 @@ namespace svt
     //---------------------------------------------------------------------
     void ORoadmap::DeselectOldRoadmapItems()
     {
-        HL_Vector pLocRoadmapItems = m_pImpl->getHyperLabels();
-        ORoadmapHyperLabel* CurHyperLabel = NULL;
-        for ( HL_Vector::iterator i = pLocRoadmapItems.begin(); i< pLocRoadmapItems.end(); i++)
+        const HL_Vector& rItems = m_pImpl->getHyperLabels();
+        for (   HL_Vector::const_iterator i = rItems.begin();
+                i < rItems.end();
+                ++i
+            )
         {
-            CurHyperLabel = *i;
-            CurHyperLabel->ToggleBackgroundColor( COL_TRANSPARENT );
+            (*i)->ToggleBackgroundColor( COL_TRANSPARENT );
         }
     }
 
@@ -617,7 +640,7 @@ namespace svt
     //---------------------------------------------------------------------
     void ORoadmap::GetFocus()
     {
-        ORoadmapHyperLabel* pCurHyperLabel = GetByID( GetCurrentRoadmapItemID() );
+        RoadmapItem* pCurHyperLabel = GetByID( GetCurrentRoadmapItemID() );
         if ( pCurHyperLabel != NULL )
             pCurHyperLabel->GrabFocus();
     }
@@ -626,15 +649,15 @@ namespace svt
     sal_Bool ORoadmap::SelectRoadmapItemByID( ItemId _nNewID )
     {
         DeselectOldRoadmapItems();
-        ORoadmapHyperLabel* CurHyperLabel = GetByID( _nNewID );
-        if (CurHyperLabel != NULL)
+        RoadmapItem* pItem = GetByID( _nNewID );
+        if ( pItem != NULL )
         {
-            if (CurHyperLabel->IsEnabled())
+            if ( pItem->IsEnabled() )
             {
                 const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
-                CurHyperLabel->ToggleBackgroundColor( rStyleSettings.GetHighlightColor() ); //HighlightColor
+                pItem->ToggleBackgroundColor( rStyleSettings.GetHighlightColor() ); //HighlightColor
 
-                CurHyperLabel->GrabFocus();
+                pItem->GrabFocus();
                 m_pImpl->setCurItemID(_nNewID);
 
                 Select();
@@ -670,7 +693,7 @@ namespace svt
     //---------------------------------------------------------------------
     void ORoadmap::DrawHeadline()
     {
-        Point aTextPos = LogicToPixel( Point( RMENTRYPOINT_X, 8 ), MAP_APPFONT );
+        Point aTextPos = LogicToPixel( Point( ROADMAP_INDENT_X, 8 ), MAP_APPFONT );
 
         Size aOutputSize( GetOutputSizePixel() );
 
@@ -683,15 +706,16 @@ namespace svt
     }
 
     //---------------------------------------------------------------------
-    ORoadmapHyperLabel* ORoadmap::GetByPointer(Window* pWindow)
+    RoadmapItem* ORoadmap::GetByPointer(Window* pWindow)
     {
-        ORoadmapHyperLabel* CurHyperLabel;
-        HL_Vector &LocHyperLabels = m_pImpl->getHyperLabels();
-        for ( HL_Vector::iterator i = LocHyperLabels.begin(); i< LocHyperLabels.end(); i++)
+        const HL_Vector& rItems = m_pImpl->getHyperLabels();
+        for (   HL_Vector::const_iterator i = rItems.begin();
+                i < rItems.end();
+                ++i
+            )
         {
-            CurHyperLabel = *i;
-            if ( (CurHyperLabel->GetIDLabel() == pWindow) || (CurHyperLabel->GetDescriptionHyperLabel() == pWindow) )
-                return CurHyperLabel;
+            if ( (*i)->Contains( pWindow ) )
+                return *i;
         }
         return NULL;
     }
@@ -703,30 +727,30 @@ namespace svt
         if ( _rNEvt.GetType() == EVENT_KEYINPUT )
         {
             Window* pWindow = _rNEvt.GetWindow();
-            ORoadmapHyperLabel* CurHyperLabel = GetByPointer( pWindow );
-            if ( CurHyperLabel != NULL )
+            RoadmapItem* pItem = GetByPointer( pWindow );
+            if ( pItem != NULL )
             {
                 sal_Int16 nKeyCode = _rNEvt.GetKeyEvent()->GetKeyCode().GetCode();
                 switch( nKeyCode )
                 {
                     case KEY_UP:
-                        {   // Note: Performancewhise this is not optimal, because we search for an ID in the labels
+                        {   // Note: Performancewise this is not optimal, because we search for an ID in the labels
                             //       and afterwards we search again for a label with the appropriate ID ->
                             //       unnecessarily we search twice!!!
-                            ItemId nPrevItemID = GetPreviousAvailableItemId( CurHyperLabel->GetIndex() );
+                            ItemId nPrevItemID = GetPreviousAvailableItemId( pItem->GetIndex() );
                             if ( nPrevItemID != -1 )
                                 return SelectRoadmapItemByID( nPrevItemID );
                         }
                         break;
                     case KEY_DOWN:
                         {
-                            ItemId nNextItemID = GetNextAvailableItemId( CurHyperLabel->GetIndex() );
+                            ItemId nNextItemID = GetNextAvailableItemId( pItem->GetIndex() );
                             if ( nNextItemID != -1 )
                                 return SelectRoadmapItemByID( nNextItemID );
                         }
                         break;
                     case KEY_SPACE:
-                        return SelectRoadmapItemByID( CurHyperLabel->GetID() );
+                        return SelectRoadmapItemByID( pItem->GetID() );
                 }
             }
         }
@@ -736,9 +760,12 @@ namespace svt
     //---------------------------------------------------------------------
       IMPL_LINK(ORoadmap, ImplClickHdl, HyperLabel*, _CurHyperLabel)
     {
-        return SelectRoadmapItemByID( _CurHyperLabel->GetID() );
+       return SelectRoadmapItemByID( _CurHyperLabel->GetID() );
     }
 
+
+
+    //---------------------------------------------------------------------
     void ORoadmap::DataChanged( const DataChangedEvent& rDCEvt )
     {
         if ((( rDCEvt.GetType() == DATACHANGED_SETTINGS )   ||
@@ -752,216 +779,228 @@ namespace svt
             aFont.SetColor( aTextColor );
             SetFont( aFont );
             RoadmapTypes::ItemId curItemID = GetCurrentRoadmapItemID();
-            ORoadmapHyperLabel* pLabelItem = GetByID( curItemID );
+            RoadmapItem* pLabelItem = GetByID( curItemID );
             pLabelItem->ToggleBackgroundColor(rStyleSettings.GetHighlightColor());
             Invalidate();
         }
     }
 
 
-    ORoadmapHyperLabel::ORoadmapHyperLabel( Window* _pParent, const ResId& )
+    //---------------------------------------------------------------------
+    RoadmapItem::RoadmapItem( ORoadmap& _rParent, const Size& _rItemPlayground )
+        :m_aItemPlayground( _rItemPlayground )
     {
-        mpIDLabel = new ORoadmapIDHyperLabel(_pParent, WB_WORDBREAK);
-        mpDescHyperLabel = new HyperLabel(_pParent, WB_NOTABSTOP | WB_WORDBREAK);
+        mpID = new IDLabel( &_rParent, WB_WORDBREAK );
+        mpID->SetTextColor( mpID->GetSettings().GetStyleSettings().GetFieldTextColor( ) );
+        mpID->Show();
+        mpDescription = new HyperLabel( &_rParent, WB_NOTABSTOP | WB_WORDBREAK );
+        mpDescription->Show();
     }
 
-
-    ORoadmapHyperLabel::ORoadmapHyperLabel( Window* _pParent, WinBits )
+    //---------------------------------------------------------------------
+    bool RoadmapItem::Contains( const Window* _pWindow ) const
     {
-        mpIDLabel = new ORoadmapIDHyperLabel(_pParent, WB_WORDBREAK);
-        mpIDLabel->SetTextColor( mpIDLabel->GetSettings().GetStyleSettings().GetFieldTextColor( ) );
-        mpDescHyperLabel = new HyperLabel(_pParent, WB_NOTABSTOP | WB_WORDBREAK);
+        return ( mpID == _pWindow ) || ( mpDescription == _pWindow );
     }
 
     //---------------------------------------------------------------------
-    void ORoadmapHyperLabel::GrabFocus()
+    void RoadmapItem::GrabFocus()
     {
-        if ( mpDescHyperLabel )
-            mpDescHyperLabel->GrabFocus();
+        if ( mpDescription )
+            mpDescription->GrabFocus();
     }
 
-
-    void ORoadmapHyperLabel::SetInteractive( sal_Bool _bInteractive )
+    //---------------------------------------------------------------------
+    void RoadmapItem::SetInteractive( sal_Bool _bInteractive )
     {
-        if ( mpDescHyperLabel )
-        mpDescHyperLabel->SetInteractive(_bInteractive);
+        if ( mpDescription )
+        mpDescription->SetInteractive(_bInteractive);
     }
 
-    void ORoadmapHyperLabel::SetID( sal_Int16 _ID )
+    //---------------------------------------------------------------------
+    void RoadmapItem::SetID( sal_Int16 _ID )
     {
-        if ( mpDescHyperLabel )
-            mpDescHyperLabel->SetID(_ID);
+        if ( mpDescription )
+            mpDescription->SetID(_ID);
     }
 
-    sal_Int16 ORoadmapHyperLabel::GetID() const
+    //---------------------------------------------------------------------
+    sal_Int16 RoadmapItem::GetID() const
     {
-        return mpDescHyperLabel ? mpDescHyperLabel->GetID() : sal_Int16(-1);
+        return mpDescription ? mpDescription->GetID() : sal_Int16(-1);
     }
 
-    void ORoadmapHyperLabel::SetIndex( sal_Int32 _Index )
+    //---------------------------------------------------------------------
+    void RoadmapItem::ImplUpdateIndex( const ItemIndex _nIndex )
     {
-        if ( mpDescHyperLabel )
-            mpDescHyperLabel->SetIndex(_Index);
-    }
+        if ( mpDescription )
+            mpDescription->SetIndex( _nIndex );
 
+        if ( mpID )
+        {
+            ::rtl::OUString aIDText = ::rtl::OUString::valueOf( (sal_Int32)( _nIndex + 1 ) ) +  ::rtl::OUString::createFromAscii( "." );
+             mpID->SetText( aIDText );
+        }
 
-    sal_Int32 ORoadmapHyperLabel::GetIndex() const
-    {
-        return mpDescHyperLabel ? mpDescHyperLabel->GetIndex() : sal_Int32(-1);
+        // update the geometry of both controls
+        ImplUpdatePosSize();
     }
 
-
-    void ORoadmapHyperLabel::SetLabel( ::rtl::OUString _rText )
+    //---------------------------------------------------------------------
+    void RoadmapItem::SetIndex( ItemIndex _Index )
     {
-        if ( mpDescHyperLabel )
-            mpDescHyperLabel->SetText(_rText);
+        ImplUpdateIndex( _Index );
     }
 
+    //---------------------------------------------------------------------
+    RoadmapTypes::ItemIndex RoadmapItem::GetIndex() const
+    {
+        return mpDescription ? mpDescription->GetIndex() : ItemIndex(-1);
+    }
 
-    ::rtl::OUString ORoadmapHyperLabel::GetLabel( )
+    //---------------------------------------------------------------------
+    void RoadmapItem::SetLabel( const ::rtl::OUString& _rText )
     {
-            return mpDescHyperLabel ? mpDescHyperLabel->GetText() : String();
+        if ( mpDescription )
+            mpDescription->SetText(_rText);
     }
 
+    //---------------------------------------------------------------------
+    ::rtl::OUString RoadmapItem::GetLabel( )
+    {
+        return mpDescription ? mpDescription->GetText() : String();
+    }
 
-    void ORoadmapHyperLabel::SetPosition(ORoadmapHyperLabel* OldHyperLabel)
+    //---------------------------------------------------------------------
+    void RoadmapItem::SetPosition( RoadmapItem* _pOldItem )
     {
-        Point aNewLogicalPoint;
-        Point aNewPoint;
-        if (OldHyperLabel == NULL)
+        Point aIDPos;
+        if ( _pOldItem == NULL )
         {
-            aNewLogicalPoint = Point( RMENTRYPOINT_X, RMENTRYPOINT_Y);
-            aNewPoint = mpIDLabel->LogicToPixel(aNewLogicalPoint, MAP_APPFONT );
+            aIDPos = mpID->LogicToPixel( Point( ROADMAP_INDENT_X, ROADMAP_INDENT_Y ), MAP_APPFONT );
         }
         else
         {
-            Size aOldSize = OldHyperLabel->GetDescriptionHyperLabel()->GetSizePixel();
-            Point aOldLogicalPoint = OldHyperLabel->GetLogicalPosition();
-            aNewLogicalPoint = Point(aOldLogicalPoint.X(), (aOldLogicalPoint.Y() + RMITEMDISTANCE_Y));
-            aNewPoint = mpIDLabel->LogicToPixel(aNewLogicalPoint, MAP_APPFONT );
-            aNewPoint = Point(aNewPoint.X(),aNewPoint.Y() + aOldSize.Height());
+            Size aOldSize = _pOldItem->GetDescriptionHyperLabel()->GetSizePixel();
+
+            aIDPos = _pOldItem->mpID->GetPosPixel();
+            aIDPos.Y() += aOldSize.Height();
+            aIDPos.Y() += mpID->GetParent()->LogicToPixel( Size( 0, ROADMAP_ITEM_DISTANCE_Y ) ).Height();
         }
-        mpIDLabel->SetPosPixel( aNewPoint );
-        sal_Int32 xDescPos = aNewPoint.X() + mpIDLabel->GetSizePixel().Width();
-        mpDescHyperLabel->SetPosPixel( Point(xDescPos, aNewPoint.Y()) );
-    }
+        mpID->SetPosPixel( aIDPos );
 
+        sal_Int32 nDescPos = aIDPos.X() + mpID->GetSizePixel().Width();
+        mpDescription->SetPosPixel( Point( nDescPos, aIDPos.Y() ) );
+    }
 
-    void ORoadmapHyperLabel::SetZOrder( ORoadmapHyperLabel* pRefRoadmapHyperLabel, USHORT nFlags )
+    //---------------------------------------------------------------------
+    void RoadmapItem::SetZOrder( RoadmapItem* pRefRoadmapHyperLabel, USHORT nFlags )
     {
         if (pRefRoadmapHyperLabel == NULL)
-            mpDescHyperLabel->SetZOrder( NULL, nFlags); //WINDOW_ZORDER_FIRST );
+            mpDescription->SetZOrder( NULL, nFlags); //WINDOW_ZORDER_FIRST );
         else
-            mpDescHyperLabel->SetZOrder( pRefRoadmapHyperLabel->mpDescHyperLabel, nFlags); //, WINDOW_ZORDER_BEHIND );
+            mpDescription->SetZOrder( pRefRoadmapHyperLabel->mpDescription, nFlags); //, WINDOW_ZORDER_BEHIND );
     }
 
-
-    void ORoadmapHyperLabel::Enable( BOOL _bEnable)
+    //---------------------------------------------------------------------
+    void RoadmapItem::Enable( BOOL _bEnable)
     {
-        mpIDLabel->Enable(_bEnable);
-        mpDescHyperLabel->Enable(_bEnable);
+        mpID->Enable(_bEnable);
+        mpDescription->Enable(_bEnable);
     }
 
-    BOOL ORoadmapHyperLabel::IsEnabled() const
+    //---------------------------------------------------------------------
+    BOOL RoadmapItem::IsEnabled() const
     {
-        return mpIDLabel->IsEnabled();
+        return mpID->IsEnabled();
     }
 
-//  void ORoadmapHyperLabel::GrabFocus()
-//  {
-//      mpDescHyperLabel->GrabFocus();
-//
-//  }
-
-    void ORoadmapHyperLabel::ToggleBackgroundColor( const Color& _rGBColor )
+    //---------------------------------------------------------------------
+    void RoadmapItem::ToggleBackgroundColor( const Color& _rGBColor )
     {
         if (_rGBColor == COL_TRANSPARENT)
         {
-            mpIDLabel->SetTextColor( mpIDLabel->GetSettings().GetStyleSettings().GetFieldTextColor( ) );
-            mpIDLabel->SetControlBackground( COL_TRANSPARENT );
+            mpID->SetTextColor( mpID->GetSettings().GetStyleSettings().GetFieldTextColor( ) );
+            mpID->SetControlBackground( COL_TRANSPARENT );
         }
         else
         {
-            mpIDLabel->SetControlBackground( mpIDLabel->GetSettings().GetStyleSettings().GetHighlightColor() );
-            mpIDLabel->SetTextColor( mpIDLabel->GetSettings().GetStyleSettings().GetHighlightTextColor( ) );
+            mpID->SetControlBackground( mpID->GetSettings().GetStyleSettings().GetHighlightColor() );
+            mpID->SetTextColor( mpID->GetSettings().GetStyleSettings().GetHighlightTextColor( ) );
         }
-        mpDescHyperLabel->ToggleBackgroundColor(_rGBColor);
+        mpDescription->ToggleBackgroundColor(_rGBColor);
     }
 
-
-    Point ORoadmapHyperLabel::GetLogicalPosition()
+    //---------------------------------------------------------------------
+    void RoadmapItem::ImplUpdatePosSize()
     {
-        Point aPoint = mpIDLabel->GetPosPixel( );
-        Size aSize = Size(aPoint.X(), aPoint.Y());
-        aSize = mpIDLabel->PixelToLogic( aSize, MAP_APPFONT );
-        aPoint = Point(aSize.Width(), aSize.Height());
-        return aPoint;
-    }
+        // calculate widths
+        long nIDWidth = mpID->GetTextWidth( mpID->GetText() );
+        long nMaxIDWidth = mpID->GetTextWidth( ::rtl::OUString::createFromAscii( "100." ) );
+        nIDWidth = ::std::min( nIDWidth, nMaxIDWidth );
+
+        // check how many space the description would need
+        Size aDescriptionSize = mpDescription->CalcMinimumSize( m_aItemPlayground.Width() - nIDWidth );
+
+        // position and size both controls
+        Size aIDSize( nIDWidth, aDescriptionSize.Height() );
+         mpID->SetSizePixel( aIDSize );
 
+        Point aIDPos = mpID->GetPosPixel();
+        mpDescription->SetPosPixel( Point( aIDPos.X() + nIDWidth, aIDPos.Y() ) );
+        mpDescription->SetSizePixel( aDescriptionSize );
+    }
 
-    void ORoadmapHyperLabel::SetLabelAndSize( ItemIndex _RMIndex, ::rtl::OUString _rText, const Size& _rNewSize)
+    //---------------------------------------------------------------------
+    void RoadmapItem::Update( ItemIndex _RMIndex, const ::rtl::OUString& _rText )
     {
-         Size rIDSize = _rNewSize;
-         ::rtl::OUString aStr = ::rtl::OUString::valueOf( (sal_Int32)( _RMIndex + 1 ) ) +  ::rtl::OUString::createFromAscii( "." );
-        rIDSize.Width() = (sal_Int32) mpIDLabel->GetTextWidth( aStr );
-        long nMaxWidth = mpIDLabel->GetTextWidth( ::rtl::OUString::createFromAscii("100.") );
-        rIDSize.Width() = ::std::min( rIDSize.getWidth(),nMaxWidth );
-         mpIDLabel->SetSizePixel(mpIDLabel->LogicToPixel( rIDSize));
-         mpIDLabel->SetText( aStr);
-         mpIDLabel->Show();
-        Size rDescSize = _rNewSize;
-        rDescSize.Width() -= rIDSize.Width();
-        sal_Int32 xDescPos = mpIDLabel->GetPosPixel().X() + mpIDLabel->GetSizePixel().Width();
-        sal_Int32 yDescPos = mpIDLabel->GetPosPixel().Y();
-        Point aPoint = Point(xDescPos, yDescPos);
-        mpDescHyperLabel->SetPosPixel( aPoint );
-        mpDescHyperLabel->SetLabelAndSize(_rText, rDescSize);
-        mpIDLabel->SetSizePixel( Size( mpIDLabel->GetSizePixel().Width(), mpDescHyperLabel->GetSizePixel().Height() ) );
+        // update description label
+        mpDescription->SetLabel( _rText );
+
+        // update the index in both controls, which triggers updating the geometry of both
+        ImplUpdateIndex( _RMIndex );
     }
 
-    ORoadmapHyperLabel::~ORoadmapHyperLabel( )
+    //---------------------------------------------------------------------
+    RoadmapItem::~RoadmapItem( )
     {
         {
-            ::std::auto_ptr<Control> aTemp(mpIDLabel);
-            mpIDLabel = NULL;
+            ::std::auto_ptr<Control> aTemp(mpID);
+            mpID = NULL;
         }
         {
-            ::std::auto_ptr<Control> aTemp(mpDescHyperLabel);
-            mpDescHyperLabel = NULL;
+            ::std::auto_ptr<Control> aTemp(mpDescription);
+            mpDescription = NULL;
         }
     }
 
-
-    void ORoadmapHyperLabel::SetClickHdl( const Link& rLink )
-    {
-        if ( mpDescHyperLabel )
-            mpDescHyperLabel->SetClickHdl( rLink);
-    }
-
-    const Link& ORoadmapHyperLabel::GetClickHdl( ) const
+    //---------------------------------------------------------------------
+    void RoadmapItem::SetClickHdl( const Link& rLink )
     {
-        return mpDescHyperLabel->GetClickHdl();
+        if ( mpDescription )
+            mpDescription->SetClickHdl( rLink);
     }
 
-
-    ORoadmapIDHyperLabel::ORoadmapIDHyperLabel( Window* _pParent, const ResId& _rId )
-        :FixedText( _pParent, _rId )
+    //---------------------------------------------------------------------
+    const Link& RoadmapItem::GetClickHdl( ) const
     {
+        return mpDescription->GetClickHdl();
     }
 
-    ORoadmapIDHyperLabel::ORoadmapIDHyperLabel( Window* _pParent, WinBits _nWinStyle )
+    //---------------------------------------------------------------------
+    IDLabel::IDLabel( Window* _pParent, WinBits _nWinStyle )
         :FixedText( _pParent, _nWinStyle )
     {
 
     }
 
-
-    ORoadmapIDHyperLabel::~ORoadmapIDHyperLabel( )
+    //---------------------------------------------------------------------
+    IDLabel::~IDLabel( )
     {
     }
 
-
-    void ORoadmapIDHyperLabel::DataChanged( const DataChangedEvent& rDCEvt )
+    //---------------------------------------------------------------------
+    void IDLabel::DataChanged( const DataChangedEvent& rDCEvt )
     {
         const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
         FixedText::DataChanged( rDCEvt );
diff --git a/svtools/source/control/taskstat.cxx b/svtools/source/control/taskstat.cxx
index 86098af7de4a..82165a711285 100644
--- a/svtools/source/control/taskstat.cxx
+++ b/svtools/source/control/taskstat.cxx
@@ -43,7 +43,7 @@
 #include <vcl/svapp.hxx>
 #include <unotools/calendarwrapper.hxx>
 
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
 #include <taskbar.hxx>
 
 // =======================================================================
diff --git a/svtools/source/control/urlcontrol.cxx b/svtools/source/control/urlcontrol.cxx
index 1252fc17a1d6..899867414e2f 100644
--- a/svtools/source/control/urlcontrol.cxx
+++ b/svtools/source/control/urlcontrol.cxx
@@ -31,12 +31,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
 
-#ifndef SVTOOL_URLCONTROL_HXX
 #include <svtools/urlcontrol.hxx>
-#endif
-#ifndef SVTOOLS_FILENOTATION_HXX_
-#include "filenotation.hxx"
-#endif
+#include "svl/filenotation.hxx"
 
 //.........................................................................
 namespace svt