diff options
67 files changed, 30 insertions, 1146 deletions
diff --git a/compilerplugins/clang/unusedmethods.cxx b/compilerplugins/clang/unusedmethods.cxx index 7dc57e9b88c7..28683347fa1d 100644 --- a/compilerplugins/clang/unusedmethods.cxx +++ b/compilerplugins/clang/unusedmethods.cxx @@ -137,18 +137,25 @@ static bool isStandardStuff(const std::string& s) || startsWith(s, "(anonymous namespace)::"); } +// prevent recursive templates from blowing up the stack +static std::set<std::string> traversedTemplateFunctionSet; + bool UnusedMethods::VisitCallExpr(CallExpr* expr) { if (ignoreLocation(expr)) { return true; } FunctionDecl* calleeFunctionDecl = expr->getDirectCallee(); - // if we see a call to a templated method, it effectively instantiates a new method, - // so we need to examine it's interior to see if it in turn calls anything else - if (calleeFunctionDecl->getTemplatedKind() != clang::FunctionDecl::TemplatedKind::TK_NonTemplate + if (calleeFunctionDecl == nullptr) { + return true; + } + // if we see a call to a templated function, it effectively creates new code, + // so we need to examine it's interior to see if it, in turn, calls anything else + if (calleeFunctionDecl->getTemplatedKind() != FunctionDecl::TemplatedKind::TK_NonTemplate || calleeFunctionDecl->isFunctionTemplateSpecialization()) { - TraverseFunctionDecl(calleeFunctionDecl); + if (traversedTemplateFunctionSet.insert(calleeFunctionDecl->getQualifiedNameAsString()).second) + TraverseFunctionDecl(calleeFunctionDecl); } CXXMethodDecl* calleeMethodDecl = dyn_cast_or_null<CXXMethodDecl>(calleeFunctionDecl); diff --git a/compilerplugins/clang/unusedmethods.py b/compilerplugins/clang/unusedmethods.py index 22d7089b93df..69a253a28650 100755 --- a/compilerplugins/clang/unusedmethods.py +++ b/compilerplugins/clang/unusedmethods.py @@ -32,6 +32,19 @@ exclusionSet = set([ # used by Windows build "_Bool basegfx::B2ITuple::equalZero() const", "class basegfx::B2DPolyPolygon basegfx::unotools::UnoPolyPolygon::getPolyPolygonUnsafe() const", + "void OpenGLContext::requestSingleBufferedRendering()", + "_Bool TabitemValue::isBothAligned() const", + "_Bool TabitemValue::isNotAligned() const", + "void StyleSettings::SetSpinSize(long)", + "void StyleSettings::SetFloatTitleHeight(long)", + "void StyleSettings::SetTitleHeight(long)", + "void StyleSettings::SetUseFlatBorders(_Bool)", + "void StyleSettings::SetUseFlatMenus(_Bool)", + "void StyleSettings::SetCursorSize(long)", + "_Bool CommandMediaData::GetPassThroughToOS() const", + "void Application::AppEvent(const class ApplicationEvent &)", + # instantiated from a template in VCL, not sure why it is not being picked up + "class basegfx::B2DPolygon OutputDevice::PixelToLogic(const class basegfx::B2DPolygon &,const class MapMode &) const", ]) diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 154cb9fb3035..861cb3ff2bd2 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -1253,7 +1253,6 @@ void Desktop::AppEvent( const ApplicationEvent& rAppEvent ) HandleAppEvent( rAppEvent ); } - struct ExecuteGlobals { Reference < css::document::XDocumentEventListener > xGlobalBroadcaster; 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 ); diff --git a/vcl/generic/print/genpspgraphics.cxx b/vcl/generic/print/genpspgraphics.cxx index 5b5971f26d3a..571be87ef0d2 100644 --- a/vcl/generic/print/genpspgraphics.cxx +++ b/vcl/generic/print/genpspgraphics.cxx @@ -529,13 +529,6 @@ void GenPspGraphics::drawBitmap( const SalTwoRect&, OSL_FAIL("Error: no PrinterGfx::DrawBitmap() for transparent bitmap"); } -void GenPspGraphics::drawBitmap( const SalTwoRect&, - const SalBitmap&, - SalColor ) -{ - OSL_FAIL("Error: no PrinterGfx::DrawBitmap() for transparent color"); -} - void GenPspGraphics::drawMask( const SalTwoRect&, const SalBitmap &, SalColor ) diff --git a/vcl/headless/svpbmp.cxx b/vcl/headless/svpbmp.cxx index 7e54bc083dbb..95441c3ed775 100644 --- a/vcl/headless/svpbmp.cxx +++ b/vcl/headless/svpbmp.cxx @@ -350,16 +350,6 @@ bool SvpSalBitmap::GetSystemData( BitmapSystemData& ) return false; } -bool SvpSalBitmap::Crop( const Rectangle& /*rRectPixel*/ ) -{ - return false; -} - -bool SvpSalBitmap::Erase( const ::Color& /*rFillColor*/ ) -{ - return false; -} - bool SvpSalBitmap::Scale( const double& /*rScaleX*/, const double& /*rScaleY*/, BmpScaleFlag /*nScaleFlag*/ ) { return false; diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx index b111b0871ef6..66d398ae0d76 100644 --- a/vcl/headless/svpgdi.cxx +++ b/vcl/headless/svpgdi.cxx @@ -708,13 +708,6 @@ void SvpSalGraphics::drawBitmap( const SalTwoRect& rPosAry, dbgOut( m_aDevice ); } -void SvpSalGraphics::drawBitmap( const SalTwoRect&, - const SalBitmap&, - SalColor ) -{ - // SNI, as in X11 plugin -} - void SvpSalGraphics::drawBitmap( const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap, const SalBitmap& rTransparentBitmap ) diff --git a/vcl/inc/generic/genpspgraphics.h b/vcl/inc/generic/genpspgraphics.h index 762b0d29e0c5..baa6b1d1e4a7 100644 --- a/vcl/inc/generic/genpspgraphics.h +++ b/vcl/inc/generic/genpspgraphics.h @@ -173,9 +173,6 @@ public: const SalBitmap& rSalBitmap ) SAL_OVERRIDE; virtual void drawBitmap( const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap, - SalColor nTransparentColor ) SAL_OVERRIDE; - virtual void drawBitmap( const SalTwoRect& rPosAry, - const SalBitmap& rSalBitmap, const SalBitmap& rTransparentBitmap ) SAL_OVERRIDE; virtual void drawMask( const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap, diff --git a/vcl/inc/headless/svpbmp.hxx b/vcl/inc/headless/svpbmp.hxx index 1a331f24522d..9cf373974141 100644 --- a/vcl/inc/headless/svpbmp.hxx +++ b/vcl/inc/headless/svpbmp.hxx @@ -59,8 +59,6 @@ public: virtual void ReleaseBuffer( BitmapBuffer* pBuffer, BitmapAccessMode nMode ) SAL_OVERRIDE; virtual bool GetSystemData( BitmapSystemData& rData ) SAL_OVERRIDE; - virtual bool Crop( const Rectangle& rRectPixel ) SAL_OVERRIDE; - virtual bool Erase( const Color& rFillColor ) SAL_OVERRIDE; virtual bool Scale( const double& rScaleX, const double& rScaleY, BmpScaleFlag nScaleFlag ) SAL_OVERRIDE; virtual bool Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol ) SAL_OVERRIDE; diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx index 587d488b3f37..0903d6e23565 100644 --- a/vcl/inc/headless/svpgdi.hxx +++ b/vcl/inc/headless/svpgdi.hxx @@ -186,9 +186,6 @@ public: const SalBitmap& rSalBitmap ) SAL_OVERRIDE; virtual void drawBitmap( const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap, - SalColor nTransparentColor ) SAL_OVERRIDE; - virtual void drawBitmap( const SalTwoRect& rPosAry, - const SalBitmap& rSalBitmap, const SalBitmap& rTransparentBitmap ) SAL_OVERRIDE; virtual void drawMask( const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap, diff --git a/vcl/inc/opengl/framebuffer.hxx b/vcl/inc/opengl/framebuffer.hxx index 4e8f9cc152da..385b11ac5771 100644 --- a/vcl/inc/opengl/framebuffer.hxx +++ b/vcl/inc/opengl/framebuffer.hxx @@ -27,7 +27,6 @@ public: OpenGLFramebuffer(); virtual ~OpenGLFramebuffer(); - GLuint Id() const { return mnId; }; int GetWidth() const { return mnWidth; }; int GetHeight() const { return mnHeight; }; diff --git a/vcl/inc/opengl/salbmp.hxx b/vcl/inc/opengl/salbmp.hxx index 3df78c8b2051..ba9ac3f4fe2f 100644 --- a/vcl/inc/opengl/salbmp.hxx +++ b/vcl/inc/opengl/salbmp.hxx @@ -79,8 +79,6 @@ public: bool GetSystemData( BitmapSystemData& rData ) SAL_OVERRIDE; - bool Crop( const Rectangle& rRectPixel ) SAL_OVERRIDE; - bool Erase( const Color& rFillColor ) SAL_OVERRIDE; bool Scale( const double& rScaleX, const double& rScaleY, BmpScaleFlag nScaleFlag ) SAL_OVERRIDE; bool Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol ) SAL_OVERRIDE; @@ -94,8 +92,6 @@ private: void ExecuteOperations(); GLuint CreateTexture(); - void DeleteTexture(); - void DrawTexture( GLuint nTexture, const SalTwoRect& rPosAry ); bool AllocateUserData(); bool ReadTexture(); diff --git a/vcl/inc/opengl/texture.hxx b/vcl/inc/opengl/texture.hxx index 3d99526d2646..554a02dd6c8c 100644 --- a/vcl/inc/opengl/texture.hxx +++ b/vcl/inc/opengl/texture.hxx @@ -69,7 +69,6 @@ public: void Bind(); void Unbind(); - bool Draw(); void Read( GLenum nFormat, GLenum nType, sal_uInt8* pData ); GLenum GetFilter() const; diff --git a/vcl/inc/openglgdiimpl.hxx b/vcl/inc/openglgdiimpl.hxx index 9abc4f975941..444c9f232fef 100644 --- a/vcl/inc/openglgdiimpl.hxx +++ b/vcl/inc/openglgdiimpl.hxx @@ -83,7 +83,6 @@ public: void DrawPoint( long nX, long nY ); void DrawLine( double nX1, double nY1, double nX2, double nY2 ); - void DrawLines( sal_uInt32 nPoints, const SalPoint* pPtAry, bool bClose ); void DrawLineAA( double nX1, double nY1, double nX2, double nY2 ); void DrawLinesAA( sal_uInt32 nPoints, const SalPoint* pPtAry, bool bClose ); void DrawEdgeAA( double nX1, double nY1, double nX2, double nY2 ); diff --git a/vcl/inc/quartz/salbmp.h b/vcl/inc/quartz/salbmp.h index 49679f073363..bcbf9b366715 100644 --- a/vcl/inc/quartz/salbmp.h +++ b/vcl/inc/quartz/salbmp.h @@ -75,8 +75,6 @@ public: bool GetSystemData( BitmapSystemData& rData ) SAL_OVERRIDE; - bool Crop( const Rectangle& rRectPixel ) SAL_OVERRIDE; - bool Erase( const Color& rFillColor ) SAL_OVERRIDE; bool Scale( const double& rScaleX, const double& rScaleY, BmpScaleFlag nScaleFlag ) SAL_OVERRIDE; bool Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol ) SAL_OVERRIDE; diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h index 7292479e8c9b..c378f202509e 100644 --- a/vcl/inc/quartz/salgdi.h +++ b/vcl/inc/quartz/salgdi.h @@ -259,9 +259,6 @@ public: virtual void drawBitmap( const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap ) SAL_OVERRIDE; virtual void drawBitmap( const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap, - SalColor nTransparentColor ) SAL_OVERRIDE; - virtual void drawBitmap( const SalTwoRect& rPosAry, - const SalBitmap& rSalBitmap, const SalBitmap& rTransparentBitmap ) SAL_OVERRIDE; virtual void drawMask( const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap, diff --git a/vcl/inc/salbmp.hxx b/vcl/inc/salbmp.hxx index f89f4171072e..91f69aeb2bdc 100644 --- a/vcl/inc/salbmp.hxx +++ b/vcl/inc/salbmp.hxx @@ -59,8 +59,6 @@ public: virtual void ReleaseBuffer( BitmapBuffer* pBuffer, BitmapAccessMode nMode ) = 0; virtual bool GetSystemData( BitmapSystemData& rData ) = 0; - virtual bool Crop( const Rectangle& rRectPixel ) = 0; - virtual bool Erase( const Color& rFillColor ) = 0; virtual bool Scale( const double& rScaleX, const double& rScaleY, BmpScaleFlag nScaleFlag ) = 0; virtual bool Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol ) = 0; }; diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx index 8c98d08b7b3e..16864276e357 100644 --- a/vcl/inc/salgdi.hxx +++ b/vcl/inc/salgdi.hxx @@ -521,11 +521,6 @@ protected: virtual void drawBitmap( const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap, - SalColor nTransparentColor ) = 0; - - virtual void drawBitmap( - const SalTwoRect& rPosAry, - const SalBitmap& rSalBitmap, const SalBitmap& rMaskBitmap ) = 0; virtual void drawMask( diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx index 5364eedb954f..5175e2d7eff5 100644 --- a/vcl/inc/sallayout.hxx +++ b/vcl/inc/sallayout.hxx @@ -345,7 +345,6 @@ public: // used by upper layers virtual DeviceCoordinate GetTextWidth() const SAL_OVERRIDE; - Rectangle GetTextRect() const; virtual DeviceCoordinate FillDXArray( DeviceCoordinate* pDXArray ) const SAL_OVERRIDE; virtual sal_Int32 GetTextBreak(DeviceCoordinate nMaxWidth, DeviceCoordinate nCharExtra, int nFactor) const SAL_OVERRIDE; virtual void GetCaretPositions( int nArraySize, long* pCaretXArray ) const SAL_OVERRIDE; diff --git a/vcl/inc/unx/salbmp.h b/vcl/inc/unx/salbmp.h index 65d85ba862e5..edd8b023266f 100644 --- a/vcl/inc/unx/salbmp.h +++ b/vcl/inc/unx/salbmp.h @@ -146,8 +146,6 @@ public: virtual void ReleaseBuffer( BitmapBuffer* pBuffer, BitmapAccessMode nMode ) SAL_OVERRIDE; virtual bool GetSystemData( BitmapSystemData& rData ) SAL_OVERRIDE; - virtual bool Crop( const Rectangle& rRectPixel ) SAL_OVERRIDE; - virtual bool Erase( const Color& rFillColor ) SAL_OVERRIDE; virtual bool Scale( const double& rScaleX, const double& rScaleY, BmpScaleFlag nScaleFlag ) SAL_OVERRIDE; virtual bool Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol ) SAL_OVERRIDE; }; diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h index 0a0d0d329bce..99fe40d87279 100644 --- a/vcl/inc/unx/salgdi.h +++ b/vcl/inc/unx/salgdi.h @@ -216,11 +216,6 @@ public: virtual void drawBitmap( const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap, - SalColor nTransparentColor ) SAL_OVERRIDE; - - virtual void drawBitmap( - const SalTwoRect& rPosAry, - const SalBitmap& rSalBitmap, const SalBitmap& rMaskBitmap ) SAL_OVERRIDE; virtual void drawMask( diff --git a/vcl/inc/win/salbmp.h b/vcl/inc/win/salbmp.h index 4b64d5df35e7..879e44130852 100644 --- a/vcl/inc/win/salbmp.h +++ b/vcl/inc/win/salbmp.h @@ -97,8 +97,6 @@ public: virtual void ReleaseBuffer( BitmapBuffer* pBuffer, BitmapAccessMode nMode ) SAL_OVERRIDE; virtual bool GetSystemData( BitmapSystemData& rData ) SAL_OVERRIDE; - virtual bool Crop( const Rectangle& rRectPixel ) SAL_OVERRIDE; - virtual bool Erase( const Color& rFillColor ) SAL_OVERRIDE; virtual bool Scale( const double& rScaleX, const double& rScaleY, BmpScaleFlag nScaleFlag ) SAL_OVERRIDE; virtual bool Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol ) SAL_OVERRIDE; }; diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h index 8550054aed3c..2e892690f72d 100644 --- a/vcl/inc/win/salgdi.h +++ b/vcl/inc/win/salgdi.h @@ -291,9 +291,6 @@ protected: virtual void drawBitmap( const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap ) SAL_OVERRIDE; virtual void drawBitmap( const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap, - SalColor nTransparentColor ) SAL_OVERRIDE; - virtual void drawBitmap( const SalTwoRect& rPosAry, - const SalBitmap& rSalBitmap, const SalBitmap& rTransparentBitmap ) SAL_OVERRIDE; virtual void drawMask( const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap, diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx index f56dd4af2a38..125ac0e218de 100644 --- a/vcl/opengl/gdiimpl.cxx +++ b/vcl/opengl/gdiimpl.cxx @@ -641,13 +641,6 @@ void OpenGLSalGraphicsImpl::ImplDrawLineAA( double nX1, double nY1, double nX2, CHECK_GL_ERROR(); } -void OpenGLSalGraphicsImpl::DrawLines( sal_uInt32 nPoints, const SalPoint* pPtAry, bool bClose ) -{ - for( int i = 0; i < int(nPoints) - 1; ++i ) - DrawLine( pPtAry[ i ].mnX, pPtAry[ i ].mnY, pPtAry[ i + 1 ].mnX, pPtAry[ i + 1 ].mnY ); - if( bClose ) - DrawLine( pPtAry[ nPoints - 1 ].mnX, pPtAry[ nPoints - 1 ].mnY, pPtAry[ 0 ].mnX, pPtAry[ 0 ].mnY ); -} void OpenGLSalGraphicsImpl::DrawLinesAA( sal_uInt32 nPoints, const SalPoint* pPtAry, bool bClose ) { diff --git a/vcl/opengl/salbmp.cxx b/vcl/opengl/salbmp.cxx index 39218faabc5e..405428e7425c 100644 --- a/vcl/opengl/salbmp.cxx +++ b/vcl/opengl/salbmp.cxx @@ -576,16 +576,6 @@ bool OpenGLSalBitmap::GetSystemData( BitmapSystemData& /*rData*/ ) #endif } -bool OpenGLSalBitmap::Crop( const Rectangle& /*rRectPixel*/ ) -{ - return false; -} - -bool OpenGLSalBitmap::Erase( const ::Color& /*rFillColor*/ ) -{ - return false; -} - bool OpenGLSalBitmap::Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol ) { OpenGLFramebuffer* pFramebuffer; diff --git a/vcl/opengl/texture.cxx b/vcl/opengl/texture.cxx index 732830b9a717..2aa99a7f3ecc 100644 --- a/vcl/opengl/texture.cxx +++ b/vcl/opengl/texture.cxx @@ -262,35 +262,6 @@ void OpenGLTexture::Unbind() CHECK_GL_ERROR(); } -bool OpenGLTexture::Draw() -{ - GLfloat aPosition[8] = { -1, -1, -1, 1, 1, 1, 1, -1 }; - GLfloat aTexCoord[8]; - - if( mpImpl == NULL ) - { - SAL_WARN( "vcl.opengl", "Can't draw invalid texture" ); - return false; - } - - SAL_INFO( "vcl.opengl", "Drawing texture " << Id() << " [" << maRect.Left() << "," << maRect.Top() << "] " << GetWidth() << "x" << GetHeight() ); - - GetWholeCoord( aTexCoord ); - glActiveTexture( GL_TEXTURE0 ); - glBindTexture( GL_TEXTURE_2D, mpImpl->mnTexture ); - glEnableVertexAttribArray( 0 ); - glVertexAttribPointer( 0, 2, GL_FLOAT, GL_FALSE, 0, aPosition ); - glEnableVertexAttribArray( 1 ); - glVertexAttribPointer( 1, 2, GL_FLOAT, GL_FALSE, 0, aTexCoord ); - glDrawArrays( GL_TRIANGLE_FAN, 0, 4 ); - glDisableVertexAttribArray( 0 ); - glDisableVertexAttribArray( 1 ); - glBindTexture( GL_TEXTURE_2D, 0 ); - - CHECK_GL_ERROR(); - return true; -} - void OpenGLTexture::Read( GLenum nFormat, GLenum nType, sal_uInt8* pData ) { if( mpImpl == NULL ) diff --git a/vcl/quartz/salbmp.cxx b/vcl/quartz/salbmp.cxx index a2d43649f2f1..7dbbfb0b64b4 100644 --- a/vcl/quartz/salbmp.cxx +++ b/vcl/quartz/salbmp.cxx @@ -968,16 +968,6 @@ bool QuartzSalBitmap::GetSystemData( BitmapSystemData& rData ) return bRet; } -bool QuartzSalBitmap::Crop( const Rectangle& /*rRectPixel*/ ) -{ - return false; -} - -bool QuartzSalBitmap::Erase( const ::Color& /*rFillColor*/ ) -{ - return false; -} - bool QuartzSalBitmap::Scale( const double& /*rScaleX*/, const double& /*rScaleY*/, BmpScaleFlag /*nScaleFlag*/ ) { return false; diff --git a/vcl/quartz/salgdicommon.cxx b/vcl/quartz/salgdicommon.cxx index 9b42a222c6af..01fac7fc087b 100644 --- a/vcl/quartz/salgdicommon.cxx +++ b/vcl/quartz/salgdicommon.cxx @@ -757,12 +757,6 @@ void AquaSalGraphics::drawBitmap( const SalTwoRect& rPosAry, const SalBitmap& rS DBG_DRAW_OPERATION_EXIT("drawBitmap"); } -void AquaSalGraphics::drawBitmap( const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap,SalColor ) -{ - OSL_FAIL("not implemented for color masking!"); - drawBitmap( rPosAry, rSalBitmap ); -} - void AquaSalGraphics::drawBitmap( const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap, const SalBitmap& rTransparentBitmap ) { diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx index 10b0e7f469ed..596ab10f1745 100644 --- a/vcl/source/gdi/metaact.cxx +++ b/vcl/source/gdi/metaact.cxx @@ -179,11 +179,6 @@ void MetaAction::Scale( double, double ) { } -bool MetaAction::Compare( const MetaAction& ) const -{ - return true; -} - void MetaAction::Write( SvStream& rOStm, ImplMetaWriteData* ) { rOStm.WriteUInt16( static_cast<sal_uInt16>(mnType) ); @@ -308,12 +303,6 @@ void MetaPixelAction::Scale( double fScaleX, double fScaleY ) ImplScalePoint( maPt, fScaleX, fScaleY ); } -bool MetaPixelAction::Compare( const MetaAction& rMetaAction ) const -{ - return ( maPt == static_cast<const MetaPixelAction&>(rMetaAction).maPt ) && - ( maColor == static_cast<const MetaPixelAction&>(rMetaAction).maColor ); -} - void MetaPixelAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { MetaAction::Write(rOStm, pData); @@ -363,11 +352,6 @@ void MetaPointAction::Scale( double fScaleX, double fScaleY ) ImplScalePoint( maPt, fScaleX, fScaleY ); } -bool MetaPointAction::Compare( const MetaAction& rMetaAction ) const -{ - return maPt == static_cast<const MetaPointAction&>(rMetaAction).maPt; -} - void MetaPointAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { MetaAction::Write(rOStm, pData); @@ -430,13 +414,6 @@ void MetaLineAction::Scale( double fScaleX, double fScaleY ) ImplScaleLineInfo( maLineInfo, fScaleX, fScaleY ); } -bool MetaLineAction::Compare( const MetaAction& rMetaAction ) const -{ - return ( maLineInfo == static_cast<const MetaLineAction&>(rMetaAction).maLineInfo ) && - ( maStartPt == static_cast<const MetaLineAction&>(rMetaAction).maStartPt ) && - ( maEndPt == static_cast<const MetaLineAction&>(rMetaAction).maEndPt ); -} - void MetaLineAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { MetaAction::Write(rOStm, pData); @@ -496,11 +473,6 @@ void MetaRectAction::Scale( double fScaleX, double fScaleY ) ImplScaleRect( maRect, fScaleX, fScaleY ); } -bool MetaRectAction::Compare( const MetaAction& rMetaAction ) const -{ - return maRect == static_cast<const MetaRectAction&>(rMetaAction).maRect; -} - void MetaRectAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { MetaAction::Write(rOStm, pData); @@ -555,13 +527,6 @@ void MetaRoundRectAction::Scale( double fScaleX, double fScaleY ) mnVertRound = FRound( mnVertRound * fabs(fScaleY) ); } -bool MetaRoundRectAction::Compare( const MetaAction& rMetaAction ) const -{ - return ( maRect == static_cast<const MetaRoundRectAction&>(rMetaAction).maRect ) && - ( mnHorzRound == static_cast<const MetaRoundRectAction&>(rMetaAction).mnHorzRound ) && - ( mnVertRound == static_cast<const MetaRoundRectAction&>(rMetaAction).mnVertRound ); -} - void MetaRoundRectAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { MetaAction::Write(rOStm, pData); @@ -610,11 +575,6 @@ void MetaEllipseAction::Scale( double fScaleX, double fScaleY ) ImplScaleRect( maRect, fScaleX, fScaleY ); } -bool MetaEllipseAction::Compare( const MetaAction& rMetaAction ) const -{ - return maRect == static_cast<const MetaEllipseAction&>(rMetaAction).maRect; -} - void MetaEllipseAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { MetaAction::Write(rOStm, pData); @@ -669,13 +629,6 @@ void MetaArcAction::Scale( double fScaleX, double fScaleY ) ImplScalePoint( maEndPt, fScaleX, fScaleY ); } -bool MetaArcAction::Compare( const MetaAction& rMetaAction ) const -{ - return ( maRect == static_cast<const MetaArcAction&>(rMetaAction).maRect ) && - ( maStartPt == static_cast<const MetaArcAction&>(rMetaAction).maStartPt ) && - ( maEndPt == static_cast<const MetaArcAction&>(rMetaAction).maEndPt ); -} - void MetaArcAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { MetaAction::Write(rOStm, pData); @@ -734,13 +687,6 @@ void MetaPieAction::Scale( double fScaleX, double fScaleY ) ImplScalePoint( maEndPt, fScaleX, fScaleY ); } -bool MetaPieAction::Compare( const MetaAction& rMetaAction ) const -{ - return ( maRect == static_cast<const MetaPieAction&>(rMetaAction).maRect ) && - ( maStartPt == static_cast<const MetaPieAction&>(rMetaAction).maStartPt ) && - ( maEndPt == static_cast<const MetaPieAction&>(rMetaAction).maEndPt ); -} - void MetaPieAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { MetaAction::Write(rOStm, pData); @@ -799,13 +745,6 @@ void MetaChordAction::Scale( double fScaleX, double fScaleY ) ImplScalePoint( maEndPt, fScaleX, fScaleY ); } -bool MetaChordAction::Compare( const MetaAction& rMetaAction ) const -{ - return ( maRect == static_cast<const MetaChordAction&>(rMetaAction).maRect ) && - ( maStartPt == static_cast<const MetaChordAction&>(rMetaAction).maStartPt ) && - ( maEndPt == static_cast<const MetaChordAction&>(rMetaAction).maEndPt ); -} - void MetaChordAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { MetaAction::Write(rOStm, pData); @@ -867,17 +806,6 @@ void MetaPolyLineAction::Scale( double fScaleX, double fScaleY ) ImplScaleLineInfo( maLineInfo, fScaleX, fScaleY ); } -bool MetaPolyLineAction::Compare( const MetaAction& rMetaAction ) const -{ - bool bIsEqual = true; - if ( maLineInfo != static_cast<const MetaPolyLineAction&>(rMetaAction).maLineInfo ) - bIsEqual = false; - else - bIsEqual = maPoly.IsEqual(static_cast<const MetaPolyLineAction&>(rMetaAction).maPoly ); - return bIsEqual; - -} - void MetaPolyLineAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { MetaAction::Write(rOStm, pData); @@ -948,11 +876,6 @@ void MetaPolygonAction::Scale( double fScaleX, double fScaleY ) ImplScalePoly( maPoly, fScaleX, fScaleY ); } -bool MetaPolygonAction::Compare( const MetaAction& rMetaAction ) const -{ - return maPoly.IsEqual(static_cast<const MetaPolygonAction&>(rMetaAction).maPoly ); -} - void MetaPolygonAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { MetaAction::Write(rOStm, pData); @@ -1018,11 +941,6 @@ void MetaPolyPolygonAction::Scale( double fScaleX, double fScaleY ) ImplScalePoly( maPolyPoly[ i ], fScaleX, fScaleY ); } -bool MetaPolyPolygonAction::Compare( const MetaAction& rMetaAction ) const -{ - return maPolyPoly.IsEqual(static_cast<const MetaPolyPolygonAction&>(rMetaAction).maPolyPoly ); -} - void MetaPolyPolygonAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { MetaAction::Write(rOStm, pData); @@ -1130,14 +1048,6 @@ void MetaTextAction::Scale( double fScaleX, double fScaleY ) ImplScalePoint( maPt, fScaleX, fScaleY ); } -bool MetaTextAction::Compare( const MetaAction& rMetaAction ) const -{ - return ( maPt == static_cast<const MetaTextAction&>(rMetaAction).maPt ) && - ( maStr == static_cast<const MetaTextAction&>(rMetaAction).maStr ) && - ( mnIndex == static_cast<const MetaTextAction&>(rMetaAction).mnIndex ) && - ( mnLen == static_cast<const MetaTextAction&>(rMetaAction).mnLen ); -} - void MetaTextAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { MetaAction::Write(rOStm, pData); @@ -1246,15 +1156,6 @@ void MetaTextArrayAction::Scale( double fScaleX, double fScaleY ) } } -bool MetaTextArrayAction::Compare( const MetaAction& rMetaAction ) const -{ - return ( maStartPt == static_cast<const MetaTextArrayAction&>(rMetaAction).maStartPt ) && - ( maStr == static_cast<const MetaTextArrayAction&>(rMetaAction).maStr ) && - ( mnIndex == static_cast<const MetaTextArrayAction&>(rMetaAction).mnIndex ) && - ( mnLen == static_cast<const MetaTextArrayAction&>(rMetaAction).mnLen ) && - ( memcmp( mpDXAry, static_cast<const MetaTextArrayAction&>(rMetaAction).mpDXAry, mnLen ) == 0 ); -} - void MetaTextArrayAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { const sal_Int32 nAryLen = mpDXAry ? mnLen : 0; @@ -1381,15 +1282,6 @@ void MetaStretchTextAction::Scale( double fScaleX, double fScaleY ) mnWidth = (sal_uLong)FRound( mnWidth * fabs(fScaleX) ); } -bool MetaStretchTextAction::Compare( const MetaAction& rMetaAction ) const -{ - return ( maPt == static_cast<const MetaStretchTextAction&>(rMetaAction).maPt ) && - ( maStr == static_cast<const MetaStretchTextAction&>(rMetaAction).maStr ) && - ( mnWidth == static_cast<const MetaStretchTextAction&>(rMetaAction).mnWidth ) && - ( mnIndex == static_cast<const MetaStretchTextAction&>(rMetaAction).mnIndex ) && - ( mnLen == static_cast<const MetaStretchTextAction&>(rMetaAction).mnLen ); -} - void MetaStretchTextAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { MetaAction::Write(rOStm, pData); @@ -1458,13 +1350,6 @@ void MetaTextRectAction::Scale( double fScaleX, double fScaleY ) ImplScaleRect( maRect, fScaleX, fScaleY ); } -bool MetaTextRectAction::Compare( const MetaAction& rMetaAction ) const -{ - return ( maRect == static_cast<const MetaTextRectAction&>(rMetaAction).maRect ) && - ( maStr == static_cast<const MetaTextRectAction&>(rMetaAction).maStr ) && - ( mnStyle == static_cast<const MetaTextRectAction&>(rMetaAction).mnStyle ); -} - void MetaTextRectAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { MetaAction::Write(rOStm, pData); @@ -1535,15 +1420,6 @@ void MetaTextLineAction::Scale( double fScaleX, double fScaleY ) mnWidth = FRound( mnWidth * fabs(fScaleX) ); } -bool MetaTextLineAction::Compare( const MetaAction& rMetaAction ) const -{ - return ( maPos == static_cast<const MetaTextLineAction&>(rMetaAction).maPos ) && - ( mnWidth == static_cast<const MetaTextLineAction&>(rMetaAction).mnWidth ) && - ( meStrikeout == static_cast<const MetaTextLineAction&>(rMetaAction).meStrikeout ) && - ( meUnderline == static_cast<const MetaTextLineAction&>(rMetaAction).meUnderline ) && - ( meOverline == static_cast<const MetaTextLineAction&>(rMetaAction).meOverline ); -} - void MetaTextLineAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { MetaAction::Write(rOStm, pData); @@ -1613,12 +1489,6 @@ void MetaBmpAction::Scale( double fScaleX, double fScaleY ) ImplScalePoint( maPt, fScaleX, fScaleY ); } -bool MetaBmpAction::Compare( const MetaAction& rMetaAction ) const -{ - return maBmp.IsEqual(static_cast<const MetaBmpAction&>(rMetaAction).maBmp ) && - ( maPt == static_cast<const MetaBmpAction&>(rMetaAction).maPt ); -} - void MetaBmpAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { if( !!maBmp ) @@ -1677,13 +1547,6 @@ void MetaBmpScaleAction::Scale( double fScaleX, double fScaleY ) maSz = aRectangle.GetSize(); } -bool MetaBmpScaleAction::Compare( const MetaAction& rMetaAction ) const -{ - return ( maBmp.IsEqual(static_cast<const MetaBmpScaleAction&>(rMetaAction).maBmp )) && - ( maPt == static_cast<const MetaBmpScaleAction&>(rMetaAction).maPt ) && - ( maSz == static_cast<const MetaBmpScaleAction&>(rMetaAction).maSz ); -} - void MetaBmpScaleAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { if( !!maBmp ) @@ -1747,15 +1610,6 @@ void MetaBmpScalePartAction::Scale( double fScaleX, double fScaleY ) maDstSz = aRectangle.GetSize(); } -bool MetaBmpScalePartAction::Compare( const MetaAction& rMetaAction ) const -{ - return ( maBmp.IsEqual(static_cast<const MetaBmpScalePartAction&>(rMetaAction).maBmp )) && - ( maDstPt == static_cast<const MetaBmpScalePartAction&>(rMetaAction).maDstPt ) && - ( maDstSz == static_cast<const MetaBmpScalePartAction&>(rMetaAction).maDstSz ) && - ( maSrcPt == static_cast<const MetaBmpScalePartAction&>(rMetaAction).maSrcPt ) && - ( maSrcSz == static_cast<const MetaBmpScalePartAction&>(rMetaAction).maSrcSz ); -} - void MetaBmpScalePartAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { if( !!maBmp ) @@ -1815,12 +1669,6 @@ void MetaBmpExAction::Scale( double fScaleX, double fScaleY ) ImplScalePoint( maPt, fScaleX, fScaleY ); } -bool MetaBmpExAction::Compare( const MetaAction& rMetaAction ) const -{ - return ( maBmpEx.IsEqual(static_cast<const MetaBmpExAction&>(rMetaAction).maBmpEx )) && - ( maPt == static_cast<const MetaBmpExAction&>(rMetaAction).maPt ); -} - void MetaBmpExAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { if( !!maBmpEx.GetBitmap() ) @@ -1879,13 +1727,6 @@ void MetaBmpExScaleAction::Scale( double fScaleX, double fScaleY ) maSz = aRectangle.GetSize(); } -bool MetaBmpExScaleAction::Compare( const MetaAction& rMetaAction ) const -{ - return ( maBmpEx.IsEqual(static_cast<const MetaBmpExScaleAction&>(rMetaAction).maBmpEx )) && - ( maPt == static_cast<const MetaBmpExScaleAction&>(rMetaAction).maPt ) && - ( maSz == static_cast<const MetaBmpExScaleAction&>(rMetaAction).maSz ); -} - void MetaBmpExScaleAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { if( !!maBmpEx.GetBitmap() ) @@ -1949,15 +1790,6 @@ void MetaBmpExScalePartAction::Scale( double fScaleX, double fScaleY ) maDstSz = aRectangle.GetSize(); } -bool MetaBmpExScalePartAction::Compare( const MetaAction& rMetaAction ) const -{ - return ( maBmpEx.IsEqual(static_cast<const MetaBmpExScalePartAction&>(rMetaAction).maBmpEx )) && - ( maDstPt == static_cast<const MetaBmpExScalePartAction&>(rMetaAction).maDstPt ) && - ( maDstSz == static_cast<const MetaBmpExScalePartAction&>(rMetaAction).maDstSz ) && - ( maSrcPt == static_cast<const MetaBmpExScalePartAction&>(rMetaAction).maSrcPt ) && - ( maSrcSz == static_cast<const MetaBmpExScalePartAction&>(rMetaAction).maSrcSz ); -} - void MetaBmpExScalePartAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { if( !!maBmpEx.GetBitmap() ) @@ -2020,13 +1852,6 @@ void MetaMaskAction::Scale( double fScaleX, double fScaleY ) ImplScalePoint( maPt, fScaleX, fScaleY ); } -bool MetaMaskAction::Compare( const MetaAction& rMetaAction ) const -{ - return ( maBmp.IsEqual(static_cast<const MetaMaskAction&>(rMetaAction).maBmp )) && - ( maColor == static_cast<const MetaMaskAction&>(rMetaAction).maColor ) && - ( maPt == static_cast<const MetaMaskAction&>(rMetaAction).maPt ); -} - void MetaMaskAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { if( !!maBmp ) @@ -2087,14 +1912,6 @@ void MetaMaskScaleAction::Scale( double fScaleX, double fScaleY ) maSz = aRectangle.GetSize(); } -bool MetaMaskScaleAction::Compare( const MetaAction& rMetaAction ) const -{ - return ( maBmp.IsEqual(static_cast<const MetaMaskScaleAction&>(rMetaAction).maBmp )) && - ( maColor == static_cast<const MetaMaskScaleAction&>(rMetaAction).maColor ) && - ( maPt == static_cast<const MetaMaskScaleAction&>(rMetaAction).maPt ) && - ( maSz == static_cast<const MetaMaskScaleAction&>(rMetaAction).maSz ); -} - void MetaMaskScaleAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { if( !!maBmp ) @@ -2160,16 +1977,6 @@ void MetaMaskScalePartAction::Scale( double fScaleX, double fScaleY ) maDstSz = aRectangle.GetSize(); } -bool MetaMaskScalePartAction::Compare( const MetaAction& rMetaAction ) const -{ - return ( maBmp.IsEqual(static_cast<const MetaMaskScalePartAction&>(rMetaAction).maBmp )) && - ( maColor == static_cast<const MetaMaskScalePartAction&>(rMetaAction).maColor ) && - ( maDstPt == static_cast<const MetaMaskScalePartAction&>(rMetaAction).maDstPt ) && - ( maDstSz == static_cast<const MetaMaskScalePartAction&>(rMetaAction).maDstSz ) && - ( maSrcPt == static_cast<const MetaMaskScalePartAction&>(rMetaAction).maSrcPt ) && - ( maSrcSz == static_cast<const MetaMaskScalePartAction&>(rMetaAction).maSrcSz ); -} - void MetaMaskScalePartAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { if( !!maBmp ) @@ -2231,12 +2038,6 @@ void MetaGradientAction::Scale( double fScaleX, double fScaleY ) ImplScaleRect( maRect, fScaleX, fScaleY ); } -bool MetaGradientAction::Compare( const MetaAction& rMetaAction ) const -{ - return ( maRect == static_cast<const MetaGradientAction&>(rMetaAction).maRect ) && - ( maGradient == static_cast<const MetaGradientAction&>(rMetaAction).maGradient ); -} - void MetaGradientAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { MetaAction::Write(rOStm, pData); @@ -2292,12 +2093,6 @@ void MetaGradientExAction::Scale( double fScaleX, double fScaleY ) ImplScalePoly( maPolyPoly[ i ], fScaleX, fScaleY ); } -bool MetaGradientExAction::Compare( const MetaAction& rMetaAction ) const -{ - return ( maPolyPoly == static_cast<const MetaGradientExAction&>(rMetaAction).maPolyPoly ) && - ( maGradient == static_cast<const MetaGradientExAction&>(rMetaAction).maGradient ); -} - void MetaGradientExAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { MetaAction::Write(rOStm, pData); @@ -2354,12 +2149,6 @@ void MetaHatchAction::Scale( double fScaleX, double fScaleY ) ImplScalePoly( maPolyPoly[ i ], fScaleX, fScaleY ); } -bool MetaHatchAction::Compare( const MetaAction& rMetaAction ) const -{ - return ( maPolyPoly == static_cast<const MetaHatchAction&>(rMetaAction).maPolyPoly ) && - ( maHatch == static_cast<const MetaHatchAction&>(rMetaAction).maHatch ); -} - void MetaHatchAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { MetaAction::Write(rOStm, pData); @@ -2416,12 +2205,6 @@ void MetaWallpaperAction::Scale( double fScaleX, double fScaleY ) ImplScaleRect( maRect, fScaleX, fScaleY ); } -bool MetaWallpaperAction::Compare( const MetaAction& rMetaAction ) const -{ - return ( maRect == static_cast<const MetaWallpaperAction&>(rMetaAction).maRect ) && - ( maWallpaper == static_cast<const MetaWallpaperAction&>(rMetaAction).maWallpaper ); -} - void MetaWallpaperAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { MetaAction::Write(rOStm, pData); @@ -2475,12 +2258,6 @@ void MetaClipRegionAction::Scale( double fScaleX, double fScaleY ) maRegion.Scale( fScaleX, fScaleY ); } -bool MetaClipRegionAction::Compare( const MetaAction& rMetaAction ) const -{ - return ( maRegion == static_cast<const MetaClipRegionAction&>(rMetaAction).maRegion ) && - ( mbClip == static_cast<const MetaClipRegionAction&>(rMetaAction).mbClip ); -} - void MetaClipRegionAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { MetaAction::Write(rOStm, pData); @@ -2531,11 +2308,6 @@ void MetaISectRectClipRegionAction::Scale( double fScaleX, double fScaleY ) ImplScaleRect( maRect, fScaleX, fScaleY ); } -bool MetaISectRectClipRegionAction::Compare( const MetaAction& rMetaAction ) const -{ - return maRect == static_cast<const MetaISectRectClipRegionAction&>(rMetaAction).maRect; -} - void MetaISectRectClipRegionAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { MetaAction::Write(rOStm, pData); @@ -2584,11 +2356,6 @@ void MetaISectRegionClipRegionAction::Scale( double fScaleX, double fScaleY ) maRegion.Scale( fScaleX, fScaleY ); } -bool MetaISectRegionClipRegionAction::Compare( const MetaAction& rMetaAction ) const -{ - return maRegion == static_cast<const MetaISectRegionClipRegionAction&>(rMetaAction).maRegion; -} - void MetaISectRegionClipRegionAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { MetaAction::Write(rOStm, pData); @@ -2635,12 +2402,6 @@ void MetaMoveClipRegionAction::Scale( double fScaleX, double fScaleY ) mnVertMove = FRound( mnVertMove * fScaleY ); } -bool MetaMoveClipRegionAction::Compare( const MetaAction& rMetaAction ) const -{ - return ( mnHorzMove == static_cast<const MetaMoveClipRegionAction&>(rMetaAction).mnHorzMove ) && - ( mnVertMove == static_cast<const MetaMoveClipRegionAction&>(rMetaAction).mnVertMove ); -} - void MetaMoveClipRegionAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { MetaAction::Write(rOStm, pData); @@ -2686,12 +2447,6 @@ MetaAction* MetaLineColorAction::Clone() return pClone; } -bool MetaLineColorAction::Compare( const MetaAction& rMetaAction ) const -{ - return ( maColor == static_cast<const MetaLineColorAction&>(rMetaAction).maColor ) && - ( mbSet == static_cast<const MetaLineColorAction&>(rMetaAction).mbSet ); -} - void MetaLineColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { MetaAction::Write(rOStm, pData); @@ -2736,12 +2491,6 @@ MetaAction* MetaFillColorAction::Clone() return pClone; } -bool MetaFillColorAction::Compare( const MetaAction& rMetaAction ) const -{ - return ( maColor == static_cast<const MetaFillColorAction&>(rMetaAction).maColor ) && - ( mbSet == static_cast<const MetaFillColorAction&>(rMetaAction).mbSet ); -} - void MetaFillColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { MetaAction::Write(rOStm, pData); @@ -2781,11 +2530,6 @@ MetaAction* MetaTextColorAction::Clone() return pClone; } -bool MetaTextColorAction::Compare( const MetaAction& rMetaAction ) const -{ - return maColor == static_cast<const MetaTextColorAction&>(rMetaAction).maColor; -} - void MetaTextColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { MetaAction::Write(rOStm, pData); @@ -2828,12 +2572,6 @@ MetaAction* MetaTextFillColorAction::Clone() return pClone; } -bool MetaTextFillColorAction::Compare( const MetaAction& rMetaAction ) const -{ - return ( maColor == static_cast<const MetaTextFillColorAction&>(rMetaAction).maColor ) && - ( mbSet == static_cast<const MetaTextFillColorAction&>(rMetaAction).mbSet ); -} - void MetaTextFillColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { MetaAction::Write(rOStm, pData); @@ -2878,12 +2616,6 @@ MetaAction* MetaTextLineColorAction::Clone() return pClone; } -bool MetaTextLineColorAction::Compare( const MetaAction& rMetaAction ) const -{ - return ( maColor == static_cast<const MetaTextLineColorAction&>(rMetaAction).maColor ) && - ( mbSet == static_cast<const MetaTextLineColorAction&>(rMetaAction).mbSet ); -} - void MetaTextLineColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { MetaAction::Write(rOStm, pData); @@ -2928,12 +2660,6 @@ MetaAction* MetaOverlineColorAction::Clone() return pClone; } -bool MetaOverlineColorAction::Compare( const MetaAction& rMetaAction ) const -{ - return ( maColor == static_cast<const MetaOverlineColorAction&>(rMetaAction).maColor ) && - ( mbSet == static_cast<const MetaOverlineColorAction&>(rMetaAction).mbSet ); -} - void MetaOverlineColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { MetaAction::Write(rOStm, pData); @@ -2974,11 +2700,6 @@ MetaAction* MetaTextAlignAction::Clone() return pClone; } -bool MetaTextAlignAction::Compare( const MetaAction& rMetaAction ) const -{ - return maAlign == static_cast<const MetaTextAlignAction&>(rMetaAction).maAlign; -} - void MetaTextAlignAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { MetaAction::Write(rOStm, pData); @@ -3026,11 +2747,6 @@ void MetaMapModeAction::Scale( double fScaleX, double fScaleY ) maMapMode.SetOrigin( aPoint ); } -bool MetaMapModeAction::Compare( const MetaAction& rMetaAction ) const -{ - return maMapMode == static_cast<const MetaMapModeAction&>(rMetaAction).maMapMode; -} - void MetaMapModeAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { MetaAction::Write(rOStm, pData); @@ -3086,11 +2802,6 @@ void MetaFontAction::Scale( double fScaleX, double fScaleY ) maFont.SetSize( aSize ); } -bool MetaFontAction::Compare( const MetaAction& rMetaAction ) const -{ - return maFont == static_cast<const MetaFontAction&>(rMetaAction).maFont; -} - void MetaFontAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { MetaAction::Write(rOStm, pData); @@ -3135,11 +2846,6 @@ MetaAction* MetaPushAction::Clone() return pClone; } -bool MetaPushAction::Compare( const MetaAction& rMetaAction ) const -{ - return mnFlags == static_cast<const MetaPushAction&>(rMetaAction).mnFlags; -} - void MetaPushAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { MetaAction::Write(rOStm, pData); @@ -3211,11 +2917,6 @@ MetaAction* MetaRasterOpAction::Clone() return pClone; } -bool MetaRasterOpAction::Compare( const MetaAction& rMetaAction ) const -{ - return meRasterOp == static_cast<const MetaRasterOpAction&>(rMetaAction).meRasterOp; -} - void MetaRasterOpAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { MetaAction::Write(rOStm, pData); @@ -3268,12 +2969,6 @@ void MetaTransparentAction::Scale( double fScaleX, double fScaleY ) ImplScalePoly( maPolyPoly[ i ], fScaleX, fScaleY ); } -bool MetaTransparentAction::Compare( const MetaAction& rMetaAction ) const -{ - return ( maPolyPoly == static_cast<const MetaTransparentAction&>(rMetaAction).maPolyPoly ) && - ( mnTransPercent == static_cast<const MetaTransparentAction&>(rMetaAction).mnTransPercent ); -} - void MetaTransparentAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { MetaAction::Write(rOStm, pData); @@ -3343,14 +3038,6 @@ void MetaFloatTransparentAction::Scale( double fScaleX, double fScaleY ) maSize = aRectangle.GetSize(); } -bool MetaFloatTransparentAction::Compare( const MetaAction& rMetaAction ) const -{ - return ( maMtf == static_cast<const MetaFloatTransparentAction&>(rMetaAction).maMtf ) && - ( maPoint == static_cast<const MetaFloatTransparentAction&>(rMetaAction).maPoint ) && - ( maSize == static_cast<const MetaFloatTransparentAction&>(rMetaAction).maSize ) && - ( maGradient == static_cast<const MetaFloatTransparentAction&>(rMetaAction).maGradient ); -} - void MetaFloatTransparentAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { MetaAction::Write(rOStm, pData); @@ -3412,14 +3099,6 @@ void MetaEPSAction::Scale( double fScaleX, double fScaleY ) maSize = aRectangle.GetSize(); } -bool MetaEPSAction::Compare( const MetaAction& rMetaAction ) const -{ - return ( maGfxLink.IsEqual(static_cast<const MetaEPSAction&>(rMetaAction).maGfxLink )) && - ( maSubst == static_cast<const MetaEPSAction&>(rMetaAction).maSubst ) && - ( maPoint == static_cast<const MetaEPSAction&>(rMetaAction).maPoint ) && - ( maSize == static_cast<const MetaEPSAction&>(rMetaAction).maSize ); -} - void MetaEPSAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { MetaAction::Write(rOStm, pData); @@ -3469,12 +3148,6 @@ MetaAction* MetaRefPointAction::Clone() return pClone; } -bool MetaRefPointAction::Compare( const MetaAction& rMetaAction ) const -{ - return ( maRefPoint == static_cast<const MetaRefPointAction&>(rMetaAction).maRefPoint ) && - ( mbSet == static_cast<const MetaRefPointAction&>(rMetaAction).mbSet ); -} - void MetaRefPointAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { MetaAction::Write(rOStm, pData); @@ -3666,14 +3339,6 @@ void MetaCommentAction::Scale( double fXScale, double fYScale ) } } -bool MetaCommentAction::Compare( const MetaAction& rMetaAction ) const -{ - return ( maComment == static_cast<const MetaCommentAction&>(rMetaAction).maComment ) && - ( mnValue == static_cast<const MetaCommentAction&>(rMetaAction).mnValue ) && - ( mnDataSize == static_cast<const MetaCommentAction&>(rMetaAction).mnDataSize ) && - ( memcmp( mpData, static_cast<const MetaCommentAction&>(rMetaAction).mpData, mnDataSize ) == 0 ); -} - void MetaCommentAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { MetaAction::Write(rOStm, pData); @@ -3729,11 +3394,6 @@ MetaAction* MetaLayoutModeAction::Clone() return pClone; } -bool MetaLayoutModeAction::Compare( const MetaAction& rMetaAction ) const -{ - return mnLayoutMode == static_cast<const MetaLayoutModeAction&>(rMetaAction).mnLayoutMode; -} - void MetaLayoutModeAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { MetaAction::Write(rOStm, pData); @@ -3774,11 +3434,6 @@ MetaAction* MetaTextLanguageAction::Clone() return pClone; } -bool MetaTextLanguageAction::Compare( const MetaAction& rMetaAction ) const -{ - return meTextLanguage == static_cast<const MetaTextLanguageAction&>(rMetaAction).meTextLanguage; -} - void MetaTextLanguageAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) { MetaAction::Write(rOStm, pData); diff --git a/vcl/source/gdi/region.cxx b/vcl/source/gdi/region.cxx index 943559582d4d..493a02204255 100644 --- a/vcl/source/gdi/region.cxx +++ b/vcl/source/gdi/region.cxx @@ -1383,34 +1383,6 @@ bool vcl::Region::IsInside( const Point& rPoint ) const return false; } -bool vcl::Region::IsInside( const Rectangle& rRect ) const -{ - if(IsEmpty()) - { - // no rectangle can be in empty region - return false; - } - - if(IsNull()) - { - // rectangle always inside null-region - return true; - } - - if ( rRect.IsEmpty() ) - { - // is rectangle empty? -> not inside - return false; - } - - // create region from rectangle and intersect own region - vcl::Region aRegion(rRect); - aRegion.Exclude(*this); - - // rectangle is inside if exclusion is empty - return aRegion.IsEmpty(); -} - bool vcl::Region::IsOver( const Rectangle& rRect ) const { if(IsEmpty()) diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx index 39c2f777d754..2e1461f83152 100644 --- a/vcl/source/gdi/sallayout.cxx +++ b/vcl/source/gdi/sallayout.cxx @@ -942,43 +942,6 @@ DeviceCoordinate GenericSalLayout::GetTextWidth() const return nWidth; } -Rectangle GenericSalLayout::GetTextRect() const -{ - if( m_GlyphItems.empty() ) - return Rectangle(Point(0, 0), Size(0, 0)); - - // initialize the extent - DeviceCoordinate nMinXPos = 0; - DeviceCoordinate nMaxXPos = 0; - - DeviceCoordinate nMinYPos = 0; - DeviceCoordinate nMaxYPos = 0; - - for( GlyphVector::const_iterator pGlyphIter = m_GlyphItems.begin(), end = m_GlyphItems.end(); pGlyphIter != end ; ++pGlyphIter ) - { - // update the text extent with the glyph extent - DeviceCoordinate nXPos = pGlyphIter->maLinearPos.X(); - DeviceCoordinate nYPos = pGlyphIter->maLinearPos.Y(); - - if( nMinXPos > nXPos ) - nMinXPos = nXPos; - nXPos += pGlyphIter->mnNewWidth - pGlyphIter->mnXOffset; - if( nMaxXPos < nXPos ) - nMaxXPos = nXPos; - - if( nMinYPos > nYPos ) - nMinYPos = nYPos; - nYPos += pGlyphIter->mnNewWidth - pGlyphIter->mnYOffset; - if( nMaxYPos < nYPos ) - nMaxYPos = nYPos; - } - - DeviceCoordinate nWidth = nMaxXPos - nMinXPos; - DeviceCoordinate nHeight = nMaxYPos - nMinYPos; - - return Rectangle( Point(nMinXPos, nMinYPos), Size(nWidth, nHeight) ); -} - void GenericSalLayout::AdjustLayout( ImplLayoutArgs& rArgs ) { SalLayout::AdjustLayout( rArgs ); diff --git a/vcl/source/gdi/virdev.cxx b/vcl/source/gdi/virdev.cxx index 04ac2d72a700..b8dc0613fda4 100644 --- a/vcl/source/gdi/virdev.cxx +++ b/vcl/source/gdi/virdev.cxx @@ -543,14 +543,6 @@ sal_uInt16 VirtualDevice::GetBitCount() const return mnBitCount; } -sal_uInt16 VirtualDevice::GetAlphaBitCount() const -{ - if (mpAlphaVDev) - return mpAlphaVDev->GetBitCount(); - - return 0; -} - bool VirtualDevice::UsePolyPolygonForComplexGradient() { return true; diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx index 0d0a157b171a..c106067dbc2b 100644 --- a/vcl/source/opengl/OpenGLContext.cxx +++ b/vcl/source/opengl/OpenGLContext.cxx @@ -60,7 +60,6 @@ OpenGLContext::OpenGLContext(): mnRefCount(1), mbRequestLegacyContext(false), mbUseDoubleBufferedRendering(true), - mbRequestVirtualDevice(false), mnFramebufferCount(0), mpCurrentFramebuffer(NULL), mpFirstFramebuffer(NULL), @@ -152,11 +151,6 @@ void OpenGLContext::requestSingleBufferedRendering() mbUseDoubleBufferedRendering = false; } -void OpenGLContext::requestVirtualDevice() -{ - mbRequestVirtualDevice = true; -} - #if defined( _WIN32 ) static LRESULT CALLBACK WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { @@ -513,56 +507,6 @@ int oglErrorHandler( Display* /*dpy*/, XErrorEvent* /*evnt*/ ) return 0; } -GLXFBConfig* getFBConfigForPixmap(Display* dpy, int& nBestFBC, bool bUseDoubleBufferedRendering, int screen) -{ - static int visual_attribs[] = - { - GLX_DOUBLEBUFFER, False, - GLX_DRAWABLE_TYPE, GLX_PIXMAP_BIT, - GLX_X_RENDERABLE, True, - GLX_RED_SIZE, 8, - GLX_GREEN_SIZE, 8, - GLX_BLUE_SIZE, 8, - GLX_ALPHA_SIZE, 8, - GLX_DEPTH_SIZE, 24, - GLX_X_VISUAL_TYPE, GLX_TRUE_COLOR, - None - }; - - if (bUseDoubleBufferedRendering) - visual_attribs[1] = True; - - int fbCount = 0; - GLXFBConfig* pFBC = glXChooseFBConfig( dpy, - screen, - visual_attribs, &fbCount ); - - if(!pFBC) - { - SAL_WARN("vcl.opengl", "no suitable fb format found"); - return NULL; - } - - int best_num_samp = -1; - for(int i = 0; i < fbCount; ++i) - { - // pick the one with the most samples per pixel - int nSampleBuf = 0; - int nSamples = 0; - glXGetFBConfigAttrib( dpy, pFBC[i], GLX_SAMPLE_BUFFERS, &nSampleBuf ); - glXGetFBConfigAttrib( dpy, pFBC[i], GLX_SAMPLES , &nSamples ); - - if ( nBestFBC < 0 || (nSampleBuf && ( nSamples > best_num_samp )) ) - { - nBestFBC = i; - best_num_samp = nSamples; - } - } - - CHECK_GL_ERROR(); - return pFBC; -} - GLXFBConfig* getFBConfig(Display* dpy, Window win, int& nBestFBC, bool bUseDoubleBufferedRendering, bool bWithSameVisualID) { if( dpy == 0 || !glXQueryExtension( dpy, NULL, NULL ) ) @@ -709,36 +653,7 @@ bool OpenGLContext::init(Display* dpy, Window win, int screen) return ImplInit(); } -bool OpenGLContext::init(Display* dpy, Pixmap pix, unsigned int width, unsigned int height, int nScreen) -{ - if(mbInitialized) - return true; - - if (!dpy) - return false; - - initOpenGLFunctionPointers(); - - SAL_INFO("vcl.opengl", "init with pixmap"); - m_aGLWin.dpy = dpy; - m_aGLWin.Width = width; - m_aGLWin.Height = height; - m_aGLWin.pix = pix; - const int attrib_list[] = { GLX_TEXTURE_FORMAT_EXT, GLX_TEXTURE_FORMAT_RGB_EXT, - GLX_TEXTURE_TARGET_EXT, GLX_TEXTURE_2D_EXT, - None}; - int best_fbc = -1; - GLXFBConfig* config = getFBConfigForPixmap(dpy, best_fbc, mbUseDoubleBufferedRendering, nScreen); - if (best_fbc == -1) - return false; - - m_aGLWin.vi = glXGetVisualFromFBConfig( dpy, config[best_fbc] ); - m_aGLWin.glPix = glXCreatePixmap(dpy, config[best_fbc], pix, attrib_list); - mbPixmap = true; - - return ImplInit(); -} bool OpenGLContext::ImplInit() { @@ -899,15 +814,12 @@ bool OpenGLContext::ImplInit() // rendering - otherwise we get errors with virtual devices PixelFormatFront.dwFlags |= PFD_DOUBLEBUFFER; - if (mbRequestVirtualDevice) - PixelFormatFront.dwFlags |= PFD_DRAW_TO_BITMAP; - else - PixelFormatFront.dwFlags |= PFD_DRAW_TO_WINDOW; + PixelFormatFront.dwFlags |= PFD_DRAW_TO_WINDOW; // we must check whether can set the MSAA int WindowPix = 0; bool bMultiSampleSupport = InitMultisample(PixelFormatFront, WindowPix, - mbUseDoubleBufferedRendering, mbRequestVirtualDevice); + mbUseDoubleBufferedRendering, false); if (bMultiSampleSupport && WindowPix != 0) { m_aGLWin.bMultiSampleSupported = true; @@ -1073,14 +985,7 @@ void OpenGLContext::setWinSize(const Size& rSize) m_aGLWin.Height = rSize.Height(); } -void OpenGLContext::renderToFile() -{ - int iWidth = m_aGLWin.Width; - int iHeight = m_aGLWin.Height; - static int nIdx = 0; - OUString aName = "file:///home/moggi/Documents/work/output" + OUString::number( nIdx++ ) + ".png"; - OpenGLHelper::renderToFile(iWidth, iHeight, aName); -} + #if defined( WNT ) diff --git a/vcl/source/outdev/map.cxx b/vcl/source/outdev/map.cxx index 4f2863ece132..530df0257627 100644 --- a/vcl/source/outdev/map.cxx +++ b/vcl/source/outdev/map.cxx @@ -1054,14 +1054,6 @@ tools::PolyPolygon OutputDevice::LogicToPixel( const tools::PolyPolygon& rLogicP return aPolyPoly; } -basegfx::B2DPolygon OutputDevice::LogicToPixel( const basegfx::B2DPolygon& rLogicPoly ) const -{ - basegfx::B2DPolygon aTransformedPoly = rLogicPoly; - const ::basegfx::B2DHomMatrix& rTransformationMatrix = GetViewTransformation(); - aTransformedPoly.transform( rTransformationMatrix ); - return aTransformedPoly; -} - basegfx::B2DPolyPolygon OutputDevice::LogicToPixel( const basegfx::B2DPolyPolygon& rLogicPolyPoly ) const { basegfx::B2DPolyPolygon aTransformedPoly = rLogicPolyPoly; @@ -1231,49 +1223,6 @@ basegfx::B2DPolyPolygon OutputDevice::LogicToPixel( const basegfx::B2DPolyPolygo return aTransformedPoly; } -basegfx::B2DPolygon OutputDevice::LogicToPixel( const basegfx::B2DPolygon& rLogicPoly, - const MapMode& rMapMode ) const -{ - basegfx::B2DPolygon aTransformedPoly = rLogicPoly; - const ::basegfx::B2DHomMatrix& rTransformationMatrix = GetViewTransformation( rMapMode ); - aTransformedPoly.transform( rTransformationMatrix ); - return aTransformedPoly; -} - -vcl::Region OutputDevice::LogicToPixel( const vcl::Region& rLogicRegion, const MapMode& rMapMode ) const -{ - - if(rMapMode.IsDefault() || rLogicRegion.IsNull() || rLogicRegion.IsEmpty()) - { - return rLogicRegion; - } - - vcl::Region aRegion; - - if(rLogicRegion.getB2DPolyPolygon()) - { - aRegion = vcl::Region(LogicToPixel(*rLogicRegion.getB2DPolyPolygon(), rMapMode)); - } - else if(rLogicRegion.getPolyPolygon()) - { - aRegion = vcl::Region(LogicToPixel(*rLogicRegion.getPolyPolygon(), rMapMode)); - } - else if(rLogicRegion.getRegionBand()) - { - RectangleVector aRectangles; - rLogicRegion.GetRegionRectangles(aRectangles); - const RectangleVector& rRectangles(aRectangles); // needed to make the '!=' work - - // make reverse run to fill new region bottom-up, this will speed it up due to the used data structuring - for(RectangleVector::const_reverse_iterator aRectIter(rRectangles.rbegin()); aRectIter != rRectangles.rend(); ++aRectIter) - { - aRegion.Union(LogicToPixel(*aRectIter, rMapMode)); - } - } - - return aRegion; -} - Point OutputDevice::PixelToLogic( const Point& rDevicePt ) const { @@ -1549,40 +1498,6 @@ basegfx::B2DPolyPolygon OutputDevice::PixelToLogic( const basegfx::B2DPolyPolygo return aTransformedPoly; } -vcl::Region OutputDevice::PixelToLogic( const vcl::Region& rDeviceRegion, const MapMode& rMapMode ) const -{ - - if(rMapMode.IsDefault() || rDeviceRegion.IsNull() || rDeviceRegion.IsEmpty()) - { - return rDeviceRegion; - } - - vcl::Region aRegion; - - if(rDeviceRegion.getB2DPolyPolygon()) - { - aRegion = vcl::Region(PixelToLogic(*rDeviceRegion.getB2DPolyPolygon(), rMapMode)); - } - else if(rDeviceRegion.getPolyPolygon()) - { - aRegion = vcl::Region(PixelToLogic(*rDeviceRegion.getPolyPolygon(), rMapMode)); - } - else if(rDeviceRegion.getRegionBand()) - { - RectangleVector aRectangles; - rDeviceRegion.GetRegionRectangles(aRectangles); - const RectangleVector& rRectangles(aRectangles); // needed to make the '!=' work - - // make reverse run to fill new region bottom-up, this will speed it up due to the used data structuring - for(RectangleVector::const_reverse_iterator aRectIter(rRectangles.rbegin()); aRectIter != rRectangles.rend(); ++aRectIter) - { - aRegion.Union(PixelToLogic(*aRectIter, rMapMode)); - } - } - - return aRegion; -} - #define ENTER1( rSource, pMapModeSource, pMapModeDest ) \ if ( !pMapModeSource ) \ pMapModeSource = &maMapMode; \ diff --git a/vcl/source/outdev/outdev.cxx b/vcl/source/outdev/outdev.cxx index daaea0ab87f5..ecc6c8f31ed2 100644 --- a/vcl/source/outdev/outdev.cxx +++ b/vcl/source/outdev/outdev.cxx @@ -433,29 +433,6 @@ sal_uLong OutputDevice::GetColorCount() const return( ( nBitCount > 31 ) ? ULONG_MAX : ( ( (sal_uLong) 1 ) << nBitCount) ); } -css::uno::Reference< css::rendering::XCanvas > OutputDevice::GetCanvas() const -{ - css::uno::Sequence< css::uno::Any > aArg(6); - - aArg[ 0 ] = css::uno::makeAny( reinterpret_cast<sal_Int64>(this) ); - aArg[ 2 ] = css::uno::makeAny( css::awt::Rectangle( mnOutOffX, mnOutOffY, mnOutWidth, mnOutHeight ) ); - aArg[ 3 ] = css::uno::makeAny( sal_False ); - aArg[ 5 ] = GetSystemGfxDataAny(); - - css::uno::Reference<css::uno::XComponentContext> xContext = comphelper::getProcessComponentContext(); - - // Create canvas instance with window handle - static css::uno::Reference<css::lang::XMultiComponentFactory > xCanvasFactory( css::rendering::CanvasFactory::create( xContext ) ); - - css::uno::Reference<css::rendering::XCanvas> xCanvas; - xCanvas.set( - xCanvasFactory->createInstanceWithArgumentsAndContext( - "com.sun.star.rendering.Canvas", aArg, xContext ), - css::uno::UNO_QUERY ); - - return xCanvas; -} - css::uno::Reference< css::awt::XGraphics > OutputDevice::CreateUnoGraphics() { UnoWrapperBase* pWrapper = Application::GetUnoWrapper(); diff --git a/vcl/source/outdev/transparent.cxx b/vcl/source/outdev/transparent.cxx index bc4d8228b1fc..07ff0678effe 100644 --- a/vcl/source/outdev/transparent.cxx +++ b/vcl/source/outdev/transparent.cxx @@ -113,16 +113,6 @@ Color OutputDevice::ImplDrawModeToColor( const Color& rColor ) const return aColor; } -sal_uInt16 OutputDevice::GetAlphaBitCount() const -{ - return 0; -} - -bool OutputDevice::HasAlpha() -{ - return mpAlphaVDev != nullptr; -} - void OutputDevice::ImplPrintTransparent( const Bitmap& rBmp, const Bitmap& rMask, const Point& rDestPt, const Size& rDestSize, const Point& rSrcPtPixel, const Size& rSrcSizePixel ) diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 8ecf0f4172bd..199888a1141a 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -3433,11 +3433,6 @@ void Window::DrawSelectionBackground( const Rectangle& rRect, sal_uInt16 highlig DrawSelectionBackground( rRect, highlight, bChecked, bDrawBorder, bDrawExtBorderOnly, 0, NULL, NULL ); } -void Window::DrawSelectionBackground( const Rectangle& rRect, sal_uInt16 highlight, bool bChecked, bool bDrawBorder, bool bDrawExtBorderOnly, Color* pSelectionTextColor ) -{ - DrawSelectionBackground( rRect, highlight, bChecked, bDrawBorder, bDrawExtBorderOnly, 0, pSelectionTextColor, NULL ); -} - void Window::DrawSelectionBackground( const Rectangle& rRect, sal_uInt16 highlight, bool bChecked, @@ -3872,45 +3867,6 @@ void Window::ApplySettings(vcl::RenderContext& /*rRenderContext*/) { } -void Window::DrawGradientWallpaper(vcl::RenderContext& rRenderContext, - long nX, long nY, long nWidth, long nHeight, - const Wallpaper& rWallpaper) -{ - Rectangle aBound; - GDIMetaFile* pOldMetaFile = mpMetaFile; - const bool bOldMap = mbMap; - bool bNeedGradient = true; - - aBound = Rectangle(Point(nX, nY), Size(nWidth, nHeight)); - - mpMetaFile = NULL; - rRenderContext.EnableMapMode(false); - rRenderContext.Push(PushFlags::CLIPREGION); - rRenderContext.IntersectClipRegion(Rectangle(Point(nX, nY), Size(nWidth, nHeight))); - - if (rWallpaper.GetStyle() == WALLPAPER_APPLICATIONGRADIENT) - { - // limit gradient to useful size, so that it still can be noticed - // in maximized windows - long gradientWidth = GetDesktopRectPixel().GetSize().Width(); - if (gradientWidth > 1024) - gradientWidth = 1024; - if (mnOutOffX + nWidth > gradientWidth) - rRenderContext.DrawColorWallpaper(nX, nY, nWidth, nHeight, rWallpaper.GetGradient().GetEndColor()); - if (mnOutOffX > gradientWidth) - bNeedGradient = false; - else - aBound = Rectangle(Point(-mnOutOffX, nY), Size(gradientWidth, nHeight)); - } - - if (bNeedGradient) - rRenderContext.DrawGradient(aBound, rWallpaper.GetGradient()); - - rRenderContext.Pop(); - rRenderContext.EnableMapMode(bOldMap); - mpMetaFile = pOldMetaFile; -} - const SystemEnvData* Window::GetSystemData() const { @@ -3929,21 +3885,11 @@ Any Window::GetSystemDataAny() const return aRet; } -vcl::RenderSettings& Window::GetRenderSettings() -{ - return mpWindowImpl->maRenderSettings; -} - bool Window::SupportsDoubleBuffering() const { return mpWindowImpl->mbDoubleBuffering; } -void Window::SetDoubleBuffering(bool bDoubleBuffering) -{ - mpWindowImpl->mbDoubleBuffering = bDoubleBuffering; -} - /* * The rational here is that we moved destructors to * dispose and this altered a lot of code paths, that diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx index 5d73c49bbb14..c1b31962b6a5 100644 --- a/vcl/source/window/winproc.cxx +++ b/vcl/source/window/winproc.cxx @@ -1578,7 +1578,7 @@ public: HandleSwipeEvent(vcl::Window *pWindow, const SalSwipeEvent& rEvt) : HandleGestureEvent(pWindow, Point(rEvt.mnX, rEvt.mnY)) { - m_aSwipeData = CommandSwipeData(rEvt.mnVelocityX, rEvt.mnVelocityY); + m_aSwipeData = CommandSwipeData(rEvt.mnVelocityX); } virtual bool CallCommand(vcl::Window *pWindow, const Point &/*rMousePos*/) SAL_OVERRIDE { diff --git a/vcl/unx/generic/gdi/salbmp.cxx b/vcl/unx/generic/gdi/salbmp.cxx index cc0779909822..1836ce7f7b67 100644 --- a/vcl/unx/generic/gdi/salbmp.cxx +++ b/vcl/unx/generic/gdi/salbmp.cxx @@ -859,16 +859,6 @@ bool X11SalBitmap::GetSystemData( BitmapSystemData& rData ) return false; } -bool X11SalBitmap::Crop( const Rectangle& /*rRectPixel*/ ) -{ - return false; -} - -bool X11SalBitmap::Erase( const ::Color& /*rFillColor*/ ) -{ - return false; -} - bool X11SalBitmap::Scale( const double& /*rScaleX*/, const double& /*rScaleY*/, BmpScaleFlag /*nScaleFlag*/ ) { return false; diff --git a/vcl/unx/generic/gdi/salgdi2.cxx b/vcl/unx/generic/gdi/salgdi2.cxx index d92da5a6c47e..b98d9b69cf66 100644 --- a/vcl/unx/generic/gdi/salgdi2.cxx +++ b/vcl/unx/generic/gdi/salgdi2.cxx @@ -208,13 +208,6 @@ bool X11SalGraphics::drawAlphaRect( long nX, long nY, long nWidth, return mxImpl->drawAlphaRect( nX, nY, nWidth, nHeight, nTransparency ); } -void X11SalGraphics::drawBitmap( const SalTwoRect& rRect, - const SalBitmap& rBitmap, - SalColor nColor ) -{ - mxImpl->drawBitmap( rRect, rBitmap, nColor ); -} - void X11SalGraphics::drawMask( const SalTwoRect& rPosAry, const SalBitmap &rSalBitmap, SalColor nMaskColor ) diff --git a/vcl/win/source/gdi/salbmp.cxx b/vcl/win/source/gdi/salbmp.cxx index 86656dd1d86a..42088b739ac6 100644 --- a/vcl/win/source/gdi/salbmp.cxx +++ b/vcl/win/source/gdi/salbmp.cxx @@ -1056,16 +1056,6 @@ bool WinSalBitmap::GetSystemData( BitmapSystemData& rData ) return bRet; } -bool WinSalBitmap::Crop( const Rectangle& /*rRectPixel*/ ) -{ - return false; -} - -bool WinSalBitmap::Erase( const ::Color& /*rFillColor*/ ) -{ - return false; -} - bool WinSalBitmap::Scale( const double& /*rScaleX*/, const double& /*rScaleY*/, BmpScaleFlag /*nScaleFlag*/ ) { return false; diff --git a/vcl/win/source/gdi/salgdi2.cxx b/vcl/win/source/gdi/salgdi2.cxx index f00945164f3e..64516c248569 100644 --- a/vcl/win/source/gdi/salgdi2.cxx +++ b/vcl/win/source/gdi/salgdi2.cxx @@ -76,13 +76,6 @@ void WinSalGraphics::drawBitmap(const SalTwoRect& rPosAry, const SalBitmap& rSal void WinSalGraphics::drawBitmap( const SalTwoRect& rPosAry, const SalBitmap& rSSalBitmap, - SalColor nTransparentColor ) -{ - mpImpl->drawBitmap( rPosAry, rSSalBitmap, nTransparentColor ); -} - -void WinSalGraphics::drawBitmap( const SalTwoRect& rPosAry, - const SalBitmap& rSSalBitmap, const SalBitmap& rSTransparentBitmap ) { mpImpl->drawBitmap( rPosAry, rSSalBitmap, rSTransparentBitmap ); |