diff options
Diffstat (limited to 'basctl')
-rw-r--r-- | basctl/source/basicide/baside3.cxx | 4 | ||||
-rw-r--r-- | basctl/source/basicide/bastypes.cxx | 2 | ||||
-rw-r--r-- | basctl/source/basicide/layout.cxx | 5 | ||||
-rw-r--r-- | basctl/source/dlged/dlged.cxx | 5 | ||||
-rw-r--r-- | basctl/source/dlged/dlgedfunc.cxx | 6 | ||||
-rw-r--r-- | basctl/source/dlged/dlgedlist.cxx | 12 | ||||
-rw-r--r-- | basctl/source/dlged/dlgedobj.cxx | 6 | ||||
-rw-r--r-- | basctl/source/inc/dlged.hxx | 2 | ||||
-rw-r--r-- | basctl/source/inc/dlgedobj.hxx | 6 | ||||
-rw-r--r-- | basctl/source/inc/layout.hxx | 1 |
10 files changed, 21 insertions, 28 deletions
diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx index 608ded2c1c68..550bcd3637e9 100644 --- a/basctl/source/basicide/baside3.cxx +++ b/basctl/source/basicide/baside3.cxx @@ -233,9 +233,9 @@ void DialogWindow::DoInit() m_pEditor->SetScrollBars( GetHScrollBar(), GetVScrollBar() ); } -void DialogWindow::DoScroll( ScrollBar* pCurScrollBar ) +void DialogWindow::DoScroll( ScrollBar* ) { - m_pEditor->DoScroll( pCurScrollBar ); + m_pEditor->DoScroll(); } void DialogWindow::GetState( SfxItemSet& rSet ) diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx index 0f4210836884..c46320ccb07f 100644 --- a/basctl/source/basicide/bastypes.cxx +++ b/basctl/source/basicide/bastypes.cxx @@ -410,7 +410,7 @@ void DockingWindow::DockThis () { if (!IsFloatingMode() && GetParent() != pLayout) SetParent(pLayout); - pLayout->DockaWindow(this); + pLayout->ArrangeWindows(); } } diff --git a/basctl/source/basicide/layout.cxx b/basctl/source/basicide/layout.cxx index 5337adf61b3b..9e92c2a247bb 100644 --- a/basctl/source/basicide/layout.cxx +++ b/basctl/source/basicide/layout.cxx @@ -113,11 +113,6 @@ void Layout::ArrangeWindows () bInArrangeWindows = false; } -void Layout::DockaWindow (DockingWindow*) -{ - ArrangeWindows(); -} - void Layout::Activating (BaseWindow& rWindow) { // first activation diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx index bb8ddeff03a8..f5cc428272d2 100644 --- a/basctl/source/dlged/dlged.cxx +++ b/basctl/source/dlged/dlged.cxx @@ -287,12 +287,11 @@ void DlgEditor::InitScrollBars() pHScroll->SetPageSize( aOutSize.Width() / 2 ); pVScroll->SetPageSize( aOutSize.Height() / 2 ); - DoScroll( pHScroll ); - DoScroll( pVScroll ); + DoScroll(); } -void DlgEditor::DoScroll( ScrollBar* ) +void DlgEditor::DoScroll() { if( !pHScroll || !pVScroll ) return; diff --git a/basctl/source/dlged/dlgedfunc.cxx b/basctl/source/dlged/dlgedfunc.cxx index 0545b7c05faf..6260f8d885f2 100644 --- a/basctl/source/dlged/dlgedfunc.cxx +++ b/basctl/source/dlged/dlgedfunc.cxx @@ -69,9 +69,9 @@ void DlgEdFunc::ForceScroll( const Point& rPos ) pVScroll->SetThumbPos( pVScroll->GetThumbPos() + nDeltaY ); if( nDeltaX ) - rParent.DoScroll( pHScroll ); + rParent.DoScroll(); if( nDeltaY ) - rParent.DoScroll( pVScroll ); + rParent.DoScroll(); } aScrollTimer.Start(); @@ -310,7 +310,7 @@ bool DlgEdFunc::KeyInput( const KeyEvent& rKEvt ) if ( nThumbPos > nRangeMax ) nThumbPos = nRangeMax; pScrollBar->SetThumbPos( nThumbPos ); - rParent.DoScroll( pScrollBar ); + rParent.DoScroll(); } } diff --git a/basctl/source/dlged/dlgedlist.cxx b/basctl/source/dlged/dlgedlist.cxx index 8cda02a4520e..666e2aa0f6a3 100644 --- a/basctl/source/dlged/dlgedlist.cxx +++ b/basctl/source/dlged/dlgedlist.cxx @@ -60,19 +60,19 @@ void SAL_CALL DlgEdEvtContListenerImpl::disposing( const css::lang::EventObject } // XContainerListener -void SAL_CALL DlgEdEvtContListenerImpl::elementInserted(const css::container::ContainerEvent& Event) +void SAL_CALL DlgEdEvtContListenerImpl::elementInserted(const css::container::ContainerEvent& /*Event*/) { - rDlgEdObj._elementInserted( Event ); + rDlgEdObj._elementInserted(); } -void SAL_CALL DlgEdEvtContListenerImpl::elementReplaced(const css::container::ContainerEvent& Event) +void SAL_CALL DlgEdEvtContListenerImpl::elementReplaced(const css::container::ContainerEvent& /*Event*/) { - rDlgEdObj._elementReplaced( Event ); + rDlgEdObj._elementReplaced(); } -void SAL_CALL DlgEdEvtContListenerImpl::elementRemoved(const css::container::ContainerEvent& Event) +void SAL_CALL DlgEdEvtContListenerImpl::elementRemoved(const css::container::ContainerEvent& /*Event*/) { - rDlgEdObj._elementRemoved( Event ); + rDlgEdObj._elementRemoved(); } } // namespace basctl diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx index c1ddd5672d51..fcde3f6fc3de 100644 --- a/basctl/source/dlged/dlgedobj.cxx +++ b/basctl/source/dlged/dlgedobj.cxx @@ -1159,7 +1159,7 @@ void SAL_CALL DlgEdObj::_propertyChange( const css::beans::PropertyChangeEvent& } } -void SAL_CALL DlgEdObj::_elementInserted(const css::container::ContainerEvent& ) +void SAL_CALL DlgEdObj::_elementInserted() { if (isListening()) { @@ -1168,7 +1168,7 @@ void SAL_CALL DlgEdObj::_elementInserted(const css::container::ContainerEvent& ) } } -void SAL_CALL DlgEdObj::_elementReplaced(const css::container::ContainerEvent& ) +void SAL_CALL DlgEdObj::_elementReplaced() { if (isListening()) { @@ -1177,7 +1177,7 @@ void SAL_CALL DlgEdObj::_elementReplaced(const css::container::ContainerEvent& ) } } -void SAL_CALL DlgEdObj::_elementRemoved(const css::container::ContainerEvent& ) +void SAL_CALL DlgEdObj::_elementRemoved() { if (isListening()) { diff --git a/basctl/source/inc/dlged.hxx b/basctl/source/inc/dlged.hxx index 2fa9bb9de66e..791cc74bc216 100644 --- a/basctl/source/inc/dlged.hxx +++ b/basctl/source/inc/dlged.hxx @@ -154,7 +154,7 @@ public: void InitScrollBars(); ScrollBar* GetHScroll() const { return pHScroll; } ScrollBar* GetVScroll() const { return pVScroll; } - void DoScroll( ScrollBar* pActScroll ); + void DoScroll(); void UpdateScrollBars(); void SetDialog (const css::uno::Reference<css::container::XNameContainer>& xUnoControlDialogModel); diff --git a/basctl/source/inc/dlgedobj.hxx b/basctl/source/inc/dlgedobj.hxx index babad14c1ef1..86a2f715350f 100644 --- a/basctl/source/inc/dlgedobj.hxx +++ b/basctl/source/inc/dlgedobj.hxx @@ -127,11 +127,11 @@ public: // ContainerListener /// @throws css::uno::RuntimeException - void SAL_CALL _elementInserted( const css::container::ContainerEvent& Event ); + void SAL_CALL _elementInserted(); /// @throws css::uno::RuntimeException - void SAL_CALL _elementReplaced( const css::container::ContainerEvent& Event ); + void SAL_CALL _elementReplaced(); /// @throws css::uno::RuntimeException - void SAL_CALL _elementRemoved( const css::container::ContainerEvent& Event ); + void SAL_CALL _elementRemoved(); virtual void SetLayer(SdrLayerID nLayer) override; void MakeDataAware( const css::uno::Reference< css::frame::XModel >& xModel ); diff --git a/basctl/source/inc/layout.hxx b/basctl/source/inc/layout.hxx index 0c476f0f0701..e054d32d23e0 100644 --- a/basctl/source/inc/layout.hxx +++ b/basctl/source/inc/layout.hxx @@ -42,7 +42,6 @@ class BaseWindow; class Layout: public vcl::Window { public: - void DockaWindow (DockingWindow*); void ArrangeWindows (); virtual void Activating (BaseWindow&); |