Kaydet (Commit) 11e83bc7 authored tarafından Noel Grandin's avatar Noel Grandin Kaydeden (comit) Michael Meeks

wrap some more OutputDevice in VclPtr

Change-Id: I6f4a74bf56543e4d31d3b84a0cd2830d4f4d669a
üst 61b224f3
......@@ -2379,7 +2379,7 @@ void SvxNumberingPreview::Paint( const Rectangle& /*rRect*/ )
const Color aBackColor = rStyleSettings.GetFieldColor();
const Color aTextColor = rStyleSettings.GetFieldTextColor();
boost::scoped_ptr<VirtualDevice> pVDev(new VirtualDevice(*this));
ScopedVclPtr<VirtualDevice> pVDev(new VirtualDevice(*this));
pVDev->EnableRTL( IsRTLEnabled() );
pVDev->SetMapMode(GetMapMode());
pVDev->SetOutputSize( aSize );
......
......@@ -588,7 +588,7 @@ private:
private:
ScDocument& mrDoc;
OutputDevice* mpOutDev;
VclPtr<OutputDevice> mpOutDev;
double mfPPTX;
double mfPPTY;
const ::std::vector<TabRanges>* mpTabRangesArray;
......
......@@ -41,7 +41,7 @@ class ScEditUtil
SCROW nRow;
SCTAB nTab;
Point aScrPos;
OutputDevice* pDev; // MapMode has to be set
VclPtr<OutputDevice> pDev; // MapMode has to be set
double nPPTX;
double nPPTY;
Fraction aZoomX;
......@@ -80,10 +80,7 @@ public:
ScEditUtil( ScDocument* pDocument, SCCOL nX, SCROW nY, SCTAB nZ,
const Point& rScrPosPixel,
OutputDevice* pDevice, double nScaleX, double nScaleY,
const Fraction& rX, const Fraction& rY ) :
pDoc(pDocument),nCol(nX),nRow(nY),nTab(nZ),
aScrPos(rScrPosPixel),pDev(pDevice),
nPPTX(nScaleX),nPPTY(nScaleY),aZoomX(rX),aZoomY(rY) {}
const Fraction& rX, const Fraction& rY );
Rectangle GetEditArea( const ScPatternAttr* pPattern, bool bForceToTop );
};
......
......@@ -13,11 +13,11 @@
#include "scdllapi.h"
#include <tools/fract.hxx>
#include <vcl/vclptr.hxx>
#include <vcl/outdev.hxx>
#include <vector>
class OutputDevice;
namespace sc {
class SC_DLLPUBLIC RowHeightContext
......@@ -28,7 +28,7 @@ class SC_DLLPUBLIC RowHeightContext
double mfPPTY;
Fraction maZoomX;
Fraction maZoomY;
OutputDevice* mpOutDev;
VclPtr<OutputDevice> mpOutDev;
sal_uInt16 mnExtraHeight;
bool mbForceAutoSize; /// whether to set height to optimal even when the manual height flag is set.
......
......@@ -53,6 +53,14 @@ using namespace com::sun::star;
// STATIC DATA
// Delimiters zusaetzlich zu EditEngine-Default:
ScEditUtil::ScEditUtil( ScDocument* pDocument, SCCOL nX, SCROW nY, SCTAB nZ,
const Point& rScrPosPixel,
OutputDevice* pDevice, double nScaleX, double nScaleY,
const Fraction& rX, const Fraction& rY ) :
pDoc(pDocument),nCol(nX),nRow(nY),nTab(nZ),
aScrPos(rScrPosPixel),pDev(pDevice),
nPPTX(nScaleX),nPPTY(nScaleY),aZoomX(rX),aZoomY(rY) {}
OUString ScEditUtil::ModifyDelimiters( const OUString& rOld )
{
// underscore is used in function argument names
......
......@@ -60,7 +60,7 @@ private:
bool bState );
protected:
OutputDevice* pOut;
VclPtr<OutputDevice> pOut;
Point aBtnPos;
Size aBtnSize;
};
......
......@@ -32,8 +32,8 @@ class ScAccessibleCsvControl;
class SC_DLLPUBLIC ScCsvRuler : public ScCsvControl
{
private:
VirtualDevice maBackgrDev; /// Ruler background, scaling.
VirtualDevice maRulerDev; /// Ruler with splits and cursor.
ScopedVclPtr<VirtualDevice> maBackgrDev; /// Ruler background, scaling.
ScopedVclPtr<VirtualDevice> maRulerDev; /// Ruler with splits and cursor.
Color maBackColor; /// Background color.
Color maActiveColor; /// Color for active part of ruler.
......
......@@ -34,7 +34,7 @@ class SdrUndoManager;
class ScDrawView: public FmFormView
{
ScViewData* pViewData;
OutputDevice* pDev; //! needed ?
VclPtr<OutputDevice> pDev; //! needed ?
ScDocument* pDoc;
SCTAB nTab;
Fraction aScaleX; // Factor for Drawing-MapMode
......
......@@ -82,7 +82,7 @@ public:
class ScPreviewLocationData
{
OutputDevice* pWindow;
VclPtr<OutputDevice> pWindow;
ScDocument* pDoc;
MapMode aCellMapMode;
MapMode aDrawMapMode[SC_PREVIEW_MAXRANGES];
......
......@@ -131,7 +131,7 @@ private:
ScDocShell* pDocShell;
ScDocument* pDoc;
SfxPrinter* pPrinter;
OutputDevice* pDev;
VclPtr<OutputDevice> pDev;
FmFormView* pDrawView;
MapMode aOldPrinterMode; // MapMode before the call
......
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