diff options
| author | Armin Le Grand <alg@apache.org> | 2013-04-09 16:06:32 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-06-17 11:02:00 +0100 |
| commit | 573322e26b0244b27f70cfbc8989b3040a34f3d6 (patch) | |
| tree | 1812788fd614d7c55b127ef360cab08b334b8244 /sd/source/ui/view | |
| parent | b93107f3d510f19faa2e62dc965aea9f1b46898d (diff) | |
Resolves: #i121538# Removed old Fontwork dialogs preset box...
and all dependencies
(cherry picked from commit bcfee75544246db6788715d98efd6d33c12f933d)
Conflicts:
sd/inc/pch/precompiled_sd.hxx
sd/source/core/typemap.cxx
sd/source/ui/view/drviews6.cxx
svx/Package_inc.mk
svx/inc/svx/dialogs.hrc
svx/inc/svx/fontwork.hxx
svx/inc/svx/svdstr.hrc
svx/inc/svx/svxcommands.h
svx/inc/svx/svxids.hrc
svx/inc/svx/unoshprp.hxx
svx/inc/svx/xdef.hxx
svx/inc/svx/xenum.hxx
svx/inc/svx/xtextit.hxx
svx/source/dialog/fontwork.cxx
svx/source/dialog/fontwork.hrc
svx/source/dialog/fontwork.src
svx/source/xoutdev/xattr.cxx
sw/inc/pch/precompiled_sw.hxx
Change-Id: I3718285d38444d3862ca382fe020a4e0a083a677
Diffstat (limited to 'sd/source/ui/view')
| -rw-r--r-- | sd/source/ui/view/drviews6.cxx | 27 |
1 files changed, 1 insertions, 26 deletions
diff --git a/sd/source/ui/view/drviews6.cxx b/sd/source/ui/view/drviews6.cxx index 8b9f5dd1d978..d80e52836ece 100644 --- a/sd/source/ui/view/drviews6.cxx +++ b/sd/source/ui/view/drviews6.cxx @@ -29,7 +29,6 @@ #include <svx/bmpmask.hxx> #include <svx/galbrws.hxx> #include <svx/imapdlg.hxx> -#include <svx/xftsfit.hxx> #include <svx/SvxColorChildWindow.hxx> #include <svx/f3dchild.hxx> #include "optsitem.hxx" @@ -75,34 +74,11 @@ void DrawViewShell::ExecFormText(SfxRequest& rReq) mpDrawView && !mpDrawView->IsPresObjSelected() ) { const SfxItemSet& rSet = *rReq.GetArgs(); - const SfxPoolItem* pItem; if ( mpDrawView->IsTextEdit() ) mpDrawView->SdrEndTextEdit(); - if ( rSet.GetItemState(XATTR_FORMTXTSTDFORM, sal_True, &pItem) == - SFX_ITEM_SET && - ((const XFormTextStdFormItem*) pItem)->GetValue() != XFTFORM_NONE ) - { - - sal_uInt16 nId = SvxFontWorkChildWindow::GetChildWindowId(); - - SvxFontWorkDialog* pDlg = (SvxFontWorkDialog*)GetViewFrame()-> - GetChildWindow(nId)->GetWindow(); - - pDlg->CreateStdFormObj(*mpDrawView, *mpDrawView->GetSdrPageView(), - rSet, *rMarkList.GetMark(0)->GetMarkedSdrObj(), - ((const XFormTextStdFormItem*) pItem)-> - GetValue()); - - if(HasCurrentFunction(SID_BEZIER_EDIT)) - { // activate the right edit function if necessary - GetViewFrame()->GetDispatcher()->Execute(SID_SWITCH_POINTEDIT, - SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD); - } - } - else - mpDrawView->SetAttributes(rSet); + mpDrawView->SetAttributes(rSet); } } @@ -139,7 +115,6 @@ void DrawViewShell::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); |