diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-06-15 14:48:24 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-06-17 15:07:07 +0200 |
commit | f9d5da8b491e30a08fa6996164e12e4d8715af46 (patch) | |
tree | 2362d2c036744f419757f0a56d33c61531e6a112 /vcl/unx | |
parent | 8914595d4623390e4bac9ebbdf0d5ae9ab69aa8a (diff) |
loplugin:unusedfields in vcl part2
Change-Id: Icd02f63e9738c0bb91348e2084649f9edc281e67
Reviewed-on: https://gerrit.libreoffice.org/38833
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/unx')
-rw-r--r-- | vcl/unx/generic/app/i18n_cb.cxx | 1 | ||||
-rw-r--r-- | vcl/unx/generic/app/i18n_ic.cxx | 1 | ||||
-rw-r--r-- | vcl/unx/generic/app/i18n_status.cxx | 5 | ||||
-rw-r--r-- | vcl/unx/generic/app/i18n_xkb.cxx | 4 | ||||
-rw-r--r-- | vcl/unx/generic/app/saldisp.cxx | 4 | ||||
-rw-r--r-- | vcl/unx/generic/app/wmadaptor.cxx | 1 | ||||
-rw-r--r-- | vcl/unx/generic/dtrans/X11_selection.cxx | 14 | ||||
-rw-r--r-- | vcl/unx/generic/dtrans/X11_selection.hxx | 7 | ||||
-rw-r--r-- | vcl/unx/generic/glyphs/freetype_glyphcache.cxx | 15 | ||||
-rw-r--r-- | vcl/unx/generic/print/common_gfx.cxx | 4 | ||||
-rw-r--r-- | vcl/unx/generic/print/genprnpsp.cxx | 4 | ||||
-rw-r--r-- | vcl/unx/generic/print/genpspgraphics.cxx | 9 | ||||
-rw-r--r-- | vcl/unx/generic/print/glyphset.cxx | 1 | ||||
-rw-r--r-- | vcl/unx/generic/print/glyphset.hxx | 1 | ||||
-rw-r--r-- | vcl/unx/generic/window/salframe.cxx | 5 | ||||
-rw-r--r-- | vcl/unx/gtk/gtksalframe.cxx | 5 | ||||
-rw-r--r-- | vcl/unx/gtk3/gtk3gtkframe.cxx | 5 |
17 files changed, 7 insertions, 79 deletions
diff --git a/vcl/unx/generic/app/i18n_cb.cxx b/vcl/unx/generic/app/i18n_cb.cxx index f291e2b6bf1b..9b8a51a693f3 100644 --- a/vcl/unx/generic/app/i18n_cb.cxx +++ b/vcl/unx/generic/app/i18n_cb.cxx @@ -45,7 +45,6 @@ PreeditStartCallback ( XIC, XPointer client_data, XPointer ) if ( pPreeditData->eState == PreeditStatus::ActivationRequired ) { pPreeditData->eState = PreeditStatus::Active; - pPreeditData->aText.nCursorPos = 0; pPreeditData->aText.nLength = 0; } diff --git a/vcl/unx/generic/app/i18n_ic.cxx b/vcl/unx/generic/app/i18n_ic.cxx index 2532e9f8b094..ec2f1a5fbf7d 100644 --- a/vcl/unx/generic/app/i18n_ic.cxx +++ b/vcl/unx/generic/app/i18n_ic.cxx @@ -182,7 +182,6 @@ SalI18N_InputContext::SalI18N_InputContext ( SalFrame *pFrame ) : maClientData.aText.pCharStyle = static_cast<XIMFeedback*>(malloc(PREEDIT_BUFSZ * sizeof(XIMFeedback))); maClientData.aText.nSize = PREEDIT_BUFSZ; - maClientData.aText.nCursorPos = 0; maClientData.aText.nLength = 0; // Status attributes diff --git a/vcl/unx/generic/app/i18n_status.cxx b/vcl/unx/generic/app/i18n_status.cxx index 40c89dd83519..7e59021a031b 100644 --- a/vcl/unx/generic/app/i18n_status.cxx +++ b/vcl/unx/generic/app/i18n_status.cxx @@ -81,7 +81,6 @@ class XIMStatusWindow : public StatusWindow // for delayed showing bool m_bDelayedShow; - I18NStatus::ShowReason m_eDelayedReason; ImplSVEvent * m_nDelayedEvent; // for toggling bool m_bOn; @@ -113,7 +112,6 @@ XIMStatusWindow::XIMStatusWindow( bool bOn ) : m_pLastParent( nullptr ), m_bAnchoredAtRight( false ), m_bDelayedShow( false ), - m_eDelayedReason( I18NStatus::contextmap ), m_nDelayedEvent( nullptr ), m_bOn( bOn ) { @@ -276,13 +274,12 @@ IMPL_LINK_NOARG(XIMStatusWindow, DelayedShowHdl, void*, void) } } -void XIMStatusWindow::show( bool bShow, I18NStatus::ShowReason eReason ) +void XIMStatusWindow::show( bool bShow, I18NStatus::ShowReason ) { if( bShow && m_aStatusText->GetText().isEmpty() ) bShow = false; m_bDelayedShow = bShow; - m_eDelayedReason = eReason; if( ! m_nDelayedEvent ) m_nDelayedEvent = Application::PostUserEvent( LINK( this, XIMStatusWindow, DelayedShowHdl ), nullptr, true ); } diff --git a/vcl/unx/generic/app/i18n_xkb.cxx b/vcl/unx/generic/app/i18n_xkb.cxx index 79739be87249..16dbc6067543 100644 --- a/vcl/unx/generic/app/i18n_xkb.cxx +++ b/vcl/unx/generic/app/i18n_xkb.cxx @@ -28,7 +28,6 @@ SalI18N_KeyboardExtension::SalI18N_KeyboardExtension( Display* pDisplay ) : mbUseExtension(true) , mnDefaultGroup(0) - , mnGroup(0) , mnEventBase(0) , mnErrorBase(0) , mpDisplay(pDisplay) @@ -78,7 +77,6 @@ SalI18N_KeyboardExtension::SalI18N_KeyboardExtension( Display* pDisplay ) { XkbStateRec aStateRecord; XkbGetState( mpDisplay, XkbUseCoreKbd, &aStateRecord ); - mnGroup = aStateRecord.group; } } @@ -96,8 +94,6 @@ SalI18N_KeyboardExtension::Dispatch( XEvent* pEvent ) switch ( nXKBType ) { case XkbStateNotify: - - mnGroup = reinterpret_cast<XkbStateNotifyEvent*>(pEvent)->group; break; default: diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx index 59b9069a578c..9d64d665648a 100644 --- a/vcl/unx/generic/app/saldisp.cxx +++ b/vcl/unx/generic/app/saldisp.cxx @@ -277,14 +277,12 @@ bool SalDisplay::BestVisual( Display *pDisplay, SalDisplay::SalDisplay( Display *display ) : pXLib_( nullptr ), mpKbdExtension( nullptr ), - mpFactory( nullptr ), pDisp_( display ), m_nXDefaultScreen( 0 ), nMaxRequestSize_( 0 ), meServerVendor( vendor_unknown ), bNumLockFromXS_( false ), nNumLockIndex_( 0 ), - nNumLockMask_( 0 ), nShiftKeySym_( 0 ), nCtrlKeySym_( 0 ), nMod1KeySym_( 0 ), @@ -580,7 +578,6 @@ void SalDisplay::Init() for( Cursor & aCsr : aPointerCache_ ) aCsr = None; - mpFactory = nullptr; m_bXinerama = false; int nDisplayScreens = ScreenCount( pDisp_ ); @@ -805,7 +802,6 @@ void SalDisplay::ModifierMapping() { bNumLockFromXS_ = False; nNumLockIndex_ = i; - nNumLockMask_ = 1<<i; break; } } diff --git a/vcl/unx/generic/app/wmadaptor.cxx b/vcl/unx/generic/app/wmadaptor.cxx index 7b4cc062f854..85152168aa3c 100644 --- a/vcl/unx/generic/app/wmadaptor.cxx +++ b/vcl/unx/generic/app/wmadaptor.cxx @@ -1261,7 +1261,6 @@ void GnomeWMAdaptor::setGnomeWMState( X11SalFrame* pFrame ) const void WMAdaptor::setFrameTypeAndDecoration( X11SalFrame* pFrame, WMWindowType eType, int nDecorationFlags, X11SalFrame* pReferenceFrame ) const { pFrame->meWindowType = eType; - pFrame->mnDecorationFlags = nDecorationFlags; if( ! pFrame->mbFullScreen ) { diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx index aac753a6da74..0d3b58ee49cb 100644 --- a/vcl/unx/generic/dtrans/X11_selection.cxx +++ b/vcl/unx/generic/dtrans/X11_selection.cxx @@ -221,7 +221,6 @@ SelectionManager::SelectionManager() : m_nLastDropAction( 0 ), m_nLastX( 0 ), m_nLastY( 0 ), - m_nDropTimestamp( 0 ), m_bDropWaitingForCompletion( false ), m_aDropWindow( None ), m_aDropProxy( None ), @@ -241,21 +240,18 @@ SelectionManager::SelectionManager() : m_bDropSent( false ), m_nDropTimeout( 0 ), m_bWaitingForPrimaryConversion( false ), - m_nDragTimestamp( None ), m_aMoveCursor( None ), m_aCopyCursor( None ), m_aLinkCursor( None ), m_aNoneCursor( None ), m_aCurrentCursor( None ), m_nCurrentProtocolVersion( nXdndProtocolRevision ), - m_nCLIPBOARDAtom( None ), m_nTARGETSAtom( None ), m_nTIMESTAMPAtom( None ), m_nTEXTAtom( None ), m_nINCRAtom( None ), m_nCOMPOUNDAtom( None ), m_nMULTIPLEAtom( None ), - m_nUTF16Atom( None ), m_nImageBmpAtom( None ), m_nXdndAware( None ), m_nXdndEnter( None ), @@ -271,7 +267,6 @@ SelectionManager::SelectionManager() : m_nXdndActionMove( None ), m_nXdndActionLink( None ), m_nXdndActionAsk( None ), - m_nXdndActionPrivate( None ), m_bShutDown( false ) { memset(&m_aDropEnterEvent, 0, sizeof(m_aDropEnterEvent)); @@ -361,9 +356,6 @@ void SelectionManager::initialize( const Sequence< Any >& arguments ) #ifdef SYNCHRONIZE XSynchronize( m_pDisplay, True ); #endif - // clipboard selection - m_nCLIPBOARDAtom = getAtom( "CLIPBOARD" ); - // special targets m_nTARGETSAtom = getAtom( "TARGETS" ); m_nTIMESTAMPAtom = getAtom( "TIMESTAMP" ); @@ -371,7 +363,6 @@ void SelectionManager::initialize( const Sequence< Any >& arguments ) m_nINCRAtom = getAtom( "INCR" ); m_nCOMPOUNDAtom = getAtom( "COMPOUND_TEXT" ); m_nMULTIPLEAtom = getAtom( "MULTIPLE" ); - m_nUTF16Atom = getAtom( "ISO10646-1" ); m_nImageBmpAtom = getAtom( "image/bmp" ); // Atoms for Xdnd protocol @@ -389,7 +380,6 @@ void SelectionManager::initialize( const Sequence< Any >& arguments ) m_nXdndActionMove = getAtom( "XdndActionMove" ); m_nXdndActionLink = getAtom( "XdndActionLink" ); m_nXdndActionAsk = getAtom( "XdndActionAsk" ); - m_nXdndActionPrivate= getAtom( "XdndActionPrivate" ); // initialize map with member none m_aAtomToString[ 0 ]= "None"; @@ -2143,8 +2133,6 @@ bool SelectionManager::handleDropEvent( XClientMessageEvent& rMessage ) { bHandled = true; m_nDropTime = m_nCurrentProtocolVersion > 0 ? rMessage.data.l[3] : CurrentTime; - if( ! m_bDropEnterSent ) - m_nDropTimestamp = m_nDropTime; ::Window aChild; XTranslateCoordinates( m_pDisplay, @@ -2623,7 +2611,6 @@ bool SelectionManager::handleDragEvent( XEvent& rMessage ) int root_x = rMessage.type == MotionNotify ? rMessage.xmotion.x_root : rMessage.xcrossing.x_root; int root_y = rMessage.type == MotionNotify ? rMessage.xmotion.y_root : rMessage.xcrossing.y_root; ::Window root = rMessage.type == MotionNotify ? rMessage.xmotion.root : rMessage.xcrossing.root; - m_nDragTimestamp = rMessage.type == MotionNotify ? rMessage.xmotion.time : rMessage.xcrossing.time; aGuard.clear(); if( rMessage.type == MotionNotify ) @@ -3830,7 +3817,6 @@ void SelectionManager::registerHandler( Atom selection, SelectionAdaptor& rAdapt Selection* pNewSelection = new Selection(); pNewSelection->m_pAdaptor = &rAdaptor; - pNewSelection->m_aAtom = selection; m_aSelections[ selection ] = pNewSelection; } diff --git a/vcl/unx/generic/dtrans/X11_selection.hxx b/vcl/unx/generic/dtrans/X11_selection.hxx index 550e24a31a9f..1aac1ab253a4 100644 --- a/vcl/unx/generic/dtrans/X11_selection.hxx +++ b/vcl/unx/generic/dtrans/X11_selection.hxx @@ -182,7 +182,6 @@ namespace x11 { State m_eState; SelectionAdaptor* m_pAdaptor; - Atom m_aAtom; ::osl::Condition m_aDataArrived; css::uno::Sequence< sal_Int8 > m_aData; css::uno::Sequence< css::datatransfer::DataFlavor > @@ -206,7 +205,6 @@ namespace x11 { Selection() : m_eState( Inactive ), m_pAdaptor( nullptr ), - m_aAtom( None ), m_aRequestedType( None ), m_nLastTimestamp( 0 ), m_bHaveUTF16( false ), @@ -273,7 +271,6 @@ namespace x11 { css::uno::Reference< css::datatransfer::XTransferable > m_xDropTransferable; int m_nLastX, m_nLastY; - Time m_nDropTimestamp; // set to true when calling drop() // if another XdndEnter is received this shows that // someone forgot to call dropComplete - we should reset @@ -308,7 +305,6 @@ namespace x11 { bool m_bDropSent; time_t m_nDropTimeout; bool m_bWaitingForPrimaryConversion; - Time m_nDragTimestamp; // drag cursors Cursor m_aMoveCursor; @@ -324,14 +320,12 @@ namespace x11 { m_aDropTargets; // some special atoms that are needed often - Atom m_nCLIPBOARDAtom; Atom m_nTARGETSAtom; Atom m_nTIMESTAMPAtom; Atom m_nTEXTAtom; Atom m_nINCRAtom; Atom m_nCOMPOUNDAtom; Atom m_nMULTIPLEAtom; - Atom m_nUTF16Atom; Atom m_nImageBmpAtom; Atom m_nXdndAware; Atom m_nXdndEnter; @@ -347,7 +341,6 @@ namespace x11 { Atom m_nXdndActionMove; Atom m_nXdndActionLink; Atom m_nXdndActionAsk; - Atom m_nXdndActionPrivate; // caching for atoms std::unordered_map< Atom, OUString > diff --git a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx index c4341fe27176..8ff1c72c8835 100644 --- a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx +++ b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx @@ -380,7 +380,6 @@ FreetypeFont::FreetypeFont( const FontSelectPattern& rFSD, FreetypeFontInfo* pFI mbFaceOk( false ), mbArtItalic( false ), mbArtBold( false ), - mbUseGamma( false ), mpHbFont( nullptr ) { // TODO: move update of mpFontInstance into FontEntry class when @@ -432,20 +431,6 @@ FreetypeFont::FreetypeFont( const FontSelectPattern& rFSD, FreetypeFontInfo* pFI mbArtItalic = (rFSD.GetItalic() != ITALIC_NONE && pFI->GetFontAttributes().GetItalic() == ITALIC_NONE); mbArtBold = (rFSD.GetWeight() > WEIGHT_MEDIUM && pFI->GetFontAttributes().GetWeight() <= WEIGHT_MEDIUM); - if( mbArtBold ) - { - //static const int TT_CODEPAGE_RANGE_874 = (1L << 16); // Thai - //static const int TT_CODEPAGE_RANGE_932 = (1L << 17); // JIS/Japan - //static const int TT_CODEPAGE_RANGE_936 = (1L << 18); // Chinese: Simplified - //static const int TT_CODEPAGE_RANGE_949 = (1L << 19); // Korean Wansung - //static const int TT_CODEPAGE_RANGE_950 = (1L << 20); // Chinese: Traditional - //static const int TT_CODEPAGE_RANGE_1361 = (1L << 21); // Korean Johab - static const int TT_CODEPAGE_RANGES1_CJKT = 0x3F0000; // all of the above - const TT_OS2* pOs2 = static_cast<const TT_OS2*>(FT_Get_Sfnt_Table( maFaceFT, ft_sfnt_os2 )); - if ((pOs2) && (pOs2->ulCodePageRange1 & TT_CODEPAGE_RANGES1_CJKT ) - && rFSD.mnHeight < 20) - mbUseGamma = true; - } if( ((mnCos != 0) && (mnSin != 0)) || (mnPrioEmbedded <= 0) ) mnLoadFlags |= FT_LOAD_NO_BITMAP; diff --git a/vcl/unx/generic/print/common_gfx.cxx b/vcl/unx/generic/print/common_gfx.cxx index b06767308b7a..9b9f5dd8abb8 100644 --- a/vcl/unx/generic/print/common_gfx.cxx +++ b/vcl/unx/generic/print/common_gfx.cxx @@ -55,7 +55,6 @@ GraphicsStatus::GraphicsStatus() : void PrinterGfx::Init (PrinterJob &rPrinterJob) { - mpPageHeader = rPrinterJob.GetCurrentPageHeader (); mpPageBody = rPrinterJob.GetCurrentPageBody (); mnDepth = rPrinterJob.GetDepth (); mnPSLevel = rPrinterJob.GetPostscriptLevel (); @@ -70,7 +69,6 @@ PrinterGfx::Init (PrinterJob &rPrinterJob) void PrinterGfx::Init (const JobData& rData) { - mpPageHeader = nullptr; mpPageBody = nullptr; mnDepth = rData.m_nColorDepth; mnPSLevel = rData.m_nPSLevel ? rData.m_nPSLevel : (rData.m_pParser ? rData.m_pParser->getLanguageLevel() : 2 ); @@ -92,7 +90,6 @@ PrinterGfx::PrinterGfx() , mnPSLevel(0) , mbColor(false) , mbUploadPS42Fonts(false) - , mpPageHeader(nullptr) , mpPageBody(nullptr) , mnFontID(0) , mnTextAngle(0) @@ -116,7 +113,6 @@ PrinterGfx::~PrinterGfx() void PrinterGfx::Clear() { - mpPageHeader = nullptr; mpPageBody = nullptr; mnFontID = 0; maVirtualStatus = GraphicsStatus(); diff --git a/vcl/unx/generic/print/genprnpsp.cxx b/vcl/unx/generic/print/genprnpsp.cxx index 4674ae771182..bef1a71fea1d 100644 --- a/vcl/unx/generic/print/genprnpsp.cxx +++ b/vcl/unx/generic/print/genprnpsp.cxx @@ -524,7 +524,7 @@ SalGraphics* PspSalInfoPrinter::AcquireGraphics() if( ! m_pGraphics ) { m_pGraphics = GetGenericInstance()->CreatePrintGraphics(); - m_pGraphics->Init(&m_aJobData, &m_aPrinterGfx, this); + m_pGraphics->Init(&m_aJobData, &m_aPrinterGfx); pRet = m_pGraphics; } return pRet; @@ -943,7 +943,7 @@ SalGraphics* PspSalPrinter::StartPage( ImplJobSetup* pJobSetup, bool ) JobData::constructFromStreamBuffer( pJobSetup->GetDriverData(), pJobSetup->GetDriverDataLen(), m_aJobData ); m_pGraphics = GetGenericInstance()->CreatePrintGraphics(); - m_pGraphics->Init(&m_aJobData, &m_aPrinterGfx, m_pInfoPrinter); + m_pGraphics->Init(&m_aJobData, &m_aPrinterGfx); if( m_nCopies > 1 ) { diff --git a/vcl/unx/generic/print/genpspgraphics.cxx b/vcl/unx/generic/print/genpspgraphics.cxx index ed50638a45b4..6e30a1da8591 100644 --- a/vcl/unx/generic/print/genpspgraphics.cxx +++ b/vcl/unx/generic/print/genpspgraphics.cxx @@ -243,20 +243,16 @@ SalPrinterBmp::GetPixelIdx (sal_uInt32 nRow, sal_uInt32 nColumn) const GenPspGraphics::GenPspGraphics() : m_pJobData( nullptr ), - m_pPrinterGfx( nullptr ), - m_bFontVertical( false ), - m_pInfoPrinter( nullptr ) + m_pPrinterGfx( nullptr ) { for(FreetypeFont* & rp : m_pFreetypeFont) rp = nullptr; } -void GenPspGraphics::Init(psp::JobData* pJob, psp::PrinterGfx* pGfx, - SalInfoPrinter* pInfoPrinter) +void GenPspGraphics::Init(psp::JobData* pJob, psp::PrinterGfx* pGfx) { m_pJobData = pJob; m_pPrinterGfx = pGfx; - m_pInfoPrinter = pInfoPrinter; SetLayout( SalLayoutFlags::NONE ); } @@ -651,7 +647,6 @@ void GenPspGraphics::SetFont( FontSelectPattern *pEntry, int nFallbackLevel ) } // also set the serverside font for layouting - m_bFontVertical = pEntry->mbVertical; if( pEntry->mpFontData ) { // requesting a font provided by builtin rasterizer diff --git a/vcl/unx/generic/print/glyphset.cxx b/vcl/unx/generic/print/glyphset.cxx index 580766b44b0a..ed7f626ab7fe 100644 --- a/vcl/unx/generic/print/glyphset.cxx +++ b/vcl/unx/generic/print/glyphset.cxx @@ -51,7 +51,6 @@ GlyphSet::GlyphSet (sal_Int32 nFontID, bool bVertical) PrintFontManager &rMgr = PrintFontManager::get(); maBaseName = OUStringToOString (rMgr.getPSName(mnFontID), RTL_TEXTENCODING_ASCII_US); - mnBaseEncoding = rMgr.getFontEncoding(mnFontID); } GlyphSet::~GlyphSet () diff --git a/vcl/unx/generic/print/glyphset.hxx b/vcl/unx/generic/print/glyphset.hxx index c7b023cc2610..4b47f6fdd442 100644 --- a/vcl/unx/generic/print/glyphset.hxx +++ b/vcl/unx/generic/print/glyphset.hxx @@ -43,7 +43,6 @@ private: sal_Int32 mnFontID; bool mbVertical; OString maBaseName; - rtl_TextEncoding mnBaseEncoding; typedef std::unordered_map< sal_GlyphId, sal_uInt8 > glyph_map_t; typedef std::list< glyph_map_t > glyph_list_t; diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index 24232b5800b8..0988307119c3 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -837,8 +837,6 @@ X11SalFrame::X11SalFrame( SalFrame *pParent, SalFrameStyleFlags nSalFrameStyle, hCursor_ = None; nCaptured_ = 0; - nKeyCode_ = 0; - nKeyState_ = 0; mbSendExtKeyModChange = false; mnExtKeyMod = ModKeyFlags::NONE; @@ -868,7 +866,6 @@ X11SalFrame::X11SalFrame( SalFrame *pParent, SalFrameStyleFlags nSalFrameStyle, maAlwaysOnTopRaiseTimer.SetDebugName( "vcl::X11SalFrame maAlwaysOnTopRaiseTimer" ); meWindowType = WMWindowType::Normal; - mnDecorationFlags = WMAdaptor::decoration_All; mbMaximizedVert = false; mbMaximizedHorz = false; mbShaded = false; @@ -3906,8 +3903,6 @@ long X11SalFrame::Dispatch( XEvent *pEvent ) switch( pEvent->type ) { case KeyPress: - nKeyCode_ = pEvent->xkey.keycode; - nKeyState_ = pEvent->xkey.state; nRet = HandleKeyEvent( &pEvent->xkey ); break; diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx index b980749f2ad4..42b4754da6bf 100644 --- a/vcl/unx/gtk/gtksalframe.cxx +++ b/vcl/unx/gtk/gtksalframe.cxx @@ -969,7 +969,6 @@ void GtkSalFrame::InitCommon() m_bFullscreen = false; m_bSpanMonitorsWhenFullscreen = false; m_nState = GDK_WINDOW_STATE_WITHDRAWN; - m_nVisibility = GDK_VISIBILITY_FULLY_OBSCURED; m_pIMHandler = nullptr; m_pRegion = nullptr; m_ePointerStyle = static_cast<PointerStyle>(0xffff); @@ -3267,10 +3266,8 @@ gboolean GtkSalFrame::signalWindowState( GtkWidget*, GdkEvent* pEvent, gpointer return false; } -gboolean GtkSalFrame::signalVisibility( GtkWidget*, GdkEventVisibility* pEvent, gpointer frame ) +gboolean GtkSalFrame::signalVisibility( GtkWidget*, GdkEventVisibility* /*pEvent*/, gpointer /*frame*/ ) { - GtkSalFrame* pThis = static_cast<GtkSalFrame*>(frame); - pThis->m_nVisibility = pEvent->state; return true; } diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx index 784c2a8d542f..25b3570d32e6 100644 --- a/vcl/unx/gtk3/gtk3gtkframe.cxx +++ b/vcl/unx/gtk3/gtk3gtkframe.cxx @@ -1081,7 +1081,6 @@ void GtkSalFrame::InitCommon() m_bFullscreen = false; m_bSpanMonitorsWhenFullscreen = false; m_nState = GDK_WINDOW_STATE_WITHDRAWN; - m_nVisibility = GDK_VISIBILITY_FULLY_OBSCURED; m_pIMHandler = nullptr; m_pRegion = nullptr; m_pDropTarget = nullptr; @@ -3256,10 +3255,8 @@ gboolean GtkSalFrame::signalWindowState( GtkWidget*, GdkEvent* pEvent, gpointer return false; } -gboolean GtkSalFrame::signalVisibility( GtkWidget*, GdkEventVisibility* pEvent, gpointer frame ) +gboolean GtkSalFrame::signalVisibility( GtkWidget*, GdkEventVisibility* /*pEvent*/, gpointer /*frame*/ ) { - GtkSalFrame* pThis = static_cast<GtkSalFrame*>(frame); - pThis->m_nVisibility = pEvent->state; return true; } |