[Libreoffice-commits] core.git: 2 commits - framework/source include/vcl sfx2/source svtools/source sw/uiconfig vcl/source
Caolán McNamara
caolanm at redhat.com
Wed Jan 14 12:31:22 PST 2015
framework/source/classes/fwktabwindow.cxx | 2 -
include/vcl/window.hxx | 1
sfx2/source/dialog/infobar.cxx | 4 +-
svtools/source/contnr/svtabbx.cxx | 2 -
svtools/source/table/tablecontrol.cxx | 2 -
sw/uiconfig/sglobal/toolbar/drawbar.xml | 6 +--
sw/uiconfig/swform/toolbar/drawbar.xml | 6 +--
sw/uiconfig/swreport/toolbar/drawbar.xml | 6 +--
sw/uiconfig/swriter/toolbar/drawbar.xml | 6 +--
sw/uiconfig/swxform/toolbar/drawbar.xml | 6 +--
vcl/source/control/combobox.cxx | 20 ++++++------
vcl/source/control/ctrl.cxx | 2 -
vcl/source/control/edit.cxx | 18 +++++-----
vcl/source/control/lstbox.cxx | 30 +++++++++---------
vcl/source/control/tabctrl.cxx | 12 +++----
vcl/source/window/accessibility.cxx | 2 -
vcl/source/window/dialog.cxx | 2 -
vcl/source/window/dockmgr.cxx | 12 +++----
vcl/source/window/dockwin.cxx | 2 -
vcl/source/window/event.cxx | 37 +++++++---------------
vcl/source/window/paint.cxx | 2 -
vcl/source/window/settings.cxx | 2 -
vcl/source/window/stacking.cxx | 2 -
vcl/source/window/status.cxx | 18 +++++-----
vcl/source/window/syswin.cxx | 6 +--
vcl/source/window/toolbox.cxx | 12 +++----
vcl/source/window/toolbox2.cxx | 50 +++++++++++++++---------------
vcl/source/window/window.cxx | 26 +++++++--------
28 files changed, 142 insertions(+), 154 deletions(-)
New commits:
commit c0948f29ebd61a232406c30c306d7d8b23a596a6
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Jan 14 16:55:02 2015 +0000
Use the same advanced Ellipse and Rectangle shapes in writer as draw
i.e. reconcile writer with draw/impress wrt.
commit 0e9faf7a0f8c76b50d9a9354d5fab5d1ad4af821
Author: Petr Mladek <pmladek at suse.cz>
Date: Fri Apr 22 16:51:58 2011 +0200
sd-toolbar-advanced-shapes.diff: used advanced Ellipse and Rectangle shapes
they allow to wrap text according to the shape which is a very nice
feature (bnc#171052)
Change-Id: I0bddfe65030f3515bcb5a30f2886d3ad17a72b0d
diff --git a/sw/uiconfig/sglobal/toolbar/drawbar.xml b/sw/uiconfig/sglobal/toolbar/drawbar.xml
index 8731a05..b31c198 100644
--- a/sw/uiconfig/sglobal/toolbar/drawbar.xml
+++ b/sw/uiconfig/sglobal/toolbar/drawbar.xml
@@ -21,8 +21,8 @@
<toolbar:toolbaritem xlink:href=".uno:SelectObject" toolbar:helpid="10128"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:Line" toolbar:helpid="10102"/>
- <toolbar:toolbaritem xlink:href=".uno:Rect" toolbar:helpid="10104"/>
- <toolbar:toolbaritem xlink:href=".uno:Ellipse" toolbar:helpid="10110"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.rectangle" toolbar:helpid="10104"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ellipse" toolbar:helpid="10110"/>
<toolbar:toolbaritem xlink:href=".uno:Polygon_Unfilled" toolbar:visible="false" toolbar:helpid="10395"/>
<toolbar:toolbaritem xlink:href=".uno:Bezier_Unfilled" toolbar:visible="false" toolbar:helpid="10397"/>
<toolbar:toolbaritem xlink:href=".uno:Freeline_Unfilled" toolbar:helpid="10464"/>
@@ -48,4 +48,4 @@
<toolbar:toolbaritem xlink:href=".uno:InsertGraphic" toolbar:helpid="10241"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:ExtrusionToggle" toolbar:helpid="10960"/>
-</toolbar:toolbar>
\ No newline at end of file
+</toolbar:toolbar>
diff --git a/sw/uiconfig/swform/toolbar/drawbar.xml b/sw/uiconfig/swform/toolbar/drawbar.xml
index 8731a05..b31c198 100644
--- a/sw/uiconfig/swform/toolbar/drawbar.xml
+++ b/sw/uiconfig/swform/toolbar/drawbar.xml
@@ -21,8 +21,8 @@
<toolbar:toolbaritem xlink:href=".uno:SelectObject" toolbar:helpid="10128"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:Line" toolbar:helpid="10102"/>
- <toolbar:toolbaritem xlink:href=".uno:Rect" toolbar:helpid="10104"/>
- <toolbar:toolbaritem xlink:href=".uno:Ellipse" toolbar:helpid="10110"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.rectangle" toolbar:helpid="10104"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ellipse" toolbar:helpid="10110"/>
<toolbar:toolbaritem xlink:href=".uno:Polygon_Unfilled" toolbar:visible="false" toolbar:helpid="10395"/>
<toolbar:toolbaritem xlink:href=".uno:Bezier_Unfilled" toolbar:visible="false" toolbar:helpid="10397"/>
<toolbar:toolbaritem xlink:href=".uno:Freeline_Unfilled" toolbar:helpid="10464"/>
@@ -48,4 +48,4 @@
<toolbar:toolbaritem xlink:href=".uno:InsertGraphic" toolbar:helpid="10241"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:ExtrusionToggle" toolbar:helpid="10960"/>
-</toolbar:toolbar>
\ No newline at end of file
+</toolbar:toolbar>
diff --git a/sw/uiconfig/swreport/toolbar/drawbar.xml b/sw/uiconfig/swreport/toolbar/drawbar.xml
index 8731a05..b31c198 100644
--- a/sw/uiconfig/swreport/toolbar/drawbar.xml
+++ b/sw/uiconfig/swreport/toolbar/drawbar.xml
@@ -21,8 +21,8 @@
<toolbar:toolbaritem xlink:href=".uno:SelectObject" toolbar:helpid="10128"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:Line" toolbar:helpid="10102"/>
- <toolbar:toolbaritem xlink:href=".uno:Rect" toolbar:helpid="10104"/>
- <toolbar:toolbaritem xlink:href=".uno:Ellipse" toolbar:helpid="10110"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.rectangle" toolbar:helpid="10104"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ellipse" toolbar:helpid="10110"/>
<toolbar:toolbaritem xlink:href=".uno:Polygon_Unfilled" toolbar:visible="false" toolbar:helpid="10395"/>
<toolbar:toolbaritem xlink:href=".uno:Bezier_Unfilled" toolbar:visible="false" toolbar:helpid="10397"/>
<toolbar:toolbaritem xlink:href=".uno:Freeline_Unfilled" toolbar:helpid="10464"/>
@@ -48,4 +48,4 @@
<toolbar:toolbaritem xlink:href=".uno:InsertGraphic" toolbar:helpid="10241"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:ExtrusionToggle" toolbar:helpid="10960"/>
-</toolbar:toolbar>
\ No newline at end of file
+</toolbar:toolbar>
diff --git a/sw/uiconfig/swriter/toolbar/drawbar.xml b/sw/uiconfig/swriter/toolbar/drawbar.xml
index 8731a05..b31c198 100644
--- a/sw/uiconfig/swriter/toolbar/drawbar.xml
+++ b/sw/uiconfig/swriter/toolbar/drawbar.xml
@@ -21,8 +21,8 @@
<toolbar:toolbaritem xlink:href=".uno:SelectObject" toolbar:helpid="10128"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:Line" toolbar:helpid="10102"/>
- <toolbar:toolbaritem xlink:href=".uno:Rect" toolbar:helpid="10104"/>
- <toolbar:toolbaritem xlink:href=".uno:Ellipse" toolbar:helpid="10110"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.rectangle" toolbar:helpid="10104"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ellipse" toolbar:helpid="10110"/>
<toolbar:toolbaritem xlink:href=".uno:Polygon_Unfilled" toolbar:visible="false" toolbar:helpid="10395"/>
<toolbar:toolbaritem xlink:href=".uno:Bezier_Unfilled" toolbar:visible="false" toolbar:helpid="10397"/>
<toolbar:toolbaritem xlink:href=".uno:Freeline_Unfilled" toolbar:helpid="10464"/>
@@ -48,4 +48,4 @@
<toolbar:toolbaritem xlink:href=".uno:InsertGraphic" toolbar:helpid="10241"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:ExtrusionToggle" toolbar:helpid="10960"/>
-</toolbar:toolbar>
\ No newline at end of file
+</toolbar:toolbar>
diff --git a/sw/uiconfig/swxform/toolbar/drawbar.xml b/sw/uiconfig/swxform/toolbar/drawbar.xml
index 8731a05..b31c198 100644
--- a/sw/uiconfig/swxform/toolbar/drawbar.xml
+++ b/sw/uiconfig/swxform/toolbar/drawbar.xml
@@ -21,8 +21,8 @@
<toolbar:toolbaritem xlink:href=".uno:SelectObject" toolbar:helpid="10128"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:Line" toolbar:helpid="10102"/>
- <toolbar:toolbaritem xlink:href=".uno:Rect" toolbar:helpid="10104"/>
- <toolbar:toolbaritem xlink:href=".uno:Ellipse" toolbar:helpid="10110"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.rectangle" toolbar:helpid="10104"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ellipse" toolbar:helpid="10110"/>
<toolbar:toolbaritem xlink:href=".uno:Polygon_Unfilled" toolbar:visible="false" toolbar:helpid="10395"/>
<toolbar:toolbaritem xlink:href=".uno:Bezier_Unfilled" toolbar:visible="false" toolbar:helpid="10397"/>
<toolbar:toolbaritem xlink:href=".uno:Freeline_Unfilled" toolbar:helpid="10464"/>
@@ -48,4 +48,4 @@
<toolbar:toolbaritem xlink:href=".uno:InsertGraphic" toolbar:helpid="10241"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:ExtrusionToggle" toolbar:helpid="10960"/>
-</toolbar:toolbar>
\ No newline at end of file
+</toolbar:toolbar>
commit 06983ef3c00c5755ef3369c1149c10ba8d3f4d4b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Jan 14 14:52:04 2015 +0000
do TODO: replace ImplCallEventListeners() by CallEventListeners() in vcl
Change-Id: If47baad0ec31f18fcb55c7db86fb2a316dd0807f
diff --git a/framework/source/classes/fwktabwindow.cxx b/framework/source/classes/fwktabwindow.cxx
index 9ce7abf..b01cf41 100644
--- a/framework/source/classes/fwktabwindow.cxx
+++ b/framework/source/classes/fwktabwindow.cxx
@@ -56,7 +56,7 @@ FwkTabControl::FwkTabControl(vcl::Window* pParent)
void FwkTabControl::BroadcastEvent( sal_uLong nEvent )
{
if ( VCLEVENT_TABPAGE_ACTIVATE == nEvent || VCLEVENT_TABPAGE_DEACTIVATE == nEvent )
- ImplCallEventListeners( nEvent, reinterpret_cast<void*>(GetCurPageId()) );
+ CallEventListeners( nEvent, reinterpret_cast<void*>(GetCurPageId()) );
else
{
SAL_WARN( "fwk", "FwkTabControl::BroadcastEvent(): illegal event" );
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 5ced134..c021333 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -663,7 +663,6 @@ protected:
void SetCompoundControl( bool bCompound );
- void ImplCallEventListeners( sal_uLong nEvent, void* pData = NULL );
void CallEventListeners( sal_uLong nEvent, void* pData = NULL );
void FireVclEvent( VclSimpleEvent* pEvent );
diff --git a/sfx2/source/dialog/infobar.cxx b/sfx2/source/dialog/infobar.cxx
index f530456..30fda30 100644
--- a/sfx2/source/dialog/infobar.cxx
+++ b/sfx2/source/dialog/infobar.cxx
@@ -71,7 +71,7 @@ void SfxCloseButton::Paint(const Rectangle&)
const Rectangle aRect(Point(0, 0), PixelToLogic(GetSizePixel()));
- Primitive2DSequence aSeq(2);
+ drawinglayer::primitive2d::Primitive2DSequence aSeq(2);
BColor aLightColor;
BColor aDarkColor;
@@ -154,7 +154,7 @@ void SfxInfoBarWindow::Paint(const Rectangle& rPaintRect)
const Rectangle aRect(Point(0, 0), PixelToLogic(GetSizePixel()));
- Primitive2DSequence aSeq(2);
+ drawinglayer::primitive2d::Primitive2DSequence aSeq(2);
BColor aLightColor;
BColor aDarkColor;
diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx
index 5c00f09..d19082c 100644
--- a/svtools/source/contnr/svtabbx.cxx
+++ b/svtools/source/contnr/svtabbx.cxx
@@ -328,7 +328,7 @@ void SvTabListBox::SetEntryText(const OUString& rStr, SvTreeListEntry* pEntry, s
GetModel()->InvalidateEntry( pEntry );
TabListBoxEventData* pData = new TabListBoxEventData( pEntry, nTextColumn, sOldText );
- ImplCallEventListeners( VCLEVENT_TABLECELL_NAMECHANGED, pData );
+ CallEventListeners( VCLEVENT_TABLECELL_NAMECHANGED, pData );
delete pData;
}
diff --git a/svtools/source/table/tablecontrol.cxx b/svtools/source/table/tablecontrol.cxx
index eefe81a..de59f68 100644
--- a/svtools/source/table/tablecontrol.cxx
+++ b/svtools/source/table/tablecontrol.cxx
@@ -64,7 +64,7 @@ namespace svt { namespace table
TableControl::~TableControl()
{
- ImplCallEventListeners( VCLEVENT_OBJECT_DYING );
+ CallEventListeners( VCLEVENT_OBJECT_DYING );
m_pImpl->setModel( PTableModel() );
m_pImpl->disposeAccessible();
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 44be889f..16d1ccc 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -240,7 +240,7 @@ bool ComboBox::IsAutocompleteEnabled() const
void ComboBox::ImplClickButtonHandler( ImplBtn* )
{
- ImplCallEventListeners( VCLEVENT_DROPDOWN_PRE_OPEN );
+ CallEventListeners( VCLEVENT_DROPDOWN_PRE_OPEN );
mpSubEdit->GrabFocus();
if ( !mpImplLB->GetEntryList()->GetMRUCount() )
ImplUpdateFloatSelection();
@@ -249,7 +249,7 @@ void ComboBox::ImplClickButtonHandler( ImplBtn* )
mpBtn->SetPressed( true );
SetSelection( Selection( 0, SELECTION_MAX ) );
mpFloatWin->StartFloat( true );
- ImplCallEventListeners( VCLEVENT_DROPDOWN_OPEN );
+ CallEventListeners( VCLEVENT_DROPDOWN_OPEN );
ImplClearLayoutData();
if( mpImplLB )
@@ -275,7 +275,7 @@ IMPL_LINK_NOARG(ComboBox, ImplPopupModeEndHdl)
mpImplLB->GetMainWindow().ImplClearLayoutData();
mpBtn->SetPressed( false );
- ImplCallEventListeners( VCLEVENT_DROPDOWN_CLOSE );
+ CallEventListeners( VCLEVENT_DROPDOWN_CLOSE );
return 0;
}
@@ -427,7 +427,7 @@ IMPL_LINK_NOARG(ComboBox, ImplSelectHdl)
IMPL_LINK( ComboBox, ImplListItemSelectHdl, void*, EMPTYARG )
{
- ImplCallEventListeners( VCLEVENT_DROPDOWN_SELECT );
+ CallEventListeners( VCLEVENT_DROPDOWN_SELECT );
return 1;
}
@@ -469,11 +469,11 @@ void ComboBox::ToggleDropDown()
ImplUpdateFloatSelection();
else
mpImplLB->SelectEntry( 0 , true );
- ImplCallEventListeners( VCLEVENT_DROPDOWN_PRE_OPEN );
+ CallEventListeners( VCLEVENT_DROPDOWN_PRE_OPEN );
mpBtn->SetPressed( true );
SetSelection( Selection( 0, SELECTION_MAX ) );
mpFloatWin->StartFloat( true );
- ImplCallEventListeners( VCLEVENT_DROPDOWN_OPEN );
+ CallEventListeners( VCLEVENT_DROPDOWN_OPEN );
}
}
}
@@ -708,13 +708,13 @@ bool ComboBox::Notify( NotifyEvent& rNEvt )
ImplUpdateFloatSelection();
if( ( nKeyCode == KEY_DOWN ) && mpFloatWin && !mpFloatWin->IsInPopupMode() && aKeyEvt.GetKeyCode().IsMod2() )
{
- ImplCallEventListeners( VCLEVENT_DROPDOWN_PRE_OPEN );
+ CallEventListeners( VCLEVENT_DROPDOWN_PRE_OPEN );
mpBtn->SetPressed( true );
if ( mpImplLB->GetEntryList()->GetMRUCount() )
mpImplLB->SelectEntry( 0 , true );
SetSelection( Selection( 0, SELECTION_MAX ) );
mpFloatWin->StartFloat( false );
- ImplCallEventListeners( VCLEVENT_DROPDOWN_OPEN );
+ CallEventListeners( VCLEVENT_DROPDOWN_OPEN );
nDone = true;
}
else if( ( nKeyCode == KEY_UP ) && mpFloatWin && mpFloatWin->IsInPopupMode() && aKeyEvt.GetKeyCode().IsMod2() )
@@ -775,7 +775,7 @@ bool ComboBox::Notify( NotifyEvent& rNEvt )
void ComboBox::SetText( const OUString& rStr )
{
- ImplCallEventListeners( VCLEVENT_COMBOBOX_SETTEXT );
+ CallEventListeners( VCLEVENT_COMBOBOX_SETTEXT );
Edit::SetText( rStr );
ImplUpdateFloatSelection();
@@ -783,7 +783,7 @@ void ComboBox::SetText( const OUString& rStr )
void ComboBox::SetText( const OUString& rStr, const Selection& rNewSelection )
{
- ImplCallEventListeners( VCLEVENT_COMBOBOX_SETTEXT );
+ CallEventListeners( VCLEVENT_COMBOBOX_SETTEXT );
Edit::SetText( rStr, rNewSelection );
ImplUpdateFloatSelection();
diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx
index 612bf94..411243c 100644
--- a/vcl/source/control/ctrl.cxx
+++ b/vcl/source/control/ctrl.cxx
@@ -316,7 +316,7 @@ bool Control::ImplCallEventListenersAndHandler( sal_uLong nEvent, const Link& r
ImplDelData aCheckDelete;
ImplAddDel( &aCheckDelete );
- ImplCallEventListeners( nEvent );
+ CallEventListeners( nEvent );
if ( !aCheckDelete.IsDead() )
{
rHandler.Call( pCaller );
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index d525fe8..1bd807c 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -938,7 +938,7 @@ void Edit::ImplSetText( const OUString& rText, const Selection* pNewSelection )
else
ImplInsertText( rText, pNewSelection );
- ImplCallEventListeners( VCLEVENT_EDIT_MODIFY );
+ CallEventListeners( VCLEVENT_EDIT_MODIFY );
}
}
@@ -1893,9 +1893,9 @@ void Edit::GetFocus()
maSelection.Max() = maText.getLength();
}
if ( mbIsSubEdit )
- static_cast<Edit*>(GetParent())->ImplCallEventListeners( VCLEVENT_EDIT_SELECTIONCHANGED );
+ static_cast<Edit*>(GetParent())->CallEventListeners( VCLEVENT_EDIT_SELECTIONCHANGED );
else
- ImplCallEventListeners( VCLEVENT_EDIT_SELECTIONCHANGED );
+ CallEventListeners( VCLEVENT_EDIT_SELECTIONCHANGED );
}
ImplShowCursor();
@@ -2389,7 +2389,7 @@ void Edit::Modify()
return;
// #i13677# notify edit listeners about caret position change
- ImplCallEventListeners( VCLEVENT_EDIT_CARETCHANGED );
+ CallEventListeners( VCLEVENT_EDIT_CARETCHANGED );
// FIXME: this is currently only on OS X
// check for other platforms that need similar handling
if( ImplGetSVData()->maNWFData.mbNoFocusRects &&
@@ -2533,22 +2533,22 @@ void Edit::ImplSetSelection( const Selection& rSelection, bool bPaint )
if (bSelection)
{
if ( mbIsSubEdit )
- static_cast<Edit*>(GetParent())->ImplCallEventListeners( VCLEVENT_EDIT_SELECTIONCHANGED );
+ static_cast<Edit*>(GetParent())->CallEventListeners( VCLEVENT_EDIT_SELECTIONCHANGED );
else
- ImplCallEventListeners( VCLEVENT_EDIT_SELECTIONCHANGED );
+ CallEventListeners( VCLEVENT_EDIT_SELECTIONCHANGED );
}
if (bCaret)
{
if ( mbIsSubEdit )
- static_cast<Edit*>(GetParent())->ImplCallEventListeners( VCLEVENT_EDIT_CARETCHANGED );
+ static_cast<Edit*>(GetParent())->CallEventListeners( VCLEVENT_EDIT_CARETCHANGED );
else
- ImplCallEventListeners( VCLEVENT_EDIT_CARETCHANGED );
+ CallEventListeners( VCLEVENT_EDIT_CARETCHANGED );
}
// #103511# notify combobox listeners of deselection
if( !maSelection && GetParent() && GetParent()->GetType() == WINDOW_COMBOBOX )
- static_cast<Edit*>(GetParent())->ImplCallEventListeners( VCLEVENT_COMBOBOX_DESELECT );
+ static_cast<Edit*>(GetParent())->CallEventListeners( VCLEVENT_COMBOBOX_DESELECT );
}
}
}
diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx
index 4b91edd..9c6f990 100644
--- a/vcl/source/control/lstbox.cxx
+++ b/vcl/source/control/lstbox.cxx
@@ -70,7 +70,7 @@ ListBox::ListBox( vcl::Window* pParent, const ResId& rResId ) :
ListBox::~ListBox()
{
- ImplCallEventListeners( VCLEVENT_OBJECT_DYING );
+ CallEventListeners( VCLEVENT_OBJECT_DYING );
// When destroying the FloatWin TH does a GrabFocus to the Parent:
// that means this "ListBox => PreNotify() ..."
@@ -238,19 +238,19 @@ IMPL_LINK_NOARG(ListBox, ImplSelectHdl)
IMPL_LINK( ListBox, ImplFocusHdl, void *, nPos )
{
- ImplCallEventListeners( VCLEVENT_LISTBOX_FOCUS , nPos);
+ CallEventListeners( VCLEVENT_LISTBOX_FOCUS , nPos);
return 1;
}
IMPL_LINK( ListBox, ImplListItemSelectHdl, void*, EMPTYARG )
{
- ImplCallEventListeners( VCLEVENT_DROPDOWN_SELECT );
+ CallEventListeners( VCLEVENT_DROPDOWN_SELECT );
return 1;
}
IMPL_LINK_NOARG(ListBox, ImplScrollHdl)
{
- ImplCallEventListeners( VCLEVENT_LISTBOX_SCROLLED );
+ CallEventListeners( VCLEVENT_LISTBOX_SCROLLED );
return 1;
}
@@ -303,11 +303,11 @@ void ListBox::ImplClickButtonHandler( Control* )
{
if( !mpFloatWin->IsInPopupMode() )
{
- ImplCallEventListeners( VCLEVENT_DROPDOWN_PRE_OPEN );
+ CallEventListeners( VCLEVENT_DROPDOWN_PRE_OPEN );
mpImplWin->GrabFocus();
mpBtn->SetPressed( true );
mpFloatWin->StartFloat( true );
- ImplCallEventListeners( VCLEVENT_DROPDOWN_OPEN );
+ CallEventListeners( VCLEVENT_DROPDOWN_OPEN );
ImplClearLayoutData();
if( mpImplLB )
@@ -346,7 +346,7 @@ IMPL_LINK_NOARG(ListBox, ImplPopupModeEndHdl)
mpImplWin->ImplClearLayoutData();
mpBtn->SetPressed( false );
- ImplCallEventListeners( VCLEVENT_DROPDOWN_CLOSE );
+ CallEventListeners( VCLEVENT_DROPDOWN_CLOSE );
return 0;
}
@@ -358,11 +358,11 @@ void ListBox::ToggleDropDown()
mpFloatWin->EndPopupMode();
else
{
- ImplCallEventListeners( VCLEVENT_DROPDOWN_PRE_OPEN );
+ CallEventListeners( VCLEVENT_DROPDOWN_PRE_OPEN );
mpImplWin->GrabFocus();
mpBtn->SetPressed( true );
mpFloatWin->StartFloat( true );
- ImplCallEventListeners( VCLEVENT_DROPDOWN_OPEN );
+ CallEventListeners( VCLEVENT_DROPDOWN_OPEN );
}
}
}
@@ -888,10 +888,10 @@ bool ListBox::PreNotify( NotifyEvent& rNEvt )
if( mpFloatWin && !mpFloatWin->IsInPopupMode() &&
aKeyEvt.GetKeyCode().IsMod2() )
{
- ImplCallEventListeners( VCLEVENT_DROPDOWN_PRE_OPEN );
+ CallEventListeners( VCLEVENT_DROPDOWN_PRE_OPEN );
mpBtn->SetPressed( true );
mpFloatWin->StartFloat( false );
- ImplCallEventListeners( VCLEVENT_DROPDOWN_OPEN );
+ CallEventListeners( VCLEVENT_DROPDOWN_OPEN );
nDone = true;
}
else
@@ -993,7 +993,7 @@ void ListBox::SetNoSelection()
mpImplWin->SetImage( aImage );
mpImplWin->Invalidate();
}
- ImplCallEventListeners(VCLEVENT_LISTBOX_STATEUPDATE);
+ CallEventListeners(VCLEVENT_LISTBOX_STATEUPDATE);
}
sal_Int32 ListBox::InsertEntry( const OUString& rStr, sal_Int32 nPos )
@@ -1101,13 +1101,13 @@ void ListBox::SelectEntryPos( sal_Int32 nPos, bool bSelect )
mpImplLB->SelectEntry( nPos + mpImplLB->GetEntryList()->GetMRUCount(), bSelect );
newSelectCount = GetSelectEntryCount();
if (oldSelectCount == 0 && newSelectCount > 0)
- ImplCallEventListeners(VCLEVENT_LISTBOX_STATEUPDATE);
+ CallEventListeners(VCLEVENT_LISTBOX_STATEUPDATE);
//Only when bSelect == true, send both Selection & Focus events
if (nCurrentPos != nPos && bSelect)
{
- ImplCallEventListeners( VCLEVENT_LISTBOX_SELECT, reinterpret_cast<void*>(nPos));
+ CallEventListeners( VCLEVENT_LISTBOX_SELECT, reinterpret_cast<void*>(nPos));
if (HasFocus())
- ImplCallEventListeners( VCLEVENT_LISTBOX_FOCUS, reinterpret_cast<void*>(nPos));
+ CallEventListeners( VCLEVENT_LISTBOX_FOCUS, reinterpret_cast<void*>(nPos));
}
}
}
diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index 27f5179..3a8f572 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -1664,7 +1664,7 @@ void TabControl::InsertPage( sal_uInt16 nPageId, const OUString& rText,
if( mpTabCtrlData->mpListBox ) // reposition/resize listbox
Resize();
- ImplCallEventListeners( VCLEVENT_TABPAGE_INSERTED, reinterpret_cast<void*>(nPageId) );
+ CallEventListeners( VCLEVENT_TABPAGE_INSERTED, reinterpret_cast<void*>(nPageId) );
}
void TabControl::RemovePage( sal_uInt16 nPageId )
@@ -1709,7 +1709,7 @@ void TabControl::RemovePage( sal_uInt16 nPageId )
ImplFreeLayoutData();
- ImplCallEventListeners( VCLEVENT_TABPAGE_REMOVED, reinterpret_cast<void*>(nPageId) );
+ CallEventListeners( VCLEVENT_TABPAGE_REMOVED, reinterpret_cast<void*>(nPageId) );
}
}
@@ -1727,7 +1727,7 @@ void TabControl::Clear()
if ( IsUpdateMode() )
Invalidate();
- ImplCallEventListeners( VCLEVENT_TABPAGE_REMOVEDALL );
+ CallEventListeners( VCLEVENT_TABPAGE_REMOVEDALL );
}
void TabControl::EnablePage( sal_uInt16 i_nPageId, bool i_bEnable )
@@ -1859,7 +1859,7 @@ void TabControl::SelectTabPage( sal_uInt16 nPageId )
{
ImplFreeLayoutData();
- ImplCallEventListeners( VCLEVENT_TABPAGE_DEACTIVATE, reinterpret_cast<void*>(mnCurPageId) );
+ CallEventListeners( VCLEVENT_TABPAGE_DEACTIVATE, reinterpret_cast<void*>(mnCurPageId) );
if ( DeactivatePage() )
{
mnActPageId = nPageId;
@@ -1870,7 +1870,7 @@ void TabControl::SelectTabPage( sal_uInt16 nPageId )
SetCurPageId( nPageId );
if( mpTabCtrlData->mpListBox )
mpTabCtrlData->mpListBox->SelectEntryPos( GetPagePos( nPageId ) );
- ImplCallEventListeners( VCLEVENT_TABPAGE_ACTIVATE, reinterpret_cast<void*>(nPageId) );
+ CallEventListeners( VCLEVENT_TABPAGE_ACTIVATE, reinterpret_cast<void*>(nPageId) );
}
}
}
@@ -1930,7 +1930,7 @@ void TabControl::SetPageText( sal_uInt16 nPageId, const OUString& rText )
if ( IsUpdateMode() )
Invalidate();
ImplFreeLayoutData();
- ImplCallEventListeners( VCLEVENT_TABPAGE_PAGETEXTCHANGED, reinterpret_cast<void*>(nPageId) );
+ CallEventListeners( VCLEVENT_TABPAGE_PAGETEXTCHANGED, reinterpret_cast<void*>(nPageId) );
}
}
diff --git a/vcl/source/window/accessibility.cxx b/vcl/source/window/accessibility.cxx
index 49c95ac..9a662f9 100644
--- a/vcl/source/window/accessibility.cxx
+++ b/vcl/source/window/accessibility.cxx
@@ -520,7 +520,7 @@ void Window::SetAccessibleName( const OUString& rName )
delete mpWindowImpl->mpAccessibleInfos->pAccessibleName;
mpWindowImpl->mpAccessibleInfos->pAccessibleName = new OUString( rName );
- ImplCallEventListeners( VCLEVENT_WINDOW_FRAMETITLECHANGED, &oldName );
+ CallEventListeners( VCLEVENT_WINDOW_FRAMETITLECHANGED, &oldName );
}
OUString Window::GetAccessibleName() const
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 90260bf..a5b9b8f 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -666,7 +666,7 @@ bool Dialog::Close()
{
ImplDelData aDelData;
ImplAddDel( &aDelData );
- ImplCallEventListeners( VCLEVENT_WINDOW_CLOSE );
+ CallEventListeners( VCLEVENT_WINDOW_CLOSE );
if ( aDelData.IsDead() )
return false;
ImplRemoveDel( &aDelData );
diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx
index 722b96d..c2d4b9c 100644
--- a/vcl/source/window/dockmgr.cxx
+++ b/vcl/source/window/dockmgr.cxx
@@ -978,7 +978,7 @@ void ImplDockingWindowWrapper::StartDocking( const Point& rPoint, Rectangle& rRe
{
DockingData data( rPoint, rRect, IsFloatingMode() );
- GetWindow()->ImplCallEventListeners( VCLEVENT_WINDOW_STARTDOCKING, &data );
+ GetWindow()->CallEventListeners( VCLEVENT_WINDOW_STARTDOCKING, &data );
mbDocking = true;
}
@@ -986,7 +986,7 @@ bool ImplDockingWindowWrapper::Docking( const Point& rPoint, Rectangle& rRect )
{
DockingData data( rPoint, rRect, IsFloatingMode() );
- GetWindow()->ImplCallEventListeners( VCLEVENT_WINDOW_DOCKING, &data );
+ GetWindow()->CallEventListeners( VCLEVENT_WINDOW_DOCKING, &data );
rRect = data.maTrackRect;
return data.mbFloating;
}
@@ -1022,7 +1022,7 @@ void ImplDockingWindowWrapper::EndDocking( const Rectangle& rRect, bool bFloatMo
}
EndDockingData data( aRect, IsFloatingMode(), IsDockingCanceled() );
- GetWindow()->ImplCallEventListeners( VCLEVENT_WINDOW_ENDDOCKING, &data );
+ GetWindow()->CallEventListeners( VCLEVENT_WINDOW_ENDDOCKING, &data );
mbDocking = false;
@@ -1033,7 +1033,7 @@ void ImplDockingWindowWrapper::EndDocking( const Rectangle& rRect, bool bFloatMo
bool ImplDockingWindowWrapper::PrepareToggleFloatingMode()
{
bool bFloating = true;
- GetWindow()->ImplCallEventListeners( VCLEVENT_WINDOW_PREPARETOGGLEFLOATING, &bFloating );
+ GetWindow()->CallEventListeners( VCLEVENT_WINDOW_PREPARETOGGLEFLOATING, &bFloating );
return bFloating;
}
@@ -1052,7 +1052,7 @@ void ImplDockingWindowWrapper::ToggleFloatingMode()
static_cast<DockingWindow*>(GetWindow())->ToggleFloatingMode();
// now notify listeners
- GetWindow()->ImplCallEventListeners( VCLEVENT_WINDOW_TOGGLEFLOATING );
+ GetWindow()->CallEventListeners( VCLEVENT_WINDOW_TOGGLEFLOATING );
// must be enabled in Window::Notify to prevent permanent docking during mouse move
mbStartDockingEnabled = false;
@@ -1198,7 +1198,7 @@ IMPL_LINK_NOARG(ImplDockingWindowWrapper, PopupModeEnd)
mpFloatWin = NULL;
// call handler - which will destroy the window and thus the wrapper as well !
- GetWindow()->ImplCallEventListeners( VCLEVENT_WINDOW_ENDPOPUPMODE, &aData );
+ GetWindow()->CallEventListeners( VCLEVENT_WINDOW_ENDPOPUPMODE, &aData );
return 0;
}
diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx
index cdc6084..934ed29 100644
--- a/vcl/source/window/dockwin.cxx
+++ b/vcl/source/window/dockwin.cxx
@@ -687,7 +687,7 @@ bool DockingWindow::Close()
{
ImplDelData aDelData;
ImplAddDel( &aDelData );
- ImplCallEventListeners( VCLEVENT_WINDOW_CLOSE );
+ CallEventListeners( VCLEVENT_WINDOW_CLOSE );
if ( aDelData.IsDead() )
return false;
ImplRemoveDel( &aDelData );
diff --git a/vcl/source/window/event.cxx b/vcl/source/window/event.cxx
index 091165c51..da38fde 100644
--- a/vcl/source/window/event.cxx
+++ b/vcl/source/window/event.cxx
@@ -67,7 +67,7 @@ bool Window::PreNotify( NotifyEvent& rNEvt )
}
if ( bCompoundFocusChanged || ( rNEvt.GetWindow() == this ) )
- ImplCallEventListeners( VCLEVENT_WINDOW_GETFOCUS );
+ CallEventListeners( VCLEVENT_WINDOW_GETFOCUS );
}
else if( rNEvt.GetType() == MouseNotifyEvent::LOSEFOCUS )
{
@@ -79,7 +79,7 @@ bool Window::PreNotify( NotifyEvent& rNEvt )
}
if ( bCompoundFocusChanged || ( rNEvt.GetWindow() == this ) )
- ImplCallEventListeners( VCLEVENT_WINDOW_LOSEFOCUS );
+ CallEventListeners( VCLEVENT_WINDOW_LOSEFOCUS );
}
// #82968# mouse and key events will be notified after processing ( in ImplNotifyKeyMouseCommandEventListeners() )!
@@ -197,17 +197,6 @@ bool Window::Notify( NotifyEvent& rNEvt )
return nRet;
}
-void Window::ImplCallEventListeners( sal_uLong nEvent, void* pData )
-{
- // The implementation was moved to CallEventListeners(),
- // because derived classes in svtools must be able to
- // call the event listeners and ImplCallEventListeners()
- // is not exported.
- // TODO: replace ImplCallEventListeners() by CallEventListeners() in vcl
-
- CallEventListeners( nEvent, pData );
-}
-
void Window::CallEventListeners( sal_uLong nEvent, void* pData )
{
VclWindowEvent aEvent( this, nEvent, pData );
@@ -339,7 +328,7 @@ void Window::ImplNotifyKeyMouseCommandEventListeners( NotifyEvent& rNEvt )
else
{
CommandEvent aCommandEvent = ImplTranslateCommandEvent( *pCEvt, rNEvt.GetWindow(), this );
- ImplCallEventListeners( VCLEVENT_WINDOW_COMMAND, &aCommandEvent );
+ CallEventListeners( VCLEVENT_WINDOW_COMMAND, &aCommandEvent );
}
}
}
@@ -357,11 +346,11 @@ void Window::ImplNotifyKeyMouseCommandEventListeners( NotifyEvent& rNEvt )
if ( mpWindowImpl->mbCompoundControl || ( rNEvt.GetWindow() == this ) )
{
if ( rNEvt.GetWindow() == this )
- ImplCallEventListeners( VCLEVENT_WINDOW_MOUSEMOVE, (void*)rNEvt.GetMouseEvent() );
+ CallEventListeners( VCLEVENT_WINDOW_MOUSEMOVE, (void*)rNEvt.GetMouseEvent() );
else
{
MouseEvent aMouseEvent = ImplTranslateMouseEvent( *rNEvt.GetMouseEvent(), rNEvt.GetWindow(), this );
- ImplCallEventListeners( VCLEVENT_WINDOW_MOUSEMOVE, &aMouseEvent );
+ CallEventListeners( VCLEVENT_WINDOW_MOUSEMOVE, &aMouseEvent );
}
}
}
@@ -370,11 +359,11 @@ void Window::ImplNotifyKeyMouseCommandEventListeners( NotifyEvent& rNEvt )
if ( mpWindowImpl->mbCompoundControl || ( rNEvt.GetWindow() == this ) )
{
if ( rNEvt.GetWindow() == this )
- ImplCallEventListeners( VCLEVENT_WINDOW_MOUSEBUTTONUP, (void*)rNEvt.GetMouseEvent() );
+ CallEventListeners( VCLEVENT_WINDOW_MOUSEBUTTONUP, (void*)rNEvt.GetMouseEvent() );
else
{
MouseEvent aMouseEvent = ImplTranslateMouseEvent( *rNEvt.GetMouseEvent(), rNEvt.GetWindow(), this );
- ImplCallEventListeners( VCLEVENT_WINDOW_MOUSEBUTTONUP, &aMouseEvent );
+ CallEventListeners( VCLEVENT_WINDOW_MOUSEBUTTONUP, &aMouseEvent );
}
}
}
@@ -383,23 +372,23 @@ void Window::ImplNotifyKeyMouseCommandEventListeners( NotifyEvent& rNEvt )
if ( mpWindowImpl->mbCompoundControl || ( rNEvt.GetWindow() == this ) )
{
if ( rNEvt.GetWindow() == this )
- ImplCallEventListeners( VCLEVENT_WINDOW_MOUSEBUTTONDOWN, (void*)rNEvt.GetMouseEvent() );
+ CallEventListeners( VCLEVENT_WINDOW_MOUSEBUTTONDOWN, (void*)rNEvt.GetMouseEvent() );
else
{
MouseEvent aMouseEvent = ImplTranslateMouseEvent( *rNEvt.GetMouseEvent(), rNEvt.GetWindow(), this );
- ImplCallEventListeners( VCLEVENT_WINDOW_MOUSEBUTTONDOWN, &aMouseEvent );
+ CallEventListeners( VCLEVENT_WINDOW_MOUSEBUTTONDOWN, &aMouseEvent );
}
}
}
else if( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT )
{
if ( mpWindowImpl->mbCompoundControl || ( rNEvt.GetWindow() == this ) )
- ImplCallEventListeners( VCLEVENT_WINDOW_KEYINPUT, (void*)rNEvt.GetKeyEvent() );
+ CallEventListeners( VCLEVENT_WINDOW_KEYINPUT, (void*)rNEvt.GetKeyEvent() );
}
else if( rNEvt.GetType() == MouseNotifyEvent::KEYUP )
{
if ( mpWindowImpl->mbCompoundControl || ( rNEvt.GetWindow() == this ) )
- ImplCallEventListeners( VCLEVENT_WINDOW_KEYUP, (void*)rNEvt.GetKeyEvent() );
+ CallEventListeners( VCLEVENT_WINDOW_KEYUP, (void*)rNEvt.GetKeyEvent() );
}
if ( aDelData.IsDead() )
@@ -455,7 +444,7 @@ void Window::ImplCallResize()
// #88419# Most classes don't call the base class in Resize() and Move(),
// => Call ImpleResize/Move instead of Resize/Move directly...
- ImplCallEventListeners( VCLEVENT_WINDOW_RESIZE );
+ CallEventListeners( VCLEVENT_WINDOW_RESIZE );
}
void Window::ImplCallMove()
@@ -497,7 +486,7 @@ void Window::ImplCallMove()
Move();
- ImplCallEventListeners( VCLEVENT_WINDOW_MOVE );
+ CallEventListeners( VCLEVENT_WINDOW_MOVE );
}
void Window::ImplCallFocusChangeActivate( vcl::Window* pNewOverlapWindow,
diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx
index ff8c980..84ce98a 100644
--- a/vcl/source/window/paint.cxx
+++ b/vcl/source/window/paint.cxx
@@ -679,7 +679,7 @@ void Window::PrePaint()
void Window::Paint( const Rectangle& rRect )
{
- ImplCallEventListeners( VCLEVENT_WINDOW_PAINT, (void*)&rRect );
+ CallEventListeners( VCLEVENT_WINDOW_PAINT, (void*)&rRect );
}
void Window::PostPaint()
diff --git a/vcl/source/window/settings.cxx b/vcl/source/window/settings.cxx
index 705efec..77ddce2 100644
--- a/vcl/source/window/settings.cxx
+++ b/vcl/source/window/settings.cxx
@@ -130,7 +130,7 @@ void Window::UpdateSettings( const AllSettings& rSettings, bool bChild )
DataChangedEvent aDCEvt( DataChangedEventType::SETTINGS, &aOldSettings, nChangeFlags );
DataChanged( aDCEvt );
// notify data change handler
- ImplCallEventListeners( VCLEVENT_WINDOW_DATACHANGED, &aDCEvt);
+ CallEventListeners( VCLEVENT_WINDOW_DATACHANGED, &aDCEvt);
}
if ( bChild || mpWindowImpl->mbChildNotify )
diff --git a/vcl/source/window/stacking.cxx b/vcl/source/window/stacking.cxx
index ad533cf..fc676ed 100644
--- a/vcl/source/window/stacking.cxx
+++ b/vcl/source/window/stacking.cxx
@@ -747,7 +747,7 @@ void Window::ImplResetReallyVisible()
// For this, the data member of the event must not be NULL.
// Previously, we did this in Window::Show, but there some events got lost in certain situations.
if( bBecameReallyInvisible && ImplIsAccessibleCandidate() )
- ImplCallEventListeners( VCLEVENT_WINDOW_HIDE, this );
+ CallEventListeners( VCLEVENT_WINDOW_HIDE, this );
// TODO. It's kind of a hack that we're re-using the VCLEVENT_WINDOW_HIDE. Normally, we should
// introduce another event which explicitly triggers the Accessibility implementations.
diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx
index 0eebdbe..5751c92 100644
--- a/vcl/source/window/status.cxx
+++ b/vcl/source/window/status.cxx
@@ -461,7 +461,7 @@ void StatusBar::ImplDrawItem( bool bOffScreen, sal_uInt16 nPos, bool bDrawText,
const OutputDevice *pOutDev = GetOutDev();
if ( !pOutDev->ImplIsRecordLayout() )
- ImplCallEventListeners( VCLEVENT_STATUSBAR_DRAWITEM, reinterpret_cast<void*>(pItem->mnId) );
+ CallEventListeners( VCLEVENT_STATUSBAR_DRAWITEM, reinterpret_cast<void*>(pItem->mnId) );
}
void DrawProgress( vcl::Window* pWindow, const Point& rPos,
@@ -876,13 +876,13 @@ void StatusBar::DataChanged( const DataChangedEvent& rDCEvt )
void StatusBar::Click()
{
- ImplCallEventListeners( VCLEVENT_STATUSBAR_CLICK );
+ CallEventListeners( VCLEVENT_STATUSBAR_CLICK );
maClickHdl.Call( this );
}
void StatusBar::DoubleClick()
{
- ImplCallEventListeners( VCLEVENT_STATUSBAR_DOUBLECLICK );
+ CallEventListeners( VCLEVENT_STATUSBAR_DOUBLECLICK );
maDoubleClickHdl.Call( this );
}
@@ -929,7 +929,7 @@ void StatusBar::InsertItem( sal_uInt16 nItemId, sal_uLong nWidth,
if ( ImplIsItemUpdate() )
Invalidate();
- ImplCallEventListeners( VCLEVENT_STATUSBAR_ITEMADDED, reinterpret_cast<void*>(nItemId) );
+ CallEventListeners( VCLEVENT_STATUSBAR_ITEMADDED, reinterpret_cast<void*>(nItemId) );
}
void StatusBar::RemoveItem( sal_uInt16 nItemId )
@@ -944,7 +944,7 @@ void StatusBar::RemoveItem( sal_uInt16 nItemId )
if ( ImplIsItemUpdate() )
Invalidate();
- ImplCallEventListeners( VCLEVENT_STATUSBAR_ITEMREMOVED, reinterpret_cast<void*>(nItemId) );
+ CallEventListeners( VCLEVENT_STATUSBAR_ITEMREMOVED, reinterpret_cast<void*>(nItemId) );
}
}
@@ -963,7 +963,7 @@ void StatusBar::ShowItem( sal_uInt16 nItemId )
if ( ImplIsItemUpdate() )
Invalidate();
- ImplCallEventListeners( VCLEVENT_STATUSBAR_SHOWITEM, reinterpret_cast<void*>(nItemId) );
+ CallEventListeners( VCLEVENT_STATUSBAR_SHOWITEM, reinterpret_cast<void*>(nItemId) );
}
}
}
@@ -983,7 +983,7 @@ void StatusBar::HideItem( sal_uInt16 nItemId )
if ( ImplIsItemUpdate() )
Invalidate();
- ImplCallEventListeners( VCLEVENT_STATUSBAR_HIDEITEM, reinterpret_cast<void*>(nItemId) );
+ CallEventListeners( VCLEVENT_STATUSBAR_HIDEITEM, reinterpret_cast<void*>(nItemId) );
}
}
}
@@ -1010,7 +1010,7 @@ void StatusBar::Clear()
if ( ImplIsItemUpdate() )
Invalidate();
- ImplCallEventListeners( VCLEVENT_STATUSBAR_ALLITEMSREMOVED );
+ CallEventListeners( VCLEVENT_STATUSBAR_ALLITEMSREMOVED );
}
sal_uInt16 StatusBar::GetItemCount() const
@@ -1481,7 +1481,7 @@ void StatusBar::SetAccessibleName( sal_uInt16 nItemId, const OUString& rName )
if ( pItem->maAccessibleName != rName )
{
pItem->maAccessibleName = rName;
- ImplCallEventListeners( VCLEVENT_STATUSBAR_NAMECHANGED, reinterpret_cast<void*>(pItem->mnId) );
+ CallEventListeners( VCLEVENT_STATUSBAR_NAMECHANGED, reinterpret_cast<void*>(pItem->mnId) );
}
}
}
diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx
index 538c7c0..5eca7c9 100644
--- a/vcl/source/window/syswin.cxx
+++ b/vcl/source/window/syswin.cxx
@@ -196,7 +196,7 @@ bool SystemWindow::Close()
{
ImplDelData aDelData;
ImplAddDel( &aDelData );
- ImplCallEventListeners( VCLEVENT_WINDOW_CLOSE );
+ CallEventListeners( VCLEVENT_WINDOW_CLOSE );
if ( aDelData.IsDead() )
return false;
ImplRemoveDel( &aDelData );
@@ -896,14 +896,14 @@ void SystemWindow::SetMenuBar(MenuBar* pMenuBar, const css::uno::Reference<css::
pOldWindow = NULL;
if ( pOldWindow )
{
- ImplCallEventListeners( VCLEVENT_WINDOW_MENUBARREMOVED, (void*) pOldMenuBar );
+ CallEventListeners( VCLEVENT_WINDOW_MENUBARREMOVED, (void*) pOldMenuBar );
pOldWindow->SetAccessible( ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >() );
}
if ( pMenuBar )
{
DBG_ASSERT( !pMenuBar->pWindow, "SystemWindow::SetMenuBar() - MenuBars can only set in one SystemWindow at time" );
static_cast<ImplBorderWindow*>(mpWindowImpl->mpBorderWindow)->SetMenuBarWindow( pNewWindow = MenuBar::ImplCreate( mpWindowImpl->mpBorderWindow, pOldWindow, pMenuBar, rFrame));
- ImplCallEventListeners( VCLEVENT_WINDOW_MENUBARADDED, (void*) pMenuBar );
+ CallEventListeners( VCLEVENT_WINDOW_MENUBARADDED, (void*) pMenuBar );
}
else
static_cast<ImplBorderWindow*>(mpWindowImpl->mpBorderWindow)->SetMenuBarWindow( NULL );
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 4d2ff5f..62ac30c 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -3592,7 +3592,7 @@ void ToolBox::MouseMove( const MouseEvent& rMEvt )
if ( mnCurPos != TOOLBOX_ITEM_NOTFOUND )
{
ImplDrawItem( mnCurPos );
- ImplCallEventListeners( VCLEVENT_TOOLBOX_HIGHLIGHTOFF, reinterpret_cast< void* >( mnCurPos ) );
+ CallEventListeners( VCLEVENT_TOOLBOX_HIGHLIGHTOFF, reinterpret_cast< void* >( mnCurPos ) );
}
mnCurPos = nNewPos;
@@ -3689,7 +3689,7 @@ void ToolBox::MouseMove( const MouseEvent& rMEvt )
ImplHideFocus();
sal_uInt16 nPos = GetItemPos( mnHighItemId );
ImplDrawItem( nPos );
- ImplCallEventListeners( VCLEVENT_TOOLBOX_HIGHLIGHTOFF, reinterpret_cast< void* >( nPos ) );
+ CallEventListeners( VCLEVENT_TOOLBOX_HIGHLIGHTOFF, reinterpret_cast< void* >( nPos ) );
}
if ( mpData->mbMenubuttonSelected )
{
@@ -3699,7 +3699,7 @@ void ToolBox::MouseMove( const MouseEvent& rMEvt )
mnHighItemId = it->mnId;
ImplDrawItem( nTempPos, 2 );
ImplShowFocus();
- ImplCallEventListeners( VCLEVENT_TOOLBOX_HIGHLIGHT );
+ CallEventListeners( VCLEVENT_TOOLBOX_HIGHLIGHT );
}
}
}
@@ -3727,7 +3727,7 @@ void ToolBox::MouseMove( const MouseEvent& rMEvt )
{
ImplDrawItem( nClearPos, (nClearPos == mnCurPos) ? 1 : 0 );
if( nClearPos != mnCurPos )
- ImplCallEventListeners( VCLEVENT_TOOLBOX_HIGHLIGHTOFF, reinterpret_cast< void* >( nClearPos ) );
+ CallEventListeners( VCLEVENT_TOOLBOX_HIGHLIGHTOFF, reinterpret_cast< void* >( nClearPos ) );
}
ImplHideFocus();
mnHighItemId = 0;
@@ -5301,7 +5301,7 @@ void ToolBox::ImplChangeHighlight( ImplToolItem* pItem, bool bNoGrabFocus )
// set mnHighItemId to 0 already to prevent this hen/egg problem
mnHighItemId = 0;
ImplDrawItem( nPos, 0 );
- ImplCallEventListeners( VCLEVENT_TOOLBOX_HIGHLIGHTOFF, reinterpret_cast< void* >( nPos ) );
+ CallEventListeners( VCLEVENT_TOOLBOX_HIGHLIGHTOFF, reinterpret_cast< void* >( nPos ) );
}
if( !bNoGrabFocus && pItem != pOldItem && pOldItem && pOldItem->mpWindow )
@@ -5344,7 +5344,7 @@ void ToolBox::ImplChangeHighlight( ImplToolItem* pItem, bool bNoGrabFocus )
if( pItem->mpWindow )
pItem->mpWindow->GrabFocus();
if( pItem != pOldItem )
- ImplCallEventListeners( VCLEVENT_TOOLBOX_HIGHLIGHT );
+ CallEventListeners( VCLEVENT_TOOLBOX_HIGHLIGHT );
}
}
else
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index c1f4e05..28bf171 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -382,7 +382,7 @@ void ToolBox::ImplInvalidate( bool bNewCalc, bool bFullPaint )
}
// request new layout by layoutmanager
- ImplCallEventListeners( VCLEVENT_TOOLBOX_FORMATCHANGED );
+ CallEventListeners( VCLEVENT_TOOLBOX_FORMATCHANGED );
}
void ToolBox::ImplUpdateItem( sal_uInt16 nIndex )
@@ -411,33 +411,33 @@ void ToolBox::ImplUpdateItem( sal_uInt16 nIndex )
void ToolBox::Click()
{
- ImplCallEventListeners( VCLEVENT_TOOLBOX_CLICK );
+ CallEventListeners( VCLEVENT_TOOLBOX_CLICK );
maClickHdl.Call( this );
}
void ToolBox::DoubleClick()
{
- ImplCallEventListeners( VCLEVENT_TOOLBOX_DOUBLECLICK );
+ CallEventListeners( VCLEVENT_TOOLBOX_DOUBLECLICK );
maDoubleClickHdl.Call( this );
}
void ToolBox::Activate()
{
mnActivateCount++;
- ImplCallEventListeners( VCLEVENT_TOOLBOX_ACTIVATE );
+ CallEventListeners( VCLEVENT_TOOLBOX_ACTIVATE );
maActivateHdl.Call( this );
}
void ToolBox::Deactivate()
{
mnActivateCount--;
- ImplCallEventListeners( VCLEVENT_TOOLBOX_DEACTIVATE );
+ CallEventListeners( VCLEVENT_TOOLBOX_DEACTIVATE );
maDeactivateHdl.Call( this );
}
void ToolBox::Highlight()
{
- ImplCallEventListeners( VCLEVENT_TOOLBOX_HIGHLIGHT );
+ CallEventListeners( VCLEVENT_TOOLBOX_HIGHLIGHT );
maHighlightHdl.Call( this );
}
@@ -446,7 +446,7 @@ void ToolBox::Select()
ImplDelData aDelData;
ImplAddDel( &aDelData );
- ImplCallEventListeners( VCLEVENT_TOOLBOX_SELECT );
+ CallEventListeners( VCLEVENT_TOOLBOX_SELECT );
maSelectHdl.Call( this );
if ( aDelData.IsDead() )
@@ -554,7 +554,7 @@ void ToolBox::InsertItem( const ResId& rResId, sal_uInt16 nPos )
// Notify
sal_uInt16 nNewPos = sal::static_int_cast<sal_uInt16>(( nPos == TOOLBOX_APPEND ) ? ( mpData->m_aItems.size() - 1 ) : nPos);
- ImplCallEventListeners( VCLEVENT_TOOLBOX_ITEMADDED, reinterpret_cast< void* >( nNewPos ) );
+ CallEventListeners( VCLEVENT_TOOLBOX_ITEMADDED, reinterpret_cast< void* >( nNewPos ) );
}
void ToolBox::InsertItem( sal_uInt16 nItemId, const Image& rImage,
@@ -573,7 +573,7 @@ void ToolBox::InsertItem( sal_uInt16 nItemId, const Image& rImage,
// Notify
sal_uInt16 nNewPos = sal::static_int_cast<sal_uInt16>(( nPos == TOOLBOX_APPEND ) ? ( mpData->m_aItems.size() - 1 ) : nPos);
- ImplCallEventListeners( VCLEVENT_TOOLBOX_ITEMADDED, reinterpret_cast< void* >(nNewPos ) );
+ CallEventListeners( VCLEVENT_TOOLBOX_ITEMADDED, reinterpret_cast< void* >(nNewPos ) );
}
void ToolBox::InsertItem( sal_uInt16 nItemId, const Image& rImage,
@@ -593,7 +593,7 @@ void ToolBox::InsertItem( sal_uInt16 nItemId, const Image& rImage,
// Notify
sal_uInt16 nNewPos = sal::static_int_cast<sal_uInt16>(( nPos == TOOLBOX_APPEND ) ? ( mpData->m_aItems.size() - 1 ) : nPos);
- ImplCallEventListeners( VCLEVENT_TOOLBOX_ITEMADDED, reinterpret_cast< void* >( nNewPos ) );
+ CallEventListeners( VCLEVENT_TOOLBOX_ITEMADDED, reinterpret_cast< void* >( nNewPos ) );
}
void ToolBox::InsertItem( sal_uInt16 nItemId, const OUString& rText,
@@ -611,7 +611,7 @@ void ToolBox::InsertItem( sal_uInt16 nItemId, const OUString& rText,
// Notify
sal_uInt16 nNewPos = sal::static_int_cast<sal_uInt16>(( nPos == TOOLBOX_APPEND ) ? ( mpData->m_aItems.size() - 1 ) : nPos);
- ImplCallEventListeners( VCLEVENT_TOOLBOX_ITEMADDED, reinterpret_cast< void* >( nNewPos ) );
+ CallEventListeners( VCLEVENT_TOOLBOX_ITEMADDED, reinterpret_cast< void* >( nNewPos ) );
}
void ToolBox::InsertItem(const OUString& rCommand, const uno::Reference<frame::XFrame>& rFrame, ToolBoxItemBits nBits, const Size& rRequestedSize, sal_uInt16 nPos)
@@ -659,7 +659,7 @@ void ToolBox::InsertWindow( sal_uInt16 nItemId, vcl::Window* pWindow,
// Notify
sal_uInt16 nNewPos = sal::static_int_cast<sal_uInt16>(( nPos == TOOLBOX_APPEND ) ? ( mpData->m_aItems.size() - 1 ) : nPos);
- ImplCallEventListeners( VCLEVENT_TOOLBOX_ITEMADDED, reinterpret_cast< void* >( nNewPos ) );
+ CallEventListeners( VCLEVENT_TOOLBOX_ITEMADDED, reinterpret_cast< void* >( nNewPos ) );
}
void ToolBox::InsertSpace( sal_uInt16 nPos )
@@ -675,7 +675,7 @@ void ToolBox::InsertSpace( sal_uInt16 nPos )
// Notify
sal_uInt16 nNewPos = sal::static_int_cast<sal_uInt16>(( nPos == TOOLBOX_APPEND ) ? ( mpData->m_aItems.size() - 1 ) : nPos);
- ImplCallEventListeners( VCLEVENT_TOOLBOX_ITEMADDED, reinterpret_cast< void* >( nNewPos ) );
+ CallEventListeners( VCLEVENT_TOOLBOX_ITEMADDED, reinterpret_cast< void* >( nNewPos ) );
}
void ToolBox::InsertSeparator( sal_uInt16 nPos, sal_uInt16 nPixSize )
@@ -693,7 +693,7 @@ void ToolBox::InsertSeparator( sal_uInt16 nPos, sal_uInt16 nPixSize )
// Notify
sal_uInt16 nNewPos = sal::static_int_cast<sal_uInt16>(( nPos == TOOLBOX_APPEND ) ? ( mpData->m_aItems.size() - 1 ) : nPos);
- ImplCallEventListeners( VCLEVENT_TOOLBOX_ITEMADDED, reinterpret_cast< void* >( nNewPos ) );
+ CallEventListeners( VCLEVENT_TOOLBOX_ITEMADDED, reinterpret_cast< void* >( nNewPos ) );
}
void ToolBox::InsertBreak( sal_uInt16 nPos )
@@ -709,7 +709,7 @@ void ToolBox::InsertBreak( sal_uInt16 nPos )
// Notify
sal_uInt16 nNewPos = sal::static_int_cast<sal_uInt16>(( nPos == TOOLBOX_APPEND ) ? ( mpData->m_aItems.size() - 1 ) : nPos);
- ImplCallEventListeners( VCLEVENT_TOOLBOX_ITEMADDED, reinterpret_cast< void* >( nNewPos ) );
+ CallEventListeners( VCLEVENT_TOOLBOX_ITEMADDED, reinterpret_cast< void* >( nNewPos ) );
}
void ToolBox::RemoveItem( sal_uInt16 nPos )
@@ -740,7 +740,7 @@ void ToolBox::RemoveItem( sal_uInt16 nPos )
mpData->ImplClearLayoutData();
// Notify
- ImplCallEventListeners( VCLEVENT_TOOLBOX_ITEMREMOVED, reinterpret_cast< void* >( nPos ) );
+ CallEventListeners( VCLEVENT_TOOLBOX_ITEMREMOVED, reinterpret_cast< void* >( nPos ) );
}
}
@@ -768,7 +768,7 @@ void ToolBox::CopyItem( const ToolBox& rToolBox, sal_uInt16 nItemId,
// Notify
sal_uInt16 nNewPos2 = sal::static_int_cast<sal_uInt16>(( nNewPos == TOOLBOX_APPEND ) ? ( mpData->m_aItems.size() - 1 ) : nNewPos);
- ImplCallEventListeners( VCLEVENT_TOOLBOX_ITEMADDED, reinterpret_cast< void* >( nNewPos2 ) );
+ CallEventListeners( VCLEVENT_TOOLBOX_ITEMADDED, reinterpret_cast< void* >( nNewPos2 ) );
}
}
@@ -784,7 +784,7 @@ void ToolBox::Clear()
ImplInvalidate( true, true );
// Notify
- ImplCallEventListeners( VCLEVENT_TOOLBOX_ALLITEMSCHANGED );
+ CallEventListeners( VCLEVENT_TOOLBOX_ALLITEMSCHANGED );
}
void ToolBox::SetButtonType( ButtonType eNewType )
@@ -1284,10 +1284,10 @@ void ToolBox::SetItemText( sal_uInt16 nItemId, const OUString& rText )
pItem->maText = ImplConvertMenuString( rText );
// Notify button changed event to prepare accessibility bridge
- ImplCallEventListeners( VCLEVENT_TOOLBOX_BUTTONSTATECHANGED, reinterpret_cast< void* >( nPos ) );
+ CallEventListeners( VCLEVENT_TOOLBOX_BUTTONSTATECHANGED, reinterpret_cast< void* >( nPos ) );
// Notify
- ImplCallEventListeners( VCLEVENT_TOOLBOX_ITEMTEXTCHANGED, reinterpret_cast< void* >( nPos ) );
+ CallEventListeners( VCLEVENT_TOOLBOX_ITEMTEXTCHANGED, reinterpret_cast< void* >( nPos ) );
}
}
@@ -1312,7 +1312,7 @@ void ToolBox::SetItemWindow( sal_uInt16 nItemId, vcl::Window* pNewWindow )
if ( pNewWindow )
pNewWindow->Hide();
ImplInvalidate( true );
- ImplCallEventListeners( VCLEVENT_TOOLBOX_ITEMWINDOWCHANGED, reinterpret_cast< void* >( nPos ) );
+ CallEventListeners( VCLEVENT_TOOLBOX_ITEMWINDOWCHANGED, reinterpret_cast< void* >( nPos ) );
}
}
@@ -1459,11 +1459,11 @@ void ToolBox::SetItemState( sal_uInt16 nItemId, TriState eState )
ImplUpdateItem( nPos );
// Notify button changed event to prepare accessibility bridge
- ImplCallEventListeners( VCLEVENT_TOOLBOX_BUTTONSTATECHANGED, reinterpret_cast< void* >( nPos ) );
+ CallEventListeners( VCLEVENT_TOOLBOX_BUTTONSTATECHANGED, reinterpret_cast< void* >( nPos ) );
// Notify
//Solution:Call accessible listener to notify state_changed event
- ImplCallEventListeners( VCLEVENT_TOOLBOX_ITEMUPDATED, reinterpret_cast< void* >(nPos) );
+ CallEventListeners( VCLEVENT_TOOLBOX_ITEMUPDATED, reinterpret_cast< void* >(nPos) );
}
}
}
@@ -1501,9 +1501,9 @@ void ToolBox::EnableItem( sal_uInt16 nItemId, bool bEnable )
ImplUpdateInputEnable();
// Notify button changed event to prepare accessibility bridge
- ImplCallEventListeners( VCLEVENT_TOOLBOX_BUTTONSTATECHANGED, reinterpret_cast< void* >( nPos ) );
+ CallEventListeners( VCLEVENT_TOOLBOX_BUTTONSTATECHANGED, reinterpret_cast< void* >( nPos ) );
- ImplCallEventListeners( bEnable ? VCLEVENT_TOOLBOX_ITEMENABLED : VCLEVENT_TOOLBOX_ITEMDISABLED, reinterpret_cast< void* >( nPos ) );
+ CallEventListeners( bEnable ? VCLEVENT_TOOLBOX_ITEMENABLED : VCLEVENT_TOOLBOX_ITEMDISABLED, reinterpret_cast< void* >( nPos ) );
}
}
}
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 0182a6c..d402d52 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -154,12 +154,12 @@ Window::~Window()
mpWindowImpl->mbInDtor = true;
- ImplCallEventListeners( VCLEVENT_OBJECT_DYING );
+ CallEventListeners( VCLEVENT_OBJECT_DYING );
// do not send child events for frames that were registered as native frames
if( !ImplIsAccessibleNativeFrame() && mpWindowImpl->mbReallyVisible )
if ( ImplIsAccessibleCandidate() && GetAccessibleParentWindow() )
- GetAccessibleParentWindow()->ImplCallEventListeners( VCLEVENT_WINDOW_CHILDDESTROYED, this );
+ GetAccessibleParentWindow()->CallEventListeners( VCLEVENT_WINDOW_CHILDDESTROYED, this );
// remove associated data structures from dockingmanager
ImplGetDockingManager()->RemoveWindow( this );
@@ -1132,7 +1132,7 @@ void Window::ImplInit( vcl::Window* pParent, WinBits nStyle, SystemParentData* p
ImplInitAppFontData( this );
if ( GetAccessibleParentWindow() && GetParent() != Application::GetDefDialogParent() )
- GetAccessibleParentWindow()->ImplCallEventListeners( VCLEVENT_WINDOW_CHILDCREATED, this );
+ GetAccessibleParentWindow()->CallEventListeners( VCLEVENT_WINDOW_CHILDCREATED, this );
}
void Window::ImplInitAppFontData( vcl::Window* pWindow )
@@ -1329,7 +1329,7 @@ void Window::ImplSetReallyVisible()
// Previously, we did this in Window::Show, but there some events got lost in certain situations. Now
// we're doing it when the visibility really changes
if( bBecameReallyVisible && ImplIsAccessibleCandidate() )
- ImplCallEventListeners( VCLEVENT_WINDOW_SHOW, this );
+ CallEventListeners( VCLEVENT_WINDOW_SHOW, this );
// TODO. It's kind of a hack that we're re-using the VCLEVENT_WINDOW_SHOW. Normally, we should
// introduce another event which explicitly triggers the Accessibility implementations.
@@ -1969,7 +1969,7 @@ void Window::RequestHelp( const HelpEvent& rHEvt )
void Window::Command( const CommandEvent& rCEvt )
{
- ImplCallEventListeners( VCLEVENT_WINDOW_COMMAND, (void*)&rCEvt );
+ CallEventListeners( VCLEVENT_WINDOW_COMMAND, (void*)&rCEvt );
NotifyEvent aNEvt( MouseNotifyEvent::COMMAND, this, &rCEvt );
if ( !Notify( aNEvt ) )
@@ -2465,7 +2465,7 @@ void Window::Show( bool bVisible, sal_uInt16 nFlags )
// Since #104887#, the notifications for the access bridge are done in Impl(Set|Reset)ReallyVisible. Here, we
// now only notify with a NULL data pointer, for all other clients except the access bridge.
if ( !bRealVisibilityChanged )
- ImplCallEventListeners( mpWindowImpl->mbVisible ? VCLEVENT_WINDOW_SHOW : VCLEVENT_WINDOW_HIDE, NULL );
+ CallEventListeners( mpWindowImpl->mbVisible ? VCLEVENT_WINDOW_SHOW : VCLEVENT_WINDOW_HIDE, NULL );
if( aDogTag.IsDead() )
return;
@@ -2545,7 +2545,7 @@ void Window::Enable( bool bEnable, bool bChild )
mpWindowImpl->mpSysObj->Enable( bEnable && !mpWindowImpl->mbInputDisabled );
StateChanged( StateChangedType::ENABLE );
- ImplCallEventListeners( bEnable ? VCLEVENT_WINDOW_ENABLED : VCLEVENT_WINDOW_DISABLED );
+ CallEventListeners( bEnable ? VCLEVENT_WINDOW_ENABLED : VCLEVENT_WINDOW_DISABLED );
}
if ( bChild || mpWindowImpl->mbChildNotify )
@@ -3156,7 +3156,7 @@ void Window::SetText( const OUString& rStr )
else if ( mpWindowImpl->mbFrame )
mpWindowImpl->mpFrame->SetTitle( rStr );
- ImplCallEventListeners( VCLEVENT_WINDOW_FRAMETITLECHANGED, &oldTitle );
+ CallEventListeners( VCLEVENT_WINDOW_FRAMETITLECHANGED, &oldTitle );
// #107247# needed for accessibility
// The VCLEVENT_WINDOW_FRAMETITLECHANGED is (mis)used to notify accessible name changes.
@@ -3166,7 +3166,7 @@ void Window::SetText( const OUString& rStr )
{
vcl::Window* pWindow = GetAccessibleRelationLabelFor();
if ( pWindow && pWindow != this )
- pWindow->ImplCallEventListeners( VCLEVENT_WINDOW_FRAMETITLECHANGED, &oldTitle );
+ pWindow->CallEventListeners( VCLEVENT_WINDOW_FRAMETITLECHANGED, &oldTitle );
}
StateChanged( StateChangedType::TEXT );
@@ -3279,7 +3279,7 @@ void Window::ImplCallDeactivateListeners( vcl::Window *pNew )
if ( !pNew || !ImplIsChild( pNew ) )
{
ImplDelData aDogtag( this );
- ImplCallEventListeners( VCLEVENT_WINDOW_DEACTIVATE );
+ CallEventListeners( VCLEVENT_WINDOW_DEACTIVATE );
if( aDogtag.IsDead() )
return;
@@ -3296,7 +3296,7 @@ void Window::ImplCallActivateListeners( vcl::Window *pOld )
if ( !pOld || !ImplIsChild( pOld ) )
{
ImplDelData aDogtag( this );
- ImplCallEventListeners( VCLEVENT_WINDOW_ACTIVATE, pOld );
+ CallEventListeners( VCLEVENT_WINDOW_ACTIVATE, pOld );
if( aDogtag.IsDead() )
return;
@@ -3634,10 +3634,10 @@ void Window::ImplIsInTaskPaneList( bool mbIsInTaskList )
void Window::ImplNotifyIconifiedState( bool bIconified )
{
- mpWindowImpl->mpFrameWindow->ImplCallEventListeners( bIconified ? VCLEVENT_WINDOW_MINIMIZE : VCLEVENT_WINDOW_NORMALIZE );
+ mpWindowImpl->mpFrameWindow->CallEventListeners( bIconified ? VCLEVENT_WINDOW_MINIMIZE : VCLEVENT_WINDOW_NORMALIZE );
// #109206# notify client window as well to have toolkit topwindow listeners notified
if( mpWindowImpl->mpFrameWindow->mpWindowImpl->mpClientWindow && mpWindowImpl->mpFrameWindow != mpWindowImpl->mpFrameWindow->mpWindowImpl->mpClientWindow )
- mpWindowImpl->mpFrameWindow->mpWindowImpl->mpClientWindow->ImplCallEventListeners( bIconified ? VCLEVENT_WINDOW_MINIMIZE : VCLEVENT_WINDOW_NORMALIZE );
+ mpWindowImpl->mpFrameWindow->mpWindowImpl->mpClientWindow->CallEventListeners( bIconified ? VCLEVENT_WINDOW_MINIMIZE : VCLEVENT_WINDOW_NORMALIZE );
}
bool Window::HasActiveChildFrame()
More information about the Libreoffice-commits
mailing list