diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-08-14 15:42:17 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-08-14 15:42:17 +0000 |
| commit | 200adc1944a1eee235ce68114aba93ae88b2bdda (patch) | |
| tree | fec18a913c5c3841d3464783e18444634f5c2868 /sw/source/core/text/porrst.hxx | |
| parent | a95676f923e03a104afc739ff4479c869792b29b (diff) | |
INTEGRATION: CWS writercorehandoff (1.15.658); FILE MERGED
2005/12/20 15:15:43 tra 1.15.658.4: RESYNC: (1.16-1.17); FILE MERGED
2005/09/13 14:35:43 tra 1.15.658.3: RESYNC: (1.15-1.16); FILE MERGED
2005/06/07 14:14:25 fme 1.15.658.2: #i50348# General cleanup - removed unused header files, functions, members, declarations etc.
2005/06/06 09:28:04 tra 1.15.658.1: Unnecessary includes removed #i50348#
Diffstat (limited to 'sw/source/core/text/porrst.hxx')
| -rw-r--r-- | sw/source/core/text/porrst.hxx | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/sw/source/core/text/porrst.hxx b/sw/source/core/text/porrst.hxx index 8f1f9100f250..719fa9e83a56 100644 --- a/sw/source/core/text/porrst.hxx +++ b/sw/source/core/text/porrst.hxx @@ -4,9 +4,9 @@ * * $RCSfile: porrst.hxx,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: obo $ $Date: 2005-11-16 09:31:27 $ + * last change: $Author: hr $ $Date: 2006-08-14 16:42:17 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -34,18 +34,11 @@ ************************************************************************/ #ifndef _PORRST_HXX #define _PORRST_HXX - -#ifndef _SVARRAY_HXX //autogen -#include <svtools/svarray.hxx> -#endif - #include "porlay.hxx" #include "porexp.hxx" -#ifdef VERTICAL_LAYOUT #define LINE_BREAK_WIDTH 150 #define SPECIAL_FONT_HEIGHT 200 -#endif class SwTxtFormatInfo; @@ -90,14 +83,10 @@ class SwKernPortion : public SwLinePortion { short nKern; sal_Bool bBackground; - -#ifdef VERTICAL_LAYOUT sal_Bool bGridKern; -#endif public: -#ifdef VERTICAL_LAYOUT // This constructor automatically appends the portion to rPortion // bBG indicates, that the background of the kerning portion has to // be painted, e.g., if the portion if positioned between to fields. @@ -109,10 +98,6 @@ public: // This constructor only sets the height and ascent to the values // of rPortion. It is only used for kerning portions for grid mode SwKernPortion( const SwLinePortion &rPortion ); -#else - SwKernPortion( SwLinePortion &rPortion, short nKrn, - sal_Bool bBG = sal_False ); -#endif virtual void FormatEOL( SwTxtFormatInfo &rInf ); virtual void Paint( const SwTxtPaintInfo &rInf ) const; |