[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - default_images/res default_images/svx drawinglayer/source sc/sdi sc/source sd/inc sd/sdi sd/source svx/inc svx/Package_inc.mk svx/sdi svx/source sw/inc sw/sdi sw/source
Armin Le Grand
alg at apache.org
Tue Apr 9 17:31:29 PDT 2013
dev/null |binary
drawinglayer/source/tools/converters.cxx | 50 +++-
sc/sdi/drawsh.sdi | 1
sc/sdi/drtxtob.sdi | 1
sc/source/ui/app/typemap.cxx | 1
sc/source/ui/drawfunc/drawsh4.cxx | 13 -
sc/source/ui/drawfunc/drawsh5.cxx | 21 -
sc/source/ui/drawfunc/drtxtob2.cxx | 33 ---
sd/inc/pch/precompiled_sd.hxx | 1
sd/sdi/_drvwsh.sdi | 5
sd/source/core/typemap.cxx | 1
sd/source/ui/view/drviews6.cxx | 37 ---
svx/Package_inc.mk | 1
svx/inc/svx/dialogs.hrc | 41 ---
svx/inc/svx/fontwork.hxx | 14 -
svx/inc/svx/svdstr.hrc | 1
svx/inc/svx/svxcommands.h | 1
svx/inc/svx/svxids.hrc | 1
svx/inc/svx/unoshprp.hxx | 1
svx/inc/svx/xdef.hxx | 5
svx/inc/svx/xenum.hxx | 6
svx/inc/svx/xftsfit.hxx | 51 ----
svx/inc/svx/xtextit.hxx | 1
svx/sdi/svx.sdi | 27 --
svx/sdi/xoitems.sdi | 1
svx/source/dialog/fontwork.cxx | 331 -------------------------------
svx/source/dialog/fontwork.hrc | 1
svx/source/dialog/fontwork.src | 239 +---------------------
svx/source/svdraw/svdattr.cxx | 1
svx/source/svdraw/svdibrow.cxx | 4
svx/source/svdraw/svdstr.src | 5
svx/source/xoutdev/xattr.cxx | 107 ----------
svx/source/xoutdev/xpool.cxx | 2
sw/inc/pch/precompiled_sw.hxx | 1
sw/sdi/drawsh.sdi | 7
sw/sdi/drwtxtsh.sdi | 7
sw/source/ui/shells/drawsh.cxx | 52 +---
sw/source/ui/shells/drwtxtsh.cxx | 53 +---
sw/source/ui/shells/slotadd.cxx | 1
39 files changed, 135 insertions(+), 991 deletions(-)
New commits:
commit bcfee75544246db6788715d98efd6d33c12f933d
Author: Armin Le Grand <alg at apache.org>
Date: Tue Apr 9 16:06:32 2013 +0000
i121538 Removed old Fontwork dialogs preset box and all dependencies
diff --git a/default_images/res/fwthcirc.png b/default_images/res/fwthcirc.png
deleted file mode 100644
index a87d6f2..0000000
Binary files a/default_images/res/fwthcirc.png and /dev/null differ
diff --git a/default_images/res/fwthcirc_h.png b/default_images/res/fwthcirc_h.png
deleted file mode 100644
index b0bdb59..0000000
Binary files a/default_images/res/fwthcirc_h.png and /dev/null differ
diff --git a/default_images/svx/res/fwbhcirc.png b/default_images/svx/res/fwbhcirc.png
deleted file mode 100644
index 07d5d76..0000000
Binary files a/default_images/svx/res/fwbhcirc.png and /dev/null differ
diff --git a/default_images/svx/res/fwbhcirc_h.png b/default_images/svx/res/fwbhcirc_h.png
deleted file mode 100644
index b17dd14..0000000
Binary files a/default_images/svx/res/fwbhcirc_h.png and /dev/null differ
diff --git a/default_images/svx/res/fwbotarc.png b/default_images/svx/res/fwbotarc.png
deleted file mode 100644
index 58bafb8..0000000
Binary files a/default_images/svx/res/fwbotarc.png and /dev/null differ
diff --git a/default_images/svx/res/fwbotarc_h.png b/default_images/svx/res/fwbotarc_h.png
deleted file mode 100644
index 432f02d..0000000
Binary files a/default_images/svx/res/fwbotarc_h.png and /dev/null differ
diff --git a/default_images/svx/res/fwbuttn1.png b/default_images/svx/res/fwbuttn1.png
deleted file mode 100644
index a022371..0000000
Binary files a/default_images/svx/res/fwbuttn1.png and /dev/null differ
diff --git a/default_images/svx/res/fwbuttn1_h.png b/default_images/svx/res/fwbuttn1_h.png
deleted file mode 100644
index 30362ed..0000000
Binary files a/default_images/svx/res/fwbuttn1_h.png and /dev/null differ
diff --git a/default_images/svx/res/fwbuttn2.png b/default_images/svx/res/fwbuttn2.png
deleted file mode 100644
index ef86a03..0000000
Binary files a/default_images/svx/res/fwbuttn2.png and /dev/null differ
diff --git a/default_images/svx/res/fwbuttn2_h.png b/default_images/svx/res/fwbuttn2_h.png
deleted file mode 100644
index 94d8364..0000000
Binary files a/default_images/svx/res/fwbuttn2_h.png and /dev/null differ
diff --git a/default_images/svx/res/fwbuttn3.png b/default_images/svx/res/fwbuttn3.png
deleted file mode 100644
index e7633f2..0000000
Binary files a/default_images/svx/res/fwbuttn3.png and /dev/null differ
diff --git a/default_images/svx/res/fwbuttn3_h.png b/default_images/svx/res/fwbuttn3_h.png
deleted file mode 100644
index ade006e..0000000
Binary files a/default_images/svx/res/fwbuttn3_h.png and /dev/null differ
diff --git a/default_images/svx/res/fwbuttn4.png b/default_images/svx/res/fwbuttn4.png
deleted file mode 100644
index ba9f7a5..0000000
Binary files a/default_images/svx/res/fwbuttn4.png and /dev/null differ
diff --git a/default_images/svx/res/fwbuttn4_h.png b/default_images/svx/res/fwbuttn4_h.png
deleted file mode 100644
index af56fee..0000000
Binary files a/default_images/svx/res/fwbuttn4_h.png and /dev/null differ
diff --git a/default_images/svx/res/fwlftarc.png b/default_images/svx/res/fwlftarc.png
deleted file mode 100644
index b691c80..0000000
Binary files a/default_images/svx/res/fwlftarc.png and /dev/null differ
diff --git a/default_images/svx/res/fwlftarc_h.png b/default_images/svx/res/fwlftarc_h.png
deleted file mode 100644
index cf76d0b..0000000
Binary files a/default_images/svx/res/fwlftarc_h.png and /dev/null differ
diff --git a/default_images/svx/res/fwlhcirc.png b/default_images/svx/res/fwlhcirc.png
deleted file mode 100644
index f29f64e..0000000
Binary files a/default_images/svx/res/fwlhcirc.png and /dev/null differ
diff --git a/default_images/svx/res/fwlhcirc_h.png b/default_images/svx/res/fwlhcirc_h.png
deleted file mode 100644
index a7b0cc4..0000000
Binary files a/default_images/svx/res/fwlhcirc_h.png and /dev/null differ
diff --git a/default_images/svx/res/fwrgtarc.png b/default_images/svx/res/fwrgtarc.png
deleted file mode 100644
index 79f5aa6..0000000
Binary files a/default_images/svx/res/fwrgtarc.png and /dev/null differ
diff --git a/default_images/svx/res/fwrgtarc_h.png b/default_images/svx/res/fwrgtarc_h.png
deleted file mode 100644
index b0db9ee..0000000
Binary files a/default_images/svx/res/fwrgtarc_h.png and /dev/null differ
diff --git a/default_images/svx/res/fwrhcirc.png b/default_images/svx/res/fwrhcirc.png
deleted file mode 100644
index 5edd472..0000000
Binary files a/default_images/svx/res/fwrhcirc.png and /dev/null differ
diff --git a/default_images/svx/res/fwrhcirc_h.png b/default_images/svx/res/fwrhcirc_h.png
deleted file mode 100644
index 195a381..0000000
Binary files a/default_images/svx/res/fwrhcirc_h.png and /dev/null differ
diff --git a/default_images/svx/res/fwtoparc.png b/default_images/svx/res/fwtoparc.png
deleted file mode 100644
index 7bcb6fe..0000000
Binary files a/default_images/svx/res/fwtoparc.png and /dev/null differ
diff --git a/default_images/svx/res/fwtoparc_h.png b/default_images/svx/res/fwtoparc_h.png
deleted file mode 100644
index b3c285f..0000000
Binary files a/default_images/svx/res/fwtoparc_h.png and /dev/null differ
diff --git a/sc/sdi/drawsh.sdi b/sc/sdi/drawsh.sdi
index c90081b..aa92e33 100644
--- a/sc/sdi/drawsh.sdi
+++ b/sc/sdi/drawsh.sdi
@@ -177,7 +177,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; ]
diff --git a/sc/sdi/drtxtob.sdi b/sc/sdi/drtxtob.sdi
index b9f685e..1cbf907 100644
--- a/sc/sdi/drtxtob.sdi
+++ b/sc/sdi/drtxtob.sdi
@@ -110,7 +110,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; ]
diff --git a/sc/source/ui/app/typemap.cxx b/sc/source/ui/app/typemap.cxx
index 50d87e0..c0050ec6 100644
--- a/sc/source/ui/app/typemap.cxx
+++ b/sc/source/ui/app/typemap.cxx
@@ -99,7 +99,6 @@
#include <svx/xftshit.hxx>
#include <svx/xftshcit.hxx>
#include <svx/xftshxy.hxx>
-#include <svx/xftsfit.hxx>
#include <editeng/langitem.hxx>
#include <svx/grafctrl.hxx>
#include <editeng/shdditem.hxx>
diff --git a/sc/source/ui/drawfunc/drawsh4.cxx b/sc/source/ui/drawfunc/drawsh4.cxx
index 59d8b56..9035fc8 100644
--- a/sc/source/ui/drawfunc/drawsh4.cxx
+++ b/sc/source/ui/drawfunc/drawsh4.cxx
@@ -77,7 +77,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);
diff --git a/sc/source/ui/drawfunc/drawsh5.cxx b/sc/source/ui/drawfunc/drawsh5.cxx
index bab82d8..e2b1dcb 100644
--- a/sc/source/ui/drawfunc/drawsh5.cxx
+++ b/sc/source/ui/drawfunc/drawsh5.cxx
@@ -46,7 +46,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>
@@ -682,25 +681,7 @@ void ScDrawShell::ExecFormText(SfxRequest& rReq)
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);
+ pDrView->SetAttributes(rSet);
}
}
diff --git a/sc/source/ui/drawfunc/drtxtob2.cxx b/sc/source/ui/drawfunc/drtxtob2.cxx
index 228de0c..0700b4b 100644
--- a/sc/source/ui/drawfunc/drtxtob2.cxx
+++ b/sc/source/ui/drawfunc/drtxtob2.cxx
@@ -205,25 +205,7 @@ void ScDrawTextObjectBar::ExecFormText(SfxRequest& rReq)
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);
+ pDrView->SetAttributes(rSet);
}
}
@@ -259,7 +241,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);
diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx
index 55e1ab3..cc57f7a 100644
--- a/sd/inc/pch/precompiled_sd.hxx
+++ b/sd/inc/pch/precompiled_sd.hxx
@@ -756,7 +756,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 e44f6b2..9ef90ca 100644
--- a/sd/sdi/_drvwsh.sdi
+++ b/sd/sdi/_drvwsh.sdi
@@ -1598,11 +1598,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 bc9719c..5e755d8 100644
--- a/sd/source/core/typemap.cxx
+++ b/sd/source/core/typemap.cxx
@@ -83,7 +83,6 @@
#include <svx/xftshit.hxx>
#include <svx/xftshcit.hxx>
#include <svx/xftshxy.hxx>
-#include <svx/xftsfit.hxx>
#include <svx/xtextit0.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 a2f0da6..b892672 100644
--- a/sd/source/ui/view/drviews6.cxx
+++ b/sd/source/ui/view/drviews6.cxx
@@ -46,7 +46,6 @@
#ifndef _IMAPDLG_HXX
#include <svx/imapdlg.hxx>
#endif
-#include <svx/xftsfit.hxx>
#include <svx/colrctrl.hxx>
#include <svx/f3dchild.hxx>
#include "optsitem.hxx"
@@ -107,29 +106,7 @@ void DrawViewShell::ExecFormText(SfxRequest& rReq)
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))
- { // ggf. die richtige Editfunktion aktivieren
- GetViewFrame()->GetDispatcher()->Execute(SID_SWITCH_POINTEDIT,
- SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD);
- }
- }
- else
- mpDrawView->SetAttributes(rSet);
+ mpDrawView->SetAttributes(rSet);
}
}
@@ -171,7 +148,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);
diff --git a/svx/Package_inc.mk b/svx/Package_inc.mk
index 971c39e..440e782 100644
--- a/svx/Package_inc.mk
+++ b/svx/Package_inc.mk
@@ -293,7 +293,6 @@ $(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxmlhitm.hxx,svx/sxmlhitm.hxx)
$(eval $(call gb_Package_add_file,svx_inc,inc/svx/optgenrl.hxx,svx/optgenrl.hxx))
$(eval $(call gb_Package_add_file,svx_inc,inc/svx/unoshcol.hxx,svx/unoshcol.hxx))
$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdtagitm.hxx,svx/sdtagitm.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xftsfit.hxx,svx/xftsfit.hxx))
$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdograf.hxx,svx/svdograf.hxx))
$(eval $(call gb_Package_add_file,svx_inc,inc/svx/cube3d.hxx,svx/cube3d.hxx))
$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlnwtit.hxx,svx/xlnwtit.hxx))
diff --git a/svx/inc/svx/dialogs.hrc b/svx/inc/svx/dialogs.hrc
index 0310b8a..a1e1835 100644
--- a/svx/inc/svx/dialogs.hrc
+++ b/svx/inc/svx/dialogs.hrc
@@ -252,20 +252,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_SVXBMP_SHADOW_XDIST (RID_SVX_START + 110)
#define RID_SVXBMP_SHADOW_YDIST (RID_SVX_START + 111)
#define RID_SVXBMP_SHADOW_ANGLE (RID_SVX_START + 112)
@@ -355,18 +341,6 @@
#define RID_SVXDLG_RUBY (RID_SVX_START + 247)
-#define RID_SVXBMP_FONTWORK_FORM1_H (RID_SVX_START + 260)
-#define RID_SVXBMP_FONTWORK_FORM2_H (RID_SVX_START + 261)
-#define RID_SVXBMP_FONTWORK_FORM3_H (RID_SVX_START + 262)
-#define RID_SVXBMP_FONTWORK_FORM4_H (RID_SVX_START + 263)
-#define RID_SVXBMP_FONTWORK_FORM5_H (RID_SVX_START + 264)
-#define RID_SVXBMP_FONTWORK_FORM6_H (RID_SVX_START + 265)
-#define RID_SVXBMP_FONTWORK_FORM7_H (RID_SVX_START + 266)
-#define RID_SVXBMP_FONTWORK_FORM8_H (RID_SVX_START + 267)
-#define RID_SVXBMP_FONTWORK_FORM9_H (RID_SVX_START + 268)
-#define RID_SVXBMP_FONTWORK_FORM10_H (RID_SVX_START + 269)
-#define RID_SVXBMP_FONTWORK_FORM11_H (RID_SVX_START + 270)
-#define RID_SVXBMP_FONTWORK_FORM12_H (RID_SVX_START + 271)
#define RID_SVXIMG_GRAF_RED_H (RID_SVX_START + 276)
#define RID_SVXIMG_GRAF_GREEN_H (RID_SVX_START + 277)
#define RID_SVXIMG_GRAF_BLUE_H (RID_SVX_START + 278)
@@ -460,21 +434,6 @@
// Schlie"ssen (im TabDialog Line/Area)
#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)
-
// Farben-Strings
#define RID_SVXSTR_BLACK (RID_SVX_START + 275)
#define RID_SVXSTR_BLUE (RID_SVX_START + 276)
diff --git a/svx/inc/svx/fontwork.hxx b/svx/inc/svx/fontwork.hxx
index 63d060d..9a97b24 100644
--- a/svx/inc/svx/fontwork.hxx
+++ b/svx/inc/svx/fontwork.hxx
@@ -48,7 +48,6 @@ class XFormTextAdjustItem;
class XFormTextDistanceItem;
class XFormTextStartItem;
class XFormTextMirrorItem;
-class XFormTextStdFormItem;
class XFormTextHideFormItem;
class XFormTextOutlineItem;
class XFormTextShadowItem;
@@ -97,12 +96,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;
@@ -148,7 +145,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*);
@@ -156,11 +152,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*,
- sal_Bool bRestoreValues = sal_False);
+ void SetShadow_Impl(const XFormTextShadowItem*, sal_Bool bRestoreValues = sal_False);
void SetShadowColor_Impl(const XFormTextShadowColorItem*);
void SetShadowXVal_Impl(const XFormTextShadowXValItem*);
void SetShadowYVal_Impl(const XFormTextShadowYValItem*);
@@ -183,10 +177,6 @@ class SVX_DLLPUBLIC SvxFontWorkDialog : public SfxDockingWindow
void SetColorTable(const XColorTable* pTable);
void SetActive(sal_Bool bActivate = sal_True);
-
- void CreateStdFormObj(SdrView& rView, SdrPageView& rPV,
- const SfxItemSet& rAttr, SdrObject& rOldObj,
- XFormTextStdForm eForm);
};
#endif // _SVX_FONTWORK_HXX
diff --git a/svx/inc/svx/svdstr.hrc b/svx/inc/svx/svdstr.hrc
index 1c9a349..6022509 100644
--- a/svx/inc/svx/svdstr.hrc
+++ b/svx/inc/svx/svdstr.hrc
@@ -558,7 +558,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/svx/inc/svx/svxcommands.h b/svx/inc/svx/svxcommands.h
index b5dd470..a3d25c1 100644
--- a/svx/inc/svx/svxcommands.h
+++ b/svx/inc/svx/svxcommands.h
@@ -171,7 +171,6 @@
#define CMD_SID_ATTR_CHAR_CTL_FONTHEIGHT ".uno:FontHeightCTL"
#define CMD_SID_FONTWORK ".uno:FontWork"
#define CMD_SID_FORMTEXT_ADJUST ".uno:FontWorkTextAdjust"
-#define CMD_SID_FORMTEXT_STDFORM ".uno:FontWorkTextClearAttributes"
#define CMD_SID_FORMTEXT_DISTANCE ".uno:FontWorkTextDistance"
#define CMD_SID_FORMTEXT_MIRROR ".uno:FontWorkTextMirror"
#define CMD_SID_FORMTEXT_OUTLINE ".uno:FontWorkTextOutline"
diff --git a/svx/inc/svx/svxids.hrc b/svx/inc/svx/svxids.hrc
index 8501ac4..3a31540 100755
--- a/svx/inc/svx/svxids.hrc
+++ b/svx/inc/svx/svxids.hrc
@@ -622,7 +622,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_FORMTEXT_RESERVED1 ( SID_SVX_START + 269 )
#define SID_FORMTEXT_RESERVED2 ( SID_SVX_START + 270 )
diff --git a/svx/inc/svx/unoshprp.hxx b/svx/inc/svx/unoshprp.hxx
index 5c31a0a..839e6e2 100644
--- a/svx/inc/svx/unoshprp.hxx
+++ b/svx/inc/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/svx/inc/svx/xdef.hxx b/svx/inc/svx/xdef.hxx
index 099542c..baf4c0c 100644
--- a/svx/inc/svx/xdef.hxx
+++ b/svx/inc/svx/xdef.hxx
@@ -89,9 +89,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/svx/inc/svx/xenum.hxx b/svx/inc/svx/xenum.hxx
index cbae02c..f615cf7 100644
--- a/svx/inc/svx/xenum.hxx
+++ b/svx/inc/svx/xenum.hxx
@@ -44,12 +44,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};
-
#endif // _XENUM_HXX
diff --git a/svx/inc/svx/xftsfit.hxx b/svx/inc/svx/xftsfit.hxx
deleted file mode 100644
index 1b747e5..0000000
--- a/svx/inc/svx/xftsfit.hxx
+++ /dev/null
@@ -1,51 +0,0 @@
-/**************************************************************
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- *************************************************************/
-
-
-
-#ifndef _SVX_XFTSFIT_HXX
-#define _SVX_XFTSFIT_HXX
-
-#include "svx/svxdllapi.h"
-
-/*************************************************************************
-|*
-|* FormText-StdFormItem
-|*
-\************************************************************************/
-
-class SVX_DLLPUBLIC XFormTextStdFormItem : public SfxEnumItem
-{
-public:
- TYPEINFO();
- XFormTextStdFormItem(XFormTextStdForm = XFTFORM_NONE);
- XFormTextStdFormItem(SvStream& rIn);
- virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
- virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
- virtual sal_uInt16 GetValueCount() const;
- XFormTextStdForm GetValue() const { return (XFormTextStdForm) SfxEnumItem::GetValue(); }
- // #FontWork#
- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
-};
-
-#endif
-
diff --git a/svx/inc/svx/xtextit.hxx b/svx/inc/svx/xtextit.hxx
index 641d877..0f4b6e0 100644
--- a/svx/inc/svx/xtextit.hxx
+++ b/svx/inc/svx/xtextit.hxx
@@ -38,7 +38,6 @@
#include <svx/xftshit.hxx>
#include <svx/xftshcit.hxx>
#include <svx/xftshxy.hxx>
-#include <svx/xftsfit.hxx>
#endif
diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index 0847c6d..6402ebc 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -4046,33 +4046,6 @@ XFormTextAdjustItem FontWorkTextAdjust SID_FORMTEXT_ADJUST
]
//--------------------------------------------------------------------------
-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
[
diff --git a/svx/sdi/xoitems.sdi b/svx/sdi/xoitems.sdi
index b88ff90..18b3db6 100644
--- a/svx/sdi/xoitems.sdi
+++ b/svx/sdi/xoitems.sdi
@@ -150,7 +150,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
diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx
index 029902e..5e9264f 100644
--- a/svx/source/dialog/fontwork.cxx
+++ b/svx/source/dialog/fontwork.cxx
@@ -118,14 +118,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 erwartet");
- rFontWorkDlg.SetStdForm_Impl(pStateItem);
- break;
- }
case SID_FORMTEXT_HIDEFORM:
{
const XFormTextHideFormItem* pStateItem =
@@ -215,8 +207,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())),
@@ -257,16 +247,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);
@@ -278,9 +264,6 @@ SvxFontWorkDialog::SvxFontWorkDialog( SfxBindings *pBindinx,
aTbxShadow.SetSizePixel(aSize);
aTbxShadow.SetSelectHdl( LINK(this, SvxFontWorkDialog, SelectShadowHdl_Impl) );
-// aFbShadowX.SetBitmap(Bitmap(FW_RESID(RID_SVXBMP_SHADOW_XDIST)));
-// aFbShadowY.SetBitmap(Bitmap(FW_RESID(RID_SVXBMP_SHADOW_YDIST)));
-
Link aLink = LINK(this, SvxFontWorkDialog, ModifyInputHdl_Impl);
aMtrFldDistance.SetModifyHdl( aLink );
aMtrFldTextStart.SetModifyHdl( aLink );
@@ -312,14 +295,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);
}
/*************************************************************************
@@ -520,27 +495,6 @@ void SvxFontWorkDialog::SetMirror_Impl(const XFormTextMirrorItem* pItem)
/*************************************************************************
|*
-|* Standardform im ValueSet anzeigen
-|*
-\************************************************************************/
-
-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();
-}
-
-/*************************************************************************
-|*
|* Button fuer Konturanzeige setzen
|*
\************************************************************************/
@@ -934,23 +888,6 @@ IMPL_LINK( SvxFontWorkDialog, InputTimoutHdl_Impl, void *, EMPTYARG )
|*
\************************************************************************/
-IMPL_LINK( SvxFontWorkDialog, FormSelectHdl_Impl, void *, EMPTYARG )
-{
- 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( SvxFontWorkDialog, ColorSelectHdl_Impl, void *, EMPTYARG )
{
// Changed by obo. Linux-Compiler can't parse commented lines
@@ -984,231 +921,6 @@ void SvxFontWorkDialog::SetActive(sal_Bool /*bActivate*/)
{
}
-/*************************************************************************
-|*
-|* Standard-FontWork-Objekt erzeugen
-|*
-\************************************************************************/
-
-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;
-
-//-/ rOldObj.TakeAttributes(aAttr, sal_True, sal_False);
- 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());
-
- // Polygone schliessen
- 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 )
- {
- // #78478# 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) )
@@ -1223,37 +935,6 @@ void SvxFontWorkDialog::ApplyImageList()
{
bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
- ResMgr* _pMgr = &DIALOG_MGR();
-
- sal_uInt16 nBitmapResId = bHighContrast ? RID_SVXBMP_FONTWORK_FORM1_H : RID_SVXBMP_FONTWORK_FORM1;
- sal_uInt16 nTextResId = RID_SVXSTR_FONTWORK_FORM1;
-
- bool bInit = aFormSet.GetItemCount() == 0;
-
- if( bInit )
- {
-/*
- Size aSize( aTbxStyle.CalcWindowSizePixel() );
- Bitmap aBmp(ResId(RID_SVXBMP_FONTWORK_FORM1,_pMgr));
- aSize.Height() = aFormSet.CalcWindowSizePixel(aBmp.GetSizePixel()).Height() + 2;
- aFormSet.SetSizePixel(aSize);
-*/
- }
-
- 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 = bHighContrast ? maImageListH : maImageList;
aTbxStyle.SetImageList( rImgLst );
diff --git a/svx/source/dialog/fontwork.hrc b/svx/source/dialog/fontwork.hrc
index 0511432..3c8a025 100644
--- a/svx/source/dialog/fontwork.hrc
+++ b/svx/source/dialog/fontwork.hrc
@@ -20,7 +20,6 @@
*************************************************************/
-#define VS_FORMS 1
#define TBX_STYLE 1
#define TBX_ADJUST 2
#define TBX_SHADOW 3
diff --git a/svx/source/dialog/fontwork.src b/svx/source/dialog/fontwork.src
index 33a6329..31c7fd7 100644
--- a/svx/source/dialog/fontwork.src
+++ b/svx/source/dialog/fontwork.src
@@ -25,7 +25,10 @@
#include <svx/dialogs.hrc>
#include "fontwork.hrc"
#include "helpid.hrc"
+
// pragma ----------------------------------------------------------------
+#define REDUCED_WIDTH 6
+#define REMOVED_VS_FORMS_HEIGHT (30 + 6)
// RID_SVXDLG_FONTWORK ---------------------------------------------------
DockingWindow RID_SVXDLG_FONTWORK
@@ -35,25 +38,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
@@ -104,7 +99,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
@@ -155,14 +150,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 ;
@@ -180,14 +175,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 ;
@@ -203,7 +198,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
@@ -254,14 +249,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 ;
@@ -279,14 +274,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 ;
@@ -304,7 +299,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" ;
@@ -353,204 +348,6 @@ 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" ;
-};
-
-Bitmap RID_SVXBMP_FONTWORK_FORM1_H
-{
- File = "fwthcirc_h.bmp" ;
-};
-Bitmap RID_SVXBMP_FONTWORK_FORM2_H
-{
- File = "fwbhcirc_h.bmp" ;
-};
-Bitmap RID_SVXBMP_FONTWORK_FORM3_H
-{
- File = "fwlhcirc_h.bmp" ;
-};
-Bitmap RID_SVXBMP_FONTWORK_FORM4_H
-{
- File = "fwrhcirc_h.bmp" ;
-};
-Bitmap RID_SVXBMP_FONTWORK_FORM5_H
-{
- File = "fwtoparc_h.bmp" ;
-};
-Bitmap RID_SVXBMP_FONTWORK_FORM6_H
-{
- File = "fwbotarc_h.bmp" ;
-};
-Bitmap RID_SVXBMP_FONTWORK_FORM7_H
-{
- File = "fwlftarc_h.bmp" ;
-};
-Bitmap RID_SVXBMP_FONTWORK_FORM8_H
-{
- File = "fwrgtarc_h.bmp" ;
-};
-Bitmap RID_SVXBMP_FONTWORK_FORM9_H
-{
- File = "fwbuttn1_h.bmp" ;
-};
-Bitmap RID_SVXBMP_FONTWORK_FORM10_H
-{
- File = "fwbuttn2_h.bmp" ;
-};
-Bitmap RID_SVXBMP_FONTWORK_FORM11_H
-{
- File = "fwbuttn3_h.bmp" ;
-};
-Bitmap RID_SVXBMP_FONTWORK_FORM12_H
-{
- File = "fwbuttn4_h.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
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+// **********************************************************************
+// EOF
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index cd6ca52..1acba74 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -451,7 +451,6 @@ void SdrItemPool::TakeItemName(sal_uInt16 nWhich, String& 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;
diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx
index 97a7c47..44f8980 100644
--- a/svx/source/svdraw/svdibrow.cxx
+++ b/svx/source/svdraw/svdibrow.cxx
@@ -748,7 +748,6 @@ FASTBOOL IsItemIneffective(sal_uInt16 nWhich, const SfxItemSet* pSet, sal_uInt16
case XATTR_FORMTXTSHDWCOLOR :
case XATTR_FORMTXTSHDWXVAL :
case XATTR_FORMTXTSHDWYVAL :
- case XATTR_FORMTXTSTDFORM :
case XATTR_FORMTXTHIDEFORM :
case XATTR_FORMTXTSHDWTRANSP: {
rIndent=1;
@@ -896,11 +895,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
diff --git a/svx/source/svdraw/svdstr.src b/svx/source/svdraw/svdstr.src
index 84a816f..64a8c9d 100644
--- a/svx/source/svdraw/svdstr.src
+++ b/svx/source/svdraw/svdstr.src
@@ -1910,11 +1910,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";
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index 2c58aad..c09501b 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -5454,113 +5454,6 @@ SfxPoolItem* XFormTextShadowYValItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/)
return new XFormTextShadowYValItem(rIn);
}
-//---------------------------
-// class XFormTextStdFormItem
-//---------------------------
-TYPEINIT1_AUTOFACTORY(XFormTextStdFormItem, SfxEnumItem);
-
-/*************************************************************************
-|*
-|* XFormTextStdFormItem::XFormTextStdFormItem()
-|*
-|* Beschreibung
-|* Ersterstellung 27.06.95
-|* Letzte Aenderung 27.06.95
-|*
-*************************************************************************/
-
-XFormTextStdFormItem::XFormTextStdFormItem(XFormTextStdForm eFormTextStdForm) :
- SfxEnumItem(
- XATTR_FORMTXTSTDFORM, sal::static_int_cast< sal_uInt16 >(eFormTextStdForm))
-{
-}
-
-/*************************************************************************
-|*
-|* XFormTextStdFormItem::XFormTextStdFormItem(SvStream& rIn)
-|*
-|* Beschreibung
-|* Ersterstellung 27.06.95
-|* Letzte Aenderung 27.06.95
-|*
-*************************************************************************/
-
-XFormTextStdFormItem::XFormTextStdFormItem(SvStream& rIn) :
- SfxEnumItem(XATTR_FORMTXTSTDFORM, rIn)
-{
-}
-
-/*************************************************************************
-|*
-|* XFormTextStdFormItem::Clone(SfxItemPool* pPool) const
-|*
-|* Beschreibung
-|* Ersterstellung 27.06.95
-|* Letzte Aenderung 27.06.95
-|*
-*************************************************************************/
-
-SfxPoolItem* XFormTextStdFormItem::Clone(SfxItemPool* /*pPool*/) const
-{
- return new XFormTextStdFormItem( *this );
-}
-
-/*************************************************************************
-|*
-|* SfxPoolItem* XFormTextStdFormItem::Create(SvStream& rIn, sal_uInt16 nVer) const
-|*
-|* Beschreibung
-|* Ersterstellung 27.06.95
-|* Letzte Aenderung 27.06.95
-|*
-*************************************************************************/
-
-SfxPoolItem* XFormTextStdFormItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
-{
- return new XFormTextStdFormItem(rIn);
-}
-
-
-/*************************************************************************
-|*
-|*
-|*
-\*************************************************************************/
-
-sal_uInt16 XFormTextStdFormItem::GetValueCount() const
-{
- return 3;
-}
-
-/*************************************************************************
-|*
-|*
-|*
-\*************************************************************************/
-
-// #FontWork#
-sal_Bool XFormTextStdFormItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
-{
- rVal <<= (sal_Int32)GetValue();
- return sal_True;
-}
-
-/*************************************************************************
-|*
-|*
-|*
-\*************************************************************************/
-
-// #FontWork#
-sal_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 sal_True;
-}
-
// --------------------------
// class XFormTextHideFormItem
// --------------------------
diff --git a/svx/source/xoutdev/xpool.cxx b/svx/source/xoutdev/xpool.cxx
index 63dc9e0..5e452f4 100644
--- a/svx/source/xoutdev/xpool.cxx
+++ b/svx/source/xoutdev/xpool.cxx
@@ -118,7 +118,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;
@@ -161,7 +160,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;
// if it's my own creation level, set Defaults and ItemInfos
diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx
index af807bf..96e2d4d 100644
--- a/sw/inc/pch/precompiled_sw.hxx
+++ b/sw/inc/pch/precompiled_sw.hxx
@@ -808,7 +808,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 9cdde03..6124df1 100644
--- a/sw/sdi/drawsh.sdi
+++ b/sw/sdi/drawsh.sdi
@@ -442,13 +442,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 0937705..ed06a5b 100644
--- a/sw/sdi/drwtxtsh.sdi
+++ b/sw/sdi/drwtxtsh.sdi
@@ -413,13 +413,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 2c18f95..3ab5d22 100644
--- a/sw/source/ui/shells/drawsh.cxx
+++ b/sw/source/ui/shells/drawsh.cxx
@@ -35,7 +35,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>
@@ -415,24 +414,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();
@@ -480,7 +462,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 ae3e326..d32e878 100644
--- a/sw/source/ui/shells/drwtxtsh.cxx
+++ b/sw/source/ui/shells/drwtxtsh.cxx
@@ -35,7 +35,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>
@@ -305,22 +304,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);
}
}
@@ -364,7 +348,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 6886d07..cea3e1f 100644
--- a/sw/source/ui/shells/slotadd.cxx
+++ b/sw/source/ui/shells/slotadd.cxx
@@ -106,7 +106,6 @@
#include <svx/xftshit.hxx>
#include <svx/xftshcit.hxx>
#include <svx/xftshxy.hxx>
-#include <svx/xftsfit.hxx>
#include <svx/grafctrl.hxx>
commit c73f0e910fcf3a940c24a639dba9b4ced2057399
Author: Armin Le Grand <alg at apache.org>
Date: Tue Apr 9 11:22:48 2013 +0000
i121538 Disable FontWork dialog entries (slots) when CustomShapes are selected to avoid unwanted FontWork editing on these shapes
diff --git a/sc/source/ui/drawfunc/drawsh4.cxx b/sc/source/ui/drawfunc/drawsh4.cxx
index 2a5fb84..59d8b56 100644
--- a/sc/source/ui/drawfunc/drawsh4.cxx
+++ b/sc/source/ui/drawfunc/drawsh4.cxx
@@ -35,7 +35,7 @@
#include <svx/xdef.hxx>
#include <sfx2/objsh.hxx>
#include <sfx2/viewfrm.hxx>
-
+#include <svx/svdoashp.hxx>
#include "drawsh.hxx"
#include "drawview.hxx"
#include "viewdata.hxx"
@@ -60,8 +60,14 @@ void ScDrawShell::GetFormTextState(SfxItemSet& rSet)
if ( rMarkList.GetMarkCount() == 1 )
pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
- if ( pObj == NULL || !pObj->ISA(SdrTextObj) ||
- !((SdrTextObj*) pObj)->HasText() )
+ const SdrTextObj* pTextObj = dynamic_cast< const SdrTextObj* >(pObj);
+ const bool bDeactivate(
+ !pObj ||
+ !pTextObj ||
+ !pTextObj->HasText() ||
+ dynamic_cast< const SdrObjCustomShape* >(pObj)); // #121538# no FontWork for CustomShapes
+
+ if(bDeactivate)
{
if ( pDlg )
pDlg->SetActive(sal_False);
diff --git a/sc/source/ui/drawfunc/drtxtob2.cxx b/sc/source/ui/drawfunc/drtxtob2.cxx
index d20b879..228de0c 100644
--- a/sc/source/ui/drawfunc/drtxtob2.cxx
+++ b/sc/source/ui/drawfunc/drtxtob2.cxx
@@ -39,7 +39,7 @@
#include <sfx2/request.hxx>
#include <sot/formats.hxx>
#include <svl/whiter.hxx>
-
+#include <svx/svdoashp.hxx>
#include "sc.hrc"
#include "drtxtob.hxx"
#include "viewdata.hxx"
@@ -242,8 +242,14 @@ void ScDrawTextObjectBar::GetFormTextState(SfxItemSet& rSet)
if ( rMarkList.GetMarkCount() == 1 )
pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
- if ( pObj == NULL || !pObj->ISA(SdrTextObj) ||
- !((SdrTextObj*) pObj)->HasText() )
+ const SdrTextObj* pTextObj = dynamic_cast< const SdrTextObj* >(pObj);
+ const bool bDeactivate(
+ !pObj ||
+ !pTextObj ||
+ !pTextObj->HasText() ||
+ dynamic_cast< const SdrObjCustomShape* >(pObj)); // #121538# no FontWork for CustomShapes
+
+ if(bDeactivate)
{
if ( pDlg )
pDlg->SetActive(sal_False);
diff --git a/sd/source/ui/view/drviews6.cxx b/sd/source/ui/view/drviews6.cxx
index 17ec461..a2f0da6 100644
--- a/sd/source/ui/view/drviews6.cxx
+++ b/sd/source/ui/view/drviews6.cxx
@@ -78,6 +78,7 @@
#include "Window.hxx"
#include "DrawDocShell.hxx"
#include "framework/FrameworkHelper.hxx"
+#include <svx/svdoashp.hxx>
namespace sd {
@@ -152,8 +153,14 @@ void DrawViewShell::GetFormTextState(SfxItemSet& rSet)
if ( rMarkList.GetMarkCount() == 1 )
pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
- if ( pObj == NULL || !pObj->ISA(SdrTextObj) ||
- !((SdrTextObj*) pObj)->HasText() )
+ const SdrTextObj* pTextObj = dynamic_cast< const SdrTextObj* >(pObj);
+ const bool bDeactivate(
+ !pObj ||
+ !pTextObj ||
+ !pTextObj->HasText() ||
+ dynamic_cast< const SdrObjCustomShape* >(pObj)); // #121538# no FontWork for CustomShapes
+
+ if(bDeactivate)
{
// automatisches Auf/Zuklappen des FontWork-Dialog; erstmal deaktiviert
// if ( pDlg )
diff --git a/sw/source/ui/shells/drawsh.cxx b/sw/source/ui/shells/drawsh.cxx
index a320e72..2c18f95 100644
--- a/sw/source/ui/shells/drawsh.cxx
+++ b/sw/source/ui/shells/drawsh.cxx
@@ -50,6 +50,7 @@
#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
#include <svx/xtable.hxx>
+#include <svx/svdoashp.hxx>
#include "swundo.hxx"
#include "wrtsh.hxx"
@@ -465,19 +466,27 @@ void SwDrawShell::GetFormTextState(SfxItemSet& rSet)
if ( rMarkList.GetMarkCount() == 1 )
pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
- if ( pObj == NULL || !pObj->ISA(SdrTextObj) ||
- !((SdrTextObj*) pObj)->HasText() )
+ const SdrTextObj* pTextObj = dynamic_cast< const SdrTextObj* >(pObj);
+ const bool bDeactivate(
+ !pObj ||
+ !pTextObj ||
+ !pTextObj->HasText() ||
+ dynamic_cast< const SdrObjCustomShape* >(pObj)); // #121538# no FontWork for CustomShapes
+
+ if(bDeactivate)
{
-#define XATTR_ANZ 12
- static const sal_uInt16 nXAttr[ XATTR_ANZ ] =
- {
- XATTR_FORMTXTSTYLE, XATTR_FORMTXTADJUST, XATTR_FORMTXTDISTANCE,
- XATTR_FORMTXTSTART, XATTR_FORMTXTMIRROR, XATTR_FORMTXTSTDFORM,
- XATTR_FORMTXTHIDEFORM, XATTR_FORMTXTOUTLINE, XATTR_FORMTXTSHADOW,
- XATTR_FORMTXTSHDWCOLOR, XATTR_FORMTXTSHDWXVAL, XATTR_FORMTXTSHDWYVAL
- };
- for( sal_uInt16 i = 0; i < XATTR_ANZ; )
- rSet.DisableItem( nXAttr[ i++ ] );
+ rSet.DisableItem(XATTR_FORMTXTSTYLE);
+ rSet.DisableItem(XATTR_FORMTXTADJUST);
+ 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);
+ rSet.DisableItem(XATTR_FORMTXTSHDWCOLOR);
+ rSet.DisableItem(XATTR_FORMTXTSHDWXVAL);
+ rSet.DisableItem(XATTR_FORMTXTSHDWYVAL);
}
else
{
diff --git a/sw/source/ui/shells/drwtxtsh.cxx b/sw/source/ui/shells/drwtxtsh.cxx
index 0a6d601..ae3e326 100644
--- a/sw/source/ui/shells/drwtxtsh.cxx
+++ b/sw/source/ui/shells/drwtxtsh.cxx
@@ -79,16 +79,13 @@
#include <uitool.hxx>
#include <wview.hxx>
#include <swmodule.hxx>
-
#include <svx/xtable.hxx>
#include <svx/svxdlg.hxx>
#include <svx/dialogs.hrc>
-
#include <svx/svxdlg.hxx>
#include <svx/dialogs.hrc>
-
+#include <svx/svdoashp.hxx>
#include <cppuhelper/bootstrap.hxx>
-
#include "swabstdlg.hxx" //CHINA001
#include "misc.hrc"
@@ -353,18 +350,27 @@ void SwDrawTextShell::GetFormTextState(SfxItemSet& rSet)
if ( rMarkList.GetMarkCount() == 1 )
pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
- if ( pObj == NULL || !pObj->ISA(SdrTextObj) ||
- !((SdrTextObj*) pObj)->HasText() )
+ const SdrTextObj* pTextObj = dynamic_cast< const SdrTextObj* >(pObj);
+ const bool bDeactivate(
+ !pObj ||
+ !pTextObj ||
+ !pTextObj->HasText() ||
+ dynamic_cast< const SdrObjCustomShape* >(pObj)); // #121538# no FontWork for CustomShapes
+
+ if (bDeactivate)
{
-#define XATTR_ANZ 12
- static const sal_uInt16 nXAttr[ XATTR_ANZ ] =
- { XATTR_FORMTXTSTYLE, XATTR_FORMTXTADJUST, XATTR_FORMTXTDISTANCE,
- XATTR_FORMTXTSTART, XATTR_FORMTXTMIRROR, XATTR_FORMTXTSTDFORM,
- XATTR_FORMTXTHIDEFORM, XATTR_FORMTXTOUTLINE, XATTR_FORMTXTSHADOW,
- XATTR_FORMTXTSHDWCOLOR, XATTR_FORMTXTSHDWXVAL, XATTR_FORMTXTSHDWYVAL
- };
- for( sal_uInt16 i = 0; i < XATTR_ANZ; )
- rSet.DisableItem( nXAttr[ i++ ] );
+ rSet.DisableItem(XATTR_FORMTXTSTYLE);
+ rSet.DisableItem(XATTR_FORMTXTADJUST);
+ 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);
+ rSet.DisableItem(XATTR_FORMTXTSHDWCOLOR);
+ rSet.DisableItem(XATTR_FORMTXTSHDWXVAL);
+ rSet.DisableItem(XATTR_FORMTXTSHDWYVAL);
}
else
{
commit d7fa73b25f75796291432496d9bb8d7c80e82c8b
Author: Armin Le Grand <alg at apache.org>
Date: Tue Apr 9 08:37:28 2013 +0000
i113080 added test code (in debug mode), cleanedup a small inconsistency
diff --git a/drawinglayer/source/tools/converters.cxx b/drawinglayer/source/tools/converters.cxx
index 83b77cc..9faef97 100644
--- a/drawinglayer/source/tools/converters.cxx
+++ b/drawinglayer/source/tools/converters.cxx
@@ -49,6 +49,9 @@ namespace drawinglayer
sal_uInt32 nMaxQuadratPixels)
{
BitmapEx aRetval;
+#ifdef DBG_UTIL
+ static bool bDoSaveForVisualControl(false);
+#endif
if(rSeq.hasElements() && nDiscreteWidth && nDiscreteHeight)
{
@@ -81,13 +84,14 @@ namespace drawinglayer
// prepare vdev
maContent.SetOutputSizePixel(aSizePixel, false);
maContent.SetMapMode(aMapModePixel);
- maContent.SetAntialiasing(true);
// set to all white
maContent.SetBackground(Wallpaper(Color(COL_WHITE)));
maContent.Erase();
- // create pixel processor
+ // create pixel processor, also already takes care of AAing and
+ // checking the getOptionsDrawinglayer().IsAntiAliasing() switch. If
+ // not wanted, change after this call as needed
processor2d::BaseProcessor2D* pContentProcessor = processor2d::createPixelProcessor2DFromOutputDevice(
maContent,
aViewInformation2D);
@@ -101,21 +105,29 @@ namespace drawinglayer
maContent.EnableMapMode(false);
const Bitmap aContent(maContent.GetBitmap(aEmptyPoint, aSizePixel));
+#ifdef DBG_UTIL
+ if(bDoSaveForVisualControl)
+ {
+ SvFileStream aNew((const String&)String(ByteString( "c:\\test_content.png" ), RTL_TEXTENCODING_UTF8), STREAM_WRITE|STREAM_TRUNC);
+ ::vcl::PNGWriter aPNGWriter(aContent);
+ aPNGWriter.Write(aNew);
+ }
+#endif
// prepare for mask creation
maContent.SetMapMode(aMapModePixel);
- maContent.SetAntialiasing(true);
// set alpha to all white (fully transparent)
maContent.Erase();
// embed primitives to paint them black
+ static basegfx::BColorModifyMode aMode = basegfx::BCOLORMODIFYMODE_REPLACE;
const primitive2d::Primitive2DReference xRef(
new primitive2d::ModifiedColorPrimitive2D(
aSequence,
basegfx::BColorModifier(
basegfx::BColor(0.0, 0.0, 0.0),
0.5,
- basegfx::BCOLORMODIFYMODE_REPLACE)));
+ aMode)));
const primitive2d::Primitive2DSequence xSeq(&xRef, 1);
// render
@@ -124,22 +136,28 @@ namespace drawinglayer
// get alpha cahannel from vdev
maContent.EnableMapMode(false);
- const AlphaMask aAlphaMask(maContent.GetBitmap(aEmptyPoint, aSizePixel));
+ const Bitmap aAlpha(maContent.GetBitmap(aEmptyPoint, aSizePixel));
+#ifdef DBG_UTIL
+ if(bDoSaveForVisualControl)
+ {
+ SvFileStream aNew((const String&)String(ByteString( "c:\\test_alpha.png" ), RTL_TEXTENCODING_UTF8), STREAM_WRITE|STREAM_TRUNC);
+ ::vcl::PNGWriter aPNGWriter(aAlpha);
+ aPNGWriter.Write(aNew);
+ }
+#endif
// create BitmapEx result
- aRetval = BitmapEx(aContent, aAlphaMask);
- }
- }
-
+ aRetval = BitmapEx(aContent, AlphaMask(aAlpha));
#ifdef DBG_UTIL
- static bool bDoSaveForVisualControl(false);
- if(bDoSaveForVisualControl)
- {
- SvFileStream aNew((const String&)String(ByteString( "c:\\test.png" ), RTL_TEXTENCODING_UTF8), STREAM_WRITE|STREAM_TRUNC);
- ::vcl::PNGWriter aPNGWriter(aRetval);
- aPNGWriter.Write(aNew);
- }
+ if(bDoSaveForVisualControl)
+ {
+ SvFileStream aNew((const String&)String(ByteString( "c:\\test_combined.png" ), RTL_TEXTENCODING_UTF8), STREAM_WRITE|STREAM_TRUNC);
+ ::vcl::PNGWriter aPNGWriter(aRetval);
+ aPNGWriter.Write(aNew);
+ }
#endif
+ }
+ }
return aRetval;
}
More information about the Libreoffice-commits
mailing list