[Libreoffice-commits] .: Branch 'libreoffice-3-6' - svx/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Thu Jan 10 01:58:46 PST 2013
svx/source/dialog/docrecovery.cxx | 2 +-
svx/source/inc/docrecovery.hxx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 26b0cacbceb39974fee8c974edb73c3428d9b137
Author: Caolán McNamara <caolanm at 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/1607
Reviewed-by: Tor Lillqvist <tml at iki.fi>
Tested-by: Tor Lillqvist <tml at iki.fi>
diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx
index 4c0c96a..412c938 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -998,8 +998,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 1159f01..9eeb3c3 100644
--- a/svx/source/inc/docrecovery.hxx
+++ b/svx/source/inc/docrecovery.hxx
@@ -631,8 +631,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;
More information about the Libreoffice-commits
mailing list