diff options
27 files changed, 297 insertions, 162 deletions
diff --git a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx index 5bd85ffa4d81..a6f20f53fcf3 100644 --- a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx @@ -171,7 +171,7 @@ void CharacterPropertyItemConverter::FillSpecialItem( uno::Any aValue( GetPropertySet()->getPropertyValue( C2U( "CharUnderline" ))); if( aValue.hasValue()) { - aItem.PutValue( aValue, MID_UNDERLINE ); + aItem.PutValue( aValue, MID_TL_STYLE ); bModified = true; } @@ -179,14 +179,14 @@ void CharacterPropertyItemConverter::FillSpecialItem( if( aValue.hasValue() && ( *reinterpret_cast< const sal_Bool * >( aValue.getValue()) != sal_False )) { - aItem.PutValue( aValue, MID_UL_HASCOLOR ); + aItem.PutValue( aValue, MID_TL_HASCOLOR ); bModified = true; } aValue = GetPropertySet()->getPropertyValue( C2U( "CharUnderlineColor" )); if( aValue.hasValue()) { - aItem.PutValue( aValue, MID_UL_COLOR ); + aItem.PutValue( aValue, MID_TL_COLOR ); bModified = true; } @@ -365,7 +365,7 @@ bool CharacterPropertyItemConverter::ApplySpecialItem( static_cast< const SvxUnderlineItem & >( rItemSet.Get( nWhichId )); - if( rItem.QueryValue( aValue, MID_UNDERLINE )) + if( rItem.QueryValue( aValue, MID_TL_STYLE )) { if( aValue != GetPropertySet()->getPropertyValue( C2U( "CharUnderline" ) )) { @@ -374,7 +374,7 @@ bool CharacterPropertyItemConverter::ApplySpecialItem( } } - if( rItem.QueryValue( aValue, MID_UL_COLOR )) + if( rItem.QueryValue( aValue, MID_TL_COLOR )) { if( aValue != GetPropertySet()->getPropertyValue( C2U( "CharUnderlineColor" ) )) { @@ -383,7 +383,7 @@ bool CharacterPropertyItemConverter::ApplySpecialItem( } } - if( rItem.QueryValue( aValue, MID_UL_HASCOLOR )) + if( rItem.QueryValue( aValue, MID_TL_HASCOLOR )) { if( aValue != GetPropertySet()->getPropertyValue( C2U( "CharUnderlineHasColor" ) )) { diff --git a/sc/inc/autoform.hxx b/sc/inc/autoform.hxx index d5feb4840837..7171d8fe1cf4 100644 --- a/sc/inc/autoform.hxx +++ b/sc/inc/autoform.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: autoform.hxx,v $ - * $Revision: 1.8.32.3 $ + * $Revision: 1.8.144.1 $ * * This file is part of OpenOffice.org. * @@ -95,6 +95,7 @@ private: SvxPostureItem aCTLPosture; SvxUnderlineItem aUnderline; + SvxOverlineItem aOverline; SvxCrossedOutItem aCrossedOut; SvxContourItem aContour; SvxShadowedItem aShadowed; @@ -139,6 +140,7 @@ public: const SvxWeightItem& GetCTLWeight() const { return aCTLWeight; } const SvxPostureItem& GetCTLPosture() const { return aCTLPosture; } const SvxUnderlineItem& GetUnderline() const { return aUnderline; } + const SvxOverlineItem& GetOverline() const { return aOverline; } const SvxCrossedOutItem& GetCrossedOut() const { return aCrossedOut; } const SvxContourItem& GetContour() const { return aContour; } const SvxShadowedItem& GetShadowed() const { return aShadowed; } @@ -170,6 +172,7 @@ public: void SetCTLWeight( const SvxWeightItem& rCTLWeight ) { aCTLWeight = rCTLWeight; } void SetCTLPosture( const SvxPostureItem& rCTLPosture ) { aCTLPosture = rCTLPosture; } void SetUnderline( const SvxUnderlineItem& rUnderline ) { aUnderline = rUnderline; } + void SetOverline( const SvxOverlineItem& rOverline ) { aOverline = rOverline; } void SetCrossedOut( const SvxCrossedOutItem& rCrossedOut ) { aCrossedOut = rCrossedOut; } void SetContour( const SvxContourItem& rContour ) { aContour = rContour; } void SetShadowed( const SvxShadowedItem& rShadowed ) { aShadowed = rShadowed; } diff --git a/sc/inc/docpool.hxx b/sc/inc/docpool.hxx index 64bfa3ad3ddc..e16ba2c7993b 100644 --- a/sc/inc/docpool.hxx +++ b/sc/inc/docpool.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: docpool.hxx,v $ - * $Revision: 1.10.32.1 $ + * $Revision: 1.10.144.1 $ * * This file is part of OpenOffice.org. * @@ -51,6 +51,7 @@ class ScDocumentPool: public SfxItemPool static USHORT* pVersionMap8; static USHORT* pVersionMap9; static USHORT* pVersionMap10; + static USHORT* pVersionMap11; public: ScDocumentPool( SfxItemPool* pSecPool = NULL, BOOL bLoadRefCounts = FALSE ); diff --git a/sc/inc/scitems.hxx b/sc/inc/scitems.hxx index 25b41945680c..51e5ccd457ba 100644 --- a/sc/inc/scitems.hxx +++ b/sc/inc/scitems.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: scitems.hxx,v $ - * $Revision: 1.12 $ + * $Revision: 1.12.144.1 $ * * This file is part of OpenOffice.org. * @@ -71,99 +71,100 @@ #define ATTR_FONT_WEIGHT 102 #define ATTR_FONT_POSTURE 103 #define ATTR_FONT_UNDERLINE 104 -#define ATTR_FONT_CROSSEDOUT 105 -#define ATTR_FONT_CONTOUR 106 -#define ATTR_FONT_SHADOWED 107 -#define ATTR_FONT_COLOR 108 -#define ATTR_FONT_LANGUAGE 109 -#define ATTR_CJK_FONT 110 -#define ATTR_CJK_FONT_HEIGHT 111 -#define ATTR_CJK_FONT_WEIGHT 112 -#define ATTR_CJK_FONT_POSTURE 113 -#define ATTR_CJK_FONT_LANGUAGE 114 -#define ATTR_CTL_FONT 115 -#define ATTR_CTL_FONT_HEIGHT 116 -#define ATTR_CTL_FONT_WEIGHT 117 -#define ATTR_CTL_FONT_POSTURE 118 -#define ATTR_CTL_FONT_LANGUAGE 119 -#define ATTR_FONT_EMPHASISMARK 120 -#define ATTR_USERDEF 121 // not saved in binary files -#define ATTR_FONT_WORDLINE 122 -#define ATTR_FONT_RELIEF 123 -#define ATTR_HYPHENATE 124 -#define ATTR_SCRIPTSPACE 125 -#define ATTR_HANGPUNCTUATION 126 -#define ATTR_FORBIDDEN_RULES 127 -#define ATTR_HOR_JUSTIFY 128 -#define ATTR_INDENT 129 -#define ATTR_VER_JUSTIFY 130 -#define ATTR_STACKED 131 -#define ATTR_ROTATE_VALUE 132 -#define ATTR_ROTATE_MODE 133 -#define ATTR_VERTICAL_ASIAN 134 -#define ATTR_WRITINGDIR 135 -#define ATTR_LINEBREAK 136 -#define ATTR_SHRINKTOFIT 137 -#define ATTR_BORDER_TLBR 138 -#define ATTR_BORDER_BLTR 139 -#define ATTR_MARGIN 140 -#define ATTR_MERGE 141 -#define ATTR_MERGE_FLAG 142 -#define ATTR_VALUE_FORMAT 143 -#define ATTR_LANGUAGE_FORMAT 144 -#define ATTR_BACKGROUND 145 -#define ATTR_PROTECTION 146 -#define ATTR_BORDER 147 -#define ATTR_BORDER_INNER 148 // innen, wg. Vorlagen-EditDialog -#define ATTR_SHADOW 149 -#define ATTR_VALIDDATA 150 -#define ATTR_CONDITIONAL 151 - -#define ATTR_PATTERN_END 151 // Ende Zellattribut-Pattern - -#define ATTR_PATTERN 152 +#define ATTR_FONT_OVERLINE 105 +#define ATTR_FONT_CROSSEDOUT 106 +#define ATTR_FONT_CONTOUR 107 +#define ATTR_FONT_SHADOWED 108 +#define ATTR_FONT_COLOR 109 +#define ATTR_FONT_LANGUAGE 110 +#define ATTR_CJK_FONT 111 +#define ATTR_CJK_FONT_HEIGHT 112 +#define ATTR_CJK_FONT_WEIGHT 113 +#define ATTR_CJK_FONT_POSTURE 114 +#define ATTR_CJK_FONT_LANGUAGE 115 +#define ATTR_CTL_FONT 116 +#define ATTR_CTL_FONT_HEIGHT 117 +#define ATTR_CTL_FONT_WEIGHT 118 +#define ATTR_CTL_FONT_POSTURE 119 +#define ATTR_CTL_FONT_LANGUAGE 120 +#define ATTR_FONT_EMPHASISMARK 121 +#define ATTR_USERDEF 122 // not saved in binary files +#define ATTR_FONT_WORDLINE 123 +#define ATTR_FONT_RELIEF 124 +#define ATTR_HYPHENATE 125 +#define ATTR_SCRIPTSPACE 126 +#define ATTR_HANGPUNCTUATION 127 +#define ATTR_FORBIDDEN_RULES 128 +#define ATTR_HOR_JUSTIFY 129 +#define ATTR_INDENT 130 +#define ATTR_VER_JUSTIFY 131 +#define ATTR_STACKED 132 +#define ATTR_ROTATE_VALUE 133 +#define ATTR_ROTATE_MODE 134 +#define ATTR_VERTICAL_ASIAN 135 +#define ATTR_WRITINGDIR 136 +#define ATTR_LINEBREAK 137 +#define ATTR_SHRINKTOFIT 138 +#define ATTR_BORDER_TLBR 139 +#define ATTR_BORDER_BLTR 140 +#define ATTR_MARGIN 141 +#define ATTR_MERGE 142 +#define ATTR_MERGE_FLAG 143 +#define ATTR_VALUE_FORMAT 144 +#define ATTR_LANGUAGE_FORMAT 145 +#define ATTR_BACKGROUND 146 +#define ATTR_PROTECTION 147 +#define ATTR_BORDER 148 +#define ATTR_BORDER_INNER 149 // innen, wg. Vorlagen-EditDialog +#define ATTR_SHADOW 150 +#define ATTR_VALIDDATA 151 +#define ATTR_CONDITIONAL 152 + +#define ATTR_PATTERN_END 152 // Ende Zellattribut-Pattern + +#define ATTR_PATTERN 153 // Seitenattribute -#define ATTR_LRSPACE 153 // Editor: PageDesc-TabPage -#define ATTR_ULSPACE 154 -#define ATTR_PAGE 155 -#define ATTR_PAGE_PAPERTRAY 156 -#define ATTR_PAGE_PAPERBIN 157 -#define ATTR_PAGE_SIZE 158 -#define ATTR_PAGE_MAXSIZE 159 -#define ATTR_PAGE_HORCENTER 160 -#define ATTR_PAGE_VERCENTER 161 - -#define ATTR_PAGE_ON 162 // Editor: Header/Footer-Page -#define ATTR_PAGE_DYNAMIC 163 -#define ATTR_PAGE_SHARED 164 - -#define ATTR_PAGE_NOTES 165 // Editor: Tabelle -#define ATTR_PAGE_GRID 166 -#define ATTR_PAGE_HEADERS 167 -#define ATTR_PAGE_CHARTS 168 -#define ATTR_PAGE_OBJECTS 169 -#define ATTR_PAGE_DRAWINGS 170 -#define ATTR_PAGE_TOPDOWN 171 -#define ATTR_PAGE_SCALE 172 -#define ATTR_PAGE_SCALETOPAGES 173 -#define ATTR_PAGE_FIRSTPAGENO 174 - -#define ATTR_PAGE_PRINTAREA 175 // Editor: Druckbereiche -#define ATTR_PAGE_REPEATROW 176 -#define ATTR_PAGE_REPEATCOL 177 -#define ATTR_PAGE_PRINTTABLES 178 - -#define ATTR_PAGE_HEADERLEFT 179 // Inhalte der Kopf-/ -#define ATTR_PAGE_FOOTERLEFT 180 // Fusszeilen (links) -#define ATTR_PAGE_HEADERRIGHT 181 // Inhalte der Kopf-/ -#define ATTR_PAGE_FOOTERRIGHT 182 // Fusszeilen (rechts) -#define ATTR_PAGE_HEADERSET 183 // die Sets dazu... -#define ATTR_PAGE_FOOTERSET 184 - -#define ATTR_PAGE_FORMULAS 185 -#define ATTR_PAGE_NULLVALS 186 - -#define ATTR_PAGE_SCALETO 187 // #i8868# scale printout to with/height +#define ATTR_LRSPACE 154 // Editor: PageDesc-TabPage +#define ATTR_ULSPACE 155 +#define ATTR_PAGE 156 +#define ATTR_PAGE_PAPERTRAY 157 +#define ATTR_PAGE_PAPERBIN 158 +#define ATTR_PAGE_SIZE 159 +#define ATTR_PAGE_MAXSIZE 160 +#define ATTR_PAGE_HORCENTER 161 +#define ATTR_PAGE_VERCENTER 162 + +#define ATTR_PAGE_ON 163 // Editor: Header/Footer-Page +#define ATTR_PAGE_DYNAMIC 164 +#define ATTR_PAGE_SHARED 165 + +#define ATTR_PAGE_NOTES 166 // Editor: Tabelle +#define ATTR_PAGE_GRID 167 +#define ATTR_PAGE_HEADERS 168 +#define ATTR_PAGE_CHARTS 169 +#define ATTR_PAGE_OBJECTS 170 +#define ATTR_PAGE_DRAWINGS 171 +#define ATTR_PAGE_TOPDOWN 172 +#define ATTR_PAGE_SCALE 173 +#define ATTR_PAGE_SCALETOPAGES 174 +#define ATTR_PAGE_FIRSTPAGENO 175 + +#define ATTR_PAGE_PRINTAREA 176 // Editor: Druckbereiche +#define ATTR_PAGE_REPEATROW 177 +#define ATTR_PAGE_REPEATCOL 178 +#define ATTR_PAGE_PRINTTABLES 179 + +#define ATTR_PAGE_HEADERLEFT 180 // Inhalte der Kopf-/ +#define ATTR_PAGE_FOOTERLEFT 181 // Fusszeilen (links) +#define ATTR_PAGE_HEADERRIGHT 182 // Inhalte der Kopf-/ +#define ATTR_PAGE_FOOTERRIGHT 183 // Fusszeilen (rechts) +#define ATTR_PAGE_HEADERSET 184 // die Sets dazu... +#define ATTR_PAGE_FOOTERSET 185 + +#define ATTR_PAGE_FORMULAS 186 +#define ATTR_PAGE_NULLVALS 187 + +#define ATTR_PAGE_SCALETO 188 // #i8868# scale printout to with/height #define ATTR_ENDINDEX ATTR_PAGE_SCALETO // Ende Pool-Range diff --git a/sc/inc/unonames.hxx b/sc/inc/unonames.hxx index 24309245787c..78f25b0b39dd 100644 --- a/sc/inc/unonames.hxx +++ b/sc/inc/unonames.hxx @@ -62,6 +62,9 @@ #define SC_UNONAME_CUNDER "CharUnderline" #define SC_UNONAME_CUNDLCOL "CharUnderlineColor" #define SC_UNONAME_CUNDLHAS "CharUnderlineHasColor" +#define SC_UNONAME_COVER "CharOverline" +#define SC_UNONAME_COVRLCOL "CharOverlineColor" +#define SC_UNONAME_COVRLHAS "CharOverlineHasColor" #define SC_UNONAME_CWEIGHT "CharWeight" #define SC_UNONAME_CPOST "CharPosture" #define SC_UNONAME_CCROSS "CharCrossedOut" diff --git a/sc/sdi/drtxtob.sdi b/sc/sdi/drtxtob.sdi index bd4af429343f..0d226895af4a 100644 --- a/sc/sdi/drtxtob.sdi +++ b/sc/sdi/drtxtob.sdi @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: drtxtob.sdi,v $ - * $Revision: 1.17 $ + * $Revision: 1.17.144.1 $ * * This file is part of OpenOffice.org. * @@ -80,6 +80,7 @@ interface TableDrawText SID_ULINE_VAL_DOUBLE [ ExecMethod = ExecuteToggle; StateMethod = GetAttrState; Export = FALSE; ] SID_ULINE_VAL_DOTTED [ ExecMethod = ExecuteToggle; StateMethod = GetAttrState; Export = FALSE; ] + SID_ATTR_CHAR_OVERLINE [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] SID_ATTR_CHAR_CONTOUR [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] SID_ATTR_CHAR_SHADOWED [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] SID_ATTR_CHAR_STRIKEOUT [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] diff --git a/sc/sdi/editsh.sdi b/sc/sdi/editsh.sdi index 075f008cc9d5..c8ad37208744 100644 --- a/sc/sdi/editsh.sdi +++ b/sc/sdi/editsh.sdi @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: editsh.sdi,v $ - * $Revision: 1.11 $ + * $Revision: 1.11.144.1 $ * * This file is part of OpenOffice.org. * @@ -69,6 +69,7 @@ interface TableText SID_ULINE_VAL_DOUBLE [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] SID_ULINE_VAL_DOTTED [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] + SID_ATTR_CHAR_OVERLINE [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] SID_ATTR_CHAR_STRIKEOUT [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] SID_ATTR_CHAR_SHADOWED [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] SID_ATTR_CHAR_CONTOUR [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; Export = FALSE; ] diff --git a/sc/sdi/formatsh.sdi b/sc/sdi/formatsh.sdi index c6a5f77b3597..ded414f0f6d6 100644 --- a/sc/sdi/formatsh.sdi +++ b/sc/sdi/formatsh.sdi @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: formatsh.sdi,v $ - * $Revision: 1.14 $ + * $Revision: 1.14.144.1 $ * * This file is part of OpenOffice.org. * @@ -94,6 +94,7 @@ interface FormatForSelection SID_SCATTR_PROTECTION [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; ] SID_BACKGROUND_COLOR [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; ] SID_ATTR_BRUSH [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; ] + SID_ATTR_CHAR_OVERLINE [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; ] SID_ATTR_CHAR_STRIKEOUT [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; ] SID_ATTR_CHAR_CONTOUR [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; ] SID_ATTR_CHAR_SHADOWED [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; ] diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx index 5ada25f0d041..ce98fcce8774 100644 --- a/sc/source/core/data/docpool.cxx +++ b/sc/source/core/data/docpool.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: docpool.cxx,v $ - * $Revision: 1.25.32.1 $ + * $Revision: 1.25.144.1 $ * * This file is part of OpenOffice.org. * @@ -94,6 +94,7 @@ USHORT* ScDocumentPool::pVersionMap7 = 0; USHORT* ScDocumentPool::pVersionMap8 = 0; USHORT* ScDocumentPool::pVersionMap9 = 0; USHORT* ScDocumentPool::pVersionMap10 = 0; +USHORT* ScDocumentPool::pVersionMap11 = 0; // ATTR_FONT_TWOLINES (not used) was changed to ATTR_USERDEF (not saved in binary format) in 641c @@ -104,6 +105,7 @@ static SfxItemInfo __READONLY_DATA aItemInfos[] = { SID_ATTR_CHAR_WEIGHT, SFX_ITEM_POOLABLE }, // ATTR_FONT_WEIGHT { SID_ATTR_CHAR_POSTURE, SFX_ITEM_POOLABLE }, // ATTR_FONT_POSTURE { SID_ATTR_CHAR_UNDERLINE, SFX_ITEM_POOLABLE }, // ATTR_FONT_UNDERLINE + { SID_ATTR_CHAR_OVERLINE, SFX_ITEM_POOLABLE }, // ATTR_FONT_OVERLINE { SID_ATTR_CHAR_STRIKEOUT, SFX_ITEM_POOLABLE }, // ATTR_FONT_CROSSEDOUT { SID_ATTR_CHAR_CONTOUR, SFX_ITEM_POOLABLE }, // ATTR_FONT_CONTOUR { SID_ATTR_CHAR_SHADOWED, SFX_ITEM_POOLABLE }, // ATTR_FONT_SHADOWED @@ -234,6 +236,7 @@ ScDocumentPool::ScDocumentPool( SfxItemPool* pSecPool, BOOL bLoadRefCounts ) ppPoolDefaults[ ATTR_FONT_WEIGHT - ATTR_STARTINDEX ] = new SvxWeightItem( WEIGHT_NORMAL, ATTR_FONT_WEIGHT ); ppPoolDefaults[ ATTR_FONT_POSTURE - ATTR_STARTINDEX ] = new SvxPostureItem( ITALIC_NONE, ATTR_FONT_POSTURE ); ppPoolDefaults[ ATTR_FONT_UNDERLINE - ATTR_STARTINDEX ] = new SvxUnderlineItem( UNDERLINE_NONE, ATTR_FONT_UNDERLINE ); + ppPoolDefaults[ ATTR_FONT_OVERLINE - ATTR_STARTINDEX ] = new SvxOverlineItem( UNDERLINE_NONE, ATTR_FONT_OVERLINE ); ppPoolDefaults[ ATTR_FONT_CROSSEDOUT - ATTR_STARTINDEX ] = new SvxCrossedOutItem( STRIKEOUT_NONE, ATTR_FONT_CROSSEDOUT ); ppPoolDefaults[ ATTR_FONT_CONTOUR - ATTR_STARTINDEX ] = new SvxContourItem( sal_False, ATTR_FONT_CONTOUR ); ppPoolDefaults[ ATTR_FONT_SHADOWED - ATTR_STARTINDEX ] = new SvxShadowedItem( sal_False, ATTR_FONT_SHADOWED ); @@ -365,8 +368,14 @@ ScDocumentPool::ScDocumentPool( SfxItemPool* pSecPool, BOOL bLoadRefCounts ) // ATTR_WRITINGDIR from 643y SetVersionMap( 9, 100, 182, pVersionMap9 ); + // ATTR_PAGE_SCALETO added in 680/sab008 + // new version map not required + // ATTR_SHRINKTOFIT, ATTR_BORDER_TL_BR, ATTR_BORDER_BL_TR added in 680/dr14 - SetVersionMap( 10, 100, 137, pVersionMap10 ); + SetVersionMap( 10, 100, 184, pVersionMap10 ); + + // ATTR_FONT_OVERLINE added in DEV300/overline2 + SetVersionMap( 11, 100, 187, pVersionMap11 ); } __EXPORT ScDocumentPool::~ScDocumentPool() @@ -389,7 +398,8 @@ void ScDocumentPool::InitVersionMaps() !pVersionMap3 && !pVersionMap4 && !pVersionMap5 && !pVersionMap6 && !pVersionMap7 && !pVersionMap8 && - !pVersionMap9 && !pVersionMap10, "InitVersionMaps call multiple times" ); + !pVersionMap9 && !pVersionMap10 && + !pVersionMap11, "InitVersionMaps call multiple times" ); // alte WhichId's mappen // nicht mit ATTR_* zaehlen, falls die sich nochmal aendern @@ -512,10 +522,12 @@ void ScDocumentPool::InitVersionMaps() for ( i=nMap9New, j=nMap9Start+nMap9New+1; i < nMap9Count; i++, j++ ) pVersionMap9[i] = j; + // ATTR_PAGE_SCALETO added in 680/sab008 + // 10th map: ATTR_SHRINKTOFIT, ATTR_BORDER_TL_BR, ATTR_BORDER_BL_TR added in 680/dr14 const USHORT nMap10Start = 100; // ATTR_STARTINDEX - const USHORT nMap10End = 185; // ATTR_ENDINDEX + const USHORT nMap10End = 184; // ATTR_ENDINDEX const USHORT nMap10Count = nMap10End - nMap10Start + 1; const USHORT nMap10New = 37; // ATTR_SHRINKTOFIT - ATTR_STARTINDEX pVersionMap10 = new USHORT [ nMap10Count ]; @@ -524,6 +536,19 @@ void ScDocumentPool::InitVersionMaps() // 3 entries inserted for ( i=nMap10New, j=nMap10Start+nMap10New+3; i < nMap10Count; i++, j++ ) pVersionMap10[i] = j; + + // 11th map: ATTR_FONT_OVERLINE added in DEV300/overline2 + + const USHORT nMap11Start = 100; // ATTR_STARTINDEX + const USHORT nMap11End = 187; // ATTR_ENDINDEX + const USHORT nMap11Count = nMap11End - nMap11Start + 1; + const USHORT nMap11New = 5; // ATTR_FONT_OVERLINE - ATTR_STARTINDEX + pVersionMap11 = new USHORT [ nMap11Count ]; + for ( i=0, j=nMap11Start; i < nMap11New; i++, j++ ) + pVersionMap11[i] = j; + // 1 entry inserted + for ( i=nMap11New, j=nMap11Start+nMap11New+1; i < nMap11Count; i++, j++ ) + pVersionMap11[i] = j; } void ScDocumentPool::DeleteVersionMaps() @@ -532,8 +557,11 @@ void ScDocumentPool::DeleteVersionMaps() pVersionMap3 && pVersionMap4 && pVersionMap5 && pVersionMap6 && pVersionMap7 && pVersionMap8 && - pVersionMap9 && pVersionMap10, "DeleteVersionMaps without maps" ); + pVersionMap9 && pVersionMap10 && + pVersionMap11, "DeleteVersionMaps without maps" ); + delete[] pVersionMap11; + pVersionMap11 = 0; delete[] pVersionMap10; pVersionMap10 = 0; delete[] pVersionMap9; diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx index 63709730cf28..9047fb31a018 100644 --- a/sc/source/core/data/global.cxx +++ b/sc/source/core/data/global.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: global.cxx,v $ - * $Revision: 1.55.30.2 $ + * $Revision: 1.56.118.1 $ * * This file is part of OpenOffice.org. * @@ -260,6 +260,7 @@ BOOL ScGlobal::CheckWidthInvalidate( BOOL& bNumFormatChanged, || HasAttrChanged( rNewAttrs, rOldAttrs, ATTR_CJK_FONT_POSTURE ) || HasAttrChanged( rNewAttrs, rOldAttrs, ATTR_CTL_FONT_POSTURE ) || HasAttrChanged( rNewAttrs, rOldAttrs, ATTR_FONT_UNDERLINE ) + || HasAttrChanged( rNewAttrs, rOldAttrs, ATTR_FONT_OVERLINE ) || HasAttrChanged( rNewAttrs, rOldAttrs, ATTR_FONT_CROSSEDOUT ) || HasAttrChanged( rNewAttrs, rOldAttrs, ATTR_FONT_CONTOUR ) || HasAttrChanged( rNewAttrs, rOldAttrs, ATTR_FONT_SHADOWED ) diff --git a/sc/source/core/data/patattr.cxx b/sc/source/core/data/patattr.cxx index aa75938777b2..5f2f3c1a4f6e 100644 --- a/sc/source/core/data/patattr.cxx +++ b/sc/source/core/data/patattr.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: patattr.cxx,v $ - * $Revision: 1.34.32.1 $ + * $Revision: 1.34.144.1 $ * * This file is part of OpenOffice.org. * @@ -250,6 +250,7 @@ void ScPatternAttr::GetFont( FontWeight eWeight; FontItalic eItalic; FontUnderline eUnder; + FontUnderline eOver; BOOL bWordLine; FontStrikeout eStrike; BOOL bOutline; @@ -305,6 +306,10 @@ void ScPatternAttr::GetFont( pItem = &rItemSet.Get( ATTR_FONT_UNDERLINE ); eUnder = (FontUnderline)((const SvxUnderlineItem*)pItem)->GetValue(); + if ( pCondSet->GetItemState( ATTR_FONT_OVERLINE, TRUE, &pItem ) != SFX_ITEM_SET ) + pItem = &rItemSet.Get( ATTR_FONT_OVERLINE ); + eOver = (FontUnderline)((const SvxOverlineItem*)pItem)->GetValue(); + if ( pCondSet->GetItemState( ATTR_FONT_WORDLINE, TRUE, &pItem ) != SFX_ITEM_SET ) pItem = &rItemSet.Get( ATTR_FONT_WORDLINE ); bWordLine = ((const SvxWordLineModeItem*)pItem)->GetValue(); @@ -344,6 +349,8 @@ void ScPatternAttr::GetFont( rItemSet.Get( nPostureId )).GetValue(); eUnder = (FontUnderline)((const SvxUnderlineItem&) rItemSet.Get( ATTR_FONT_UNDERLINE )).GetValue(); + eOver = (FontUnderline)((const SvxOverlineItem&) + rItemSet.Get( ATTR_FONT_OVERLINE )).GetValue(); bWordLine = ((const SvxWordLineModeItem&) rItemSet.Get( ATTR_FONT_WORDLINE )).GetValue(); eStrike = (FontStrikeout)((const SvxCrossedOutItem&) @@ -472,6 +479,7 @@ void ScPatternAttr::GetFont( rFont.SetWeight( eWeight ); rFont.SetItalic( eItalic ); rFont.SetUnderline( eUnder ); + rFont.SetOverline( eOver ); rFont.SetWordLineMode( bWordLine ); rFont.SetStrikeout( eStrike ); rFont.SetOutline( bOutline ); @@ -503,6 +511,7 @@ void ScPatternAttr::FillToEditItemSet( SfxItemSet& rEditSet, const SfxItemSet& r long nTHeight, nCjkTHeight, nCtlTHeight; // Twips FontWeight eWeight, eCjkWeight, eCtlWeight; SvxUnderlineItem aUnderlineItem(UNDERLINE_NONE, EE_CHAR_UNDERLINE); + SvxOverlineItem aOverlineItem(UNDERLINE_NONE, EE_CHAR_OVERLINE); BOOL bWordLine; FontStrikeout eStrike; FontItalic eItalic, eCjkItalic, eCtlItalic; @@ -569,6 +578,10 @@ void ScPatternAttr::FillToEditItemSet( SfxItemSet& rEditSet, const SfxItemSet& r pItem = &rSrcSet.Get( ATTR_FONT_UNDERLINE ); aUnderlineItem = *(const SvxUnderlineItem*)pItem; + if ( pCondSet->GetItemState( ATTR_FONT_OVERLINE, TRUE, &pItem ) != SFX_ITEM_SET ) + pItem = &rSrcSet.Get( ATTR_FONT_OVERLINE ); + aOverlineItem = *(const SvxOverlineItem*)pItem; + if ( pCondSet->GetItemState( ATTR_FONT_WORDLINE, TRUE, &pItem ) != SFX_ITEM_SET ) pItem = &rSrcSet.Get( ATTR_FONT_WORDLINE ); bWordLine = ((const SvxWordLineModeItem*)pItem)->GetValue(); @@ -639,6 +652,7 @@ void ScPatternAttr::FillToEditItemSet( SfxItemSet& rEditSet, const SfxItemSet& r eCtlItalic = (FontItalic)((const SvxPostureItem&) rSrcSet.Get( ATTR_CTL_FONT_POSTURE )).GetValue(); aUnderlineItem = (const SvxUnderlineItem&) rSrcSet.Get( ATTR_FONT_UNDERLINE ); + aOverlineItem = (const SvxOverlineItem&) rSrcSet.Get( ATTR_FONT_OVERLINE ); bWordLine = ((const SvxWordLineModeItem&) rSrcSet.Get( ATTR_FONT_WORDLINE )).GetValue(); eStrike = (FontStrikeout)((const SvxCrossedOutItem&) @@ -694,6 +708,7 @@ void ScPatternAttr::FillToEditItemSet( SfxItemSet& rEditSet, const SfxItemSet& r rEditSet.Put( SvxWeightItem ( eCjkWeight, EE_CHAR_WEIGHT_CJK ) ); rEditSet.Put( SvxWeightItem ( eCtlWeight, EE_CHAR_WEIGHT_CTL ) ); rEditSet.Put( aUnderlineItem ); + rEditSet.Put( aOverlineItem ); rEditSet.Put( SvxWordLineModeItem( bWordLine, EE_CHAR_WLM ) ); rEditSet.Put( SvxCrossedOutItem( eStrike, EE_CHAR_STRIKEOUT ) ); rEditSet.Put( SvxPostureItem ( eItalic, EE_CHAR_ITALIC ) ); @@ -759,9 +774,11 @@ void ScPatternAttr::GetFromEditItemSet( SfxItemSet& rDestSet, const SfxItemSet& rDestSet.Put( SvxWeightItem( (FontWeight)((const SvxWeightItem*)pItem)->GetValue(), ATTR_CTL_FONT_WEIGHT) ); - // SvxUnderlineItem contains enum and color + // SvxTextLineItem contains enum and color if (rEditSet.GetItemState(EE_CHAR_UNDERLINE,TRUE,&pItem) == SFX_ITEM_SET) rDestSet.Put( SvxUnderlineItem(UNDERLINE_NONE,ATTR_FONT_UNDERLINE) = *(const SvxUnderlineItem*)pItem ); + if (rEditSet.GetItemState(EE_CHAR_OVERLINE,TRUE,&pItem) == SFX_ITEM_SET) + rDestSet.Put( SvxOverlineItem(UNDERLINE_NONE,ATTR_FONT_OVERLINE) = *(const SvxOverlineItem*)pItem ); if (rEditSet.GetItemState(EE_CHAR_WLM,TRUE,&pItem) == SFX_ITEM_SET) rDestSet.Put( SvxWordLineModeItem( ((const SvxWordLineModeItem*)pItem)->GetValue(), ATTR_FONT_WORDLINE) ); diff --git a/sc/source/core/tool/autoform.cxx b/sc/source/core/tool/autoform.cxx index 58b4e80bf5b7..d584f13490b2 100644 --- a/sc/source/core/tool/autoform.cxx +++ b/sc/source/core/tool/autoform.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: autoform.cxx,v $ - * $Revision: 1.22.32.3 $ + * $Revision: 1.22.144.1 $ * * This file is part of OpenOffice.org. * @@ -88,9 +88,13 @@ const USHORT AUTOFORMAT_DATA_ID_680DR14 = 10012; const USHORT AUTOFORMAT_ID_680DR25 = 10021; const USHORT AUTOFORMAT_DATA_ID_680DR25 = 10022; +// --- from DEV300/overline2 on: #5991# overline support +const USHORT AUTOFORMAT_ID_300OVRLN = 10031; +const USHORT AUTOFORMAT_DATA_ID_300OVRLN = 10032; + // aktuelle Version -const USHORT AUTOFORMAT_ID = AUTOFORMAT_ID_680DR25; -const USHORT AUTOFORMAT_DATA_ID = AUTOFORMAT_DATA_ID_680DR25; +const USHORT AUTOFORMAT_ID = AUTOFORMAT_ID_300OVRLN; +const USHORT AUTOFORMAT_DATA_ID = AUTOFORMAT_DATA_ID_300OVRLN; #ifdef READ_OLDVERS @@ -110,6 +114,7 @@ public: USHORT nWeightVersion; USHORT nPostureVersion; USHORT nUnderlineVersion; + USHORT nOverlineVersion; USHORT nCrossedOutVersion; USHORT nContourVersion; USHORT nShadowedVersion; @@ -141,6 +146,7 @@ ScAfVersions::ScAfVersions() : nWeightVersion(0), nPostureVersion(0), nUnderlineVersion(0), + nOverlineVersion(0), nCrossedOutVersion(0), nContourVersion(0), nShadowedVersion(0), @@ -167,6 +173,8 @@ void ScAfVersions::Load( SvStream& rStream, USHORT nVer ) rStream >> nWeightVersion; rStream >> nPostureVersion; rStream >> nUnderlineVersion; + if ( nVer >= AUTOFORMAT_ID_300OVRLN ) + rStream >> nOverlineVersion; rStream >> nCrossedOutVersion; rStream >> nContourVersion; rStream >> nShadowedVersion; @@ -196,6 +204,7 @@ void ScAfVersions::Write(SvStream& rStream) rStream << SvxWeightItem(WEIGHT_NORMAL, ATTR_FONT_WEIGHT).GetVersion(SOFFICE_FILEFORMAT_40); rStream << SvxPostureItem(ITALIC_NONE, ATTR_FONT_POSTURE).GetVersion(SOFFICE_FILEFORMAT_40); rStream << SvxUnderlineItem(UNDERLINE_NONE, ATTR_FONT_UNDERLINE).GetVersion(SOFFICE_FILEFORMAT_40); + rStream << SvxOverlineItem(UNDERLINE_NONE, ATTR_FONT_OVERLINE).GetVersion(SOFFICE_FILEFORMAT_40); rStream << SvxCrossedOutItem(STRIKEOUT_NONE, ATTR_FONT_CROSSEDOUT).GetVersion(SOFFICE_FILEFORMAT_40); rStream << SvxContourItem(sal_False, ATTR_FONT_CONTOUR).GetVersion(SOFFICE_FILEFORMAT_40); rStream << SvxShadowedItem(sal_False, ATTR_FONT_SHADOWED).GetVersion(SOFFICE_FILEFORMAT_40); @@ -236,6 +245,7 @@ ScAutoFormatDataField::ScAutoFormatDataField() : aCTLPosture( ITALIC_NONE, ATTR_CTL_FONT_POSTURE ), aUnderline( UNDERLINE_NONE,ATTR_FONT_UNDERLINE ), + aOverline( UNDERLINE_NONE,ATTR_FONT_OVERLINE ), aCrossedOut( STRIKEOUT_NONE, ATTR_FONT_CROSSEDOUT ), aContour( sal_False, ATTR_FONT_CONTOUR ), aShadowed( sal_False, ATTR_FONT_SHADOWED ), @@ -268,6 +278,7 @@ ScAutoFormatDataField::ScAutoFormatDataField( const ScAutoFormatDataField& rCopy aCTLWeight( rCopy.aCTLWeight ), aCTLPosture( rCopy.aCTLPosture ), aUnderline( rCopy.aUnderline ), + aOverline( rCopy.aOverline ), aCrossedOut( rCopy.aCrossedOut ), aContour( rCopy.aContour ), aShadowed( rCopy.aShadowed ), @@ -326,6 +337,10 @@ BOOL ScAutoFormatDataField::Load( SvStream& rStream, const ScAfVersions& rVersio READ( aCTLPosture, SvxPostureItem, rVersions.nPostureVersion) } READ( aUnderline, SvxUnderlineItem, rVersions.nUnderlineVersion) + if ( nVer >= AUTOFORMAT_DATA_ID_300OVRLN ) + { + READ( aOverline, SvxOverlineItem, rVersions.nOverlineVersion) + } READ( aCrossedOut, SvxCrossedOutItem, rVersions.nCrossedOutVersion) READ( aContour, SvxContourItem, rVersions.nContourVersion) READ( aShadowed, SvxShadowedItem, rVersions.nShadowedVersion) @@ -436,6 +451,8 @@ BOOL ScAutoFormatDataField::Save( SvStream& rStream ) aCTLPosture.Store ( rStream, aCTLPosture.GetVersion( SOFFICE_FILEFORMAT_40 ) ); aUnderline.Store ( rStream, aUnderline.GetVersion( SOFFICE_FILEFORMAT_40 ) ); + // --- from DEV300/overline2 on: overline support + aOverline.Store ( rStream, aOverline.GetVersion( SOFFICE_FILEFORMAT_40 ) ); aCrossedOut.Store ( rStream, aCrossedOut.GetVersion( SOFFICE_FILEFORMAT_40 ) ); aContour.Store ( rStream, aContour.GetVersion( SOFFICE_FILEFORMAT_40 ) ); aShadowed.Store ( rStream, aShadowed.GetVersion( SOFFICE_FILEFORMAT_40 ) ); @@ -539,6 +556,7 @@ const SfxPoolItem* ScAutoFormatData::GetItem( USHORT nIndex, USHORT nWhich ) con case ATTR_CTL_FONT_WEIGHT: return &rField.GetCTLWeight(); case ATTR_CTL_FONT_POSTURE: return &rField.GetCTLPosture(); case ATTR_FONT_UNDERLINE: return &rField.GetUnderline(); + case ATTR_FONT_OVERLINE: return &rField.GetOverline(); case ATTR_FONT_CROSSEDOUT: return &rField.GetCrossedOut(); case ATTR_FONT_CONTOUR: return &rField.GetContour(); case ATTR_FONT_SHADOWED: return &rField.GetShadowed(); @@ -576,6 +594,7 @@ void ScAutoFormatData::PutItem( USHORT nIndex, const SfxPoolItem& rItem ) case ATTR_CTL_FONT_WEIGHT: rField.SetCTLWeight( (const SvxWeightItem&)rItem ); break; case ATTR_CTL_FONT_POSTURE: rField.SetCTLPosture( (const SvxPostureItem&)rItem ); break; case ATTR_FONT_UNDERLINE: rField.SetUnderline( (const SvxUnderlineItem&)rItem ); break; + case ATTR_FONT_OVERLINE: rField.SetOverline( (const SvxOverlineItem&)rItem ); break; case ATTR_FONT_CROSSEDOUT: rField.SetCrossedOut( (const SvxCrossedOutItem&)rItem ); break; case ATTR_FONT_CONTOUR: rField.SetContour( (const SvxContourItem&)rItem ); break; case ATTR_FONT_SHADOWED: rField.SetShadowed( (const SvxShadowedItem&)rItem ); break; @@ -633,6 +652,7 @@ BOOL ScAutoFormatData::IsEqualData( USHORT nIndex1, USHORT nIndex2 ) const && (rField1.GetCTLWeight() == rField2.GetCTLWeight()) && (rField1.GetCTLPosture() == rField2.GetCTLPosture()) && (rField1.GetUnderline() == rField2.GetUnderline()) + && (rField1.GetOverline() == rField2.GetOverline()) && (rField1.GetCrossedOut() == rField2.GetCrossedOut()) && (rField1.GetContour() == rField2.GetContour()) && (rField1.GetShadowed() == rField2.GetShadowed()) @@ -713,6 +733,7 @@ void ScAutoFormatData::FillToItemSet( USHORT nIndex, SfxItemSet& rItemSet, ScDoc rItemSet.Put( rField.GetPosture(), ATTR_CTL_FONT_POSTURE ); } rItemSet.Put( rField.GetUnderline() ); + rItemSet.Put( rField.GetOverline() ); rItemSet.Put( rField.GetCrossedOut() ); rItemSet.Put( rField.GetContour() ); rItemSet.Put( rField.GetShadowed() ); @@ -756,6 +777,7 @@ void ScAutoFormatData::GetFromItemSet( USHORT nIndex, const SfxItemSet& rItemSet rField.SetCTLWeight ( (const SvxWeightItem&) rItemSet.Get( ATTR_CTL_FONT_WEIGHT ) ); rField.SetCTLPosture ( (const SvxPostureItem&) rItemSet.Get( ATTR_CTL_FONT_POSTURE ) ); rField.SetUnderline ( (const SvxUnderlineItem&) rItemSet.Get( ATTR_FONT_UNDERLINE ) ); + rField.SetOverline ( (const SvxOverlineItem&) rItemSet.Get( ATTR_FONT_OVERLINE ) ); rField.SetCrossedOut ( (const SvxCrossedOutItem&) rItemSet.Get( ATTR_FONT_CROSSEDOUT ) ); rField.SetContour ( (const SvxContourItem&) rItemSet.Get( ATTR_FONT_CONTOUR ) ); rField.SetShadowed ( (const SvxShadowedItem&) rItemSet.Get( ATTR_FONT_SHADOWED ) ); diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx index 35c3f104458f..bbad9e6c0751 100644 --- a/sc/source/filter/html/htmlexp.cxx +++ b/sc/source/filter/html/htmlexp.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: htmlexp.cxx,v $ - * $Revision: 1.38 $ + * $Revision: 1.38.144.1 $ * * This file is part of OpenOffice.org. * @@ -993,7 +993,7 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab ) BOOL bBold = ( WEIGHT_BOLD <= rWeightItem.GetWeight() ); BOOL bItalic = ( ITALIC_NONE != rPostureItem.GetPosture() ); - BOOL bUnderline = ( UNDERLINE_NONE != rUnderlineItem.GetUnderline() ); + BOOL bUnderline = ( UNDERLINE_NONE != rUnderlineItem.GetLineStyle() ); BOOL bSetFontColor = ( COL_AUTO != rColorItem.GetValue().GetColor() ); // #97650# default is AUTO now #if 0 // keine StyleSheet-Fontangaben: hart fuer jede Zelle diff --git a/sc/source/filter/rtf/rtfexp.cxx b/sc/source/filter/rtf/rtfexp.cxx index 6b243e707977..8fd9cd116402 100644 --- a/sc/source/filter/rtf/rtfexp.cxx +++ b/sc/source/filter/rtf/rtfexp.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: rtfexp.cxx,v $ - * $Revision: 1.10 $ + * $Revision: 1.10.144.1 $ * * This file is part of OpenOffice.org. * @@ -289,7 +289,7 @@ void ScRTFExport::WriteCell( SCTAB nTab, SCROW nRow, SCCOL nCol ) bResetAttr = TRUE; rStrm << sRTF_I; } - if ( rUnderlineItem.GetUnderline() != UNDERLINE_NONE ) + if ( rUnderlineItem.GetLineStyle() != UNDERLINE_NONE ) { // underline bResetAttr = TRUE; rStrm << sRTF_UL; diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx index ac69e2883193..a3fa86abd00d 100644 --- a/sc/source/ui/drawfunc/drtxtob.cxx +++ b/sc/source/ui/drawfunc/drtxtob.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: drtxtob.cxx,v $ - * $Revision: 1.34 $ + * $Revision: 1.34.144.1 $ * * This file is part of OpenOffice.org. * @@ -521,7 +521,7 @@ void __EXPORT ScDrawTextObjectBar::ExecuteToggle( SfxRequest &rReq ) // Unterstreichung FontUnderline eOld = ((const SvxUnderlineItem&) aViewAttr. - Get(EE_CHAR_UNDERLINE)).GetUnderline(); + Get(EE_CHAR_UNDERLINE)).GetLineStyle(); FontUnderline eNew = eOld; switch (nSlot) { @@ -681,6 +681,10 @@ void __EXPORT ScDrawTextObjectBar::ExecuteAttr( SfxRequest &rReq ) aNewAttr.Put( (const SvxUnderlineItem&)aEditAttr.Get( EE_CHAR_UNDERLINE ) ); break; + case SID_ATTR_CHAR_OVERLINE: + aNewAttr.Put( (const SvxOverlineItem&)aEditAttr.Get( EE_CHAR_OVERLINE ) ); + break; + case SID_ATTR_CHAR_CONTOUR: aNewAttr.Put( (const SvxContourItem&)aEditAttr.Get( EE_CHAR_OUTLINE ) ); break; @@ -927,7 +931,7 @@ void __EXPORT ScDrawTextObjectBar::GetAttrState( SfxItemSet& rDestSet ) else { FontUnderline eUnderline = ((const SvxUnderlineItem&) - aAttrSet.Get(EE_CHAR_UNDERLINE)).GetUnderline(); + aAttrSet.Get(EE_CHAR_UNDERLINE)).GetLineStyle(); USHORT nId = SID_ULINE_VAL_NONE; switch (eUnderline) { diff --git a/sc/source/ui/drawfunc/futext.cxx b/sc/source/ui/drawfunc/futext.cxx index 83dc880758c7..5abb3f3b756c 100644 --- a/sc/source/ui/drawfunc/futext.cxx +++ b/sc/source/ui/drawfunc/futext.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: futext.cxx,v $ - * $Revision: 1.28 $ + * $Revision: 1.28.144.1 $ * * This file is part of OpenOffice.org. * @@ -71,6 +71,7 @@ void lcl_InvalidateAttribs( SfxBindings& rBindings ) rBindings.Invalidate( SID_ULINE_VAL_SINGLE ); rBindings.Invalidate( SID_ULINE_VAL_DOUBLE ); rBindings.Invalidate( SID_ULINE_VAL_DOTTED ); + rBindings.Invalidate( SID_ATTR_CHAR_OVERLINE ); rBindings.Invalidate( SID_ATTR_CHAR_COLOR ); rBindings.Invalidate( SID_ATTR_CHAR_FONT ); rBindings.Invalidate( SID_ATTR_CHAR_FONTHEIGHT ); diff --git a/sc/source/ui/drawfunc/objdraw.src b/sc/source/ui/drawfunc/objdraw.src index 9c9bced042e3..1f3a374fc34a 100644 --- a/sc/source/ui/drawfunc/objdraw.src +++ b/sc/source/ui/drawfunc/objdraw.src @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: objdraw.src,v $ - * $Revision: 1.72 $ + * $Revision: 1.72.144.1 $ * * This file is part of OpenOffice.org. * @@ -65,6 +65,10 @@ };\ MenuItem\ {\ + ITEM_FORMAT_ATTR_CHAR_OVERLINE\ + };\ + MenuItem\ + {\ ITEM_FORMAT_ATTR_CHAR_UNDERLINE\ };\ MenuItem\ diff --git a/sc/source/ui/miscdlgs/autofmt.cxx b/sc/source/ui/miscdlgs/autofmt.cxx index 2adc13be0713..54cd75c0b59f 100644 --- a/sc/source/ui/miscdlgs/autofmt.cxx +++ b/sc/source/ui/miscdlgs/autofmt.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: autofmt.cxx,v $ - * $Revision: 1.19 $ + * $Revision: 1.19.122.1 $ * * This file is part of OpenOffice.org. * @@ -556,6 +556,7 @@ void AutoFmtPreview::MakeFonts( USHORT nIndex, Font& rFont, Font& rCJKFont, Font const SvxWeightItem* pCTLWeightItem = (const SvxWeightItem*) pCurData->GetItem( nIndex, ATTR_CTL_FONT_WEIGHT ); const SvxPostureItem* pCTLPostureItem = (const SvxPostureItem*) pCurData->GetItem( nIndex, ATTR_CTL_FONT_POSTURE ); const SvxUnderlineItem* pUnderlineItem = (const SvxUnderlineItem*) pCurData->GetItem( nIndex, ATTR_FONT_UNDERLINE ); + const SvxOverlineItem* pOverlineItem = (const SvxOverlineItem*) pCurData->GetItem( nIndex, ATTR_FONT_OVERLINE ); const SvxCrossedOutItem* pCrossedOutItem = (const SvxCrossedOutItem*)pCurData->GetItem( nIndex, ATTR_FONT_CROSSEDOUT ); const SvxContourItem* pContourItem = (const SvxContourItem*) pCurData->GetItem( nIndex, ATTR_FONT_CONTOUR ); const SvxShadowedItem* pShadowedItem = (const SvxShadowedItem*) pCurData->GetItem( nIndex, ATTR_FONT_SHADOWED ); @@ -573,6 +574,7 @@ void AutoFmtPreview::MakeFonts( USHORT nIndex, Font& rFont, Font& rCJKFont, Font rFont.MethodName( Value ); rCJKFont.MethodName( Value ); rCTLFont.MethodName( Value ); SETONALLFONTS( SetUnderline, (FontUnderline)pUnderlineItem->GetValue() ) + SETONALLFONTS( SetOverline, (FontUnderline)pOverlineItem->GetValue() ) SETONALLFONTS( SetStrikeout, (FontStrikeout)pCrossedOutItem->GetValue() ) SETONALLFONTS( SetOutline, pContourItem->GetValue() ) SETONALLFONTS( SetShadow, pShadowedItem->GetValue() ) diff --git a/sc/source/ui/src/popup.src b/sc/source/ui/src/popup.src index 6ce799518bd3..f6e401b1f76d 100644 --- a/sc/source/ui/src/popup.src +++ b/sc/source/ui/src/popup.src @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: popup.src,v $ - * $Revision: 1.58.90.1 $ + * $Revision: 1.58.144.1 $ * * This file is part of OpenOffice.org. * @@ -321,6 +321,10 @@ Menu RID_POPUP_EDIT }; MenuItem { + ITEM_FORMAT_ATTR_CHAR_OVERLINE + }; + MenuItem + { ITEM_FORMAT_ATTR_CHAR_UNDERLINE }; MenuItem diff --git a/sc/source/ui/unoobj/afmtuno.cxx b/sc/source/ui/unoobj/afmtuno.cxx index d90999547098..7acaf77729ca 100644 --- a/sc/source/ui/unoobj/afmtuno.cxx +++ b/sc/source/ui/unoobj/afmtuno.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: afmtuno.cxx,v $ - * $Revision: 1.16 $ + * $Revision: 1.16.144.1 $ * * This file is part of OpenOffice.org. * @@ -130,12 +130,13 @@ const SfxItemPropertyMap* lcl_GetAutoFieldMap() {MAP_CHAR_LEN(SC_UNONAME_CHEIGHT), ATTR_FONT_HEIGHT, &::getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNO_CJK_CHEIGHT), ATTR_CJK_FONT_HEIGHT, &::getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, {MAP_CHAR_LEN(SC_UNO_CTL_CHEIGHT), ATTR_CTL_FONT_HEIGHT, &::getCppuType((float*)0), 0, MID_FONTHEIGHT | CONVERT_TWIPS }, + {MAP_CHAR_LEN(SC_UNONAME_COVER), ATTR_FONT_OVERLINE, &::getCppuType((const sal_Int16*)0), 0, MID_TL_STYLE }, {MAP_CHAR_LEN(SC_UNONAME_CPOST), ATTR_FONT_POSTURE, &::getCppuType((awt::FontSlant*)0), 0, MID_POSTURE }, {MAP_CHAR_LEN(SC_UNO_CJK_CPOST), ATTR_CJK_FONT_POSTURE, &::getCppuType((awt::FontSlant*)0), 0, MID_POSTURE }, {MAP_CHAR_LEN(SC_UNO_CTL_CPOST), ATTR_CTL_FONT_POSTURE, &::getCppuType((awt::FontSlant*)0), 0, MID_POSTURE }, {MAP_CHAR_LEN(SC_UNONAME_CSHADD), ATTR_FONT_SHADOWED, &::getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_TBLBORD), SC_WID_UNO_TBLBORD, &::getCppuType((table::TableBorder*)0), 0, 0 | CONVERT_TWIPS }, - {MAP_CHAR_LEN(SC_UNONAME_CUNDER), ATTR_FONT_UNDERLINE, &::getCppuType((const sal_Int16*)0), 0, MID_UNDERLINE }, + {MAP_CHAR_LEN(SC_UNONAME_CUNDER), ATTR_FONT_UNDERLINE, &::getCppuType((const sal_Int16*)0), 0, MID_TL_STYLE }, {MAP_CHAR_LEN(SC_UNONAME_CWEIGHT), ATTR_FONT_WEIGHT, &::getCppuType((float*)0), 0, MID_WEIGHT }, {MAP_CHAR_LEN(SC_UNO_CJK_CWEIGHT), ATTR_CJK_FONT_WEIGHT, &::getCppuType((float*)0), 0, MID_WEIGHT }, {MAP_CHAR_LEN(SC_UNO_CTL_CWEIGHT), ATTR_CTL_FONT_WEIGHT, &::getCppuType((float*)0), 0, MID_WEIGHT }, diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index 34764c2b66a8..e72d3ab7da26 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -191,15 +191,18 @@ const SfxItemPropertyMap* lcl_GetCellsPropertyMap() {MAP_CHAR_LEN(SC_UNONAME_CLOCAL), ATTR_FONT_LANGUAGE, &getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE }, {MAP_CHAR_LEN(SC_UNO_CJK_CLOCAL), ATTR_CJK_FONT_LANGUAGE,&getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE }, {MAP_CHAR_LEN(SC_UNO_CTL_CLOCAL), ATTR_CTL_FONT_LANGUAGE,&getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE }, + {MAP_CHAR_LEN(SC_UNONAME_COVER), ATTR_FONT_OVERLINE, &getCppuType((sal_Int16*)0), 0, MID_TL_STYLE }, + {MAP_CHAR_LEN(SC_UNONAME_COVRLCOL), ATTR_FONT_OVERLINE, &getCppuType((sal_Int32*)0), 0, MID_TL_COLOR }, + {MAP_CHAR_LEN(SC_UNONAME_COVRLHAS), ATTR_FONT_OVERLINE, &getBooleanCppuType(), 0, MID_TL_HASCOLOR }, {MAP_CHAR_LEN(SC_UNONAME_CPOST), ATTR_FONT_POSTURE, &getCppuType((awt::FontSlant*)0), 0, MID_POSTURE }, {MAP_CHAR_LEN(SC_UNO_CJK_CPOST), ATTR_CJK_FONT_POSTURE,&getCppuType((awt::FontSlant*)0), 0, MID_POSTURE }, {MAP_CHAR_LEN(SC_UNO_CTL_CPOST), ATTR_CTL_FONT_POSTURE,&getCppuType((awt::FontSlant*)0), 0, MID_POSTURE }, {MAP_CHAR_LEN(SC_UNONAME_CRELIEF), ATTR_FONT_RELIEF, &getCppuType((sal_Int16*)0), 0, MID_RELIEF }, {MAP_CHAR_LEN(SC_UNONAME_CSHADD), ATTR_FONT_SHADOWED, &getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_CSTRIKE), ATTR_FONT_CROSSEDOUT,&getCppuType((sal_Int16*)0), 0, MID_CROSS_OUT }, - {MAP_CHAR_LEN(SC_UNONAME_CUNDER), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int16*)0), 0, MID_UNDERLINE }, - {MAP_CHAR_LEN(SC_UNONAME_CUNDLCOL), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int32*)0), 0, MID_UL_COLOR }, - {MAP_CHAR_LEN(SC_UNONAME_CUNDLHAS), ATTR_FONT_UNDERLINE,&getBooleanCppuType(), 0, MID_UL_HASCOLOR }, + {MAP_CHAR_LEN(SC_UNONAME_CUNDER), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int16*)0), 0, MID_TL_STYLE }, + {MAP_CHAR_LEN(SC_UNONAME_CUNDLCOL), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int32*)0), 0, MID_TL_COLOR }, + {MAP_CHAR_LEN(SC_UNONAME_CUNDLHAS), ATTR_FONT_UNDERLINE,&getBooleanCppuType(), 0, MID_TL_HASCOLOR }, {MAP_CHAR_LEN(SC_UNONAME_CWEIGHT), ATTR_FONT_WEIGHT, &getCppuType((float*)0), 0, MID_WEIGHT }, {MAP_CHAR_LEN(SC_UNO_CJK_CWEIGHT), ATTR_CJK_FONT_WEIGHT,&getCppuType((float*)0), 0, MID_WEIGHT }, {MAP_CHAR_LEN(SC_UNO_CTL_CWEIGHT), ATTR_CTL_FONT_WEIGHT,&getCppuType((float*)0), 0, MID_WEIGHT }, @@ -286,15 +289,18 @@ const SfxItemPropertyMap* lcl_GetRangePropertyMap() {MAP_CHAR_LEN(SC_UNONAME_CLOCAL), ATTR_FONT_LANGUAGE, &getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE }, {MAP_CHAR_LEN(SC_UNO_CJK_CLOCAL), ATTR_CJK_FONT_LANGUAGE,&getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE }, {MAP_CHAR_LEN(SC_UNO_CTL_CLOCAL), ATTR_CTL_FONT_LANGUAGE,&getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE }, + {MAP_CHAR_LEN(SC_UNONAME_COVER), ATTR_FONT_OVERLINE, &getCppuType((sal_Int16*)0), 0, MID_TL_STYLE }, + {MAP_CHAR_LEN(SC_UNONAME_COVRLCOL), ATTR_FONT_OVERLINE, &getCppuType((sal_Int32*)0), 0, MID_TL_COLOR }, + {MAP_CHAR_LEN(SC_UNONAME_COVRLHAS), ATTR_FONT_OVERLINE, &getBooleanCppuType(), 0, MID_TL_HASCOLOR }, {MAP_CHAR_LEN(SC_UNONAME_CPOST), ATTR_FONT_POSTURE, &getCppuType((awt::FontSlant*)0), 0, MID_POSTURE }, {MAP_CHAR_LEN(SC_UNO_CJK_CPOST), ATTR_CJK_FONT_POSTURE,&getCppuType((awt::FontSlant*)0), 0, MID_POSTURE }, {MAP_CHAR_LEN(SC_UNO_CTL_CPOST), ATTR_CTL_FONT_POSTURE,&getCppuType((awt::FontSlant*)0), 0, MID_POSTURE }, {MAP_CHAR_LEN(SC_UNONAME_CRELIEF), ATTR_FONT_RELIEF, &getCppuType((sal_Int16*)0), 0, MID_RELIEF }, {MAP_CHAR_LEN(SC_UNONAME_CSHADD), ATTR_FONT_SHADOWED, &getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_CSTRIKE), ATTR_FONT_CROSSEDOUT,&getCppuType((sal_Int16*)0), 0, MID_CROSS_OUT }, - {MAP_CHAR_LEN(SC_UNONAME_CUNDER), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int16*)0), 0, MID_UNDERLINE }, - {MAP_CHAR_LEN(SC_UNONAME_CUNDLCOL), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int32*)0), 0, MID_UL_COLOR }, - {MAP_CHAR_LEN(SC_UNONAME_CUNDLHAS), ATTR_FONT_UNDERLINE,&getBooleanCppuType(), 0, MID_UL_HASCOLOR }, + {MAP_CHAR_LEN(SC_UNONAME_CUNDER), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int16*)0), 0, MID_TL_STYLE }, + {MAP_CHAR_LEN(SC_UNONAME_CUNDLCOL), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int32*)0), 0, MID_TL_COLOR }, + {MAP_CHAR_LEN(SC_UNONAME_CUNDLHAS), ATTR_FONT_UNDERLINE,&getBooleanCppuType(), 0, MID_TL_HASCOLOR }, {MAP_CHAR_LEN(SC_UNONAME_CWEIGHT), ATTR_FONT_WEIGHT, &getCppuType((float*)0), 0, MID_WEIGHT }, {MAP_CHAR_LEN(SC_UNO_CJK_CWEIGHT), ATTR_CJK_FONT_WEIGHT,&getCppuType((float*)0), 0, MID_WEIGHT }, {MAP_CHAR_LEN(SC_UNO_CTL_CWEIGHT), ATTR_CTL_FONT_WEIGHT,&getCppuType((float*)0), 0, MID_WEIGHT }, @@ -383,15 +389,18 @@ const SfxItemPropertyMap* lcl_GetCellPropertyMap() {MAP_CHAR_LEN(SC_UNONAME_CLOCAL), ATTR_FONT_LANGUAGE, &getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE }, {MAP_CHAR_LEN(SC_UNO_CJK_CLOCAL), ATTR_CJK_FONT_LANGUAGE,&getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE }, {MAP_CHAR_LEN(SC_UNO_CTL_CLOCAL), ATTR_CTL_FONT_LANGUAGE,&getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE }, + {MAP_CHAR_LEN(SC_UNONAME_COVER), ATTR_FONT_OVERLINE, &getCppuType((sal_Int16*)0), 0, MID_TL_STYLE }, + {MAP_CHAR_LEN(SC_UNONAME_COVRLCOL), ATTR_FONT_OVERLINE, &getCppuType((sal_Int32*)0), 0, MID_TL_COLOR }, + {MAP_CHAR_LEN(SC_UNONAME_COVRLHAS), ATTR_FONT_OVERLINE, &getBooleanCppuType(), 0, MID_TL_HASCOLOR }, {MAP_CHAR_LEN(SC_UNONAME_CPOST), ATTR_FONT_POSTURE, &getCppuType((awt::FontSlant*)0), 0, MID_POSTURE }, {MAP_CHAR_LEN(SC_UNO_CJK_CPOST), ATTR_CJK_FONT_POSTURE,&getCppuType((awt::FontSlant*)0), 0, MID_POSTURE }, {MAP_CHAR_LEN(SC_UNO_CTL_CPOST), ATTR_CTL_FONT_POSTURE,&getCppuType((awt::FontSlant*)0), 0, MID_POSTURE }, {MAP_CHAR_LEN(SC_UNONAME_CRELIEF), ATTR_FONT_RELIEF, &getCppuType((sal_Int16*)0), 0, MID_RELIEF }, {MAP_CHAR_LEN(SC_UNONAME_CSHADD), ATTR_FONT_SHADOWED, &getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_CSTRIKE), ATTR_FONT_CROSSEDOUT,&getCppuType((sal_Int16*)0), 0, MID_CROSS_OUT }, - {MAP_CHAR_LEN(SC_UNONAME_CUNDER), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int16*)0), 0, MID_UNDERLINE }, - {MAP_CHAR_LEN(SC_UNONAME_CUNDLCOL), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int32*)0), 0, MID_UL_COLOR }, - {MAP_CHAR_LEN(SC_UNONAME_CUNDLHAS), ATTR_FONT_UNDERLINE,&getBooleanCppuType(), 0, MID_UL_HASCOLOR }, + {MAP_CHAR_LEN(SC_UNONAME_CUNDER), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int16*)0), 0, MID_TL_STYLE }, + {MAP_CHAR_LEN(SC_UNONAME_CUNDLCOL), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int32*)0), 0, MID_TL_COLOR }, + {MAP_CHAR_LEN(SC_UNONAME_CUNDLHAS), ATTR_FONT_UNDERLINE,&getBooleanCppuType(), 0, MID_TL_HASCOLOR }, {MAP_CHAR_LEN(SC_UNONAME_CWEIGHT), ATTR_FONT_WEIGHT, &getCppuType((float*)0), 0, MID_WEIGHT }, {MAP_CHAR_LEN(SC_UNO_CJK_CWEIGHT), ATTR_CJK_FONT_WEIGHT,&getCppuType((float*)0), 0, MID_WEIGHT }, {MAP_CHAR_LEN(SC_UNO_CTL_CWEIGHT), ATTR_CTL_FONT_WEIGHT,&getCppuType((float*)0), 0, MID_WEIGHT }, @@ -482,15 +491,18 @@ const SfxItemPropertyMap* lcl_GetColumnPropertyMap() {MAP_CHAR_LEN(SC_UNONAME_CLOCAL), ATTR_FONT_LANGUAGE, &getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE }, {MAP_CHAR_LEN(SC_UNO_CJK_CLOCAL), ATTR_CJK_FONT_LANGUAGE,&getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE }, {MAP_CHAR_LEN(SC_UNO_CTL_CLOCAL), ATTR_CTL_FONT_LANGUAGE,&getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE }, + {MAP_CHAR_LEN(SC_UNONAME_COVER), ATTR_FONT_OVERLINE, &getCppuType((sal_Int16*)0), 0, MID_TL_STYLE }, + {MAP_CHAR_LEN(SC_UNONAME_COVRLCOL), ATTR_FONT_OVERLINE, &getCppuType((sal_Int32*)0), 0, MID_TL_COLOR }, + {MAP_CHAR_LEN(SC_UNONAME_COVRLHAS), ATTR_FONT_OVERLINE, &getBooleanCppuType(), 0, MID_TL_HASCOLOR }, {MAP_CHAR_LEN(SC_UNONAME_CPOST), ATTR_FONT_POSTURE, &getCppuType((awt::FontSlant*)0), 0, MID_POSTURE }, {MAP_CHAR_LEN(SC_UNO_CJK_CPOST), ATTR_CJK_FONT_POSTURE,&getCppuType((awt::FontSlant*)0), 0, MID_POSTURE }, {MAP_CHAR_LEN(SC_UNO_CTL_CPOST), ATTR_CTL_FONT_POSTURE,&getCppuType((awt::FontSlant*)0), 0, MID_POSTURE }, {MAP_CHAR_LEN(SC_UNONAME_CRELIEF), ATTR_FONT_RELIEF, &getCppuType((sal_Int16*)0), 0, MID_RELIEF }, {MAP_CHAR_LEN(SC_UNONAME_CSHADD), ATTR_FONT_SHADOWED, &getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_CSTRIKE), ATTR_FONT_CROSSEDOUT,&getCppuType((sal_Int16*)0), 0, MID_CROSS_OUT }, - {MAP_CHAR_LEN(SC_UNONAME_CUNDER), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int16*)0), 0, MID_UNDERLINE }, - {MAP_CHAR_LEN(SC_UNONAME_CUNDLCOL), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int32*)0), 0, MID_UL_COLOR }, - {MAP_CHAR_LEN(SC_UNONAME_CUNDLHAS), ATTR_FONT_UNDERLINE,&getBooleanCppuType(), 0, MID_UL_HASCOLOR }, + {MAP_CHAR_LEN(SC_UNONAME_CUNDER), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int16*)0), 0, MID_TL_STYLE }, + {MAP_CHAR_LEN(SC_UNONAME_CUNDLCOL), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int32*)0), 0, MID_TL_COLOR }, + {MAP_CHAR_LEN(SC_UNONAME_CUNDLHAS), ATTR_FONT_UNDERLINE,&getBooleanCppuType(), 0, MID_TL_HASCOLOR }, {MAP_CHAR_LEN(SC_UNONAME_CWEIGHT), ATTR_FONT_WEIGHT, &getCppuType((float*)0), 0, MID_WEIGHT }, {MAP_CHAR_LEN(SC_UNO_CJK_CWEIGHT), ATTR_CJK_FONT_WEIGHT,&getCppuType((float*)0), 0, MID_WEIGHT }, {MAP_CHAR_LEN(SC_UNO_CTL_CWEIGHT), ATTR_CTL_FONT_WEIGHT,&getCppuType((float*)0), 0, MID_WEIGHT }, @@ -582,15 +594,18 @@ const SfxItemPropertyMap* lcl_GetRowPropertyMap() {MAP_CHAR_LEN(SC_UNONAME_CLOCAL), ATTR_FONT_LANGUAGE, &getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE }, {MAP_CHAR_LEN(SC_UNO_CJK_CLOCAL), ATTR_CJK_FONT_LANGUAGE,&getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE }, {MAP_CHAR_LEN(SC_UNO_CTL_CLOCAL), ATTR_CTL_FONT_LANGUAGE,&getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE }, + {MAP_CHAR_LEN(SC_UNONAME_COVER), ATTR_FONT_OVERLINE, &getCppuType((sal_Int16*)0), 0, MID_TL_STYLE }, + {MAP_CHAR_LEN(SC_UNONAME_COVRLCOL), ATTR_FONT_OVERLINE, &getCppuType((sal_Int32*)0), 0, MID_TL_COLOR }, + {MAP_CHAR_LEN(SC_UNONAME_COVRLHAS), ATTR_FONT_OVERLINE, &getBooleanCppuType(), 0, MID_TL_HASCOLOR }, {MAP_CHAR_LEN(SC_UNONAME_CPOST), ATTR_FONT_POSTURE, &getCppuType((awt::FontSlant*)0), 0, MID_POSTURE }, {MAP_CHAR_LEN(SC_UNO_CJK_CPOST), ATTR_CJK_FONT_POSTURE,&getCppuType((awt::FontSlant*)0), 0, MID_POSTURE }, {MAP_CHAR_LEN(SC_UNO_CTL_CPOST), ATTR_CTL_FONT_POSTURE,&getCppuType((awt::FontSlant*)0), 0, MID_POSTURE }, {MAP_CHAR_LEN(SC_UNONAME_CRELIEF), ATTR_FONT_RELIEF, &getCppuType((sal_Int16*)0), 0, MID_RELIEF }, {MAP_CHAR_LEN(SC_UNONAME_CSHADD), ATTR_FONT_SHADOWED, &getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_CSTRIKE), ATTR_FONT_CROSSEDOUT,&getCppuType((sal_Int16*)0), 0, MID_CROSS_OUT }, - {MAP_CHAR_LEN(SC_UNONAME_CUNDER), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int16*)0), 0, MID_UNDERLINE }, - {MAP_CHAR_LEN(SC_UNONAME_CUNDLCOL), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int32*)0), 0, MID_UL_COLOR }, - {MAP_CHAR_LEN(SC_UNONAME_CUNDLHAS), ATTR_FONT_UNDERLINE,&getBooleanCppuType(), 0, MID_UL_HASCOLOR }, + {MAP_CHAR_LEN(SC_UNONAME_CUNDER), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int16*)0), 0, MID_TL_STYLE }, + {MAP_CHAR_LEN(SC_UNONAME_CUNDLCOL), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int32*)0), 0, MID_TL_COLOR }, + {MAP_CHAR_LEN(SC_UNONAME_CUNDLHAS), ATTR_FONT_UNDERLINE,&getBooleanCppuType(), 0, MID_TL_HASCOLOR }, {MAP_CHAR_LEN(SC_UNONAME_CWEIGHT), ATTR_FONT_WEIGHT, &getCppuType((float*)0), 0, MID_WEIGHT }, {MAP_CHAR_LEN(SC_UNO_CJK_CWEIGHT), ATTR_CJK_FONT_WEIGHT,&getCppuType((float*)0), 0, MID_WEIGHT }, {MAP_CHAR_LEN(SC_UNO_CTL_CWEIGHT), ATTR_CTL_FONT_WEIGHT,&getCppuType((float*)0), 0, MID_WEIGHT }, @@ -684,15 +699,18 @@ const SfxItemPropertyMap* lcl_GetSheetPropertyMap() {MAP_CHAR_LEN(SC_UNONAME_CLOCAL), ATTR_FONT_LANGUAGE, &getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE }, {MAP_CHAR_LEN(SC_UNO_CJK_CLOCAL), ATTR_CJK_FONT_LANGUAGE,&getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE }, {MAP_CHAR_LEN(SC_UNO_CTL_CLOCAL), ATTR_CTL_FONT_LANGUAGE,&getCppuType((lang::Locale*)0), 0, MID_LANG_LOCALE }, + {MAP_CHAR_LEN(SC_UNONAME_COVER), ATTR_FONT_OVERLINE, &getCppuType((sal_Int16*)0), 0, MID_TL_STYLE }, + {MAP_CHAR_LEN(SC_UNONAME_COVRLCOL), ATTR_FONT_OVERLINE, &getCppuType((sal_Int32*)0), 0, MID_TL_COLOR }, + {MAP_CHAR_LEN(SC_UNONAME_COVRLHAS), ATTR_FONT_OVERLINE, &getBooleanCppuType(), 0, MID_TL_HASCOLOR }, {MAP_CHAR_LEN(SC_UNONAME_CPOST), ATTR_FONT_POSTURE, &getCppuType((awt::FontSlant*)0), 0, MID_POSTURE }, {MAP_CHAR_LEN(SC_UNO_CJK_CPOST), ATTR_CJK_FONT_POSTURE,&getCppuType((awt::FontSlant*)0), 0, MID_POSTURE }, {MAP_CHAR_LEN(SC_UNO_CTL_CPOST), ATTR_CTL_FONT_POSTURE,&getCppuType((awt::FontSlant*)0), 0, MID_POSTURE }, {MAP_CHAR_LEN(SC_UNONAME_CRELIEF), ATTR_FONT_RELIEF, &getCppuType((sal_Int16*)0), 0, MID_RELIEF }, {MAP_CHAR_LEN(SC_UNONAME_CSHADD), ATTR_FONT_SHADOWED, &getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_CSTRIKE), ATTR_FONT_CROSSEDOUT,&getCppuType((sal_Int16*)0), 0, MID_CROSS_OUT }, - {MAP_CHAR_LEN(SC_UNONAME_CUNDER), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int16*)0), 0, MID_UNDERLINE }, - {MAP_CHAR_LEN(SC_UNONAME_CUNDLCOL), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int32*)0), 0, MID_UL_COLOR }, - {MAP_CHAR_LEN(SC_UNONAME_CUNDLHAS), ATTR_FONT_UNDERLINE,&getBooleanCppuType(), 0, MID_UL_HASCOLOR }, + {MAP_CHAR_LEN(SC_UNONAME_CUNDER), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int16*)0), 0, MID_TL_STYLE }, + {MAP_CHAR_LEN(SC_UNONAME_CUNDLCOL), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int32*)0), 0, MID_TL_COLOR }, + {MAP_CHAR_LEN(SC_UNONAME_CUNDLHAS), ATTR_FONT_UNDERLINE,&getBooleanCppuType(), 0, MID_TL_HASCOLOR }, {MAP_CHAR_LEN(SC_UNONAME_CWEIGHT), ATTR_FONT_WEIGHT, &getCppuType((float*)0), 0, MID_WEIGHT }, {MAP_CHAR_LEN(SC_UNO_CJK_CWEIGHT), ATTR_CJK_FONT_WEIGHT,&getCppuType((float*)0), 0, MID_WEIGHT }, {MAP_CHAR_LEN(SC_UNO_CTL_CWEIGHT), ATTR_CTL_FONT_WEIGHT,&getCppuType((float*)0), 0, MID_WEIGHT }, diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx index 8942b3a103cb..6786234067fb 100644 --- a/sc/source/ui/unoobj/styleuno.cxx +++ b/sc/source/ui/unoobj/styleuno.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: styleuno.cxx,v $ - * $Revision: 1.43.32.3 $ + * $Revision: 1.44.72.1 $ * * This file is part of OpenOffice.org. * @@ -117,15 +117,18 @@ const SfxItemPropertyMap* lcl_GetCellStyleMap() {MAP_CHAR_LEN(SC_UNONAME_CLOCAL), ATTR_FONT_LANGUAGE, &::getCppuType((const lang::Locale*)0), 0, MID_LANG_LOCALE }, {MAP_CHAR_LEN(SC_UNO_CJK_CLOCAL), ATTR_CJK_FONT_LANGUAGE,&::getCppuType((const lang::Locale*)0), 0, MID_LANG_LOCALE }, {MAP_CHAR_LEN(SC_UNO_CTL_CLOCAL), ATTR_CTL_FONT_LANGUAGE,&::getCppuType((const lang::Locale*)0), 0, MID_LANG_LOCALE }, + {MAP_CHAR_LEN(SC_UNONAME_COVER), ATTR_FONT_OVERLINE, &::getCppuType((const sal_Int16*)0), 0, MID_TL_STYLE }, + {MAP_CHAR_LEN(SC_UNONAME_COVRLCOL), ATTR_FONT_OVERLINE, &getCppuType((sal_Int32*)0), 0, MID_TL_COLOR }, + {MAP_CHAR_LEN(SC_UNONAME_COVRLHAS), ATTR_FONT_OVERLINE, &getBooleanCppuType(), 0, MID_TL_HASCOLOR }, {MAP_CHAR_LEN(SC_UNONAME_CPOST), ATTR_FONT_POSTURE, &::getCppuType((const awt::FontSlant*)0), 0, MID_POSTURE }, {MAP_CHAR_LEN(SC_UNO_CJK_CPOST), ATTR_CJK_FONT_POSTURE,&::getCppuType((const awt::FontSlant*)0), 0, MID_POSTURE }, {MAP_CHAR_LEN(SC_UNO_CTL_CPOST), ATTR_CTL_FONT_POSTURE,&::getCppuType((const awt::FontSlant*)0), 0, MID_POSTURE }, {MAP_CHAR_LEN(SC_UNONAME_CRELIEF), ATTR_FONT_RELIEF, &getCppuType((sal_Int16*)0), 0, MID_RELIEF }, {MAP_CHAR_LEN(SC_UNONAME_CSHADD), ATTR_FONT_SHADOWED, &::getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNONAME_CSTRIKE), ATTR_FONT_CROSSEDOUT,&getCppuType((sal_Int16*)0), 0, MID_CROSS_OUT }, - {MAP_CHAR_LEN(SC_UNONAME_CUNDER), ATTR_FONT_UNDERLINE,&::getCppuType((const sal_Int16*)0), 0, MID_UNDERLINE }, - {MAP_CHAR_LEN(SC_UNONAME_CUNDLCOL), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int32*)0), 0, MID_UL_COLOR }, - {MAP_CHAR_LEN(SC_UNONAME_CUNDLHAS), ATTR_FONT_UNDERLINE,&getBooleanCppuType(), 0, MID_UL_HASCOLOR }, + {MAP_CHAR_LEN(SC_UNONAME_CUNDER), ATTR_FONT_UNDERLINE,&::getCppuType((const sal_Int16*)0), 0, MID_TL_STYLE }, + {MAP_CHAR_LEN(SC_UNONAME_CUNDLCOL), ATTR_FONT_UNDERLINE,&getCppuType((sal_Int32*)0), 0, MID_TL_COLOR }, + {MAP_CHAR_LEN(SC_UNONAME_CUNDLHAS), ATTR_FONT_UNDERLINE,&getBooleanCppuType(), 0, MID_TL_HASCOLOR }, {MAP_CHAR_LEN(SC_UNONAME_CWEIGHT), ATTR_FONT_WEIGHT, &::getCppuType((const float*)0), 0, MID_WEIGHT }, {MAP_CHAR_LEN(SC_UNO_CJK_CWEIGHT), ATTR_CJK_FONT_WEIGHT,&::getCppuType((const float*)0), 0, MID_WEIGHT }, {MAP_CHAR_LEN(SC_UNO_CTL_CWEIGHT), ATTR_CTL_FONT_WEIGHT,&::getCppuType((const float*)0), 0, MID_WEIGHT }, diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx index b1da55da179a..eebc01136186 100644 --- a/sc/source/ui/view/drawview.cxx +++ b/sc/source/ui/view/drawview.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: drawview.cxx,v $ - * $Revision: 1.51 $ + * $Revision: 1.50.142.2 $ * * This file is part of OpenOffice.org. * @@ -227,6 +227,7 @@ void ScDrawView::InvalidateDrawTextAttrs() rBindings.Invalidate( SID_ULINE_VAL_SINGLE ); rBindings.Invalidate( SID_ULINE_VAL_DOUBLE ); rBindings.Invalidate( SID_ULINE_VAL_DOTTED ); + rBindings.Invalidate( SID_ATTR_CHAR_OVERLINE ); rBindings.Invalidate( SID_ATTR_CHAR_COLOR ); rBindings.Invalidate( SID_ALIGNLEFT ); rBindings.Invalidate( SID_ALIGNCENTERHOR ); diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx index 8bd1fcfdf592..b5f93446b605 100644 --- a/sc/source/ui/view/editsh.cxx +++ b/sc/source/ui/view/editsh.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: editsh.cxx,v $ - * $Revision: 1.35 $ + * $Revision: 1.35.44.1 $ * * This file is part of OpenOffice.org. * @@ -844,7 +844,7 @@ void ScEditShell::ExecuteAttr(SfxRequest& rReq) case SID_ULINE_VAL_DOTTED: { FontUnderline eOld = ((const SvxUnderlineItem&) pEditView-> - GetAttribs().Get(EE_CHAR_UNDERLINE)).GetUnderline(); + GetAttribs().Get(EE_CHAR_UNDERLINE)).GetLineStyle(); FontUnderline eNew = eOld; switch (nSlot) { @@ -866,6 +866,16 @@ void ScEditShell::ExecuteAttr(SfxRequest& rReq) } break; + case SID_ATTR_CHAR_OVERLINE: + { + FontUnderline eOld = ((const SvxOverlineItem&) pEditView-> + GetAttribs().Get(EE_CHAR_OVERLINE)).GetLineStyle(); + FontUnderline eNew = ( eOld != UNDERLINE_NONE ) ? UNDERLINE_NONE : UNDERLINE_SINGLE; + aSet.Put( SvxOverlineItem( eNew, EE_CHAR_OVERLINE ) ); + rBindings.Invalidate( nSlot ); + } + break; + case SID_ATTR_CHAR_STRIKEOUT: { BOOL bOld = ((const SvxCrossedOutItem&)pEditView->GetAttribs(). @@ -982,7 +992,7 @@ void ScEditShell::GetAttrState(SfxItemSet &rSet) else { FontUnderline eUnderline = ((const SvxUnderlineItem&) - aAttribs.Get(EE_CHAR_UNDERLINE)).GetUnderline(); + aAttribs.Get(EE_CHAR_UNDERLINE)).GetLineStyle(); USHORT nId = SID_ULINE_VAL_NONE; switch (eUnderline) { diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx index 9af0be53a4c4..2215cbd4d1af 100644 --- a/sc/source/ui/view/formatsh.cxx +++ b/sc/source/ui/view/formatsh.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: formatsh.cxx,v $ - * $Revision: 1.41.24.1 $ + * $Revision: 1.41.142.1 $ * * This file is part of OpenOffice.org. * @@ -1224,13 +1224,13 @@ void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq ) } else { - SvxUnderlineItem aUnderline( (const SvxUnderlineItem&) + SvxUnderlineItem aUnderline( (const SvxUnderlineItem&) pAttrs->GetItem( ATTR_FONT_UNDERLINE ) ); - eUnderline = (UNDERLINE_NONE != aUnderline.GetUnderline()) + eUnderline = (UNDERLINE_NONE != aUnderline.GetLineStyle()) ? UNDERLINE_NONE : UNDERLINE_SINGLE; - aUnderline.SetUnderline( eUnderline ); + aUnderline.SetLineStyle( eUnderline ); pTabViewShell->ApplyAttr( aUnderline ); pNewSet->Put( aUnderline,aUnderline.Which() ); } @@ -1245,7 +1245,7 @@ void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq ) case SID_ULINE_VAL_DOTTED: { FontUnderline eOld = ((const SvxUnderlineItem&) - pAttrs->GetItem(ATTR_FONT_UNDERLINE)).GetUnderline(); + pAttrs->GetItem(ATTR_FONT_UNDERLINE)).GetLineStyle(); FontUnderline eNew = eOld; switch (nSlot) { @@ -1447,6 +1447,7 @@ void ScFormatShell::ExecuteAttr( SfxRequest& rReq ) switch ( nSlot ) { + case SID_ATTR_CHAR_OVERLINE: case SID_ATTR_CHAR_STRIKEOUT: case SID_ATTR_ALIGN_LINEBREAK: case SID_ATTR_CHAR_COLOR: @@ -1751,7 +1752,7 @@ void ScFormatShell::GetTextAttrState( SfxItemSet& rSet ) else { FontUnderline eUnderline = ((const SvxUnderlineItem&) - rAttrSet.Get(ATTR_FONT_UNDERLINE)).GetUnderline(); + rAttrSet.Get(ATTR_FONT_UNDERLINE)).GetLineStyle(); USHORT nId = SID_ULINE_VAL_NONE; switch (eUnderline) { diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx index 63b2eafefce7..e41bd4941d9c 100644 --- a/sc/source/ui/view/output2.cxx +++ b/sc/source/ui/view/output2.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: output2.cxx,v $ - * $Revision: 1.57 $ + * $Revision: 1.56.142.2 $ * * This file is part of OpenOffice.org. * @@ -367,6 +367,9 @@ void ScDrawStringsVars::SetPattern( const ScPatternAttr* pNew, const SfxItemSet* Color aULineColor( ((const SvxUnderlineItem&)pPattern->GetItem( ATTR_FONT_UNDERLINE, pCondSet )).GetColor() ); pDev->SetTextLineColor( aULineColor ); + Color aOLineColor( ((const SvxOverlineItem&)pPattern->GetItem( ATTR_FONT_OVERLINE, pCondSet )).GetColor() ); + pDev->SetOverlineColor( aOLineColor ); + // Zahlenformat // ULONG nOld = nValueFormat; @@ -782,6 +785,8 @@ inline BOOL StringDiffer( const ScPatternAttr*& rpOldPattern, const ScPatternAtt return TRUE; else if ( &rpNewPattern->GetItem( ATTR_FONT_UNDERLINE ) != &rpOldPattern->GetItem( ATTR_FONT_UNDERLINE ) ) return TRUE; + else if ( &rpNewPattern->GetItem( ATTR_FONT_OVERLINE ) != &rpOldPattern->GetItem( ATTR_FONT_OVERLINE ) ) + return TRUE; else if ( &rpNewPattern->GetItem( ATTR_FONT_WORDLINE ) != &rpOldPattern->GetItem( ATTR_FONT_WORDLINE ) ) return TRUE; else if ( &rpNewPattern->GetItem( ATTR_FONT_CROSSEDOUT ) != &rpOldPattern->GetItem( ATTR_FONT_CROSSEDOUT ) ) diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx index 5130062ad436..445f029c6039 100644 --- a/sc/source/ui/view/tabview3.cxx +++ b/sc/source/ui/view/tabview3.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: tabview3.cxx,v $ - * $Revision: 1.67.22.6 $ + * $Revision: 1.69.40.1 $ * * This file is part of OpenOffice.org. * @@ -234,6 +234,8 @@ void ScTabView::InvalidateAttribs() rBindings.Invalidate( SID_ULINE_VAL_DOUBLE ); rBindings.Invalidate( SID_ULINE_VAL_DOTTED ); + rBindings.Invalidate( SID_ATTR_CHAR_OVERLINE ); + rBindings.Invalidate( SID_ALIGNLEFT ); rBindings.Invalidate( SID_ALIGNRIGHT ); rBindings.Invalidate( SID_ALIGNBLOCK ); |