[Libreoffice-commits] core.git: sw/source

Caolán McNamara caolanm at redhat.com
Mon May 13 05:37:36 PDT 2013


 sw/source/ui/dbui/mmlayoutpage.hxx |    1 -
 sw/source/ui/inc/swuicnttab.hxx    |    1 -
 sw/source/ui/index/cnttab.cxx      |    6 +-----
 3 files changed, 1 insertion(+), 7 deletions(-)

New commits:
commit 38504054d87e3fb8b29cd1172965fb5012983a75
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon May 13 13:36:16 2013 +0100

    Resolves: fdo#64287 missing insert index/table preview
    
    Change-Id: I90aab9339362565dd49b72dd057717f7bbf3d874

diff --git a/sw/source/ui/dbui/mmlayoutpage.hxx b/sw/source/ui/dbui/mmlayoutpage.hxx
index 57e76e5..ca16b1a 100644
--- a/sw/source/ui/dbui/mmlayoutpage.hxx
+++ b/sw/source/ui/dbui/mmlayoutpage.hxx
@@ -54,7 +54,6 @@ class SwMailMergeLayoutPage : public svt::OWizardPage
     PushButton          m_aDownPB;
 
     Window              m_aExampleContainerWIN;
-    Window              m_aExampleWIN;
 
     FixedText           m_aZoomFT;
     ListBox             m_aZoomLB;
diff --git a/sw/source/ui/inc/swuicnttab.hxx b/sw/source/ui/inc/swuicnttab.hxx
index b540a73..27a5a8f 100644
--- a/sw/source/ui/inc/swuicnttab.hxx
+++ b/sw/source/ui/inc/swuicnttab.hxx
@@ -62,7 +62,6 @@ struct SwIndexSections_Impl;
 class SwMultiTOXTabDialog : public SfxTabDialog
 {
     Window                  aExampleContainerWIN;
-    Window                  aExampleWIN;
     CheckBox                aShowExampleCB;
     SwTOXMgr*               pMgr;
     SwWrtShell&             rSh;
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 73089da..bf7965e 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -224,7 +224,6 @@ SwMultiTOXTabDialog::SwMultiTOXTabDialog(Window* pParent, const SfxItemSet& rSet
                     sal_uInt16 nToxType, sal_Bool bGlobal) :
         SfxTabDialog(   pParent, SW_RES(DLG_MULTI_TOX), &rSet),
         aExampleContainerWIN(this, SW_RES(WIN_EXAMPLE)),
-        aExampleWIN( &aExampleContainerWIN, 0 ),
         aShowExampleCB( this, SW_RES(CB_SHOWEXAMPLE)),
         pMgr( new SwTOXMgr( &rShell ) ),
         rSh(rShell),
@@ -239,9 +238,6 @@ SwMultiTOXTabDialog::SwMultiTOXTabDialog(Window* pParent, const SfxItemSet& rSet
 {
     FreeResource();
 
-    aExampleWIN.SetPosSizePixel(aExampleContainerWIN.GetPosPixel(),
-                                aExampleContainerWIN.GetSizePixel());
-
     eCurrentTOXType.eType = TOX_CONTENT;
     eCurrentTOXType.nIndex = 0;
 
@@ -528,7 +524,7 @@ IMPL_LINK( SwMultiTOXTabDialog, ShowPreviewHdl, CheckBox *, pBox )
             {
                 Link aLink(LINK(this, SwMultiTOXTabDialog, CreateExample_Hdl));
                 pExampleFrame = new SwOneExampleFrame(
-                        aExampleWIN, EX_SHOW_ONLINE_LAYOUT, &aLink, &sTemplate);
+                        aExampleContainerWIN, EX_SHOW_ONLINE_LAYOUT, &aLink, &sTemplate);
 
                 if(!pExampleFrame->IsServiceAvailable())
                 {


More information about the Libreoffice-commits mailing list