diff options
author | Noel Grandin <noel@peralex.com> | 2015-07-07 13:58:41 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-07-08 09:51:27 +0200 |
commit | 449d272daf5e99f039cdfdd25f020bd798fb9e1d (patch) | |
tree | fad3597606f3fbae275ff990aac45ad8f00e1c86 /include/vcl | |
parent | b43fde69caf456585004b3e1da5161d76eadf057 (diff) |
loplugin:unusedmethods vcl
Change-Id: I98b88ca3369a2c888fd63796e39d42376d513002
Diffstat (limited to 'include/vcl')
-rw-r--r-- | include/vcl/accel.hxx | 9 | ||||
-rw-r--r-- | include/vcl/alpha.hxx | 3 | ||||
-rw-r--r-- | include/vcl/animate.hxx | 11 | ||||
-rw-r--r-- | include/vcl/bitmap.hxx | 1 | ||||
-rw-r--r-- | include/vcl/bitmapex.hxx | 3 | ||||
-rw-r--r-- | include/vcl/bmpacc.hxx | 24 | ||||
-rw-r--r-- | include/vcl/cmdevt.hxx | 38 | ||||
-rw-r--r-- | include/vcl/cursor.hxx | 5 | ||||
-rw-r--r-- | include/vcl/event.hxx | 7 | ||||
-rw-r--r-- | include/vcl/gdimtf.hxx | 2 | ||||
-rw-r--r-- | include/vcl/gfxlink.hxx | 4 | ||||
-rw-r--r-- | include/vcl/gradient.hxx | 2 | ||||
-rw-r--r-- | include/vcl/graph.h | 2 | ||||
-rw-r--r-- | include/vcl/hatch.hxx | 1 | ||||
-rw-r--r-- | include/vcl/inputctx.hxx | 1 | ||||
-rw-r--r-- | include/vcl/lineinfo.hxx | 1 | ||||
-rw-r--r-- | include/vcl/metaact.hxx | 102 | ||||
-rw-r--r-- | include/vcl/metric.hxx | 1 | ||||
-rw-r--r-- | include/vcl/opengl/OpenGLContext.hxx | 5 | ||||
-rw-r--r-- | include/vcl/outdev.hxx | 28 | ||||
-rw-r--r-- | include/vcl/region.hxx | 1 | ||||
-rw-r--r-- | include/vcl/salbtype.hxx | 27 | ||||
-rw-r--r-- | include/vcl/scheduler.hxx | 2 | ||||
-rw-r--r-- | include/vcl/virdev.hxx | 1 | ||||
-rw-r--r-- | include/vcl/wall.hxx | 2 | ||||
-rw-r--r-- | include/vcl/window.hxx | 11 |
26 files changed, 2 insertions, 292 deletions
diff --git a/include/vcl/accel.hxx b/include/vcl/accel.hxx index 0459f04266b3..f8491bcbf168 100644 --- a/include/vcl/accel.hxx +++ b/include/vcl/accel.hxx @@ -77,8 +77,6 @@ public: sal_uInt16 GetCurItemId() const { return mnCurId; } const vcl::KeyCode& GetCurKeyCode() const { return maCurKeyCode; } - sal_uInt16 GetCurRepeat() const { return mnCurRepeat; } - bool IsCancel() const { return mbIsCancel; } sal_uInt16 GetItemCount() const; sal_uInt16 GetItemId( sal_uInt16 nPos ) const; @@ -86,15 +84,8 @@ public: Accelerator* GetAccel( sal_uInt16 nItemId ) const; - void SetHelpText( const OUString& rHelpText ) { maHelpStr = rHelpText; } - const OUString& GetHelpText() const { return maHelpStr; } - void SetActivateHdl( const Link<>& rLink ) { maActivateHdl = rLink; } - const Link<>& GetActivateHdl() const { return maActivateHdl; } - void SetDeactivateHdl( const Link<>& rLink ) { maDeactivateHdl = rLink; } - const Link<>& GetDeactivateHdl() const { return maDeactivateHdl; } void SetSelectHdl( const Link<>& rLink ) { maSelectHdl = rLink; } - const Link<>& GetSelectHdl() const { return maSelectHdl; } Accelerator& operator=( const Accelerator& rAccel ); }; diff --git a/include/vcl/alpha.hxx b/include/vcl/alpha.hxx index ec89be425e12..13cf4f873e0b 100644 --- a/include/vcl/alpha.hxx +++ b/include/vcl/alpha.hxx @@ -43,14 +43,11 @@ public: bool operator==( const AlphaMask& rAlphaMask ) const { return Bitmap::operator==( rAlphaMask ); } bool operator!=( const AlphaMask& rAlphaMask ) const { return Bitmap::operator!=( rAlphaMask ); } - const MapMode& GetPrefMapMode() const { return Bitmap::GetPrefMapMode(); } void SetPrefMapMode( const MapMode& rMapMode ) { Bitmap::SetPrefMapMode( rMapMode ); } - const Size& GetPrefSize() const { return Bitmap::GetPrefSize(); } void SetPrefSize( const Size& rSize ) { Bitmap::SetPrefSize( rSize ); } Size GetSizePixel() const { return Bitmap::GetSizePixel(); } - sal_uLong GetSizeBytes() const { return Bitmap::GetSizeBytes(); } sal_uLong GetChecksum() const { return Bitmap::GetChecksum(); } diff --git a/include/vcl/animate.hxx b/include/vcl/animate.hxx index 1f2a6b8b3920..2ef68e723fa1 100644 --- a/include/vcl/animate.hxx +++ b/include/vcl/animate.hxx @@ -87,15 +87,6 @@ struct VCL_DLLPUBLIC AnimationBitmap bool operator!=( const AnimationBitmap& rAnimBmp ) const { return !( *this == rAnimBmp ); } - bool IsEqual( const AnimationBitmap& rAnimBmp ) const - { - return( rAnimBmp.aPosPix == aPosPix && - rAnimBmp.aSizePix == aSizePix && - rAnimBmp.nWait == nWait && - rAnimBmp.eDisposal == eDisposal && - rAnimBmp.bUserInput == bUserInput && - rAnimBmp.aBmpEx.IsEqual( aBmpEx ) ); - } sal_uLong GetChecksum() const; }; @@ -148,7 +139,6 @@ public: bool IsInAnimation() const { return mbIsInAnimation; } bool IsTransparent() const; - bool IsTerminated() const { return mbLoopTerminated; } const Size& GetDisplaySizePixel() const { return maGlobalSize; } void SetDisplaySizePixel( const Size& rSize ) { maGlobalSize = rSize; } @@ -160,7 +150,6 @@ public: void SetLoopCount( const sal_uLong nLoopCount ); void ResetLoopCount(); - void SetCycleMode( CycleMode eMode ); CycleMode GetCycleMode() const { return meCycleMode; } void SetNotifyHdl( const Link<>& rLink ) { maNotifyLink = rLink; } diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx index 9d80820e7629..16a6fb8087a2 100644 --- a/include/vcl/bitmap.hxx +++ b/include/vcl/bitmap.hxx @@ -389,7 +389,6 @@ public: sal_uLong GetChecksum() const; Bitmap CreateDisplayBitmap( OutputDevice* pDisplay ); - Bitmap GetColorTransformedBitmap() const; static const BitmapPalette& GetGreyPalette( int nEntries ); diff --git a/include/vcl/bitmapex.hxx b/include/vcl/bitmapex.hxx index 3eee859c6e6b..c63758d074b7 100644 --- a/include/vcl/bitmapex.hxx +++ b/include/vcl/bitmapex.hxx @@ -77,8 +77,6 @@ public: Bitmap GetBitmap( const Color* pTransReplaceColor = NULL ) const; Bitmap GetMask() const; - BitmapEx GetColorTransformedBitmapEx() const; - bool IsAlpha() const; AlphaMask GetAlpha() const; @@ -92,7 +90,6 @@ public: void SetPrefMapMode( const MapMode& rPrefMapMode ) { aBitmap.SetPrefMapMode( rPrefMapMode ); } const Color& GetTransparentColor() const { return aTransparentColor; } - void SetTransparentColor( const Color& rColor ) { aTransparentColor = rColor; } sal_uInt16 GetBitCount() const { return aBitmap.GetBitCount(); } sal_uLong GetSizeBytes() const; diff --git a/include/vcl/bmpacc.hxx b/include/vcl/bmpacc.hxx index ebc00c75c4c4..e832528c9f2b 100644 --- a/include/vcl/bmpacc.hxx +++ b/include/vcl/bmpacc.hxx @@ -42,8 +42,6 @@ public: inline long Width() const; inline long Height() const; - inline Point TopLeft() const; - inline Point BottomRight() const; inline bool IsTopDown() const; inline bool IsBottomUp() const; @@ -61,7 +59,6 @@ public: inline const BitmapColor& GetBestPaletteColor(const BitmapColor& rBitmapColor) const; sal_uInt16 GetBestPaletteIndex(const BitmapColor& rBitmapColor) const; - inline bool HasColorMask() const; inline ColorMask& GetColorMask() const; private: @@ -253,16 +250,6 @@ inline long BitmapInfoAccess::Height() const return mpBuffer ? mpBuffer->mnHeight : 0L; } -inline Point BitmapInfoAccess::TopLeft() const -{ - return Point(); -} - -inline Point BitmapInfoAccess::BottomRight() const -{ - return Point(Width() - 1L, Height() - 1L); -} - inline bool BitmapInfoAccess::IsTopDown() const { assert(mpBuffer && "Access is not valid!"); @@ -338,18 +325,7 @@ inline const BitmapColor& BitmapInfoAccess::GetBestPaletteColor(const BitmapColo return GetPaletteColor(GetBestPaletteIndex(rBitmapColor)); } -inline bool BitmapInfoAccess::HasColorMask() const -{ - assert(mpBuffer && "Access is not valid!"); - const sal_uLong nFormat = BMP_SCANLINE_FORMAT(mpBuffer->mnFormat); - - return nFormat == BMP_FORMAT_8BIT_TC_MASK || - nFormat == BMP_FORMAT_16BIT_TC_MSB_MASK || - nFormat == BMP_FORMAT_16BIT_TC_LSB_MASK || - nFormat == BMP_FORMAT_24BIT_TC_MASK || - nFormat == BMP_FORMAT_32BIT_TC_MASK; -} inline ColorMask& BitmapInfoAccess::GetColorMask() const { diff --git a/include/vcl/cmdevt.hxx b/include/vcl/cmdevt.hxx index 9a7d65042f72..75556ad0971f 100644 --- a/include/vcl/cmdevt.hxx +++ b/include/vcl/cmdevt.hxx @@ -62,19 +62,10 @@ public: const OUString& GetText() const { return maText; } const sal_uInt16* GetTextAttr() const { return mpTextAttr; } - sal_uInt16 GetCharTextAttr(sal_Int32 nIndex) const - { - assert(nIndex >= 0); - if (mpTextAttr && nIndex < maText.getLength() && nIndex >=0) - return mpTextAttr[nIndex]; - else - return 0; - } sal_Int32 GetCursorPos() const { return mnCursorPos; } bool IsCursorVisible() const { return (mnCursorFlags & EXTTEXTINPUT_CURSOR_INVISIBLE) == 0; } bool IsCursorOverwrite() const { return (mnCursorFlags & EXTTEXTINPUT_CURSOR_OVERWRITE) != 0; } - sal_uInt16 GetCursorFlags() const { return mnCursorFlags; } bool IsOnlyCursorChanged() const { return mbOnlyCursor; } }; @@ -90,8 +81,6 @@ private: public: CommandInputContextData(); CommandInputContextData( LanguageType eLang ); - - LanguageType GetLanguage() const { return meLanguage; } }; inline CommandInputContextData::CommandInputContextData() @@ -154,8 +143,6 @@ public: { return ((mnCode & KEY_MOD1) != 0); } bool IsMod2() const { return ((mnCode & KEY_MOD2) != 0); } - bool IsMod3() const - { return ((mnCode & KEY_MOD3) != 0); } }; inline CommandWheelData::CommandWheelData() @@ -226,20 +213,10 @@ public: CommandModKeyData(); CommandModKeyData( sal_uInt16 nCode ); - bool IsShift() const { return (mnCode & MODKEY_SHIFT) != 0; } bool IsMod1() const { return (mnCode & MODKEY_MOD1) != 0; } bool IsMod2() const { return (mnCode & MODKEY_MOD2) != 0; } - bool IsMod3() const { return (mnCode & MODKEY_MOD3) != 0; } - bool IsLeftShift() const { return (mnCode & MODKEY_LSHIFT) != 0; } - bool IsLeftMod1() const { return (mnCode & MODKEY_LMOD1) != 0; } - bool IsLeftMod2() const { return (mnCode & MODKEY_LMOD2) != 0; } - bool IsLeftMod3() const { return (mnCode & MODKEY_LMOD3) != 0; } - bool IsRightShift() const { return (mnCode & MODKEY_RSHIFT) != 0; } - bool IsRightMod1() const { return (mnCode & MODKEY_RMOD1) != 0; } - bool IsRightMod2() const { return (mnCode & MODKEY_RMOD2) != 0; } - bool IsRightMod3() const { return (mnCode & MODKEY_RMOD3) != 0; } }; inline CommandModKeyData::CommandModKeyData() @@ -345,20 +322,16 @@ inline CommandSelectionChangeData::CommandSelectionChangeData( sal_uLong nStart, class VCL_DLLPUBLIC CommandSwipeData { double mnVelocityX; - double mnVelocityY; public: CommandSwipeData() : mnVelocityX(0) - , mnVelocityY(0) { } - CommandSwipeData(double nVelocityX, double nVelocityY) + CommandSwipeData(double nVelocityX) : mnVelocityX(nVelocityX) - , mnVelocityY(nVelocityY) { } double getVelocityX() const { return mnVelocityX; } - double getVelocityY() const { return mnVelocityY; } }; class VCL_DLLPUBLIC CommandLongPressData @@ -427,7 +400,6 @@ public: void* GetEventData() const { return mpData; } const CommandExtTextInputData* GetExtTextInputData() const; - const CommandInputContextData* GetInputContextChangeData() const; const CommandWheelData* GetWheelData() const; const CommandScrollData* GetAutoScrollData() const; const CommandModKeyData* GetModKeyData() const; @@ -462,14 +434,6 @@ inline const CommandExtTextInputData* CommandEvent::GetExtTextInputData() const return NULL; } -inline const CommandInputContextData* CommandEvent::GetInputContextChangeData() const -{ - if ( mnCommand == CommandEventId::InputContextChange ) - return static_cast<const CommandInputContextData*>(mpData); - else - return NULL; -} - inline const CommandWheelData* CommandEvent::GetWheelData() const { if ( mnCommand == CommandEventId::Wheel ) diff --git a/include/vcl/cursor.hxx b/include/vcl/cursor.hxx index baf04d26b7c6..038e18f5b2c7 100644 --- a/include/vcl/cursor.hxx +++ b/include/vcl/cursor.hxx @@ -75,7 +75,6 @@ public: bool IsVisible() const { return mbVisible; } void SetWindow( vcl::Window* pWindow ); - vcl::Window* GetWindow() const { return mpWindow; } void SetPos( const Point& rNewPos ); const Point& GetPos() const { return maPos; } @@ -86,13 +85,9 @@ public: long GetWidth() const { return maSize.Width(); } long GetHeight() const { return maSize.Height(); } - long GetSlant() const { return mnSlant; } - void SetOrientation( short nOrientation = 0 ); - short GetOrientation() const { return mnOrientation; } void SetDirection( CursorDirection nDirection = CursorDirection::NONE ); - CursorDirection GetDirection() const { return mnDirection; } Cursor& operator=( const Cursor& rCursor ); bool operator==( const Cursor& rCursor ) const; diff --git a/include/vcl/event.hxx b/include/vcl/event.hxx index 085182a41d0c..13ded2d0064d 100644 --- a/include/vcl/event.hxx +++ b/include/vcl/event.hxx @@ -359,12 +359,10 @@ public: bool IsTrackingRepeat() const { return bool(mnFlags & TrackingEventFlags::Repeat); } - bool IsTrackingEnded() const { return bool(mnFlags & TrackingEventFlags::End); } bool IsTrackingCanceled() const { return bool(mnFlags & TrackingEventFlags::Cancel); } - TrackingEventFlags GetTrackingFlags() const { return mnFlags; } }; inline TrackingEvent::TrackingEvent() @@ -418,10 +416,6 @@ public: MouseNotifyEvent GetType() const { return mnEventType; } vcl::Window* GetWindow() const { return mpWindow; } void* GetData() const { return mpData; } - - void SetReturnValue( long nRet ) { mnRetValue = nRet; } - long GetReturnValue() const { return mnRetValue; } - const KeyEvent* GetKeyEvent() const; const MouseEvent* GetMouseEvent() const; const CommandEvent* GetCommandEvent() const; @@ -479,7 +473,6 @@ public: AllSettingsFlags nFlags = AllSettingsFlags::NONE ); DataChangedEventType GetType() const { return mnType; } - void* GetData() const { return mpData; } AllSettingsFlags GetFlags() const { return mnFlags; } const AllSettings* GetOldSettings() const; diff --git a/include/vcl/gdimtf.hxx b/include/vcl/gdimtf.hxx index 8baa116eea95..1dca8a939dec 100644 --- a/include/vcl/gdimtf.hxx +++ b/include/vcl/gdimtf.hxx @@ -195,8 +195,6 @@ public: const MapMode& GetPrefMapMode() const { return aPrefMapMode; } void SetPrefMapMode( const MapMode& rMapMode ) { aPrefMapMode = rMapMode; } - void SetHookHdl( const Link<>& rLink ) { aHookHdlLink = rLink; } - const Link<>& GetHookHdl() const { return aHookHdlLink; } sal_uLong GetChecksum() const; sal_uLong GetSizeBytes() const; diff --git a/include/vcl/gfxlink.hxx b/include/vcl/gfxlink.hxx index 4d326d9f24ae..8c36ae340f8b 100644 --- a/include/vcl/gfxlink.hxx +++ b/include/vcl/gfxlink.hxx @@ -151,8 +151,7 @@ public: sal_uInt32 GetUserId() const { return mnUserId; } sal_uInt32 GetDataSize() const { return mnBufSize;} - void SetData( sal_uInt8* pBuf, sal_uInt32 nSize, GfxLinkType nType, bool bOwns ); - const sal_uInt8* GetData() const; + const sal_uInt8* GetData() const; const Size& GetPrefSize() const { return mpImpData->maPrefSize;} void SetPrefSize( const Size& rPrefSize ); @@ -163,7 +162,6 @@ public: bool IsPrefMapModeValid() { return mpImpData->mbPrefMapModeValid;} bool IsNative() const; - bool IsUser() const { return( GFX_LINK_TYPE_USER == meType ); } bool LoadNative( Graphic& rGraphic ); diff --git a/include/vcl/gradient.hxx b/include/vcl/gradient.hxx index adbe28f10cbb..10b16e43c380 100644 --- a/include/vcl/gradient.hxx +++ b/include/vcl/gradient.hxx @@ -106,8 +106,6 @@ public: bool operator==( const Gradient& rGradient ) const; bool operator!=( const Gradient& rGradient ) const { return !(Gradient::operator==( rGradient )); } - bool IsSameInstance( const Gradient& rGradient ) const - { return (mpImplGradient == rGradient.mpImplGradient); } friend VCL_DLLPUBLIC SvStream& ReadGradient( SvStream& rIStm, Gradient& rGradient ); friend VCL_DLLPUBLIC SvStream& WriteGradient( SvStream& rOStm, const Gradient& rGradient ); diff --git a/include/vcl/graph.h b/include/vcl/graph.h index 30f4230a11d4..f41274735126 100644 --- a/include/vcl/graph.h +++ b/include/vcl/graph.h @@ -50,8 +50,6 @@ public: virtual ~GraphicReader(); const OUString& GetUpperFilterName() const { return maUpperName; } - ReaderData* GetReaderData() const { return mpReaderData; } - bool IsReading() const { return mbIsReading; } // TODO: when incompatible changes are possible again // the preview size hint should be redone diff --git a/include/vcl/hatch.hxx b/include/vcl/hatch.hxx index 70515d43afc8..935ea9ac6e06 100644 --- a/include/vcl/hatch.hxx +++ b/include/vcl/hatch.hxx @@ -67,7 +67,6 @@ public: Hatch& operator=( const Hatch& rHatch ); bool operator==( const Hatch& rHatch ) const; bool operator!=( const Hatch& rHatch ) const { return !(Hatch::operator==( rHatch ) ); } - bool IsSameInstance( const Hatch& rHatch ) const { return( mpImplHatch == rHatch.mpImplHatch ); } HatchStyle GetStyle() const { return mpImplHatch->meStyle; } diff --git a/include/vcl/inputctx.hxx b/include/vcl/inputctx.hxx index 3cd78744299a..d1f3f9ff3f5b 100644 --- a/include/vcl/inputctx.hxx +++ b/include/vcl/inputctx.hxx @@ -61,7 +61,6 @@ public: maFont( rFont ) { mnOptions = nOptions; } - void SetFont( const vcl::Font& rFont ) { maFont = rFont; } const vcl::Font& GetFont() const { return maFont; } void SetOptions( InputContextFlags nOptions ) { mnOptions = nOptions; } diff --git a/include/vcl/lineinfo.hxx b/include/vcl/lineinfo.hxx index a6acda319f88..9f7438b72a05 100644 --- a/include/vcl/lineinfo.hxx +++ b/include/vcl/lineinfo.hxx @@ -77,7 +77,6 @@ public: LineInfo& operator=( const LineInfo& rLineInfo ); bool operator==( const LineInfo& rLineInfo ) const; bool operator!=( const LineInfo& rLineInfo ) const { return !(LineInfo::operator==( rLineInfo ) ); } - bool IsSameInstance( const LineInfo& rLineInfo ) const { return( mpImplLineInfo == rLineInfo.mpImplLineInfo ); } void SetStyle( LineStyle eStyle ); LineStyle GetStyle() const { return mpImplLineInfo->meStyle; } diff --git a/include/vcl/metaact.hxx b/include/vcl/metaact.hxx index 18e73033b7b3..2f1f5cecd5d0 100644 --- a/include/vcl/metaact.hxx +++ b/include/vcl/metaact.hxx @@ -64,8 +64,6 @@ private: sal_uLong mnRefCount; MetaActionType mnType; - virtual bool Compare( const MetaAction& ) const; - protected: virtual ~MetaAction(); @@ -99,8 +97,6 @@ private: Point maPt; Color maColor; - virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; - public: MetaPixelAction(); protected: @@ -125,8 +121,6 @@ class VCL_DLLPUBLIC MetaPointAction : public MetaAction private: Point maPt; - virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; - public: MetaPointAction(); protected: @@ -153,8 +147,6 @@ private: Point maStartPt; Point maEndPt; - virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; - public: MetaLineAction(); protected: @@ -183,7 +175,6 @@ private: Rectangle maRect; - virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: MetaRectAction(); protected: @@ -210,8 +201,6 @@ private: sal_uInt32 mnHorzRound; sal_uInt32 mnVertRound; - virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; - public: MetaRoundRectAction(); protected: @@ -239,8 +228,6 @@ private: Rectangle maRect; - virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; - public: MetaEllipseAction(); protected: @@ -267,8 +254,6 @@ private: Point maStartPt; Point maEndPt; - virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; - public: MetaArcAction(); protected: @@ -298,8 +283,6 @@ private: Point maStartPt; Point maEndPt; - virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; - public: MetaPieAction(); protected: @@ -329,8 +312,6 @@ private: Point maStartPt; Point maEndPt; - virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; - public: MetaChordAction(); protected: @@ -359,8 +340,6 @@ private: LineInfo maLineInfo; Polygon maPoly; - virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; - public: MetaPolyLineAction(); protected: @@ -387,8 +366,6 @@ private: Polygon maPoly; - virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; - public: MetaPolygonAction(); protected: @@ -413,8 +390,6 @@ private: tools::PolyPolygon maPolyPoly; - virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; - public: MetaPolyPolygonAction(); protected: @@ -442,8 +417,6 @@ private: sal_Int32 mnIndex; sal_Int32 mnLen; - virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; - public: MetaTextAction(); protected: @@ -476,8 +449,6 @@ private: sal_Int32 mnIndex; sal_Int32 mnLen; - virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; - protected: virtual ~MetaTextArrayAction(); @@ -515,8 +486,6 @@ private: sal_Int32 mnIndex; sal_Int32 mnLen; - virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; - public: MetaStretchTextAction(); protected: @@ -549,8 +518,6 @@ private: OUString maStr; DrawTextFlags mnStyle; - virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; - public: MetaTextRectAction(); protected: @@ -582,8 +549,6 @@ private: FontUnderline meUnderline; FontUnderline meOverline; - virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; - public: MetaTextLineAction(); protected: @@ -615,8 +580,6 @@ private: Bitmap maBmp; Point maPt; - virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; - public: MetaBmpAction(); protected: @@ -644,8 +607,6 @@ private: Point maPt; Size maSz; - virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; - public: MetaBmpScaleAction(); protected: @@ -677,8 +638,6 @@ private: Point maSrcPt; Size maSrcSz; - virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; - public: MetaBmpScalePartAction(); protected: @@ -710,8 +669,6 @@ private: BitmapEx maBmpEx; Point maPt; - virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; - public: MetaBmpExAction(); protected: @@ -739,8 +696,6 @@ private: Point maPt; Size maSz; - virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; - public: MetaBmpExScaleAction(); protected: @@ -772,8 +727,6 @@ private: Point maSrcPt; Size maSrcSz; - virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; - public: MetaBmpExScalePartAction(); protected: @@ -806,8 +759,6 @@ private: Color maColor; Point maPt; - virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; - public: MetaMaskAction(); protected: @@ -839,8 +790,6 @@ private: Point maPt; Size maSz; - virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; - public: MetaMaskScaleAction(); protected: @@ -875,8 +824,6 @@ private: Point maSrcPt; Size maSrcSz; - virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; - public: MetaMaskScalePartAction(); protected: @@ -910,8 +857,6 @@ private: Rectangle maRect; Gradient maGradient; - virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; - public: MetaGradientAction(); protected: @@ -938,8 +883,6 @@ private: tools::PolyPolygon maPolyPoly; Gradient maGradient; - virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; - public: MetaGradientExAction(); protected: @@ -966,8 +909,6 @@ private: tools::PolyPolygon maPolyPoly; Hatch maHatch; - virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; - public: MetaHatchAction(); protected: @@ -994,8 +935,6 @@ private: Rectangle maRect; Wallpaper maWallpaper; - virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; - public: MetaWallpaperAction(); protected: @@ -1023,8 +962,6 @@ private: vcl::Region maRegion; bool mbClip; - virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; - public: MetaClipRegionAction(); protected: @@ -1050,8 +987,6 @@ private: Rectangle maRect; - virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; - public: MetaISectRectClipRegionAction(); protected: @@ -1076,8 +1011,6 @@ private: vcl::Region maRegion; - virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; - public: MetaISectRegionClipRegionAction(); protected: @@ -1103,8 +1036,6 @@ private: long mnHorzMove; long mnVertMove; - virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; - public: MetaMoveClipRegionAction(); protected: @@ -1130,8 +1061,6 @@ private: Color maColor; bool mbSet; - virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; - public: MetaLineColorAction(); protected: @@ -1155,8 +1084,6 @@ private: Color maColor; bool mbSet; - virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; - public: MetaFillColorAction(); protected: @@ -1179,8 +1106,6 @@ private: Color maColor; - virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; - public: MetaTextColorAction(); protected: @@ -1203,8 +1128,6 @@ private: Color maColor; bool mbSet; - virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; - public: MetaTextFillColorAction(); protected: @@ -1228,8 +1151,6 @@ private: Color maColor; bool mbSet; - virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; - public: MetaTextLineColorAction(); protected: @@ -1253,8 +1174,6 @@ private: Color maColor; bool mbSet; - virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; - public: MetaOverlineColorAction(); protected: @@ -1277,8 +1196,6 @@ private: TextAlign maAlign; - virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; - public: MetaTextAlignAction(); protected: @@ -1300,8 +1217,6 @@ private: MapMode maMapMode; - virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; - public: MetaMapModeAction(); protected: @@ -1325,8 +1240,6 @@ private: vcl::Font maFont; - virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; - public: MetaFontAction(); protected: @@ -1350,8 +1263,6 @@ private: PushFlags mnFlags; - virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; - public: MetaPushAction(); protected: @@ -1387,8 +1298,6 @@ private: RasterOp meRasterOp; - virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; - public: MetaRasterOpAction(); protected: @@ -1411,8 +1320,6 @@ private: tools::PolyPolygon maPolyPoly; sal_uInt16 mnTransPercent; - virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; - public: MetaTransparentAction(); protected: @@ -1441,8 +1348,6 @@ private: Size maSize; Gradient maGradient; - virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; - public: MetaFloatTransparentAction(); protected: @@ -1474,8 +1379,6 @@ private: Point maPoint; Size maSize; - virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; - public: MetaEPSAction(); protected: @@ -1505,8 +1408,6 @@ private: Point maRefPoint; bool mbSet; - virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; - public: MetaRefPointAction(); protected: @@ -1533,7 +1434,6 @@ private: sal_uInt8* mpData; SAL_DLLPRIVATE void ImplInitDynamicData( const sal_uInt8* pData, sal_uInt32 nDataSize ); - virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; protected: virtual ~MetaCommentAction(); @@ -1562,7 +1462,6 @@ class VCL_DLLPUBLIC MetaLayoutModeAction : public MetaAction private: ComplexTextLayoutMode mnLayoutMode; - virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: MetaLayoutModeAction(); @@ -1584,7 +1483,6 @@ class VCL_DLLPUBLIC MetaTextLanguageAction : public MetaAction private: LanguageType meTextLanguage; - virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: MetaTextLanguageAction(); diff --git a/include/vcl/metric.hxx b/include/vcl/metric.hxx index e2049696e500..7a7c7d30c860 100644 --- a/include/vcl/metric.hxx +++ b/include/vcl/metric.hxx @@ -239,7 +239,6 @@ private: public: TextRectInfo(); - sal_uInt16 GetLineCount() const { return mnLineCount; } long GetMaxLineWidth() const { return mnMaxWidth; } bool IsEllipses() const { return mbEllipsis; } diff --git a/include/vcl/opengl/OpenGLContext.hxx b/include/vcl/opengl/OpenGLContext.hxx index a04c8e1868d3..26769059c389 100644 --- a/include/vcl/opengl/OpenGLContext.hxx +++ b/include/vcl/opengl/OpenGLContext.hxx @@ -172,7 +172,6 @@ public: void requestLegacyContext(); void requestSingleBufferedRendering(); - void requestVirtualDevice(); bool init(vcl::Window* pParent = 0); bool init(SystemChildWindow* pChildWindow); @@ -181,7 +180,6 @@ public: // only in vcl's platform code #if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID && !defined(LIBO_HEADLESS) bool init(Display* dpy, Window win, int screen); - bool init(Display* dpy, Pixmap pix, unsigned int width, unsigned int height, int nScreen); #elif defined( _WIN32 ) bool init( HDC hDC, HWND hWnd ); #endif @@ -225,8 +223,6 @@ public: SystemChildWindow* getChildWindow(); const SystemChildWindow* getChildWindow() const; - void renderToFile(); - bool isInitialized() { return mbInitialized; @@ -256,7 +252,6 @@ private: int mnRefCount; bool mbRequestLegacyContext; bool mbUseDoubleBufferedRendering; - bool mbRequestVirtualDevice; #if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID && !defined(LIBO_HEADLESS) bool mbPixmap; // is a pixmap instead of a window #endif diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index e357fcf44be7..3e73b313c530 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -496,10 +496,6 @@ public: sal_uLong GetColorCount() const; - /// request XCanvas render interface for this OutputDevice - css::uno::Reference< css::rendering::XCanvas > - GetCanvas() const; - css::uno::Reference< css::awt::XGraphics > CreateUnoGraphics(); std::vector< VCLXGraphics* > *GetUnoGraphicsList() const { return mpUnoGraphicsList; } @@ -632,9 +628,7 @@ public: void EnableOutput( bool bEnable = true ); bool IsOutputEnabled() const { return mbOutput; } - bool IsDeviceOutput() const { return mbDevOutput; } bool IsDeviceOutputNecessary() const { return (mbOutput && mbDevOutput); } - bool IsOutputNecessary() const { return ((mbOutput && mbDevOutput) || (mpMetaFile != NULL)); } void SetAntialiasing( AntialiasingFlags nMode = AntialiasingFlags::NONE ); AntialiasingFlags GetAntialiasing() const { return mnAntialiasing; } @@ -1584,13 +1578,6 @@ private: public: - /** Query availability of alpha channel - - @return sal_True, if this device has an alpha channel. - */ - bool HasAlpha(); - - /** helper method removing transparencies from a metafile (e.g. for printing) @returns @@ -1617,14 +1604,6 @@ public: SAL_DLLPRIVATE Color ImplDrawModeToColor ( const Color& rColor ) const; - /** Query the existence and depth of the alpha channel - - @return 0, if no alpha channel available, and the bit depth of - the alpha channel otherwise. - */ - virtual sal_uInt16 GetAlphaBitCount() const; - - void DrawTransparent( const tools::PolyPolygon& rPolyPoly, sal_uInt16 nTransparencePercent ); void DrawTransparent( const basegfx::B2DPolyPolygon& rB2DPolyPoly, double fTransparency); void DrawTransparent( @@ -1739,15 +1718,10 @@ public: const MapMode& rMapMode ) const; Polygon LogicToPixel( const Polygon& rLogicPoly, const MapMode& rMapMode ) const; - basegfx::B2DPolygon LogicToPixel( const basegfx::B2DPolygon& rLogicPoly, - const MapMode& rMapMode ) const; tools::PolyPolygon LogicToPixel( const tools::PolyPolygon& rLogicPolyPoly, const MapMode& rMapMode ) const; basegfx::B2DPolyPolygon LogicToPixel( const basegfx::B2DPolyPolygon& rLogicPolyPoly, const MapMode& rMapMode ) const; - vcl::Region LogicToPixel( const vcl::Region& rLogicRegion, - const MapMode& rMapMode ) const; - basegfx::B2DPolygon LogicToPixel( const basegfx::B2DPolygon& rLogicPoly ) const; Point PixelToLogic( const Point& rDevicePt ) const; Size PixelToLogic( const Size& rDeviceSize ) const; @@ -1770,8 +1744,6 @@ public: const MapMode& rMapMode ) const; basegfx::B2DPolyPolygon PixelToLogic( const basegfx::B2DPolyPolygon& rDevicePolyPoly, const MapMode& rMapMode ) const; - vcl::Region PixelToLogic( const vcl::Region& rDeviceRegion, - const MapMode& rMapMode ) const; Point LogicToLogic( const Point& rPtSource, const MapMode* pMapModeSource, diff --git a/include/vcl/region.hxx b/include/vcl/region.hxx index 60090cea5122..f32bbe15ac0f 100644 --- a/include/vcl/region.hxx +++ b/include/vcl/region.hxx @@ -108,7 +108,6 @@ public: void GetRegionRectangles(RectangleVector& rTarget) const; bool IsInside( const Point& rPoint ) const; - bool IsInside( const Rectangle& rRect ) const; bool IsOver( const Rectangle& rRect ) const; vcl::Region& operator=( const vcl::Region& rRegion ); diff --git a/include/vcl/salbtype.hxx b/include/vcl/salbtype.hxx index 4a9d398e16e8..f4ce3cb8fc8b 100644 --- a/include/vcl/salbtype.hxx +++ b/include/vcl/salbtype.hxx @@ -138,11 +138,8 @@ public: inline BitmapColor& Invert(); inline sal_uInt8 GetLuminance() const; - inline BitmapColor& IncreaseLuminance( sal_uInt8 cGreyInc ); - inline BitmapColor& DecreaseLuminance( sal_uInt8 cGreyDec ); inline BitmapColor& Merge( const BitmapColor& rColor, sal_uInt8 cTransparency ); - inline BitmapColor& Merge( sal_uInt8 cR, sal_uInt8 cG, sal_uInt8 cB, sal_uInt8 cTransparency ); inline sal_uLong GetColorError( const BitmapColor& rBitmapColor ) const; }; @@ -405,25 +402,9 @@ inline sal_uInt8 BitmapColor::GetLuminance() const return (static_cast<unsigned long>(mcBlueOrIndex) * 28UL + static_cast<unsigned long>(mcGreen) * 151UL + static_cast<unsigned long>(mcRed) * 77UL) >> 8; } -inline BitmapColor& BitmapColor::IncreaseLuminance( sal_uInt8 cGreyInc ) -{ - DBG_ASSERT( !mbIndex, "Pixel represents index into colortable!" ); - mcBlueOrIndex = (sal_uInt8) MinMax( (long) mcBlueOrIndex + cGreyInc, 0L, 255L ); - mcGreen = (sal_uInt8) MinMax( (long) mcGreen + cGreyInc, 0L, 255L ); - mcRed = (sal_uInt8) MinMax( (long) mcRed + cGreyInc, 0L, 255L ); - return *this; -} -inline BitmapColor& BitmapColor::DecreaseLuminance( sal_uInt8 cGreyDec ) -{ - DBG_ASSERT( !mbIndex, "Pixel represents index into colortable!" ); - mcBlueOrIndex = (sal_uInt8) MinMax( (long) mcBlueOrIndex - cGreyDec, 0L, 255L ); - mcGreen = (sal_uInt8) MinMax( (long) mcGreen - cGreyDec, 0L, 255L ); - mcRed = (sal_uInt8) MinMax( (long) mcRed - cGreyDec, 0L, 255L ); - return *this; -} inline BitmapColor& BitmapColor::Merge( const BitmapColor& rBitmapColor, sal_uInt8 cTransparency ) { @@ -436,15 +417,7 @@ inline BitmapColor& BitmapColor::Merge( const BitmapColor& rBitmapColor, sal_uIn return *this; } -inline BitmapColor& BitmapColor::Merge( sal_uInt8 cR, sal_uInt8 cG, sal_uInt8 cB, sal_uInt8 cTransparency ) -{ - DBG_ASSERT( !mbIndex, "Pixel represents index into colortable!" ); - mcBlueOrIndex = COLOR_CHANNEL_MERGE( mcBlueOrIndex, cB, cTransparency ); - mcGreen = COLOR_CHANNEL_MERGE( mcGreen, cG, cTransparency ); - mcRed = COLOR_CHANNEL_MERGE( mcRed, cR, cTransparency ); - return *this; -} inline sal_uLong BitmapColor::GetColorError( const BitmapColor& rBitmapColor ) const { diff --git a/include/vcl/scheduler.hxx b/include/vcl/scheduler.hxx index 6c4e2116b589..c4d093712729 100644 --- a/include/vcl/scheduler.hxx +++ b/include/vcl/scheduler.hxx @@ -71,7 +71,6 @@ public: SchedulerPriority GetPriority() const { return mePriority; } void SetDebugName( const sal_Char *pDebugName ) { mpDebugName = pDebugName; } - const sal_Char *GetDebugName() { return mpDebugName; } // Call handler virtual void Invoke() = 0; @@ -80,7 +79,6 @@ public: void Stop(); bool IsActive() const { return mbActive; } - void SetInActive() { mbActive = false; } Scheduler& operator=( const Scheduler& rScheduler ); static void ImplDeInitScheduler(); diff --git a/include/vcl/virdev.hxx b/include/vcl/virdev.hxx index 3720a19c98f3..9f0fdbcc48da 100644 --- a/include/vcl/virdev.hxx +++ b/include/vcl/virdev.hxx @@ -146,7 +146,6 @@ public: void SetReferenceDevice( sal_Int32 i_nDPIX, sal_Int32 i_nDPIY ); virtual sal_uInt16 GetBitCount() const SAL_OVERRIDE; - virtual sal_uInt16 GetAlphaBitCount() const SAL_OVERRIDE; private: SAL_DLLPRIVATE void ImplSetReferenceDevice( RefDevMode, sal_Int32 i_nDPIX, sal_Int32 i_nDPIY ); diff --git a/include/vcl/wall.hxx b/include/vcl/wall.hxx index cc4a8366ba27..206e5fb88194 100644 --- a/include/vcl/wall.hxx +++ b/include/vcl/wall.hxx @@ -112,8 +112,6 @@ public: bool operator==( const Wallpaper& rWallpaper ) const; bool operator!=( const Wallpaper& rWallpaper ) const { return !(Wallpaper::operator==( rWallpaper )); } - bool IsSameInstance( const Wallpaper& rWallpaper ) const - { return (mpImplWallpaper == rWallpaper.mpImplWallpaper); } friend VCL_DLLPUBLIC SvStream& ReadWallpaper( SvStream& rIStm, Wallpaper& rWallpaper ); friend VCL_DLLPUBLIC SvStream& WriteWallpaper( SvStream& rOStm, const Wallpaper& rWallpaper ); diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index a18debc6bbe7..545f4bb52af6 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -837,9 +837,6 @@ protected: OutputDevice::DrawGradientWallpaper(nX, nY, nWidth, nHeight, rWallpaper); } - void DrawGradientWallpaper(vcl::RenderContext& rRenderContext, long nX, long nY, - long nWidth, long nHeight, const Wallpaper& rWallpaper); - virtual void ApplySettings(vcl::RenderContext& rRenderContext); public: bool HasMirroredGraphics() const SAL_OVERRIDE; @@ -933,8 +930,6 @@ public: /// Can the widget derived from this Window do the double-buffering via RenderContext properly? bool SupportsDoubleBuffering() const; - /// Mark this window / widget derived from this window as working with double-buffering via RenderContext. - void SetDoubleBuffering(bool bDoubleBuffering = true); void EnableAllResize( bool bEnable = true ); @@ -968,8 +963,6 @@ public: PointerState GetPointerState(); bool IsMouseOver(); - sal_uLong GetCurrentModButtons(); - void SetInputContext( const InputContext& rInputContext ); const InputContext& GetInputContext() const; void EndExtTextInput( EndExtTextInputFlags nFlags ); @@ -1045,8 +1038,6 @@ public: const vcl::Window* pExcludeWindow = NULL ); bool IsInputEnabled() const; - vcl::RenderSettings& GetRenderSettings(); - /** Override <code>EnableInput</code>. This can be necessary due to other people using EnableInput for whole window hierarchies. @@ -1260,8 +1251,6 @@ public: // transparent background for selected or checked items in toolboxes etc. void DrawSelectionBackground( const Rectangle& rRect, sal_uInt16 highlight, bool bChecked, bool bDrawBorder, bool bDrawExtBorderOnly ); - // the same, but fills a passed Color with a text color complementing the selection background - void DrawSelectionBackground( const Rectangle& rRect, sal_uInt16 highlight, bool bChecked, bool bDrawBorder, bool bDrawExtBorderOnly, Color* pSelectionTextColor ); // support rounded edges in the selection rect void DrawSelectionBackground( const Rectangle& rRect, sal_uInt16 highlight, bool bChecked, bool bDrawBorder, bool bDrawExtBorderOnly, long nCornerRadius, Color* pSelectionTextColor, Color* pPaintColor ); |