diff options
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/ui/dbui/mmlayoutpage.cxx | 12 | ||||
| -rw-r--r-- | sw/source/ui/dbui/mmlayoutpage.hxx | 1 | ||||
| -rw-r--r-- | sw/source/ui/dbui/mmlayoutpage.src | 1 |
3 files changed, 3 insertions, 11 deletions
diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx b/sw/source/ui/dbui/mmlayoutpage.cxx index f9ccc48d7208..44c7b9ee1fe6 100644 --- a/sw/source/ui/dbui/mmlayoutpage.cxx +++ b/sw/source/ui/dbui/mmlayoutpage.cxx @@ -90,7 +90,6 @@ SwMailMergeLayoutPage::SwMailMergeLayoutPage( SwMailMergeWizard* _pParent) : m_aDownFT( this, SW_RES( FT_DOWN )), m_aDownPB( this, SW_RES( PB_DOWN )), m_aExampleContainerWIN( this, SW_RES( WIN_EXAMPLECONTAINER )), - m_aExampleWIN( this, 0 ), m_aZoomFT( this, SW_RES( FT_ZOOM )), m_aZoomLB( this, SW_RES( LB_ZOOM )), #ifdef _MSC_VER @@ -103,9 +102,6 @@ SwMailMergeLayoutPage::SwMailMergeLayoutPage( SwMailMergeWizard* _pParent) : m_pWizard(_pParent) { FreeResource(); - m_aExampleWIN.SetPosSizePixel(m_aExampleContainerWIN.GetPosPixel(), - m_aExampleContainerWIN.GetSizePixel()); - const SfxFilter *pSfxFlt = SwIoSystem::GetFilterOfFormat( OUString( FILTER_XML ), @@ -130,11 +126,10 @@ SwMailMergeLayoutPage::SwMailMergeLayoutPage( SwMailMergeWizard* _pParent) : xStore->storeToURL( m_sExampleURL, aValues ); Link aLink(LINK(this, SwMailMergeLayoutPage, PreviewLoadedHdl_Impl)); - m_pExampleFrame = new SwOneExampleFrame( m_aExampleWIN, + m_pExampleFrame = new SwOneExampleFrame( m_aExampleContainerWIN, EX_SHOW_DEFAULT_PAGE, &aLink, &m_sExampleURL ); - m_aExampleWIN.Show( sal_False ); - m_aExampleContainerWIN.Show(sal_True); + m_aExampleContainerWIN.Show(false); m_aLeftMF.SetValue(m_aLeftMF.Normalize(DEFAULT_LEFT_DISTANCE), FUNIT_TWIP); m_aTopMF.SetValue(m_aTopMF.Normalize(DEFAULT_TOP_DISTANCE), FUNIT_TWIP); @@ -662,8 +657,7 @@ void SwMailMergeLayoutPage::InsertGreeting(SwWrtShell& rShell, SwMailMergeConfig IMPL_LINK_NOARG(SwMailMergeLayoutPage, PreviewLoadedHdl_Impl) { - m_aExampleWIN.Show( sal_True ); - m_aExampleContainerWIN.Show(sal_False); + m_aExampleContainerWIN.Show(true); Reference< XModel > & xModel = m_pExampleFrame->GetModel(); //now the ViewOptions should be set properly diff --git a/sw/source/ui/dbui/mmlayoutpage.hxx b/sw/source/ui/dbui/mmlayoutpage.hxx index 57e76e5aeeab..ca16b1ad71b0 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/dbui/mmlayoutpage.src b/sw/source/ui/dbui/mmlayoutpage.src index bbb4da9cfd0c..cc54bba162b3 100644 --- a/sw/source/ui/dbui/mmlayoutpage.src +++ b/sw/source/ui/dbui/mmlayoutpage.src @@ -129,7 +129,6 @@ TabPage DLG_MM_LAYOUT_PAGE { Pos = MAP_APPFONT ( 130 , 20 ) ; Size = MAP_APPFONT ( 124 , 159 ) ; - Border = TRUE; }; FixedText FT_ZOOM { |