diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-01-05 17:49:45 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-01-05 17:49:45 +0000 |
commit | 305c3ee0d0b4c49de8e8829a99da9a17063363a9 (patch) | |
tree | 31475d884750470a1d91b565b1e2ce5631508af1 /svx/sdi | |
parent | 6195d275cb60575aa320bab64e10a52994b40e7b (diff) |
CWS-TOOLING: integrate CWS overline3
2008-12-11 15:24:46 +0100 fredrikh r265314 : i97099
2008-12-11 15:20:37 +0100 fredrikh r265313 : i97099
2008-12-11 15:18:00 +0100 fredrikh r265312 : i97099
2008-12-11 15:17:00 +0100 fredrikh r265311 : i97099
2008-12-11 15:13:20 +0100 fredrikh r265309 : i97144
2008-12-11 15:06:24 +0100 fredrikh r265306 : i97099
2008-11-24 10:41:42 +0100 fme r264213 : #i5991# Overline support
2008-11-24 10:39:53 +0100 fme r264212 : #i5991# Overline support
2008-11-24 10:02:13 +0100 fme r264209 : #5991# Overline support
2008-11-24 10:01:26 +0100 fme r264208 : #5991# Overline support
2008-11-24 09:59:11 +0100 fme r264207 : #5991# Overline support
2008-11-24 09:57:11 +0100 fme r264206 : #5991# Overline support
2008-11-14 10:36:44 +0100 fme r263667 : CWS-TOOLING: rebase CWS overline3 to trunk@263288 (milestone: DEV300:m35)
2008-11-13 16:12:13 +0100 fme r263649 : #i5991# migrate CWS overline3 to SVN.
Diffstat (limited to 'svx/sdi')
-rw-r--r-- | svx/sdi/fmslots.sdi | 7 | ||||
-rw-r--r-- | svx/sdi/svx.sdi | 29 | ||||
-rw-r--r-- | svx/sdi/svxitems.sdi | 12 |
3 files changed, 40 insertions, 8 deletions
diff --git a/svx/sdi/fmslots.sdi b/svx/sdi/fmslots.sdi index f43d6fb6644d..f372c6ad5e4b 100644 --- a/svx/sdi/fmslots.sdi +++ b/svx/sdi/fmslots.sdi @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: fmslots.sdi,v $ - * $Revision: 1.16 $ + * $Revision: 1.15.212.2 $ * * This file is part of OpenOffice.org. * @@ -420,6 +420,11 @@ interface FormTextAttributeShell ExecMethod = ExecuteTextAttribute; StateMethod = GetTextAttributeState; ] + SID_ATTR_CHAR_OVERLINE + [ + ExecMethod = ExecuteTextAttribute; + StateMethod = GetTextAttributeState; + ] SID_ATTR_CHAR_WEIGHT [ ExecMethod = ExecuteTextAttribute; diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi index 30bae65cc655..91f326e862b0 100644 --- a/svx/sdi/svx.sdi +++ b/svx/sdi/svx.sdi @@ -10996,7 +10996,34 @@ SfxVoidItem TwainTransfer SID_TWAIN_TRANSFER ] //-------------------------------------------------------------------------- -SvxUnderlineItem Underline SID_ATTR_CHAR_UNDERLINE +SvxTextLineItem Underline SID_ATTR_CHAR_UNDERLINE + +[ + /* flags: */ + AutoUpdate = TRUE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = FALSE, + ReadOnlyDoc = FALSE, + Toggle = TRUE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + Synchron; + + Readonly = FALSE, + + /* config: */ + AccelConfig = TRUE, + MenuConfig = TRUE, + StatusBarConfig = FALSE, + ToolBoxConfig = TRUE, + GroupId = GID_FORMAT; +] + +//-------------------------------------------------------------------------- +SvxTextLineItem Overline SID_ATTR_CHAR_OVERLINE [ /* flags: */ diff --git a/svx/sdi/svxitems.sdi b/svx/sdi/svxitems.sdi index 4b811dee5321..795f2aea1177 100644 --- a/svx/sdi/svxitems.sdi +++ b/svx/sdi/svxitems.sdi @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: svxitems.sdi,v $ - * $Revision: 1.32 $ + * $Revision: 1.32.212.1 $ * * This file is part of OpenOffice.org. * @@ -426,13 +426,13 @@ struct SvxCrossedOut }; item SvxCrossedOut SvxCrossedOutItem; -struct SvxUnderline +struct SvxTextLine { - FontUnderline Underline MID_UNDERLINE; - BOOL HasColor MID_UL_HASCOLOR; - INT32 Color MID_UL_COLOR; + FontUnderline LineStyle MID_TL_STYLE; + BOOL HasColor MID_TL_HASCOLOR; + INT32 Color MID_TL_COLOR; }; -item SvxUnderline SvxUnderlineItem; +item SvxTextLine SvxTextLineItem; struct SvxBrush { |