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

Caolán McNamara caolanm at redhat.com
Fri Dec 27 05:59:25 PST 2013


 svx/source/tbxctrls/grafctrl.cxx |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 4b3b7fc35e4d94d9ec30e0b2fc85b7b961fdcb8d
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Dec 27 13:54:55 2013 +0000

    SfxNoLayoutSingleTabDialog->SfxSingleTabDialog
    
    Change-Id: Ib0d0696b1da5b609473a61aff185282233afb9fd

diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx
index 59b7a31..600774b 100644
--- a/svx/source/tbxctrls/grafctrl.cxx
+++ b/svx/source/tbxctrls/grafctrl.cxx
@@ -737,18 +737,19 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView )
                     aCropDlgAttr.Put( SdrGrafCropItem( aLTSize.Width(), aLTSize.Height(),
                                                     aRBSize.Width(), aRBSize.Height() ) );
 
-                    SfxNoLayoutSingleTabDialog  aCropDialog( SfxViewShell::Current() ? SfxViewShell::Current()->GetWindow() : NULL,
-                                                    aCropDlgAttr, 950 );
-                    const OUString        aCropStr = SVX_RESSTR( RID_SVXSTR_GRAFCROP );
+                    SfxSingleTabDialog  aCropDialog(
+                        SfxViewShell::Current() ? SfxViewShell::Current()->GetWindow() : NULL,
+                        aCropDlgAttr);
+                    const OUString aCropStr(SVX_RESSTR(RID_SVXSTR_GRAFCROP));
 
                     SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
                     DBG_ASSERT(pFact, "Dialogdiet error!");
                     ::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( RID_SVXPAGE_GRFCROP );
                     DBG_ASSERT(fnCreatePage, "Dialogdiet error!");
-                    SfxTabPage* pTabPage = (*fnCreatePage)( &aCropDialog, aCropDlgAttr );
+                    SfxTabPage* pTabPage = (*fnCreatePage)( aCropDialog.get_content_area(), aCropDlgAttr );
 
                     pTabPage->SetText( aCropStr );
-                    aCropDialog.SetTabPage( pTabPage );
+                    aCropDialog.setTabPage( pTabPage );
 
                     if( aCropDialog.Execute() == RET_OK )
                     {


More information about the Libreoffice-commits mailing list