diff options
26 files changed, 36 insertions, 132 deletions
diff --git a/compilerplugins/clang/unusedfields.py b/compilerplugins/clang/unusedfields.py index 08f0b675ce6f..7325175d5d3d 100755 --- a/compilerplugins/clang/unusedfields.py +++ b/compilerplugins/clang/unusedfields.py @@ -60,7 +60,11 @@ for d in definitionSet: continue # this is all representations of on-disk data structures if (srcLoc.startswith("sc/source/filter/inc/scflt.hxx") - or srcLoc.startswith("sw/source/filter/ww8/")): + or srcLoc.startswith("sw/source/filter/ww8/") + or srcLoc.startswith("vcl/source/filter/sgvmain.hxx") + or srcLoc.startswith("vcl/source/filter/sgfbram.hxx") + or srcLoc.startswith("vcl/inc/unx/XIM.h") + or srcLoc.startswith("vcl/inc/unx/gtk/gloactiongroup.h")): continue tmp1set.add((clazz, srcLoc)) diff --git a/vcl/generic/fontmanager/parseAFM.hxx b/vcl/generic/fontmanager/parseAFM.hxx index 933e2fa7bfda..a31217b9a14f 100644 --- a/vcl/generic/fontmanager/parseAFM.hxx +++ b/vcl/generic/fontmanager/parseAFM.hxx @@ -203,9 +203,8 @@ typedef struct _t_ligature typedef struct { int code, /* key: C */ - wx, /* key: WX */ - w0x, /* key: W0X */ - wy; /* together wx and wy are associated with key: W */ + wx, /* key: WX */ + wy; /* together wx and wy are associated with key: W */ char *name; /* key: N */ BBox charBBox; /* key: B */ Ligature *ligs; /* key: L (linked list; not a fixed number of Ls */ diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx index cd8645440187..ec5da8971769 100644 --- a/vcl/generic/glyphs/gcach_ftyp.cxx +++ b/vcl/generic/glyphs/gcach_ftyp.cxx @@ -444,7 +444,6 @@ ServerFont::ServerFont( const FontSelectPattern& rFSD, FtFontInfo* pFI ) mpNextGCFont( nullptr ), mnCos( 0x10000), mnSin( 0 ), - mbCollectedZW( false ), mnPrioEmbedded(nDefaultPrioEmbedded), mnPrioAntiAlias(nDefaultPrioAntiAlias), mnPrioAutoHint(nDefaultPrioAutoHint), diff --git a/vcl/generic/glyphs/scrptrun.h b/vcl/generic/glyphs/scrptrun.h index 1ae12089f045..2efcff4110ba 100644 --- a/vcl/generic/glyphs/scrptrun.h +++ b/vcl/generic/glyphs/scrptrun.h @@ -47,13 +47,6 @@ namespace vcl { -struct ScriptRecord -{ - UChar32 startChar; - UChar32 endChar; - UScriptCode scriptCode; -}; - struct ParenStackEntry { int32_t pairIndex; diff --git a/vcl/inc/brdwin.hxx b/vcl/inc/brdwin.hxx index 1a844e07f144..430ae04e1988 100644 --- a/vcl/inc/brdwin.hxx +++ b/vcl/inc/brdwin.hxx @@ -198,7 +198,6 @@ struct ImplBorderFrameData long mnNoTitleTop; long mnBorderSize; long mnTitleHeight; - long mnTitleOff; sal_uInt16 mnHitTest; DrawButtonFlags mnPinState; DrawButtonFlags mnCloseState; diff --git a/vcl/inc/fontmanager.hxx b/vcl/inc/fontmanager.hxx index 83f3cc662a4a..79891f95ccd5 100644 --- a/vcl/inc/fontmanager.hxx +++ b/vcl/inc/fontmanager.hxx @@ -246,7 +246,6 @@ class VCL_PLUGIN_PUBLIC PrintFontManager fontID m_nNextFontID; std::unordered_map< fontID, PrintFont* > m_aFonts; std::unordered_map< int, FontFamily > m_aFamilyTypes; - std::list< OUString > m_aPrinterDrivers; std::list< OString > m_aFontDirectories; std::list< int > m_aPrivateFontDirectories; utl::MultiAtomProvider* m_pAtoms; @@ -319,7 +318,6 @@ class VCL_PLUGIN_PUBLIC PrintFontManager static bool addFontconfigDir(const OString& rDirectory); std::set<OString> m_aPreviousLangSupportRequests; - std::vector<OString> m_aCurrentRequests; Timer m_aFontInstallerTimer; #if defined(ENABLE_DBUS) && defined(ENABLE_PACKAGEKIT) diff --git a/vcl/inc/generic/glyphcache.hxx b/vcl/inc/generic/glyphcache.hxx index eb708d6f8756..722e6b1b9d33 100644 --- a/vcl/inc/generic/glyphcache.hxx +++ b/vcl/inc/generic/glyphcache.hxx @@ -125,18 +125,6 @@ private: Size maSize; }; -// the glyph specific data needed by a GlyphCachePeer is usually trivial, -// not attaching it to the corresponding GlyphData would be overkill; -// this is currently only used by the headless (aka svp) plugin, where meInfo is -// basebmp::Format and mpData is SvpGcpHelper* -struct ExtGlyphData -{ - basebmp::Format meInfo; - SvpGcpHelper* mpData; - - ExtGlyphData() : meInfo(basebmp::Format::NONE), mpData(nullptr) {} -}; - class GlyphData { public: @@ -234,8 +222,6 @@ private: long mnCos; long mnSin; - bool mbCollectedZW; - int mnWidth; int mnPrioEmbedded; int mnPrioAntiAlias; diff --git a/vcl/inc/outdev.h b/vcl/inc/outdev.h index 06959c81f2c5..d48fa994b4f7 100644 --- a/vcl/inc/outdev.h +++ b/vcl/inc/outdev.h @@ -84,8 +84,6 @@ protected: struct ImplFontSubstEntry { - OUString maName; - OUString maReplaceName; OUString maSearchName; OUString maSearchReplaceName; AddFontSubstituteFlags mnFlags; diff --git a/vcl/inc/salmenu.hxx b/vcl/inc/salmenu.hxx index aaea364f30b2..287e19e8e796 100644 --- a/vcl/inc/salmenu.hxx +++ b/vcl/inc/salmenu.hxx @@ -36,7 +36,7 @@ struct SalItemParams MenuItemType eType; // MenuItem-Type MenuItemBits nBits; // MenuItem-Bits Menu* pMenu; // Pointer to Menu - OUString aText; // Menu-Text + OUString aText; // Menu-Text Image aImage; // Image }; diff --git a/vcl/inc/salwtype.hxx b/vcl/inc/salwtype.hxx index 222c8c85a54a..da5126c43d38 100644 --- a/vcl/inc/salwtype.hxx +++ b/vcl/inc/salwtype.hxx @@ -53,7 +53,7 @@ enum class InputContextFlags; #define SALEVENT_FONTCHANGED ((sal_uInt16)18) #define SALEVENT_WHEELMOUSE ((sal_uInt16)21) #define SALEVENT_USEREVENT ((sal_uInt16)22) -#define SALEVENT_MOUSEACTIVATE ((sal_uInt16)23) +// unused #define SALEVENT_EXTTEXTINPUT ((sal_uInt16)24) #define SALEVENT_ENDEXTTEXTINPUT ((sal_uInt16)25) #define SALEVENT_EXTTEXTINPUTPOS ((sal_uInt16)26) @@ -161,13 +161,6 @@ struct SalWheelMouseEvent {} }; -// MOUSEACTIVATE -struct SalMouseActivateEvent -{ - long mnX; // X-Position (Pixel, TopLeft-Output) - long mnY; // Y-Position (Pixel, TopLeft-Output) -}; - // EXTTEXTINPUT struct SalExtTextInputEvent { diff --git a/vcl/inc/sft.hxx b/vcl/inc/sft.hxx index ec8c6a0c92d4..e383c030835a 100644 --- a/vcl/inc/sft.hxx +++ b/vcl/inc/sft.hxx @@ -62,11 +62,6 @@ namespace vcl typedef sal_Int32 F16Dot16; /**< fixed: 16.16 */ /*@}*/ - typedef struct { - sal_uInt16 s; - sal_uInt16 d; - } sal_uInt16pair; - /** Return value of OpenTTFont() and CreateT3FromTTGlyphs() */ enum SFErrCodes { SF_OK, /**< no error */ diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx index dc5c37a22665..b93a0361b67e 100644 --- a/vcl/inc/svdata.hxx +++ b/vcl/inc/svdata.hxx @@ -122,7 +122,6 @@ struct ImplSVAppData OUString* mpAppName; // Application name OUString* mpAppFileName; // Abs. Application FileName OUString* mpDisplayName; // Application Display Name - OUString* mpFontPath; // Additional Fontpath Help* mpHelp; // Application help PopupMenu* mpActivePopupMenu; // Actives Popup-Menu (in Execute) ImplIdleMgr* mpIdleMgr; // Idle-Manager @@ -133,7 +132,6 @@ struct ImplSVAppData sal_uInt16 mnDispatchLevel; // DispatchLevel sal_uInt16 mnModalMode; // ModalMode Count sal_uInt16 mnModalDialog; // ModalDialog Count - sal_uInt16 mnAccessCount; // AccessHdl Count SystemWindowFlags mnSysWinMode; // Mode, when SystemWindows should be created short mnDialogScaleX; // Scale X-Positions and sizes in Dialogs bool mbInAppMain; // is Application::Main() on stack @@ -230,7 +228,6 @@ struct ImplSVCtrlData sal_uInt16 mnRadioStyle; // Radio-Style for ImageList-Update sal_uLong mnLastCheckFColor; // Letzte FaceColor fuer CheckImage sal_uLong mnLastCheckWColor; // Letzte WindowColor fuer CheckImage - sal_uLong mnLastCheckWTextColor; // Letzte WindowTextColor fuer CheckImage sal_uLong mnLastCheckLColor; // Letzte LightColor fuer CheckImage sal_uLong mnLastRadioFColor; // Letzte FaceColor fuer RadioImage sal_uLong mnLastRadioWColor; // Letzte WindowColor fuer RadioImage @@ -325,8 +322,6 @@ struct ImplSVData Application* mpApp; // pApp VclPtr<WorkWindow> mpDefaultWin; // Default-Window bool mbDeInit; // Is VCL deinitializing - sal_uLong mnThreadCount; // is VCL MultiThread enabled - ImplConfigData* mpFirstConfigData; // pointer to the first config block ImplSchedulerData* mpFirstSchedulerData; // list of all running tasks SalTimer* mpSalTimer; // interface to sal event loop/timers SalI18NImeStatus* mpImeStatus; // interface to ime status window diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index e8cb62f865b5..f2df4673598a 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -84,12 +84,11 @@ using namespace ::com::sun::star::uno; class ImplReservedKey { public: - ImplReservedKey( vcl::KeyCode aKeyCode, sal_uInt16 nResId ) : - mKeyCode(aKeyCode), mnResId( nResId) + ImplReservedKey( vcl::KeyCode aKeyCode ) : + mKeyCode(aKeyCode) {} vcl::KeyCode mKeyCode; - sal_uInt16 mnResId; }; typedef std::pair<ImplReservedKey*, size_t> ReservedKeys; @@ -101,31 +100,31 @@ namespace { static ImplReservedKey ImplReservedKeys[] = { - ImplReservedKey(vcl::KeyCode(KEY_F1,0), SV_SHORTCUT_HELP), - ImplReservedKey(vcl::KeyCode(KEY_F1,KEY_SHIFT), SV_SHORTCUT_ACTIVEHELP), - ImplReservedKey(vcl::KeyCode(KEY_F1,KEY_MOD1), SV_SHORTCUT_CONTEXTHELP), - ImplReservedKey(vcl::KeyCode(KEY_F2,KEY_SHIFT), SV_SHORTCUT_CONTEXTHELP), - ImplReservedKey(vcl::KeyCode(KEY_F4,KEY_MOD1), SV_SHORTCUT_DOCKUNDOCK), - ImplReservedKey(vcl::KeyCode(KEY_F4,KEY_MOD2), SV_SHORTCUT_DOCKUNDOCK), - ImplReservedKey(vcl::KeyCode(KEY_F4,KEY_MOD1|KEY_MOD2), SV_SHORTCUT_DOCKUNDOCK), - ImplReservedKey(vcl::KeyCode(KEY_F6,0), SV_SHORTCUT_NEXTSUBWINDOW), - ImplReservedKey(vcl::KeyCode(KEY_F6,KEY_MOD1), SV_SHORTCUT_TODOCUMENT), - ImplReservedKey(vcl::KeyCode(KEY_F6,KEY_SHIFT), SV_SHORTCUT_PREVSUBWINDOW), - ImplReservedKey(vcl::KeyCode(KEY_F6,KEY_MOD1|KEY_SHIFT), SV_SHORTCUT_SPLITTER), - ImplReservedKey(vcl::KeyCode(KEY_F10,0), SV_SHORTCUT_MENUBAR) + ImplReservedKey(vcl::KeyCode(KEY_F1,0) ), + ImplReservedKey(vcl::KeyCode(KEY_F1,KEY_SHIFT) ), + ImplReservedKey(vcl::KeyCode(KEY_F1,KEY_MOD1) ), + ImplReservedKey(vcl::KeyCode(KEY_F2,KEY_SHIFT) ), + ImplReservedKey(vcl::KeyCode(KEY_F4,KEY_MOD1) ), + ImplReservedKey(vcl::KeyCode(KEY_F4,KEY_MOD2) ), + ImplReservedKey(vcl::KeyCode(KEY_F4,KEY_MOD1|KEY_MOD2) ), + ImplReservedKey(vcl::KeyCode(KEY_F6,0) ), + ImplReservedKey(vcl::KeyCode(KEY_F6,KEY_MOD1) ), + ImplReservedKey(vcl::KeyCode(KEY_F6,KEY_SHIFT) ), + ImplReservedKey(vcl::KeyCode(KEY_F6,KEY_MOD1|KEY_SHIFT) ), + ImplReservedKey(vcl::KeyCode(KEY_F10,0) ) #ifdef UNX , - ImplReservedKey(vcl::KeyCode(KEY_1,KEY_SHIFT|KEY_MOD1), 0), - ImplReservedKey(vcl::KeyCode(KEY_2,KEY_SHIFT|KEY_MOD1), 0), - ImplReservedKey(vcl::KeyCode(KEY_3,KEY_SHIFT|KEY_MOD1), 0), - ImplReservedKey(vcl::KeyCode(KEY_4,KEY_SHIFT|KEY_MOD1), 0), - ImplReservedKey(vcl::KeyCode(KEY_5,KEY_SHIFT|KEY_MOD1), 0), - ImplReservedKey(vcl::KeyCode(KEY_6,KEY_SHIFT|KEY_MOD1), 0), - ImplReservedKey(vcl::KeyCode(KEY_7,KEY_SHIFT|KEY_MOD1), 0), - ImplReservedKey(vcl::KeyCode(KEY_8,KEY_SHIFT|KEY_MOD1), 0), - ImplReservedKey(vcl::KeyCode(KEY_9,KEY_SHIFT|KEY_MOD1), 0), - ImplReservedKey(vcl::KeyCode(KEY_0,KEY_SHIFT|KEY_MOD1), 0), - ImplReservedKey(vcl::KeyCode(KEY_ADD,KEY_SHIFT|KEY_MOD1), 0) + ImplReservedKey(vcl::KeyCode(KEY_1,KEY_SHIFT|KEY_MOD1)), + ImplReservedKey(vcl::KeyCode(KEY_2,KEY_SHIFT|KEY_MOD1)), + ImplReservedKey(vcl::KeyCode(KEY_3,KEY_SHIFT|KEY_MOD1)), + ImplReservedKey(vcl::KeyCode(KEY_4,KEY_SHIFT|KEY_MOD1)), + ImplReservedKey(vcl::KeyCode(KEY_5,KEY_SHIFT|KEY_MOD1)), + ImplReservedKey(vcl::KeyCode(KEY_6,KEY_SHIFT|KEY_MOD1)), + ImplReservedKey(vcl::KeyCode(KEY_7,KEY_SHIFT|KEY_MOD1)), + ImplReservedKey(vcl::KeyCode(KEY_8,KEY_SHIFT|KEY_MOD1)), + ImplReservedKey(vcl::KeyCode(KEY_9,KEY_SHIFT|KEY_MOD1)), + ImplReservedKey(vcl::KeyCode(KEY_0,KEY_SHIFT|KEY_MOD1)), + ImplReservedKey(vcl::KeyCode(KEY_ADD,KEY_SHIFT|KEY_MOD1)) #endif }; static ReservedKeys aKeys @@ -148,7 +147,6 @@ extern "C" { struct ImplHotKey { ImplHotKey* mpNext; - void* mpUserData; vcl::KeyCode maKeyCode; }; diff --git a/vcl/source/filter/FilterConfigCache.hxx b/vcl/source/filter/FilterConfigCache.hxx index 71661f2bbfc2..8c52991e4636 100644 --- a/vcl/source/filter/FilterConfigCache.hxx +++ b/vcl/source/filter/FilterConfigCache.hxx @@ -36,16 +36,12 @@ class FilterConfigCache OUString sType; css::uno::Sequence< OUString > lExtensionList; OUString sUIName; - OUString sDocumentService; - OUString sFilterService; - OUString sTemplateName; OUString sExternalFilterName; OUString sMediaType; OUString sFilterType; sal_Int32 nFlags; - sal_Int32 nFileFormatVersion; // user data OUString sFilterName; diff --git a/vcl/source/filter/wmf/winmtf.hxx b/vcl/source/filter/wmf/winmtf.hxx index af179ba3d844..087c3f2d5db1 100644 --- a/vcl/source/filter/wmf/winmtf.hxx +++ b/vcl/source/filter/wmf/winmtf.hxx @@ -449,8 +449,7 @@ struct SaveStruct WinMtfClipPath aClipPath; XForm aXForm; - bool bRecordPath; - bool bFillStyleSelected; + bool bFillStyleSelected; }; typedef std::shared_ptr<SaveStruct> SaveStructPtr; diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 13906b435b01..cea5b53bfe71 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -1741,7 +1741,6 @@ void PDFWriterImpl::PDFPage::appendWaveLine( sal_Int32 nWidth, sal_Int32 nY, sal m_aMapMode( MAP_POINT, Point(), Fraction( 1L, pointToPixel(1) ), Fraction( 1L, pointToPixel(1) ) ), m_nCurrentStructElement( 0 ), m_bEmitStructure( true ), - m_bNewMCID( false ), m_nNextFID( 1 ), m_nInheritedPageWidth( 595 ), // default A4 m_nInheritedPageHeight( 842 ), // default A4 diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx index 3d7bf48b334e..77b0d4700981 100644 --- a/vcl/source/gdi/pdfwriter_impl.hxx +++ b/vcl/source/gdi/pdfwriter_impl.hxx @@ -632,7 +632,6 @@ private: /* emit strucure marks currently (aka. NonStructElement or not) */ bool m_bEmitStructure; - bool m_bNewMCID; /* role map of struct tree root */ std::unordered_map< OString, OString, OStringHash > m_aRoleMap; diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx index 8f443ce5a252..558ff3b5eb55 100644 --- a/vcl/source/outdev/font.cxx +++ b/vcl/source/outdev/font.cxx @@ -711,9 +711,7 @@ void ImplDirectFontSubstitution::AddFontSubstitute( const OUString& rFontName, ImplFontSubstEntry::ImplFontSubstEntry( const OUString& rFontName, const OUString& rSubstFontName, AddFontSubstituteFlags nSubstFlags ) -: maName( rFontName ) -, maReplaceName( rSubstFontName ) -, mnFlags( nSubstFlags ) +: mnFlags( nSubstFlags ) { maSearchName = GetEnglishSearchFontName( rFontName ); maSearchReplaceName = GetEnglishSearchFontName( rSubstFontName ); diff --git a/vcl/source/window/btndlg.cxx b/vcl/source/window/btndlg.cxx index 6ad603ab1a76..59c0638546ba 100644 --- a/vcl/source/window/btndlg.cxx +++ b/vcl/source/window/btndlg.cxx @@ -29,7 +29,6 @@ struct ImplBtnDlgItem { sal_uInt16 mnId; bool mbOwnButton; - bool mbDummyAlign; long mnSepSize; VclPtr<PushButton> mpPushButton; }; diff --git a/vcl/source/window/menuitemlist.hxx b/vcl/source/window/menuitemlist.hxx index 3f7f8d2d6166..afc0bdc602ac 100644 --- a/vcl/source/window/menuitemlist.hxx +++ b/vcl/source/window/menuitemlist.hxx @@ -54,7 +54,6 @@ struct MenuItemData long nItemImageAngle; Size aSz; // only temporarily valid OUString aAccessibleName; // accessible name - OUString aAccessibleDescription; // accessible description SalMenuItem* pSalMenuItem; // access to native menu diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx index ef4cb769e18e..6e9f5bb0c76a 100644 --- a/vcl/source/window/winproc.cxx +++ b/vcl/source/window/winproc.cxx @@ -2437,9 +2437,6 @@ bool ImplWindowFrameProc( vcl::Window* _pWindow, SalFrame* /*pFrame*/, bRet = ImplHandleSalMouseButtonUp( pWindow, &aSalMouseEvent ); } break; - case SALEVENT_MOUSEACTIVATE: - bRet = false; - break; case SALEVENT_KEYINPUT: { SalKeyEvent const * pKeyEvt = static_cast<SalKeyEvent const *>(pEvent); diff --git a/vcl/unx/generic/app/saldata.cxx b/vcl/unx/generic/app/saldata.cxx index 8d5d0486158d..ceee7fc82c67 100644 --- a/vcl/unx/generic/app/saldata.cxx +++ b/vcl/unx/generic/app/saldata.cxx @@ -512,7 +512,6 @@ void X11SalData::XError( Display *pDisplay, XErrorEvent *pEvent ) struct YieldEntry { - YieldEntry* next; // pointer to next entry int fd; // file descriptor for reading void* data; // data for predicate and callback YieldFunc pending; // predicate (determins pending events) diff --git a/vcl/unx/generic/gdi/cairo_xlib_cairo.cxx b/vcl/unx/generic/gdi/cairo_xlib_cairo.cxx index 11d4e6cc19a1..f0514fb1acbb 100644 --- a/vcl/unx/generic/gdi/cairo_xlib_cairo.cxx +++ b/vcl/unx/generic/gdi/cairo_xlib_cairo.cxx @@ -63,8 +63,6 @@ namespace cairo hDrawable(0), pVisual(nullptr), nScreen(0), - nDepth(-1), - aColormap(-1), pRenderFormat(nullptr) {} @@ -73,8 +71,6 @@ namespace cairo hDrawable(pSysDat.hDrawable), pVisual(pSysDat.pVisual), nScreen(pSysDat.nScreen), - nDepth(pSysDat.nDepth), - aColormap(pSysDat.aColormap), pRenderFormat(pSysDat.pXRenderFormat) {} @@ -83,8 +79,6 @@ namespace cairo hDrawable(pSysDat.aWindow), pVisual(pSysDat.pVisual), nScreen(pSysDat.nScreen), - nDepth(pSysDat.nDepth), - aColormap(pSysDat.aColormap), pRenderFormat(nullptr) {} diff --git a/vcl/unx/generic/gdi/cairo_xlib_cairo.hxx b/vcl/unx/generic/gdi/cairo_xlib_cairo.hxx index 0ccf98a92aca..56cc9f07db85 100644 --- a/vcl/unx/generic/gdi/cairo_xlib_cairo.hxx +++ b/vcl/unx/generic/gdi/cairo_xlib_cairo.hxx @@ -42,8 +42,6 @@ namespace cairo { long hDrawable; // a drawable void* pVisual; // the visual in use int nScreen; // the current screen of the drawable - int nDepth; // depth of said visual - long aColormap; // the colormap being used void* pRenderFormat; // render format for drawable }; diff --git a/vcl/unx/generic/gdi/x11cairotextrender.cxx b/vcl/unx/generic/gdi/x11cairotextrender.cxx index 8734526193fd..bbdda88d36cd 100644 --- a/vcl/unx/generic/gdi/x11cairotextrender.cxx +++ b/vcl/unx/generic/gdi/x11cairotextrender.cxx @@ -36,7 +36,6 @@ struct BOX }; struct _XRegion { - long size; long numRects; BOX *rects; BOX extents; diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx index 4b873a96ec74..763d4430e5b4 100644 --- a/vcl/win/source/window/salframe.cxx +++ b/vcl/win/source/window/salframe.cxx @@ -3183,24 +3183,6 @@ static long ImplHandleMouseMsg( HWND hWnd, UINT nMsg, return nRet; } -static long ImplHandleMouseActivateMsg( HWND hWnd ) -{ - WinSalFrame* pFrame = GetWindowPtr( hWnd ); - if ( !pFrame ) - return 0; - - if ( pFrame->mbFloatWin ) - return TRUE; - - SalMouseActivateEvent aMouseActivateEvt; - POINT aPt; - GetCursorPos( &aPt ); - ScreenToClient( hWnd, &aPt ); - aMouseActivateEvt.mnX = aPt.x; - aMouseActivateEvt.mnY = aPt.y; - return pFrame->CallCallback( SALEVENT_MOUSEACTIVATE, &aMouseActivateEvt ); -} - static long ImplHandleWheelMsg( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam ) { DBG_ASSERT( nMsg == WM_MOUSEWHEEL || @@ -5533,17 +5515,6 @@ LRESULT CALLBACK SalFrameWndProc( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lP break; case WM_MOUSEACTIVATE: - if ( LOWORD( lParam ) == HTCLIENT ) - { - ImplSalYieldMutexAcquireWithWait(); - nRet = ImplHandleMouseActivateMsg( hWnd ); - ImplSalYieldMutexRelease(); - if ( nRet ) - { - nRet = MA_NOACTIVATE; - rDef = FALSE; - } - } break; case WM_KEYDOWN: |