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

6 files changed, 2 insertions, 58 deletions

diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx
index b38f6dc9a136..2567a5212605 100644
--- a/sw/inc/pch/precompiled_sw.hxx
+++ b/sw/inc/pch/precompiled_sw.hxx
@@ -931,7 +931,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/sw/sdi/drawsh.sdi b/sw/sdi/drawsh.sdi
index 49ebe0fcf5cd..3bd4a4a53dbc 100644
--- a/sw/sdi/drawsh.sdi
+++ b/sw/sdi/drawsh.sdi
@@ -491,13 +491,6 @@ shell SwDrawShell : SwDrawBaseShell
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
 
-    SID_FORMTEXT_STDFORM
-    [
-        ExecMethod = ExecFormText ;
-        StateMethod = GetFormTextState ;
-        DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
-    ]
-
     FN_FORMAT_FOOTNOTE_DLG // status()
     [
         ExecMethod = Execute;
diff --git a/sw/sdi/drwtxtsh.sdi b/sw/sdi/drwtxtsh.sdi
index 5e326f771226..23402a38f397 100644
--- a/sw/sdi/drwtxtsh.sdi
+++ b/sw/sdi/drwtxtsh.sdi
@@ -433,13 +433,6 @@ interface TextDrawText
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
 
-    SID_FORMTEXT_STDFORM // api:
-    [
-        ExecMethod = ExecFormText ;
-        StateMethod = GetFormTextState ;
-        DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
-    ]
-
     SID_THESAURUS // api:
     [
         ExecMethod = ExecDrawLingu ;
diff --git a/sw/source/ui/shells/drawsh.cxx b/sw/source/ui/shells/drawsh.cxx
index 4694ec22972f..9ee7a70b7bbc 100644
--- a/sw/source/ui/shells/drawsh.cxx
+++ b/sw/source/ui/shells/drawsh.cxx
@@ -27,7 +27,6 @@
 #include <sfx2/objface.hxx>
 #include <svl/itemiter.hxx>
 #include <svl/srchitem.hxx>
-#include <svx/xftsfit.hxx>
 #include <svx/extrusionbar.hxx>
 #include <svx/fontworkbar.hxx>
 #include <svx/tbxcustomshapes.hxx>
@@ -389,7 +388,6 @@ void SwDrawShell::ExecFormText(SfxRequest& rReq)
     if ( rMarkList.GetMarkCount() == 1 && rReq.GetArgs() )
     {
         const SfxItemSet& rSet = *rReq.GetArgs();
-        const SfxPoolItem* pItem;
 
         if ( pDrView->IsTextEdit() )
         {
@@ -397,24 +395,7 @@ void SwDrawShell::ExecFormText(SfxRequest& rReq)
             GetView().AttrChangedNotify(&rSh);
         }
 
-        if ( rSet.GetItemState(XATTR_FORMTXTSTDFORM, sal_True, &pItem) ==
-             SFX_ITEM_SET &&
-            ((const XFormTextStdFormItem*) pItem)->GetValue() != XFTFORM_NONE )
-        {
-
-            const sal_uInt16 nId = SvxFontWorkChildWindow::GetChildWindowId();
-
-            SvxFontWorkDialog* pDlg = (SvxFontWorkDialog*)(GetView().GetViewFrame()->
-                                        GetChildWindow(nId)->GetWindow());
-
-            pDlg->CreateStdFormObj(*pDrView, *pDrView->GetSdrPageView(),
-                                    rSet, *rMarkList.GetMark(0)->GetMarkedSdrObj(),
-                                   ((const XFormTextStdFormItem*) pItem)->
-                                   GetValue());
-
-        }
-        else
-            pDrView->SetAttributes(rSet);
+        pDrView->SetAttributes(rSet);
     }
     if (pDrView->GetModel()->IsChanged())
         rSh.SetModified();
@@ -456,7 +437,6 @@ void SwDrawShell::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/sw/source/ui/shells/drwtxtsh.cxx b/sw/source/ui/shells/drwtxtsh.cxx
index f0c40462df47..cda38033ae93 100644
--- a/sw/source/ui/shells/drwtxtsh.cxx
+++ b/sw/source/ui/shells/drwtxtsh.cxx
@@ -29,7 +29,6 @@
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/objface.hxx>
 #include <svx/svdotext.hxx>
-#include <svx/xftsfit.hxx>
 #include <editeng/editeng.hxx>
 #include <editeng/editview.hxx>
 #include <editeng/eeitem.hxx>
@@ -212,10 +211,7 @@ void SwDrawTextShell::ExecFormText(SfxRequest& rReq)
     if ( rMarkList.GetMarkCount() == 1 && rReq.GetArgs() )
     {
         const SfxItemSet& rSet = *rReq.GetArgs();
-        const SfxPoolItem* pItem;
 
-        //ask for the ViewFrame here - "this" may not be valid any longer!
-        SfxViewFrame* pVFrame = GetView().GetViewFrame();
         if ( pDrView->IsTextEdit() )
         {
             //#111733# Sometimes SdrEndTextEdit() initiates the change in selection and
@@ -226,22 +222,7 @@ void SwDrawTextShell::ExecFormText(SfxRequest& rReq)
             rTempView.AttrChangedNotify(&rSh);
         }
 
-        if ( rSet.GetItemState(XATTR_FORMTXTSTDFORM, sal_True, &pItem) ==
-             SFX_ITEM_SET &&
-            ((const XFormTextStdFormItem*) pItem)->GetValue() != XFTFORM_NONE )
-        {
-
-            const sal_uInt16 nId = SvxFontWorkChildWindow::GetChildWindowId();
-            SvxFontWorkDialog* pDlg = (SvxFontWorkDialog*)(
-                    pVFrame->GetChildWindow(nId)->GetWindow());
-
-            pDlg->CreateStdFormObj(*pDrView, *pDrView->GetSdrPageView(),
-                                    rSet, *rMarkList.GetMark(0)->GetMarkedSdrObj(),
-                                   ((const XFormTextStdFormItem*) pItem)->
-                                   GetValue());
-        }
-        else
-            pDrView->SetAttributes(rSet);
+        pDrView->SetAttributes(rSet);
     }
 
 }
@@ -279,7 +260,6 @@ void SwDrawTextShell::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/sw/source/ui/shells/slotadd.cxx b/sw/source/ui/shells/slotadd.cxx
index 41f7825e182b..fd9bf5107d9e 100644
--- a/sw/source/ui/shells/slotadd.cxx
+++ b/sw/source/ui/shells/slotadd.cxx
@@ -96,7 +96,6 @@
 #include <svx/xftshit.hxx>
 #include <svx/xftshcit.hxx>
 #include <svx/xftshxy.hxx>
-#include <svx/xftsfit.hxx>
 #include <svx/grafctrl.hxx>