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