diff options
Diffstat (limited to 'sc/source/ui/drawfunc/drawsh.cxx')
| -rw-r--r-- | sc/source/ui/drawfunc/drawsh.cxx | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx index 63f958763479..e53fea436d12 100644 --- a/sc/source/ui/drawfunc/drawsh.cxx +++ b/sc/source/ui/drawfunc/drawsh.cxx @@ -48,7 +48,7 @@ #include <sfx2/objsh.hxx> #include <sfx2/request.hxx> #include <sfx2/dispatch.hxx> -#include <svtools/whiter.hxx> +#include <svl/whiter.hxx> #include <vcl/msgbox.hxx> #include "drawsh.hxx" @@ -71,7 +71,7 @@ #include "userdat.hxx" #include <sfx2/objsh.hxx> -#include <svtools/macitem.hxx> +#include <svl/macitem.hxx> #include <sfx2/evntconf.hxx> #include <sfx2/viewsh.hxx> #include <com/sun/star/util/XModifiable.hpp> @@ -266,7 +266,7 @@ void ScDrawShell::ExecDrawAttr( SfxRequest& rReq ) SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if ( pFact ) { - SfxAbstractTabDialog *pDlg = pFact->CreateCaptionDialog( pWin, pView, RID_SVXDLG_CAPTION ); + SfxAbstractTabDialog *pDlg = pFact->CreateCaptionDialog( pWin, pView ); const USHORT* pRange = pDlg->GetInputRanges( *aNewAttr.GetPool() ); SfxItemSet aCombSet( *aNewAttr.GetPool(), pRange ); @@ -291,7 +291,7 @@ void ScDrawShell::ExecDrawAttr( SfxRequest& rReq ) SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) { - SfxAbstractTabDialog* pDlg = pFact->CreateSvxTransformTabDialog( pWin, &aNewAttr,pView, RID_SVXDLG_TRANSFORM ); + SfxAbstractTabDialog* pDlg = pFact->CreateSvxTransformTabDialog( pWin, &aNewAttr,pView ); DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001 if (pDlg->Execute() == RET_OK) { @@ -398,7 +398,6 @@ void ScDrawShell::ExecuteLineDlg( SfxRequest& rReq, USHORT nTabPage ) SfxAbstractTabDialog * pDlg = pFact->CreateSvxLineTabDialog( pViewData->GetDialogParent(), &aNewAttr, pViewData->GetDocument()->GetDrawLayer(), - RID_SVXDLG_LINE, pObj, bHasMarked); DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001 @@ -439,7 +438,6 @@ void ScDrawShell::ExecuteAreaDlg( SfxRequest& rReq, USHORT nTabPage ) AbstractSvxAreaTabDialog * pDlg = pFact->CreateSvxAreaTabDialog( pViewData->GetDialogParent(), &aNewAttr, pViewData->GetDocument()->GetDrawLayer(), - RID_SVXDLG_AREA, pView); DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001 @@ -477,7 +475,7 @@ void ScDrawShell::ExecuteTextAttrDlg( SfxRequest& rReq, USHORT /* nTabPage */ ) pView->MergeAttrFromMarked( aNewAttr, FALSE ); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - SfxAbstractTabDialog *pDlg = pFact->CreateTextTabDialog( pViewData->GetDialogParent(), &aNewAttr, RID_SVXDLG_TEXT, pView ); + SfxAbstractTabDialog *pDlg = pFact->CreateTextTabDialog( pViewData->GetDialogParent(), &aNewAttr, pView ); USHORT nResult = pDlg->Execute(); |