diff options
| author | Björn Milcke <bm@openoffice.org> | 2004-02-10 09:21:12 +0000 |
|---|---|---|
| committer | Björn Milcke <bm@openoffice.org> | 2004-02-10 09:21:12 +0000 |
| commit | 67d81fb06d54cd25b13603cfa5dd4629c1c09581 (patch) | |
| tree | 86b156a7574200aca3bab40e7340b37e504f5fe8 /chart2/source/controller/main/ChartController_Position.cxx | |
| parent | #100000#: remove ofa.ilb from dependencies (diff) | |
| download | core-67d81fb06d54cd25b13603cfa5dd4629c1c09581.tar.gz core-67d81fb06d54cd25b13603cfa5dd4629c1c09581.zip | |
necessary changes due to dialog restructuring
(see CWS SRC680/dialogdiet)
Diffstat (limited to 'chart2/source/controller/main/ChartController_Position.cxx')
| -rw-r--r-- | chart2/source/controller/main/ChartController_Position.cxx | 29 |
1 files changed, 22 insertions, 7 deletions
diff --git a/chart2/source/controller/main/ChartController_Position.cxx b/chart2/source/controller/main/ChartController_Position.cxx index 000b9eaa1dd7..741e1be0edf0 100644 --- a/chart2/source/controller/main/ChartController_Position.cxx +++ b/chart2/source/controller/main/ChartController_Position.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ChartController_Position.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: bm $ $Date: 2004-01-26 09:12:07 $ + * last change: $Author: bm $ $Date: 2004-02-10 10:21:12 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -60,7 +60,6 @@ ************************************************************************/ #include "ChartController.hxx" -#include "dlg_PositionAndSize.hxx" #include "dlg_RotateDiagram.hxx" #include "macros.hxx" #include "ChartWindow.hxx" @@ -82,6 +81,13 @@ #include <svx/svxids.hrc> #endif +#ifndef _SVX_DIALOG_HXX +#include <svx/svxdlg.hxx> +#endif +#ifndef _SVX_DIALOGS_HRC +#include <svx/dialogs.hrc> +#endif + //............................................................................. namespace chart { @@ -120,6 +126,7 @@ void SAL_CALL ChartController::executeDispatch_PositionAndSize( const ::rtl::OUS return; bool bChanged = false; + SfxAbstractTabDialog * pDlg = NULL; try { SfxItemSet aItemSet = m_pDrawViewWrapper->getPositionAndSizeItemSetFromMarkedObject(); @@ -128,10 +135,16 @@ void SAL_CALL ChartController::executeDispatch_PositionAndSize( const ::rtl::OUS Window* pParent( NULL ); SdrView* pSdrView = m_pDrawViewWrapper; bool bResizePossible=true; - PositionAndSizeDialog aDlg( pParent, &aItemSet, pSdrView, bResizePossible ); - if( aDlg.Execute() == RET_OK ) + + SvxAbstractDialogFactory * pFact = SvxAbstractDialogFactory::Create(); + DBG_ASSERT( pFact, "No dialog factory" ); + pDlg = pFact->CreateSchTransformTabDialog( + NULL, &aItemSet, pSdrView, ResId( RID_SCH_TransformTabDLG_SVXPAGE_ANGLE ), bResizePossible ); + DBG_ASSERT( pDlg, "Couldn't create SchTransformTabDialog" ); + + if( pDlg->Execute() == RET_OK ) { - const SfxItemSet* pOutItemSet = aDlg.GetOutputItemSet(); + const SfxItemSet* pOutItemSet = pDlg->GetOutputItemSet(); if(pOutItemSet) { Rectangle aObjectRect; @@ -146,9 +159,11 @@ void SAL_CALL ChartController::executeDispatch_PositionAndSize( const ::rtl::OUS ); } } + delete pDlg; } - catch( uno::RuntimeException& e) + catch( uno::Exception& e) { + delete pDlg; ASSERT_EXCEPTION( e ); } //make sure that all objects using m_pChartView are already deleted |