[Libreoffice-commits] core.git: 2 commits - comphelper/source compilerplugins/clang drawinglayer/source include/vcl vcl/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Nov 26 18:13:32 UTC 2018
comphelper/source/misc/graphicmimetype.cxx | 2
compilerplugins/clang/unusedenumconstants.readonly.results | 14 ------
drawinglayer/source/processor2d/vclprocessor2d.cxx | 22 ---------
include/vcl/outdev.hxx | 29 ++++---------
include/vcl/salctype.hxx | 3 -
vcl/source/filter/graphicfilter.cxx | 1
vcl/source/outdev/bitmap.cxx | 28 ++----------
vcl/source/outdev/gradient.cxx | 29 +------------
vcl/source/outdev/hatch.cxx | 9 ----
vcl/source/outdev/outdevstate.cxx | 27 +-----------
vcl/source/outdev/text.cxx | 18 --------
vcl/source/outdev/textline.cxx | 20 --------
vcl/source/outdev/transparent.cxx | 9 ----
13 files changed, 33 insertions(+), 178 deletions(-)
New commits:
commit b8b79633021488a7f3400026357a66c4cdadb4b6
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Fri Nov 23 16:45:55 2018 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Mon Nov 26 19:13:20 2018 +0100
remove unused DrawModeFlags enum values
Change-Id: I86775a5b7609f5e85c8fcc18a0be7e0ee3c8f84c
Reviewed-on: https://gerrit.libreoffice.org/64046
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/compilerplugins/clang/unusedenumconstants.readonly.results b/compilerplugins/clang/unusedenumconstants.readonly.results
index 96d5d1a5c68c..922644280873 100644
--- a/compilerplugins/clang/unusedenumconstants.readonly.results
+++ b/compilerplugins/clang/unusedenumconstants.readonly.results
@@ -926,18 +926,6 @@ include/vcl/outdev.hxx:190
enum DrawImageFlags Highlight
include/vcl/outdev.hxx:191
enum DrawImageFlags Deactive
-include/vcl/outdev.hxx:228
- enum DrawModeFlags NoBitmap
-include/vcl/outdev.hxx:229
- enum DrawModeFlags NoGradient
-include/vcl/outdev.hxx:230
- enum DrawModeFlags GhostedLine
-include/vcl/outdev.hxx:232
- enum DrawModeFlags GhostedText
-include/vcl/outdev.hxx:233
- enum DrawModeFlags GhostedBitmap
-include/vcl/outdev.hxx:234
- enum DrawModeFlags GhostedGradient
include/vcl/pdfwriter.hxx:110
enum vcl::PDFWriter::PDFVersion PDF_1_3
include/vcl/pdfwriter.hxx:110
diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx b/drawinglayer/source/processor2d/vclprocessor2d.cxx
index de94ac307120..e5b77c1c86d3 100644
--- a/drawinglayer/source/processor2d/vclprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx
@@ -1308,7 +1308,7 @@ namespace drawinglayer
{
const DrawModeFlags nOriginalDrawMode(mpOutputDevice->GetDrawMode());
- if(nOriginalDrawMode & (DrawModeFlags::BlackLine|DrawModeFlags::GrayLine|DrawModeFlags::GhostedLine|DrawModeFlags::WhiteLine|DrawModeFlags::SettingsLine))
+ if(nOriginalDrawMode & (DrawModeFlags::BlackLine|DrawModeFlags::GrayLine|DrawModeFlags::WhiteLine|DrawModeFlags::SettingsLine))
{
DrawModeFlags nAdaptedDrawMode(nOriginalDrawMode);
@@ -1330,15 +1330,6 @@ namespace drawinglayer
nAdaptedDrawMode &= ~DrawModeFlags::GrayFill;
}
- if(nOriginalDrawMode & DrawModeFlags::GhostedLine)
- {
- nAdaptedDrawMode |= DrawModeFlags::GhostedFill;
- }
- else
- {
- nAdaptedDrawMode &= ~DrawModeFlags::GhostedFill;
- }
-
if(nOriginalDrawMode & DrawModeFlags::WhiteLine)
{
nAdaptedDrawMode |= DrawModeFlags::WhiteFill;
@@ -1364,7 +1355,7 @@ namespace drawinglayer
void VclProcessor2D::adaptTextToFillDrawMode() const
{
const DrawModeFlags nOriginalDrawMode(mpOutputDevice->GetDrawMode());
- if(nOriginalDrawMode & (DrawModeFlags::BlackText|DrawModeFlags::GrayText|DrawModeFlags::GhostedText|DrawModeFlags::WhiteText|DrawModeFlags::SettingsText))
+ if(nOriginalDrawMode & (DrawModeFlags::BlackText|DrawModeFlags::GrayText|DrawModeFlags::WhiteText|DrawModeFlags::SettingsText))
{
DrawModeFlags nAdaptedDrawMode(nOriginalDrawMode);
@@ -1386,15 +1377,6 @@ namespace drawinglayer
nAdaptedDrawMode &= ~DrawModeFlags::GrayFill;
}
- if(nOriginalDrawMode & DrawModeFlags::GhostedText)
- {
- nAdaptedDrawMode |= DrawModeFlags::GhostedFill;
- }
- else
- {
- nAdaptedDrawMode &= ~DrawModeFlags::GhostedFill;
- }
-
if(nOriginalDrawMode & DrawModeFlags::WhiteText)
{
nAdaptedDrawMode |= DrawModeFlags::WhiteFill;
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 6d3bbb02e54d..47d8872a4960 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -225,27 +225,20 @@ enum class DrawModeFlags : sal_uInt32
GrayBitmap = 0x00000100,
GrayGradient = 0x00000200,
NoFill = 0x00000400,
- NoBitmap = 0x00000800,
- NoGradient = 0x00001000,
- GhostedLine = 0x00002000,
- GhostedFill = 0x00004000,
- GhostedText = 0x00008000,
- GhostedBitmap = 0x00010000,
- GhostedGradient = 0x00020000,
- WhiteLine = 0x00100000,
- WhiteFill = 0x00200000,
- WhiteText = 0x00400000,
- WhiteBitmap = 0x00800000,
- WhiteGradient = 0x01000000,
- SettingsLine = 0x02000000,
- SettingsFill = 0x04000000,
- SettingsText = 0x08000000,
- SettingsGradient = 0x10000000,
- NoTransparency = 0x80000000,
+ WhiteLine = 0x00000800,
+ WhiteFill = 0x00001000,
+ WhiteText = 0x00002000,
+ WhiteBitmap = 0x00004000,
+ WhiteGradient = 0x00008000,
+ SettingsLine = 0x00010000,
+ SettingsFill = 0x00020000,
+ SettingsText = 0x00040000,
+ SettingsGradient = 0x00080000,
+ NoTransparency = 0x00100000,
};
namespace o3tl
{
- template<> struct typed_flags<DrawModeFlags> : is_typed_flags<DrawModeFlags, 0x9ff3ffff> {};
+ template<> struct typed_flags<DrawModeFlags> : is_typed_flags<DrawModeFlags, 0x1fffff> {};
}
// Antialiasing
diff --git a/vcl/source/outdev/bitmap.cxx b/vcl/source/outdev/bitmap.cxx
index 42aa0d78c486..7823a1665221 100644
--- a/vcl/source/outdev/bitmap.cxx
+++ b/vcl/source/outdev/bitmap.cxx
@@ -71,10 +71,6 @@ void OutputDevice::DrawBitmap( const Point& rDestPt, const Size& rDestSize,
if( ImplIsRecordLayout() )
return;
- if ( mnDrawMode & DrawModeFlags::NoBitmap )
- {
- return;
- }
if ( RasterOp::Invert == meRasterOp )
{
DrawRect( tools::Rectangle( rDestPt, rDestSize ) );
@@ -84,14 +80,14 @@ void OutputDevice::DrawBitmap( const Point& rDestPt, const Size& rDestSize,
Bitmap aBmp( rBitmap );
if ( mnDrawMode & ( DrawModeFlags::BlackBitmap | DrawModeFlags::WhiteBitmap |
- DrawModeFlags::GrayBitmap | DrawModeFlags::GhostedBitmap ) )
+ DrawModeFlags::GrayBitmap ) )
{
if ( mnDrawMode & ( DrawModeFlags::BlackBitmap | DrawModeFlags::WhiteBitmap ) )
{
sal_uInt8 cCmpVal;
if ( mnDrawMode & DrawModeFlags::BlackBitmap )
- cCmpVal = ( mnDrawMode & DrawModeFlags::GhostedBitmap ) ? 0x80 : 0;
+ cCmpVal = 0;
else
cCmpVal = 255;
@@ -107,9 +103,6 @@ void OutputDevice::DrawBitmap( const Point& rDestPt, const Size& rDestSize,
{
if ( mnDrawMode & DrawModeFlags::GrayBitmap )
aBmp.Convert( BmpConversion::N8BitGreys );
-
- if ( mnDrawMode & DrawModeFlags::GhostedBitmap )
- aBmp.Convert( BmpConversion::Ghosted );
}
}
@@ -296,9 +289,6 @@ void OutputDevice::DrawBitmapEx( const Point& rDestPt, const Size& rDestSize,
}
else
{
- if ( mnDrawMode & DrawModeFlags::NoBitmap )
- return;
-
if ( RasterOp::Invert == meRasterOp )
{
DrawRect( tools::Rectangle( rDestPt, rDestSize ) );
@@ -308,15 +298,15 @@ void OutputDevice::DrawBitmapEx( const Point& rDestPt, const Size& rDestSize,
BitmapEx aBmpEx( rBitmapEx );
if ( mnDrawMode & ( DrawModeFlags::BlackBitmap | DrawModeFlags::WhiteBitmap |
- DrawModeFlags::GrayBitmap | DrawModeFlags::GhostedBitmap ) )
+ DrawModeFlags::GrayBitmap ) )
{
if ( mnDrawMode & ( DrawModeFlags::BlackBitmap | DrawModeFlags::WhiteBitmap ) )
{
- Bitmap aColorBmp( aBmpEx.GetSizePixel(), ( mnDrawMode & DrawModeFlags::GhostedBitmap ) ? 4 : 1 );
+ Bitmap aColorBmp( aBmpEx.GetSizePixel(), 1 );
sal_uInt8 cCmpVal;
if ( mnDrawMode & DrawModeFlags::BlackBitmap )
- cCmpVal = ( mnDrawMode & DrawModeFlags::GhostedBitmap ) ? 0x80 : 0;
+ cCmpVal = 0;
else
cCmpVal = 255;
@@ -342,9 +332,6 @@ void OutputDevice::DrawBitmapEx( const Point& rDestPt, const Size& rDestSize,
{
if ( mnDrawMode & DrawModeFlags::GrayBitmap )
aBmpEx.Convert( BmpConversion::N8BitGreys );
-
- if ( mnDrawMode & DrawModeFlags::GhostedBitmap )
- aBmpEx.Convert( BmpConversion::Ghosted );
}
}
@@ -1175,9 +1162,6 @@ void OutputDevice::DrawTransformedBitmapEx(
if(rBitmapEx.IsEmpty())
return;
- if ( mnDrawMode & DrawModeFlags::NoBitmap )
- return;
-
// decompose matrix to check rotation and shear
basegfx::B2DVector aScale, aTranslate;
double fRotate, fShearX;
@@ -1218,7 +1202,7 @@ void OutputDevice::DrawTransformedBitmapEx(
// we have rotation,shear or mirror, check if some crazy mode needs the
// created transformed bitmap
const bool bInvert(RasterOp::Invert == meRasterOp);
- const bool bBitmapChangedColor(mnDrawMode & (DrawModeFlags::BlackBitmap | DrawModeFlags::WhiteBitmap | DrawModeFlags::GrayBitmap | DrawModeFlags::GhostedBitmap));
+ const bool bBitmapChangedColor(mnDrawMode & (DrawModeFlags::BlackBitmap | DrawModeFlags::WhiteBitmap | DrawModeFlags::GrayBitmap ));
bool bDone(false);
const basegfx::B2DHomMatrix aFullTransform(GetViewTransformation() * rTransformation);
const bool bTryDirectPaint(!bInvert && !bBitmapChangedColor && !bMetafile );
diff --git a/vcl/source/outdev/gradient.cxx b/vcl/source/outdev/gradient.cxx
index aeace07e4710..630d99234273 100644
--- a/vcl/source/outdev/gradient.cxx
+++ b/vcl/source/outdev/gradient.cxx
@@ -50,9 +50,6 @@ void OutputDevice::DrawGradient( const tools::PolyPolygon& rPolyPoly,
{
assert(!is_double_buffered_window());
- if ( mnDrawMode & DrawModeFlags::NoGradient )
- return; // nothing to draw!
-
if ( mbInitClipRegion )
InitClipRegion();
@@ -75,7 +72,7 @@ void OutputDevice::DrawGradient( const tools::PolyPolygon& rPolyPoly,
Gradient aGradient( rGradient );
- if ( mnDrawMode & ( DrawModeFlags::GrayGradient | DrawModeFlags::GhostedGradient ) )
+ if ( mnDrawMode & DrawModeFlags::GrayGradient )
{
SetGrayscaleColors( aGradient );
}
@@ -185,7 +182,7 @@ void OutputDevice::DrawGradientToMetafile ( const tools::PolyPolygon& rPolyPoly,
{
Gradient aGradient( rGradient );
- if ( mnDrawMode & ( DrawModeFlags::GrayGradient | DrawModeFlags::GhostedGradient ) )
+ if ( mnDrawMode & DrawModeFlags::GrayGradient )
{
SetGrayscaleColors( aGradient );
}
@@ -984,20 +981,13 @@ Color OutputDevice::GetSingleColorGradientFill()
else if ( mnDrawMode & DrawModeFlags::SettingsGradient )
aColor = GetSettings().GetStyleSettings().GetWindowColor();
- if ( mnDrawMode & DrawModeFlags::GhostedGradient )
- {
- aColor = Color( ( aColor.GetRed() >> 1 ) | 0x80,
- ( aColor.GetGreen() >> 1 ) | 0x80,
- ( aColor.GetBlue() >> 1 ) | 0x80 );
- }
-
return aColor;
}
void OutputDevice::SetGrayscaleColors( Gradient &rGradient )
{
- // this should only be called with the drawing mode is for grayscale or ghosted gradients
- assert ( mnDrawMode & ( DrawModeFlags::GrayGradient | DrawModeFlags::GhostedGradient ) );
+ // this should only be called with the drawing mode is for grayscale gradients
+ assert ( mnDrawMode & DrawModeFlags::GrayGradient );
Color aStartCol( rGradient.GetStartColor() );
Color aEndCol( rGradient.GetEndColor() );
@@ -1009,17 +999,6 @@ void OutputDevice::SetGrayscaleColors( Gradient &rGradient )
aEndCol = Color( cEndLum, cEndLum, cEndLum );
}
- if ( mnDrawMode & DrawModeFlags::GhostedGradient )
- {
- aStartCol = Color( ( aStartCol.GetRed() >> 1 ) | 0x80,
- ( aStartCol.GetGreen() >> 1 ) | 0x80,
- ( aStartCol.GetBlue() >> 1 ) | 0x80 );
-
- aEndCol = Color( ( aEndCol.GetRed() >> 1 ) | 0x80,
- ( aEndCol.GetGreen() >> 1 ) | 0x80,
- ( aEndCol.GetBlue() >> 1 ) | 0x80 );
- }
-
rGradient.SetStartColor( aStartCol );
rGradient.SetEndColor( aEndCol );
}
diff --git a/vcl/source/outdev/hatch.cxx b/vcl/source/outdev/hatch.cxx
index a5c4f355dcc8..d98773cd95bd 100644
--- a/vcl/source/outdev/hatch.cxx
+++ b/vcl/source/outdev/hatch.cxx
@@ -56,7 +56,7 @@ void OutputDevice::DrawHatch( const tools::PolyPolygon& rPolyPoly, const Hatch&
Hatch aHatch( rHatch );
if ( mnDrawMode & ( DrawModeFlags::BlackLine | DrawModeFlags::WhiteLine |
- DrawModeFlags::GrayLine | DrawModeFlags::GhostedLine |
+ DrawModeFlags::GrayLine |
DrawModeFlags::SettingsLine ) )
{
Color aColor( rHatch.GetColor() );
@@ -75,13 +75,6 @@ void OutputDevice::DrawHatch( const tools::PolyPolygon& rPolyPoly, const Hatch&
aColor = GetSettings().GetStyleSettings().GetFontColor();
}
- if ( mnDrawMode & DrawModeFlags::GhostedLine )
- {
- aColor = Color( ( aColor.GetRed() >> 1 ) | 0x80,
- ( aColor.GetGreen() >> 1 ) | 0x80,
- ( aColor.GetBlue() >> 1 ) | 0x80);
- }
-
aHatch.SetColor( aColor );
}
diff --git a/vcl/source/outdev/outdevstate.cxx b/vcl/source/outdev/outdevstate.cxx
index 8d11aada14fd..3c5a7e6a870c 100644
--- a/vcl/source/outdev/outdevstate.cxx
+++ b/vcl/source/outdev/outdevstate.cxx
@@ -324,7 +324,7 @@ void OutputDevice::SetFillColor( const Color& rColor )
if( mnDrawMode & ( DrawModeFlags::BlackFill | DrawModeFlags::WhiteFill |
DrawModeFlags::GrayFill | DrawModeFlags::NoFill |
- DrawModeFlags::GhostedFill | DrawModeFlags::SettingsFill ) )
+ DrawModeFlags::SettingsFill ) )
{
if( !ImplIsColorTransparent( aColor ) )
{
@@ -349,13 +349,6 @@ void OutputDevice::SetFillColor( const Color& rColor )
{
aColor = GetSettings().GetStyleSettings().GetWindowColor();
}
-
- if( mnDrawMode & DrawModeFlags::GhostedFill )
- {
- aColor = Color( (aColor.GetRed() >> 1) | 0x80,
- (aColor.GetGreen() >> 1) | 0x80,
- (aColor.GetBlue() >> 1) | 0x80);
- }
}
}
@@ -461,9 +454,9 @@ void OutputDevice::SetFont( const vcl::Font& rNewFont )
{
vcl::Font aFont( rNewFont );
- if ( mnDrawMode & (DrawModeFlags::BlackText | DrawModeFlags::WhiteText | DrawModeFlags::GrayText | DrawModeFlags::GhostedText | DrawModeFlags::SettingsText |
+ if ( mnDrawMode & (DrawModeFlags::BlackText | DrawModeFlags::WhiteText | DrawModeFlags::GrayText | DrawModeFlags::SettingsText |
DrawModeFlags::BlackFill | DrawModeFlags::WhiteFill | DrawModeFlags::GrayFill | DrawModeFlags::NoFill |
- DrawModeFlags::GhostedFill | DrawModeFlags::SettingsFill ) )
+ DrawModeFlags::SettingsFill ) )
{
Color aTextColor( aFont.GetColor() );
@@ -479,13 +472,6 @@ void OutputDevice::SetFont( const vcl::Font& rNewFont )
else if ( mnDrawMode & DrawModeFlags::SettingsText )
aTextColor = GetSettings().GetStyleSettings().GetFontColor();
- if ( mnDrawMode & DrawModeFlags::GhostedText )
- {
- aTextColor = Color( (aTextColor.GetRed() >> 1 ) | 0x80,
- (aTextColor.GetGreen() >> 1 ) | 0x80,
- (aTextColor.GetBlue() >> 1 ) | 0x80 );
- }
-
aFont.SetColor( aTextColor );
bool bTransFill = aFont.IsTransparent();
@@ -510,13 +496,6 @@ void OutputDevice::SetFont( const vcl::Font& rNewFont )
bTransFill = true;
}
- if ( !bTransFill && (mnDrawMode & DrawModeFlags::GhostedFill) )
- {
- aTextFillColor = Color( (aTextFillColor.GetRed() >> 1) | 0x80,
- (aTextFillColor.GetGreen() >> 1) | 0x80,
- (aTextFillColor.GetBlue() >> 1) | 0x80 );
- }
-
aFont.SetFillColor( aTextFillColor );
}
}
diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx
index 2bb81ad8da2d..79035ab6d629 100644
--- a/vcl/source/outdev/text.cxx
+++ b/vcl/source/outdev/text.cxx
@@ -663,7 +663,7 @@ void OutputDevice::SetTextColor( const Color& rColor )
Color aColor( rColor );
if ( mnDrawMode & ( DrawModeFlags::BlackText | DrawModeFlags::WhiteText |
- DrawModeFlags::GrayText | DrawModeFlags::GhostedText |
+ DrawModeFlags::GrayText |
DrawModeFlags::SettingsText ) )
{
if ( mnDrawMode & DrawModeFlags::BlackText )
@@ -677,13 +677,6 @@ void OutputDevice::SetTextColor( const Color& rColor )
}
else if ( mnDrawMode & DrawModeFlags::SettingsText )
aColor = GetSettings().GetStyleSettings().GetFontColor();
-
- if ( mnDrawMode & DrawModeFlags::GhostedText )
- {
- aColor = Color( (aColor.GetRed() >> 1) | 0x80,
- (aColor.GetGreen() >> 1) | 0x80,
- (aColor.GetBlue() >> 1) | 0x80 );
- }
}
if ( mpMetaFile )
@@ -724,7 +717,7 @@ void OutputDevice::SetTextFillColor( const Color& rColor )
{
if ( mnDrawMode & ( DrawModeFlags::BlackFill | DrawModeFlags::WhiteFill |
DrawModeFlags::GrayFill | DrawModeFlags::NoFill |
- DrawModeFlags::GhostedFill | DrawModeFlags::SettingsFill ) )
+ DrawModeFlags::SettingsFill ) )
{
if ( mnDrawMode & DrawModeFlags::BlackFill )
aColor = COL_BLACK;
@@ -742,13 +735,6 @@ void OutputDevice::SetTextFillColor( const Color& rColor )
aColor = COL_TRANSPARENT;
bTransFill = true;
}
-
- if ( !bTransFill && (mnDrawMode & DrawModeFlags::GhostedFill) )
- {
- aColor = Color( (aColor.GetRed() >> 1) | 0x80,
- (aColor.GetGreen() >> 1) | 0x80,
- (aColor.GetBlue() >> 1) | 0x80 );
- }
}
}
diff --git a/vcl/source/outdev/textline.cxx b/vcl/source/outdev/textline.cxx
index 7ae959493f09..ba467962a080 100644
--- a/vcl/source/outdev/textline.cxx
+++ b/vcl/source/outdev/textline.cxx
@@ -815,7 +815,7 @@ void OutputDevice::SetTextLineColor( const Color& rColor )
Color aColor( rColor );
if ( mnDrawMode & ( DrawModeFlags::BlackText | DrawModeFlags::WhiteText |
- DrawModeFlags::GrayText | DrawModeFlags::GhostedText |
+ DrawModeFlags::GrayText |
DrawModeFlags::SettingsText ) )
{
if ( mnDrawMode & DrawModeFlags::BlackText )
@@ -835,14 +835,6 @@ void OutputDevice::SetTextLineColor( const Color& rColor )
{
aColor = GetSettings().GetStyleSettings().GetFontColor();
}
-
- if( (mnDrawMode & DrawModeFlags::GhostedText) &&
- (aColor != COL_TRANSPARENT) )
- {
- aColor = Color( (aColor.GetRed() >> 1) | 0x80,
- (aColor.GetGreen() >> 1) | 0x80,
- (aColor.GetBlue() >> 1) | 0x80 );
- }
}
if ( mpMetaFile )
@@ -872,7 +864,7 @@ void OutputDevice::SetOverlineColor( const Color& rColor )
Color aColor( rColor );
if ( mnDrawMode & ( DrawModeFlags::BlackText | DrawModeFlags::WhiteText |
- DrawModeFlags::GrayText | DrawModeFlags::GhostedText |
+ DrawModeFlags::GrayText |
DrawModeFlags::SettingsText ) )
{
if ( mnDrawMode & DrawModeFlags::BlackText )
@@ -892,14 +884,6 @@ void OutputDevice::SetOverlineColor( const Color& rColor )
{
aColor = GetSettings().GetStyleSettings().GetFontColor();
}
-
- if( (mnDrawMode & DrawModeFlags::GhostedText) &&
- (aColor != COL_TRANSPARENT) )
- {
- aColor = Color( (aColor.GetRed() >> 1) | 0x80,
- (aColor.GetGreen() >> 1) | 0x80,
- (aColor.GetBlue() >> 1) | 0x80 );
- }
}
if ( mpMetaFile )
diff --git a/vcl/source/outdev/transparent.cxx b/vcl/source/outdev/transparent.cxx
index fdb3115b2812..ce072678a7f2 100644
--- a/vcl/source/outdev/transparent.cxx
+++ b/vcl/source/outdev/transparent.cxx
@@ -82,7 +82,7 @@ Color OutputDevice::ImplDrawModeToColor( const Color& rColor ) const
DrawModeFlags nDrawMode = GetDrawMode();
if( nDrawMode & ( DrawModeFlags::BlackLine | DrawModeFlags::WhiteLine |
- DrawModeFlags::GrayLine | DrawModeFlags::GhostedLine |
+ DrawModeFlags::GrayLine |
DrawModeFlags::SettingsLine ) )
{
if( !ImplIsColorTransparent( aColor ) )
@@ -104,13 +104,6 @@ Color OutputDevice::ImplDrawModeToColor( const Color& rColor ) const
{
aColor = GetSettings().GetStyleSettings().GetFontColor();
}
-
- if( nDrawMode & DrawModeFlags::GhostedLine )
- {
- aColor = Color( ( aColor.GetRed() >> 1 ) | 0x80,
- ( aColor.GetGreen() >> 1 ) | 0x80,
- ( aColor.GetBlue() >> 1 ) | 0x80);
- }
}
}
return aColor;
commit b3505dd7adcfd4483c4af181c15eef31bf04a846
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Fri Nov 23 15:20:54 2018 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Mon Nov 26 19:13:08 2018 +0100
remove unused enum value ConvertDataFormat::PDF
Change-Id: I61023dc049b914fee1d5d8918b99972d34a82b4a
Reviewed-on: https://gerrit.libreoffice.org/64042
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/comphelper/source/misc/graphicmimetype.cxx b/comphelper/source/misc/graphicmimetype.cxx
index 4c335f348173..8dd188767936 100644
--- a/comphelper/source/misc/graphicmimetype.cxx
+++ b/comphelper/source/misc/graphicmimetype.cxx
@@ -114,8 +114,6 @@ OUString GraphicMimeTypeHelper::GetMimeTypeForConvertDataFormat(ConvertDataForma
return OUString("image/x-emf");
case ConvertDataFormat::SVG:
return OUString("image/svg+xml");
- case ConvertDataFormat::PDF:
- return OUString("application/pdf");
case ConvertDataFormat::MET: // What is this?
case ConvertDataFormat::Unknown:
default:
diff --git a/compilerplugins/clang/unusedenumconstants.readonly.results b/compilerplugins/clang/unusedenumconstants.readonly.results
index 0c0bad002db6..96d5d1a5c68c 100644
--- a/compilerplugins/clang/unusedenumconstants.readonly.results
+++ b/compilerplugins/clang/unusedenumconstants.readonly.results
@@ -1068,8 +1068,6 @@ include/vcl/ptrstyle.hxx:78
enum PointerStyle CopyFiles
include/vcl/ptrstyle.hxx:92
enum PointerStyle Chart
-include/vcl/salctype.hxx:41
- enum ConvertDataFormat PDF
include/vcl/vclenum.hxx:37
enum MenuItemBits POPUPSELECT
include/vcl/vclenum.hxx:143
diff --git a/include/vcl/salctype.hxx b/include/vcl/salctype.hxx
index 73b29b1e97d7..c5c2975b338f 100644
--- a/include/vcl/salctype.hxx
+++ b/include/vcl/salctype.hxx
@@ -37,8 +37,7 @@ enum class ConvertDataFormat
TIF,
WMF,
EMF,
- SVG,
- PDF
+ SVG
};
class SvStream;
diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx
index efe986c71977..2f1c15df344d 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -2497,7 +2497,6 @@ IMPL_LINK( GraphicFilter, FilterCallback, ConvertData&, rData, bool )
case ConvertDataFormat::WMF: aShortName = WMF_SHORTNAME; break;
case ConvertDataFormat::EMF: aShortName = EMF_SHORTNAME; break;
case ConvertDataFormat::SVG: aShortName = SVG_SHORTNAME; break;
- case ConvertDataFormat::PDF: aShortName = PDF_SHORTNAME; break;
default:
break;
More information about the Libreoffice-commits
mailing list