diff options
| author | Armin Weiss <aw@openoffice.org> | 2000-12-13 14:05:15 +0000 |
|---|---|---|
| committer | Armin Weiss <aw@openoffice.org> | 2000-12-13 14:05:15 +0000 |
| commit | b5e6750b4886776f2526bdf3b295a987d0f19e95 (patch) | |
| tree | 1b82b30e8ec36cb81cac165e69aafa893d10b172 /svx | |
| parent | 29264a179404b2a186e5ddc93349631764b988fe (diff) | |
#78478# if FontWork and outline for it is activated the LineStyle needs to
be set, too
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/svdraw/svdotext.cxx | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx index 5686d29a1f79..f1eab55556e2 100644 --- a/svx/source/svdraw/svdotext.cxx +++ b/svx/source/svdraw/svdotext.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svdotext.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: cl $ $Date: 2000-12-07 19:54:41 $ + * last change: $Author: aw $ $Date: 2000-12-13 15:05:15 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -108,6 +108,10 @@ #endif #include "flditem.hxx" +#ifndef _SVX_XFTOUIT_HXX +#include "xftouit.hxx" +#endif + //////////////////////////////////////////////////////////////////////////////////////////////////// // // @@@@@@ @@@@@ @@ @@ @@@@@@ @@@@ @@@@@ @@@@@@ @@ -1017,7 +1021,16 @@ FASTBOOL SdrTextObj::Paint(ExtOutputDevice& rXOut, const SdrPaintInfoRec& rInfoR //-/ const SfxItemSet& rSet = GetItemSet(); //-/ XTextAttrSetItem aTextSetItem(rSet.GetPool()); //-/ aTextSetItem.GetItemSet().Put(rSet); - rXOut.SetTextAttr(GetItemSet()); + + // #78478# to have the outline color in XOutputDevice::ImpDrawFormText(...) + // SetLineAttr(...) needs to be called if the outline item is set + const SfxItemSet& rSet = GetItemSet(); + BOOL bFormTextOutline = ((XFormTextOutlineItem&)(rSet.Get(XATTR_FORMTXTOUTLINE))).GetValue(); + + if(bFormTextOutline) + rXOut.SetLineAttr(rSet); + + rXOut.SetTextAttr(rSet); aTPHandler.DrawTextToPath(rXOut); // drucken bei aktivem Textedit fehlt hier rOutliner.Clear(); |