include/vcl/vclevent.hxx | 4 ---- include/vcl/window.hxx | 1 - vcl/source/control/listbox.cxx | 5 +---- vcl/source/window/status.cxx | 2 -- vcl/source/window/window.cxx | 4 ---- 5 files changed, 1 insertion(+), 15 deletions(-)
New commits: commit f22f5a8a1c25d0a68d64d82bd824f5e153cf9959 Author: Noel Grandin <[email protected]> AuthorDate: Tue Dec 4 09:40:38 2018 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Wed Dec 5 07:52:02 2018 +0100 remove unused StateChangedType enum value Change-Id: I5b241e35af90cc5c0a2df15e596bb5d45f110e52 Reviewed-on: https://gerrit.libreoffice.org/64560 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index 60389e836aa9..02b59375423c 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -331,7 +331,6 @@ enum class StateChangedType : sal_uInt16 ControlForeground = 14, ControlBackground = 15, ReadOnly = 16, - ExtendedStyle = 17, Mirroring = 18, Layout = 19, ControlFocus = 20 diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index e57d446709d1..38cd829661d8 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -1948,7 +1948,6 @@ void Window::SetExtendedStyle( WindowExtendedStyle nExtendedStyle ) pWindow->ImplGetFrame()->SetExtendedFrameStyle( nExt ); } mpWindowImpl->mnExtendedStyle = nExtendedStyle; - CompatStateChanged( StateChangedType::ExtendedStyle ); } } commit 0adbc69c81cc287386b31b25b2dc89780933e2b1 Author: Noel Grandin <[email protected]> AuthorDate: Tue Dec 4 09:33:17 2018 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Wed Dec 5 07:51:48 2018 +0100 remove unused VclEventId enum values Change-Id: I7887a7de37a024f2e97dbd20a27a1aa3fdfcfbfa Reviewed-on: https://gerrit.libreoffice.org/64559 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/include/vcl/vclevent.hxx b/include/vcl/vclevent.hxx index 698fd038bbde..26cf1a681c2b 100644 --- a/include/vcl/vclevent.hxx +++ b/include/vcl/vclevent.hxx @@ -69,7 +69,6 @@ enum class VclEventId ListboxItemRemoved, // pData = itempos, -1=All ListboxScrolled, ListboxSelect, - ListboxStateUpdate, ListboxTreeFocus, ListboxTreeSelect, MenuActivate, @@ -102,8 +101,6 @@ enum class VclEventId SpinfieldLast, SpinfieldUp, StatusbarAllItemsRemoved, - StatusbarClick, - StatusbarDoubleClick, StatusbarDrawItem, // pData = itemid StatusbarHideItem, // pData = itemid StatusbarItemAdded, // pData = itemid @@ -143,7 +140,6 @@ enum class VclEventId ToolboxItemWindowChanged, ToolboxSelect, WindowActivate, - WindowChildCreated, // pData = vcl::Window* WindowChildDestroyed, // pData = vcl::Window* WindowClose, WindowCommand, // pData = CommandEvent* diff --git a/vcl/source/control/listbox.cxx b/vcl/source/control/listbox.cxx index e109e135d0d4..3a048a3fedb8 100644 --- a/vcl/source/control/listbox.cxx +++ b/vcl/source/control/listbox.cxx @@ -946,7 +946,6 @@ void ListBox::SetNoSelection() mpImplWin->SetImage( aImage ); mpImplWin->Invalidate(); } - CallEventListeners(VclEventId::ListboxStateUpdate); } sal_Int32 ListBox::InsertEntry( const OUString& rStr, sal_Int32 nPos ) @@ -1066,11 +1065,9 @@ void ListBox::SelectEntryPos( sal_Int32 nPos, bool bSelect ) if ( 0 <= nPos && nPos < mpImplLB->GetEntryList()->GetEntryCount() ) { - sal_Int32 oldSelectCount = GetSelectedEntryCount(), newSelectCount = 0, nCurrentPos = mpImplLB->GetCurrentPos(); + sal_Int32 newSelectCount = 0, nCurrentPos = mpImplLB->GetCurrentPos(); mpImplLB->SelectEntry( nPos + mpImplLB->GetEntryList()->GetMRUCount(), bSelect ); newSelectCount = GetSelectedEntryCount(); - if (oldSelectCount == 0 && newSelectCount > 0) - CallEventListeners(VclEventId::ListboxStateUpdate); //Only when bSelect == true, send both Selection & Focus events if (nCurrentPos != nPos && bSelect) { diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx index be83ef42282c..723ab9d07b4f 100644 --- a/vcl/source/window/status.cxx +++ b/vcl/source/window/status.cxx @@ -874,13 +874,11 @@ void StatusBar::DataChanged( const DataChangedEvent& rDCEvt ) void StatusBar::Click() { - CallEventListeners( VclEventId::StatusbarClick ); maClickHdl.Call( this ); } void StatusBar::DoubleClick() { - CallEventListeners( VclEventId::StatusbarDoubleClick ); maDoubleClickHdl.Call( this ); } diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 11fd8d5f482e..e57d446709d1 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -1159,9 +1159,6 @@ void Window::ImplInit( vcl::Window* pParent, WinBits nStyle, SystemParentData* p // calculate app font res (except for the Intro Window or the default window) if ( mpWindowImpl->mbFrame && !pSVData->maGDIData.mnAppFontX && ! (nStyle & (WB_INTROWIN|WB_DEFAULTWIN)) ) ImplInitAppFontData( this ); - - if ( GetAccessibleParentWindow() && GetParent() != Application::GetDefDialogParent() ) - GetAccessibleParentWindow()->CallEventListeners( VclEventId::WindowChildCreated, this ); } void Window::ImplInitAppFontData( vcl::Window const * pWindow ) _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
