Kaydet (Commit) c8431b7f authored tarafından Markus Mohrhard's avatar Markus Mohrhard Kaydeden (comit) Markus Mohrhard

remove unused code and const-ify some methods

Change-Id: I4c8da0cdf39f31ec757e87687dcec79a4ac83681
üst 2e4b89bb
...@@ -194,14 +194,13 @@ public: ...@@ -194,14 +194,13 @@ public:
HFONT ImplDoSetFont( FontSelectPattern* i_pFont, float& o_rFontScale, HFONT& o_rOldFont ); HFONT ImplDoSetFont( FontSelectPattern* i_pFont, float& o_rFontScale, HFONT& o_rOldFont );
public: public:
explicit WinSalGraphics();
explicit WinSalGraphics(WinSalGraphics::Type eType, bool bScreen); explicit WinSalGraphics(WinSalGraphics::Type eType, bool bScreen);
virtual ~WinSalGraphics(); virtual ~WinSalGraphics();
bool isPrinter(); bool isPrinter() const;
bool isVirtualDevice(); bool isVirtualDevice() const;
bool isWindow(); bool isWindow() const;
bool isScreen(); bool isScreen() const;
protected: protected:
virtual bool setClipRegion( const vcl::Region& ); virtual bool setClipRegion( const vcl::Region& );
......
...@@ -554,44 +554,6 @@ void ImplClearHDCCache( SalData* pData ) ...@@ -554,44 +554,6 @@ void ImplClearHDCCache( SalData* pData )
} }
} }
WinSalGraphics::WinSalGraphics():
mpImpl(new WinSalGraphicsImpl(*this)),
mhLocalDC(0),
mbPrinter(false),
mbVirDev(false),
mbWindow(false),
mbScreen(false),
mfCurrentFontScale(1.0),
mhRegion(0),
mhDefPen(0),
mhDefBrush(0),
mhDefFont(0),
mhDefPal(0),
mpStdClipRgnData(NULL),
mpLogFont(NULL),
mpFontCharSets(NULL),
mpFontAttrCache(NULL),
mnFontCharSetCount(0),
mpFontKernPairs(NULL),
mnFontKernPairCount(0),
mbFontKernInit(false),
mnPenWidth(GSL_PEN_WIDTH)
{
for( int i = 0; i < MAX_FALLBACK; ++i )
{
mhFonts[ i ] = 0;
mpWinFontData[ i ] = NULL;
mpWinFontEntry[ i ] = NULL;
mfFontScale[ i ] = 1.0;
}
static const char* pEnv = getenv("USE_OPENGL");
if (pEnv)
{
mpImpl.reset(new OpenGLSalGraphicsImpl());
}
}
WinSalGraphics::WinSalGraphics(WinSalGraphics::Type eType, bool bScreen): WinSalGraphics::WinSalGraphics(WinSalGraphics::Type eType, bool bScreen):
mpImpl(new WinSalGraphicsImpl(*this)), mpImpl(new WinSalGraphicsImpl(*this)),
mhLocalDC(0), mhLocalDC(0),
...@@ -651,22 +613,22 @@ WinSalGraphics::~WinSalGraphics() ...@@ -651,22 +613,22 @@ WinSalGraphics::~WinSalGraphics()
delete mpFontKernPairs; delete mpFontKernPairs;
} }
bool WinSalGraphics::isPrinter() bool WinSalGraphics::isPrinter() const
{ {
return mbPrinter; return mbPrinter;
} }
bool WinSalGraphics::isVirtualDevice() bool WinSalGraphics::isVirtualDevice() const
{ {
return mbVirDev; return mbVirDev;
} }
bool WinSalGraphics::isWindow() bool WinSalGraphics::isWindow() const
{ {
return mbWindow; return mbWindow;
} }
bool WinSalGraphics::isScreen() bool WinSalGraphics::isScreen() const
{ {
return mbScreen; return mbScreen;
} }
......
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