summaryrefslogtreecommitdiff
path: root/sw/inc/tblafmt.hxx
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2004-08-02 16:16:16 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2004-08-02 16:16:16 +0000
commit58545e7040d6c7992720a75cc9ec612ea55f45b1 (patch)
tree2a642334ea8c633ca8f34fe713e04c0f8cf2a5a1 /sw/inc/tblafmt.hxx
parent96ffb4231ee119202442756657448fffad6833c5 (diff)
INTEGRATION: CWS dr14 (1.3.508); FILE MERGED
2004/03/15 13:07:46 dr 1.3.508.2: #i23675# diagonal borders step 6: AutoFormats support diagonal frame lines 2003/12/18 13:26:55 dr 1.3.508.1: #i22640# SvxOrientationItem replaced by SfxBoolItem for stacked state
Diffstat (limited to 'sw/inc/tblafmt.hxx')
-rw-r--r--sw/inc/tblafmt.hxx18
1 files changed, 15 insertions, 3 deletions
diff --git a/sw/inc/tblafmt.hxx b/sw/inc/tblafmt.hxx
index 23204df5a9..8065418218 100644
--- a/sw/inc/tblafmt.hxx
+++ b/sw/inc/tblafmt.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: tblafmt.hxx,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: dr $ $Date: 2001-11-14 15:05:57 $
+ * last change: $Author: hr $ $Date: 2004-08-02 17:16:16 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -89,6 +89,9 @@ JP 20.07.95:
#define ITEMID_VERJUSTIFY 0
#define ITEMID_ORIENTATION 0
#define ITEMID_MARGIN 0
+#ifndef ITEMID_LINE
+#define ITEMID_LINE 0
+#endif
#ifndef _SVX_ALGITEM_HXX //autogen
#include <svx/algitem.hxx>
@@ -135,6 +138,9 @@ JP 20.07.95:
#ifndef _SFXINTITEM_HXX //autogen
#include <svtools/intitem.hxx>
#endif
+#ifndef _SVX_BOLNITEM_HXX
+#include <svx/bolnitem.hxx>
+#endif
struct SwAfVersions;
@@ -165,6 +171,8 @@ class SwBoxAutoFmt
SvxShadowedItem aShadowed;
SvxColorItem aColor;
SvxBoxItem aBox;
+ SvxLineItem aTLBR;
+ SvxLineItem aBLTR;
SvxBrushItem aBackground;
// Writer specific
@@ -173,7 +181,7 @@ class SwBoxAutoFmt
// Calc specific
SvxHorJustifyItem aHorJustify;
SvxVerJustifyItem aVerJustify;
- SvxOrientationItem aOrientation;
+ SfxBoolItem aStacked;
SvxMarginItem aMargin;
SfxBoolItem aLinebreak;
SfxInt32Item aRotateAngle;
@@ -211,6 +219,8 @@ public:
const SvxColorItem &GetColor() const { return aColor; }
const SvxAdjustItem &GetAdjust() const { return aAdjust; }
const SvxBoxItem &GetBox() const { return aBox; }
+ const SvxLineItem &GetTLBR() const { return aTLBR; }
+ const SvxLineItem &GetBLTR() const { return aBLTR; }
const SvxBrushItem &GetBackground() const { return aBackground; }
void GetValueFormat( String& rFmt, LanguageType& rLng, LanguageType& rSys ) const
{ rFmt = sNumFmtString; rLng = eNumFmtLanguage; rSys = eSysLanguage; }
@@ -240,6 +250,8 @@ public:
aAdjust.SetLastBlock( rNew.GetLastBlock() );
}
void SetBox( const SvxBoxItem& rNew ) { aBox = rNew; }
+ void SetTLBR( const SvxLineItem& rNew ) { aTLBR = rNew; }
+ void SetBLTR( const SvxLineItem& rNew ) { aBLTR = rNew; }
void SetBackground( const SvxBrushItem& rNew ) { aBackground = rNew; }
void SetValueFormat( const String& rFmt, LanguageType eLng, LanguageType eSys )
{ sNumFmtString = rFmt; eNumFmtLanguage = eLng; eSysLanguage = eSys; }