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

4 files changed, 1 insertions, 33 deletions

diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx
index e421bca10b35..5ba7e608aa34 100644
--- a/sd/inc/pch/precompiled_sd.hxx
+++ b/sd/inc/pch/precompiled_sd.hxx
@@ -758,7 +758,6 @@
 #include <svx/xftdiit.hxx>
 #include <svx/xftmrit.hxx>
 #include <svx/xftouit.hxx>
-#include <svx/xftsfit.hxx>
 #include <svx/xftshcit.hxx>
 #include <svx/xftshit.hxx>
 #include <svx/xftshxy.hxx>
diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi
index 29c436249561..b06113e33dcd 100644
--- a/sd/sdi/_drvwsh.sdi
+++ b/sd/sdi/_drvwsh.sdi
@@ -1769,11 +1769,6 @@ interface DrawView
         ExecMethod = ExecFormText ;
         StateMethod = GetFormTextState ;
     ]
-    SID_FORMTEXT_STDFORM // ole : no, status : ?
-    [
-        ExecMethod = ExecFormText ;
-        StateMethod = GetFormTextState ;
-    ]
     SID_GALLERY // ole : yes, status : ?
     [
         ExecMethod = FuTemporary ;
diff --git a/sd/source/core/typemap.cxx b/sd/source/core/typemap.cxx
index 7e5277e55c79..cc029fca554c 100644
--- a/sd/source/core/typemap.cxx
+++ b/sd/source/core/typemap.cxx
@@ -80,7 +80,6 @@
 #include <svx/xftshit.hxx>
 #include <svx/xftshcit.hxx>
 #include <svx/xftshxy.hxx>
-#include <svx/xftsfit.hxx>
 #include <avmedia/mediaitem.hxx>
 #include <svx/drawitem.hxx>
 
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);