[Libreoffice-commits] core.git: 2 commits - include/editeng include/svx include/tools include/vcl sw/inc sw/source vcl/source xmloff/source
Noel Grandin
noel.grandin at collabora.co.uk
Tue Jan 9 06:19:17 UTC 2018
include/editeng/editids.hrc | 2 +-
include/svx/svxitems.hrc | 1 -
include/tools/color.hxx | 6 +++---
include/tools/colordata.hxx | 6 ++++--
include/vcl/salbtype.hxx | 6 +++---
sw/inc/hintids.hxx | 4 ++--
sw/source/core/bastyp/init.cxx | 8 ++++----
sw/source/core/doc/dbgoutsw.cxx | 2 --
sw/source/core/layout/wsfrm.cxx | 1 -
sw/source/core/text/atrstck.cxx | 4 ++--
sw/source/filter/html/css1atr.cxx | 4 ++--
sw/source/filter/html/htmlatr.cxx | 4 ++--
vcl/source/outdev/bitmap.cxx | 6 +++---
vcl/source/outdev/transparent.cxx | 6 +++---
xmloff/source/text/txtprmap.cxx | 12 ++++--------
15 files changed, 33 insertions(+), 39 deletions(-)
New commits:
commit c0847dc7b7a311d19b73d4943d1b0466b10cde4f
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Mon Jan 8 14:34:59 2018 +0200
convert COLOR_CHANNEL_MERGE to constexpr function
Change-Id: Ie46e0a47b433517b0bae0deabb447ff5c1000f22
Reviewed-on: https://gerrit.libreoffice.org/47595
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/include/tools/color.hxx b/include/tools/color.hxx
index 0173840d80ff..1d0d239d5af5 100644
--- a/include/tools/color.hxx
+++ b/include/tools/color.hxx
@@ -192,9 +192,9 @@ inline sal_uInt8 Color::GetLuminance() const
inline void Color::Merge( const Color& rMergeColor, sal_uInt8 cTransparency )
{
- SetRed(COLOR_CHANNEL_MERGE(COLORDATA_RED(mnColor), COLORDATA_RED(rMergeColor.mnColor), cTransparency));
- SetGreen(COLOR_CHANNEL_MERGE(COLORDATA_GREEN(mnColor), COLORDATA_GREEN(rMergeColor.mnColor), cTransparency));
- SetBlue(COLOR_CHANNEL_MERGE(COLORDATA_BLUE(mnColor), COLORDATA_BLUE(rMergeColor.mnColor), cTransparency));
+ SetRed(ColorChannelMerge(COLORDATA_RED(mnColor), COLORDATA_RED(rMergeColor.mnColor), cTransparency));
+ SetGreen(ColorChannelMerge(COLORDATA_GREEN(mnColor), COLORDATA_GREEN(rMergeColor.mnColor), cTransparency));
+ SetBlue(ColorChannelMerge(COLORDATA_BLUE(mnColor), COLORDATA_BLUE(rMergeColor.mnColor), cTransparency));
}
#endif
diff --git a/include/tools/colordata.hxx b/include/tools/colordata.hxx
index ffe5a2d14b44..6008d0c0fc24 100644
--- a/include/tools/colordata.hxx
+++ b/include/tools/colordata.hxx
@@ -92,8 +92,10 @@ constexpr ColorData RGB_COLORDATA(sal_uInt8 r, sal_uInt8 g, sal_uInt8 b) {
#define COL_AUTHOR9_NORMAL RGB_COLORDATA(255, 226, 185)
#define COL_AUTHOR9_LIGHT RGB_COLORDATA(255, 231, 199)
-#define COLOR_CHANNEL_MERGE( _def_cDst, _def_cSrc, _def_cSrcTrans ) \
- ((sal_uInt8)((((long)(_def_cDst)-(_def_cSrc))*(_def_cSrcTrans)+(((_def_cSrc)<<8)|(_def_cDst)))>>8))
+constexpr sal_uInt8 ColorChannelMerge(sal_uInt8 nDst, sal_uInt8 nSrc, sal_uInt8 nSrcTrans)
+{
+ return (sal_uInt8) ((((sal_Int32)nDst-nSrc)*nSrcTrans+((nSrc<<8)|nDst))>>8);
+};
#endif
diff --git a/include/vcl/salbtype.hxx b/include/vcl/salbtype.hxx
index ed38c9a41b8a..e9a3bdf599b7 100644
--- a/include/vcl/salbtype.hxx
+++ b/include/vcl/salbtype.hxx
@@ -480,9 +480,9 @@ inline BitmapColor& BitmapColor::Merge( const BitmapColor& rBitmapColor, sal_uIn
{
assert( !mbIndex && "Pixel represents index into colortable" );
assert( !rBitmapColor.mbIndex && "Pixel represents index into colortable" );
- mcBlueOrIndex = COLOR_CHANNEL_MERGE( mcBlueOrIndex, rBitmapColor.mcBlueOrIndex, cTransparency );
- mcGreen = COLOR_CHANNEL_MERGE( mcGreen, rBitmapColor.mcGreen, cTransparency );
- mcRed = COLOR_CHANNEL_MERGE( mcRed, rBitmapColor.mcRed, cTransparency );
+ mcBlueOrIndex = ColorChannelMerge( mcBlueOrIndex, rBitmapColor.mcBlueOrIndex, cTransparency );
+ mcGreen = ColorChannelMerge( mcGreen, rBitmapColor.mcGreen, cTransparency );
+ mcRed = ColorChannelMerge( mcRed, rBitmapColor.mcRed, cTransparency );
return *this;
}
diff --git a/vcl/source/outdev/bitmap.cxx b/vcl/source/outdev/bitmap.cxx
index e33cfa60bd70..24b1c5403057 100644
--- a/vcl/source/outdev/bitmap.cxx
+++ b/vcl/source/outdev/bitmap.cxx
@@ -867,11 +867,11 @@ public:
nAlpha = (nAlphaLine1 + nMapFY * ((nAlphaLine2 >> 7) - (nAlphaLine1 >> 7))) >> 7;
- *pDestScanline = COLOR_CHANNEL_MERGE(*pDestScanline, nColor1, nAlpha);
+ *pDestScanline = ColorChannelMerge(*pDestScanline, nColor1, nAlpha);
pDestScanline++;
- *pDestScanline = COLOR_CHANNEL_MERGE(*pDestScanline, nColor2, nAlpha);
+ *pDestScanline = ColorChannelMerge(*pDestScanline, nColor2, nAlpha);
pDestScanline++;
- *pDestScanline = COLOR_CHANNEL_MERGE(*pDestScanline, nColor3, nAlpha);
+ *pDestScanline = ColorChannelMerge(*pDestScanline, nColor3, nAlpha);
pDestScanline++;
pDestScanline++;
}
diff --git a/vcl/source/outdev/transparent.cxx b/vcl/source/outdev/transparent.cxx
index 31d4c946bb36..764389dcbe78 100644
--- a/vcl/source/outdev/transparent.cxx
+++ b/vcl/source/outdev/transparent.cxx
@@ -558,9 +558,9 @@ void OutputDevice::EmulateDrawTransparent ( const tools::PolyPolygon& rPolyPoly,
}
if( ( *pRScan & cBit ) == cBlack )
{
- pWScan[ 0 ] = COLOR_CHANNEL_MERGE( pWScan[ 0 ], nB, cTrans );
- pWScan[ 1 ] = COLOR_CHANNEL_MERGE( pWScan[ 1 ], nG, cTrans );
- pWScan[ 2 ] = COLOR_CHANNEL_MERGE( pWScan[ 2 ], nR, cTrans );
+ pWScan[ 0 ] = ColorChannelMerge( pWScan[ 0 ], nB, cTrans );
+ pWScan[ 1 ] = ColorChannelMerge( pWScan[ 1 ], nG, cTrans );
+ pWScan[ 2 ] = ColorChannelMerge( pWScan[ 2 ], nR, cTrans );
}
}
}
commit 46ab8c952aa535bd1c624aa95c8900460aa474bf
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Mon Jan 8 13:22:16 2018 +0200
RES_CHRATR_PROPORTIONALFONTSIZE and RES_CHRATR_NOLINEBREAK unused
but leave placeholders behind to avoid having to renumber items.
Change-Id: Ifa1a9dc790a68d7486da7504c11b3c203a5fd3db
Reviewed-on: https://gerrit.libreoffice.org/47580
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/include/editeng/editids.hrc b/include/editeng/editids.hrc
index 69a34cfc7804..e72976e88144 100644
--- a/include/editeng/editids.hrc
+++ b/include/editeng/editids.hrc
@@ -42,7 +42,7 @@
#define SID_ATTR_CHAR_STRIKEOUT ( SID_SVX_START + 13 )
#define SID_ATTR_CHAR_UNDERLINE ( SID_SVX_START + 14 )
#define SID_ATTR_CHAR_FONTHEIGHT ( SID_SVX_START + 15 )
-#define SID_ATTR_CHAR_PROPSIZE ( SID_SVX_START + 16 )
+ // free
#define SID_ATTR_CHAR_COLOR ( SID_SVX_START + 17 )
#define SID_ATTR_CHAR_KERNING ( SID_SVX_START + 18 )
#define SID_ATTR_CHAR_CASEMAP ( SID_SVX_START + 19 )
diff --git a/include/svx/svxitems.hrc b/include/svx/svxitems.hrc
index bb2ce7754e84..1d11ec7acdf9 100644
--- a/include/svx/svxitems.hrc
+++ b/include/svx/svxitems.hrc
@@ -43,7 +43,6 @@ const std::pair<const char*, sal_uInt16> RID_ATTR_NAMES[] =
{ NC_("RID_ATTR_NAMES", "Strikethrough") , SID_ATTR_CHAR_STRIKEOUT },
{ NC_("RID_ATTR_NAMES", "Underline") , SID_ATTR_CHAR_UNDERLINE },
{ NC_("RID_ATTR_NAMES", "Font size") , SID_ATTR_CHAR_FONTHEIGHT },
- { NC_("RID_ATTR_NAMES", "Rel. Font size") , SID_ATTR_CHAR_PROPSIZE },
{ NC_("RID_ATTR_NAMES", "Font color") , SID_ATTR_CHAR_COLOR },
{ NC_("RID_ATTR_NAMES", "Kerning") , SID_ATTR_CHAR_KERNING },
{ NC_("RID_ATTR_NAMES", "Effects") , SID_ATTR_CHAR_CASEMAP },
diff --git a/sw/inc/hintids.hxx b/sw/inc/hintids.hxx
index 8e254b62ec0f..ec9bfa950bec 100644
--- a/sw/inc/hintids.hxx
+++ b/sw/inc/hintids.hxx
@@ -65,7 +65,7 @@
#define RES_CHRATR_KERNING TypedWhichId<SvxKerningItem>(9)
#define RES_CHRATR_LANGUAGE TypedWhichId<SvxLanguageItem>(10)
#define RES_CHRATR_POSTURE TypedWhichId<SvxPostureItem>(11)
-#define RES_CHRATR_PROPORTIONALFONTSIZE TypedWhichId<SvxPropSizeItem>(12)
+#define RES_CHRATR_UNUSED1 TypedWhichId<SfxVoidItem>(12)
#define RES_CHRATR_SHADOWED TypedWhichId<SvxShadowedItem>(13)
#define RES_CHRATR_UNDERLINE TypedWhichId<SvxUnderlineItem>(14)
#define RES_CHRATR_WEIGHT TypedWhichId<SvxWeightItem>(15)
@@ -73,7 +73,7 @@
#define RES_CHRATR_AUTOKERN TypedWhichId<SvxAutoKernItem>(17)
#define RES_CHRATR_BLINK TypedWhichId<SvxBlinkItem>(18)
#define RES_CHRATR_NOHYPHEN TypedWhichId<SvxNoHyphenItem>(19)
-#define RES_CHRATR_NOLINEBREAK TypedWhichId<SvxNoLinebreakItem>(20)
+#define RES_CHRATR_UNUSED2 TypedWhichId<SfxVoidItem>(20)
#define RES_CHRATR_BACKGROUND TypedWhichId<SvxBrushItem>(21)
#define RES_CHRATR_CJK_FONT TypedWhichId<SvxFontItem>(22)
#define RES_CHRATR_CJK_FONTSIZE TypedWhichId<SvxFontHeightItem>(23)
diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx
index 399309fd6a88..39d6c438dc79 100644
--- a/sw/source/core/bastyp/init.cxx
+++ b/sw/source/core/bastyp/init.cxx
@@ -276,14 +276,14 @@ SfxItemInfo aSlotTab[] =
{ SID_ATTR_CHAR_KERNING, true }, // RES_CHRATR_KERNING
{ SID_ATTR_CHAR_LANGUAGE, true }, // RES_CHRATR_LANGUAGE
{ SID_ATTR_CHAR_POSTURE, true }, // RES_CHRATR_POSTURE
- { SID_ATTR_CHAR_PROPSIZE, true }, // RES_CHRATR_PROPORTIONALFONTSIZE
+ { 0, true }, // RES_CHRATR_UNUSED1
{ SID_ATTR_CHAR_SHADOWED, true }, // RES_CHRATR_SHADOWED
{ SID_ATTR_CHAR_UNDERLINE, true }, // RES_CHRATR_UNDERLINE
{ SID_ATTR_CHAR_WEIGHT, true }, // RES_CHRATR_WEIGHT
{ SID_ATTR_CHAR_WORDLINEMODE, true }, // RES_CHRATR_WORDLINEMODE
{ SID_ATTR_CHAR_AUTOKERN, true }, // RES_CHRATR_AUTOKERN
{ SID_ATTR_FLASH, true }, // RES_CHRATR_BLINK
- { 0, true }, // RES_CHRATR_NOLINEBREAK
+ { 0, true }, // RES_CHRATR_UNUSED2
{ 0, true }, // RES_CHRATR_NOHYPHEN
{ SID_ATTR_BRUSH_CHAR, true }, // RES_CHRATR_BACKGROUND
{ SID_ATTR_CHAR_CJK_FONT, true }, // RES_CHRATR_CJK_FONT
@@ -464,7 +464,7 @@ void InitCore()
aAttrTab[ RES_CHRATR_KERNING- POOLATTR_BEGIN ] = new SvxKerningItem( 0, RES_CHRATR_KERNING );
aAttrTab[ RES_CHRATR_LANGUAGE- POOLATTR_BEGIN ] = new SvxLanguageItem(LANGUAGE_DONTKNOW, RES_CHRATR_LANGUAGE );
aAttrTab[ RES_CHRATR_POSTURE- POOLATTR_BEGIN ] = new SvxPostureItem( ITALIC_NONE, RES_CHRATR_POSTURE );
- aAttrTab[ RES_CHRATR_PROPORTIONALFONTSIZE- POOLATTR_BEGIN ] = new SvxPropSizeItem( 100, RES_CHRATR_PROPORTIONALFONTSIZE );
+ aAttrTab[ RES_CHRATR_UNUSED1- POOLATTR_BEGIN ] = new SfxVoidItem( RES_CHRATR_UNUSED1 );
aAttrTab[ RES_CHRATR_SHADOWED- POOLATTR_BEGIN ] = new SvxShadowedItem( false, RES_CHRATR_SHADOWED );
aAttrTab[ RES_CHRATR_UNDERLINE- POOLATTR_BEGIN ] = new SvxUnderlineItem( LINESTYLE_NONE, RES_CHRATR_UNDERLINE );
aAttrTab[ RES_CHRATR_WEIGHT- POOLATTR_BEGIN ] = new SvxWeightItem( WEIGHT_NORMAL, RES_CHRATR_WEIGHT );
@@ -473,7 +473,7 @@ void InitCore()
aAttrTab[ RES_CHRATR_AUTOKERN- POOLATTR_BEGIN ] = new SvxAutoKernItem( false, RES_CHRATR_AUTOKERN );
aAttrTab[ RES_CHRATR_BLINK - POOLATTR_BEGIN ] = new SvxBlinkItem( false, RES_CHRATR_BLINK );
aAttrTab[ RES_CHRATR_NOHYPHEN - POOLATTR_BEGIN ] = new SvxNoHyphenItem( true, RES_CHRATR_NOHYPHEN );
- aAttrTab[ RES_CHRATR_NOLINEBREAK- POOLATTR_BEGIN ] = new SvxNoLinebreakItem( true, RES_CHRATR_NOLINEBREAK );
+ aAttrTab[ RES_CHRATR_UNUSED2- POOLATTR_BEGIN ] = new SfxVoidItem( RES_CHRATR_UNUSED2 );
aAttrTab[ RES_CHRATR_BACKGROUND - POOLATTR_BEGIN ] = new SvxBrushItem( RES_CHRATR_BACKGROUND );
// CJK-Attributes
diff --git a/sw/source/core/doc/dbgoutsw.cxx b/sw/source/core/doc/dbgoutsw.cxx
index 342ab3834daf..8cbdc024fb3b 100644
--- a/sw/source/core/doc/dbgoutsw.cxx
+++ b/sw/source/core/doc/dbgoutsw.cxx
@@ -111,7 +111,6 @@ map<sal_uInt16,OUString> & GetItemWhichMap()
aItemWhichMap[RES_CHRATR_KERNING] = "CHRATR_KERNING";
aItemWhichMap[RES_CHRATR_LANGUAGE] = "CHRATR_LANGUAGE";
aItemWhichMap[RES_CHRATR_POSTURE] = "CHRATR_POSTURE";
- aItemWhichMap[RES_CHRATR_PROPORTIONALFONTSIZE] = "CHRATR_PROPORTIONALFONTSIZE";
aItemWhichMap[RES_CHRATR_SHADOWED] = "CHRATR_SHADOWED";
aItemWhichMap[RES_CHRATR_UNDERLINE] = "CHRATR_UNDERLINE";
aItemWhichMap[RES_CHRATR_OVERLINE] = "CHRATR_OVERLINE";
@@ -120,7 +119,6 @@ map<sal_uInt16,OUString> & GetItemWhichMap()
aItemWhichMap[RES_CHRATR_AUTOKERN] = "CHRATR_AUTOKERN";
aItemWhichMap[RES_CHRATR_BLINK] = "CHRATR_BLINK";
aItemWhichMap[RES_CHRATR_NOHYPHEN] = "CHRATR_NOHYPHEN";
- aItemWhichMap[RES_CHRATR_NOLINEBREAK] = "CHRATR_NOLINEBREAK";
aItemWhichMap[RES_CHRATR_BACKGROUND] = "CHRATR_BACKGROUND";
aItemWhichMap[RES_CHRATR_HIGHLIGHT] = "CHRATR_HIGHLIGHT";
aItemWhichMap[RES_CHRATR_CJK_FONT] = "CHRATR_CJK_FONT";
diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx
index 5b85b69a4b27..f36667e96554 100644
--- a/sw/source/core/layout/wsfrm.cxx
+++ b/sw/source/core/layout/wsfrm.cxx
@@ -2454,7 +2454,6 @@ void SwContentFrame::UpdateAttr_( const SfxPoolItem* pOld, const SfxPoolItem* pN
break;
case RES_PARATR_TABSTOP:
- case RES_CHRATR_PROPORTIONALFONTSIZE:
case RES_CHRATR_SHADOWED:
case RES_CHRATR_AUTOKERN:
case RES_CHRATR_UNDERLINE:
diff --git a/sw/source/core/text/atrstck.cxx b/sw/source/core/text/atrstck.cxx
index 9a6ee165323c..a252302b743a 100644
--- a/sw/source/core/text/atrstck.cxx
+++ b/sw/source/core/text/atrstck.cxx
@@ -82,7 +82,7 @@ const sal_uInt8 StackPos[ RES_TXTATR_WITHEND_END - RES_CHRATR_BEGIN + 1 ] =
8, // RES_CHRATR_KERNING, // 9
9, // RES_CHRATR_LANGUAGE, // 10
10, // RES_CHRATR_POSTURE, // 11
- 0, // RES_CHRATR_PROPORTIONALFONTSIZE, // 12
+ 0, // RES_CHRATR_UNUSED1, // 12
11, // RES_CHRATR_SHADOWED, // 13
12, // RES_CHRATR_UNDERLINE, // 14
13, // RES_CHRATR_WEIGHT, // 15
@@ -90,7 +90,7 @@ const sal_uInt8 StackPos[ RES_TXTATR_WITHEND_END - RES_CHRATR_BEGIN + 1 ] =
15, // RES_CHRATR_AUTOKERN, // 17
16, // RES_CHRATR_BLINK, // 18
17, // RES_CHRATR_NOHYPHEN, // 19
- 0, // RES_CHRATR_NOLINEBREAK, // 20
+ 0, // RES_CHRATR_UNUSED2, // 20
18, // RES_CHRATR_BACKGROUND, // 21
19, // RES_CHRATR_CJK_FONT, // 22
20, // RES_CHRATR_CJK_FONTSIZE, // 23
diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx
index aeaac6d5af73..6d19d69ed054 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -3490,7 +3490,7 @@ static SwAttrFnTab const aCSS1AttrFnTab = {
/* RES_CHRATR_KERNING */ OutCSS1_SvxKerning,
/* RES_CHRATR_LANGUAGE */ OutCSS1_SvxLanguage,
/* RES_CHRATR_POSTURE */ OutCSS1_SvxPosture,
-/* RES_CHRATR_PROPORTIONALFONTSIZE*/nullptr,
+/* RES_CHRATR_UNUSED1*/ nullptr,
/* RES_CHRATR_SHADOWED */ nullptr,
/* RES_CHRATR_UNDERLINE */ OutCSS1_SvxUnderline,
/* RES_CHRATR_WEIGHT */ OutCSS1_SvxFontWeight,
@@ -3498,7 +3498,7 @@ static SwAttrFnTab const aCSS1AttrFnTab = {
/* RES_CHRATR_AUTOKERN */ nullptr,
/* RES_CHRATR_BLINK */ OutCSS1_SvxBlink,
/* RES_CHRATR_NOHYPHEN */ nullptr, // new: don't separate
-/* RES_CHRATR_NOLINEBREAK */ nullptr, // new: don't wrap
+/* RES_CHRATR_UNUSED2 */ nullptr,
/* RES_CHRATR_BACKGROUND */ OutCSS1_SvxBrush, // new: character background
/* RES_CHRATR_CJK_FONT */ OutCSS1_SvxFont,
/* RES_CHRATR_CJK_FONTSIZE */ OutCSS1_SvxFontHeight,
diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx
index e82dc41be022..de89c4869588 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -3140,7 +3140,7 @@ SwAttrFnTab aHTMLAttrFnTab = {
/* RES_CHRATR_KERNING */ OutHTML_CSS1Attr,
/* RES_CHRATR_LANGUAGE */ OutHTML_SvxLanguage,
/* RES_CHRATR_POSTURE */ OutHTML_SwPosture,
-/* RES_CHRATR_PROPORTIONALFONTSIZE*/nullptr,
+/* RES_CHRATR_UNUSED1*/ nullptr,
/* RES_CHRATR_SHADOWED */ nullptr,
/* RES_CHRATR_UNDERLINE */ OutHTML_SwUnderline,
/* RES_CHRATR_WEIGHT */ OutHTML_SwWeight,
@@ -3148,7 +3148,7 @@ SwAttrFnTab aHTMLAttrFnTab = {
/* RES_CHRATR_AUTOKERN */ nullptr,
/* RES_CHRATR_BLINK */ OutHTML_SwBlink,
/* RES_CHRATR_NOHYPHEN */ nullptr, // New: don't hyphenate
-/* RES_CHRATR_NOLINEBREAK */ nullptr, // New: don't line-break
+/* RES_CHRATR_UNUSED2 */ nullptr,
/* RES_CHRATR_BACKGROUND */ OutHTML_CSS1Attr, // New: character background
/* RES_CHRATR_CJK_FONT */ OutHTML_SvxFont,
/* RES_CHRATR_CJK_FONTSIZE */ OutHTML_SvxFontHeight,
diff --git a/xmloff/source/text/txtprmap.cxx b/xmloff/source/text/txtprmap.cxx
index 9b42098a5698..1dac3b40ffe1 100644
--- a/xmloff/source/text/txtprmap.cxx
+++ b/xmloff/source/text/txtprmap.cxx
@@ -161,8 +161,7 @@ XMLPropertyMapEntry const aXMLParaPropMap[] =
MT_ED( "CharLocale", FO, COUNTRY, XML_TYPE_CHAR_COUNTRY|MID_FLAG_MERGE_PROPERTY, 0 ),
// RES_CHRATR_POSTURE
MT_E( "CharPosture", FO, FONT_STYLE, XML_TYPE_TEXT_POSTURE, 0 ),
- // RES_CHRATR_PROPORTIONALFONTSIZE
- // TODO: not used?
+ // RES_CHRATR_UNUSED1
// RES_CHRATR_SHADOWED
MT_E( "CharShadowed", FO, TEXT_SHADOW, XML_TYPE_TEXT_SHADOWED, 0 ),
// RES_CHRATR_UNDERLINE
@@ -187,8 +186,7 @@ XMLPropertyMapEntry const aXMLParaPropMap[] =
MT_E( "CharFlash", STYLE, TEXT_BLINKING, XML_TYPE_BOOL, 0 ),
// RES_CHRATR_NOHYPHEN
// TODO: not used?
- // RES_CHRATR_NOLINEBREAK
- // TODO: not used?
+ // RES_CHRATR_UNUSED2
// RES_CHRATR_BACKGROUND
MT_E( "CharBackColor", FO, BACKGROUND_COLOR, XML_TYPE_COLORTRANSPARENT|MID_FLAG_MULTI_PROPERTY, CTF_CHAR_BACKGROUND ),
MT_E( "CharBackTransparent", FO, BACKGROUND_COLOR, XML_TYPE_ISTRANSPARENT|MID_FLAG_MERGE_ATTRIBUTE, CTF_CHAR_BACKGROUND_TRANSPARENCY),
@@ -503,8 +501,7 @@ XMLPropertyMapEntry const aXMLTextPropMap[] =
MT_ED( "CharLocale", FO, COUNTRY, XML_TYPE_CHAR_COUNTRY|MID_FLAG_MERGE_PROPERTY, 0 ),
// RES_CHRATR_POSTURE
MT_E( "CharPosture", FO, FONT_STYLE, XML_TYPE_TEXT_POSTURE, 0 ),
- // RES_CHRATR_PROPORTIONALFONTSIZE
- // TODO: not used?
+ // RES_CHRATR_UNUSED1
// RES_CHRATR_SHADOWED
MT_E( "CharShadowed", FO, TEXT_SHADOW, XML_TYPE_TEXT_SHADOWED, 0 ),
// VALIDATED UP TO THIS LINE
@@ -530,8 +527,7 @@ XMLPropertyMapEntry const aXMLTextPropMap[] =
MT_E( "CharFlash", STYLE, TEXT_BLINKING, XML_TYPE_BOOL, 0 ),
// RES_CHRATR_NOHYPHEN
// TODO: not used?
- // RES_CHRATR_NOLINEBREAK
- // TODO: not used?
+ // RES_CHRATR_UNUSED2
// RES_CHRATR_BACKGROUND
MT_E( "CharBackColor", FO, BACKGROUND_COLOR, XML_TYPE_COLORTRANSPARENT|MID_FLAG_MULTI_PROPERTY, CTF_CHAR_BACKGROUND ),
MT_E( "CharBackTransparent", FO, BACKGROUND_COLOR, XML_TYPE_ISTRANSPARENT|MID_FLAG_MERGE_ATTRIBUTE, CTF_CHAR_BACKGROUND_TRANSPARENCY),
More information about the Libreoffice-commits
mailing list