summaryrefslogtreecommitdiff
path: root/vcl/unx/generic/window
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/unx/generic/window')
-rw-r--r--vcl/unx/generic/window/FWS.cxx2
-rw-r--r--vcl/unx/generic/window/salframe.cxx21
-rw-r--r--vcl/unx/generic/window/salobj.cxx20
3 files changed, 0 insertions, 43 deletions
diff --git a/vcl/unx/generic/window/FWS.cxx b/vcl/unx/generic/window/FWS.cxx
index 43f1130c68e3..b6887dae7a67 100644
--- a/vcl/unx/generic/window/FWS.cxx
+++ b/vcl/unx/generic/window/FWS.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -116,7 +115,6 @@ WMSupportsFWS (Display *display, int screen)
#endif
XFree (propData);
-
if (XGetWindowProperty (display, DefaultRootWindow (display),
FWS_PROTOCOLS, 0, 10,
False, AnyPropertyType, &propType,
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index a292449b66db..3a60c1ff6a35 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <signal.h>
#include <string.h>
#include <stdio.h>
@@ -893,7 +892,6 @@ X11SalFrame::~X11SalFrame()
delete pFreeGraphics_;
}
-
XDestroyWindow( GetXDisplay(), mhWindow );
/*
@@ -1807,7 +1805,6 @@ bool X11SalFrame::GetWindowState( SalFrameState* pState )
pState->mnMask = _FRAMESTATE_MASK_GEOMETRY | WINDOWSTATE_MASK_STATE;
-
if (! maRestorePosSize.IsEmpty() )
{
GetPosSize( aPosSize );
@@ -2287,7 +2284,6 @@ void X11SalFrame::StartPresentation( bool bStart )
doReparentPresentationDialogues( GetDisplay() );
hPresentationWindow = (bStart && IsOverrideRedirect() ) ? GetWindow() : None;
-
// needs static here to save DPMS settings
int dummy;
static bool DPMSExtensionAvailable =
@@ -2304,7 +2300,6 @@ void X11SalFrame::StartPresentation( bool bStart )
static CARD16 dpms_suspend_timeout=0;
static CARD16 dpms_off_timeout=0;
-
if( bStart || nScreenSaversTimeout_ || DPMSEnabled)
{
if( hPresentationWindow )
@@ -2322,7 +2317,6 @@ void X11SalFrame::StartPresentation( bool bStart )
&prefer_blanking,
&allow_exposures );
-
// get the DPMS state right before the start
if (DPMSExtensionAvailable)
{
@@ -2460,15 +2454,11 @@ void X11SalFrame::SetTitle( const OUString& rTitle )
}
}
-
-
void X11SalFrame::Flush()
{
XFlush( GetDisplay()->GetDisplay() );
}
-
-
void X11SalFrame::Sync()
{
XSync( GetDisplay()->GetDisplay(), False );
@@ -2513,16 +2503,12 @@ void X11SalFrame::SetInputContext( SalInputContext* pContext )
return;
}
-
-
void X11SalFrame::EndExtTextInput( sal_uInt16 nFlags )
{
if (mpInputContext != NULL)
mpInputContext->EndExtTextInput( nFlags );
}
-
-
OUString X11SalFrame::GetKeyName( sal_uInt16 nKeyCode )
{
return GetDisplay()->GetKeyName( nKeyCode );
@@ -2779,7 +2765,6 @@ long X11SalFrame::HandleMouseEvent( XEvent *pEvent )
}
}
-
if( LeaveNotify == pEvent->type || EnterNotify == pEvent->type )
{
/*
@@ -3386,7 +3371,6 @@ long X11SalFrame::HandleKeyEvent( XKeyEvent *pEvent )
}
}
-
// update the spot location for PreeditPosition IME style
if (! aDeleteWatch.isDeleted())
@@ -3430,7 +3414,6 @@ long X11SalFrame::HandleFocusEvent( XFocusChangeEvent *pEvent )
}
}
-
if ( pEvent->mode == NotifyNormal || pEvent->mode == NotifyWhileGrabbed ||
( ( nStyle_ & SAL_FRAME_STYLE_PLUG ) && pEvent->window == GetShellWindow() )
)
@@ -3444,8 +3427,6 @@ long X11SalFrame::HandleFocusEvent( XFocusChangeEvent *pEvent )
mbInputFocus = True;
ImplSVData* pSVData = ImplGetSVData();
-
-
long nRet = CallCallback( SALEVENT_GETFOCUS, 0 );
if ((mpParent != NULL && nStyle_ == 0)
&& pSVData->maWinData.mpFirstFloat )
@@ -3613,7 +3594,6 @@ long X11SalFrame::HandleSizeEvent( XConfigureEvent *pEvent )
return 1;
}
-
if( ( nStyle_ & SAL_FRAME_STYLE_PLUG ) && pEvent->window == GetShellWindow() )
{
// just update the children's positions
@@ -4133,7 +4113,6 @@ long X11SalFrame::Dispatch( XEvent *pEvent )
CurrentTime );
}
-
RestackChildren();
mbInShow = false;
m_bSetFocusOnMap = false;
diff --git a/vcl/unx/generic/window/salobj.cxx b/vcl/unx/generic/window/salobj.cxx
index 4588321affc1..7a61bd1c92bd 100644
--- a/vcl/unx/generic/window/salobj.cxx
+++ b/vcl/unx/generic/window/salobj.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#if OSL_DEBUG_LEVEL > 1
#include <stdio.h>
#endif
@@ -38,8 +37,6 @@
#include <salwtype.hxx>
-
-
// SalInstance member to create and destroy a SalObject
SalObject* X11SalInstance::CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, bool bShow )
@@ -173,18 +170,14 @@ X11SalObject* X11SalObject::CreateObject( SalFrame* pParent, SystemWindowData* p
return pObject;
}
-
void X11SalInstance::DestroyObject( SalObject* pObject )
{
delete pObject;
}
-
-
// SalClipRegion is a member of SalObject
// definition of SalClipRegion my be found in unx/inc/salobj.h
-
SalClipRegion::SalClipRegion()
{
ClipRectangleList = NULL;
@@ -193,14 +186,12 @@ SalClipRegion::SalClipRegion()
nClipRegionType = SAL_OBJECT_CLIP_INCLUDERECTS;
}
-
SalClipRegion::~SalClipRegion()
{
if ( ClipRectangleList )
delete [] ClipRectangleList;
}
-
void
SalClipRegion::BeginSetClipRegion( sal_uLong nRects )
{
@@ -212,7 +203,6 @@ SalClipRegion::BeginSetClipRegion( sal_uLong nRects )
maxClipRectangles = nRects;
}
-
void
SalClipRegion::UnionClipRegion( long nX, long nY, long nWidth, long nHeight )
{
@@ -269,7 +259,6 @@ X11SalObject::~X11SalObject()
GetGenericData()->ErrorTrapPop();
}
-
void
X11SalObject::ResetClipRegion()
{
@@ -302,21 +291,18 @@ X11SalObject::ResetClipRegion()
op, ordering );
}
-
void
X11SalObject::BeginSetClipRegion( sal_uLong nRectCount )
{
maClipRegion.BeginSetClipRegion ( nRectCount );
}
-
void
X11SalObject::UnionClipRegion( long nX, long nY, long nWidth, long nHeight )
{
maClipRegion.UnionClipRegion ( nX, nY, nWidth, nHeight );
}
-
void
X11SalObject::EndSetClipRegion()
{
@@ -354,15 +340,12 @@ X11SalObject::EndSetClipRegion()
op, ordering );
}
-
sal_uInt16
X11SalObject::GetClipRegionType()
{
return maClipRegion.GetClipRegionType();
}
-
-
void
X11SalObject::SetPosSize( long nX, long nY, long nWidth, long nHeight )
{
@@ -377,7 +360,6 @@ X11SalObject::SetPosSize( long nX, long nY, long nWidth, long nHeight )
}
}
-
void
X11SalObject::Show( bool bVisible )
{
@@ -407,8 +389,6 @@ void X11SalObject::GrabFocus()
CurrentTime );
}
-
-
const SystemEnvData* X11SalObject::GetSystemData() const
{
return &maSystemChildData;
generated by cgit (git 2.34.1) at 2024-07-23 14:56:28 +0000