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

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Tue Jan 29 01:51:27 PST 2013


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

New commits:
commit 6a3091af129ea3e6440e618922cde73496840f17
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jan 28 10:55:10 2013 +0000

    Resolves: fdo#59965 crash dialog title area text is missing
    
    Change-Id: I19adc5047d744acee243c94ff4e31531ae8c458a
    (cherry picked from commit ffce5ac51518bbd43ac0ae14dbb0967ae2c50bb4)
    Reviewed-on: https://gerrit.libreoffice.org/1893
    Reviewed-by: Petr Mladek <pmladek at suse.cz>
    Tested-by: Petr Mladek <pmladek at suse.cz>
    (cherry picked from commit 13d390b9d55f81ca87f86d86249a19e672efcc2f)
    Reviewed-on: https://gerrit.libreoffice.org/1906
    Reviewed-by: Kohei Yoshida <kohei.yoshida at gmail.com>
    Reviewed-by: Miklos Vajna <vmiklos at suse.cz>
    Tested-by: Miklos Vajna <vmiklos at suse.cz>

diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx
index 277d9ec..dfe9aee 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -727,8 +727,8 @@ void SAL_CALL PluginProgress::reset()
 SaveDialog::SaveDialog(Window*       pParent,
                        RecoveryCore* pCore  )
     : IExtendedTabPage( pParent, SVX_RES( RID_SVXPAGE_DOCRECOVERY_SAVE ) )
-    , m_aTitleWin    ( this   , SVX_RES  ( WIN_SAVE_TITLE              ) )
     , m_aTitleFT     ( this   , SVX_RES  ( FT_SAVE_TITLE               ) )
+    , m_aTitleWin    ( this   , SVX_RES  ( WIN_SAVE_TITLE              ) )
     , m_aTitleFL     ( this   , SVX_RES  ( FL_SAVE_TITLE               ) )
     , m_aDescrFT     ( this   , SVX_RES  ( FT_SAVE_DESCR               ) )
     , m_aFileListFT  ( this   , SVX_RES  ( FT_SAVE_FILELIST            ) )
diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx
index 171c34d..937ff98 100644
--- a/svx/source/inc/docrecovery.hxx
+++ b/svx/source/inc/docrecovery.hxx
@@ -441,8 +441,8 @@ class SaveDialog : public IExtendedTabPage
     // member
     private:
 
-        Window          m_aTitleWin;
         FixedText       m_aTitleFT;
+        Window          m_aTitleWin;
         FixedLine       m_aTitleFL;
         FixedText       m_aDescrFT;
         FixedText       m_aFileListFT;


More information about the Libreoffice-commits mailing list