From 61f8216ce426cae9b214c41e85327254757ca067 Mon Sep 17 00:00:00 2001 From: Jens-Heiner Rechtien Date: Tue, 3 Feb 2004 11:40:18 +0000 Subject: INTEGRATION: CWS calcrtl (1.6.2.1.16); FILE MERGED 2004/01/13 12:20:59 sab 1.6.2.1.16.6: RESYNC: (1.8-1.9); FILE MERGED 2003/11/27 11:15:05 nn 1.6.2.1.16.5: RESYNC: (1.7-1.8); FILE MERGED 2003/10/23 16:46:54 nn 1.6.2.1.16.4: #106948# horizontal alignment of rotated text 2003/08/14 19:19:35 nn 1.6.2.1.16.3: #106948# continue long text in both directions 2003/03/10 14:15:56 nn 1.6.2.1.16.2: RESYNC: (1.6.2.1-1.6.2.2); FILE MERGED 2003/03/10 14:00:18 nn 1.6.2.1.16.1: #106948# RTL layout flag, mirror width --- sc/source/ui/inc/output.hxx | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) (limited to 'sc/source/ui/inc/output.hxx') diff --git a/sc/source/ui/inc/output.hxx b/sc/source/ui/inc/output.hxx index 982b6936a0c3..36100a98e886 100644 --- a/sc/source/ui/inc/output.hxx +++ b/sc/source/ui/inc/output.hxx @@ -2,9 +2,9 @@ * * $RCSfile: output.hxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: vg $ $Date: 2003-12-16 13:13:10 $ + * last change: $Author: hr $ $Date: 2004-02-03 12:40:18 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -122,6 +122,7 @@ private: long nScrY; long nScrW; // Ausgabe Groesse (Pixel) long nScrH; + long nMirrorW; // Visible output width for mirroring (default: nScrW) USHORT nX1; // Start-/Endkoordinaten USHORT nY1; // ( incl. versteckte ) USHORT nX2; @@ -175,18 +176,24 @@ private: BOOL bAnyClipped; // intern BOOL bTabProtected; BYTE nTabTextDirection; // EEHorizontalTextDirection values + BOOL bLayoutRTL; - // private Methoden + // private methods BOOL GetMergeOrigin( USHORT nX, USHORT nY, USHORT nArrY, - USHORT& rOverX, USHORT& rOverY, - long& rVirtPosX, long& rVirtPosY, - BOOL bClipVirt, BOOL bVisRowChanged ); + USHORT& rOverX, USHORT& rOverY, BOOL bVisRowChanged ); BOOL IsEmptyCellText( RowInfo* pThisRowInfo, USHORT nX, USHORT nY ); void GetVisibleCell( USHORT nCol, USHORT nRow, USHORT nTab, ScBaseCell*& rpCell ); BOOL IsAvailable( USHORT nX, USHORT nY ); long GetAvailableWidth( USHORT nX, USHORT nY, long nNeeded ); + void GetOutputArea( USHORT nX, USHORT nArrY, long nPosX, long nPosY, + USHORT nCellX, USHORT nCellY, long nNeeded, + const ScPatternAttr& rPattern, + USHORT nHorJustify, BOOL bCellIsValue, + BOOL bBreak, BOOL bOverwrite, + Rectangle& rAlignRect, Rectangle& rClipRect, + BOOL& rLeftClip, BOOL& rRightClip ); void SetSyntaxColor( Font* pFont, ScBaseCell* pCell ); void SetEditSyntaxColor( EditEngine& rEngine, ScBaseCell* pCell ); @@ -229,6 +236,7 @@ public: void SetShowNullValues ( BOOL bSet = TRUE ); void SetShowFormulas ( BOOL bSet = TRUE ); void SetShowSpellErrors( BOOL bSet = TRUE ); + void SetMirrorWidth( long nNew ); long GetScrW() const { return nScrW; } long GetScrH() const { return nScrH; } -- cgit