[Libreoffice-commits] .: Branch 'libreoffice-4-0' - svx/source

[Libreoffice Gerrit user]

 svx/source/dialog/docrecovery.cxx |    2 +-
 svx/source/inc/docrecovery.hxx    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit fe3bcdac912580607611475bfc3b0fa478a54ec1
Author: Caolán McNamara <caol...@redhat.com>
Date:   Tue Jan 8 14:04:09 2013 +0000

    Resolves: fdo#58589 recovery dialog title area text is missing
    
    regression since efc6b840a0423099d6c3e0d33c14d34637fbba4c
    as that changes the order in which windows are drawn
    
    Change-Id: I37388229533127ab915bec351f094fcd4786b2a3
    (cherry picked from commit f8a4ce67987e5cb47f07dc61eeb450e1d5b9c541)
    Reviewed-on: https://gerrit.libreoffice.org/1606
    Reviewed-by: Tor Lillqvist <t...@iki.fi>
    Tested-by: Tor Lillqvist <t...@iki.fi>

diff --git a/svx/source/dialog/docrecovery.cxx 
b/svx/source/dialog/docrecovery.cxx
index 3f9d4de..277d9ec 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -987,8 +987,8 @@ short impl_askUserForWizardCancel(Window* pParent, 
sal_Int16 nRes)
 RecoveryDialog::RecoveryDialog(Window*       pParent,
                                RecoveryCore* pCore  )
     : IExtendedTabPage( pParent      , SVX_RES( 
RID_SVXPAGE_DOCRECOVERY_RECOVER ) )
-    , m_aTitleWin           ( this           , SVX_RES  ( WIN_RECOV_TITLE      
          ) )
     , 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       
          ) )
diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx
index f3e47e0..171c34d 100644
--- a/svx/source/inc/docrecovery.hxx
+++ b/svx/source/inc/docrecovery.hxx
@@ -606,8 +606,8 @@ class RecoveryDialog : public IExtendedTabPage
     //-------------------------------------------
     // member
     private:
-        Window          m_aTitleWin;
         FixedText       m_aTitleFT;
+        Window          m_aTitleWin;
         FixedLine       m_aTitleFL;
         FixedText       m_aDescrFT;
         FixedText       m_aProgressFT;

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits