summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
Diffstat (limited to 'vcl')
-rw-r--r--vcl/inc/osx/salframe.h1
-rw-r--r--vcl/inc/salframe.hxx2
-rw-r--r--vcl/inc/unx/gtk/gtkframe.hxx2
-rw-r--r--vcl/inc/unx/salframe.h1
-rw-r--r--vcl/inc/win/salframe.h1
-rw-r--r--vcl/osx/salframe.cxx12
-rw-r--r--vcl/source/gdi/impanmvw.cxx2
-rw-r--r--vcl/source/window/window.cxx6
-rw-r--r--vcl/unx/generic/window/salframe.cxx5
-rw-r--r--vcl/unx/gtk/window/gtkobject.cxx2
-rw-r--r--vcl/unx/gtk/window/gtksalframe.cxx5
-rw-r--r--vcl/win/source/window/salframe.cxx5
-rw-r--r--vcl/workben/outdevgrind.cxx2
13 files changed, 3 insertions, 43 deletions
diff --git a/vcl/inc/osx/salframe.h b/vcl/inc/osx/salframe.h
index b030d3934ee5..4ed18fa483c6 100644
--- a/vcl/inc/osx/salframe.h
+++ b/vcl/inc/osx/salframe.h
@@ -132,7 +132,6 @@ public:
virtual void SetPointerPos( long nX, long nY ) SAL_OVERRIDE;
virtual void Flush( void ) SAL_OVERRIDE;
virtual void Flush( const Rectangle& ) SAL_OVERRIDE;
- virtual void Sync() SAL_OVERRIDE;
virtual void SetInputContext( SalInputContext* pContext ) SAL_OVERRIDE;
virtual void EndExtTextInput( sal_uInt16 nFlags ) SAL_OVERRIDE;
virtual OUString GetKeyName( sal_uInt16 nKeyCode ) SAL_OVERRIDE;
diff --git a/vcl/inc/salframe.hxx b/vcl/inc/salframe.hxx
index 4e52fe44e309..7491e045035f 100644
--- a/vcl/inc/salframe.hxx
+++ b/vcl/inc/salframe.hxx
@@ -173,8 +173,6 @@ public:
// flush output buffer
virtual void Flush() = 0;
virtual void Flush( const Rectangle& );
- // flush output buffer, wait till outstanding operations are done
- virtual void Sync() = 0;
virtual void SetInputContext( SalInputContext* pContext ) = 0;
virtual void EndExtTextInput( sal_uInt16 nFlags ) = 0;
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index 604f2a6df789..210808537528 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -413,8 +413,6 @@ public:
// flush output buffer
using SalFrame::Flush;
virtual void Flush() SAL_OVERRIDE;
- // flush output buffer, wait till outstanding operations are done
- virtual void Sync() SAL_OVERRIDE;
virtual void SetInputContext( SalInputContext* pContext ) SAL_OVERRIDE;
virtual void EndExtTextInput( sal_uInt16 nFlags ) SAL_OVERRIDE;
diff --git a/vcl/inc/unx/salframe.h b/vcl/inc/unx/salframe.h
index 9ead2aed89e1..706b198fc27c 100644
--- a/vcl/inc/unx/salframe.h
+++ b/vcl/inc/unx/salframe.h
@@ -241,7 +241,6 @@ public:
virtual void SetPointerPos( long nX, long nY ) SAL_OVERRIDE;
using SalFrame::Flush;
virtual void Flush() SAL_OVERRIDE;
- virtual void Sync() SAL_OVERRIDE;
virtual void SetInputContext( SalInputContext* pContext ) SAL_OVERRIDE;
virtual void EndExtTextInput( sal_uInt16 nFlags ) SAL_OVERRIDE;
virtual OUString GetKeyName( sal_uInt16 nKeyCode ) SAL_OVERRIDE;
diff --git a/vcl/inc/win/salframe.h b/vcl/inc/win/salframe.h
index 73f9e7010551..b3e586cf76cc 100644
--- a/vcl/inc/win/salframe.h
+++ b/vcl/inc/win/salframe.h
@@ -113,7 +113,6 @@ public:
virtual void SetPointerPos( long nX, long nY ) SAL_OVERRIDE;
using SalFrame::Flush;
virtual void Flush() SAL_OVERRIDE;
- virtual void Sync() SAL_OVERRIDE;
virtual void SetInputContext( SalInputContext* pContext ) SAL_OVERRIDE;
virtual void EndExtTextInput( sal_uInt16 nFlags ) SAL_OVERRIDE;
virtual OUString GetKeyName( sal_uInt16 nKeyCode ) SAL_OVERRIDE;
diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index 251f5c3d08ab..bfe88f3b2f92 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -903,18 +903,6 @@ void AquaSalFrame::Flush( const Rectangle& rRect )
}
}
-void AquaSalFrame::Sync()
-{
- if( mbGraphics && mpGraphics && mpNSView && mbShown )
- {
- // #i113170# may not be the main thread if called from UNO API
- SalData::ensureThreadAutoreleasePool();
-
- [mpNSView setNeedsDisplay: YES];
- [mpNSView display];
- }
-}
-
void AquaSalFrame::SetInputContext( SalInputContext* pContext )
{
if (!pContext)
diff --git a/vcl/source/gdi/impanmvw.cxx b/vcl/source/gdi/impanmvw.cxx
index 8dc2c49c8335..5346b7839fa6 100644
--- a/vcl/source/gdi/impanmvw.cxx
+++ b/vcl/source/gdi/impanmvw.cxx
@@ -301,7 +301,7 @@ void ImplAnimView::draw( sal_uLong nPos, VirtualDevice* pVDev )
pDev.disposeAndClear();
if( pRenderContext->GetOutDevType() == OUTDEV_WINDOW )
- static_cast<vcl::Window*>( pRenderContext.get() )->Sync();
+ static_cast<vcl::Window*>( pRenderContext.get() )->Flush();
}
}
}
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index d8c7846031e2..95c48c4d25f5 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -3146,12 +3146,6 @@ void Window::Flush()
mpWindowImpl->mpFrame->Flush( aWinRect );
}
-void Window::Sync()
-{
-
- mpWindowImpl->mpFrame->Sync();
-}
-
void Window::SetUpdateMode( bool bUpdate )
{
mpWindowImpl->mbNoUpdate = !bUpdate;
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index fb64cc32e63c..0dfcd619d3bf 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -2454,11 +2454,6 @@ void X11SalFrame::Flush()
XFlush( GetDisplay()->GetDisplay() );
}
-void X11SalFrame::Sync()
-{
- XSync( GetDisplay()->GetDisplay(), False );
-}
-
// Keyboard
void X11SalFrame::SetInputContext( SalInputContext* pContext )
diff --git a/vcl/unx/gtk/window/gtkobject.cxx b/vcl/unx/gtk/window/gtkobject.cxx
index 3de060bdc843..463c3c1ff486 100644
--- a/vcl/unx/gtk/window/gtkobject.cxx
+++ b/vcl/unx/gtk/window/gtkobject.cxx
@@ -78,7 +78,7 @@ GtkSalObject::GtkSalObject( GtkSalFrame* pParent, bool bShow )
g_signal_connect( G_OBJECT(m_pSocket), "destroy", G_CALLBACK(signalDestroy), this );
// #i59255# necessary due to sync effects with java child windows
- pParent->Sync();
+ pParent->Flush();
}
}
diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx
index fe41c30593e5..0034de61b3e6 100644
--- a/vcl/unx/gtk/window/gtksalframe.cxx
+++ b/vcl/unx/gtk/window/gtksalframe.cxx
@@ -2903,11 +2903,6 @@ void GtkSalFrame::Flush()
#endif
}
-void GtkSalFrame::Sync()
-{
- gdk_display_sync( getGdkDisplay() );
-}
-
#ifndef GDK_Open
#define GDK_Open 0x1008ff6b
#endif
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index 6acf7d8b08bc..6f6793f9e574 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -2210,11 +2210,6 @@ void WinSalFrame::Flush()
GdiFlush();
}
-void WinSalFrame::Sync()
-{
- GdiFlush();
-}
-
static void ImplSalFrameSetInputContext( HWND hWnd, const SalInputContext* pContext )
{
WinSalFrame* pFrame = GetWindowPtr( hWnd );
diff --git a/vcl/workben/outdevgrind.cxx b/vcl/workben/outdevgrind.cxx
index 7407c51a5fe5..bd819f131df5 100644
--- a/vcl/workben/outdevgrind.cxx
+++ b/vcl/workben/outdevgrind.cxx
@@ -807,7 +807,7 @@ void grindFunc( OutputDevice& rTarget,
iter->second(&rTarget);
if( rTarget.GetOutDevType() == OUTDEV_WINDOW )
- static_cast< vcl::Window & >( rTarget ).Sync();
+ static_cast< vcl::Window & >( rTarget ).Flush();
fprintf( stdout,
"Duration: %d ms (%d repetitions)\tOperation: %s\tSetup: %s\n",
generated by cgit (git 2.34.1) at 2024-06-05 00:18:11 +0000