diff options
Diffstat (limited to 'sc/source/ui')
| -rw-r--r-- | sc/source/ui/app/typemap.cxx | 1 | ||||
| -rw-r--r-- | sc/source/ui/drawfunc/drawsh4.cxx | 1 | ||||
| -rw-r--r-- | sc/source/ui/drawfunc/drawsh5.cxx | 21 | ||||
| -rw-r--r-- | sc/source/ui/drawfunc/drtxtob2.cxx | 21 |
4 files changed, 2 insertions, 42 deletions
diff --git a/sc/source/ui/app/typemap.cxx b/sc/source/ui/app/typemap.cxx index 50d87e085c40..c0050ec617c0 100644 --- a/sc/source/ui/app/typemap.cxx +++ b/sc/source/ui/app/typemap.cxx @@ -99,7 +99,6 @@ #include <svx/xftshit.hxx> #include <svx/xftshcit.hxx> #include <svx/xftshxy.hxx> -#include <svx/xftsfit.hxx> #include <editeng/langitem.hxx> #include <svx/grafctrl.hxx> #include <editeng/shdditem.hxx> diff --git a/sc/source/ui/drawfunc/drawsh4.cxx b/sc/source/ui/drawfunc/drawsh4.cxx index 59d8b56f53ce..9035fc89601a 100644 --- a/sc/source/ui/drawfunc/drawsh4.cxx +++ b/sc/source/ui/drawfunc/drawsh4.cxx @@ -77,7 +77,6 @@ void ScDrawShell::GetFormTextState(SfxItemSet& rSet) rSet.DisableItem(XATTR_FORMTXTDISTANCE); rSet.DisableItem(XATTR_FORMTXTSTART); rSet.DisableItem(XATTR_FORMTXTMIRROR); - rSet.DisableItem(XATTR_FORMTXTSTDFORM); rSet.DisableItem(XATTR_FORMTXTHIDEFORM); rSet.DisableItem(XATTR_FORMTXTOUTLINE); rSet.DisableItem(XATTR_FORMTXTSHADOW); diff --git a/sc/source/ui/drawfunc/drawsh5.cxx b/sc/source/ui/drawfunc/drawsh5.cxx index bab82d87c1d1..e2b1dcbd7238 100644 --- a/sc/source/ui/drawfunc/drawsh5.cxx +++ b/sc/source/ui/drawfunc/drawsh5.cxx @@ -46,7 +46,6 @@ #include <svx/svdpage.hxx> #include <svx/svdundo.hxx> #include <svx/xdef.hxx> -#include <svx/xftsfit.hxx> #include <vcl/msgbox.hxx> #include <svx/extrusionbar.hxx> #include <svx/fontworkbar.hxx> @@ -682,25 +681,7 @@ void ScDrawShell::ExecFormText(SfxRequest& rReq) if ( pDrView->IsTextEdit() ) pDrView->ScEndTextEdit(); - if ( SFX_ITEM_SET == - rSet.GetItemState(XATTR_FORMTXTSTDFORM, sal_True, &pItem) - && XFTFORM_NONE != - ((const XFormTextStdFormItem*) pItem)->GetValue() ) - { - - sal_uInt16 nId = SvxFontWorkChildWindow::GetChildWindowId(); - SfxViewFrame* pViewFrm = pViewData->GetViewShell()->GetViewFrame(); - SvxFontWorkDialog* pDlg = (SvxFontWorkDialog*) - (pViewFrm-> - GetChildWindow(nId)->GetWindow()); - - pDlg->CreateStdFormObj(*pDrView, *pDrView->GetSdrPageView(), - rSet, *rMarkList.GetMark(0)->GetMarkedSdrObj(), - ((const XFormTextStdFormItem*) pItem)-> - GetValue()); - } - else - pDrView->SetAttributes(rSet); + pDrView->SetAttributes(rSet); } } diff --git a/sc/source/ui/drawfunc/drtxtob2.cxx b/sc/source/ui/drawfunc/drtxtob2.cxx index 228de0c81c57..0700b4b54dd6 100644 --- a/sc/source/ui/drawfunc/drtxtob2.cxx +++ b/sc/source/ui/drawfunc/drtxtob2.cxx @@ -205,25 +205,7 @@ void ScDrawTextObjectBar::ExecFormText(SfxRequest& rReq) if ( pDrView->IsTextEdit() ) pDrView->ScEndTextEdit(); - if ( SFX_ITEM_SET == - rSet.GetItemState(XATTR_FORMTXTSTDFORM, sal_True, &pItem) - && XFTFORM_NONE != - ((const XFormTextStdFormItem*) pItem)->GetValue() ) - { - - sal_uInt16 nId = SvxFontWorkChildWindow::GetChildWindowId(); - SfxViewFrame* pViewFrm = pViewData->GetViewShell()->GetViewFrame(); - SvxFontWorkDialog* pDlg = (SvxFontWorkDialog*) - (pViewFrm-> - GetChildWindow(nId)->GetWindow()); - - pDlg->CreateStdFormObj(*pDrView, *pDrView->GetSdrPageView(), - rSet, *rMarkList.GetMark(0)->GetMarkedSdrObj(), - ((const XFormTextStdFormItem*) pItem)-> - GetValue()); - } - else - pDrView->SetAttributes(rSet); + pDrView->SetAttributes(rSet); } } @@ -259,7 +241,6 @@ void ScDrawTextObjectBar::GetFormTextState(SfxItemSet& rSet) rSet.DisableItem(XATTR_FORMTXTDISTANCE); rSet.DisableItem(XATTR_FORMTXTSTART); rSet.DisableItem(XATTR_FORMTXTMIRROR); - rSet.DisableItem(XATTR_FORMTXTSTDFORM); rSet.DisableItem(XATTR_FORMTXTHIDEFORM); rSet.DisableItem(XATTR_FORMTXTOUTLINE); rSet.DisableItem(XATTR_FORMTXTSHADOW); |