diff options
-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 | ||||
-rw-r--r-- | basic/inc/sbstdobj.hxx | 18 | ||||
-rw-r--r-- | basic/source/runtime/stdobj1.cxx | 40 |
12 files changed, 49 insertions, 58 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&); diff --git a/basic/inc/sbstdobj.hxx b/basic/inc/sbstdobj.hxx index 7cc22584fab7..d306c3d81e97 100644 --- a/basic/inc/sbstdobj.hxx +++ b/basic/inc/sbstdobj.hxx @@ -43,9 +43,9 @@ protected: virtual ~SbStdPicture() override; virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; - void PropType( SbxVariable* pVar, SbxArray* pPar, bool bWrite ); - void PropWidth( SbxVariable* pVar, SbxArray* pPar, bool bWrite ); - void PropHeight( SbxVariable* pVar, SbxArray* pPar, bool bWrite ); + void PropType( SbxVariable* pVar, bool bWrite ); + void PropWidth( SbxVariable* pVar, bool bWrite ); + void PropHeight( SbxVariable* pVar, bool bWrite ); public: @@ -69,12 +69,12 @@ protected: virtual ~SbStdFont() override; virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; - void PropBold( SbxVariable* pVar, SbxArray* pPar, bool bWrite ); - void PropItalic( SbxVariable* pVar, SbxArray* pPar, bool bWrite ); - void PropStrikeThrough( SbxVariable* pVar, SbxArray* pPar, bool bWrite ); - void PropUnderline( SbxVariable* pVar, SbxArray* pPar, bool bWrite ); - void PropSize( SbxVariable* pVar, SbxArray* pPar, bool bWrite ); - void PropName( SbxVariable* pVar, SbxArray* pPar, bool bWrite ); + void PropBold( SbxVariable* pVar, bool bWrite ); + void PropItalic( SbxVariable* pVar, bool bWrite ); + void PropStrikeThrough( SbxVariable* pVar, bool bWrite ); + void PropUnderline( SbxVariable* pVar, bool bWrite ); + void PropSize( SbxVariable* pVar, bool bWrite ); + void PropName( SbxVariable* pVar, bool bWrite ); public: diff --git a/basic/source/runtime/stdobj1.cxx b/basic/source/runtime/stdobj1.cxx index 8284a1acf7ed..ed8df7686965 100644 --- a/basic/source/runtime/stdobj1.cxx +++ b/basic/source/runtime/stdobj1.cxx @@ -56,7 +56,7 @@ SbxObject* SbStdFactory::CreateObject( const OUString& rClassName ) } -void SbStdPicture::PropType( SbxVariable* pVar, SbxArray*, bool bWrite ) +void SbStdPicture::PropType( SbxVariable* pVar, bool bWrite ) { if( bWrite ) { @@ -76,7 +76,7 @@ void SbStdPicture::PropType( SbxVariable* pVar, SbxArray*, bool bWrite ) } -void SbStdPicture::PropWidth( SbxVariable* pVar, SbxArray*, bool bWrite ) +void SbStdPicture::PropWidth( SbxVariable* pVar, bool bWrite ) { if( bWrite ) { @@ -91,7 +91,7 @@ void SbStdPicture::PropWidth( SbxVariable* pVar, SbxArray*, bool bWrite ) pVar->PutInteger( (sal_Int16)aSize.Width() ); } -void SbStdPicture::PropHeight( SbxVariable* pVar, SbxArray*, bool bWrite ) +void SbStdPicture::PropHeight( SbxVariable* pVar, bool bWrite ) { if( bWrite ) { @@ -141,16 +141,15 @@ void SbStdPicture::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) } SbxVariable* pVar = pHint->GetVar(); - SbxArray* pPar_ = pVar->GetParameters(); const sal_uInt32 nWhich = pVar->GetUserData(); bool bWrite = pHint->GetId() == SfxHintId::BasicDataChanged; - // Propteries + // Properties switch( nWhich ) { - case ATTR_IMP_TYPE: PropType( pVar, pPar_, bWrite ); return; - case ATTR_IMP_WIDTH: PropWidth( pVar, pPar_, bWrite ); return; - case ATTR_IMP_HEIGHT: PropHeight( pVar, pPar_, bWrite ); return; + case ATTR_IMP_TYPE: PropType( pVar, bWrite ); return; + case ATTR_IMP_WIDTH: PropWidth( pVar, bWrite ); return; + case ATTR_IMP_HEIGHT: PropHeight( pVar, bWrite ); return; } SbxObject::Notify( rBC, rHint ); @@ -158,7 +157,7 @@ void SbStdPicture::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) } -void SbStdFont::PropBold( SbxVariable* pVar, SbxArray*, bool bWrite ) +void SbStdFont::PropBold( SbxVariable* pVar, bool bWrite ) { if( bWrite ) SetBold( pVar->GetBool() ); @@ -166,7 +165,7 @@ void SbStdFont::PropBold( SbxVariable* pVar, SbxArray*, bool bWrite ) pVar->PutBool( IsBold() ); } -void SbStdFont::PropItalic( SbxVariable* pVar, SbxArray*, bool bWrite ) +void SbStdFont::PropItalic( SbxVariable* pVar, bool bWrite ) { if( bWrite ) SetItalic( pVar->GetBool() ); @@ -174,7 +173,7 @@ void SbStdFont::PropItalic( SbxVariable* pVar, SbxArray*, bool bWrite ) pVar->PutBool( IsItalic() ); } -void SbStdFont::PropStrikeThrough( SbxVariable* pVar, SbxArray*, bool bWrite ) +void SbStdFont::PropStrikeThrough( SbxVariable* pVar, bool bWrite ) { if( bWrite ) SetStrikeThrough( pVar->GetBool() ); @@ -182,7 +181,7 @@ void SbStdFont::PropStrikeThrough( SbxVariable* pVar, SbxArray*, bool bWrite ) pVar->PutBool( IsStrikeThrough() ); } -void SbStdFont::PropUnderline( SbxVariable* pVar, SbxArray*, bool bWrite ) +void SbStdFont::PropUnderline( SbxVariable* pVar, bool bWrite ) { if( bWrite ) SetUnderline( pVar->GetBool() ); @@ -190,7 +189,7 @@ void SbStdFont::PropUnderline( SbxVariable* pVar, SbxArray*, bool bWrite ) pVar->PutBool( IsUnderline() ); } -void SbStdFont::PropSize( SbxVariable* pVar, SbxArray*, bool bWrite ) +void SbStdFont::PropSize( SbxVariable* pVar, bool bWrite ) { if( bWrite ) SetSize( (sal_uInt16)pVar->GetInteger() ); @@ -198,7 +197,7 @@ void SbStdFont::PropSize( SbxVariable* pVar, SbxArray*, bool bWrite ) pVar->PutInteger( (sal_Int16)GetSize() ); } -void SbStdFont::PropName( SbxVariable* pVar, SbxArray*, bool bWrite ) +void SbStdFont::PropName( SbxVariable* pVar, bool bWrite ) { if( bWrite ) { @@ -259,19 +258,18 @@ void SbStdFont::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) } SbxVariable* pVar = pHint->GetVar(); - SbxArray* pPar_ = pVar->GetParameters(); const sal_uInt32 nWhich = pVar->GetUserData(); bool bWrite = pHint->GetId() == SfxHintId::BasicDataChanged; // Propteries switch( nWhich ) { - case ATTR_IMP_BOLD: PropBold( pVar, pPar_, bWrite ); return; - case ATTR_IMP_ITALIC: PropItalic( pVar, pPar_, bWrite ); return; - case ATTR_IMP_STRIKETHROUGH:PropStrikeThrough( pVar, pPar_, bWrite ); return; - case ATTR_IMP_UNDERLINE: PropUnderline( pVar, pPar_, bWrite ); return; - case ATTR_IMP_SIZE: PropSize( pVar, pPar_, bWrite ); return; - case ATTR_IMP_NAME: PropName( pVar, pPar_, bWrite ); return; + case ATTR_IMP_BOLD: PropBold( pVar, bWrite ); return; + case ATTR_IMP_ITALIC: PropItalic( pVar, bWrite ); return; + case ATTR_IMP_STRIKETHROUGH:PropStrikeThrough( pVar, bWrite ); return; + case ATTR_IMP_UNDERLINE: PropUnderline( pVar, bWrite ); return; + case ATTR_IMP_SIZE: PropSize( pVar, bWrite ); return; + case ATTR_IMP_NAME: PropName( pVar, bWrite ); return; } SbxObject::Notify( rBC, rHint ); |