diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2012-02-20 13:16:51 +0100 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2012-02-20 22:19:32 +0100 |
commit | f4fbdf7f9c8e657cccb679b341397daabee7079b (patch) | |
tree | da5535c167fff13a0f692ee10cc47a8748e67060 | |
parent | 24f63831af82e71133fae0fc8309d1f752a402bf (diff) |
unusedcode.easy: Remove SwProtocol::Snapshot()
And all implementations. Also unused and removed:
ImplCreateFromXImage()
ImplGetFrameBitmap()
-rw-r--r-- | sw/source/core/inc/dbg_lay.hxx | 3 | ||||
-rw-r--r-- | sw/source/core/layout/dbg_lay.cxx | 43 | ||||
-rwxr-xr-x | unusedcode.easy | 1 | ||||
-rw-r--r-- | vcl/aqua/source/window/salframe.cxx | 5 | ||||
-rw-r--r-- | vcl/headless/svpframe.cxx | 5 | ||||
-rw-r--r-- | vcl/inc/aqua/salframe.h | 1 | ||||
-rw-r--r-- | vcl/inc/headless/svpframe.hxx | 1 | ||||
-rw-r--r-- | vcl/inc/ios/salframe.h | 1 | ||||
-rw-r--r-- | vcl/inc/salframe.hxx | 2 | ||||
-rw-r--r-- | vcl/inc/unx/gtk/gtkframe.hxx | 2 | ||||
-rw-r--r-- | vcl/inc/unx/salbmp.h | 7 | ||||
-rw-r--r-- | vcl/inc/unx/salframe.h | 1 | ||||
-rw-r--r-- | vcl/inc/vcl/outdev.hxx | 2 | ||||
-rw-r--r-- | vcl/inc/vcl/window.hxx | 2 | ||||
-rw-r--r-- | vcl/inc/win/salframe.h | 1 | ||||
-rw-r--r-- | vcl/ios/source/window/salframe.cxx | 5 | ||||
-rw-r--r-- | vcl/source/gdi/outdev2.cxx | 13 | ||||
-rw-r--r-- | vcl/source/window/window2.cxx | 36 | ||||
-rw-r--r-- | vcl/unx/generic/gdi/salbmp.cxx | 94 | ||||
-rw-r--r-- | vcl/unx/generic/window/salframe.cxx | 48 | ||||
-rw-r--r-- | vcl/unx/gtk/window/gtkframe.cxx | 26 | ||||
-rw-r--r-- | vcl/win/source/window/salframe.cxx | 33 |
22 files changed, 0 insertions, 332 deletions
diff --git a/sw/source/core/inc/dbg_lay.hxx b/sw/source/core/inc/dbg_lay.hxx index 4106bbd19240..eaa104400c2a 100644 --- a/sw/source/core/inc/dbg_lay.hxx +++ b/sw/source/core/inc/dbg_lay.hxx @@ -84,7 +84,6 @@ public: static void Record( const SwFrm* pFrm, sal_uLong nFunction, sal_uLong nAction, void* pParam ); static void Init(); static void Stop(); - static void SnapShot( const SwFrm* pFrm, sal_uLong nFlags ); static void GetVar( const sal_uInt16 nNo, long& rVar ); }; @@ -104,7 +103,6 @@ public: #define PROTOCOL_INIT SwProtocol::Init(); #define PROTOCOL_STOP SwProtocol::Stop(); #define PROTOCOL_ENTER( pFrm, nFunc, nAct, pPar ) SwEnterLeave aEnter( pFrm, nFunc, nAct, pPar ); -#define PROTOCOL_SNAPSHOT( pFrm, nFlags ) SwProtocol::SnapShot( pFrm, nFlags ); #define GET_VARIABLE( nNo, nVar ) SwProtocol::GetVar( nNo, nVar ); #else @@ -113,7 +111,6 @@ public: #define PROTOCOL_INIT #define PROTOCOL_STOP #define PROTOCOL_ENTER( pFrm, nFunc, nAct, pPar ) -#define PROTOCOL_SNAPSHOT( pFrm, nFlags ) #define GET_VARIABLE( nNo, nVar ) #endif diff --git a/sw/source/core/layout/dbg_lay.cxx b/sw/source/core/layout/dbg_lay.cxx index fc166cb6eca2..f435a17da299 100644 --- a/sw/source/core/layout/dbg_lay.cxx +++ b/sw/source/core/layout/dbg_lay.cxx @@ -161,7 +161,6 @@ public: sal_Bool DeleteFrm( sal_uInt16 nFrmId ); // FrmId entfernen, diesen nicht mehr Aufzeichnen void FileInit(); // Auslesen der INI-Datei void ChkStream() { if( !pStream ) NewStream(); } - void SnapShot( const SwFrm* pFrm, sal_uLong nFlags ); void GetVar( const sal_uInt16 nNo, long& rVar ) { if( nNo < aVars.size() ) rVar = aVars[ nNo ]; } }; @@ -274,14 +273,6 @@ void SwProtocol::Stop() nRecord = 0; } -// Creates a more or less detailed snapshot of the layout structur - -void SwProtocol::SnapShot( const SwFrm* pFrm, sal_uLong nFlags ) -{ - if( pImpl ) - pImpl->SnapShot( pFrm, nFlags ); -} - void SwProtocol::GetVar( const sal_uInt16 nNo, long& rVar ) { if( pImpl ) @@ -768,40 +759,6 @@ sal_Bool SwImplProtocol::DeleteFrm( sal_uInt16 nId ) return sal_False; } -/*-------------------------------------------------- - * SwProtocol::SnapShot(..) - * creates a snapshot of the given frame and its content. - * --------------------------------------------------*/ -void SwImplProtocol::SnapShot( const SwFrm* pFrm, sal_uLong nFlags ) -{ - while( pFrm ) - { - _Record( pFrm, PROT_SNAPSHOT, 0, 0); - if( pFrm->GetDrawObjs() && nFlags & SNAP_FLYFRAMES ) - { - aLayer.append(RTL_CONSTASCII_STRINGPARAM("[ ")); - const SwSortedObjs &rObjs = *pFrm->GetDrawObjs(); - for ( sal_uInt16 i = 0; i < rObjs.Count(); ++i ) - { - SwAnchoredObject* pObj = rObjs[i]; - if ( pObj->ISA(SwFlyFrm) ) - SnapShot( static_cast<SwFlyFrm*>(pObj), nFlags ); - } - if (aLayer.getLength() > 1) - aLayer.remove(aLayer.getLength() - 2, aLayer.getLength()); - } - if( pFrm->IsLayoutFrm() && nFlags & SNAP_LOWER && - ( !pFrm->IsTabFrm() || nFlags & SNAP_TABLECONT ) ) - { - aLayer.append(RTL_CONSTASCII_STRINGPARAM(" ")); - SnapShot( ((SwLayoutFrm*)pFrm)->Lower(), nFlags ); - if (aLayer.getLength() > 1) - aLayer.remove(aLayer.getLength() - 2, aLayer.getLength()); - } - pFrm = pFrm->GetNext(); - } -} - /* -------------------------------------------------- * SwEnterLeave::Ctor(..) wird vom eigentlichen (inline-)Kontruktor gerufen, * wenn die Funktion aufgezeichnet werden soll. diff --git a/unusedcode.easy b/unusedcode.easy index 69cb1254e2a0..0c6dd9e87efa 100755 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -376,7 +376,6 @@ SwPosFlyFrms::Insert(SwPosFlyFrms const*, unsigned short, unsigned short) SwPosFlyFrms::Remove(SwPosFlyFrm* const&, unsigned short) SwPosFlyFrms::Remove(unsigned short, unsigned short) SwProtocol::GetVar(unsigned short, long&) -SwProtocol::SnapShot(SwFrm const*, unsigned long) SwRects::Replace(SwRect const&, unsigned short) SwRects::Replace(SwRect const*, unsigned short, unsigned short) SwRects::_ForEach(unsigned short, unsigned short, unsigned char (*)(SwRect const&, void*), void*) diff --git a/vcl/aqua/source/window/salframe.cxx b/vcl/aqua/source/window/salframe.cxx index 70b247bf1dbc..f2e77e5882c0 100644 --- a/vcl/aqua/source/window/salframe.cxx +++ b/vcl/aqua/source/window/salframe.cxx @@ -1621,11 +1621,6 @@ void AquaSalFrame::SetBackgroundBitmap( SalBitmap* ) //TODO: implement } -SalBitmap* AquaSalFrame::SnapShot() -{ - return mpGraphics ? mpGraphics->getBitmap( 0, 0, maGeometry.nWidth, maGeometry.nHeight ) : NULL; -} - SalFrame* AquaSalFrame::GetParent() const { return mpParent; diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx index a8486b040406..ae5614226022 100644 --- a/vcl/headless/svpframe.cxx +++ b/vcl/headless/svpframe.cxx @@ -384,11 +384,6 @@ LanguageType SvpSalFrame::GetInputLanguage() return LANGUAGE_DONTKNOW; } -SalBitmap* SvpSalFrame::SnapShot() -{ - return NULL; -} - void SvpSalFrame::UpdateSettings( AllSettings& ) { } diff --git a/vcl/inc/aqua/salframe.h b/vcl/inc/aqua/salframe.h index 879e1dde0a4b..50ec40723d3d 100644 --- a/vcl/inc/aqua/salframe.h +++ b/vcl/inc/aqua/salframe.h @@ -146,7 +146,6 @@ public: virtual rtl::OUString GetKeyName( sal_uInt16 nKeyCode ); virtual sal_Bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode ); virtual LanguageType GetInputLanguage(); - virtual SalBitmap* SnapShot(); virtual void UpdateSettings( AllSettings& rSettings ); virtual void Beep( SoundType eSoundType ); virtual const SystemEnvData* GetSystemData() const; diff --git a/vcl/inc/headless/svpframe.hxx b/vcl/inc/headless/svpframe.hxx index 2165c5d89fc8..3dd896165b6e 100644 --- a/vcl/inc/headless/svpframe.hxx +++ b/vcl/inc/headless/svpframe.hxx @@ -107,7 +107,6 @@ public: virtual rtl::OUString GetKeyName( sal_uInt16 nKeyCode ); virtual sal_Bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode ); virtual LanguageType GetInputLanguage(); - virtual SalBitmap* SnapShot(); virtual void UpdateSettings( AllSettings& rSettings ); virtual void Beep( SoundType eSoundType ); virtual const SystemEnvData* GetSystemData() const; diff --git a/vcl/inc/ios/salframe.h b/vcl/inc/ios/salframe.h index b76ddfd915c9..46ff6fc17549 100644 --- a/vcl/inc/ios/salframe.h +++ b/vcl/inc/ios/salframe.h @@ -142,7 +142,6 @@ public: virtual rtl::OUString GetKeyName( sal_uInt16 nKeyCode ); virtual sal_Bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode ); virtual LanguageType GetInputLanguage(); - virtual SalBitmap* SnapShot(); virtual void UpdateSettings( AllSettings& rSettings ); virtual void Beep( SoundType eSoundType ); virtual const SystemEnvData* GetSystemData() const; diff --git a/vcl/inc/salframe.hxx b/vcl/inc/salframe.hxx index 4c412b7677de..e72648316992 100644 --- a/vcl/inc/salframe.hxx +++ b/vcl/inc/salframe.hxx @@ -213,8 +213,6 @@ public: // may be LANGUAGE_DONTKNOW if not supported by the OS virtual LanguageType GetInputLanguage() = 0; - virtual SalBitmap* SnapShot() = 0; - virtual void UpdateSettings( AllSettings& rSettings ) = 0; virtual void Beep( SoundType eSoundType ) = 0; diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx index ee436da271f2..e5fd0cf5660a 100644 --- a/vcl/inc/unx/gtk/gtkframe.hxx +++ b/vcl/inc/unx/gtk/gtkframe.hxx @@ -393,8 +393,6 @@ public: // may be LANGUAGE_DONTKNOW if not supported by the OS virtual LanguageType GetInputLanguage(); - virtual SalBitmap* SnapShot(); - virtual void UpdateSettings( AllSettings& rSettings ); virtual void Beep( SoundType eSoundType ); diff --git a/vcl/inc/unx/salbmp.h b/vcl/inc/unx/salbmp.h index a5f0bac27d3b..31aeeab58271 100644 --- a/vcl/inc/unx/salbmp.h +++ b/vcl/inc/unx/salbmp.h @@ -78,13 +78,6 @@ public: static void ImplDestroyCache(); void ImplRemovedFromCache(); - bool SnapShot (Display* pDisplay, XLIB_Window hWindow); - bool ImplCreateFromXImage( - Display* pDisplay, - XLIB_Window hWindow, - SalX11Screen nXScreen, - XImage* pImage - ); private: BitmapBuffer* mpDIB; diff --git a/vcl/inc/unx/salframe.h b/vcl/inc/unx/salframe.h index 3ccb8751ec9d..f03f0e5b8f5d 100644 --- a/vcl/inc/unx/salframe.h +++ b/vcl/inc/unx/salframe.h @@ -255,7 +255,6 @@ public: virtual rtl::OUString GetKeyName( sal_uInt16 nKeyCode ); virtual sal_Bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode ); virtual LanguageType GetInputLanguage(); - virtual SalBitmap* SnapShot(); virtual void UpdateSettings( AllSettings& rSettings ); virtual void Beep( SoundType eSoundType ); virtual const SystemEnvData* GetSystemData() const; diff --git a/vcl/inc/vcl/outdev.hxx b/vcl/inc/vcl/outdev.hxx index 6a983ec92af6..b6c0411563a5 100644 --- a/vcl/inc/vcl/outdev.hxx +++ b/vcl/inc/vcl/outdev.hxx @@ -533,8 +533,6 @@ public: const OutputDevice& rOutDev, const Region& rRegion ); SAL_DLLPRIVATE void ImplGetFrameDev( const Point& rPt, const Point& rDevPt, const Size& rDevSize, OutputDevice& rOutDev ); - SAL_DLLPRIVATE void ImplGetFrameBitmap( const Point& rPt, const Size& rSize, - Bitmap& rBitmap ) const; SAL_DLLPRIVATE sal_Bool ImplIsRecordLayout() const; diff --git a/vcl/inc/vcl/window.hxx b/vcl/inc/vcl/window.hxx index ad445b7a0064..f4b79ae700d0 100644 --- a/vcl/inc/vcl/window.hxx +++ b/vcl/inc/vcl/window.hxx @@ -950,8 +950,6 @@ public: void SetData( void* pNewData ); void* GetData() const; - Bitmap SnapShot( sal_Bool bBorder = sal_True ) const; - void ShowFocus( const Rectangle& rRect ); void HideFocus(); diff --git a/vcl/inc/win/salframe.h b/vcl/inc/win/salframe.h index b252ad3d2ded..0d4e206e8507 100644 --- a/vcl/inc/win/salframe.h +++ b/vcl/inc/win/salframe.h @@ -129,7 +129,6 @@ public: virtual rtl::OUString GetKeyName( sal_uInt16 nKeyCode ); virtual sal_Bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode ); virtual LanguageType GetInputLanguage(); - virtual SalBitmap* SnapShot(); virtual void UpdateSettings( AllSettings& rSettings ); virtual void Beep( SoundType eSoundType ); virtual const SystemEnvData* GetSystemData() const; diff --git a/vcl/ios/source/window/salframe.cxx b/vcl/ios/source/window/salframe.cxx index 10f087ee3724..0665fc91fb7c 100644 --- a/vcl/ios/source/window/salframe.cxx +++ b/vcl/ios/source/window/salframe.cxx @@ -958,11 +958,6 @@ void IosSalFrame::SetBackgroundBitmap( SalBitmap* ) //TODO: implement } -SalBitmap* IosSalFrame::SnapShot() -{ - return mpGraphics ? mpGraphics->getBitmap( 0, 0, maGeometry.nWidth, maGeometry.nHeight ) : NULL; -} - SalFrame* IosSalFrame::GetParent() const { return mpParent; diff --git a/vcl/source/gdi/outdev2.cxx b/vcl/source/gdi/outdev2.cxx index 9b0b4f3c09a7..1781655ec44d 100644 --- a/vcl/source/gdi/outdev2.cxx +++ b/vcl/source/gdi/outdev2.cxx @@ -1361,19 +1361,6 @@ BitmapEx OutputDevice::GetBitmapEx( const Point& rSrcPt, const Size& rSize ) con // ------------------------------------------------------------------ -void OutputDevice::ImplGetFrameBitmap( const Point& rDestPt, const Size& rSize, - Bitmap& rBitmap ) const -{ - DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); - - sal_Bool bOldMap = mbMap; - ((OutputDevice*)this)->mbMap = sal_False; - rBitmap = GetBitmap( rDestPt, rSize ); - ((OutputDevice*)this)->mbMap = bOldMap; -} - -// ------------------------------------------------------------------ - Color OutputDevice::GetPixel( const Point& rPt ) const { DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx index 16972adf07d6..e9b433853a91 100644 --- a/vcl/source/window/window2.cxx +++ b/vcl/source/window/window2.cxx @@ -302,42 +302,6 @@ void Window::ImplInvalidateAllOverlapBackgrounds() } } -// ======================================================================= - -Bitmap Window::SnapShot( sal_Bool bBorder ) const -{ - DBG_CHKTHIS( Window, ImplDbgCheckWindow ); - - Bitmap aBmp; - - if ( IsReallyVisible() ) - { - if ( bBorder && mpWindowImpl->mpBorderWindow ) - aBmp = mpWindowImpl->mpBorderWindow->SnapShot(); - else - { - ((Window*)this)->Update(); - - if ( bBorder && mpWindowImpl->mbFrame ) - { - SalBitmap* pSalBmp = mpWindowImpl->mpFrame->SnapShot(); - - if ( pSalBmp ) - { - ImpBitmap* pImpBmp = new ImpBitmap; - pImpBmp->ImplSetSalBitmap( pSalBmp ); - aBmp.ImplSetImpBitmap( pImpBmp ); - return aBmp; - } - } - - mpWindowImpl->mpFrameWindow->ImplGetFrameBitmap( Point( mnOutOffX, mnOutOffY ), Size( mnOutWidth, mnOutHeight ), aBmp ); - } - } - - return aBmp; -} - // ----------------------------------------------------------------------- void Window::ShowFocus( const Rectangle& rRect ) diff --git a/vcl/unx/generic/gdi/salbmp.cxx b/vcl/unx/generic/gdi/salbmp.cxx index 0eccf20f1ad0..cd617b8c2c58 100644 --- a/vcl/unx/generic/gdi/salbmp.cxx +++ b/vcl/unx/generic/gdi/salbmp.cxx @@ -565,100 +565,6 @@ bool X11SalBitmap::ImplCreateFromDrawable( } // ----------------------------------------------------------------------------- -bool X11SalBitmap::SnapShot (Display* pDisplay, XLIB_Window hWindow) -{ - if (hWindow != None) - { - XWindowAttributes aAttribute; - XGetWindowAttributes (pDisplay, hWindow, &aAttribute); - if (aAttribute.map_state == IsViewable) - { - // get coordinates relative to root window - XLIB_Window hPetitFleur; - int nRootX, nRootY; - - if (XTranslateCoordinates (pDisplay, hWindow, aAttribute.root, - 0, 0, &nRootX, &nRootY, &hPetitFleur)) - { - XWindowAttributes aRootAttribute; - XGetWindowAttributes (pDisplay, aAttribute.root, &aRootAttribute); - - int width = aAttribute.width; - int height = aAttribute.height; - int x = nRootX; - int y = nRootY; - - // horizontal range check - if (x < 0) - { - width = width + x; - x = 0; - } - else - if (x > aRootAttribute.width) - { - width = 0; - x = aRootAttribute.width; - } - else - if (x + width > aRootAttribute.width) - { - width = aRootAttribute.width - x; - } - - // vertical range check - if (y < 0) - { - height = height + y; - y = 0; - } - else - if (y > aRootAttribute.height) - { - height = 0; - y = aRootAttribute.height; - } - else - if (y + height > aRootAttribute.height) - { - height = aRootAttribute.height - y; - } - - if ((width > 0) && (height > 0)) - { - XImage* pImage = XGetImage( pDisplay, aAttribute.root, - x, y, width, height, AllPlanes, ZPixmap ); - bool bSnapShot = ImplCreateFromXImage( - pDisplay, aAttribute.root, - SalX11Screen (XScreenNumberOfScreen( aAttribute.screen ) ), - pImage ); - XDestroyImage (pImage); - - return bSnapShot; - } - } - } - } - - return False; -} - -bool X11SalBitmap::ImplCreateFromXImage ( - Display* pDisplay, - XLIB_Window hWindow, - SalX11Screen nScreen, - XImage* pImage -) { - Destroy(); - - if (pImage != NULL && pImage->width != 0 && pImage->height != 0 && pImage->depth != 0) - { - mpDDB = new ImplSalDDB (pDisplay, hWindow, nScreen, pImage); - return True; - } - return False; -} - ImplSalDDB* X11SalBitmap::ImplGetDDB( Drawable aDrawable, SalX11Screen nXScreen, diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index c88279017a1f..141289f3f00d 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -1805,54 +1805,6 @@ sal_Bool X11SalFrame::GetWindowState( SalFrameState* pState ) return sal_True; } -// ---------------------------------------------------------------------------- -// get a screenshot of the current frame including window manager decoration -SalBitmap* X11SalFrame::SnapShot() -{ - Display* pDisplay = GetXDisplay(); - - // make sure the frame has been reparented and all paint timer have been - // expired - do - { - XSync(pDisplay, False); - Application::Reschedule (); - } - while (XPending(pDisplay)); - TimeValue aVal; - aVal.Seconds = 0; - aVal.Nanosec = 50000000; - osl_waitThread( &aVal ); - do - { - XSync(pDisplay, False); - Application::Reschedule (); - } - while (XPending(pDisplay)); - - // get the most outer window, usually the window manager decoration - Drawable hWindow = None; - if (IsOverrideRedirect()) - hWindow = GetDrawable(); - else - if (hPresentationWindow != None) - hWindow = hPresentationWindow; - else - hWindow = GetStackingWindow(); - - // query the contents of the window - if (hWindow != None) - { - X11SalBitmap *pBmp = new X11SalBitmap; - if (pBmp->SnapShot (pDisplay, hWindow)) - return pBmp; - else - delete pBmp; - } - - return NULL; -} - // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= // native menu implementation - currently empty diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx index f889e619ba35..7f4db68dd037 100644 --- a/vcl/unx/gtk/window/gtkframe.cxx +++ b/vcl/unx/gtk/window/gtkframe.cxx @@ -2446,32 +2446,6 @@ LanguageType GtkSalFrame::GetInputLanguage() return LANGUAGE_DONTKNOW; } -SalBitmap* GtkSalFrame::SnapShot() -{ - if( !m_pWindow ) - return NULL; - -#if GTK_CHECK_VERSION(3,0,0) - SvpSalGraphics *pGraphics = static_cast<SvpSalGraphics *>(GetGraphics()); - if (!pGraphics) - return NULL; - - SalBitmap *pRet = pGraphics->getBitmap( 0, 0, maGeometry.nWidth, maGeometry.nHeight ); - ReleaseGraphics( pGraphics ); - - return pRet; -#else - X11SalBitmap *pBmp = new X11SalBitmap; - if( pBmp->SnapShot( GDK_DISPLAY_XDISPLAY( getGdkDisplay() ), - widget_get_xid(m_pWindow) ) ) - return pBmp; - else - delete pBmp; -#endif - - return NULL; -} - void GtkSalFrame::UpdateSettings( AllSettings& rSettings ) { if( ! m_pWindow ) diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx index 2243e219a83b..55630a8f451a 100644 --- a/vcl/win/source/window/salframe.cxx +++ b/vcl/win/source/window/salframe.cxx @@ -2958,39 +2958,6 @@ void WinSalFrame::UpdateSettings( AllSettings& rSettings ) // ----------------------------------------------------------------------- -SalBitmap* WinSalFrame::SnapShot() -{ - WinSalBitmap* pSalBitmap = NULL; - - RECT aRect; - GetWindowRect( mhWnd, &aRect ); - - int nDX = aRect.right-aRect.left; - int nDY = aRect.bottom-aRect.top; - HDC hDC = GetWindowDC( mhWnd ); - HBITMAP hBmpBitmap = CreateCompatibleBitmap( hDC, nDX, nDY ); - HDC hBmpDC = ImplGetCachedDC( CACHED_HDC_1, hBmpBitmap ); - sal_Bool bRet; - - bRet = BitBlt( hBmpDC, 0, 0, nDX, nDY, hDC, 0, 0, SRCCOPY ) ? TRUE : FALSE; - ImplReleaseCachedDC( CACHED_HDC_1 ); - - if ( bRet ) - { - pSalBitmap = new WinSalBitmap; - - if ( !pSalBitmap->Create( hBmpBitmap, FALSE, FALSE ) ) - { - delete pSalBitmap; - pSalBitmap = NULL; - } - } - - return pSalBitmap; -} - -// ----------------------------------------------------------------------- - const SystemEnvData* WinSalFrame::GetSystemData() const { return &maSysData; |