convert document recovery dialog to .ui

and move sidebar global resource defines up to the toplevel so its harder to
collide with them and adjust the define to indicate the next free resource
id.

and simplify the dialog down a good bit and remove intermediate classes
etc.

Change-Id: I8d6db17fcdfc86457368d7f432bd96f6f3aa182d

17 files changed, 455 insertions, 521 deletions

diff --git a/svx/UIConfig_svx.mk b/svx/UIConfig_svx.mk
index 5388669e5885..746dc32cb8e9 100644
--- a/svx/UIConfig_svx.mk
+++ b/svx/UIConfig_svx.mk
@@ -23,6 +23,7 @@ $(eval $(call gb_UIConfig_add_uifiles,svx,\
 	svx/uiconfig/ui/compressgraphicdialog \
 	svx/uiconfig/ui/deleteheaderdialog \
 	svx/uiconfig/ui/deletefooterdialog \
+	svx/uiconfig/ui/docrecoveryrecoverdialog \
 	svx/uiconfig/ui/docrecoverysavedialog \
 	svx/uiconfig/ui/extrustiondepthdialog \
 	svx/uiconfig/ui/findreplacedialog \
diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx
index e2c9b4079c52..d9d41d0eef37 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -65,68 +65,6 @@ namespace svx{
 using namespace ::rtl;
 using namespace ::osl;
 
-
-TabDialog4Recovery::TabDialog4Recovery(Window* pParent)
-    : TabDialog    (pParent, SVX_RES( RID_SVX_TABDLG_DOCRECOVERY ))
-    , m_pActualPage(m_lTabPages.begin()                           )
-{
-}
-
-
-TabDialog4Recovery::~TabDialog4Recovery()
-{
-    m_lTabPages.clear();
-}
-
-
-void TabDialog4Recovery::addTabPage(IExtendedTabPage* pPage)
-{
-    if (pPage)
-        m_lTabPages.push_back(pPage);
-}
-
-
-short TabDialog4Recovery::Execute()
-{
-    ::SolarMutexGuard aLock;
-
-    Show();
-    m_pActualPage = m_lTabPages.begin();
-    while(true)
-    {
-        IExtendedTabPage* pPage = *m_pActualPage;
-        SetViewWindow(pPage);
-        pPage->Show();
-        pPage->setDefButton();
-        short nRet = pPage->execute();
-        pPage->Hide();
-
-        switch(nRet)
-        {
-            case DLG_RET_OK :
-                {
-                    ++m_pActualPage;
-                    if (m_pActualPage == m_lTabPages.end())
-                        return nRet;
-                }
-                break;
-
-            case DLG_RET_BACK :
-                {
-                    if (m_pActualPage != m_lTabPages.begin())
-                        --m_pActualPage;
-                }
-                break;
-
-            case DLG_RET_UNKNOWN :
-            case DLG_RET_CANCEL :
-            case DLG_RET_OK_AUTOLUNCH :
-                return nRet;
-        }
-    }
-}
-
-
 RecoveryCore::RecoveryCore(const css::uno::Reference< css::uno::XComponentContext >& rxContext,
                                  bool                                            bUsedForSaving)
     : m_xContext        ( rxContext    )
@@ -580,7 +518,6 @@ css::util::URL RecoveryCore::impl_getParsedURL(const OUString& sURL)
     return aURL;
 }
 
-
 PluginProgressWindow::PluginProgressWindow(      Window*                                       pParent  ,
                                            const css::uno::Reference< css::lang::XComponent >& xProgress)
     : Window     (pParent  )
@@ -592,7 +529,6 @@ PluginProgressWindow::PluginProgressWindow(      Window*
     setPosSizePixel( -9, 0, aParentSize.Width() + 15, aParentSize.Height() - 4 );
 }
 
-
 PluginProgressWindow::~PluginProgressWindow()
 {
     if (m_xProgress.is())
@@ -679,7 +615,8 @@ void SAL_CALL PluginProgress::reset()
 
 
 SaveDialog::SaveDialog(Window* pParent, RecoveryCore* pCore)
-    : Dialog(pParent, "DocRecoverySaveDialog", "svx/ui/docrecoverysavedialog.ui")
+    : Dialog(pParent, "DocRecoverySaveDialog",
+        "svx/ui/docrecoverysavedialog.ui")
     , m_pCore(pCore)
 {
     get(m_pTitleFT, "title");
@@ -749,7 +686,6 @@ SaveProgressDialog::~SaveProgressDialog()
 {
 }
 
-
 short SaveProgressDialog::Execute()
 {
     ::SolarMutexGuard aLock;
@@ -762,7 +698,6 @@ short SaveProgressDialog::Execute()
     return nRet;
 }
 
-
 void SaveProgressDialog::updateItems()
 {
 }
@@ -858,23 +793,21 @@ void RecovDocListEntry::Paint(
 
 RecovDocList::RecovDocList(SvSimpleTableContainer& rParent, ResMgr &rResMgr)
     : SvSimpleTable      ( rParent )
-    , m_aGreenCheckImg    ( ResId(IMG_GREENCHECK, rResMgr ) )
-    , m_aYellowCheckImg   ( ResId(IMG_YELLOWCHECK, rResMgr ) )
-    , m_aRedCrossImg      ( ResId(IMG_REDCROSS, rResMgr ) )
-    , m_aSuccessRecovStr  ( ResId(STR_SUCCESSRECOV, rResMgr ) )
-    , m_aOrigDocRecovStr  ( ResId(STR_ORIGDOCRECOV, rResMgr ) )
-    , m_aRecovFailedStr   ( ResId(STR_RECOVFAILED, rResMgr ) )
-    , m_aRecovInProgrStr  ( ResId(STR_RECOVINPROGR, rResMgr ) )
-    , m_aNotRecovYetStr   ( ResId(STR_NOTRECOVYET, rResMgr ) )
+    , m_aGreenCheckImg    ( ResId(RID_SVXIMG_GREENCHECK, rResMgr ) )
+    , m_aYellowCheckImg   ( ResId(RID_SVXIMG_YELLOWCHECK, rResMgr ) )
+    , m_aRedCrossImg      ( ResId(RID_SVXIMG_REDCROSS, rResMgr ) )
+    , m_aSuccessRecovStr  ( ResId(RID_SVXSTR_SUCCESSRECOV, rResMgr ) )
+    , m_aOrigDocRecovStr  ( ResId(RID_SVXSTR_ORIGDOCRECOV, rResMgr ) )
+    , m_aRecovFailedStr   ( ResId(RID_SVXSTR_RECOVFAILED, rResMgr ) )
+    , m_aRecovInProgrStr  ( ResId(RID_SVXSTR_RECOVINPROGR, rResMgr ) )
+    , m_aNotRecovYetStr   ( ResId(RID_SVXSTR_NOTRECOVYET, rResMgr ) )
 {
 }
 
-
 RecovDocList::~RecovDocList()
 {
 }
 
-
 void RecovDocList::InitEntry(SvTreeListEntry* pEntry,
                              const OUString& rText,
                              const Image& rImage1,
@@ -899,56 +832,46 @@ short impl_askUserForWizardCancel(Window* pParent, sal_Int16 nRes)
         return DLG_RET_CANCEL;
 }
 
-
-RecoveryDialog::RecoveryDialog(Window*       pParent,
-                               RecoveryCore* pCore  )
-    : IExtendedTabPage( pParent      , SVX_RES( RID_SVXPAGE_DOCRECOVERY_RECOVER ) )
-    , m_aTitleFT            ( this           , SVX_RES  ( FT_RECOV_TITLE                 ) )
-    , m_aTitleWin           ( this           , SVX_RES  ( WIN_RECOV_TITLE                ) )
-    , m_aTitleFL            ( this           , SVX_RES  ( FL_RECOV_TITLE                 ) )
-    , m_aDescrFT            ( this           , SVX_RES  ( FT_RECOV_DESCR                 ) )
-    , m_aProgressFT         ( this           , SVX_RES  ( FT_RECOV_PROGR                 ) )
-    , m_aProgrParent        ( this           , SVX_RES  ( WIN_RECOV_PROGR                ) )
-    , m_aFileListFT         ( this           , SVX_RES  ( FT_RECOV_FILELIST              ) )
-    , m_aFileListLBContainer( this           , SVX_RES  ( LB_RECOV_FILELIST              ) )
-    , m_aFileListLB         (m_aFileListLBContainer, DIALOG_MGR())
-    , m_aBottomFL           ( this           , SVX_RES  ( FL_RECOV_BOTTOM                ) )
-    , m_aNextBtn            ( this           , SVX_RES  ( BTN_RECOV_NEXT                 ) )
-    , m_aCancelBtn          ( this           , SVX_RES  ( BTN_RECOV_CANCEL               ) )
-    , m_aTitleRecoveryInProgress(SVX_RESSTR(STR_RECOVERY_INPROGRESS))
-    , m_aRecoveryOnlyFinish (SVX_RESSTR(STR_RECOVERYONLY_FINISH))
-    , m_aRecoveryOnlyFinishDescr(SVX_RESSTR(STR_RECOVERYONLY_FINISH_DESCR))
-    , m_pDefButton          ( NULL                                                       )
-    , m_pCore               ( pCore                                                      )
-    , m_eRecoveryState      (RecoveryDialog::E_RECOVERY_PREPARED)
-    , m_bWaitForUser        (false)
-    , m_bWaitForCore        (false)
-    , m_bUserDecideNext     (false)
-    , m_bWasRecoveryStarted (false)
+RecoveryDialog::RecoveryDialog(Window* pParent, RecoveryCore* pCore)
+    : Dialog(pParent, "DocRecoveryRecoverDialog",
+        "svx/ui/docrecoveryrecoverdialog.ui")
+    , m_aTitleRecoveryInProgress(SVX_RESSTR(RID_SVXSTR_RECOVERY_INPROGRESS))
+    , m_aRecoveryOnlyFinish (SVX_RESSTR(RID_SVXSTR_RECOVERYONLY_FINISH))
+    , m_aRecoveryOnlyFinishDescr(SVX_RESSTR(RID_SVXSTR_RECOVERYONLY_FINISH_DESCR))
+    , m_pCore(pCore)
+    , m_eRecoveryState(RecoveryDialog::E_RECOVERY_PREPARED)
+    , m_bWaitForCore(false)
+    , m_bWasRecoveryStarted(false)
 {
-    static long nTabs[] = { 2, 0, 40*RECOV_CONTROLWIDTH/100 };
-    m_aFileListLB.SetTabs( &nTabs[0] );
-    m_aFileListLB.InsertHeaderEntry(SVX_RESSTR(STR_HEADERBAR));
+    get(m_pTitleFT, "title");
+    get(m_pDescrFT, "desc");
+    get(m_pProgrParent, "progress");
+    m_pProgrParent->set_height_request(LogicToPixel(Size(0, PROGR_HEIGHT), MAP_APPFONT).Height());
+    get(m_pNextBtn, "next");
+    get(m_pCancelBtn, "cancel");
+
+    SvSimpleTableContainer* pFileListLBContainer = get<SvSimpleTableContainer>("filelist");
+    Size aSize(LogicToPixel(Size(RECOV_CONTROLWIDTH, RECOV_FILELISTHEIGHT), MAP_APPFONT));
+    pFileListLBContainer->set_width_request(aSize.Width());
+    pFileListLBContainer->set_height_request(aSize.Height());
+    m_pFileListLB = new RecovDocList(*pFileListLBContainer, DIALOG_MGR());
 
-    FreeResource();
+    static long nTabs[] = { 2, 0, 40*RECOV_CONTROLWIDTH/100 };
+    m_pFileListLB->SetTabs( &nTabs[0] );
+    m_pFileListLB->InsertHeaderEntry(get<FixedText>("nameft")->GetText() + "\t" + get<FixedText>("statusft")->GetText());
 
-    PluginProgress* pProgress   = new PluginProgress( &m_aProgrParent, pCore->getComponentContext() );
+    PluginProgress* pProgress   = new PluginProgress(m_pProgrParent, pCore->getComponentContext());
     m_xProgress = css::uno::Reference< css::task::XStatusIndicator >(static_cast< css::task::XStatusIndicator* >(pProgress), css::uno::UNO_QUERY_THROW);
 
     const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
-    Wallpaper aBackground( rStyleSettings.GetWindowColor() );
-    m_aTitleWin.SetBackground(aBackground);
-    m_aTitleFT.SetBackground (aBackground);
-
-    Font aFont(m_aTitleFT.GetFont());
-    aFont.SetWeight(WEIGHT_BOLD);
-    m_aTitleFT.SetFont(aFont);
+    m_pTitleFT->SetBackground(rStyleSettings.GetWindowColor());
+    m_pTitleFT->set_height_request(m_pTitleFT->get_preferred_size().Height() + 48);
 
-    m_aFileListLB.SetBackground( rStyleSettings.GetDialogColor() );
+    m_pFileListLB->SetBackground( rStyleSettings.GetDialogColor() );
 
-    m_aNextBtn.Enable(true);
-    m_aNextBtn.SetClickHdl( LINK( this, RecoveryDialog, NextButtonHdl ) );
-    m_aCancelBtn.SetClickHdl( LINK( this, RecoveryDialog, CancelButtonHdl ) );
+    m_pNextBtn->Enable(true);
+    m_pNextBtn->SetClickHdl( LINK( this, RecoveryDialog, NextButtonHdl ) );
+    m_pCancelBtn->SetClickHdl( LINK( this, RecoveryDialog, CancelButtonHdl ) );
 
     // fill list box first time
     TURLList*                pURLList = m_pCore->getURLListAccess();
@@ -962,54 +885,36 @@ RecoveryDialog::RecoveryDialog(Window*       pParent,
         OUString sName( rInfo.DisplayName );
         sName += "\t";
         sName += impl_getStatusString( rInfo );
-        SvTreeListEntry* pEntry = m_aFileListLB.InsertEntry(sName, rInfo.StandardImage, rInfo.StandardImage);
+        SvTreeListEntry* pEntry = m_pFileListLB->InsertEntry(sName, rInfo.StandardImage, rInfo.StandardImage);
         pEntry->SetUserData((void*)&rInfo);
     }
 
     // mark first item
-    SvTreeListEntry* pFirst = m_aFileListLB.First();
+    SvTreeListEntry* pFirst = m_pFileListLB->First();
     if (pFirst)
-        m_aFileListLB.SetCursor(pFirst, true);
+        m_pFileListLB->SetCursor(pFirst, true);
 }
 
-
 RecoveryDialog::~RecoveryDialog()
 {
+    delete m_pFileListLB;
 }
 
-
 short RecoveryDialog::execute()
 {
     ::SolarMutexGuard aSolarLock;
 
-    switch(m_eRecoveryState)
+    switch (m_eRecoveryState)
     {
-        case RecoveryDialog::E_RECOVERY_PREPARED :
-             {
-                // Dialog was started first time ...
-                // wait for user decision ("start" or "cancel" recovery)
-                // This decision will be made inside the NextBtn handler.
-                m_aNextBtn.Enable(true);
-                m_aCancelBtn.Enable(true);
-                m_bWaitForUser = true;
-                while(m_bWaitForUser)
-                    Application::Yield();
-                if (m_bUserDecideNext)
-                    m_eRecoveryState = RecoveryDialog::E_RECOVERY_IN_PROGRESS;
-                else
-                    m_eRecoveryState = RecoveryDialog::E_RECOVERY_CANCELED;
-                return execute();
-             }
-
         case RecoveryDialog::E_RECOVERY_IN_PROGRESS :
              {
                 // user decided to start recovery ...
                 m_bWasRecoveryStarted = true;
                 // do it asynchronous (to allow repaints)
                 // and wait for this asynchronous operation.
-                m_aDescrFT.SetText( m_aTitleRecoveryInProgress );
-                m_aNextBtn.Enable(false);
-                m_aCancelBtn.Enable(false);
+                m_pDescrFT->SetText( m_aTitleRecoveryInProgress );
+                m_pNextBtn->Enable(false);
+                m_pCancelBtn->Enable(false);
                 m_pCore->setProgressHandler(m_xProgress);
                 m_pCore->setUpdateListener(this);
                 m_pCore->doRecovery();
@@ -1027,20 +932,11 @@ short RecoveryDialog::execute()
              {
                  // the core finished it's task.
                  // let the user decide the next step.
-                 m_aDescrFT.SetText(m_aRecoveryOnlyFinishDescr);
-                 m_aNextBtn.SetText(m_aRecoveryOnlyFinish);
-                 m_aNextBtn.Enable(true);
-                 m_aCancelBtn.Enable(false);
-
-                 m_bWaitForUser = true;
-                 while(m_bWaitForUser)
-                     Application::Yield();
-
-                if (m_bUserDecideNext)
-                    m_eRecoveryState = RecoveryDialog::E_RECOVERY_DONE;
-                else
-                    m_eRecoveryState = RecoveryDialog::E_RECOVERY_CANCELED;
-                return execute();
+                 m_pDescrFT->SetText(m_aRecoveryOnlyFinishDescr);
+                 m_pNextBtn->SetText(m_aRecoveryOnlyFinish);
+                 m_pNextBtn->Enable(true);
+                 m_pCancelBtn->Enable(false);
+                 return 0;
              }
 
         case RecoveryDialog::E_RECOVERY_DONE :
@@ -1167,21 +1063,6 @@ short RecoveryDialog::execute()
                  // THERE IS NO WAY BACK. see impl_askUserForWizardCancel()!
                  return DLG_RET_CANCEL;
              }
-
-        case RecoveryDialog::E_RECOVERY_HANDLED :
-             {
-                 m_bWaitForUser = true;
-                 while(m_bWaitForUser)
-                     Application::Yield();
-
-                 // TODO: show BrokenRecoveryDialog again, ift he user
-                 // doesn't accepted it last time.
-
-                 if (m_bUserDecideNext)
-                     return DLG_RET_OK;
-                 else
-                     return DLG_RET_CANCEL;
-             }
     }
 
     // should never be reached .-)
@@ -1189,28 +1070,17 @@ short RecoveryDialog::execute()
     return DLG_RET_OK;
 }
 
-
-void RecoveryDialog::setDefButton()
-{
-    if ( m_aNextBtn.IsEnabled() )
-        m_aNextBtn.GrabFocus();
-    else
-        m_pDefButton = &m_aNextBtn;
-}
-
-
 void RecoveryDialog::start()
 {
 }
 
-
 void RecoveryDialog::updateItems()
 {
-    sal_uIntPtr c = m_aFileListLB.GetEntryCount();
+    sal_uIntPtr c = m_pFileListLB->GetEntryCount();
     sal_uIntPtr i = 0;
     for ( i=0; i<c; ++i )
     {
-        SvTreeListEntry* pEntry = m_aFileListLB.GetEntry(i);
+        SvTreeListEntry* pEntry = m_pFileListLB->GetEntry(i);
         if ( !pEntry )
             continue;
 
@@ -1220,21 +1090,21 @@ void RecoveryDialog::updateItems()
 
         OUString sStatus = impl_getStatusString( *pInfo );
         if ( !sStatus.isEmpty() )
-            m_aFileListLB.SetEntryText( sStatus, pEntry, 1 );
+            m_pFileListLB->SetEntryText( sStatus, pEntry, 1 );
     }
 
-    m_aFileListLB.Invalidate();
-    m_aFileListLB.Update();
+    m_pFileListLB->Invalidate();
+    m_pFileListLB->Update();
 }
 
 
 void RecoveryDialog::stepNext(TURLInfo* pItem)
 {
-    sal_uIntPtr c = m_aFileListLB.GetEntryCount();
+    sal_uIntPtr c = m_pFileListLB->GetEntryCount();
     sal_uIntPtr i = 0;
     for (i=0; i<c; ++i)
     {
-        SvTreeListEntry* pEntry = m_aFileListLB.GetEntry(i);
+        SvTreeListEntry* pEntry = m_pFileListLB->GetEntry(i);
         if (!pEntry)
             continue;
 
@@ -1242,66 +1112,87 @@ void RecoveryDialog::stepNext(TURLInfo* pItem)
         if (pInfo->ID != pItem->ID)
             continue;
 
-        m_aFileListLB.SetCursor(pEntry, true);
-        m_aFileListLB.MakeVisible(pEntry);
-        m_aFileListLB.Invalidate();
-        m_aFileListLB.Update();
+        m_pFileListLB->SetCursor(pEntry, true);
+        m_pFileListLB->MakeVisible(pEntry);
+        m_pFileListLB->Invalidate();
+        m_pFileListLB->Update();
         break;
     }
 }
 
-
 void RecoveryDialog::end()
 {
-    if ( m_pDefButton )
-    {
-        m_pDefButton->GrabFocus();
-        m_pDefButton = NULL;
-    }
     m_bWaitForCore = false;
 }
 
-
 IMPL_LINK_NOARG(RecoveryDialog, NextButtonHdl)
 {
-    m_bUserDecideNext = true;
-    m_bWaitForUser    = false;
+    switch (m_eRecoveryState)
+    {
+        case RecoveryDialog::E_RECOVERY_PREPARED:
+            m_eRecoveryState = RecoveryDialog::E_RECOVERY_IN_PROGRESS;
+            execute();
+        break;
+        case RecoveryDialog::E_RECOVERY_CORE_DONE:
+            m_eRecoveryState = RecoveryDialog::E_RECOVERY_DONE;
+            execute();
+        break;
+    }
+
+    if (m_eRecoveryState == RecoveryDialog::E_RECOVERY_HANDLED)
+    {
+        EndDialog(DLG_RET_OK);
+        return DLG_RET_OK;
+    }
+
     return 0;
 }
 
-
 IMPL_LINK_NOARG(RecoveryDialog, CancelButtonHdl)
 {
-    if (m_eRecoveryState == RecoveryDialog::E_RECOVERY_PREPARED)
+    switch (m_eRecoveryState)
     {
-        if (impl_askUserForWizardCancel(this, RID_SVXQB_EXIT_RECOVERY) == DLG_RET_CANCEL)
-            return 0;
+        case RecoveryDialog::E_RECOVERY_PREPARED:
+            if (impl_askUserForWizardCancel(this, RID_SVXQB_EXIT_RECOVERY) != DLG_RET_CANCEL)
+            {
+                m_eRecoveryState = RecoveryDialog::E_RECOVERY_CANCELED;
+                execute();
+            }
+            break;
+        case RecoveryDialog::E_RECOVERY_CORE_DONE:
+            m_eRecoveryState = RecoveryDialog::E_RECOVERY_CANCELED;
+            execute();
+            break;
+    }
+
+    if (m_eRecoveryState == RecoveryDialog::E_RECOVERY_HANDLED)
+    {
+        EndDialog(DLG_RET_CANCEL);
+        return DLG_RET_CANCEL;
     }
-    m_bUserDecideNext = false;
-    m_bWaitForUser    = false;
+
     return 0;
 }
 
-
 OUString RecoveryDialog::impl_getStatusString( const TURLInfo& rInfo ) const
 {
     OUString sStatus;
     switch ( rInfo.RecoveryState )
     {
         case E_SUCCESSFULLY_RECOVERED :
-            sStatus = m_aFileListLB.m_aSuccessRecovStr;
+            sStatus = m_pFileListLB->m_aSuccessRecovStr;
             break;
         case E_ORIGINAL_DOCUMENT_RECOVERED :
-            sStatus = m_aFileListLB.m_aOrigDocRecovStr;
+            sStatus = m_pFileListLB->m_aOrigDocRecovStr;
             break;
         case E_RECOVERY_FAILED :
-            sStatus = m_aFileListLB.m_aRecovFailedStr;
+            sStatus = m_pFileListLB->m_aRecovFailedStr;
             break;
         case E_RECOVERY_IS_IN_PROGRESS :
-            sStatus = m_aFileListLB.m_aRecovInProgrStr;
+            sStatus = m_pFileListLB->m_aRecovInProgrStr;
             break;
         case E_NOT_RECOVERED_YET :
-            sStatus = m_aFileListLB.m_aNotRecovYetStr;
+            sStatus = m_pFileListLB->m_aNotRecovYetStr;
             break;
         default:
             break;
@@ -1309,7 +1200,6 @@ OUString RecoveryDialog::impl_getStatusString( const TURLInfo& rInfo ) const
     return sStatus;
 }
 
-
 BrokenRecoveryDialog::BrokenRecoveryDialog(Window*       pParent        ,
                                            RecoveryCore* pCore          ,
                                            bool      bBeforeRecovery)
diff --git a/svx/source/dialog/docrecovery.hrc b/svx/source/dialog/docrecovery.hrc
index a74b30bf4f41..2d65d24188c5 100644
--- a/svx/source/dialog/docrecovery.hrc
+++ b/svx/source/dialog/docrecovery.hrc
@@ -65,32 +65,6 @@
 #define SAVEPROGR_CONTROLWIDTH      (SAVEPROGR_COL1-SAVEPROGR_COL0)
 #define SAVEPROGR_HEIGHT            (SAVEPROGR_ROW3+RSC_SP_DLG_INNERBORDER_BOTTOM)
 
-// TabPage Recovery
-
-#define WIN_RECOV_TITLE             1
-#define FT_RECOV_TITLE              2
-#define FL_RECOV_TITLE              3
-#define FT_RECOV_DESCR              4
-#define FT_RECOV_PROGR              5
-#define WIN_RECOV_PROGR             6
-#define FT_RECOV_FILELIST           7
-#define LB_RECOV_FILELIST           8
-#define FL_RECOV_BOTTOM             9
-#define BTN_RECOV_NEXT              11
-#define BTN_RECOV_CANCEL            12
-#define STR_HEADERBAR               13
-#define IMG_GREENCHECK              14
-#define IMG_YELLOWCHECK             15
-#define IMG_REDCROSS                16
-#define STR_SUCCESSRECOV            20
-#define STR_ORIGDOCRECOV            21
-#define STR_RECOVFAILED             22
-#define STR_RECOVINPROGR            23
-#define STR_NOTRECOVYET             24
-#define STR_RECOVERY_INPROGRESS     26
-#define STR_RECOVERYONLY_FINISH_DESCR 28
-#define STR_RECOVERYONLY_FINISH     29
-
 #define RECOV_WIDTH                 SAVE_WIDTH
 #define RECOV_HEIGHT                SAVE_HEIGHT
 #define RECOV_TITLEWINHEIGHT        SAVE_TITLEWINHEIGHT
diff --git a/svx/source/dialog/docrecovery.src b/svx/source/dialog/docrecovery.src
index 2b676d4ec3eb..764a846fb10b 100644
--- a/svx/source/dialog/docrecovery.src
+++ b/svx/source/dialog/docrecovery.src
@@ -63,129 +63,6 @@ ModalDialog RID_SVX_MDLG_DOCRECOVERY_PROGR
     };
 };
 
-TabPage RID_SVXPAGE_DOCRECOVERY_RECOVER
-{
-    Size = MAP_APPFONT( RECOV_WIDTH, RECOV_HEIGHT );
-    HelpId = HID_SVX_TP_DOCRECOVERY_RECOVER;
-    OutputSize = TRUE;
-    SVLook = TRUE;
-    Hide = TRUE;
-    Window WIN_RECOV_TITLE
-    {
-        Pos = MAP_APPFONT( 0 , 0 );
-        Size = MAP_APPFONT( RECOV_WIDTH, RECOV_TITLEWINHEIGHT );
-    };
-    FixedText FT_RECOV_TITLE
-    {
-        Pos = MAP_APPFONT( RECOV_COL1, RECOV_ROW0 );
-        Size = MAP_APPFONT( RECOV_CONTROLWIDTH, RSC_CD_FIXEDTEXT_HEIGHT );
-        Text[ en-US ] = "%PRODUCTNAME Document Recovery";
-    };
-    FixedLine FL_RECOV_TITLE
-    {
-        Pos = MAP_APPFONT( 0 , RECOV_TITLEWINHEIGHT );
-        Size = MAP_APPFONT( RECOV_WIDTH, 2 );
-    };
-    FixedText FT_RECOV_DESCR
-    {
-        Pos = MAP_APPFONT( RECOV_COL1, RECOV_ROW2 );
-        Size = MAP_APPFONT( RECOV_CONTROLWIDTH, RECOV_DESCRHEIGHT );
-        WordBreak = TRUE;
-        Text[ en-US ] = "Press 'Start Recovery' to start the recovery process of the documents listed below.\n\nThe 'Status' column shows whether the document can be recovered.";
-    };
-    FixedText FT_RECOV_PROGR
-    {
-        Pos = MAP_APPFONT( RECOV_COL1, RECOV_ROW3 );
-        Size = MAP_APPFONT( RECOV_CONTROLWIDTH, RSC_CD_FIXEDTEXT_HEIGHT );
-        Text[ en-US ] = "Recovering document:";
-    };
-    Window WIN_RECOV_PROGR
-    {
-        Pos = MAP_APPFONT( RECOV_COL1, RECOV_ROW4 );
-        Size = MAP_APPFONT( RECOV_CONTROLWIDTH, PROGR_HEIGHT );
-        Border = TRUE;
-    };
-    FixedText FT_RECOV_FILELIST
-    {
-        Pos = MAP_APPFONT( RECOV_COL1, RECOV_ROW5 );
-        Size = MAP_APPFONT( RECOV_CONTROLWIDTH, RSC_CD_FIXEDTEXT_HEIGHT );
-        Text[ en-US ] = "Status of recovered documents:";
-    };
-    String STR_HEADERBAR
-    {
-        Text[ en-US ] = "Document Name\tStatus";
-    };
-    Control LB_RECOV_FILELIST
-    {
-        Pos = MAP_APPFONT( RECOV_COL1, RECOV_ROW6 );
-        Size = MAP_APPFONT( RECOV_CONTROLWIDTH, RECOV_FILELISTHEIGHT );
-        Border = TRUE;
-        SVLook = TRUE;
-    };
-    FixedLine FL_RECOV_BOTTOM
-    {
-        Pos = MAP_APPFONT( 0 , RECOV_ROW8 );
-        Size = MAP_APPFONT( RECOV_WIDTH, RSC_CD_FIXEDLINE_HEIGHT );
-    };
-    PushButton BTN_RECOV_NEXT
-    {
-        HelpID = "svx:PushButton:RID_SVXPAGE_DOCRECOVERY_RECOVER:BTN_RECOV_NEXT";
-        Pos = MAP_APPFONT( RECOV_COL_C, RECOV_ROW9 );
-        Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH*2, RSC_CD_PUSHBUTTON_HEIGHT );
-        Text[ en-US ] = "~Start Recovery >";
-        DefButton = TRUE;
-    };
-    CancelButton BTN_RECOV_CANCEL
-    {
-        Pos = MAP_APPFONT( RECOV_COL_F, RECOV_ROW9 );
-        Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
-    };
-    Image IMG_GREENCHECK
-    {
-        ImageBitmap = Bitmap { File = "nu01.png"; };
-    };
-    Image IMG_YELLOWCHECK
-    {
-        ImageBitmap = Bitmap { File = "nu04.png"; };
-    };
-    Image IMG_REDCROSS
-    {
-        ImageBitmap = Bitmap { File = "nu02.png"; };
-    };
-    String STR_SUCCESSRECOV
-    {
-        Text[ en-US ] = "Successfully recovered";
-    };
-    String STR_ORIGDOCRECOV
-    {
-        Text[ en-US ] = "Original document recovered";
-    };
-    String STR_RECOVFAILED
-    {
-        Text[ en-US ] = "Recovery failed";
-    };
-    String STR_RECOVINPROGR
-    {
-        Text[ en-US ] = "Recovery in progress";
-    };
-    String STR_NOTRECOVYET
-    {
-        Text[ en-US ] = "Not recovered yet";
-    };
-    String STR_RECOVERY_INPROGRESS
-    {
-        Text[ en-US ] = "%PRODUCTNAME %PRODUCTVERSION will start to recover your documents. Depending on the size of the documents this process can take some time." ;
-    };
-    String STR_RECOVERYONLY_FINISH_DESCR
-    {
-        Text[ en-US ] = "Recovery of your documents was finished.\nClick 'Finish' to see your documents.";
-    };
-    String STR_RECOVERYONLY_FINISH
-    {
-        Text[ en-US ] = "~Finish";
-    };
-};
-
 QueryBox RID_SVXQB_EXIT_RECOVERY
 {
     BUTTONS = WB_YES_NO ;
diff --git a/svx/source/dialog/sdstring.src b/svx/source/dialog/sdstring.src
index 9fad4bcff161..9ee47ff8f969 100644
--- a/svx/source/dialog/sdstring.src
+++ b/svx/source/dialog/sdstring.src
@@ -2089,4 +2089,59 @@ String RID_SVXSTR_VIEW
     Text [ en-US ] = "List" ;
 };
 
+Image RID_SVXIMG_GREENCHECK
+{
+    ImageBitmap = Bitmap { File = "nu01.png"; };
+};
+
+Image RID_SVXIMG_YELLOWCHECK
+{
+    ImageBitmap = Bitmap { File = "nu04.png"; };
+};
+
+Image RID_SVXIMG_REDCROSS
+{
+    ImageBitmap = Bitmap { File = "nu02.png"; };
+};
+
+String RID_SVXSTR_SUCCESSRECOV
+{
+    Text[ en-US ] = "Successfully recovered";
+};
+
+String RID_SVXSTR_ORIGDOCRECOV
+{
+    Text[ en-US ] = "Original document recovered";
+};
+
+String RID_SVXSTR_RECOVFAILED
+{
+    Text[ en-US ] = "Recovery failed";
+};
+
+String RID_SVXSTR_RECOVINPROGR
+{
+    Text[ en-US ] = "Recovery in progress";
+};
+
+String RID_SVXSTR_NOTRECOVYET
+{
+    Text[ en-US ] = "Not recovered yet";
+};
+
+String RID_SVXSTR_RECOVERY_INPROGRESS
+{
+    Text[ en-US ] = "%PRODUCTNAME %PRODUCTVERSION will start to recover your documents. Depending on the size of the documents this process can take some time." ;
+};
+
+String RID_SVXSTR_RECOVERYONLY_FINISH_DESCR
+{
+    Text[ en-US ] = "Recovery of your documents was finished.\nClick 'Finish' to see your documents.";
+};
+
+String RID_SVXSTR_RECOVERYONLY_FINISH
+{
+    Text[ en-US ] = "~Finish";
+};
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx
index 523e749a0281..3e9f3ffd281d 100644
--- a/svx/source/inc/docrecovery.hxx
+++ b/svx/source/inc/docrecovery.hxx
@@ -302,11 +302,8 @@ class RecoveryCore : public ::cppu::WeakImplHelper1< css::frame::XStatusListener
 class PluginProgressWindow : public Window
 {
     private:
-
         css::uno::Reference< css::lang::XComponent > m_xProgress;
-
     public:
-
         PluginProgressWindow(      Window*                                       pParent  ,
                              const css::uno::Reference< css::lang::XComponent >& xProgress);
         virtual ~PluginProgressWindow();
@@ -315,11 +312,8 @@ class PluginProgressWindow : public Window
 class PluginProgress : public ::cppu::WeakImplHelper2< css::task::XStatusIndicator ,
                                                        css::lang::XComponent       >
 {
-
-
     // member
     private:
-
         /** @short  TODO */
         css::uno::Reference< css::task::XStatusIndicatorFactory > m_xProgressFactory;
 
@@ -330,8 +324,6 @@ class PluginProgress : public ::cppu::WeakImplHelper2< css::task::XStatusIndicat
 
     // native interface
     public:
-
-
         /** @short  TODO */
         PluginProgress(      Window*                                             pParent,
                        const css::uno::Reference< css::uno::XComponentContext >& xContext  );
@@ -374,60 +366,6 @@ class PluginProgress : public ::cppu::WeakImplHelper2< css::task::XStatusIndicat
             throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 };
 
-
-class IExtendedTabPage : public TabPage
-{
-
-    // member
-    protected:
-
-        short m_nResult;
-
-
-    // interface
-    public:
-
-        IExtendedTabPage( Window* pParent, WinBits nStyle = 0 )
-            : TabPage( pParent, nStyle )
-            , m_nResult(DLG_RET_UNKNOWN)
-        {}
-
-        IExtendedTabPage( Window* pParent, const ResId& rResId )
-            : TabPage( pParent, rResId )
-            , m_nResult(DLG_RET_UNKNOWN)
-        {}
-
-        virtual ~IExtendedTabPage()
-        {}
-
-        virtual short   execute() = 0;
-        virtual void    setDefButton() = 0;
-};
-
-typedef ::std::vector< IExtendedTabPage* > TTabPageList;
-
-
-class TabDialog4Recovery : public TabDialog
-{
-
-    // member
-    private:
-
-        TTabPageList m_lTabPages;
-        TTabPageList::iterator m_pActualPage;
-
-
-    // interface
-    public:
-
-        TabDialog4Recovery(Window* pParent);
-        virtual ~TabDialog4Recovery();
-
-        virtual void addTabPage(IExtendedTabPage* pPage);
-        virtual short Execute() SAL_OVERRIDE;
-};
-
-
 class SaveDialog : public Dialog
 {
     // member
@@ -568,24 +506,17 @@ class RecovDocList : public SvSimpleTable
 };
 
 
-class RecoveryDialog : public IExtendedTabPage
+class RecoveryDialog : public Dialog
                      , public IRecoveryUpdateListener
 {
-
     // member
     private:
-        FixedText       m_aTitleFT;
-        Window          m_aTitleWin;
-        FixedLine       m_aTitleFL;
-        FixedText       m_aDescrFT;
-        FixedText       m_aProgressFT;
-        Window          m_aProgrParent;
-        FixedText       m_aFileListFT;
-        SvSimpleTableContainer m_aFileListLBContainer;
-        RecovDocList    m_aFileListLB;
-        FixedLine       m_aBottomFL;
-        PushButton      m_aNextBtn;
-        CancelButton    m_aCancelBtn;
+        FixedText*      m_pTitleFT;
+        FixedText*      m_pDescrFT;
+        Window*         m_pProgrParent;
+        RecovDocList*   m_pFileListLB;
+        PushButton*     m_pNextBtn;
+        CancelButton*   m_pCancelBtn;
         OUString        m_aTitleRecoveryInProgress;
         OUString        m_aRecoveryOnlyFinish;
         OUString        m_aRecoveryOnlyFinishDescr;
@@ -605,44 +536,27 @@ class RecoveryDialog : public IExtendedTabPage
             E_RECOVERY_HANDLED              // the recovery wizard page was shown already ... and will be shown now again ...
         };
         sal_Int32 m_eRecoveryState;
-        bool  m_bWaitForUser;
         bool  m_bWaitForCore;
-        bool  m_bUserDecideNext;
         bool  m_bWasRecoveryStarted;
 
-
     // member
     public:
-
-
         /** @short TODO */
         RecoveryDialog(Window*       pParent,
                        RecoveryCore* pCore  );
 
-
-        /** @short TODO */
         virtual ~RecoveryDialog();
 
-
         // IRecoveryUpdateListener
         virtual void updateItems() SAL_OVERRIDE;
         virtual void stepNext(TURLInfo* pItem) SAL_OVERRIDE;
         virtual void start() SAL_OVERRIDE;
         virtual void end() SAL_OVERRIDE;
 
-
-        /** @short TODO */
-        virtual short execute() SAL_OVERRIDE;
-
-
-        /** @short  TODO*/
-        virtual void    setDefButton() SAL_OVERRIDE;
-
+        short execute();
 
     // helper
     private:
-
-
         /** @short TODO */
         DECL_LINK(NextButtonHdl, void*);
         DECL_LINK(CancelButtonHdl, void*);
diff --git a/svx/source/sidebar/area/AreaPropertyPanel.cxx b/svx/source/sidebar/area/AreaPropertyPanel.cxx
index 0b0a2f8bd8e3..f37bb1acfc43 100644
--- a/svx/source/sidebar/area/AreaPropertyPanel.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanel.cxx
@@ -98,7 +98,7 @@ AreaPropertyPanel::AreaPropertyPanel(
       maImgRadial(SVX_RES(IMG_RADIAL)),
       maImgSquare(SVX_RES(IMG_SQUARE)),
       maImgLinear(SVX_RES(IMG_LINEAR)),
-      maImgColor(SVX_RES(IMG_COLOR)),
+      maImgColor(SVX_RES(IMG_AREA_COLOR)),
       maTrGrPopup(this, ::boost::bind(&AreaPropertyPanel::CreateTransparencyGradientControl, this, _1)),
       maColorPopup(this, ::boost::bind(&AreaPropertyPanel::CreateColorPopupControl, this, _1)),
       mpFloatTransparenceItem(),
diff --git a/svx/source/sidebar/area/AreaPropertyPanel.hrc b/svx/source/sidebar/area/AreaPropertyPanel.hrc
index 509b52b99563..b5d6ac1961b4 100644
--- a/svx/source/sidebar/area/AreaPropertyPanel.hrc
+++ b/svx/source/sidebar/area/AreaPropertyPanel.hrc
@@ -44,18 +44,6 @@
 #define BTN_LEFT_SECOND         22
 #define BTN_RIGHT_FIRST         23
 
-// global definitions
-#define IMG_AXIAL       (RID_SVX_SIDEBAR_BEGIN +  30)
-#define IMG_ELLI        (RID_SVX_SIDEBAR_BEGIN +  31)
-#define IMG_QUAD        (RID_SVX_SIDEBAR_BEGIN +  32)
-#define IMG_RADIAL      (RID_SVX_SIDEBAR_BEGIN +  33)
-#define IMG_SQUARE      (RID_SVX_SIDEBAR_BEGIN +  34)
-#define IMG_LINEAR      (RID_SVX_SIDEBAR_BEGIN +  35)
-#define IMG_COLOR       (RID_SVX_SIDEBAR_BEGIN +  36)
-
-#define IMG_ROT_LEFT    (RID_SVX_SIDEBAR_BEGIN +  37)
-#define IMG_ROT_RIGHT   (RID_SVX_SIDEBAR_BEGIN +  38)
-
 #define STR_HELP_COLOR          41
 
 #define FIXED_TEXT_HEIGHT   9
diff --git a/svx/source/sidebar/area/AreaPropertyPanel.src b/svx/source/sidebar/area/AreaPropertyPanel.src
index b24b1ec1a915..2e9a8deb028a 100644
--- a/svx/source/sidebar/area/AreaPropertyPanel.src
+++ b/svx/source/sidebar/area/AreaPropertyPanel.src
@@ -48,7 +48,7 @@ Image IMG_LINEAR
 {
     ImageBitmap = Bitmap{File = "symphony/linear.png";};
 };
-Image IMG_COLOR
+Image IMG_AREA_COLOR
 {
     ImageBitmap = Bitmap{File = "symphony/fill_color.png";};
 };
diff --git a/svx/source/sidebar/line/LinePropertyPanel.cxx b/svx/source/sidebar/line/LinePropertyPanel.cxx
index e59b992cbf96..eaa79bbe118e 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.cxx
+++ b/svx/source/sidebar/line/LinePropertyPanel.cxx
@@ -178,7 +178,7 @@ LinePropertyPanel::LinePropertyPanel(
     mpEndItem(0),
     maColorPopup(this, ::boost::bind(&LinePropertyPanel::CreateColorPopupControl, this, _1)),
     maLineWidthPopup(this, ::boost::bind(&LinePropertyPanel::CreateLineWidthPopupControl, this, _1)),
-    maIMGColor(SVX_RES(IMG_COLOR)),
+    maIMGColor(SVX_RES(IMG_LINE_COLOR)),
     maIMGNone(SVX_RES(IMG_NONE_ICON)),
     mpIMGWidthIcon(),
     mxFrame(rxFrame),
diff --git a/svx/source/sidebar/line/LinePropertyPanel.hrc b/svx/source/sidebar/line/LinePropertyPanel.hrc
index bff5bb9cbfb3..636c412cc9f3 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.hrc
+++ b/svx/source/sidebar/line/LinePropertyPanel.hrc
@@ -25,18 +25,6 @@
 #define STR_QH_TB_WIDTH     15
 #define STR_QH_TB_COLOR     16
 
-#define IMG_COLOR           (RID_SVX_SIDEBAR_BEGIN + 20)
-#define IMG_NONE_ICON       (RID_SVX_SIDEBAR_BEGIN + 21)
-
-#define IMG_WIDTH1_ICON     (RID_SVX_SIDEBAR_BEGIN + 22)
-#define IMG_WIDTH2_ICON     (RID_SVX_SIDEBAR_BEGIN + 23)
-#define IMG_WIDTH3_ICON     (RID_SVX_SIDEBAR_BEGIN + 24)
-#define IMG_WIDTH4_ICON     (RID_SVX_SIDEBAR_BEGIN + 25)
-#define IMG_WIDTH5_ICON     (RID_SVX_SIDEBAR_BEGIN + 26)
-#define IMG_WIDTH6_ICON     (RID_SVX_SIDEBAR_BEGIN + 27)
-#define IMG_WIDTH7_ICON     (RID_SVX_SIDEBAR_BEGIN + 28)
-#define IMG_WIDTH8_ICON     (RID_SVX_SIDEBAR_BEGIN + 29)
-
 //color popup page
 #define VS_COLOR        1
 
diff --git a/svx/source/sidebar/line/LinePropertyPanel.src b/svx/source/sidebar/line/LinePropertyPanel.src
index e5f4b7c4af43..c13dfa793524 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.src
+++ b/svx/source/sidebar/line/LinePropertyPanel.src
@@ -25,7 +25,7 @@
 #define TOOLBOX_HEIGHT      14
 #define LISTBOX_HEIGHT      99
 
-Image IMG_COLOR
+Image IMG_LINE_COLOR
 {
     ImageBitmap = Bitmap{File = "symphony/Line_color.png";};
 };
diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
index d7f1a0f5f4a5..c69c03f07f21 100644
--- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
+++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
@@ -73,8 +73,8 @@ ParaLineSpacingControl::ParaLineSpacingControl(Window* pParent, svx::sidebar::Pa
     , maSelSpacing115  (SVX_RES(IMG_SEL_SPACING115))
     , maSelSpacing15   (SVX_RES(IMG_SEL_SPACING15))
     , maSelSpacing2    (SVX_RES(IMG_SEL_SPACING2))
-    , maImgCus         (SVX_RES(IMG_CUSTOM))
-    , maImgCusGrey     (SVX_RES(IMG_CUSTOM_GRAY))
+    , maImgCus         (SVX_RES(IMG_PARA_CUSTOM))
+    , maImgCusGrey     (SVX_RES(IMG_PARA_CUSTOM_GRAY))
     , maStrCus         (SVX_RESSTR(STR_LCVALUE))
     , mpImg(NULL)
     , mpImgSel(NULL)
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.hrc b/svx/source/sidebar/paragraph/ParaPropertyPanel.hrc
index 9f5d0c107b10..8a5c1dcaf2d5 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.hrc
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.hrc
@@ -19,21 +19,6 @@
 
 #include "svx/dialogs.hrc"
 
-#define IMG_SPACE3          (RID_SVX_SIDEBAR_BEGIN +  0)
-#define IMG_INDENT_HANG     (RID_SVX_SIDEBAR_BEGIN +  1)
-#define IMG_SPACING1        (RID_SVX_SIDEBAR_BEGIN +  2)
-#define IMG_SPACING115      (RID_SVX_SIDEBAR_BEGIN +  3)
-#define IMG_SPACING15       (RID_SVX_SIDEBAR_BEGIN +  4)
-#define IMG_SPACING2        (RID_SVX_SIDEBAR_BEGIN +  5)
-#define IMG_SEL_SPACING1    (RID_SVX_SIDEBAR_BEGIN +  6)
-#define IMG_SEL_SPACING115  (RID_SVX_SIDEBAR_BEGIN +  7)
-#define IMG_SEL_SPACING15   (RID_SVX_SIDEBAR_BEGIN +  8)
-#define IMG_SEL_SPACING2    (RID_SVX_SIDEBAR_BEGIN +  9)
-#define IMG_CUSTOM          (RID_SVX_SIDEBAR_BEGIN + 10)
-#define IMG_CUSTOM_GRAY     (RID_SVX_SIDEBAR_BEGIN + 11)
-#define IL_NUM_BULLET       (RID_SVX_SIDEBAR_BEGIN + 12)
-#define IL_NUM_BULLET_RTL   (RID_SVX_SIDEBAR_BEGIN + 13)
-
 //for numbering and bullet
 #define IID_BULLET          1
 #define IID_NUMBER          2
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.src b/svx/source/sidebar/paragraph/ParaPropertyPanel.src
index 840e2c84a122..677ade565745 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.src
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.src
@@ -203,11 +203,11 @@ Image IMG_SEL_SPACING2
 {
     ImageBitmap = Bitmap{File = "symphony/lpselected-spacing-2.png";};
 };
-Image IMG_CUSTOM
+Image IMG_PARA_CUSTOM
 {
     ImageBitmap = Bitmap{File = "symphony/last_custom_common.png";};
 };
-Image IMG_CUSTOM_GRAY
+Image IMG_PARA_CUSTOM_GRAY
 {
     ImageBitmap = Bitmap{File = "symphony/last_custom_common_grey.png";};
 };
diff --git a/svx/source/unodraw/recoveryui.cxx b/svx/source/unodraw/recoveryui.cxx
index 445f04cfbf67..a8f620db2880 100644
--- a/svx/source/unodraw/recoveryui.cxx
+++ b/svx/source/unodraw/recoveryui.cxx
@@ -281,11 +281,10 @@ bool RecoveryUI::impl_doEmergencySave()
     css::uno::Reference< css::frame::XStatusListener > xCore(pCore);
 
     // create dialog for this operation and bind it to the used core service
-    Dialog* pDialog = new svxdr::SaveDialog(m_pParentWindow, pCore);
+    boost::scoped_ptr<Dialog> xDialog(new svxdr::SaveDialog(m_pParentWindow, pCore));
 
     // start the dialog
-    short nRet = pDialog->Execute();
-    delete pDialog;
+    short nRet = xDialog->Execute();
     return (nRet==DLG_RET_OK_AUTOLUNCH);
 }
 
@@ -297,23 +296,16 @@ void RecoveryUI::impl_doRecovery()
 
     // create all needed dialogs for this operation
     // and bind it to the used core service
-    boost::scoped_ptr<svxdr::TabDialog4Recovery> xWizard(new svxdr::TabDialog4Recovery(m_pParentWindow));
-    svxdr::IExtendedTabPage*   pPage1  = new svxdr::RecoveryDialog(xWizard.get(), pCore );
+    boost::scoped_ptr<Dialog> xDialog(new svxdr::RecoveryDialog(m_pParentWindow, pCore));
 
-    xWizard->addTabPage(pPage1);
-
-    // start the wizard
-    xWizard->Execute();
+    // start the dialog
+    xDialog->Execute();
 
     impl_showAllRecoveredDocs();
 
-    delete pPage1 ;
-
     delete_pending_crash();
 }
 
-
-
 void RecoveryUI::impl_showAllRecoveredDocs()
 {
     css::uno::Reference< css::frame::XDesktop2 > xDesktop = css::frame::Desktop::create( m_xContext );
diff --git a/svx/uiconfig/ui/docrecoveryrecoverdialog.ui b/svx/uiconfig/ui/docrecoveryrecoverdialog.ui
new file mode 100644
index 000000000000..f11f71eda0e5
--- /dev/null
+++ b/svx/uiconfig/ui/docrecoveryrecoverdialog.ui
@@ -0,0 +1,270 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.1 -->
+<interface>
+  <requires lib="gtk+" version="3.0"/>
+  <!-- interface-requires LibreOffice 1.0 -->
+  <object class="GtkDialog" id="DocRecoveryRecoverDialog">
+    <property name="can_focus">False</property>
+    <property name="border_width">6</property>
+    <property name="title" translatable="yes">%PRODUCTNAME %PRODUCTVERSION</property>
+    <property name="type_hint">dialog</property>
+    <child internal-child="vbox">
+      <object class="GtkBox" id="dialog-vbox1">
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">12</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox" id="dialog-action_area1">
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="next">
+                <property name="label">_Start Recovery &gt;</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="has_default">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_underline">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="cancel">
+                <property name="label">gtk-cancel</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="has_default">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkGrid" id="bgrid1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="hexpand">True</property>
+            <property name="vexpand">True</property>
+            <property name="row_spacing">12</property>
+            <child>
+              <object class="GtkGrid" id="grid1">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="hexpand">True</property>
+                <property name="vexpand">True</property>
+                <property name="row_spacing">24</property>
+                <child>
+                  <object class="GtkLabel" id="desc">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">Press 'Start Recovery' to start the recovery process of the documents listed below.
+
+The 'Status' column shows whether the document can be recovered.</property>
+                    <property name="wrap">True</property>
+                    <property name="max_width_chars">87</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">0</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkGrid" id="grid2">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="hexpand">True</property>
+                    <property name="vexpand">True</property>
+                    <property name="row_spacing">6</property>
+                    <child>
+                      <object class="GtkLabel" id="label2">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Status of recovered documents:</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">filelist:border</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">0</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="svtlo-SvSimpleTableContainer" id="filelist:border">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="hexpand">True</property>
+                        <property name="vexpand">True</property>
+                        <child internal-child="selection">
+                          <object class="GtkTreeSelection" id="treeview-selection"/>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">2</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkGrid" id="grid4">
+                        <property name="can_focus">False</property>
+                        <property name="no_show_all">True</property>
+                        <property name="hexpand">True</property>
+                        <property name="column_spacing">12</property>
+                        <property name="column_homogeneous">True</property>
+                        <child>
+                          <object class="GtkLabel" id="nameft">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="hexpand">True</property>
+                            <property name="label" translatable="yes">Document Name</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">0</property>
+                            <property name="width">1</property>
+                            <property name="height">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="statusft">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="hexpand">True</property>
+                            <property name="label" translatable="yes">Status</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="top_attach">0</property>
+                            <property name="width">1</property>
+                            <property name="height">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">1</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">2</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkGrid" id="grid3">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="hexpand">True</property>
+                    <property name="row_spacing">6</property>
+                    <child>
+                      <object class="GtkLabel" id="label3">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Recovering document:</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">progress</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">0</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkHBox" id="progress">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="hexpand">True</property>
+                        <child>
+                          <placeholder/>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">1</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">1</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">1</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="title">
+                <property name="name">12</property>
+                <property name="height_request">-1</property>
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">%PRODUCTNAME Document Recovery</property>
+                <attributes>
+                  <attribute name="weight" value="bold"/>
+                </attributes>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">0</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="0">next</action-widget>
+      <action-widget response="0">cancel</action-widget>
+    </action-widgets>
+  </object>
+</interface>