mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolves: #i121538# Removed old Fontwork dialogs preset box...

Browse Source 
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
This commit is contained in:
Armin Le Grand 2013-04-09 16:06:32 +00:00 committed by Caolán McNamara
parent b93107f3d5
commit 573322e26b
34 changed files with 32 additions and 726 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
include/svx/dialogs.hrc
View File

@ -203,20 +203,6 @@
// FontWork dialog
#define RID_SVXDLG_FONTWORK (RID_SVX_START + 93)
// FontWork ValueSet bitmaps
#define RID_SVXBMP_FONTWORK_FORM1 (RID_SVX_START + 94)
#define RID_SVXBMP_FONTWORK_FORM2 (RID_SVX_START + 95)
#define RID_SVXBMP_FONTWORK_FORM3 (RID_SVX_START + 96)
#define RID_SVXBMP_FONTWORK_FORM4 (RID_SVX_START + 97)
#define RID_SVXBMP_FONTWORK_FORM5 (RID_SVX_START + 98)
#define RID_SVXBMP_FONTWORK_FORM6 (RID_SVX_START + 99)
#define RID_SVXBMP_FONTWORK_FORM7 (RID_SVX_START + 100)
#define RID_SVXBMP_FONTWORK_FORM8 (RID_SVX_START + 101)
#define RID_SVXBMP_FONTWORK_FORM9 (RID_SVX_START + 102)
#define RID_SVXBMP_FONTWORK_FORM10 (RID_SVX_START + 103)
#define RID_SVXBMP_FONTWORK_FORM11 (RID_SVX_START + 104)
#define RID_SVXBMP_FONTWORK_FORM12 (RID_SVX_START + 105)
#define RID_SVXCTRL_COLOR (RID_SVX_START + 117)
// for Toolbox-Control style
@ -322,21 +308,6 @@
// Close (in TabDialog line/aria)
#define RID_SVXSTR_CLOSE (RID_SVX_START + 260)
// FontWork-ValueSet-Strings
#define RID_SVXSTR_FONTWORK_FORM1 (RID_SVX_START + 261)
#define RID_SVXSTR_FONTWORK_FORM2 (RID_SVX_START + 262)
#define RID_SVXSTR_FONTWORK_FORM3 (RID_SVX_START + 263)
#define RID_SVXSTR_FONTWORK_FORM4 (RID_SVX_START + 264)
#define RID_SVXSTR_FONTWORK_FORM5 (RID_SVX_START + 265)
#define RID_SVXSTR_FONTWORK_FORM6 (RID_SVX_START + 266)
#define RID_SVXSTR_FONTWORK_FORM7 (RID_SVX_START + 267)
#define RID_SVXSTR_FONTWORK_FORM8 (RID_SVX_START + 268)
#define RID_SVXSTR_FONTWORK_FORM9 (RID_SVX_START + 269)
#define RID_SVXSTR_FONTWORK_FORM10 (RID_SVX_START + 270)
#define RID_SVXSTR_FONTWORK_FORM11 (RID_SVX_START + 271)
#define RID_SVXSTR_FONTWORK_FORM12 (RID_SVX_START + 272)
#define RID_SVXSTR_FONTWORK_UNDOCREATE (RID_SVX_START + 273)
// Color strings
#define RID_SVXSTR_BLACK (RID_SVX_START + 275)
#define RID_SVXSTR_BLUE (RID_SVX_START + 276)

14
include/svx/fontwork.hxx
View File

@ -39,7 +39,6 @@ class XFormTextAdjustItem;
class XFormTextDistanceItem;
class XFormTextStartItem;
class XFormTextMirrorItem;
class XFormTextStdFormItem;
class XFormTextHideFormItem;
class XFormTextOutlineItem;
class XFormTextShadowItem;
@ -88,12 +87,10 @@ class SVX_DLLPUBLIC SvxFontWorkChildWindow : public SfxChildWindow
class SVX_DLLPUBLIC SvxFontWorkDialog : public SfxDockingWindow
{
#define CONTROLLER_COUNT 12
#define CONTROLLER_COUNT 11
SvxFontWorkControllerItem* pCtrlItems[CONTROLLER_COUNT];
ValueSet aFormSet;
ToolBox aTbxStyle;
ToolBox aTbxAdjust;
@ -136,7 +133,6 @@ class SVX_DLLPUBLIC SvxFontWorkDialog : public SfxDockingWindow
DECL_LINK( ModifyInputHdl_Impl, void * );
DECL_LINK( InputTimoutHdl_Impl, void * );
DECL_LINK( FormSelectHdl_Impl, void * );
DECL_LINK( ColorSelectHdl_Impl, void * );
void SetStyle_Impl(const XFormTextStyleItem*);
@ -144,11 +140,9 @@ class SVX_DLLPUBLIC SvxFontWorkDialog : public SfxDockingWindow
void SetDistance_Impl(const XFormTextDistanceItem*);
void SetStart_Impl(const XFormTextStartItem*);
void SetMirror_Impl(const XFormTextMirrorItem*);
void SetStdForm_Impl(const XFormTextStdFormItem*);
void SetShowForm_Impl(const XFormTextHideFormItem*);
void SetOutline_Impl(const XFormTextOutlineItem*);
void SetShadow_Impl(const XFormTextShadowItem*,
bool bRestoreValues = false);
void SetShadow_Impl(const XFormTextShadowItem*, bool bRestoreValues = false);
void SetShadowColor_Impl(const XFormTextShadowColorItem*);
void SetShadowXVal_Impl(const XFormTextShadowXValItem*);
void SetShadowYVal_Impl(const XFormTextShadowYValItem*);
@ -170,10 +164,6 @@ class SVX_DLLPUBLIC SvxFontWorkDialog : public SfxDockingWindow
void SetColorList(const XColorListRef &pTable);
void SetActive(bool bActivate = true);
void CreateStdFormObj(SdrView& rView, SdrPageView& rPV,
const SfxItemSet& rAttr, SdrObject& rOldObj,
XFormTextStdForm eForm);
};
#endif // _SVX_FONTWORK_HXX

1
include/svx/svdstr.hrc
View File

@ -519,7 +519,6 @@
#define SIP_XA_FORMTXTSHDWCOLOR (SIP_Begin + 56)
#define SIP_XA_FORMTXTSHDWXVAL (SIP_Begin + 57)
#define SIP_XA_FORMTXTSHDWYVAL (SIP_Begin + 58)
#define SIP_XA_FORMTXTSTDFORM (SIP_Begin + 59)
#define SIP_XA_FORMTXTHIDEFORM (SIP_Begin + 60)
#define SIP_XA_FORMTXTSHDWTRANSP (SIP_Begin + 61)
#define SIP_XA_FTRESERVED2 (SIP_Begin + 62)

1
include/svx/svxids.hrc
View File

@ -437,7 +437,6 @@
#define SID_FORMTEXT_SHDWCOLOR ( SID_SVX_START + 264 )
#define SID_FORMTEXT_SHDWXVAL ( SID_SVX_START + 265 )
#define SID_FORMTEXT_SHDWYVAL ( SID_SVX_START + 266 )
#define SID_FORMTEXT_STDFORM ( SID_SVX_START + 267 )
#define SID_FORMTEXT_HIDEFORM ( SID_SVX_START + 268 )
#define SID_GALLERY_ENABLE_ADDCOPY ( SID_SVX_START + 276 )
#define SID_GALLERY_BG_POS ( SID_SVX_START + 278 )

1
include/svx/unoshprp.hxx
View File

@ -200,7 +200,6 @@
{ MAP_CHAR_LEN("FontWorkShadowColor"), XATTR_FORMTXTSHDWCOLOR, &::getCppuType((const sal_Int32*)0), 0, 0}, \
{ MAP_CHAR_LEN("FontWorkShadowOffsetX"), XATTR_FORMTXTSHDWXVAL, &::getCppuType((const sal_Int32*)0), 0, SFX_METRIC_ITEM}, \
{ MAP_CHAR_LEN("FontWorkShadowOffsetY"), XATTR_FORMTXTSHDWYVAL, &::getCppuType((const sal_Int32*)0), 0, SFX_METRIC_ITEM}, \
{ MAP_CHAR_LEN("FontWorkForm"), XATTR_FORMTXTSTDFORM, /*ENUM*/&::getCppuType((const sal_Int32*)0), 0, 0}, \
{ MAP_CHAR_LEN("FontWorkHideForm"), XATTR_FORMTXTHIDEFORM, &::getBooleanCppuType(), 0, 0}, \
{ MAP_CHAR_LEN("FontWorkShadowTransparence"),XATTR_FORMTXTSHDWTRANSP, &::getCppuType((const sal_Int16*)0), 0, 0},

5
include/svx/xdef.hxx
View File

@ -85,9 +85,8 @@
#define XATTR_FORMTXTSHDWCOLOR (XATTR_TEXT_FIRST + 7) /* V3: 1055 V2: 1038 */
#define XATTR_FORMTXTSHDWXVAL (XATTR_TEXT_FIRST + 8) /* V3: 1056 V2: 1039 */
#define XATTR_FORMTXTSHDWYVAL (XATTR_TEXT_FIRST + 9) /* V3: 1057 V2: 1040 */
#define XATTR_FORMTXTSTDFORM (XATTR_TEXT_FIRST + 10) /* V3: 1058 V2: 1041 */
#define XATTR_FORMTXTHIDEFORM (XATTR_TEXT_FIRST + 11) /* V3: 1059 V2: 1042 */
#define XATTR_FORMTXTSHDWTRANSP (XATTR_TEXT_FIRST + 12) /* V3: 1060 V2: 1043 */
#define XATTR_FORMTXTHIDEFORM (XATTR_TEXT_FIRST + 10) /* V3: 1059 V2: 1042 */
#define XATTR_FORMTXTSHDWTRANSP (XATTR_TEXT_FIRST + 11) /* V3: 1060 V2: 1043 */
#define XATTR_TEXT_LAST XATTR_FORMTXTSHDWTRANSP
#define XATTR_END XATTR_TEXT_LAST

5
include/svx/xenum.hxx
View File

@ -32,11 +32,6 @@ enum XFormTextStyle { XFT_ROTATE, XFT_UPRIGHT, XFT_SLANTX, XFT_SLANTY,
XFT_NONE };
enum XFormTextAdjust { XFT_LEFT, XFT_RIGHT, XFT_AUTOSIZE, XFT_CENTER };
enum XFormTextShadow { XFTSHADOW_NONE, XFTSHADOW_NORMAL, XFTSHADOW_SLANT};
enum XFormTextStdForm { XFTFORM_NONE = 0, XFTFORM_TOPCIRC, XFTFORM_BOTCIRC,
XFTFORM_LFTCIRC, XFTFORM_RGTCIRC, XFTFORM_TOPARC,
XFTFORM_BOTARC, XFTFORM_LFTARC, XFTFORM_RGTARC,
XFTFORM_BUTTON1, XFTFORM_BUTTON2,
XFTFORM_BUTTON3, XFTFORM_BUTTON4};
enum XBitmapType { XBITMAP_IMPORT, XBITMAP_8X8 };

1
include/svx/xtextit.hxx
View File

@ -34,7 +34,6 @@
#include <svx/xftshit.hxx>
#include <svx/xftshcit.hxx>
#include <svx/xftshxy.hxx>
#include <svx/xftsfit.hxx>
#endif

1
sc/sdi/drawsh.sdi
View File

@ -200,7 +200,6 @@ interface TableDraw
SID_FORMTEXT_SHDWCOLOR [ ExecMethod = ExecFormText; StateMethod = GetFormTextState; Export = FALSE; ]
SID_FORMTEXT_SHDWXVAL [ ExecMethod = ExecFormText; StateMethod = GetFormTextState; Export = FALSE; ]
SID_FORMTEXT_SHDWYVAL [ ExecMethod = ExecFormText; StateMethod = GetFormTextState; Export = FALSE; ]
SID_FORMTEXT_STDFORM [ ExecMethod = ExecFormText; StateMethod = GetFormTextState; Export = FALSE; ]
SID_ATTR_POSITION [ StateMethod = GetDrawAttrState; Export = FALSE; ]
SID_ATTR_SIZE [ StateMethod = GetDrawAttrState; Export = FALSE; ]
SID_TABLE_CELL [ StateMethod = GetDrawAttrState; Export = FALSE; ]

1
sc/sdi/drtxtob.sdi
View File

@ -118,7 +118,6 @@ interface TableDrawText
SID_FORMTEXT_SHDWCOLOR [ ExecMethod = ExecFormText; StateMethod = GetFormTextState; Export = FALSE; ]
SID_FORMTEXT_SHDWXVAL [ ExecMethod = ExecFormText; StateMethod = GetFormTextState; Export = FALSE; ]
SID_FORMTEXT_SHDWYVAL [ ExecMethod = ExecFormText; StateMethod = GetFormTextState; Export = FALSE; ]
SID_FORMTEXT_STDFORM [ ExecMethod = ExecFormText; StateMethod = GetFormTextState; Export = FALSE; ]
SID_HYPERLINK_SETLINK [ ExecMethod = Execute; Export = FALSE; ]
SID_HYPERLINK_GETLINK [ StateMethod = GetState; Export = FALSE; ]

1
sc/source/ui/app/typemap.cxx
View File

@ -65,7 +65,6 @@
#include <svx/xftshit.hxx>
#include <svx/xftshcit.hxx>
#include <svx/xftshxy.hxx>
#include <svx/xftsfit.hxx>
#include <editeng/langitem.hxx>
#include <editeng/justifyitem.hxx>
#include <svx/grafctrl.hxx>

1
sc/source/ui/drawfunc/drawsh4.cxx
View File

@ -66,7 +66,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);

20
sc/source/ui/drawfunc/drawsh5.cxx
View File

@ -35,7 +35,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>
@ -662,29 +661,10 @@ void ScDrawShell::ExecFormText(SfxRequest& rReq)
if ( rMarkList.GetMarkCount() == 1 && rReq.GetArgs() )
{
const SfxItemSet& rSet = *rReq.GetArgs();
const SfxPoolItem* pItem;
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);
}
}

20
sc/source/ui/drawfunc/drtxtob2.cxx
View File

@ -194,29 +194,10 @@ void ScDrawTextObjectBar::ExecFormText(SfxRequest& rReq)
if ( rMarkList.GetMarkCount() == 1 && rReq.GetArgs() )
{
const SfxItemSet& rSet = *rReq.GetArgs();
const SfxPoolItem* pItem;
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);
}
}
@ -253,7 +234,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);

1
sd/inc/pch/precompiled_sd.hxx
View File

@ -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>

5
sd/sdi/_drvwsh.sdi
View File

@ -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 ;

1
sd/source/core/typemap.cxx
View File

@ -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>

25
sd/source/ui/view/drviews6.cxx
View File

@ -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,33 +74,10 @@ 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);
}
}
@ -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);

27
svx/sdi/svx.sdi
View File

@ -4141,33 +4141,6 @@ XFormTextAdjustItem FontWorkTextAdjust SID_FORMTEXT_ADJUST
GroupId = GID_SPECIAL;
]
//--------------------------------------------------------------------------
XFormTextStdFormItem FontWorkTextClearAttributes SID_FORMTEXT_STDFORM
[
/* flags: */
AutoUpdate = FALSE,
Cachable = Cachable,
FastCall = FALSE,
HasCoreId = FALSE,
HasDialog = FALSE,
ReadOnlyDoc = FALSE,
Toggle = FALSE,
Container = FALSE,
RecordAbsolute = FALSE,
RecordPerSet;
Synchron;
Readonly = FALSE,
/* config: */
AccelConfig = FALSE,
MenuConfig = FALSE,
StatusBarConfig = FALSE,
ToolBoxConfig = FALSE,
GroupId = GID_SPECIAL;
]
//--------------------------------------------------------------------------
XFormTextDistanceItem FontWorkTextDistance SID_FORMTEXT_DISTANCE

1
svx/sdi/xoitems.sdi
View File

@ -167,7 +167,6 @@ item INT32 XFormTextDistanceItem; // SfxInt32Item
item INT32 XFormTextStartItem; // SfxInt32Item
item BOOL XFormTextMirrorItem; // SfxBoolItem
item INT32 XFormTextStdFormItem; // SfxEnumItem
item BOOL XFormTextHideFormItem; // SfxBoolItem
item BOOL XFormTextOutlineItem; // SfxBoolItem
item INT32 XFormTextShadowItem; // SfxEnumItem

305
svx/source/dialog/fontwork.cxx
View File

@ -101,14 +101,6 @@ void SvxFontWorkControllerItem::StateChanged( sal_uInt16 /*nSID*/, SfxItemState
rFontWorkDlg.SetMirror_Impl(pStateItem);
break;
}
case SID_FORMTEXT_STDFORM:
{
const XFormTextStdFormItem* pStateItem =
PTR_CAST(XFormTextStdFormItem, pItem);
DBG_ASSERT(pStateItem || pItem == 0, "XFormTextStdFormItem expected");
rFontWorkDlg.SetStdForm_Impl(pStateItem);
break;
}
case SID_FORMTEXT_HIDEFORM:
{
const XFormTextHideFormItem* pStateItem =
@ -190,8 +182,6 @@ SvxFontWorkDialog::SvxFontWorkDialog( SfxBindings *pBindinx,
const ResId& rResId ) :
SfxDockingWindow( pBindinx, pCW, _pParent, rResId ),
aFormSet (this, ResId(VS_FORMS,*rResId.GetResMgr())),
aTbxStyle (this, ResId(TBX_STYLE,*rResId.GetResMgr())),
aTbxAdjust (this, ResId(TBX_ADJUST,*rResId.GetResMgr())),
@ -229,16 +219,12 @@ SvxFontWorkDialog::SvxFontWorkDialog( SfxBindings *pBindinx,
pCtrlItems[2] = new SvxFontWorkControllerItem(SID_FORMTEXT_DISTANCE, *this, rBindings);
pCtrlItems[3] = new SvxFontWorkControllerItem(SID_FORMTEXT_START, *this, rBindings);
pCtrlItems[4] = new SvxFontWorkControllerItem(SID_FORMTEXT_MIRROR, *this, rBindings);
pCtrlItems[5] = new SvxFontWorkControllerItem(SID_FORMTEXT_STDFORM, *this, rBindings);
pCtrlItems[6] = new SvxFontWorkControllerItem(SID_FORMTEXT_HIDEFORM, *this, rBindings);
pCtrlItems[7] = new SvxFontWorkControllerItem(SID_FORMTEXT_OUTLINE, *this, rBindings);
pCtrlItems[8] = new SvxFontWorkControllerItem(SID_FORMTEXT_SHADOW, *this, rBindings);
pCtrlItems[9] = new SvxFontWorkControllerItem(SID_FORMTEXT_SHDWCOLOR, *this, rBindings);
pCtrlItems[10] = new SvxFontWorkControllerItem(SID_FORMTEXT_SHDWXVAL, *this, rBindings);
pCtrlItems[11] = new SvxFontWorkControllerItem(SID_FORMTEXT_SHDWYVAL, *this, rBindings);
WinBits aNewStyle = ( aFormSet.GetStyle() | WB_VSCROLL | WB_ITEMBORDER | WB_DOUBLEBORDER );
aFormSet.SetStyle( aNewStyle );
pCtrlItems[5] = new SvxFontWorkControllerItem(SID_FORMTEXT_HIDEFORM, *this, rBindings);
pCtrlItems[6] = new SvxFontWorkControllerItem(SID_FORMTEXT_OUTLINE, *this, rBindings);
pCtrlItems[7] = new SvxFontWorkControllerItem(SID_FORMTEXT_SHADOW, *this, rBindings);
pCtrlItems[8] = new SvxFontWorkControllerItem(SID_FORMTEXT_SHDWCOLOR, *this, rBindings);
pCtrlItems[9] = new SvxFontWorkControllerItem(SID_FORMTEXT_SHDWXVAL, *this, rBindings);
pCtrlItems[10] = new SvxFontWorkControllerItem(SID_FORMTEXT_SHDWYVAL, *this, rBindings);
Size aSize = aTbxStyle.CalcWindowSizePixel();
aTbxStyle.SetSizePixel(aSize);
@ -281,14 +267,6 @@ SvxFontWorkDialog::SvxFontWorkDialog( SfxBindings *pBindinx,
aInputTimer.SetTimeout(500);
aInputTimer.SetTimeoutHdl(LINK(this, SvxFontWorkDialog, InputTimoutHdl_Impl));
aFormSet.SetSelectHdl( LINK(this, SvxFontWorkDialog, FormSelectHdl_Impl) );
aFormSet.SetColCount(4);
aFormSet.SetLineCount(2);
Bitmap aBmp(SVX_RES(RID_SVXBMP_FONTWORK_FORM1));
aSize.Height() = aFormSet.CalcWindowSizePixel(aBmp.GetSizePixel()).Height() + 2;
aFormSet.SetSizePixel(aSize);
}
SvxFontWorkDialog::~SvxFontWorkDialog()
@ -449,23 +427,6 @@ void SvxFontWorkDialog::SetMirror_Impl(const XFormTextMirrorItem* pItem)
aTbxAdjust.CheckItem(TBI_ADJUST_MIRROR, pItem->GetValue());
}
// Standard form in ValueSet View
void SvxFontWorkDialog::SetStdForm_Impl(const XFormTextStdFormItem* pItem)
{
if ( pItem )
{
aFormSet.Enable();
aFormSet.SetNoSelection();
if ( pItem->GetValue() != XFTFORM_NONE )
aFormSet.SelectItem(
sal::static_int_cast< sal_uInt16 >(pItem->GetValue()));
}
else
aFormSet.Disable();
}
// Set button for contour display
void SvxFontWorkDialog::SetShowForm_Impl(const XFormTextHideFormItem* pItem)
@ -807,19 +768,6 @@ IMPL_LINK_NOARG(SvxFontWorkDialog, InputTimoutHdl_Impl)
return 0;
}
IMPL_LINK_NOARG(SvxFontWorkDialog, FormSelectHdl_Impl)
{
XFormTextStdFormItem aItem;
if ( aFormSet.IsNoSelection() )
aItem.SetValue(XFTFORM_NONE);
else
aItem.SetValue(aFormSet.GetSelectItemId());
GetBindings().GetDispatcher()->Execute( SID_FORMTEXT_STDFORM, SFX_CALLMODE_RECORD, &aItem, 0L );
aFormSet.SetNoSelection();
return 0;
}
IMPL_LINK_NOARG(SvxFontWorkDialog, ColorSelectHdl_Impl)
{
XFormTextShadowColorItem aItem( (const String &) String(),
@ -842,226 +790,6 @@ void SvxFontWorkDialog::SetActive(bool /*bActivate*/)
{
}
// Create standard fontWork Object
void SvxFontWorkDialog::CreateStdFormObj(SdrView& rView, SdrPageView& rPV,
const SfxItemSet& rAttr,
SdrObject& rOldObj,
XFormTextStdForm eForm)
{
SfxItemSet aAttr(*rAttr.GetPool(), XATTR_FORMTXTSTYLE,
XATTR_FORMTXTHIDEFORM);
SdrObject* pNewObj = NULL;
Rectangle aRect;
XFormTextAdjust eAdjust = XFT_AUTOSIZE;
aAttr.Put(rOldObj.GetMergedItemSet());
const XFormTextStdFormItem& rOldForm = (const XFormTextStdFormItem&)
aAttr.Get(XATTR_FORMTXTSTDFORM);
aRect = rOldObj.GetSnapRect();
if ( !rOldObj.ISA(SdrPathObj) )
{
Point aPos = aRect.TopLeft();
aRect = rOldObj.GetLogicRect();
aRect.SetPos(aPos);
}
aAttr.Put(rAttr);
if ( rOldForm.GetValue() == XFTFORM_NONE )
{
long nW = aRect.GetWidth();
aRect.SetSize(Size(nW, nW));
aAttr.Put(XFormTextStyleItem(XFT_ROTATE));
}
Point aCenter = aRect.Center();
switch ( eForm )
{
case XFTFORM_TOPCIRC:
case XFTFORM_BOTCIRC:
case XFTFORM_LFTCIRC:
case XFTFORM_RGTCIRC:
case XFTFORM_TOPARC:
case XFTFORM_BOTARC:
case XFTFORM_LFTARC:
case XFTFORM_RGTARC:
{
long nBeg, nEnd;
switch ( eForm )
{
default: ; //prevent warning
case XFTFORM_TOPCIRC:
nBeg = 0;
nEnd = 18000;
break;
case XFTFORM_BOTCIRC:
nBeg = 18000;
nEnd = 36000;
break;
case XFTFORM_LFTCIRC:
nBeg = 9000;
nEnd = 27000;
break;
case XFTFORM_RGTCIRC:
nBeg = 27000;
nEnd = 9000;
break;
case XFTFORM_TOPARC:
nBeg = 4500;
nEnd = 13500;
break;
case XFTFORM_BOTARC:
nBeg = 22500;
nEnd = 31500;
break;
case XFTFORM_LFTARC:
nBeg = 13500;
nEnd = 22500;
break;
case XFTFORM_RGTARC:
nBeg = 31500;
nEnd = 4500;
break;
}
pNewObj = new SdrCircObj(OBJ_CARC, aRect, nBeg, nEnd);
break;
}
case XFTFORM_BUTTON1:
{
basegfx::B2DPolyPolygon aPolyPolygon;
basegfx::B2DPolygon aLine;
long nR = aRect.GetWidth() / 2;
basegfx::B2DPolygon aTopArc(XPolygon(aCenter, -nR, nR, 50, 1750, sal_False).getB2DPolygon());
basegfx::B2DPolygon aBottomArc(XPolygon(aCenter, -nR, nR, 1850, 3550, sal_False).getB2DPolygon());
// Close Polygon
aTopArc.setClosed(true);
aBottomArc.setClosed(true);
aPolyPolygon.append(aTopArc);
aLine.append(aBottomArc.getB2DPoint(aBottomArc.count() - 1L));
aLine.append(aBottomArc.getB2DPoint(0L));
aLine.setClosed(true);
aPolyPolygon.append(aLine);
aPolyPolygon.append(aBottomArc);
pNewObj = new SdrPathObj(OBJ_PATHFILL, aPolyPolygon);
eAdjust = XFT_CENTER;
break;
}
case XFTFORM_BUTTON2:
case XFTFORM_BUTTON3:
case XFTFORM_BUTTON4:
{
basegfx::B2DPolyPolygon aPolyPolygon;
basegfx::B2DPolygon aLine;
long nR = aRect.GetWidth() / 2;
long nWDiff = nR / 5;
long nHDiff;
if ( eForm == XFTFORM_BUTTON4 )
{
basegfx::B2DPolygon aNewArc(XPolygon(aCenter, -nR, nR, 950, 2650, sal_False).getB2DPolygon());
aNewArc.setClosed(true);
aPolyPolygon.append(aNewArc);
eAdjust = XFT_CENTER;
}
else
{
basegfx::B2DPolygon aNewArc(XPolygon(aCenter, -nR, nR, 2700, 2700).getB2DPolygon());
aPolyPolygon.append(aNewArc);
}
if ( eForm == XFTFORM_BUTTON3 )
nHDiff = -aRect.GetHeight() / 10;
else
nHDiff = aRect.GetHeight() / 20;
aLine.append(basegfx::B2DPoint(aRect.Left() + nWDiff, aRect.Center().Y() + nHDiff));
aLine.append(basegfx::B2DPoint(aRect.Right() - nWDiff, aRect.Center().Y() + nHDiff));
aLine.setClosed(true);
aPolyPolygon.append(aLine);
if ( eForm == XFTFORM_BUTTON4 )
{
basegfx::B2DPolygon aNewArc(XPolygon(aCenter, -nR, nR, 2750, 850, sal_False).getB2DPolygon());
aNewArc.setClosed(true);
aPolyPolygon.append(aNewArc);
}
if ( eForm == XFTFORM_BUTTON3 )
{
nHDiff += nHDiff;
aLine.setB2DPoint(0L, basegfx::B2DPoint(aLine.getB2DPoint(0L).getX(), aLine.getB2DPoint(0L).getY() - nHDiff));
aLine.setB2DPoint(1L, basegfx::B2DPoint(aLine.getB2DPoint(1L).getX(), aLine.getB2DPoint(1L).getY() - nHDiff));
aPolyPolygon.append(aLine);
}
pNewObj = new SdrPathObj(OBJ_PATHFILL, aPolyPolygon);
break;
}
default: ; //prevent warning
}
if ( pNewObj )
{
// due to DLs changes in Outliner the object needs
// a model to get an outliner for later calls to
// pNewObj->SetOutlinerParaObject(pPara) (see below).
pNewObj->SetModel(rOldObj.GetModel());
Size aSize;
Rectangle aSnap = pNewObj->GetSnapRect();
aSize.Width() = aRect.Left() - aSnap.Left();
aSize.Height() = aRect.Top() - aSnap.Top();
pNewObj->NbcMove(aSize);
rView.BegUndo( SVX_RESSTR( RID_SVXSTR_FONTWORK_UNDOCREATE ) );
OutlinerParaObject* pPara = rOldObj.GetOutlinerParaObject();
sal_Bool bHide = sal_True;
if ( pPara != NULL )
{
pPara = new OutlinerParaObject(*pPara);
pNewObj->SetOutlinerParaObject(pPara);
}
else
bHide = sal_False;
rView.ReplaceObjectAtView(&rOldObj, rPV, pNewObj, sal_True);
pNewObj->SetLayer(rOldObj.GetLayer());
aAttr.Put(XFormTextHideFormItem(bHide));
aAttr.Put(XFormTextAdjustItem(eAdjust));
XFormTextShadow eShadow = XFTSHADOW_NONE;
if ( nLastShadowTbxId == TBI_SHADOW_NORMAL )
{
eShadow = XFTSHADOW_NORMAL;
aAttr.Put(XFormTextShadowXValItem(nSaveShadowX));
aAttr.Put(XFormTextShadowYValItem(nSaveShadowY));
}
else if ( nLastShadowTbxId == TBI_SHADOW_SLANT )
{
eShadow = XFTSHADOW_SLANT;
aAttr.Put(XFormTextShadowXValItem(nSaveShadowAngle));
aAttr.Put(XFormTextShadowYValItem(nSaveShadowSize));
}
aAttr.Put(XFormTextShadowItem(eShadow));
rView.SetAttributes(aAttr);
rView.EndUndo();
}
}
void SvxFontWorkDialog::DataChanged( const DataChangedEvent& rDCEvt )
{
if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE) )
@ -1072,27 +800,6 @@ void SvxFontWorkDialog::DataChanged( const DataChangedEvent& rDCEvt )
void SvxFontWorkDialog::ApplyImageList()
{
ResMgr* _pMgr = &DIALOG_MGR();
sal_uInt16 nBitmapResId = RID_SVXBMP_FONTWORK_FORM1;
sal_uInt16 nTextResId = RID_SVXSTR_FONTWORK_FORM1;
bool bInit = aFormSet.GetItemCount() == 0;
sal_uInt16 i;
for( i = 1; i < 13; i++, nTextResId++, nBitmapResId++ )
{
if( bInit )
{
aFormSet.InsertItem( i, Bitmap(ResId(nBitmapResId,*_pMgr)),
String(ResId(nTextResId,*_pMgr)));
}
else
{
aFormSet.SetItemImage( i, Bitmap(ResId(nBitmapResId,*_pMgr)) );
}
}
ImageList& rImgLst = maImageList;
aTbxStyle.SetImageList( rImgLst );

1
svx/source/dialog/fontwork.hrc
View File

@ -16,7 +16,6 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#define VS_FORMS 1
#define TBX_STYLE 1
#define TBX_ADJUST 2
#define TBX_SHADOW 3

141
svx/source/dialog/fontwork.src
View File

@ -22,6 +22,9 @@
#include "fontwork.hrc"
#include "helpid.hrc"
#define REDUCED_WIDTH 6
#define REMOVED_VS_FORMS_HEIGHT (30 + 6)
// RID_SVXDLG_FONTWORK ---------------------------------------------------
DockingWindow RID_SVXDLG_FONTWORK
{
@ -30,25 +33,17 @@ DockingWindow RID_SVXDLG_FONTWORK
SVLook = TRUE ;
Hide = TRUE ;
Pos = MAP_APPFONT ( 0 , 0 ) ;
Size = MAP_APPFONT ( 89 , 193 ) ;
Size = MAP_APPFONT ( 89 - REDUCED_WIDTH , 193 - REMOVED_VS_FORMS_HEIGHT ) ;
Text [ en-US ] = "Fontwork" ;
Moveable = TRUE ;
Zoomable = TRUE ;
Closeable = TRUE ;
Dockable = TRUE ;
EnableResizing = TRUE ;
Control VS_FORMS
{
HelpId = HID_FONTWORK_CTL_FORMS ;
Pos = MAP_APPFONT ( 6 , 4 ) ;
Size = MAP_APPFONT ( 71 , 30 ) ;
Border = TRUE ;
TabStop = TRUE ;
};
ToolBox TBX_STYLE
{
SVLook = TRUE ;
Pos = MAP_APPFONT ( 6 , 41 ) ;
Pos = MAP_APPFONT ( 6 , 41 - REMOVED_VS_FORMS_HEIGHT ) ;
ItemList =
{
ToolBoxItem
@ -99,7 +94,7 @@ DockingWindow RID_SVXDLG_FONTWORK
ToolBox TBX_ADJUST
{
SVLook = TRUE ;
Pos = MAP_APPFONT ( 6 , 63 ) ;
Pos = MAP_APPFONT ( 6 , 63 - REMOVED_VS_FORMS_HEIGHT ) ;
ItemList =
{
ToolBoxItem
@ -150,14 +145,14 @@ DockingWindow RID_SVXDLG_FONTWORK
};
FixedImage FB_DISTANCE
{
Pos = MAP_APPFONT ( 10 , 84 ) ;
Pos = MAP_APPFONT ( 10 , 84 - REMOVED_VS_FORMS_HEIGHT ) ;
Size = MAP_APPFONT ( 14 , 15 ) ;
};
MetricField MTR_FLD_DISTANCE
{
HelpID = "svx:MetricField:RID_SVXDLG_FONTWORK:MTR_FLD_DISTANCE";
Border = TRUE ;
Pos = MAP_APPFONT ( 29 , 85 ) ;
Pos = MAP_APPFONT ( 29 , 85 - REMOVED_VS_FORMS_HEIGHT ) ;
Size = MAP_APPFONT ( 48 , 12 ) ;
TabStop = TRUE ;
Repeat = TRUE ;
@ -175,14 +170,14 @@ DockingWindow RID_SVXDLG_FONTWORK
};
FixedImage FB_TEXTSTART
{
Pos = MAP_APPFONT ( 10 , 99 ) ;
Pos = MAP_APPFONT ( 10 , 99 - REMOVED_VS_FORMS_HEIGHT ) ;
Size = MAP_APPFONT ( 14 , 15 ) ;
};
MetricField MTR_FLD_TEXTSTART
{
HelpID = "svx:MetricField:RID_SVXDLG_FONTWORK:MTR_FLD_TEXTSTART";
Border = TRUE ;
Pos = MAP_APPFONT ( 29 , 100 ) ;
Pos = MAP_APPFONT ( 29 , 100 - REMOVED_VS_FORMS_HEIGHT ) ;
Size = MAP_APPFONT ( 48 , 12 ) ;
TabStop = TRUE ;
Repeat = TRUE ;
@ -198,7 +193,7 @@ DockingWindow RID_SVXDLG_FONTWORK
ToolBox TBX_SHADOW
{
SVLook = TRUE ;
Pos = MAP_APPFONT ( 6 , 122 ) ;
Pos = MAP_APPFONT ( 6 , 122 - REMOVED_VS_FORMS_HEIGHT ) ;
ItemList =
{
ToolBoxItem
@ -249,14 +244,14 @@ DockingWindow RID_SVXDLG_FONTWORK
};
FixedImage FB_SHADOW_X
{
Pos = MAP_APPFONT ( 10 , 143 ) ;
Pos = MAP_APPFONT ( 10 , 143 - REMOVED_VS_FORMS_HEIGHT ) ;
Size = MAP_APPFONT ( 14 , 15 ) ;
};
MetricField MTR_FLD_SHADOW_X
{
HelpID = "svx:MetricField:RID_SVXDLG_FONTWORK:MTR_FLD_SHADOW_X";
Border = TRUE ;
Pos = MAP_APPFONT ( 29 , 144 ) ;
Pos = MAP_APPFONT ( 29 , 144 - REMOVED_VS_FORMS_HEIGHT ) ;
Size = MAP_APPFONT ( 48 , 12 ) ;
TabStop = TRUE ;
Repeat = TRUE ;
@ -274,14 +269,14 @@ DockingWindow RID_SVXDLG_FONTWORK
};
FixedImage FB_SHADOW_Y
{
Pos = MAP_APPFONT ( 10 , 158 ) ;
Pos = MAP_APPFONT ( 10 , 158 - REMOVED_VS_FORMS_HEIGHT ) ;
Size = MAP_APPFONT ( 14 , 15 ) ;
};
MetricField MTR_FLD_SHADOW_Y
{
HelpID = "svx:MetricField:RID_SVXDLG_FONTWORK:MTR_FLD_SHADOW_Y";
Border = TRUE ;
Pos = MAP_APPFONT ( 29 , 159 ) ;
Pos = MAP_APPFONT ( 29 , 159 - REMOVED_VS_FORMS_HEIGHT ) ;
Size = MAP_APPFONT ( 48 , 12 ) ;
TabStop = TRUE ;
Repeat = TRUE ;
@ -299,7 +294,7 @@ DockingWindow RID_SVXDLG_FONTWORK
{
HelpID = "svx:ListBox:RID_SVXDLG_FONTWORK:CLB_SHADOW_COLOR";
Border = TRUE ;
Pos = MAP_APPFONT ( 6 , 174 ) ;
Pos = MAP_APPFONT ( 6 , 174 - REMOVED_VS_FORMS_HEIGHT ) ;
Size = MAP_APPFONT ( 71 , 60 ) ;
DropDown = TRUE ;
QuickHelpText [ en-US ] = "Shadow Color" ;
@ -342,109 +337,5 @@ DockingWindow RID_SVXDLG_FONTWORK
FONTWORK_IDLIST
};
};
// Bitmaps ---------------------------------------------------------------
Bitmap RID_SVXBMP_FONTWORK_FORM1
{
File = "fwthcirc.bmp" ;
};
Bitmap RID_SVXBMP_FONTWORK_FORM2
{
File = "fwbhcirc.bmp" ;
};
Bitmap RID_SVXBMP_FONTWORK_FORM3
{
File = "fwlhcirc.bmp" ;
};
Bitmap RID_SVXBMP_FONTWORK_FORM4
{
File = "fwrhcirc.bmp" ;
};
Bitmap RID_SVXBMP_FONTWORK_FORM5
{
File = "fwtoparc.bmp" ;
};
Bitmap RID_SVXBMP_FONTWORK_FORM6
{
File = "fwbotarc.bmp" ;
};
Bitmap RID_SVXBMP_FONTWORK_FORM7
{
File = "fwlftarc.bmp" ;
};
Bitmap RID_SVXBMP_FONTWORK_FORM8
{
File = "fwrgtarc.bmp" ;
};
Bitmap RID_SVXBMP_FONTWORK_FORM9
{
File = "fwbuttn1.bmp" ;
};
Bitmap RID_SVXBMP_FONTWORK_FORM10
{
File = "fwbuttn2.bmp" ;
};
Bitmap RID_SVXBMP_FONTWORK_FORM11
{
File = "fwbuttn3.bmp" ;
};
Bitmap RID_SVXBMP_FONTWORK_FORM12
{
File = "fwbuttn4.bmp" ;
};
// Strings ---------------------------------------------------------------
String RID_SVXSTR_FONTWORK_FORM1
{
Text [ en-US ] = "Upper Semicircle" ;
};
String RID_SVXSTR_FONTWORK_FORM2
{
Text [ en-US ] = "Lower Semicircle" ;
};
String RID_SVXSTR_FONTWORK_FORM3
{
Text [ en-US ] = "Left Semicircle" ;
};
String RID_SVXSTR_FONTWORK_FORM4
{
Text [ en-US ] = "Right Semicircle" ;
};
String RID_SVXSTR_FONTWORK_FORM5
{
Text [ en-US ] = "Upper Arc" ;
};
String RID_SVXSTR_FONTWORK_FORM6
{
Text [ en-US ] = "Lower Arc" ;
};
String RID_SVXSTR_FONTWORK_FORM7
{
Text [ en-US ] = "Left Arc" ;
};
String RID_SVXSTR_FONTWORK_FORM8
{
Text [ en-US ] = "Right Arc" ;
};
String RID_SVXSTR_FONTWORK_FORM9
{
Text [ en-US ] = "Open Circle" ;
};
String RID_SVXSTR_FONTWORK_FORM10
{
Text [ en-US ] = "Closed Circle" ;
};
String RID_SVXSTR_FONTWORK_FORM11
{
Text [ en-US ] = "Closed Circle II" ;
};
String RID_SVXSTR_FONTWORK_FORM12
{
Text [ en-US ] = "Open Circle Vertical" ;
};
String RID_SVXSTR_FONTWORK_UNDOCREATE
{
Text [ en-US ] = "Create Fontwork object" ;
};
// ********************************************************************** EOF
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

1
svx/source/svdraw/svdattr.cxx
View File

@ -431,7 +431,6 @@ void SdrItemPool::TakeItemName(sal_uInt16 nWhich, OUString& rItemName)
case XATTR_FORMTXTSHDWCOLOR : nResId = SIP_XA_FORMTXTSHDWCOLOR;break;
case XATTR_FORMTXTSHDWXVAL : nResId = SIP_XA_FORMTXTSHDWXVAL;break;
case XATTR_FORMTXTSHDWYVAL : nResId = SIP_XA_FORMTXTSHDWYVAL;break;
case XATTR_FORMTXTSTDFORM : nResId = SIP_XA_FORMTXTSTDFORM;break;
case XATTR_FORMTXTHIDEFORM : nResId = SIP_XA_FORMTXTHIDEFORM;break;
case XATTR_FORMTXTSHDWTRANSP: nResId = SIP_XA_FORMTXTSHDWTRANSP;break;

4
svx/source/svdraw/svdibrow.cxx
View File

@ -734,7 +734,6 @@ bool IsItemIneffective(sal_uInt16 nWhich, const SfxItemSet* pSet, sal_uInt16& rI
case XATTR_FORMTXTSHDWCOLOR :
case XATTR_FORMTXTSHDWXVAL :
case XATTR_FORMTXTSHDWYVAL :
case XATTR_FORMTXTSTDFORM :
case XATTR_FORMTXTHIDEFORM :
case XATTR_FORMTXTSHDWTRANSP: {
rIndent=1;
@ -882,11 +881,10 @@ sal_uInt16 ImpSortWhich(sal_uInt16 nWhich)
case XATTR_FILLBMP_STRETCH : nWhich=XATTR_FILLBMP_TILEOFFSETY ; break;
// Fontwork
case XATTR_FORMTXTSHADOW : nWhich=XATTR_FORMTXTSTDFORM ; break;
case XATTR_FORMTXTSHADOW : nWhich=XATTR_FORMTXTSHDWXVAL ; break;
case XATTR_FORMTXTSHDWCOLOR : nWhich=XATTR_FORMTXTHIDEFORM ; break;
case XATTR_FORMTXTSHDWXVAL : nWhich=XATTR_FORMTXTSHADOW ; break;
case XATTR_FORMTXTSHDWYVAL : nWhich=XATTR_FORMTXTSHDWCOLOR ; break;
case XATTR_FORMTXTSTDFORM : nWhich=XATTR_FORMTXTSHDWXVAL ; break;
case XATTR_FORMTXTHIDEFORM : nWhich=XATTR_FORMTXTSHDWYVAL ; break;
// Misc

5
svx/source/svdraw/svdstr.src
View File

@ -1874,11 +1874,6 @@ String SIP_XA_FORMTXTSHDWYVAL
Text [ en-US ] = "Fontwork shadow offset Y";
};
String SIP_XA_FORMTXTSTDFORM
{
Text [ en-US ] = "Fontwork default form";
};
String SIP_XA_FORMTXTHIDEFORM
{
Text [ en-US ] = "Hide fontwork outline";

72
svx/source/xoutdev/xattr.cxx
View File

@ -4712,78 +4712,6 @@ SfxPoolItem* XFormTextShadowYValItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/)
return new XFormTextShadowYValItem(rIn);
}
//---------------------------
// class XFormTextStdFormItem
//---------------------------
TYPEINIT1_AUTOFACTORY(XFormTextStdFormItem, SfxEnumItem);
/*************************************************************************
|*
|* XFormTextStdFormItem::XFormTextStdFormItem()
|*
*************************************************************************/
XFormTextStdFormItem::XFormTextStdFormItem(XFormTextStdForm eFormTextStdForm) :
SfxEnumItem(
XATTR_FORMTXTSTDFORM, sal::static_int_cast< sal_uInt16 >(eFormTextStdForm))
{
}
/*************************************************************************
|*
|* XFormTextStdFormItem::XFormTextStdFormItem(SvStream& rIn)
|*
*************************************************************************/
XFormTextStdFormItem::XFormTextStdFormItem(SvStream& rIn) :
SfxEnumItem(XATTR_FORMTXTSTDFORM, rIn)
{
}
/*************************************************************************
|*
|* XFormTextStdFormItem::Clone(SfxItemPool* pPool) const
|*
*************************************************************************/
SfxPoolItem* XFormTextStdFormItem::Clone(SfxItemPool* /*pPool*/) const
{
return new XFormTextStdFormItem( *this );
}
/*************************************************************************
|*
|* SfxPoolItem* XFormTextStdFormItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
*************************************************************************/
SfxPoolItem* XFormTextStdFormItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFormTextStdFormItem(rIn);
}
sal_uInt16 XFormTextStdFormItem::GetValueCount() const
{
return 3;
}
// #FontWork#
bool XFormTextStdFormItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
{
rVal <<= (sal_Int32)GetValue();
return true;
}
// #FontWork#
bool XFormTextStdFormItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
{
sal_Int32 nValue = 0;
rVal >>= nValue;
SetValue(sal::static_int_cast< sal_uInt16 >(nValue));
return true;
}
// --------------------------
// class XFormTextHideFormItem
// --------------------------

2
svx/source/xoutdev/xpool.cxx
View File

@ -111,7 +111,6 @@ XOutdevItemPool::XOutdevItemPool(
mppLocalPoolDefaults[XATTR_FORMTXTSHDWCOLOR -XATTR_START] = new XFormTextShadowColorItem(aNullStr,aNullShadowCol);
mppLocalPoolDefaults[XATTR_FORMTXTSHDWXVAL -XATTR_START] = new XFormTextShadowXValItem;
mppLocalPoolDefaults[XATTR_FORMTXTSHDWYVAL -XATTR_START] = new XFormTextShadowYValItem;
mppLocalPoolDefaults[XATTR_FORMTXTSTDFORM -XATTR_START] = new XFormTextStdFormItem;
mppLocalPoolDefaults[XATTR_FORMTXTHIDEFORM -XATTR_START] = new XFormTextHideFormItem;
mppLocalPoolDefaults[XATTR_FORMTXTSHDWTRANSP -XATTR_START] = new XFormTextShadowTranspItem;
@ -154,7 +153,6 @@ XOutdevItemPool::XOutdevItemPool(
mpLocalItemInfos[XATTR_FORMTXTSHDWCOLOR -XATTR_START]._nSID = SID_FORMTEXT_SHDWCOLOR;
mpLocalItemInfos[XATTR_FORMTXTSHDWXVAL -XATTR_START]._nSID = SID_FORMTEXT_SHDWXVAL;
mpLocalItemInfos[XATTR_FORMTXTSHDWYVAL -XATTR_START]._nSID = SID_FORMTEXT_SHDWYVAL;
mpLocalItemInfos[XATTR_FORMTXTSTDFORM -XATTR_START]._nSID = SID_FORMTEXT_STDFORM;
mpLocalItemInfos[XATTR_FORMTXTHIDEFORM -XATTR_START]._nSID = SID_FORMTEXT_HIDEFORM;
// associate new slots for panels with known items

1
sw/inc/pch/precompiled_sw.hxx
View File

@ -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>

7
sw/sdi/drawsh.sdi
View File

@ -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;

7
sw/sdi/drwtxtsh.sdi
View File

@ -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 ;

20
sw/source/ui/shells/drawsh.cxx
View File

@ -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,23 +395,6 @@ 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);
}
if (pDrView->GetModel()->IsChanged())
@ -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);

20
sw/source/ui/shells/drwtxtsh.cxx
View File

@ -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,21 +222,6 @@ 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);
}
@ -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);

1
sw/source/ui/shells/slotadd.cxx
View File

@ -96,7 +96,6 @@
#include <svx/xftshit.hxx>
#include <svx/xftshcit.hxx>
#include <svx/xftshxy.hxx>
#include <svx/xftsfit.hxx>
#include <svx/grafctrl.hxx>