Kaydet (Commit) ba51e421 authored tarafından Noel Grandin's avatar Noel Grandin

remove unused GraphicManagerDrawFlags enum value

Change-Id: I9e832da8f6b7a90d72c07ab712cbe00774496b76
Reviewed-on: https://gerrit.libreoffice.org/64060
Tested-by: Jenkins
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst f7934ebc
...@@ -884,8 +884,6 @@ include/vcl/fontcapabilities.hxx:191 ...@@ -884,8 +884,6 @@ include/vcl/fontcapabilities.hxx:191
enum vcl::CodePageCoverage::CodePageCoverageEnum CP850 enum vcl::CodePageCoverage::CodePageCoverageEnum CP850
include/vcl/fontcapabilities.hxx:192 include/vcl/fontcapabilities.hxx:192
enum vcl::CodePageCoverage::CodePageCoverageEnum CP437 enum vcl::CodePageCoverage::CodePageCoverageEnum CP437
include/vcl/GraphicObject.hxx:36
enum GraphicManagerDrawFlags USE_DRAWMODE_SETTINGS
include/vcl/GraphicObject.hxx:55 include/vcl/GraphicObject.hxx:55
enum GraphicAdjustmentFlags DRAWMODE enum GraphicAdjustmentFlags DRAWMODE
include/vcl/GraphicObject.hxx:56 include/vcl/GraphicObject.hxx:56
......
...@@ -33,12 +33,11 @@ enum class GraphicManagerDrawFlags ...@@ -33,12 +33,11 @@ enum class GraphicManagerDrawFlags
{ {
CACHED = 0x01, CACHED = 0x01,
SMOOTHSCALE = 0x02, SMOOTHSCALE = 0x02,
USE_DRAWMODE_SETTINGS = 0x04, STANDARD = CACHED | SMOOTHSCALE,
STANDARD = (CACHED|SMOOTHSCALE),
}; };
namespace o3tl namespace o3tl
{ {
template<> struct typed_flags<GraphicManagerDrawFlags> : is_typed_flags<GraphicManagerDrawFlags, 0x07> {}; template<> struct typed_flags<GraphicManagerDrawFlags> : is_typed_flags<GraphicManagerDrawFlags, 0x02> {};
} }
// Adjustment defines // Adjustment defines
...@@ -255,8 +254,7 @@ private: ...@@ -255,8 +254,7 @@ private:
int nNumTilesX, int nNumTilesX,
int nNumTilesY, int nNumTilesY,
const Size& rTileSize, const Size& rTileSize,
const GraphicAttr* pAttr, const GraphicAttr* pAttr
GraphicManagerDrawFlags nFlags
); );
void VCL_DLLPRIVATE ImplTransformBitmap( void VCL_DLLPRIVATE ImplTransformBitmap(
...@@ -336,8 +334,7 @@ public: ...@@ -336,8 +334,7 @@ public:
OutputDevice* pOut, OutputDevice* pOut,
const Point& rPt, const Point& rPt,
const Size& rSz, const Size& rSz,
const GraphicAttr* pAttr = nullptr, const GraphicAttr* pAttr = nullptr
GraphicManagerDrawFlags nFlags = GraphicManagerDrawFlags::STANDARD
); );
/** Draw the graphic repeatedly into the given output rectangle /** Draw the graphic repeatedly into the given output rectangle
......
...@@ -463,7 +463,7 @@ void GraphicObject::SetUserData( const OUString& rUserData ) ...@@ -463,7 +463,7 @@ void GraphicObject::SetUserData( const OUString& rUserData )
} }
bool GraphicObject::Draw( OutputDevice* pOut, const Point& rPt, const Size& rSz, bool GraphicObject::Draw( OutputDevice* pOut, const Point& rPt, const Size& rSz,
const GraphicAttr* pAttr, GraphicManagerDrawFlags nFlags ) const GraphicAttr* pAttr )
{ {
GraphicAttr aAttr( pAttr ? *pAttr : GetAttr() ); GraphicAttr aAttr( pAttr ? *pAttr : GetAttr() );
Point aPt( rPt ); Point aPt( rPt );
...@@ -475,7 +475,6 @@ bool GraphicObject::Draw( OutputDevice* pOut, const Point& rPt, const Size& rSz, ...@@ -475,7 +475,6 @@ bool GraphicObject::Draw( OutputDevice* pOut, const Point& rPt, const Size& rSz,
// #i29534# Provide output rects for PDF writer // #i29534# Provide output rects for PDF writer
tools::Rectangle aCropRect; tools::Rectangle aCropRect;
if( !( GraphicManagerDrawFlags::USE_DRAWMODE_SETTINGS & nFlags ) )
pOut->SetDrawMode( nOldDrawMode & ~DrawModeFlags( DrawModeFlags::SettingsLine | DrawModeFlags::SettingsFill | DrawModeFlags::SettingsText | DrawModeFlags::SettingsGradient ) ); pOut->SetDrawMode( nOldDrawMode & ~DrawModeFlags( DrawModeFlags::SettingsLine | DrawModeFlags::SettingsFill | DrawModeFlags::SettingsText | DrawModeFlags::SettingsGradient ) );
// mirrored horizontically // mirrored horizontically
......
...@@ -178,7 +178,7 @@ bool GraphicObject::ImplRenderTileRecursive( VirtualDevice& rVDev, int nExponent ...@@ -178,7 +178,7 @@ bool GraphicObject::ImplRenderTileRecursive( VirtualDevice& rVDev, int nExponent
Point aCurrPos(aTileInfo.aNextTileTopLeft.X(), aTileInfo.aTileTopLeft.Y()); Point aCurrPos(aTileInfo.aNextTileTopLeft.X(), aTileInfo.aTileTopLeft.Y());
for (int nX=0; nX < aTileInfo.nTilesEmptyX; nX += nMSBFactor) for (int nX=0; nX < aTileInfo.nTilesEmptyX; nX += nMSBFactor)
{ {
if (!pTileGraphic->Draw(&rVDev, aCurrPos, aTileInfo.aTileSizePixel, pAttr, nFlags)) if (!pTileGraphic->Draw(&rVDev, aCurrPos, aTileInfo.aTileSizePixel, pAttr))
return false; return false;
aCurrPos.AdjustX(aTileInfo.aTileSizePixel.Width() ); aCurrPos.AdjustX(aTileInfo.aTileSizePixel.Width() );
...@@ -199,7 +199,7 @@ bool GraphicObject::ImplRenderTileRecursive( VirtualDevice& rVDev, int nExponent ...@@ -199,7 +199,7 @@ bool GraphicObject::ImplRenderTileRecursive( VirtualDevice& rVDev, int nExponent
aCurrPos.setY( aTileInfo.aNextTileTopLeft.Y() ); aCurrPos.setY( aTileInfo.aNextTileTopLeft.Y() );
for (int nY=0; nY < aTileInfo.nTilesEmptyY; nY += nMSBFactor) for (int nY=0; nY < aTileInfo.nTilesEmptyY; nY += nMSBFactor)
{ {
if (!pTileGraphic->Draw(&rVDev, aCurrPos, aTileInfo.aTileSizePixel, pAttr, nFlags)) if (!pTileGraphic->Draw(&rVDev, aCurrPos, aTileInfo.aTileSizePixel, pAttr))
return false; return false;
aCurrPos.AdjustY(aTileInfo.aTileSizePixel.Height() ); aCurrPos.AdjustY(aTileInfo.aTileSizePixel.Height() );
...@@ -259,7 +259,7 @@ bool GraphicObject::ImplRenderTileRecursive( VirtualDevice& rVDev, int nExponent ...@@ -259,7 +259,7 @@ bool GraphicObject::ImplRenderTileRecursive( VirtualDevice& rVDev, int nExponent
{ {
if( bNoFirstTileDraw ) if( bNoFirstTileDraw )
bNoFirstTileDraw = false; // don't draw first tile position bNoFirstTileDraw = false; // don't draw first tile position
else if (!pTileGraphic->Draw(&rVDev, aCurrPos, aTileInfo.aTileSizePixel, pAttr, nFlags)) else if (!pTileGraphic->Draw(&rVDev, aCurrPos, aTileInfo.aTileSizePixel, pAttr))
return false; return false;
aCurrPos.AdjustX(aTileInfo.aTileSizePixel.Width() ); aCurrPos.AdjustX(aTileInfo.aTileSizePixel.Width() );
...@@ -378,7 +378,7 @@ bool GraphicObject::ImplDrawTiled( OutputDevice* pOut, const tools::Rectangle& r ...@@ -378,7 +378,7 @@ bool GraphicObject::ImplDrawTiled( OutputDevice* pOut, const tools::Rectangle& r
bRet = ImplDrawTiled( *pOut, aOutStart, bRet = ImplDrawTiled( *pOut, aOutStart,
(aOutArea.GetWidth() + aOutArea.Left() - aOutStart.X() + rSizePixel.Width() - 1) / rSizePixel.Width(), (aOutArea.GetWidth() + aOutArea.Left() - aOutStart.X() + rSizePixel.Width() - 1) / rSizePixel.Width(),
(aOutArea.GetHeight() + aOutArea.Top() - aOutStart.Y() + rSizePixel.Height() - 1) / rSizePixel.Height(), (aOutArea.GetHeight() + aOutArea.Top() - aOutStart.Y() + rSizePixel.Height() - 1) / rSizePixel.Height(),
rSizePixel, pAttr, nFlags ); rSizePixel, pAttr );
pOut->Pop(); pOut->Pop();
} }
...@@ -388,7 +388,7 @@ bool GraphicObject::ImplDrawTiled( OutputDevice* pOut, const tools::Rectangle& r ...@@ -388,7 +388,7 @@ bool GraphicObject::ImplDrawTiled( OutputDevice* pOut, const tools::Rectangle& r
bool GraphicObject::ImplDrawTiled( OutputDevice& rOut, const Point& rPosPixel, bool GraphicObject::ImplDrawTiled( OutputDevice& rOut, const Point& rPosPixel,
int nNumTilesX, int nNumTilesY, int nNumTilesX, int nNumTilesY,
const Size& rTileSizePixel, const GraphicAttr* pAttr, GraphicManagerDrawFlags nFlags ) const Size& rTileSizePixel, const GraphicAttr* pAttr )
{ {
Point aCurrPos( rPosPixel ); Point aCurrPos( rPosPixel );
Size aTileSizeLogic( rOut.PixelToLogic( rTileSizePixel ) ); Size aTileSizeLogic( rOut.PixelToLogic( rTileSizePixel ) );
...@@ -420,7 +420,7 @@ bool GraphicObject::ImplDrawTiled( OutputDevice& rOut, const Point& rPosPixel, ...@@ -420,7 +420,7 @@ bool GraphicObject::ImplDrawTiled( OutputDevice& rOut, const Point& rPosPixel,
bRet |= Draw( &rOut, bRet |= Draw( &rOut,
bDrawInPixel ? aCurrPos : rOut.PixelToLogic( aCurrPos ), bDrawInPixel ? aCurrPos : rOut.PixelToLogic( aCurrPos ),
bDrawInPixel ? rTileSizePixel : aTileSizeLogic, bDrawInPixel ? rTileSizePixel : aTileSizeLogic,
pAttr, nFlags ); pAttr );
aCurrPos.AdjustX(rTileSizePixel.Width() ); aCurrPos.AdjustX(rTileSizePixel.Width() );
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment