vcl/inc/fontattributes.hxx | 2 -- vcl/inc/salwtype.hxx | 2 -- vcl/inc/unx/gtk/gtkframe.hxx | 2 -- vcl/inc/unx/printergfx.hxx | 6 +----- vcl/inc/unx/saldata.hxx | 1 - vcl/inc/unx/salframe.h | 3 --- vcl/inc/unx/wmadaptor.hxx | 8 -------- vcl/inc/window.h | 3 --- vcl/osx/salframeview.mm | 6 ------ vcl/source/edit/vclmedit.cxx | 5 ----- vcl/source/filter/wmf/winmtf.hxx | 1 - vcl/source/filter/wmf/winwmf.cxx | 2 -- vcl/source/font/fontattributes.cxx | 2 -- vcl/source/fontsubset/cff.cxx | 24 ------------------------ vcl/source/gdi/pdfwriter_impl.cxx | 32 -------------------------------- vcl/source/gdi/pdfwriter_impl.hxx | 7 +------ vcl/source/outdev/font.cxx | 4 ++-- vcl/source/window/menubarwindow.cxx | 34 ++++++++++++++-------------------- vcl/source/window/menubarwindow.hxx | 1 - vcl/source/window/settings.cxx | 4 ++-- vcl/source/window/window.cxx | 11 ++++------- vcl/unx/generic/app/i18n_cb.cxx | 2 -- vcl/unx/generic/app/i18n_ic.cxx | 6 ------ vcl/unx/generic/app/saldata.cxx | 1 - vcl/unx/generic/app/wmadaptor.cxx | 3 --- vcl/unx/generic/print/bitmap_gfx.cxx | 22 +++++++--------------- vcl/unx/generic/print/common_gfx.cxx | 3 --- vcl/unx/generic/print/text_gfx.cxx | 2 +- vcl/unx/generic/window/salframe.cxx | 24 ++---------------------- vcl/unx/gtk/gtksalframe.cxx | 19 ++----------------- vcl/unx/gtk/salnativewidgets-gtk.cxx | 4 ---- vcl/unx/gtk3/gtk3gtkframe.cxx | 7 ------- vcl/win/window/salframe.cxx | 4 ---- 33 files changed, 36 insertions(+), 221 deletions(-)
New commits: commit 1ac18c60bb280855cfcc8d92886709cd6db35118 Author: Noel Grandin <n...@peralex.com> Date: Thu Jun 23 14:10:31 2016 +0200 loplugin:singlevalfields in vcl(part2) Change-Id: I4782c6f6d3d090ba0f9e29af8afdd7d88aa2d382 Reviewed-on: https://gerrit.libreoffice.org/26598 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Noel Grandin <noelgran...@gmail.com> diff --git a/vcl/inc/fontattributes.hxx b/vcl/inc/fontattributes.hxx index faca6a8..fcd2fa8 100644 --- a/vcl/inc/fontattributes.hxx +++ b/vcl/inc/fontattributes.hxx @@ -42,7 +42,6 @@ public: FontItalic GetItalic() const { return meItalic; } FontPitch GetPitch() const { return mePitch; } FontWidth GetWidthType() const { return meWidthType; } - TextAlign GetAlignment() const { return meAlign; } rtl_TextEncoding GetCharSet() const { return meCharSet; } bool IsSymbolFont() const { return mbSymbolFlag; } @@ -86,7 +85,6 @@ private: FontPitch mePitch; // Pitch Type FontWidth meWidthType; // Width Type FontItalic meItalic; // Slant Type - TextAlign meAlign; // Text alignment rtl_TextEncoding meCharSet; // RTL_TEXTENCODING_SYMBOL or RTL_TEXTENCODING_UNICODE bool mbSymbolFlag; // Is font a symbol? diff --git a/vcl/inc/salwtype.hxx b/vcl/inc/salwtype.hxx index 2a45616..75fae73 100644 --- a/vcl/inc/salwtype.hxx +++ b/vcl/inc/salwtype.hxx @@ -161,12 +161,10 @@ struct SalWheelMouseEvent struct SalExtTextInputEvent { - sal_uInt64 mnTime; // Time in ms, when event is created OUString maText; // Text const ExtTextInputAttr* mpTextAttr; // Text-Attribute sal_Int32 mnCursorPos; // Cursor-Position sal_uInt8 mnCursorFlags; // EXTTEXTINPUT_CURSOR_xxx - bool mbOnlyCursor; // true: Only Cursor-Position has been changed }; struct SalExtTextInputPosEvent diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx index ff5c454..30c0743 100644 --- a/vcl/inc/unx/gtk/gtkframe.hxx +++ b/vcl/inc/unx/gtk/gtkframe.hxx @@ -180,7 +180,6 @@ class GtkSalFrame : public SalFrame GdkNativeWindow m_aForeignParentWindow; GdkWindow* m_pForeignTopLevel; GdkNativeWindow m_aForeignTopLevelWindow; - Pixmap m_hBackgroundPixmap; SalFrameStyleFlags m_nStyle; SalExtStyle m_nExtStyle; GtkSalFrame* m_pParent; @@ -381,7 +380,6 @@ public: GdkNativeWindow getForeignParentWindow() const { return m_aForeignParentWindow; } GdkWindow* getForeignTopLevel() const { return m_pForeignTopLevel; } GdkNativeWindow getForeignTopLevelWindow() const { return m_aForeignTopLevelWindow; } - Pixmap getBackgroundPixmap() const { return m_hBackgroundPixmap; } const SalX11Screen& getXScreenNumber() const { return m_nXScreen; } int GetDisplayScreen() const { return maGeometry.nDisplayScreenNumber; } void updateScreenNumber(); diff --git a/vcl/inc/unx/printergfx.hxx b/vcl/inc/unx/printergfx.hxx index d22d351..ac261d4 100644 --- a/vcl/inc/unx/printergfx.hxx +++ b/vcl/inc/unx/printergfx.hxx @@ -196,15 +196,12 @@ private: std::list< GlyphSet > maPS3Font; sal_Int32 mnFontID; - sal_Int32 mnFallbackID; sal_Int32 mnTextAngle; - bool mbTextVertical; + bool mbTextVertical; PrintFontManager& mrFontMgr; /* bitmap drawing implementation */ - bool mbCompressBmp; - void DrawPS1GrayImage (const PrinterBmp& rBitmap, const Rectangle& rArea); void writePS2ImageHeader (const Rectangle& rArea, psp::ImageType nType); void writePS2Colorspace (const PrinterBmp& rBitmap, psp::ImageType nType); @@ -235,7 +232,6 @@ private: CharacterMetric *p_bbox); fontID getCharMetric (const Font2 &rFont, sal_Unicode n_char, CharacterMetric *p_bbox); - fontID getFallbackID () const { return mnFallbackID; } public: /* graphics status update */ diff --git a/vcl/inc/unx/saldata.hxx b/vcl/inc/unx/saldata.hxx index bea7468..e1294ad 100644 --- a/vcl/inc/unx/saldata.hxx +++ b/vcl/inc/unx/saldata.hxx @@ -50,7 +50,6 @@ class VCLPLUG_GEN_PUBLIC X11SalData : public SalGenericData { bool m_bIgnore; bool m_bWas; - unsigned int m_nLastErrorRequest; XErrorHandler m_aHandler; }; std::vector< XErrorStackEntry > m_aXErrorHandlerStack; diff --git a/vcl/inc/unx/salframe.h b/vcl/inc/unx/salframe.h index f5773c0..3fd2072 100644 --- a/vcl/inc/unx/salframe.h +++ b/vcl/inc/unx/salframe.h @@ -70,8 +70,6 @@ class VCLPLUG_GEN_PUBLIC X11SalFrame : public SalFrame, public NativeWindowHandl ::Window mhStackingWindow; // window to listen for CirculateNotify events - Pixmap mhBackgroundPixmap; - Cursor hCursor_; int nCaptured_; // is captured @@ -80,7 +78,6 @@ class VCLPLUG_GEN_PUBLIC X11SalFrame : public SalFrame, public NativeWindowHandl sal_uInt16 nKeyCode_; // last key code sal_uInt16 nKeyState_; // last key state - int nCompose_; // compose state bool mbSendExtKeyModChange; sal_uInt16 mnExtKeyMod; diff --git a/vcl/inc/unx/wmadaptor.hxx b/vcl/inc/unx/wmadaptor.hxx index 177ca34..3c0c129 100644 --- a/vcl/inc/unx/wmadaptor.hxx +++ b/vcl/inc/unx/wmadaptor.hxx @@ -149,7 +149,6 @@ protected: bool m_bEqualWorkAreas; ::std::vector< Rectangle > m_aWMWorkAreas; - bool m_bTransientBehaviour; bool m_bEnableAlwaysOnTopWorks; bool m_bLegacyPartialFullscreen; int m_nWinGravity; @@ -298,13 +297,6 @@ public: { return m_nInitWinGravity; } /* - * expected behaviour is that the WM will not allow transient - * windows to get stacked behind the windows they are transient for - */ - bool isTransientBehaviourAsExpected() const - { return m_bTransientBehaviour; } - - /* * changes the transient hint of a window to reference frame * if reference frame is NULL the root window is used instead */ diff --git a/vcl/inc/window.h b/vcl/inc/window.h index b14806d..8ba8be7 100644 --- a/vcl/inc/window.h +++ b/vcl/inc/window.h @@ -285,15 +285,12 @@ public: mbVisible:1, mbDisabled:1, mbInputDisabled:1, - mbDropDisabled:1, mbNoUpdate:1, mbNoParentUpdate:1, mbActive:1, - mbParentActive:1, mbReallyVisible:1, mbReallyShown:1, mbInInitShow:1, - mbChildNotify:1, mbChildPtrOverwrite:1, mbNoPtrVisible:1, mbPaintFrame:1, diff --git a/vcl/osx/salframeview.mm b/vcl/osx/salframeview.mm index 3dded25..b833e45 100644 --- a/vcl/osx/salframeview.mm +++ b/vcl/osx/salframeview.mm @@ -1072,12 +1072,10 @@ private: else { SalExtTextInputEvent aEvent; - aEvent.mnTime = mpFrame->mnLastEventTime; aEvent.maText = aInsertString; aEvent.mpTextAttr = nullptr; aEvent.mnCursorPos = aInsertString.getLength(); aEvent.mnCursorFlags = 0; - aEvent.mbOnlyCursor = FALSE; mpFrame->CallCallback( SalEvent::ExtTextInput, &aEvent ); if( AquaSalFrame::isAlive( mpFrame ) ) mpFrame->CallCallback( SalEvent::EndExtTextInput, nullptr ); @@ -1086,12 +1084,10 @@ private: else { SalExtTextInputEvent aEvent; - aEvent.mnTime = mpFrame->mnLastEventTime; aEvent.maText.clear(); aEvent.mpTextAttr = nullptr; aEvent.mnCursorPos = 0; aEvent.mnCursorFlags = 0; - aEvent.mbOnlyCursor = FALSE; mpFrame->CallCallback( SalEvent::ExtTextInput, &aEvent ); if( AquaSalFrame::isAlive( mpFrame ) ) mpFrame->CallCallback( SalEvent::EndExtTextInput, nullptr ); @@ -1605,8 +1601,6 @@ private: int len = [aString length]; SalExtTextInputEvent aInputEvent; - aInputEvent.mnTime = mpFrame->mnLastEventTime; - aInputEvent.mbOnlyCursor = FALSE; if( len > 0 ) { NSString *pString = [aString string]; OUString aInsertString( GetOUString( pString ) ); diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx index f131479..a1b3a21 100644 --- a/vcl/source/edit/vclmedit.cxx +++ b/vcl/source/edit/vclmedit.cxx @@ -43,7 +43,6 @@ private: bool mbIgnoreTab; bool mbActivePopup; bool mbSelectOnTab; - bool mbTextSelectable; public: explicit TextWindow( vcl::Window* pParent ); @@ -709,7 +708,6 @@ TextWindow::TextWindow( vcl::Window* pParent ) : Window( pParent ) mbIgnoreTab = false; mbActivePopup = false; mbSelectOnTab = true; - mbTextSelectable = true; SetPointer( Pointer( PointerStyle::Text ) ); @@ -750,9 +748,6 @@ void TextWindow::MouseMove( const MouseEvent& rMEvt ) void TextWindow::MouseButtonDown( const MouseEvent& rMEvt ) { - if ( !mbTextSelectable ) - return; - mbInMBDown = true; // so that GetFocus does not select everything mpExtTextView->MouseButtonDown( rMEvt ); GrabFocus(); diff --git a/vcl/source/filter/wmf/winmtf.hxx b/vcl/source/filter/wmf/winmtf.hxx index 542c72a..6177d08 100644 --- a/vcl/source/filter/wmf/winmtf.hxx +++ b/vcl/source/filter/wmf/winmtf.hxx @@ -724,7 +724,6 @@ private: sal_uInt32 nSkipActions; sal_uInt32 nCurrentAction; - sal_uInt32 nUnicodeEscapeAction; WMF_EXTERNALHEADER* pExternalHeader; diff --git a/vcl/source/filter/wmf/winwmf.cxx b/vcl/source/filter/wmf/winwmf.cxx index 6cc7ae9..06431af 100644 --- a/vcl/source/filter/wmf/winwmf.cxx +++ b/vcl/source/filter/wmf/winwmf.cxx @@ -1296,7 +1296,6 @@ void WMFReader::ReadWMF() nSkipActions = 0; nCurrentAction = 0; - nUnicodeEscapeAction = 0; pEMFStream.reset(); nEMFRecCount = 0; @@ -1796,7 +1795,6 @@ WMFReader::WMFReader(SvStream& rStreamWMF, GDIMetaFile& rGDIMetaFile, , nEMFSize(0) , nSkipActions(0) , nCurrentAction(0) - , nUnicodeEscapeAction(0) , pExternalHeader(pExtHeader) {} diff --git a/vcl/source/font/fontattributes.cxx b/vcl/source/font/fontattributes.cxx index 0702932..f800f18 100644 --- a/vcl/source/font/fontattributes.cxx +++ b/vcl/source/font/fontattributes.cxx @@ -28,7 +28,6 @@ FontAttributes::FontAttributes() mePitch( PITCH_DONTKNOW ), meWidthType ( WIDTH_DONTKNOW ), meItalic ( ITALIC_NONE ), - meAlign ( ALIGN_TOP ), meCharSet( RTL_TEXTENCODING_DONTKNOW ), mbSymbolFlag( false ), mnQuality( 0 ), @@ -46,7 +45,6 @@ FontAttributes::FontAttributes( const FontAttributes& rFontAttributes ) : mePitch( rFontAttributes.mePitch ), meWidthType( rFontAttributes.meWidthType ), meItalic( rFontAttributes.meItalic ), - meAlign( rFontAttributes.meAlign ), meCharSet( rFontAttributes.meCharSet ), mbSymbolFlag( rFontAttributes.mbSymbolFlag ), maMapNames( rFontAttributes.maMapNames ), diff --git a/vcl/source/fontsubset/cff.cxx b/vcl/source/fontsubset/cff.cxx index 9fcf8e7..dfe29d8 100644 --- a/vcl/source/fontsubset/cff.cxx +++ b/vcl/source/fontsubset/cff.cxx @@ -346,7 +346,6 @@ private: const U8* mpReadEnd; U8* mpWritePtr; - bool mbSawError; bool mbNeedClose; bool mbIgnoreHints; sal_Int32 mnCntrMask; @@ -416,7 +415,6 @@ CffSubsetterContext::CffSubsetterContext( const U8* pBasePtr, int nBaseLen) , mpReadPtr(nullptr) , mpReadEnd(nullptr) , mpWritePtr(nullptr) - , mbSawError(false) , mbNeedClose(false) , mbIgnoreHints(false) , mnCntrMask(0) @@ -1212,7 +1210,6 @@ int CffSubsetterContext::convert2Type1Ops( CffLocal* pCffLocal, const U8* const writeType1Val( 0); // TODO: aSubsetterContext.getLeftSideBearing(); writeType1Val( 1000/*###getCharWidth()###*/); writeTypeOp( TYPE1OP::HSBW); -mbSawError = false; mbNeedClose = false; mbIgnoreHints = false; mnHintSize=mnHorzHintSize=mnStackIdx=0; maCharWidth=-1;//####### @@ -1223,23 +1220,6 @@ mnCntrMask = 0; // writeTypeOp( TYPE1OP::CLOSEPATH); // if( bSubRoutine) // writeTypeOp( TYPE1OP::RETURN); -if( mbSawError) { - mpWritePtr = pT1Ops+4; - // create an "idiotproof" charstring - writeType1Val( 0); - writeType1Val( 800); - writeTypeOp( TYPE1OP::HSBW); - writeType1Val( 50); - writeTypeOp( TYPE1OP::HMOVETO); - writeType1Val( 650); - writeType1Val( 100); - writeTypeOp( TYPE1OP::RLINETO); - writeType1Val( -350); - writeType1Val( 700); - writeTypeOp( TYPE1OP::RLINETO); - writeTypeOp( TYPE1OP::CLOSEPATH); - writeTypeOp( TYPE1OP::ENDCHAR); -} #else // useful for manually encoding charstrings mpWritePtr = pT1Ops; mpWritePtr += sprintf( (char*)mpWritePtr, "OOo_\x8b\x8c\x0c\x10\x0b"); @@ -1714,7 +1694,6 @@ public: void emitValVector( const char* pLineHead, const char* pLineTail, const std::vector<ValType>&); private: FILE* mpFileOut; - bool mbCloseOutfile; char maBuffer[MAX_T1OPS_SIZE]; // TODO: dynamic allocation int mnEECryptR; public: @@ -1727,7 +1706,6 @@ public: Type1Emitter::Type1Emitter( FILE* pOutFile, bool bPfbSubset) : mpFileOut( pOutFile) -, mbCloseOutfile( false) , maBuffer{} , mnEECryptR( 55665) // default eexec seed, TODO: mnEECryptSeed , mpPtr( maBuffer) @@ -1741,8 +1719,6 @@ Type1Emitter::~Type1Emitter() { if( !mpFileOut) return; - if( mbCloseOutfile ) - fclose( mpFileOut); mpFileOut = nullptr; } diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 15d764f..f9f602e 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -1721,7 +1721,6 @@ void PDFWriterImpl::PDFPage::appendWaveLine( sal_Int32 nWidth, sal_Int32 nY, sal m_nNextFID( 1 ), m_nInheritedPageWidth( 595 ), // default A4 m_nInheritedPageHeight( 842 ), // default A4 - m_eInheritedOrientation( PDFWriter::Portrait ), m_nCurrentPage( -1 ), m_nCatalogObject(0), m_nSignatureObject( -1 ), @@ -5578,16 +5577,6 @@ bool PDFWriterImpl::emitCatalog() aLine.append( getResourceDictObj() ); aLine.append( " 0 R\n" ); - switch( m_eInheritedOrientation ) - { - case PDFWriter::Landscape: aLine.append( "/Rotate 90\n" );break; - case PDFWriter::Seascape: aLine.append( "/Rotate -90\n" );break; - - case PDFWriter::Inherit: // actually Inherit would be a bug, but insignificant - case PDFWriter::Portrait: - default: - break; - } sal_Int32 nMediaBoxWidth = 0; sal_Int32 nMediaBoxHeight = 0; if( m_aPages.empty() ) // sanity check, this should not happen @@ -11096,9 +11085,6 @@ bool PDFWriterImpl::writeBitmapObject( BitmapEmit& rObject, bool bMask ) switch( rObject.m_aBitmap.GetTransparentType() ) { case TransparentType::NONE: - // comes from drawMask function - if( aBitmap.GetBitCount() == 1 && rObject.m_bDrawMask ) - bMask = true; break; case TransparentType::Color: aTransparentColor = rObject.m_aBitmap.GetTransparentColor(); @@ -11524,7 +11510,6 @@ const PDFWriterImpl::BitmapEmit& PDFWriterImpl::createBitmapEmit( const BitmapEx m_aBitmaps.front().m_aID = aID; m_aBitmaps.front().m_aBitmap = aBitmap; m_aBitmaps.front().m_nObject = createObject(); - m_aBitmaps.front().m_bDrawMask = false; it = m_aBitmaps.begin(); } @@ -12213,23 +12198,6 @@ void PDFWriterImpl::setOutlineItemParent( sal_Int32 nItem, sal_Int32 nNewParent { nNewParent = 0; } - // remove item from previous parent - sal_Int32 nParentID = m_aOutline[ nItem ].m_nParentID; - if( nParentID >= 0 && nParentID < (sal_Int32)m_aOutline.size() ) - { - PDFOutlineEntry& rParent = m_aOutline[ nParentID ]; - - for( std::vector<sal_Int32>::iterator it = rParent.m_aChildren.begin(); - it != rParent.m_aChildren.end(); ++it ) - { - if( *it == nItem ) - { - rParent.m_aChildren.erase( it ); - break; - } - } - } - // insert item to new parent's list of children m_aOutline[ nNewParent ].m_aChildren.push_back( nItem ); } diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx index 5f3ef73..b55c55b 100644 --- a/vcl/source/gdi/pdfwriter_impl.hxx +++ b/vcl/source/gdi/pdfwriter_impl.hxx @@ -194,11 +194,9 @@ public: BitmapID m_aID; BitmapEx m_aBitmap; sal_Int32 m_nObject; - bool m_bDrawMask; BitmapEmit() : m_nObject(0) - , m_bDrawMask(false) { } }; @@ -356,7 +354,6 @@ public: struct PDFOutlineEntry { - sal_Int32 m_nParentID; sal_Int32 m_nObject; sal_Int32 m_nParentObject; sal_Int32 m_nNextObject; @@ -366,8 +363,7 @@ public: sal_Int32 m_nDestID; PDFOutlineEntry() - : m_nParentID( -1 ), - m_nObject( 0 ), + : m_nObject( 0 ), m_nParentObject( 0 ), m_nNextObject( 0 ), m_nPrevObject( 0 ), @@ -638,7 +634,6 @@ private: sal_Int32 m_nInheritedPageWidth; // in inch/72 sal_Int32 m_nInheritedPageHeight; // in inch/72 - PDFWriter::Orientation m_eInheritedOrientation; sal_Int32 m_nCurrentPage; sal_Int32 m_nCatalogObject; diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx index 17ee7a3..25a9fad 100644 --- a/vcl/source/outdev/font.cxx +++ b/vcl/source/outdev/font.cxx @@ -58,7 +58,7 @@ FontMetric OutputDevice::GetDevFont( int nDevFontIndex ) const aFontMetric.SetPitch( rData.GetPitch() ); aFontMetric.SetWeight( rData.GetWeight() ); aFontMetric.SetItalic( rData.GetItalic() ); - aFontMetric.SetAlignment( rData.GetAlignment() ); + aFontMetric.SetAlignment( TextAlign::ALIGN_TOP ); aFontMetric.SetWidthType( rData.GetWidthType() ); aFontMetric.SetScalableFlag( rData.IsScalable() ); aFontMetric.SetBuiltInFontFlag( rData.IsBuiltInFont() ); @@ -193,7 +193,7 @@ FontMetric OutputDevice::GetFontMetric() const aMetric.SetPitch( xFontMetric->GetPitch() ); aMetric.SetWeight( xFontMetric->GetWeight() ); aMetric.SetItalic( xFontMetric->GetItalic() ); - aMetric.SetAlignment( xFontMetric->GetAlignment() ); + aMetric.SetAlignment( TextAlign::ALIGN_TOP ); aMetric.SetWidthType( xFontMetric->GetWidthType() ); if ( pFontInstance->mnOwnOrientation ) aMetric.SetOrientation( pFontInstance->mnOwnOrientation ); diff --git a/vcl/source/window/menubarwindow.cxx b/vcl/source/window/menubarwindow.cxx index bec7b35..906459c 100644 --- a/vcl/source/window/menubarwindow.cxx +++ b/vcl/source/window/menubarwindow.cxx @@ -125,7 +125,6 @@ MenuBarWindow::MenuBarWindow( vcl::Window* pParent ) : nRolloveredItem = ITEMPOS_INVALID; mbAutoPopup = true; bIgnoreFirstMove = true; - bStayActive = false; SetMBWHideAccel(true); SetMBWMenuKey(false); @@ -452,31 +451,26 @@ void MenuBarWindow::ChangeHighlightItem( sal_uInt16 n, bool bSelectEntry, bool b if ( ( nHighlightedItem == ITEMPOS_INVALID ) && ( n != ITEMPOS_INVALID ) ) { ImplGetSVData()->maWinData.mbNoDeactivate = true; - if( !bStayActive ) - { - // #105406# avoid saving the focus when we already have the focus - bool bNoSaveFocus = (this == ImplGetSVData()->maWinData.mpFocusWin.get() ); + // #105406# avoid saving the focus when we already have the focus + bool bNoSaveFocus = (this == ImplGetSVData()->maWinData.mpFocusWin.get() ); - if( xSaveFocusId != nullptr ) - { - if( !ImplGetSVData()->maWinData.mbNoSaveFocus ) - { - xSaveFocusId = nullptr; - if( !bNoSaveFocus ) - xSaveFocusId = Window::SaveFocus(); // only save focus when initially activated - } - else { - ; // do nothing: we 're activated again from taskpanelist, focus was already saved - } - } - else + if( xSaveFocusId != nullptr ) + { + if( !ImplGetSVData()->maWinData.mbNoSaveFocus ) { - if( !bNoSaveFocus ) + xSaveFocusId = nullptr; + if( !bNoSaveFocus ) xSaveFocusId = Window::SaveFocus(); // only save focus when initially activated } + else { + ; // do nothing: we 're activated again from taskpanelist, focus was already saved + } } else - bStayActive = false; + { + if( !bNoSaveFocus ) + xSaveFocusId = Window::SaveFocus(); // only save focus when initially activated + } pMenu->bInCallback = true; // set here if Activate overridden pMenu->Activate(); pMenu->bInCallback = false; diff --git a/vcl/source/window/menubarwindow.hxx b/vcl/source/window/menubarwindow.hxx index 3f1f40f..06aac8d 100644 --- a/vcl/source/window/menubarwindow.hxx +++ b/vcl/source/window/menubarwindow.hxx @@ -78,7 +78,6 @@ private: VclPtr<vcl::Window> xSaveFocusId; bool mbAutoPopup; bool bIgnoreFirstMove; - bool bStayActive; bool mbHideAccel; bool mbMenuKey; diff --git a/vcl/source/window/settings.cxx b/vcl/source/window/settings.cxx index c9a8fd1..8a119ed 100644 --- a/vcl/source/window/settings.cxx +++ b/vcl/source/window/settings.cxx @@ -68,7 +68,7 @@ void Window::SetSettings( const AllSettings& rSettings, bool bChild ) DataChanged( aDCEvt ); } - if ( bChild || mpWindowImpl->mbChildNotify ) + if ( bChild ) { vcl::Window* pChild = mpWindowImpl->mpFirstChild; while ( pChild ) @@ -133,7 +133,7 @@ void Window::UpdateSettings( const AllSettings& rSettings, bool bChild ) CallEventListeners( VCLEVENT_WINDOW_DATACHANGED, &aDCEvt); } - if ( bChild || mpWindowImpl->mbChildNotify ) + if ( bChild ) { vcl::Window* pChild = mpWindowImpl->mpFirstChild; while ( pChild ) diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 122f39a..4e32d0f 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -674,15 +674,12 @@ WindowImpl::WindowImpl( WindowType nType ) mbOverlapVisible = false; // true: Hide called for visible window from ImplHideAllOverlapWindow() mbDisabled = false; // true: Enable( false ) called mbInputDisabled = false; // true: EnableInput( false ) called - mbDropDisabled = false; // true: Drop is enabled mbNoUpdate = false; // true: SetUpdateMode( false ) called mbNoParentUpdate = false; // true: SetParentUpdateMode( false ) called mbActive = false; // true: Window Active - mbParentActive = false; // true: OverlapActive from Parent mbReallyVisible = false; // true: this and all parents to an overlapped window are visible mbReallyShown = false; // true: this and all parents to an overlapped window are shown mbInInitShow = false; // true: we are in InitShow - mbChildNotify = false; // true: ChildNotify mbChildPtrOverwrite = false; // true: PointerStyle overwrites Child-Pointer mbNoPtrVisible = false; // true: ShowPointer( false ) called mbMouseMove = false; // true: BaseMouseMove called @@ -2490,7 +2487,7 @@ void Window::Enable( bool bEnable, bool bChild ) CallEventListeners( bEnable ? VCLEVENT_WINDOW_ENABLED : VCLEVENT_WINDOW_DISABLED ); } - if ( bChild || mpWindowImpl->mbChildNotify ) + if ( bChild ) { vcl::Window* pChild = mpWindowImpl->mpFirstChild; while ( pChild ) @@ -2563,7 +2560,7 @@ void Window::EnableInput( bool bEnable, bool bChild ) mpWindowImpl->mpFrameData->mpFocusWin == this ) pSVData->maWinData.mpFocusWin = this; - if ( bChild || mpWindowImpl->mbChildNotify ) + if ( bChild ) { vcl::Window* pChild = mpWindowImpl->mpFirstChild; while ( pChild ) @@ -2662,7 +2659,7 @@ void Window::AlwaysEnableInput( bool bAlways, bool bChild ) mpWindowImpl->meAlwaysInputMode = AlwaysInputNone; } - if ( bChild || mpWindowImpl->mbChildNotify ) + if ( bChild ) { vcl::Window* pChild = mpWindowImpl->mpFirstChild; while ( pChild ) @@ -2691,7 +2688,7 @@ void Window::AlwaysDisableInput( bool bAlways, bool bChild ) mpWindowImpl->meAlwaysInputMode = AlwaysInputNone; } - if ( bChild || mpWindowImpl->mbChildNotify ) + if ( bChild ) { vcl::Window* pChild = mpWindowImpl->mpFirstChild; while ( pChild ) diff --git a/vcl/unx/generic/app/i18n_cb.cxx b/vcl/unx/generic/app/i18n_cb.cxx index 2c7bc67..1ab6c61 100644 --- a/vcl/unx/generic/app/i18n_cb.cxx +++ b/vcl/unx/generic/app/i18n_cb.cxx @@ -359,14 +359,12 @@ PreeditDrawCallback(XIC ic, XPointer client_data, // build the SalExtTextInputEvent and send it up - pPreeditData->aInputEv.mnTime = 0; pPreeditData->aInputEv.mpTextAttr = Preedit_FeedbackToSAL( pPreeditData->aText.pCharStyle, pPreeditData->aText.nLength, pPreeditData->aInputFlags); pPreeditData->aInputEv.mnCursorPos = call_data->caret; pPreeditData->aInputEv.maText = OUString(pPreeditData->aText.pUnicodeBuffer, pPreeditData->aText.nLength); pPreeditData->aInputEv.mnCursorFlags = 0; // default: make cursor visible - pPreeditData->aInputEv.mbOnlyCursor = False; if ( pPreeditData->eState == PreeditStatus::Active && pPreeditData->pFrame ) pPreeditData->pFrame->CallCallback(SalEvent::ExtTextInput, static_cast<void*>(&pPreeditData->aInputEv)); diff --git a/vcl/unx/generic/app/i18n_ic.cxx b/vcl/unx/generic/app/i18n_ic.cxx index 585f891..503cd87 100644 --- a/vcl/unx/generic/app/i18n_ic.cxx +++ b/vcl/unx/generic/app/i18n_ic.cxx @@ -42,12 +42,10 @@ static void sendEmptyCommit( SalFrame* pFrame ) vcl::DeletionListener aDel( pFrame ); SalExtTextInputEvent aEmptyEv; - aEmptyEv.mnTime = 0; aEmptyEv.mpTextAttr = nullptr; aEmptyEv.maText.clear(); aEmptyEv.mnCursorPos = 0; aEmptyEv.mnCursorFlags = 0; - aEmptyEv.mbOnlyCursor = False; pFrame->CallCallback( SalEvent::ExtTextInput, static_cast<void*>(&aEmptyEv) ); if( ! aDel.isDeleted() ) pFrame->CallCallback( SalEvent::EndExtTextInput, nullptr ); @@ -159,11 +157,9 @@ SalI18N_InputContext::SalI18N_InputContext ( SalFrame *pFrame ) : maClientData.aText.pUnicodeBuffer = nullptr; maClientData.aText.pCharStyle = nullptr; - maClientData.aInputEv.mnTime = 0; maClientData.aInputEv.mpTextAttr = nullptr; maClientData.aInputEv.mnCursorPos = 0; maClientData.aInputEv.mnCursorFlags = 0; - maClientData.aInputEv.mbOnlyCursor = false; SalI18N_InputMethod *pInputMethod; pInputMethod = vcl_sal::getSalDisplay(GetGenericData())->GetInputMethod(); @@ -526,12 +522,10 @@ SalI18N_InputContext::CommitKeyEvent(sal_Unicode* pText, sal_Size nLength) { SalExtTextInputEvent aTextEvent; - aTextEvent.mnTime = 0; aTextEvent.mpTextAttr = nullptr; aTextEvent.mnCursorPos = nLength; aTextEvent.maText = OUString(pText, nLength); aTextEvent.mnCursorFlags = 0; - aTextEvent.mbOnlyCursor = False; maClientData.pFrame->CallCallback(SalEvent::ExtTextInput, static_cast<void*>(&aTextEvent)); maClientData.pFrame->CallCallback(SalEvent::EndExtTextInput, nullptr); diff --git a/vcl/unx/generic/app/saldata.cxx b/vcl/unx/generic/app/saldata.cxx index d6673b8..15e541a 100644 --- a/vcl/unx/generic/app/saldata.cxx +++ b/vcl/unx/generic/app/saldata.cxx @@ -311,7 +311,6 @@ void X11SalData::PushXErrorLevel( bool bIgnore ) XErrorStackEntry& rEnt = m_aXErrorHandlerStack.back(); rEnt.m_bWas = false; rEnt.m_bIgnore = bIgnore; - rEnt.m_nLastErrorRequest = 0; rEnt.m_aHandler = XSetErrorHandler( XErrorHdl ); } diff --git a/vcl/unx/generic/app/wmadaptor.cxx b/vcl/unx/generic/app/wmadaptor.cxx index 8134655..f61082c 100644 --- a/vcl/unx/generic/app/wmadaptor.cxx +++ b/vcl/unx/generic/app/wmadaptor.cxx @@ -221,7 +221,6 @@ WMAdaptor* WMAdaptor::createWMAdaptor( SalDisplay* pSalDisplay ) WMAdaptor::WMAdaptor( SalDisplay* pDisplay ) : m_pSalDisplay( pDisplay ), - m_bTransientBehaviour( true ), m_bEnableAlwaysOnTopWorks( false ), m_bLegacyPartialFullscreen( false ), m_nWinGravity( StaticGravity ), @@ -335,7 +334,6 @@ NetWMAdaptor::NetWMAdaptor( SalDisplay* pSalDisplay ) : WMAdaptor( pSalDisplay ) { // currently all _NET WMs do transient like expected - m_bTransientBehaviour = true; Atom aRealType = None; int nFormat = 8; @@ -525,7 +523,6 @@ GnomeWMAdaptor::GnomeWMAdaptor( SalDisplay* pSalDisplay ) : m_bValid( false ) { // currently all Gnome WMs do transient like expected - m_bTransientBehaviour = true; Atom aRealType = None; int nFormat = 8; diff --git a/vcl/unx/generic/print/bitmap_gfx.cxx b/vcl/unx/generic/print/bitmap_gfx.cxx index 93ed0ce..02cf26b 100644 --- a/vcl/unx/generic/print/bitmap_gfx.cxx +++ b/vcl/unx/generic/print/bitmap_gfx.cxx @@ -529,7 +529,7 @@ PrinterGfx::writePS2ImageHeader (const Rectangle& rArea, psp::ImageType nType) case psp::ImageType::MonochromeImage: nDictType = 3; break; default: break; } - sal_Int32 nCompressType = mbCompressBmp ? 1 : 0; + sal_Int32 nCompressType = 1; nChar += psp::getValueOf (rArea.GetWidth(), pImage + nChar); nChar += psp::appendStr (" ", pImage + nChar); @@ -569,14 +569,10 @@ PrinterGfx::writePS2Colorspace(const PrinterBmp& rBitmap, psp::ImageType nType) nChar += psp::appendStr ("[/Indexed /DeviceRGB ", pImage + nChar); nChar += psp::getValueOf (nSize - 1, pImage + nChar); - if (mbCompressBmp) - nChar += psp::appendStr ("\npsp_lzwstring\n", pImage + nChar); - else - nChar += psp::appendStr ("\npsp_ascii85string\n", pImage + nChar); + nChar += psp::appendStr ("\npsp_lzwstring\n", pImage + nChar); WritePS (mpPageBody, pImage, nChar); - std::unique_ptr<ByteEncoder> xEncoder(mbCompressBmp ? new LZWEncoder(mpPageBody) - : new Ascii85Encoder(mpPageBody)); + std::unique_ptr<ByteEncoder> xEncoder(new LZWEncoder(mpPageBody)); for (sal_uInt32 i = 0; i < nSize; i++) { PrinterColor aColor = rBitmap.GetPaletteColor(i); @@ -600,8 +596,7 @@ PrinterGfx::DrawPS2GrayImage (const PrinterBmp& rBitmap, const Rectangle& rArea) writePS2Colorspace(rBitmap, psp::ImageType::GrayScaleImage); writePS2ImageHeader(rArea, psp::ImageType::GrayScaleImage); - std::unique_ptr<ByteEncoder> xEncoder(mbCompressBmp ? new LZWEncoder(mpPageBody) - : new Ascii85Encoder(mpPageBody)); + std::unique_ptr<ByteEncoder> xEncoder(new LZWEncoder(mpPageBody)); for (long nRow = rArea.Top(); nRow <= rArea.Bottom(); nRow++) { @@ -619,8 +614,7 @@ PrinterGfx::DrawPS2MonoImage (const PrinterBmp& rBitmap, const Rectangle& rArea) writePS2Colorspace(rBitmap, psp::ImageType::MonochromeImage); writePS2ImageHeader(rArea, psp::ImageType::MonochromeImage); - std::unique_ptr<ByteEncoder> xEncoder(mbCompressBmp ? new LZWEncoder(mpPageBody) - : new Ascii85Encoder(mpPageBody)); + std::unique_ptr<ByteEncoder> xEncoder(new LZWEncoder(mpPageBody)); for (long nRow = rArea.Top(); nRow <= rArea.Bottom(); nRow++) { @@ -651,8 +645,7 @@ PrinterGfx::DrawPS2PaletteImage (const PrinterBmp& rBitmap, const Rectangle& rAr writePS2Colorspace(rBitmap, psp::ImageType::PaletteImage); writePS2ImageHeader(rArea, psp::ImageType::PaletteImage); - std::unique_ptr<ByteEncoder> xEncoder(mbCompressBmp ? new LZWEncoder(mpPageBody) - : new Ascii85Encoder(mpPageBody)); + std::unique_ptr<ByteEncoder> xEncoder(new LZWEncoder(mpPageBody)); for (long nRow = rArea.Top(); nRow <= rArea.Bottom(); nRow++) { @@ -670,8 +663,7 @@ PrinterGfx::DrawPS2TrueColorImage (const PrinterBmp& rBitmap, const Rectangle& r writePS2Colorspace(rBitmap, psp::ImageType::TrueColorImage); writePS2ImageHeader(rArea, psp::ImageType::TrueColorImage); - std::unique_ptr<ByteEncoder> xEncoder(mbCompressBmp ? new LZWEncoder(mpPageBody) - : new Ascii85Encoder(mpPageBody)); + std::unique_ptr<ByteEncoder> xEncoder(new LZWEncoder(mpPageBody)); for (long nRow = rArea.Top(); nRow <= rArea.Bottom(); nRow++) { diff --git a/vcl/unx/generic/print/common_gfx.cxx b/vcl/unx/generic/print/common_gfx.cxx index e8cfada..b771073 100644 --- a/vcl/unx/generic/print/common_gfx.cxx +++ b/vcl/unx/generic/print/common_gfx.cxx @@ -95,11 +95,9 @@ PrinterGfx::PrinterGfx() , mpPageHeader(nullptr) , mpPageBody(nullptr) , mnFontID(0) - , mnFallbackID(0) , mnTextAngle(0) , mbTextVertical(false) , mrFontMgr(PrintFontManager::get()) - , mbCompressBmp(true) , maFillColor(0xff,0,0) , maTextColor(0,0,0) , maLineColor(0, 0xff, 0) @@ -129,7 +127,6 @@ PrinterGfx::Clear() maLineColor = PrinterColor(); maFillColor = PrinterColor(); maTextColor = PrinterColor(); - mbCompressBmp = true; mnDpi = 300; mnDepth = 24; mnPSLevel = 2; diff --git a/vcl/unx/generic/print/text_gfx.cxx b/vcl/unx/generic/print/text_gfx.cxx index d782077..c21cb75 100644 --- a/vcl/unx/generic/print/text_gfx.cxx +++ b/vcl/unx/generic/print/text_gfx.cxx @@ -63,7 +63,7 @@ class Font2 Font2::Font2(const PrinterGfx &rGfx) { mpFont[0] = rGfx.GetFontID(); - mpFont[1] = rGfx.getFallbackID(); + mpFont[1] = 0; // fallback ID PrintFontManager &rMgr = PrintFontManager::get(); mbSymbol = mpFont[0] != -1 && diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index 45da111..f70ad75 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -767,7 +767,6 @@ X11SalFrame::X11SalFrame( SalFrame *pParent, SalFrameStyleFlags nSalFrameStyle, mhShellWindow = None; mhStackingWindow = None; mhForeignParent = None; - mhBackgroundPixmap = None; m_bSetFocusOnMap = false; pGraphics_ = nullptr; @@ -778,7 +777,6 @@ X11SalFrame::X11SalFrame( SalFrame *pParent, SalFrameStyleFlags nSalFrameStyle, nKeyCode_ = 0; nKeyState_ = 0; - nCompose_ = -1; mbSendExtKeyModChange = false; mnExtKeyMod = 0; @@ -836,12 +834,6 @@ X11SalFrame::~X11SalFrame() m_nCurClipRect = m_nMaxClipRect = 0; } - if( mhBackgroundPixmap ) - { - XSetWindowBackgroundPixmap( GetXDisplay(), GetWindow(), None ); - XFreePixmap( GetXDisplay(), mhBackgroundPixmap ); - } - if( mhStackingWindow ) aPresentationReparentList.remove( mhStackingWindow ); @@ -1376,10 +1368,6 @@ void X11SalFrame::ToTop( SalFrameToTop nFlags ) if( ! (nFlags & SalFrameToTop::GrabFocusOnly) ) { XRaiseWindow( GetXDisplay(), aToTopWindow ); - if( ! GetDisplay()->getWMAdaptor()->isTransientBehaviourAsExpected() ) - for( std::list< X11SalFrame* >::const_iterator it = maChildren.begin(); - it != maChildren.end(); ++it ) - (*it)->ToTop( nFlags & ~SalFrameToTop::GrabFocus ); } if( ( ( nFlags & SalFrameToTop::GrabFocus ) || ( nFlags & SalFrameToTop::GrabFocusOnly ) ) @@ -2863,12 +2851,10 @@ void X11SalFrame::beginUnicodeSequence() { ExtTextInputAttr nTextAttr = ExtTextInputAttr::Underline; SalExtTextInputEvent aEv; - aEv.mnTime = 0; aEv.maText = rSeq; aEv.mpTextAttr = &nTextAttr; aEv.mnCursorPos = 0; aEv.mnCursorFlags = 0; - aEv.mbOnlyCursor = false; CallCallback(SalEvent::ExtTextInput, static_cast<void*>(&aEv)); } @@ -2892,12 +2878,10 @@ bool X11SalFrame::appendUnicodeSequence( sal_Unicode c ) std::vector<ExtTextInputAttr> attribs( rSeq.getLength(), ExtTextInputAttr::Underline ); SalExtTextInputEvent aEv; - aEv.mnTime = 0; aEv.maText = rSeq; aEv.mpTextAttr = &attribs[0]; aEv.mnCursorPos = 0; aEv.mnCursorFlags = 0; - aEv.mbOnlyCursor = false; CallCallback(SalEvent::ExtTextInput, static_cast<void*>(&aEv)); bRet = true; @@ -2924,12 +2908,10 @@ bool X11SalFrame::endUnicodeSequence() { ExtTextInputAttr nTextAttr = ExtTextInputAttr::Underline; SalExtTextInputEvent aEv; - aEv.mnTime = 0; aEv.maText = OUString( sal_Unicode(nValue) ); aEv.mpTextAttr = &nTextAttr; aEv.mnCursorPos = 0; aEv.mnCursorFlags = 0; - aEv.mbOnlyCursor = false; CallCallback(SalEvent::ExtTextInput, static_cast<void*>(&aEv)); } } @@ -3432,8 +3414,7 @@ void X11SalFrame::RestackChildren( ::Window* pTopLevelWindows, int nTopLevelWind void X11SalFrame::RestackChildren() { - if( ! GetDisplay()->getWMAdaptor()->isTransientBehaviourAsExpected() - && !maChildren.empty() ) + if( !maChildren.empty() ) { ::Window aRoot, aParent, *pChildren = nullptr; unsigned int nChildren; @@ -3873,8 +3854,7 @@ long X11SalFrame::Dispatch( XEvent *pEvent ) break; case KeyRelease: - if( -1 == nCompose_ ) - nRet = HandleKeyEvent( &pEvent->xkey ); + nRet = HandleKeyEvent( &pEvent->xkey ); break; case ButtonPress: diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx index a291899..e0134ac 100644 --- a/vcl/unx/gtk/gtksalframe.cxx +++ b/vcl/unx/gtk/gtksalframe.cxx @@ -784,14 +784,6 @@ GtkSalFrame::~GtkSalFrame() gdk_region_destroy( m_pRegion ); } - if( m_hBackgroundPixmap ) - { - XSetWindowBackgroundPixmap( getDisplay()->GetDisplay(), - widget_get_xid(m_pWindow), - None ); - XFreePixmap( getDisplay()->GetDisplay(), m_hBackgroundPixmap ); - } - delete m_pIMHandler; GtkWidget *pEventWidget = getMouseEventWidget(); @@ -972,7 +964,6 @@ void GtkSalFrame::InitCommon() m_nVisibility = GDK_VISIBILITY_FULLY_OBSCURED; m_bSendModChangeOnRelease = false; m_pIMHandler = nullptr; - m_hBackgroundPixmap = None; m_nExtStyle = 0; m_pRegion = nullptr; m_ePointerStyle = static_cast<PointerStyle>(0xffff); @@ -1057,7 +1048,7 @@ void GtkSalFrame::InitCommon() */ XSetWindowBackgroundPixmap( getDisplay()->GetDisplay(), widget_get_xid(m_pWindow), - m_hBackgroundPixmap ); + None ); } /* Sadly gtk_window_set_accept_focus exists only since gtk 2.4 @@ -3289,7 +3280,7 @@ void GtkSalFrame::signalStyleSet( GtkWidget*, GtkStyle* pPrevious, gpointer fram if( aWin != None ) XSetWindowBackgroundPixmap( GtkSalFrame::getDisplay()->GetDisplay(), aWin, - pThis->m_hBackgroundPixmap ); + None ); } if( ! pThis->m_pParent ) { @@ -3433,12 +3424,10 @@ void GtkSalFrame::IMHandler::sendEmptyCommit() vcl::DeletionListener aDel( m_pFrame ); SalExtTextInputEvent aEmptyEv; - aEmptyEv.mnTime = 0; aEmptyEv.mpTextAttr = nullptr; aEmptyEv.maText.clear(); aEmptyEv.mnCursorPos = 0; aEmptyEv.mnCursorFlags = 0; - aEmptyEv.mbOnlyCursor = False; m_pFrame->CallCallback( SalEvent::ExtTextInput, static_cast<void*>(&aEmptyEv) ); if( ! aDel.isDeleted() ) m_pFrame->CallCallback( SalEvent::EndExtTextInput, nullptr ); @@ -3620,12 +3609,10 @@ void GtkSalFrame::IMHandler::signalIMCommit( GtkIMContext* pContext, gchar* pTex (pThis->m_aInputEvent.mpTextAttr != nullptr) || pThis->m_bPreeditJustChanged; - pThis->m_aInputEvent.mnTime = 0; pThis->m_aInputEvent.mpTextAttr = nullptr; pThis->m_aInputEvent.maText = OUString( pText, strlen(pText), RTL_TEXTENCODING_UTF8 ); pThis->m_aInputEvent.mnCursorPos = pThis->m_aInputEvent.maText.getLength(); pThis->m_aInputEvent.mnCursorFlags = 0; - pThis->m_aInputEvent.mbOnlyCursor = False; pThis->m_aInputFlags.clear(); @@ -3709,11 +3696,9 @@ void GtkSalFrame::IMHandler::signalIMPreeditChanged( GtkIMContext*, gpointer im_ pThis->m_bPreeditJustChanged = true; bool bEndPreedit = (!pText || !*pText) && pThis->m_aInputEvent.mpTextAttr != nullptr; - pThis->m_aInputEvent.mnTime = 0; pThis->m_aInputEvent.maText = pText ? OUString( pText, strlen(pText), RTL_TEXTENCODING_UTF8 ) : OUString(); pThis->m_aInputEvent.mnCursorPos = nCursorPos; pThis->m_aInputEvent.mnCursorFlags = 0; - pThis->m_aInputEvent.mbOnlyCursor = False; pThis->m_aInputFlags = std::vector<ExtTextInputAttr>( std::max( 1, (int)pThis->m_aInputEvent.maText.getLength() ), ExtTextInputAttr::NONE ); diff --git a/vcl/unx/gtk/salnativewidgets-gtk.cxx b/vcl/unx/gtk/salnativewidgets-gtk.cxx index 8ae0d49..c6b8380 100644 --- a/vcl/unx/gtk/salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk/salnativewidgets-gtk.cxx @@ -630,10 +630,6 @@ void GtkSalGraphics::copyBits( const SalTwoRect& rPosAry, } } X11SalGraphics::copyBits( rPosAry, pSrcGraphics ); - if( pFrame && pFrame->getBackgroundPixmap() != None ) - XSetWindowBackgroundPixmap( GtkSalFrame::getDisplay()->GetDisplay(), - aWin, - pFrame->getBackgroundPixmap() ); } /* diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx index 7e3600b..c6e1d5f 100644 --- a/vcl/unx/gtk3/gtk3gtkframe.cxx +++ b/vcl/unx/gtk3/gtk3gtkframe.cxx @@ -1053,7 +1053,6 @@ void GtkSalFrame::InitCommon() m_nVisibility = GDK_VISIBILITY_FULLY_OBSCURED; m_bSendModChangeOnRelease = false; m_pIMHandler = nullptr; - m_hBackgroundPixmap = None; m_nExtStyle = 0; m_pRegion = nullptr; m_pDropTarget = nullptr; @@ -3579,12 +3578,10 @@ void GtkSalFrame::IMHandler::sendEmptyCommit() vcl::DeletionListener aDel( m_pFrame ); SalExtTextInputEvent aEmptyEv; - aEmptyEv.mnTime = 0; aEmptyEv.mpTextAttr = nullptr; aEmptyEv.maText.clear(); aEmptyEv.mnCursorPos = 0; aEmptyEv.mnCursorFlags = 0; - aEmptyEv.mbOnlyCursor = False; m_pFrame->CallCallback( SalEvent::ExtTextInput, static_cast<void*>(&aEmptyEv) ); if( ! aDel.isDeleted() ) m_pFrame->CallCallback( SalEvent::EndExtTextInput, nullptr ); @@ -3766,12 +3763,10 @@ void GtkSalFrame::IMHandler::signalIMCommit( GtkIMContext* /*pContext*/, gchar* (pThis->m_aInputEvent.mpTextAttr != nullptr) || pThis->m_bPreeditJustChanged; - pThis->m_aInputEvent.mnTime = 0; pThis->m_aInputEvent.mpTextAttr = nullptr; pThis->m_aInputEvent.maText = OUString( pText, strlen(pText), RTL_TEXTENCODING_UTF8 ); pThis->m_aInputEvent.mnCursorPos = pThis->m_aInputEvent.maText.getLength(); pThis->m_aInputEvent.mnCursorFlags = 0; - pThis->m_aInputEvent.mbOnlyCursor = False; pThis->m_aInputFlags.clear(); @@ -3846,11 +3841,9 @@ void GtkSalFrame::IMHandler::signalIMPreeditChanged( GtkIMContext*, gpointer im_ pThis->m_bPreeditJustChanged = true; bool bEndPreedit = (!pText || !*pText) && pThis->m_aInputEvent.mpTextAttr != nullptr; - pThis->m_aInputEvent.mnTime = 0; pThis->m_aInputEvent.maText = pText ? OUString( pText, strlen(pText), RTL_TEXTENCODING_UTF8 ) : OUString(); pThis->m_aInputEvent.mnCursorPos = nCursorPos; pThis->m_aInputEvent.mnCursorFlags = 0; - pThis->m_aInputEvent.mbOnlyCursor = False; pThis->m_aInputFlags = std::vector<ExtTextInputAttr>( std::max( 1, (int)pThis->m_aInputEvent.maText.getLength() ), ExtTextInputAttr::NONE ); diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx index fef5448..084705c 100644 --- a/vcl/win/window/salframe.cxx +++ b/vcl/win/window/salframe.cxx @@ -4989,10 +4989,8 @@ static bool ImplHandleIMECompositionInput( WinSalFrame* pFrame, // Init Event SalExtTextInputEvent aEvt; - aEvt.mnTime = GetMessageTime(); aEvt.mpTextAttr = NULL; aEvt.mnCursorPos = 0; - aEvt.mbOnlyCursor = FALSE; aEvt.mnCursorFlags = 0; // If we get a result string, then we handle this input @@ -5131,10 +5129,8 @@ static bool ImplHandleIMEComposition( HWND hWnd, LPARAM lParam ) if ( !lParam ) { SalExtTextInputEvent aEvt; - aEvt.mnTime = GetMessageTime(); aEvt.mpTextAttr = NULL; aEvt.mnCursorPos = 0; - aEvt.mbOnlyCursor = FALSE; aEvt.mnCursorFlags = 0; pFrame->CallCallback( SalEvent::ExtTextInput, (void*)&aEvt ); pFrame->CallCallback( SalEvent::EndExtTextInput, (void*)NULL ); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits