diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-08-19 22:28:19 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-08-19 22:28:19 +0000 |
| commit | f6a0667514d6a8776c53c7ec20d0ec2c2527cea6 (patch) | |
| tree | 16397b4cedf8acedf89596bab9e11074d21e347f /svx | |
| parent | 39bd08518cafbe271771d18c0d8fddf02381fff9 (diff) | |
INTEGRATION: CWS aw033 (1.7.30); FILE MERGED
2008/05/27 14:50:04 aw 1.7.30.3: #i39532# changes DEV300 m12 resync corrections
2008/05/14 14:05:20 aw 1.7.30.2: RESYNC: (1.7-1.8); FILE MERGED
2008/01/29 10:27:34 aw 1.7.30.1: updated refresh for ActionChanged(), diverse removals
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/svdraw/svdtxhdl.hxx | 37 |
1 files changed, 2 insertions, 35 deletions
diff --git a/svx/source/svdraw/svdtxhdl.hxx b/svx/source/svdraw/svdtxhdl.hxx index a562a21c701e..82fd38519171 100644 --- a/svx/source/svdraw/svdtxhdl.hxx +++ b/svx/source/svdraw/svdtxhdl.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: svdtxhdl.hxx,v $ - * $Revision: 1.8 $ + * $Revision: 1.9 $ * * This file is part of OpenOffice.org. * @@ -31,9 +31,7 @@ #ifndef _SVDTXHDL_HXX #define _SVDTXHDL_HXX -#ifndef _VIRDEV_HXX //autogen #include <vcl/virdev.hxx> -#endif #include <tools/poly.hxx> #include <tools/link.hxx> @@ -46,7 +44,6 @@ class DrawPortionInfo; class SdrTextObj; class SdrObjGroup; class SdrModel; -class XOutputDevice; //************************************************************ // ImpTextPortionHandler @@ -55,49 +52,19 @@ class XOutputDevice; class ImpTextPortionHandler { VirtualDevice aVDev; - Rectangle aFormTextBoundRect; SdrOutliner& rOutliner; const SdrTextObj& rTextObj; - XOutputDevice* pXOut; // Variablen fuer ConvertToPathObj SdrObjGroup* pGroup; - SdrModel* pModel; FASTBOOL bToPoly; - - // Variablen fuer DrawFitText - Point aPos; - Fraction aXFact; - Fraction aYFact; - - // Variablen fuer DrawTextToPath - ULONG nParagraph; - BOOL bToLastPoint; - bool bDraw; - void* mpRecordPortions; - -private: - // #101498# - void SortedAddFormTextRecordPortion(DrawPortionInfo* pInfo); - void DrawFormTextRecordPortions(Polygon aPoly); - void ClearFormTextRecordPortions(); - sal_uInt32 GetFormTextPortionsLength(OutputDevice* pOut); + Rectangle maTextRect; public: ImpTextPortionHandler(SdrOutliner& rOutln, const SdrTextObj& rTxtObj); - void ConvertToPathObj(SdrObjGroup& rGroup, FASTBOOL bToPoly); - void DrawFitText(XOutputDevice& rXOut, const Point& rPos, const Fraction& rXFact); - void DrawTextToPath(XOutputDevice& rXOut, FASTBOOL bDrawEffect=TRUE); - - // wird von DrawTextToPath() gesetzt: - const Rectangle& GetFormTextBoundRect() { return aFormTextBoundRect; } DECL_LINK(ConvertHdl,DrawPortionInfo*); - DECL_LINK(FitTextDrawHdl,DrawPortionInfo*); - - // #101498# - DECL_LINK(FormTextRecordPortionHdl, DrawPortionInfo*); }; //////////////////////////////////////////////////////////////////////////////////////////////////// |