unoawt: merged in latest changes from CWS slidecopy (rebase to m80)

23 files changed, 1603 insertions, 99 deletions

diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx
index 671b5a9f54e5..7111a29a6a8a 100644
--- a/svtools/source/contnr/svimpbox.cxx
+++ b/svtools/source/contnr/svimpbox.cxx
@@ -3115,7 +3115,7 @@ void lcl_DeleteSubPopups(PopupMenu* pPopup)
     }
 }
 
-void SvImpLBox::Command( const CommandEvent& rCEvt )
+bool SvImpLBox::Command( const CommandEvent& rCEvt )
 {
     USHORT              nCommand = rCEvt.GetCommand();
 
@@ -3123,9 +3123,22 @@ void SvImpLBox::Command( const CommandEvent& rCEvt )
         aEditTimer.Stop();
 
     // Rollmaus-Event?
-    if( ( ( nCommand == COMMAND_WHEEL ) || ( nCommand == COMMAND_STARTAUTOSCROLL ) || ( nCommand == COMMAND_AUTOSCROLL ) )
-        && pView->HandleScrollCommand( rCEvt, &aHorSBar, &aVerSBar ) )
-            return;
+    if  (   (   ( nCommand == COMMAND_WHEEL )
+            ||  ( nCommand == COMMAND_STARTAUTOSCROLL )
+            ||  ( nCommand == COMMAND_AUTOSCROLL )
+            )
+        &&  pView->HandleScrollCommand( rCEvt, &aHorSBar, &aVerSBar )
+        )
+    {
+        return true;
+    }
+
+    if  (   ( nCommand == COMMAND_CONTEXTMENU )
+        &&  !bContextMenuHandling
+        )
+    {
+        return false;
+    }
 
     if( bContextMenuHandling && nCommand == COMMAND_CONTEXTMENU )
     {
@@ -3174,8 +3187,6 @@ void SvImpLBox::Command( const CommandEvent& rCEvt )
             {   // deselect all
                 pView->SelectAll( FALSE );
             }
-
-
         }
         else
         {   // key event (or at least no mouse event)
@@ -3235,15 +3246,18 @@ void SvImpLBox::Command( const CommandEvent& rCEvt )
                 aSelRestore.pop();
             }
         }
+        return true;
     }
-#ifndef NOCOMMAND
-    else
-    {
-        const Point& rPos = rCEvt.GetMousePosPixel();
-        if( rPos.X() < aOutputSize.Width() && rPos.Y() < aOutputSize.Height() )
-            aSelEng.Command( rCEvt );
-    }
-#endif
+
+    const Point& rPos = rCEvt.GetMousePosPixel();
+    if( rPos.X() < aOutputSize.Width() && rPos.Y() < aOutputSize.Height() )
+        aSelEng.Command( rCEvt );
+
+    // strictly, this is not correct. However, it leads to a behavior compatible to the one at the time
+    // when this method did have a void return value ...
+    // A proper solution would be to give the EditEngine::Command also a boolean return value, and forward
+    // this (or false) to our caller
+    return true;
 }
 
 void SvImpLBox::BeginScroll()
diff --git a/svtools/source/contnr/svlbox.cxx b/svtools/source/contnr/svlbox.cxx
index 2752e813052e..fb71f64772ad 100644
--- a/svtools/source/contnr/svlbox.cxx
+++ b/svtools/source/contnr/svlbox.cxx
@@ -1515,9 +1515,10 @@ void SvLBox::MakeVisible( SvLBoxEntry* )
     DBG_CHKTHIS(SvLBox,0);
 }
 
-void SvLBox::Command( const CommandEvent& )
+void SvLBox::Command( const CommandEvent& i_rCommandEvent )
 {
     DBG_CHKTHIS(SvLBox,0);
+    Control::Command( i_rCommandEvent );
 }
 
 void SvLBox::KeyInput( const KeyEvent& rKEvt )
@@ -1774,10 +1775,14 @@ void SvLBox::StartDrag( sal_Int8, const Point& rPosPixel )
 {
     DBG_CHKTHIS(SvLBox,0);
 
+    nOldDragMode = GetDragDropMode();
+    if ( !nOldDragMode )
+        return;
+
     ReleaseMouse();
+
     SvLBoxEntry* pEntry = GetEntry( rPosPixel ); // GetDropTarget( rPos );
-    nOldDragMode = GetDragDropMode();
-    if( !pEntry || !nOldDragMode )
+    if( !pEntry )
     {
         DragFinished( DND_ACTION_NONE );
         return;
diff --git a/svtools/source/contnr/svtreebx.cxx b/svtools/source/contnr/svtreebx.cxx
index 736f27a1eafb..bf6e41f93f36 100644
--- a/svtools/source/contnr/svtreebx.cxx
+++ b/svtools/source/contnr/svtreebx.cxx
@@ -40,6 +40,7 @@ class TabBar;
 #include <svtools/svlbox.hxx>
 #include <svtools/svlbitm.hxx>
 #include <svtools/svtreebx.hxx>
+#include <tools/diagnose_ex.h>
 #include <svimpbox.hxx>
 #include <unotools/accessiblestatesethelper.hxx>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
@@ -427,17 +428,6 @@ SvLBoxEntry* SvTreeListBox::InsertEntry( const XubString& aText,SvLBoxEntry* pPa
     else
         SvLBox::Insert( pEntry, pParent, nPos );
 
-    short nExpWidth = (short)rDefExpBmp.GetSizePixel().Width();
-    short nColWidth = (short)rDefColBmp.GetSizePixel().Width();
-    short nMax = Max(nExpWidth, nColWidth);
-    // #97680# ----------------
-    nMax = pImp->UpdateContextBmpWidthVector( pEntry, nMax );
-    if( nMax > nContextBmpWidthMax )
-    {
-        nContextBmpWidthMax = nMax;
-        SetTabs();
-    }
-
     aPrevInsertedExpBmp = rDefExpBmp;
     aPrevInsertedColBmp = rDefColBmp;
 
@@ -468,17 +458,6 @@ SvLBoxEntry* SvTreeListBox::InsertEntry( const XubString& aText,
     else
         SvLBox::Insert( pEntry, pParent, nPos );
 
-    short nExpWidth = (short)aExpEntryBmp.GetSizePixel().Width();
-    short nColWidth = (short)aCollEntryBmp.GetSizePixel().Width();
-    short nMax = Max(nExpWidth, nColWidth);
-    // #97680# ----------------
-    nMax = pImp->UpdateContextBmpWidthVector( pEntry, nMax );
-    if( nMax > nContextBmpWidthMax )
-    {
-        nContextBmpWidthMax = nMax;
-        SetTabs();
-    }
-
     aPrevInsertedExpBmp = aExpEntryBmp;
     aPrevInsertedColBmp = aCollEntryBmp;
 
@@ -2250,7 +2229,8 @@ Region SvTreeListBox::GetDragRegion() const
 void SvTreeListBox::Command( const CommandEvent& rCEvt )
 {
     DBG_CHKTHIS(SvTreeListBox,0);
-    pImp->Command( rCEvt );
+    if ( !pImp->Command( rCEvt ) )
+        SvLBox::Command( rCEvt );
 }
 
 
@@ -2346,6 +2326,25 @@ void SvTreeListBox::ModelNotification( USHORT nActionId, SvListEntry* pEntry1,
     SvLBox::ModelNotification( nActionId, pEntry1, pEntry2, nPos );
     switch( nActionId )
     {
+        case LISTACTION_INSERTED:
+        {
+            SvLBoxEntry* pEntry( dynamic_cast< SvLBoxEntry* >( pEntry1 ) );
+            ENSURE_OR_BREAK( pEntry, "SvTreeListBox::ModelNotification: invalid entry!" );
+            SvLBoxContextBmp* pBmpItem = static_cast< SvLBoxContextBmp* >( pEntry->GetFirstItem( SV_ITEM_ID_LBOXCONTEXTBMP ) );
+            if ( !pBmpItem )
+                break;
+            const Image& rBitmap1( pBmpItem->GetBitmap1() );
+            const Image& rBitmap2( pBmpItem->GetBitmap2() );
+            short nMaxWidth = short( Max( rBitmap1.GetSizePixel().Width(), rBitmap2.GetSizePixel().Width() ) );
+            nMaxWidth = pImp->UpdateContextBmpWidthVector( pEntry, nMaxWidth );
+            if( nMaxWidth > nContextBmpWidthMax )
+            {
+                nContextBmpWidthMax = nMaxWidth;
+                SetTabs();
+            }
+        }
+        break;
+
         case LISTACTION_RESORTING:
             SetUpdateMode( FALSE );
             break;
diff --git a/svtools/source/dialogs/roadmapwizard.cxx b/svtools/source/dialogs/roadmapwizard.cxx
index 9a03a9b16c2d..c28cfe1d4b18 100644
--- a/svtools/source/dialogs/roadmapwizard.cxx
+++ b/svtools/source/dialogs/roadmapwizard.cxx
@@ -182,7 +182,21 @@ namespace svt
         ,m_pImpl( new RoadmapWizardImpl )
     {
         DBG_CTOR( RoadmapWizard, CheckInvariants );
+        impl_construct();
+    }
+
+    //--------------------------------------------------------------------
+    RoadmapWizard::RoadmapWizard( Window* _pParent, const WinBits i_nStyle, sal_uInt32 _nButtonFlags )
+        :OWizardMachine( _pParent, i_nStyle, _nButtonFlags )
+        ,m_pImpl( new RoadmapWizardImpl )
+    {
+        DBG_CTOR( RoadmapWizard, CheckInvariants );
+        impl_construct();
+    }
 
+    //--------------------------------------------------------------------
+    void RoadmapWizard::impl_construct()
+    {
         SetLeftAlignedButtonCount( 1 );
         SetEmptyViewMargin();
 
@@ -328,15 +342,16 @@ namespace svt
         if ( (sal_Int32)aNewPathPos->second.size() <= nCurrentStatePathIndex )
             return;
 
-#if OSL_DEBUG_LEVEL > 0
         // assert that the current and the new path are equal, up to nCurrentStatePathIndex
         Paths::const_iterator aActivePathPos = m_pImpl->aPaths.find( m_pImpl->nActivePath );
         if ( aActivePathPos != m_pImpl->aPaths.end() )
         {
-            DBG_ASSERT( m_pImpl->getFirstDifferentIndex( aActivePathPos->second, aNewPathPos->second ) > nCurrentStatePathIndex,
-                "RoadmapWizard::activate: you cannot activate a path which conflicts with the current one *before* the current state!" );
+            if ( m_pImpl->getFirstDifferentIndex( aActivePathPos->second, aNewPathPos->second ) <= nCurrentStatePathIndex )
+            {
+                OSL_ENSURE( false, "RoadmapWizard::activate: you cannot activate a path which conflicts with the current one *before* the current state!" );
+                return;
+            }
         }
-#endif
 
         m_pImpl->nActivePath = _nPathId;
         m_pImpl->bActivePathIsDefinite = _bDecideForIt;
@@ -383,8 +398,14 @@ namespace svt
         }
 
         // can we advance from the current page?
-        const OWizardPage* pCurrentPage = dynamic_cast< const OWizardPage* >( GetPage( getCurrentState() ) );
-        const bool bCurrentPageCanAdvance = !pCurrentPage || pCurrentPage->canAdvance();
+        bool bCurrentPageCanAdvance = true;
+        TabPage* pCurrentPage = GetPage( getCurrentState() );
+        if ( pCurrentPage )
+        {
+            const IWizardPageController* pController = getPageController( GetPage( getCurrentState() ) );
+            OSL_ENSURE( pController != NULL, "RoadmapWizard::implUpdateRoadmap: no controller for the current page!" );
+            bCurrentPageCanAdvance = !pController || pController->canAdvance();
+        }
 
         // now, we have to remove all items after nCurrentStatePathIndex, and insert the items from the active
         // path, up to (excluding) nUpperStepBoundary
@@ -641,11 +662,33 @@ namespace svt
         // if the state is currently in the roadmap, reflect it's new status
         m_pImpl->pRoadmap->EnableRoadmapItem( (RoadmapTypes::ItemId)_nState, _bEnable );
     }
+
+    //--------------------------------------------------------------------
+    bool RoadmapWizard::knowsState( WizardState i_nState ) const
+    {
+        for (   Paths::const_iterator path = m_pImpl->aPaths.begin();
+                path != m_pImpl->aPaths.end();
+                ++path
+            )
+        {
+            for (   WizardPath::const_iterator state = path->second.begin();
+                    state != path->second.end();
+                    ++state
+                )
+            {
+                if ( *state == i_nState )
+                    return true;
+            }
+        }
+        return false;
+    }
+
     //--------------------------------------------------------------------
     bool RoadmapWizard::isStateEnabled( WizardState _nState ) const
     {
         return m_pImpl->aDisabledStates.find( _nState ) == m_pImpl->aDisabledStates.end();
     }
+
     //--------------------------------------------------------------------
     void RoadmapWizard::Resize()
     {
diff --git a/svtools/source/dialogs/wizardmachine.cxx b/svtools/source/dialogs/wizardmachine.cxx
index 3aaf279889d8..2053da80019d 100644
--- a/svtools/source/dialogs/wizardmachine.cxx
+++ b/svtools/source/dialogs/wizardmachine.cxx
@@ -30,6 +30,7 @@
 #include <svtools/wizardmachine.hxx>
 #include <svtools/helpid.hrc>
 #include <tools/debug.hxx>
+#include <tools/diagnose_ex.h>
 #include <vcl/msgbox.hxx>
 #include <svtools/svtdata.hxx>
 #ifndef _SVTOOLS_HRC
@@ -101,7 +102,7 @@ namespace svt
     }
 
     //---------------------------------------------------------------------
-    sal_Bool OWizardPage::commitPage( CommitPageReason )
+    sal_Bool OWizardPage::commitPage( WizardTypes::CommitPageReason )
     {
         return sal_True;
     }
@@ -161,6 +162,25 @@ namespace svt
         ,m_pHelp(NULL)
         ,m_pImpl( new WizardMachineImplData )
     {
+        implConstruct( _nButtonFlags );
+    }
+
+    //---------------------------------------------------------------------
+    OWizardMachine::OWizardMachine(Window* _pParent, const WinBits i_nStyle, sal_uInt32 _nButtonFlags )
+        :WizardDialog( _pParent, i_nStyle )
+        ,m_pFinish(NULL)
+        ,m_pCancel(NULL)
+        ,m_pNextPage(NULL)
+        ,m_pPrevPage(NULL)
+        ,m_pHelp(NULL)
+        ,m_pImpl( new WizardMachineImplData )
+    {
+        implConstruct( _nButtonFlags );
+    }
+
+    //---------------------------------------------------------------------
+    void OWizardMachine::implConstruct( const sal_uInt32 _nButtonFlags )
+    {
         m_pImpl->sTitleBase = GetText();
 
         // create the buttons according to the wizard button flags
@@ -225,8 +245,6 @@ namespace svt
 
             AddButton( m_pCancel, WIZARDDIALOG_BUTTON_STDOFFSET_X );
         }
-
-
     }
 
     //---------------------------------------------------------------------
@@ -274,35 +292,42 @@ namespace svt
     }
 
     //---------------------------------------------------------------------
-    void OWizardMachine::ActivatePage()
+    TabPage* OWizardMachine::GetOrCreatePage( const WizardState i_nState )
     {
-        WizardDialog::ActivatePage();
-
-        WizardState nCurrentLevel = GetCurLevel();
-        if (NULL == GetPage(nCurrentLevel))
+        if ( NULL == GetPage( i_nState ) )
         {
-            TabPage* pNewPage = createPage(nCurrentLevel);
-            DBG_ASSERT(pNewPage, "OWizardMachine::ActivatePage: invalid new page (NULL)!");
+            TabPage* pNewPage = createPage( i_nState );
+            DBG_ASSERT( pNewPage, "OWizardMachine::GetOrCreatePage: invalid new page (NULL)!" );
 
             // fill up the page sequence of our base class (with dummies)
-            while (m_pImpl->nFirstUnknownPage < nCurrentLevel)
+            while ( m_pImpl->nFirstUnknownPage < i_nState )
             {
-                AddPage(NULL);
+                AddPage( NULL );
                 ++m_pImpl->nFirstUnknownPage;
             }
 
-            if (m_pImpl->nFirstUnknownPage == nCurrentLevel)
+            if ( m_pImpl->nFirstUnknownPage == i_nState )
             {
                 // encountered this page number the first time
-                AddPage(pNewPage);
+                AddPage( pNewPage );
                 ++m_pImpl->nFirstUnknownPage;
             }
             else
                 // already had this page - just change it
-                SetPage(nCurrentLevel, pNewPage);
+                SetPage( i_nState, pNewPage );
         }
+        return GetPage( i_nState );
+    }
 
-        enterState(nCurrentLevel);
+    //---------------------------------------------------------------------
+    void OWizardMachine::ActivatePage()
+    {
+        WizardDialog::ActivatePage();
+
+        WizardState nCurrentLevel = GetCurLevel();
+        GetOrCreatePage( nCurrentLevel );
+
+        enterState( nCurrentLevel );
     }
 
     //---------------------------------------------------------------------
@@ -330,8 +355,10 @@ namespace svt
         if (m_pCancel && (_nWizardButtonFlags & WZB_CANCEL))
             pNewDefButton = m_pCancel;
 
-        if (pNewDefButton)
-            defaultButton(pNewDefButton);
+        if ( pNewDefButton )
+            defaultButton( pNewDefButton );
+        else
+            implResetDefault( this );
     }
 
     //---------------------------------------------------------------------
@@ -395,9 +422,10 @@ namespace svt
     void OWizardMachine::enterState(WizardState _nState)
     {
         // tell the page
-        IWizardPage* pCurrentPage = getWizardPage(GetPage(_nState));
-        if ( pCurrentPage )
-            pCurrentPage->initializePage();
+        IWizardPageController* pController = getPageController( GetPage( _nState ) );
+        OSL_ENSURE( pController, "OWizardMachine::enterState: no controller for the given page!" );
+        if ( pController )
+            pController->initializePage();
 
         if ( isAutomaticNextButtonStateEnabled() )
             enableButtons( WZB_NEXT, canAdvance() );
@@ -419,9 +447,9 @@ namespace svt
     }
 
     //---------------------------------------------------------------------
-    sal_Bool OWizardMachine::onFinish(sal_Int32 _nResult)
+    sal_Bool OWizardMachine::onFinish()
     {
-        return Finnish(_nResult);
+        return Finnish( RET_OK );
     }
 
     //---------------------------------------------------------------------
@@ -434,8 +462,7 @@ namespace svt
         {
             return 0L;
         }
-        long nRet = onFinish( RET_OK );
-        return nRet;
+        return onFinish() ? 1L : 0L;
     }
 
     //---------------------------------------------------------------------
@@ -447,10 +474,9 @@ namespace svt
     //---------------------------------------------------------------------
     sal_Bool OWizardMachine::prepareLeaveCurrentState( CommitPageReason _eReason )
     {
-        IWizardPage* pCurrentPage = getWizardPage(GetPage(getCurrentState()));
-        if ( pCurrentPage )
-            return pCurrentPage->commitPage( _eReason );
-        return sal_True;
+        IWizardPageController* pController = getPageController( GetPage( getCurrentState() ) );
+        ENSURE_OR_RETURN( pController != NULL, "OWizardMachine::prepareLeaveCurrentState: no controller for the current page!", sal_True );
+        return pController->commitPage( _eReason );
     }
 
     //---------------------------------------------------------------------
@@ -664,10 +690,10 @@ namespace svt
     }
 
     //---------------------------------------------------------------------
-    IWizardPage* OWizardMachine::getWizardPage(TabPage* _pCurrentPage) const
+    IWizardPageController* OWizardMachine::getPageController( TabPage* _pCurrentPage ) const
     {
-        OWizardPage* pPage = dynamic_cast< OWizardPage* >( _pCurrentPage );
-        return pPage;
+        IWizardPageController* pController = dynamic_cast< IWizardPageController* >( _pCurrentPage );
+        return pController;
     }
 
     //---------------------------------------------------------------------
@@ -690,11 +716,12 @@ namespace svt
     //---------------------------------------------------------------------
     void OWizardMachine::updateTravelUI()
     {
-        OWizardPage* pPage = dynamic_cast< OWizardPage* >( GetPage( getCurrentState() ) );
+        const IWizardPageController* pController = getPageController( GetPage( getCurrentState() ) );
+        OSL_ENSURE( pController != NULL, "RoadmapWizard::updateTravelUI: no controller for the current page!" );
 
         bool bCanAdvance =
-                ( !pPage || pPage->canAdvance() )   // the current page allows to advance
-            &&  canAdvance();                       // the dialog as a whole allows to advance
+                ( !pController || pController->canAdvance() )   // the current page allows to advance
+            &&  canAdvance();                                   // the dialog as a whole allows to advance
         enableButtons( WZB_NEXT, bCanAdvance );
     }
 
diff --git a/svtools/source/inc/svimpbox.hxx b/svtools/source/inc/svimpbox.hxx
index cde986b3cb7d..92b9f960b65c 100644
--- a/svtools/source/inc/svimpbox.hxx
+++ b/svtools/source/inc/svimpbox.hxx
@@ -340,7 +340,7 @@ public:
     const Size&         GetOutputSize() const { return aOutputSize;}
     void                KeyUp( BOOL bPageUp, BOOL bNotifyScroll = TRUE );
     void                KeyDown( BOOL bPageDown, BOOL bNotifyScroll = TRUE );
-    void                Command( const CommandEvent& rCEvt );
+    bool                Command( const CommandEvent& rCEvt );
 
     void                Invalidate();
     void                DestroyAnchor() { pAnchor=0; aSelEng.Reset(); }
diff --git a/svtools/source/misc/imageresourceaccess.cxx b/svtools/source/misc/imageresourceaccess.cxx
index a4f19d9e004a..436c3f721833 100644
--- a/svtools/source/misc/imageresourceaccess.cxx
+++ b/svtools/source/misc/imageresourceaccess.cxx
@@ -48,8 +48,6 @@ namespace svt
 {
 //........................................................................
 
-#define GRAPHOBJ_URLPREFIX "vnd.sun.star.GraphicObject:"
-
     using namespace ::utl;
     using namespace ::comphelper;
     using namespace ::com::sun::star::io;
@@ -141,8 +139,14 @@ namespace svt
     //--------------------------------------------------------------------
     bool GraphicAccess::isSupportedURL( const ::rtl::OUString& _rURL )
     {
-        ::rtl::OUString sIndicator( RTL_CONSTASCII_USTRINGPARAM( "private:resource/" ) );
-        return ( ( _rURL.indexOf( sIndicator ) == 0 ) || ( _rURL.compareToAscii( GRAPHOBJ_URLPREFIX, RTL_CONSTASCII_LENGTH( GRAPHOBJ_URLPREFIX ) ) == 0 ) );
+        if  (   ( _rURL.indexOfAsciiL( RTL_CONSTASCII_STRINGPARAM( "private:resource/" ) ) == 0 )
+            ||  ( _rURL.indexOfAsciiL( RTL_CONSTASCII_STRINGPARAM( "private:graphicrepository/" ) ) == 0 )
+            ||  ( _rURL.indexOfAsciiL( RTL_CONSTASCII_STRINGPARAM( "private:standardimage/" ) ) == 0 )
+            ||  ( _rURL.indexOfAsciiL( RTL_CONSTASCII_STRINGPARAM( "vnd.sun.star.GraphicObject:" ) ) == 0 )
+            ||  ( _rURL.indexOfAsciiL( RTL_CONSTASCII_STRINGPARAM( "vnd.sun.star.extension://" ) ) == 0 )
+            )
+            return true;
+        return false;
     }
 
     //--------------------------------------------------------------------
diff --git a/svtools/source/table/tablecontrol.cxx b/svtools/source/table/tablecontrol.cxx
index 8c95fab6120b..1770bfd7dd02 100644
--- a/svtools/source/table/tablecontrol.cxx
+++ b/svtools/source/table/tablecontrol.cxx
@@ -76,6 +76,11 @@ namespace svt { namespace table
         aTableData->SetMouseButtonUpHdl( LINK( this, TableControl, ImplMouseButtonUpHdl ) );
         aTableData->SetSelectHdl( LINK( this, TableControl, ImplSelectHdl ) );
         m_pAccessTable.reset(new ::svt::table::AccessibleTableControl_Impl());
+
+        // by default, use the background as determined by the style settings
+        const Color aWindowColor( GetSettings().GetStyleSettings().GetFieldColor() );
+        SetBackground( Wallpaper( aWindowColor ) );
+        SetFillColor( aWindowColor );
     }
 
     //--------------------------------------------------------------------
@@ -120,6 +125,39 @@ namespace svt { namespace table
             }
         }
     }
+
+
+    //--------------------------------------------------------------------
+    void TableControl::StateChanged( StateChangedType i_nStateChange )
+    {
+        Control::StateChanged( i_nStateChange );
+
+        // forward certain settings to the data window
+        switch ( i_nStateChange )
+        {
+        case STATE_CHANGE_CONTROLBACKGROUND:
+            if ( IsControlBackground() )
+                getDataWindow()->SetControlBackground( GetControlBackground() );
+            else
+                getDataWindow()->SetControlBackground();
+            break;
+
+        case STATE_CHANGE_CONTROLFOREGROUND:
+            if ( IsControlForeground() )
+                getDataWindow()->SetControlForeground( GetControlForeground() );
+            else
+                getDataWindow()->SetControlForeground();
+            break;
+
+        case STATE_CHANGE_CONTROLFONT:
+            if ( IsControlFont() )
+                getDataWindow()->SetControlFont( GetControlFont() );
+            else
+                getDataWindow()->SetControlFont();
+            break;
+        }
+    }
+
     //--------------------------------------------------------------------
     void TableControl::Resize()
     {
@@ -175,6 +213,11 @@ namespace svt { namespace table
         return m_pImpl->goTo( _nColPos, _nRowPos );
     }
     //--------------------------------------------------------------------
+    void TableControl::clearSelection()
+    {
+        m_pImpl->clearSelection();
+    }
+    //--------------------------------------------------------------------
     void TableControl::InvalidateDataWindow(RowPos _nRowStart, RowPos _nRowEnd, bool _bRemoved)
     {
         Rectangle _rRect;
diff --git a/svtools/source/table/tablecontrol_impl.cxx b/svtools/source/table/tablecontrol_impl.cxx
index 1526dbdb778d..3288ab6a4284 100644
--- a/svtools/source/table/tablecontrol_impl.cxx
+++ b/svtools/source/table/tablecontrol_impl.cxx
@@ -1647,6 +1647,12 @@ namespace svt { namespace table
     {
         return m_nRowSelected;
     }
+    //--------------------------------------------------------------------
+    void TableControl_Impl::clearSelection()
+    {
+        m_nRowSelected.clear();
+    }
+    //--------------------------------------------------------------------
     //-------------------------------------------------------------------------------
     void TableControl_Impl::removeSelectedRow(RowPos _nRowPos)
     {
diff --git a/svtools/source/table/tablecontrol_impl.hxx b/svtools/source/table/tablecontrol_impl.hxx
index 0a487c77c76c..12b518aa3578 100644
--- a/svtools/source/table/tablecontrol_impl.hxx
+++ b/svtools/source/table/tablecontrol_impl.hxx
@@ -204,6 +204,7 @@ namespace svt { namespace table
     /** updates the vector, which contains the selected rows after removing the row nRowPos*/
     void    removeSelectedRow(RowPos _nRowPos);
     void    invalidateRows();
+    void    clearSelection();
         // IAbstractTableControl
         virtual void    hideCursor();
         virtual void    showCursor();
diff --git a/svtools/source/table/tabledatawindow.cxx b/svtools/source/table/tabledatawindow.cxx
index e307071e2699..3245b7e84aac 100644
--- a/svtools/source/table/tabledatawindow.cxx
+++ b/svtools/source/table/tabledatawindow.cxx
@@ -47,6 +47,10 @@ namespace svt { namespace table
         ,m_rTableControl        ( _rTableControl )
         ,m_nRowAlreadySelected( -1 )
     {
+        // by default, use the background as determined by the style settings
+        const Color aWindowColor( GetSettings().GetStyleSettings().GetFieldColor() );
+        SetBackground( Wallpaper( aWindowColor ) );
+        SetFillColor( aWindowColor );
     }
 
     //--------------------------------------------------------------------
@@ -54,6 +58,7 @@ namespace svt { namespace table
     {
         m_rTableControl.doPaintContent( rUpdateRect );
     }
+
     //--------------------------------------------------------------------
     void TableDataWindow::MouseMove( const MouseEvent& rMEvt )
     {
diff --git a/svtools/source/uno/makefile.mk b/svtools/source/uno/makefile.mk
index 4a52960f448c..d207b1effd97 100644
--- a/svtools/source/uno/makefile.mk
+++ b/svtools/source/uno/makefile.mk
@@ -52,7 +52,7 @@ SLOFILES= \
             $(SLO)$/unoevent.obj \
             $(SLO)$/unoiface.obj \
             $(SLO)$/unoimap.obj \
-            $(SLO)$/svtxgridcontrol.obj 
+            $(SLO)$/svtxgridcontrol.obj
 
 # --- Targets ------------------------------------------------------
 
diff --git a/svtools/source/uno/miscservices.cxx b/svtools/source/uno/miscservices.cxx
index 433c1e1acbcb..e16a1ecb56dc 100644
--- a/svtools/source/uno/miscservices.cxx
+++ b/svtools/source/uno/miscservices.cxx
@@ -38,10 +38,13 @@
 #include <uno/mapping.hxx>
 #include "provider.hxx"
 #include "renderer.hxx"
+#include "unowizard.hxx"
 
 #include <com/sun/star/registry/XRegistryKey.hpp>
 #include "comphelper/servicedecl.hxx"
 
+#include "cppuhelper/implementationentry.hxx"
+
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::registry;
 using namespace ::com::sun::star::lang;
@@ -67,6 +70,20 @@ extern sdecl::ServiceDecl const serviceDecl;
         Reference< XInterface > SAL_CALL ImplName##_CreateInstance( const Reference< XMultiServiceFactory >& ); \
     }
 
+namespace
+{
+    static struct ::cppu::ImplementationEntry s_aServiceEntries[] =
+    {
+        {
+            ::svt::uno::Wizard::Create,
+            ::svt::uno::Wizard::getImplementationName_static,
+            ::svt::uno::Wizard::getSupportedServiceNames_static,
+            ::cppu::createSingleComponentFactory, NULL, 0
+        },
+        { 0, 0, 0, 0, 0, 0 }
+    };
+}
+
 // -------------------------------------------------------------------------------------
 
 DECLARE_CREATEINSTANCE_NAMESPACE( svt, OAddressBookSourceDialogUno )
@@ -126,9 +143,9 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo (
             xNewKey->createKey( aServices.getConstArray()[ i ] );
 
         if ( !component_writeInfoHelper( reinterpret_cast< lang::XMultiServiceFactory* >( pServiceManager ), reinterpret_cast< registry::XRegistryKey* >( _pRegistryKey ), serviceDecl ) )
-                return false;
+            return false;
 
-        return sal_True;
+        return ::cppu::component_writeInfoHelper( pServiceManager, _pRegistryKey, s_aServiceEntries );
     }
     return sal_False;
 }
@@ -185,6 +202,8 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory (
         else
         {
             pResult =  component_getFactoryHelper( pImplementationName, reinterpret_cast< lang::XMultiServiceFactory * >( _pServiceManager ),reinterpret_cast< registry::XRegistryKey* >( pRegistryKey ), serviceDecl );
+            if ( !pResult )
+                pResult = ::cppu::component_getFactoryHelper( pImplementationName, _pServiceManager, pRegistryKey, s_aServiceEntries );
         }
 
         if ( xFactory.is() )
diff --git a/svtools/source/uno/svtxgridcontrol.cxx b/svtools/source/uno/svtxgridcontrol.cxx
index b411181c2aab..264dfd6342f7 100755
--- a/svtools/source/uno/svtxgridcontrol.cxx
+++ b/svtools/source/uno/svtxgridcontrol.cxx
@@ -129,6 +129,18 @@ void SVTXGridControl::setProperty( const ::rtl::OUString& PropertyName, const An
     TableControl* pTable = (TableControl*)GetWindow();
     switch( GetPropertyId( PropertyName ) )
     {
+        case BASEPROPERTY_BACKGROUNDCOLOR:
+        {
+            // let the base class handle this for the TableControl
+            VCLXWindow::setProperty( PropertyName, aValue );
+            // and forward to the grid control's data window
+            if ( pTable->IsBackground() )
+                pTable->getDataWindow()->SetBackground( pTable->GetBackground() );
+            else
+                pTable->getDataWindow()->SetBackground();
+        }
+        break;
+
         case BASEPROPERTY_GRID_SELECTIONMODE:
         {
             SelectionType eSelectionType;
@@ -425,6 +437,8 @@ void SAL_CALL SVTXGridControl::setFocus() throw(::com::sun::star::uno::RuntimeEx
 }
 void SAL_CALL SVTXGridControl::rowAdded(const ::com::sun::star::awt::grid::GridDataEvent& Event ) throw (::com::sun::star::uno::RuntimeException)
 {
+    ::vos::OGuard aGuard( GetMutex() );
+
     std::vector< Any > newRow;
     Sequence< Any > rawRowData = Event.rowData;
     int colCount = m_xColumnModel->getColumnCount();
@@ -471,6 +485,8 @@ void SAL_CALL SVTXGridControl::rowAdded(const ::com::sun::star::awt::grid::GridD
 
 void SAL_CALL SVTXGridControl::rowRemoved(const ::com::sun::star::awt::grid::GridDataEvent& Event ) throw (::com::sun::star::uno::RuntimeException)
 {
+    ::vos::OGuard aGuard( GetMutex() );
+
     TableControl* pTable = (TableControl*)GetWindow();
     if(Event.index == -1)
     {
@@ -478,6 +494,7 @@ void SAL_CALL SVTXGridControl::rowRemoved(const ::com::sun::star::awt::grid::Gri
             deselectAllRows();
         if(m_pTableModel->hasRowHeaders())
             m_pTableModel->getRowHeaderName().clear();
+        pTable->clearSelection();
         m_pTableModel->getCellContent().clear();
         if(pTable->isAccessibleAlive())
         {
@@ -511,6 +528,8 @@ void SAL_CALL SVTXGridControl::rowRemoved(const ::com::sun::star::awt::grid::Gri
 
 void SAL_CALL  SVTXGridControl::columnChanged(const ::com::sun::star::awt::grid::GridColumnEvent& Event ) throw (::com::sun::star::uno::RuntimeException)
 {
+    ::vos::OGuard aGuard( GetMutex() );
+
     TableControl* pTable = (TableControl*)GetWindow();
     if(Event.valueName == rtl::OUString::createFromAscii("ColumnResize"))
     {
@@ -558,6 +577,8 @@ void SAL_CALL  SVTXGridControl::columnChanged(const ::com::sun::star::awt::grid:
 }
 void SAL_CALL  SVTXGridControl::dataChanged(const ::com::sun::star::awt::grid::GridDataEvent& Event ) throw (::com::sun::star::uno::RuntimeException)
 {
+    ::vos::OGuard aGuard( GetMutex() );
+
     TableControl* pTable = (TableControl*)GetWindow();
     if(Event.valueName == rtl::OUString::createFromAscii("RowHeight"))
     {
diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx
index e5a273bbbf6d..7fb1a007960f 100644
--- a/svtools/source/uno/treecontrolpeer.cxx
+++ b/svtools/source/uno/treecontrolpeer.cxx
@@ -34,6 +34,7 @@
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/view/SelectionType.hpp>
 #include <toolkit/helper/property.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 
 #include <com/sun/star/awt/tree/XMutableTreeNode.hpp>
 #include <treecontrolpeer.hxx>
@@ -196,9 +197,7 @@ void TreeControlPeer::addEntry( UnoTreeListEntry* pEntry )
             mpTreeNodeMap = new TreeNodeMap();
         }
 
-        const Reference< XTreeNode > xNormalizedNode( pEntry->mxNode, UNO_QUERY );
-        (*mpTreeNodeMap)[ xNormalizedNode ] = pEntry;
-        OSL_TRACE( "tree: adding %p => %p", xNormalizedNode.get(), pEntry );
+        (*mpTreeNodeMap)[ pEntry->mxNode ] = pEntry;
     }
 }
 
@@ -208,11 +207,9 @@ void TreeControlPeer::removeEntry( UnoTreeListEntry* pEntry )
 {
     if( mpTreeNodeMap && pEntry && pEntry->mxNode.is() )
     {
-        const Reference< XTreeNode > xNormalizedNode( pEntry->mxNode, UNO_QUERY );
-        TreeNodeMap::iterator aIter( mpTreeNodeMap->find( xNormalizedNode ) );
+        TreeNodeMap::iterator aIter( mpTreeNodeMap->find( pEntry->mxNode ) );
         if( aIter != mpTreeNodeMap->end() )
         {
-            OSL_TRACE( "tree: removing %p => %p", xNormalizedNode.get(), pEntry );
             mpTreeNodeMap->erase( aIter );
         }
     }
@@ -224,8 +221,7 @@ UnoTreeListEntry* TreeControlPeer::getEntry( const Reference< XTreeNode >& xNode
 {
     if( mpTreeNodeMap )
     {
-        const Reference< XTreeNode > xNormalizedNode( xNode, UNO_QUERY );
-        TreeNodeMap::iterator aIter( mpTreeNodeMap->find( xNormalizedNode ) );
+        TreeNodeMap::iterator aIter( mpTreeNodeMap->find( xNode ) );
         if( aIter != mpTreeNodeMap->end() )
             return (*aIter).second;
     }
@@ -287,14 +283,14 @@ UnoTreeListEntry* TreeControlPeer::createEntry( const Reference< XTreeNode >& xN
 
         pEntry->AddItem( pUnoItem );
 
+        mpTreeImpl->insert( pEntry, pParent, nPos );
+
         if( msDefaultExpandedGraphicURL.getLength() )
             mpTreeImpl->SetExpandedEntryBmp( pEntry, maDefaultExpandedImage );
 
         if( msDefaultCollapsedGraphicURL.getLength() )
             mpTreeImpl->SetCollapsedEntryBmp( pEntry, maDefaultCollapsedImage );
 
-        mpTreeImpl->insert( pEntry, pParent, nPos );
-
         updateEntry( pEntry );
     }
     return pEntry;
@@ -922,6 +918,19 @@ Reference< XTreeNode > SAL_CALL TreeControlPeer::getClosestNodeForLocation( sal_
 
 // -------------------------------------------------------------------
 
+awt::Rectangle SAL_CALL TreeControlPeer::getNodeRect( const Reference< XTreeNode >& i_Node ) throw (IllegalArgumentException, RuntimeException)
+{
+    ::vos::OGuard aGuard( GetMutex() );
+
+    UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow();
+    UnoTreeListEntry* pEntry = getEntry( i_Node, true );
+
+    ::Rectangle aEntryRect( rTree.GetFocusRect( pEntry, rTree.GetEntryPosition( pEntry ).Y() ) );
+    return VCLUnoHelper::ConvertToAWTRect( aEntryRect );
+}
+
+// -------------------------------------------------------------------
+
 sal_Bool SAL_CALL TreeControlPeer::isEditing(  ) throw (RuntimeException)
 {
     ::vos::OGuard aGuard( GetMutex() );
diff --git a/svtools/source/uno/treecontrolpeer.hxx b/svtools/source/uno/treecontrolpeer.hxx
index 015e131321f8..336830804a6f 100644
--- a/svtools/source/uno/treecontrolpeer.hxx
+++ b/svtools/source/uno/treecontrolpeer.hxx
@@ -91,6 +91,7 @@ public:
     virtual void SAL_CALL removeTreeExpansionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeExpansionListener >& Listener ) throw (::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode > SAL_CALL getNodeForLocation( ::sal_Int32 x, ::sal_Int32 y ) throw (::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode > SAL_CALL getClosestNodeForLocation( ::sal_Int32 x, ::sal_Int32 y ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::awt::Rectangle SAL_CALL getNodeRect( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode >& Node ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
     virtual ::sal_Bool SAL_CALL isEditing(  ) throw (::com::sun::star::uno::RuntimeException);
     virtual ::sal_Bool SAL_CALL stopEditing(  ) throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL cancelEditing(  ) throw (::com::sun::star::uno::RuntimeException);
diff --git a/svtools/source/uno/unowizard.hxx b/svtools/source/uno/unowizard.hxx
new file mode 100644
index 000000000000..ceb8fac14eb6
--- /dev/null
+++ b/svtools/source/uno/unowizard.hxx
@@ -0,0 +1,117 @@
+/*************************************************************************
+ * 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 SVT_UNO_WIZARD_HXX
+#define SVT_UNO_WIZARD_HXX
+
+#include "svtools/genericunodialog.hxx"
+
+/** === begin UNO includes === **/
+#include <com/sun/star/ui/dialogs/XWizard.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/ui/dialogs/XWizardController.hpp>
+/** === end UNO includes === **/
+
+#include <cppuhelper/implbase1.hxx>
+#include <comphelper/componentcontext.hxx>
+
+//......................................................................................................................
+namespace svt { namespace uno
+{
+//......................................................................................................................
+
+    //==================================================================================================================
+    //= Wizard - declaration
+    //==================================================================================================================
+    typedef ::cppu::ImplInheritanceHelper1  <   ::svt::OGenericUnoDialog
+                                            ,   ::com::sun::star::ui::dialogs::XWizard
+                                            >   Wizard_Base;
+    class Wizard;
+    typedef ::comphelper::OPropertyArrayUsageHelper< Wizard >  Wizard_PBase;
+    class Wizard    : public Wizard_Base
+                    , public Wizard_PBase
+    {
+    public:
+        Wizard( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_rContext );
+
+        // ::com::sun::star::lang::XServiceInfo - static version
+        static ::rtl::OUString SAL_CALL getImplementationName_static() throw(::com::sun::star::uno::RuntimeException);
+        static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_static() throw(::com::sun::star::uno::RuntimeException);
+        static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_rContext );
+
+    protected:
+        // ::com::sun::star::lang::XServiceInfo
+        virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException);
+
+        // ::com::sun::star::beans::XPropertySet
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo >  SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException);
+        virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
+
+        // OPropertyArrayUsageHelper
+        virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const;
+
+        // ::com::sun::star::ui::dialogs::XWizard
+        virtual ::rtl::OUString SAL_CALL getHelpURL() throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL setHelpURL( const ::rtl::OUString& _helpurl ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL getDialogWindow() throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XWizardPage > SAL_CALL getCurrentPage(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL enableButton( ::sal_Int16 WizardButton, ::sal_Bool Enable ) throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL setDefaultButton( ::sal_Int16 WizardButton ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::sal_Bool SAL_CALL travelNext(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::sal_Bool SAL_CALL travelPrevious(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL enablePage( ::sal_Int16 PageID, ::sal_Bool Enable ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::util::InvalidStateException, ::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL updateTravelUI(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::sal_Bool SAL_CALL advanceTo( ::sal_Int16 PageId ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::sal_Bool SAL_CALL goBackTo( ::sal_Int16 PageId ) throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL activatePath( ::sal_Int16 PathIndex, ::sal_Bool Final ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::util::InvalidStateException, ::com::sun::star::uno::RuntimeException);
+
+        // ::com::sun::star::ui::dialogs::XExecutableDialog
+        virtual void SAL_CALL setTitle( const ::rtl::OUString& aTitle ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::sal_Int16 SAL_CALL execute(  ) throw (::com::sun::star::uno::RuntimeException);
+
+        // ::com::sun::star::lang::XInitialization
+        virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
+
+   protected:
+        ~Wizard();
+
+    protected:
+        virtual Dialog* createDialog( Window* _pParent );
+        virtual void destroyDialog();
+
+    private:
+        ::comphelper::ComponentContext                                                          m_aContext;
+        ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< sal_Int16 > >         m_aWizardSteps;
+        ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XWizardController >    m_xController;
+        ::rtl::OUString                                                                         m_sHelpURL;
+    };
+
+//......................................................................................................................
+} } // namespace svt::uno
+//......................................................................................................................
+
+#endif // SVT_UNO_WIZARD_HXX
diff --git a/svtools/source/uno/wizard/makefile.mk b/svtools/source/uno/wizard/makefile.mk
new file mode 100644
index 000000000000..521496fc5d48
--- /dev/null
+++ b/svtools/source/uno/wizard/makefile.mk
@@ -0,0 +1,48 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=../../..
+
+PRJNAME=svtools
+TARGET=unowiz
+ENABLE_EXCEPTIONS=TRUE
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE : settings.mk
+.INCLUDE : $(PRJ)$/util$/svt.pmk
+
+# --- Files --------------------------------------------------------
+
+SLOFILES= \
+    $(SLO)$/unowizard.obj \
+    $(SLO)$/wizardshell.obj \
+    $(SLO)$/wizardpagecontroller.obj
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE : target.mk
diff --git a/svtools/source/uno/wizard/unowizard.cxx b/svtools/source/uno/wizard/unowizard.cxx
new file mode 100644
index 000000000000..9440c0e69f26
--- /dev/null
+++ b/svtools/source/uno/wizard/unowizard.cxx
@@ -0,0 +1,452 @@
+/*************************************************************************
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include "precompiled_svtools.hxx"
+
+#include "../unowizard.hxx"
+#include "wizardshell.hxx"
+
+/** === begin UNO includes === **/
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <com/sun/star/beans/XPropertySetInfo.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/ucb/AlreadyInitializedException.hpp>
+#include <com/sun/star/ui/dialogs/XWizardController.hpp>
+#include <com/sun/star/ui/dialogs/WizardButton.hpp>
+/** === end UNO includes === **/
+
+#include <tools/diagnose_ex.h>
+#include <rtl/strbuf.hxx>
+#include <vos/mutex.hxx>
+#include <vcl/svapp.hxx>
+
+//......................................................................................................................
+namespace svt { namespace uno
+{
+//......................................................................................................................
+
+    /** === begin UNO using === **/
+    using ::com::sun::star::uno::Reference;
+    using ::com::sun::star::uno::XInterface;
+    using ::com::sun::star::uno::UNO_QUERY;
+    using ::com::sun::star::uno::UNO_QUERY_THROW;
+    using ::com::sun::star::uno::UNO_SET_THROW;
+    using ::com::sun::star::uno::Exception;
+    using ::com::sun::star::uno::RuntimeException;
+    using ::com::sun::star::uno::Any;
+    using ::com::sun::star::uno::makeAny;
+    using ::com::sun::star::uno::Sequence;
+    using ::com::sun::star::uno::Type;
+    using ::com::sun::star::lang::XServiceInfo;
+    using ::com::sun::star::ui::dialogs::XWizard;
+    using ::com::sun::star::lang::XInitialization;
+    using ::com::sun::star::beans::XPropertySetInfo;
+    using ::com::sun::star::uno::XComponentContext;
+    using ::com::sun::star::beans::Property;
+    using ::com::sun::star::lang::IllegalArgumentException;
+    using ::com::sun::star::ucb::AlreadyInitializedException;
+    using ::com::sun::star::ui::dialogs::XWizardController;
+    using ::com::sun::star::ui::dialogs::XWizardPage;
+    using ::com::sun::star::container::NoSuchElementException;
+    using ::com::sun::star::util::InvalidStateException;
+    using ::com::sun::star::awt::XWindow;
+    /** === end UNO using === **/
+    namespace WizardButton = ::com::sun::star::ui::dialogs::WizardButton;
+
+    //------------------------------------------------------------------------------------------------------------------
+    namespace
+    {
+        sal_uInt32 lcl_convertWizardButtonToWZB( const sal_Int16 i_nWizardButton )
+        {
+            switch ( i_nWizardButton )
+            {
+            case WizardButton::NONE:        return WZB_NONE;
+            case WizardButton::NEXT:        return WZB_NEXT;
+            case WizardButton::PREVIOUS:    return WZB_PREVIOUS;
+            case WizardButton::FINISH:      return WZB_FINISH;
+            case WizardButton::CANCEL:      return WZB_CANCEL;
+            case WizardButton::HELP:        return WZB_HELP;
+            }
+            OSL_ENSURE( false, "lcl_convertWizardButtonToWZB: invalid WizardButton constant!" );
+            return WZB_NONE;
+        }
+    }
+
+    //==================================================================================================================
+    //= Wizard - implementation
+    //==================================================================================================================
+    //------------------------------------------------------------------------------------------------------------------
+    Wizard::Wizard( const Reference< XComponentContext >& _rxContext )
+        :Wizard_Base( _rxContext )
+        ,m_aContext( _rxContext )
+    {
+    }
+
+    //--------------------------------------------------------------------
+    Wizard::~Wizard()
+    {
+        // we do this here cause the base class' call to destroyDialog won't reach us anymore : we're within an dtor,
+        // so this virtual-method-call the base class does does not work, we're already dead then ...
+        if ( m_pDialog )
+        {
+            ::osl::MutexGuard aGuard( m_aMutex );
+            if ( m_pDialog )
+                destroyDialog();
+        }
+    }
+
+    //--------------------------------------------------------------------
+    Reference< XInterface > SAL_CALL Wizard::Create( const Reference< XComponentContext >& _rxContext )
+    {
+        return *(new Wizard( _rxContext ) );
+    }
+
+    //--------------------------------------------------------------------
+    namespace
+    {
+        static void lcl_checkPaths( const Sequence< Sequence< sal_Int16 > >& i_rPaths, const Reference< XInterface >& i_rContext )
+        {
+            // need at least one path
+            if ( i_rPaths.getLength() == 0 )
+                throw IllegalArgumentException( ::rtl::OUString(), i_rContext, 2 );
+
+            // each path must be of length 1, at least
+            for ( sal_Int32 i = 0; i < i_rPaths.getLength(); ++i )
+            {
+                if ( i_rPaths[i].getLength() == 0 )
+                    throw IllegalArgumentException( ::rtl::OUString(), i_rContext, 2 );
+
+                // page IDs must be in ascending order
+                sal_Int16 nPreviousPageID = i_rPaths[i][0];
+                for ( sal_Int32 j=1; j<i_rPaths[i].getLength(); ++j )
+                {
+                    if ( i_rPaths[i][j] <= nPreviousPageID )
+                    {
+                        ::rtl::OStringBuffer message;
+                        message.append( "Path " );
+                        message.append( i );
+                        message.append( ": invalid page ID sequence - each page ID must be greater than the previous one." );
+                        throw IllegalArgumentException(
+                            ::rtl::OStringToOUString( message.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US ),
+                            i_rContext, 2 );
+                    }
+                    nPreviousPageID = i_rPaths[i][j];
+                }
+            }
+
+            // if we have one path, that's okay
+            if ( i_rPaths.getLength() == 1 )
+                return;
+
+            // if we have multiple paths, they must start with the same page id
+            const sal_Int16 nFirstPageId = i_rPaths[0][0];
+            for ( sal_Int32 i = 0; i < i_rPaths.getLength(); ++i )
+            {
+                if ( i_rPaths[i][0] != nFirstPageId )
+                    throw IllegalArgumentException(
+                        ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "All paths must start with the same page id." ) ),
+                        i_rContext, 2 );
+            }
+        }
+    }
+
+    //--------------------------------------------------------------------
+    void SAL_CALL Wizard::initialize( const Sequence< Any >& i_Arguments ) throw (Exception, RuntimeException)
+    {
+        ::osl::MutexGuard aGuard( m_aMutex );
+        if ( m_bInitialized )
+            throw AlreadyInitializedException( ::rtl::OUString(), *this );
+
+        if ( i_Arguments.getLength() != 2 )
+            throw IllegalArgumentException( ::rtl::OUString(), *this, -1 );
+
+        // the second argument must be a XWizardController, for each constructor
+        m_xController.set( i_Arguments[1], UNO_QUERY );
+        if ( !m_xController.is() )
+            throw IllegalArgumentException( ::rtl::OUString(), *this, 2 );
+
+        // the first arg is either a single path (short[]), or multiple paths (short[][])
+        Sequence< sal_Int16 > aSinglePath;
+        i_Arguments[0] >>= aSinglePath;
+        Sequence< Sequence< sal_Int16 > > aMultiplePaths;
+        i_Arguments[0] >>= aMultiplePaths;
+
+        if ( !aMultiplePaths.getLength() )
+        {
+            aMultiplePaths.realloc(1);
+            aMultiplePaths[0] = aSinglePath;
+        }
+        lcl_checkPaths( aMultiplePaths, *this );
+        // if we survived this, the paths are valid, and we're done here ...
+        m_aWizardSteps = aMultiplePaths;
+
+        m_bInitialized = true;
+    }
+
+    //--------------------------------------------------------------------
+    Dialog* Wizard::createDialog( Window* i_pParent )
+    {
+        WizardShell* pDialog( new WizardShell( i_pParent, this, m_xController, m_aWizardSteps ) );
+        pDialog->SetSmartHelpId( SmartId( m_sHelpURL ) );
+        pDialog->setTitleBase( m_sTitle );
+        return pDialog;
+    }
+
+    //--------------------------------------------------------------------
+    void Wizard::destroyDialog()
+    {
+        if ( m_pDialog )
+            m_sHelpURL = m_pDialog->GetSmartHelpId().GetStr();
+
+        Wizard_Base::destroyDialog();
+    }
+
+    //--------------------------------------------------------------------
+    ::rtl::OUString SAL_CALL Wizard::getImplementationName_static() throw(RuntimeException)
+    {
+        return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.svtools.uno.Wizard" ) );
+    }
+
+    //--------------------------------------------------------------------
+    Sequence< ::rtl::OUString > SAL_CALL Wizard::getSupportedServiceNames_static() throw(RuntimeException)
+    {
+        Sequence< ::rtl::OUString > aServices(1);
+        aServices[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.Wizard" ) );
+        return aServices;
+    }
+
+    //--------------------------------------------------------------------
+    ::rtl::OUString SAL_CALL Wizard::getImplementationName() throw(RuntimeException)
+    {
+        return getImplementationName_static();
+    }
+
+    //--------------------------------------------------------------------
+    Sequence< ::rtl::OUString > SAL_CALL Wizard::getSupportedServiceNames() throw(RuntimeException)
+    {
+        return getSupportedServiceNames_static();
+    }
+
+    //--------------------------------------------------------------------
+    Reference< XPropertySetInfo > SAL_CALL Wizard::getPropertySetInfo() throw(RuntimeException)
+    {
+        return createPropertySetInfo( getInfoHelper() );
+    }
+
+    //--------------------------------------------------------------------
+    ::cppu::IPropertyArrayHelper& SAL_CALL Wizard::getInfoHelper()
+    {
+        return *const_cast< Wizard* >( this )->getArrayHelper();
+    }
+
+    //--------------------------------------------------------------------
+    ::cppu::IPropertyArrayHelper* Wizard::createArrayHelper( ) const
+    {
+        Sequence< Property > aProps;
+        describeProperties( aProps );
+        return new ::cppu::OPropertyArrayHelper( aProps );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    ::rtl::OUString SAL_CALL Wizard::getHelpURL() throw (RuntimeException)
+    {
+        ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+        ::osl::MutexGuard aGuard( m_aMutex );
+
+        if ( !m_pDialog )
+            return m_sHelpURL;
+
+        const SmartId aSmartId( m_pDialog->GetSmartHelpId() );
+        return aSmartId.GetStr();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL Wizard::setHelpURL( const ::rtl::OUString& i_HelpURL ) throw (RuntimeException)
+    {
+        ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+        ::osl::MutexGuard aGuard( m_aMutex );
+
+        if ( !m_pDialog )
+            m_sHelpURL = i_HelpURL;
+        else
+            m_pDialog->SetSmartHelpId( SmartId( i_HelpURL ) );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    Reference< XWindow > SAL_CALL Wizard::getDialogWindow() throw (RuntimeException)
+    {
+        ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+        ::osl::MutexGuard aGuard( m_aMutex );
+
+        ENSURE_OR_RETURN( m_pDialog, "Wizard::getDialogWindow: illegal call (execution did not start, yet)!", NULL );
+        return Reference< XWindow >( m_pDialog->GetComponentInterface(), UNO_QUERY );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL Wizard::enableButton( ::sal_Int16 i_WizardButton, ::sal_Bool i_Enable ) throw (RuntimeException)
+    {
+        ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+        ::osl::MutexGuard aGuard( m_aMutex );
+
+        WizardShell* pWizardImpl = dynamic_cast< WizardShell* >( m_pDialog );
+        ENSURE_OR_RETURN_VOID( pWizardImpl, "Wizard::enableButtons: invalid dialog implementation!" );
+
+        pWizardImpl->enableButtons( lcl_convertWizardButtonToWZB( i_WizardButton ), i_Enable );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL Wizard::setDefaultButton( ::sal_Int16 i_WizardButton ) throw (RuntimeException)
+    {
+        ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+        ::osl::MutexGuard aGuard( m_aMutex );
+
+        WizardShell* pWizardImpl = dynamic_cast< WizardShell* >( m_pDialog );
+        ENSURE_OR_RETURN_VOID( pWizardImpl, "Wizard::setDefaultButton: invalid dialog implementation!" );
+
+        pWizardImpl->defaultButton( lcl_convertWizardButtonToWZB( i_WizardButton ) );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    sal_Bool SAL_CALL Wizard::travelNext(  ) throw (RuntimeException)
+    {
+        ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+        ::osl::MutexGuard aGuard( m_aMutex );
+
+        WizardShell* pWizardImpl = dynamic_cast< WizardShell* >( m_pDialog );
+        ENSURE_OR_RETURN_FALSE( pWizardImpl, "Wizard::travelNext: invalid dialog implementation!" );
+
+        return pWizardImpl->travelNext();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    sal_Bool SAL_CALL Wizard::travelPrevious(  ) throw (RuntimeException)
+    {
+        ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+        ::osl::MutexGuard aGuard( m_aMutex );
+
+        WizardShell* pWizardImpl = dynamic_cast< WizardShell* >( m_pDialog );
+        ENSURE_OR_RETURN_FALSE( pWizardImpl, "Wizard::travelPrevious: invalid dialog implementation!" );
+
+        return pWizardImpl->travelPrevious();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL Wizard::enablePage( ::sal_Int16 i_PageID, ::sal_Bool i_Enable ) throw (NoSuchElementException, InvalidStateException, RuntimeException)
+    {
+        ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+        ::osl::MutexGuard aGuard( m_aMutex );
+
+        WizardShell* pWizardImpl = dynamic_cast< WizardShell* >( m_pDialog );
+        ENSURE_OR_RETURN_VOID( pWizardImpl, "Wizard::enablePage: invalid dialog implementation!" );
+
+        if ( !pWizardImpl->knowsPage( i_PageID ) )
+            throw NoSuchElementException( ::rtl::OUString(), *this );
+
+        if ( i_PageID == pWizardImpl->getCurrentPage() )
+            throw InvalidStateException( ::rtl::OUString(), *this );
+
+        pWizardImpl->enablePage( i_PageID, i_Enable );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL Wizard::updateTravelUI(  ) throw (RuntimeException)
+    {
+        ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+        ::osl::MutexGuard aGuard( m_aMutex );
+
+        WizardShell* pWizardImpl = dynamic_cast< WizardShell* >( m_pDialog );
+        ENSURE_OR_RETURN_VOID( pWizardImpl, "Wizard::updateTravelUI: invalid dialog implementation!" );
+
+        pWizardImpl->updateTravelUI();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    ::sal_Bool SAL_CALL Wizard::advanceTo( ::sal_Int16 i_PageId ) throw (RuntimeException)
+    {
+        ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+        ::osl::MutexGuard aGuard( m_aMutex );
+
+        WizardShell* pWizardImpl = dynamic_cast< WizardShell* >( m_pDialog );
+        ENSURE_OR_RETURN_FALSE( pWizardImpl, "Wizard::advanceTo: invalid dialog implementation!" );
+
+        return pWizardImpl->advanceTo( i_PageId );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    ::sal_Bool SAL_CALL Wizard::goBackTo( ::sal_Int16 i_PageId ) throw (RuntimeException)
+    {
+        ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+        ::osl::MutexGuard aGuard( m_aMutex );
+
+        WizardShell* pWizardImpl = dynamic_cast< WizardShell* >( m_pDialog );
+        ENSURE_OR_RETURN_FALSE( pWizardImpl, "Wizard::goBackTo: invalid dialog implementation!" );
+
+        return pWizardImpl->goBackTo( i_PageId );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    Reference< XWizardPage > SAL_CALL Wizard::getCurrentPage(  ) throw (RuntimeException)
+    {
+        ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+        ::osl::MutexGuard aGuard( m_aMutex );
+
+        WizardShell* pWizardImpl = dynamic_cast< WizardShell* >( m_pDialog );
+        ENSURE_OR_RETURN_FALSE( pWizardImpl, "Wizard::getCurrentPage: invalid dialog implementation!" );
+
+        return pWizardImpl->getCurrentWizardPage();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL Wizard::activatePath( ::sal_Int16 i_PathIndex, ::sal_Bool i_Final ) throw (NoSuchElementException, InvalidStateException, RuntimeException)
+    {
+        ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+        ::osl::MutexGuard aGuard( m_aMutex );
+
+        if ( ( i_PathIndex < 0 ) || ( i_PathIndex >= m_aWizardSteps.getLength() ) )
+            throw NoSuchElementException( ::rtl::OUString(), *this );
+
+        WizardShell* pWizardImpl = dynamic_cast< WizardShell* >( m_pDialog );
+        ENSURE_OR_RETURN_VOID( pWizardImpl, "Wizard::activatePath: invalid dialog implementation!" );
+
+        pWizardImpl->activatePath( i_PathIndex, i_Final );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL Wizard::setTitle( const ::rtl::OUString& i_Title ) throw (RuntimeException)
+    {
+        // simply disambiguate
+        Wizard_Base::OGenericUnoDialog::setTitle( i_Title );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    ::sal_Int16 SAL_CALL Wizard::execute(  ) throw (RuntimeException)
+    {
+        return Wizard_Base::OGenericUnoDialog::execute();
+    }
+
+//......................................................................................................................
+} } // namespace svt::uno
+//......................................................................................................................
diff --git a/svtools/source/uno/wizard/wizardpagecontroller.cxx b/svtools/source/uno/wizard/wizardpagecontroller.cxx
new file mode 100644
index 000000000000..d6f7029b477c
--- /dev/null
+++ b/svtools/source/uno/wizard/wizardpagecontroller.cxx
@@ -0,0 +1,190 @@
+/*************************************************************************
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include "precompiled_svtools.hxx"
+
+#include "wizardpagecontroller.hxx"
+#include "wizardshell.hxx"
+
+/** === begin UNO includes === **/
+#include <com/sun/star/lang/XComponent.hpp>
+#include <com/sun/star/awt/XControl.hpp>
+/** === end UNO includes === **/
+
+#include <toolkit/helper/vclunohelper.hxx>
+#include <tools/diagnose_ex.h>
+
+//......................................................................................................................
+namespace svt { namespace uno
+{
+//......................................................................................................................
+
+    /** === begin UNO using === **/
+    using ::com::sun::star::uno::Reference;
+    using ::com::sun::star::uno::XInterface;
+    using ::com::sun::star::uno::UNO_QUERY;
+    using ::com::sun::star::uno::UNO_QUERY_THROW;
+    using ::com::sun::star::uno::UNO_SET_THROW;
+    using ::com::sun::star::uno::Exception;
+    using ::com::sun::star::uno::RuntimeException;
+    using ::com::sun::star::uno::Any;
+    using ::com::sun::star::uno::makeAny;
+    using ::com::sun::star::uno::Sequence;
+    using ::com::sun::star::uno::Type;
+    using ::com::sun::star::ui::dialogs::XWizardController;
+    using ::com::sun::star::awt::XWindow;
+    using ::com::sun::star::lang::XComponent;
+    using ::com::sun::star::awt::XControl;
+    /** === end UNO using === **/
+    using namespace ::com::sun::star;
+
+    //==================================================================================================================
+    //= WizardPageController
+    //==================================================================================================================
+    //------------------------------------------------------------------------------------------------------------------
+    WizardPageController::WizardPageController( WizardShell& i_rParent, const Reference< XWizardController >& i_rController,
+            const sal_Int16 i_nPageId )
+        :m_xController( i_rController )
+        ,m_xWizardPage()
+        ,m_nPageId( i_nPageId )
+    {
+        ENSURE_OR_THROW( m_xController.is(), "no controller" );
+        try
+        {
+            m_xWizardPage.set( m_xController->createPage(
+                Reference< XWindow >( i_rParent.GetComponentInterface( TRUE ), UNO_QUERY_THROW ),
+                m_nPageId
+            ), UNO_SET_THROW );
+
+            Reference< XWindow > xPageWindow( m_xWizardPage->getWindow(), UNO_SET_THROW );
+            xPageWindow->setVisible( sal_True );
+
+            TabPage* pTabPage( getTabPage() );
+            if ( pTabPage )
+                pTabPage->SetStyle( pTabPage->GetStyle() | WB_CHILDDLGCTRL | WB_DIALOGCONTROL );
+        }
+        catch( const Exception& )
+        {
+            DBG_UNHANDLED_EXCEPTION();
+        }
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    WizardPageController::~WizardPageController()
+    {
+        try
+        {
+            if ( m_xWizardPage.is() )
+                m_xWizardPage->dispose();
+        }
+        catch( const Exception& )
+        {
+            DBG_UNHANDLED_EXCEPTION();
+        }
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    TabPage* WizardPageController::getTabPage() const
+    {
+        ENSURE_OR_RETURN( m_xWizardPage.is(), "WizardPageController::getTabPage: no external wizard page!", NULL );
+        try
+        {
+            Reference< XWindow > xPageWindow( m_xWizardPage->getWindow(), UNO_SET_THROW );
+            Window* pPageWindow = VCLUnoHelper::GetWindow( xPageWindow );
+            if ( pPageWindow == NULL )
+            {
+                // windows created via the XContainerWindowProvider might be controls, not real windows, so resolve
+                // that one indirection
+                const Reference< XControl > xPageControl( m_xWizardPage->getWindow(), UNO_QUERY_THROW );
+                xPageWindow.set( xPageControl->getPeer(), UNO_QUERY_THROW );
+                pPageWindow = VCLUnoHelper::GetWindow( xPageWindow );
+            }
+
+            OSL_ENSURE( pPageWindow != NULL, "WizardPageController::getTabPage: unable to find the Window implementation for the page's window!" );
+            return dynamic_cast< TabPage* >( pPageWindow );
+        }
+        catch( const Exception& )
+        {
+            DBG_UNHANDLED_EXCEPTION();
+        }
+        return NULL;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void WizardPageController::initializePage()
+    {
+        if ( !m_xWizardPage.is() )
+            return;
+
+        try
+        {
+            m_xWizardPage->activatePage();
+        }
+        catch( const Exception& )
+        {
+            DBG_UNHANDLED_EXCEPTION();
+        }
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    sal_Bool WizardPageController::commitPage( WizardTypes::CommitPageReason i_eReason )
+    {
+        if ( !m_xWizardPage.is() )
+            return sal_True;
+
+        try
+        {
+            return m_xWizardPage->commitPage( WizardShell::convertCommitReasonToTravelType( i_eReason ) );
+        }
+        catch( const Exception& )
+        {
+            DBG_UNHANDLED_EXCEPTION();
+        }
+
+        return sal_True;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    bool WizardPageController::canAdvance() const
+    {
+        if ( !m_xWizardPage.is() )
+            return true;
+
+        try
+        {
+            return m_xWizardPage->canAdvance();
+        }
+        catch( const Exception& )
+        {
+            DBG_UNHANDLED_EXCEPTION();
+        }
+
+        return true;
+    }
+
+//......................................................................................................................
+} } // namespace svt::uno
+//......................................................................................................................
diff --git a/svtools/source/uno/wizard/wizardpagecontroller.hxx b/svtools/source/uno/wizard/wizardpagecontroller.hxx
new file mode 100644
index 000000000000..9de04d2f0dd4
--- /dev/null
+++ b/svtools/source/uno/wizard/wizardpagecontroller.hxx
@@ -0,0 +1,75 @@
+/*************************************************************************
+ * 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 SVT_UNOWIZ_WIZARDPAGECONTROLLER_HXX
+#define SVT_UNOWIZ_WIZARDPAGECONTROLLER_HXX
+
+#include "svtools/wizardmachine.hxx"
+
+/** === begin UNO includes === **/
+#include <com/sun/star/ui/dialogs/XWizardController.hpp>
+/** === end UNO includes === **/
+
+//......................................................................................................................
+namespace svt { namespace uno
+{
+//......................................................................................................................
+
+    class WizardShell;
+
+    //==================================================================================================================
+    //= WizardPageController
+    //==================================================================================================================
+    class WizardPageController : public IWizardPageController
+    {
+    public:
+        WizardPageController(
+            WizardShell& i_rParent,
+            const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XWizardController >& i_rController,
+            const sal_Int16 i_nPageId
+        );
+        ~WizardPageController();
+
+        // IWizardPageController overridables
+        virtual void        initializePage();
+        virtual sal_Bool    commitPage( WizardTypes::CommitPageReason _eReason );
+        virtual bool        canAdvance() const;
+
+        const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XWizardPage >&
+                            getWizardPage() const { return m_xWizardPage; }
+        TabPage*            getTabPage() const;
+
+    private:
+        const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XWizardController >  m_xController;
+        ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XWizardPage >              m_xWizardPage;
+        const sal_Int16                                                                             m_nPageId;
+    };
+
+//......................................................................................................................
+} } // namespace svt::uno
+//......................................................................................................................
+
+#endif // SVT_UNOWIZ_WIZARDPAGECONTROLLER_HXX
diff --git a/svtools/source/uno/wizard/wizardshell.cxx b/svtools/source/uno/wizard/wizardshell.cxx
new file mode 100644
index 000000000000..7737b214ac1f
--- /dev/null
+++ b/svtools/source/uno/wizard/wizardshell.cxx
@@ -0,0 +1,279 @@
+/*************************************************************************
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include "precompiled_svtools.hxx"
+
+#include "wizardshell.hxx"
+#include "wizardpagecontroller.hxx"
+
+#include <tools/diagnose_ex.h>
+
+/** === begin UNO includes === **/
+#include <com/sun/star/ui/dialogs/WizardTravelType.hpp>
+/** === end UNO includes === **/
+
+#include <vcl/msgbox.hxx>
+
+//......................................................................................................................
+namespace svt { namespace uno
+{
+//......................................................................................................................
+
+    /** === begin UNO using === **/
+    using ::com::sun::star::uno::Reference;
+    using ::com::sun::star::uno::XInterface;
+    using ::com::sun::star::uno::UNO_QUERY;
+    using ::com::sun::star::uno::UNO_QUERY_THROW;
+    using ::com::sun::star::uno::UNO_SET_THROW;
+    using ::com::sun::star::uno::Exception;
+    using ::com::sun::star::uno::RuntimeException;
+    using ::com::sun::star::uno::Any;
+    using ::com::sun::star::uno::makeAny;
+    using ::com::sun::star::uno::Sequence;
+    using ::com::sun::star::uno::Type;
+    using ::com::sun::star::ui::dialogs::XWizardController;
+    using ::com::sun::star::ui::dialogs::XWizard;
+    using ::com::sun::star::ui::dialogs::XWizardPage;
+    /** === end UNO using === **/
+    namespace WizardTravelType = ::com::sun::star::ui::dialogs::WizardTravelType;
+
+    //==================================================================================================================
+    namespace
+    {
+        //--------------------------------------------------------------------------------------------------------------
+        sal_Int16 lcl_determineFirstPageID( const Sequence< Sequence< sal_Int16 > >& i_rPaths )
+        {
+            ENSURE_OR_THROW( ( i_rPaths.getLength() > 0 ) && ( i_rPaths[0].getLength() > 0 ), "illegal paths" );
+            return i_rPaths[0][0];
+        }
+    }
+
+    //==================================================================================================================
+    //= WizardShell
+    //==================================================================================================================
+    //------------------------------------------------------------------------------------------------------------------
+    WizardShell::WizardShell( Window* i_pParent, const Reference< XWizard >& i_rWizard, const Reference< XWizardController >& i_rController,
+            const Sequence< Sequence< sal_Int16 > >& i_rPaths )
+        :WizardShell_Base( i_pParent, WB_MOVEABLE | WB_CLOSEABLE )
+        ,m_xWizard( i_rWizard )
+        ,m_xController( i_rController )
+        ,m_nFirstPageID( lcl_determineFirstPageID( i_rPaths ) )
+    {
+        ENSURE_OR_THROW( m_xWizard.is() && m_xController.is(), "invalid wizard/controller" );
+
+        // declare the paths
+        for ( sal_Int32 i=0; i<i_rPaths.getLength(); ++i )
+        {
+            const Sequence< sal_Int16 >& rPath( i_rPaths[i] );
+            WizardPath aPath( rPath.getLength() );
+            for ( sal_Int32 j=0; j<rPath.getLength(); ++j )
+                aPath[j] = impl_pageIdToState( rPath[j] );
+            declarePath( i, aPath );
+        }
+
+        // create the first page, to know the page size
+        TabPage* pStartPage = GetOrCreatePage( impl_pageIdToState( i_rPaths[0][0] ) );
+        SetPageSizePixel( pStartPage->GetSizePixel() );
+
+        // some defaults
+        ShowButtonFixedLine( true );
+        SetRoadmapInteractive( true );
+        enableAutomaticNextButtonState();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    WizardShell::~WizardShell()
+    {
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    short WizardShell::Execute()
+    {
+        ActivatePage();
+        return WizardShell_Base::Execute();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    sal_Int16 WizardShell::convertCommitReasonToTravelType( const CommitPageReason i_eReason )
+    {
+        switch ( i_eReason )
+        {
+        case WizardTypes::eTravelForward:
+            return WizardTravelType::FORWARD;
+
+        case WizardTypes::eTravelBackward:
+            return WizardTravelType::BACKWARD;
+
+        case WizardTypes::eFinish:
+            return WizardTravelType::FINISH;
+
+        default:
+            break;
+        }
+        OSL_ENSURE( false, "WizardShell::convertCommitReasonToTravelType: unsupported CommitPageReason!" );
+        return WizardTravelType::FINISH;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void WizardShell::enterState( WizardState i_nState )
+    {
+        WizardShell_Base::enterState( i_nState );
+
+        if ( !m_xController.is() )
+            return;
+
+        try
+        {
+            m_xController->onActivatePage( impl_stateToPageId( i_nState ) );
+        }
+        catch( const Exception& )
+        {
+            DBG_UNHANDLED_EXCEPTION();
+        }
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    sal_Bool WizardShell::leaveState( WizardState i_nState )
+    {
+        if ( !WizardShell_Base::leaveState( i_nState ) )
+            return sal_False;
+
+        if ( !m_xController.is() )
+            return sal_True;
+
+        try
+        {
+            m_xController->onDeactivatePage( impl_stateToPageId( i_nState ) );
+        }
+        catch( const Exception& )
+        {
+            DBG_UNHANDLED_EXCEPTION();
+        }
+
+        return sal_True;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    PWizardPageController WizardShell::impl_getController( TabPage* i_pPage ) const
+    {
+        Page2ControllerMap::const_iterator pos = m_aPageControllers.find( i_pPage );
+        ENSURE_OR_RETURN( pos != m_aPageControllers.end(), "WizardShell::impl_getController: no controller for this page!", PWizardPageController() );
+        return pos->second;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    Reference< XWizardPage > WizardShell::getCurrentWizardPage() const
+    {
+        const WizardState eState = getCurrentState();
+
+        PWizardPageController pController( impl_getController( GetPage( eState ) ) );
+        ENSURE_OR_RETURN( pController, "WizardShell::getCurrentWizardPage: invalid page/controller!", NULL );
+
+        return pController->getWizardPage();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    void WizardShell::enablePage( const sal_Int16 i_nPageID, const sal_Bool i_bEnable )
+    {
+        enableState( impl_pageIdToState( i_nPageID ), i_bEnable );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    TabPage* WizardShell::createPage( WizardState i_nState )
+    {
+        ENSURE_OR_RETURN( m_xController.is(), "WizardShell::createPage: no WizardController!", NULL );
+
+        ::boost::shared_ptr< WizardPageController > pController( new WizardPageController( *this, m_xController, impl_stateToPageId( i_nState ) ) );
+        TabPage* pPage = pController->getTabPage();
+        OSL_ENSURE( pPage != NULL, "WizardShell::createPage: illegal tab page!" );
+        if ( pPage == NULL )
+        {
+            // fallback for ill-behaved clients: empty page
+            pPage = new TabPage( this, 0 );
+            pPage->SetSizePixel( LogicToPixel( Size( 280, 185 ), MAP_APPFONT ) );
+        }
+
+        m_aPageControllers[ pPage ] = pController;
+        return pPage;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    IWizardPageController* WizardShell::getPageController( TabPage* i_pCurrentPage ) const
+    {
+        return impl_getController( i_pCurrentPage ).get();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    String WizardShell::getStateDisplayName( WizardState i_nState ) const
+    {
+        try
+        {
+            if ( m_xController.is() )
+                return m_xController->getPageTitle( impl_stateToPageId( i_nState ) );
+        }
+        catch( const Exception& )
+        {
+            DBG_UNHANDLED_EXCEPTION();
+        }
+        // fallback for ill-behaved clients: the numeric state
+        return String::CreateFromInt32( i_nState );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    bool WizardShell::canAdvance() const
+    {
+        try
+        {
+            if ( m_xController.is() && !m_xController->canAdvance() )
+                return false;
+        }
+        catch( const Exception& )
+        {
+            DBG_UNHANDLED_EXCEPTION();
+        }
+
+        return WizardShell_Base::canAdvance();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    sal_Bool WizardShell::onFinish()
+    {
+        try
+        {
+            if ( m_xController.is() && !m_xController->confirmFinish() )
+                return sal_False;
+        }
+        catch( const Exception& )
+        {
+            DBG_UNHANDLED_EXCEPTION();
+        }
+
+        return WizardShell_Base::onFinish();
+    }
+
+//......................................................................................................................
+} } // namespace svt::uno
+//......................................................................................................................
diff --git a/svtools/source/uno/wizard/wizardshell.hxx b/svtools/source/uno/wizard/wizardshell.hxx
new file mode 100644
index 000000000000..7cc656832d81
--- /dev/null
+++ b/svtools/source/uno/wizard/wizardshell.hxx
@@ -0,0 +1,146 @@
+/*************************************************************************
+ * 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 SVT_UNO_WIZARD_SHELL
+#define SVT_UNO_WIZARD_SHELL
+
+/** === begin UNO includes === **/
+#include <com/sun/star/ui/dialogs/XWizardController.hpp>
+#include <com/sun/star/ui/dialogs/XWizard.hpp>
+/** === end UNO includes === **/
+
+#include <svtools/roadmapwizard.hxx>
+
+#include <boost/shared_ptr.hpp>
+#include <map>
+
+//......................................................................................................................
+namespace svt { namespace uno
+{
+//......................................................................................................................
+
+    class WizardPageController;
+    typedef ::boost::shared_ptr< WizardPageController > PWizardPageController;
+
+    //==================================================================================================================
+    //= WizardShell
+    //==================================================================================================================
+    typedef ::svt::RoadmapWizard    WizardShell_Base;
+    class WizardShell : public WizardShell_Base
+    {
+    public:
+        WizardShell(
+            Window* _pParent,
+            const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XWizard >& i_rWizard,
+            const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XWizardController >& i_rController,
+            const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< sal_Int16 > >& i_rPaths
+        );
+        virtual ~WizardShell();
+
+        // Dialog overridables
+        virtual short   Execute();
+
+        // OWizardMachine overridables
+        virtual TabPage*    createPage( WizardState i_nState );
+        virtual void        enterState( WizardState i_nState );
+        virtual sal_Bool    leaveState( WizardState i_nState );
+        virtual String      getStateDisplayName( WizardState i_nState ) const;
+        virtual bool        canAdvance() const;
+        virtual sal_Bool    onFinish();
+        virtual IWizardPageController*
+                            getPageController( TabPage* _pCurrentPage ) const;
+
+        // attribute access
+        const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XWizard >&
+            getWizard() const { return m_xWizard; }
+
+        static sal_Int16 convertCommitReasonToTravelType( const CommitPageReason i_eReason );
+
+        // operations
+        sal_Bool    advanceTo( const sal_Int16 i_nPageId )
+        {
+            return skipUntil( impl_pageIdToState( i_nPageId ) );
+        }
+        sal_Bool    goBackTo( const sal_Int16 i_nPageId )
+        {
+            return skipBackwardUntil( impl_pageIdToState( i_nPageId ) );
+        }
+        sal_Bool    travelNext()        { return WizardShell_Base::travelNext(); }
+        sal_Bool    travelPrevious()    { return WizardShell_Base::travelPrevious(); }
+
+        void        activatePath( const sal_Int16 i_nPathID, const sal_Bool i_bFinal )
+        {
+            WizardShell_Base::activatePath( PathId( i_nPathID ), i_bFinal );
+        }
+
+        ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XWizardPage >
+                    getCurrentWizardPage() const;
+
+        sal_Int16   getCurrentPage() const
+        {
+            return impl_stateToPageId( getCurrentState() );
+        }
+
+        void        enablePage( const sal_Int16 i_PageID, const sal_Bool i_Enable );
+
+        bool        knowsPage( const sal_Int16 i_nPageID ) const
+        {
+            return knowsState( impl_pageIdToState( i_nPageID ) );
+        }
+
+    private:
+        sal_Int16   impl_stateToPageId( const WizardTypes::WizardState i_nState ) const
+        {
+            return static_cast< sal_Int16 >( i_nState + m_nFirstPageID );
+        }
+
+        WizardState impl_pageIdToState( const sal_Int16 i_nPageId ) const
+        {
+            return static_cast< WizardState >( i_nPageId - m_nFirstPageID );
+        }
+
+        PWizardPageController impl_getController( TabPage* i_pPage ) const;
+
+        // prevent outside access to some base class members
+        using WizardShell_Base::skip;
+        using WizardShell_Base::skipUntil;
+        using WizardShell_Base::skipBackwardUntil;
+        using WizardShell_Base::getCurrentState;
+
+    private:
+        typedef ::std::map< TabPage*, PWizardPageController > Page2ControllerMap;
+
+        const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XWizard >            m_xWizard;
+        const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XWizardController >  m_xController;
+        const sal_Int16                                                                             m_nFirstPageID;
+        Page2ControllerMap                                                                          m_aPageControllers;
+    };
+
+//......................................................................................................................
+} } // namespace svt::uno
+//......................................................................................................................
+
+#endif // SVT_UNO_WIZARD_SHELL