Kaydet (Commit) b3fd1d5e authored tarafından Miklos Vajna's avatar Miklos Vajna

Use SdrModel::isTiledRendering()

It turns out that in case the is-tiled-rendering flag is part of the sdr
model, then that's enough for all the places where so far used a flag on
the output device for this purpose, so change the two users of that
method to use SdrModel::isTiledRendering(), and clean up the now unused
one.

Change-Id: Ife6d3d7e093c04b707497d9588942b38bcd8742d
üst 40e3569a
......@@ -607,7 +607,6 @@ void doc_paintTile (LibreOfficeKitDocument* pThis,
aDevice.SetOutputSizePixelScaleOffsetAndBuffer(
Size(nCanvasWidth, nCanvasHeight), Fraction(1.0), Point(),
aBuffer, true );
aDevice.setTiledRendering(true);
pDoc->paintTile(aDevice, nCanvasWidth, nCanvasHeight,
nTilePosX, nTilePosY, nTileWidth, nTileHeight);
......
......@@ -275,8 +275,6 @@ private:
ImplOutDevData* mpOutDevData;
std::vector< VCLXGraphics* >* mpUnoGraphicsList;
vcl::PDFWriterImpl* mpPDFWriter;
/// Set if we are doing the tiled rendering.
bool mbTiledRendering;
vcl::ExtOutDevData* mpExtOutDevData;
// TEMP TEMP TEMP
......@@ -478,11 +476,6 @@ public:
void SetExtOutDevData( vcl::ExtOutDevData* pExtOutDevData ) { mpExtOutDevData = pExtOutDevData; }
vcl::ExtOutDevData* GetExtOutDevData() const { return mpExtOutDevData; }
/// Set if we are doing tiled rendering.
void setTiledRendering(bool bTiledRendering);
/// Are we doing tiled rendering?
bool isTiledRendering() const;
///@}
......
......@@ -308,7 +308,7 @@ void SdrObjEditView::TextEditDrawing(SdrPaintWindow& rPaintWindow) const
{
OutlinerView* pOLV = pActiveOutliner->GetView(i);
if(pOLV->GetWindow() == &rPaintWindow.GetOutputDevice() || rPaintWindow.GetOutputDevice().isTiledRendering())
if(pOLV->GetWindow() == &rPaintWindow.GetOutputDevice() || GetModel()->isTiledRendering())
{
ImpPaintOutlinerView(*pOLV, aCheckRect, rPaintWindow.GetTargetOutputDevice());
return;
......
......@@ -736,7 +736,7 @@ void SdrPaintView::DoCompleteRedraw(SdrPaintWindow& rPaintWindow, const vcl::Reg
void SdrPaintView::EndCompleteRedraw(SdrPaintWindow& rPaintWindow, bool bPaintFormLayer)
{
std::unique_ptr<SdrPaintWindow> pPaintWindow;
if (rPaintWindow.GetOutputDevice().isTiledRendering() && rPaintWindow.getTemporaryTarget())
if (GetModel()->isTiledRendering() && rPaintWindow.getTemporaryTarget())
{
// Tiled rendering, we must paint the TextEdit to the output device.
pPaintWindow.reset(&rPaintWindow);
......
......@@ -99,7 +99,6 @@ OutputDevice::OutputDevice() :
mpOutDevStateStack = new OutDevStateStack;
mpPDFWriter = NULL;
mpAlphaVDev = NULL;
mbTiledRendering = false;
mpExtOutDevData = NULL;
mnOutOffX = 0;
mnOutOffY = 0;
......@@ -398,16 +397,6 @@ bool OutputDevice::SupportsOperation( OutDevSupportType eType ) const
return bHasSupport;
}
void OutputDevice::setTiledRendering(bool bTiledRendering)
{
mbTiledRendering = bTiledRendering;
}
bool OutputDevice::isTiledRendering() const
{
return mbTiledRendering;
}
// Direct OutputDevice drawing public functions
void OutputDevice::DrawOutDev( const Point& rDestPt, const Size& rDestSize,
......
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