summaryrefslogtreecommitdiffstats
path: root/include/svx
diff options
context:
space:
mode:
authorArmin Le Grand <alg@apache.org>2013-04-09 16:06:32 +0000
committerCaolán McNamara <caolanm@redhat.com>2013-06-17 11:02:00 +0100
commit573322e26b0244b27f70cfbc8989b3040a34f3d6 (patch)
tree1812788fd614d7c55b127ef360cab08b334b8244 /include/svx
parenttypo fix, use ja_charset for Japanese (diff)
downloadcore-573322e26b0244b27f70cfbc8989b3040a34f3d6.tar.gz
core-573322e26b0244b27f70cfbc8989b3040a34f3d6.zip
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 'include/svx')
-rw-r--r--include/svx/dialogs.hrc29
-rw-r--r--include/svx/fontwork.hxx14
-rw-r--r--include/svx/svdstr.hrc1
-rw-r--r--include/svx/svxids.hrc1
-rw-r--r--include/svx/unoshprp.hxx1
-rw-r--r--include/svx/xdef.hxx5
-rw-r--r--include/svx/xenum.hxx5
-rw-r--r--include/svx/xtextit.hxx1
8 files changed, 4 insertions, 53 deletions
diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc
index fa3c869cd3b6..8ba1b2ddf04b 100644
--- a/include/svx/dialogs.hrc
+++ b/include/svx/dialogs.hrc
@@ -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)
diff --git a/include/svx/fontwork.hxx b/include/svx/fontwork.hxx
index 4e24257aed9b..81cc59b65943 100644
--- a/include/svx/fontwork.hxx
+++ b/include/svx/fontwork.hxx
@@ -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
diff --git a/include/svx/svdstr.hrc b/include/svx/svdstr.hrc
index a78d88dfdb2d..2b20fdf3bd42 100644
--- a/include/svx/svdstr.hrc
+++ b/include/svx/svdstr.hrc
@@ -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)
diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc
index 27afc3671494..7a62e639dc61 100644
--- a/include/svx/svxids.hrc
+++ b/include/svx/svxids.hrc
@@ -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 )
diff --git a/include/svx/unoshprp.hxx b/include/svx/unoshprp.hxx
index c39854f76b97..995eed8dca80 100644
--- a/include/svx/unoshprp.hxx
+++ b/include/svx/unoshprp.hxx
@@ -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},
diff --git a/include/svx/xdef.hxx b/include/svx/xdef.hxx
index ea38bbbbf644..78b98ee5c201 100644
--- a/include/svx/xdef.hxx
+++ b/include/svx/xdef.hxx
@@ -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
diff --git a/include/svx/xenum.hxx b/include/svx/xenum.hxx
index 38f414c03fc8..ba4bc41f12ec 100644
--- a/include/svx/xenum.hxx
+++ b/include/svx/xenum.hxx
@@ -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 };
diff --git a/include/svx/xtextit.hxx b/include/svx/xtextit.hxx
index 40a33b2afa32..e0d76b00ec16 100644
--- a/include/svx/xtextit.hxx
+++ b/include/svx/xtextit.hxx
@@ -34,7 +34,6 @@
#include <svx/xftshit.hxx>
#include <svx/xftshcit.hxx>
#include <svx/xftshxy.hxx>
-#include <svx/xftsfit.hxx>
#endif
generated by cgit (git 2.34.1) at 2024-07-22 16:29:33 +0000