summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--basic/source/sbx/sbxdec.cxx18
-rw-r--r--reportdesign/source/ui/dlg/GroupsSorting.cxx15
-rw-r--r--sfx2/inc/sfx2/tbxctrl.hxx2
-rw-r--r--sfx2/source/toolbox/tbxitem.cxx7
-rwxr-xr-xunusedcode.easy5
5 files changed, 4 insertions, 43 deletions
diff --git a/basic/source/sbx/sbxdec.cxx b/basic/source/sbx/sbxdec.cxx
index 3f95fa6f1003..320c444a120f 100644
--- a/basic/source/sbx/sbxdec.cxx
+++ b/basic/source/sbx/sbxdec.cxx
@@ -290,22 +290,6 @@ bool SbxDecimal::getDouble( double& rVal )
return bRet;
}
-bool SbxDecimal::getInt( int& rVal )
-{
- sal_Int32 TmpVal;
- bool bRet = getLong( TmpVal );
- rVal = TmpVal;
- return bRet;
-}
-
-bool SbxDecimal::getUInt( unsigned int& rVal )
-{
- sal_uInt32 TmpVal;
- bool bRet = getULong( TmpVal );
- rVal = TmpVal;
- return bRet;
-}
-
#else
// !WIN32
@@ -369,8 +353,6 @@ bool SbxDecimal::getUShort( sal_uInt16& rVal ) { (void)rVal; return false;
bool SbxDecimal::getULong( sal_uInt32& rVal ) { (void)rVal; return false; }
bool SbxDecimal::getSingle( float& rVal ) { (void)rVal; return false; }
bool SbxDecimal::getDouble( double& rVal ) { (void)rVal; return false; }
-bool SbxDecimal::getInt( int& rVal ) { (void)rVal; return false; }
-bool SbxDecimal::getUInt( unsigned int& rVal ) { (void)rVal; return false; }
#endif
diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx
index 53711b8b46d9..5edc7a5414c7 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.cxx
+++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx
@@ -165,8 +165,6 @@ protected:
private:
- DECL_LINK( AsynchActivate, void* );
- DECL_LINK( AsynchDeactivate, void* );
DECL_LINK( DelayedPaste, void* );
DECL_LINK( CBChangeHdl,ComboBox*);
@@ -408,19 +406,6 @@ IMPL_LINK( OFieldExpressionControl, CBChangeHdl, ComboBox*, /*pComboBox*/ )
SaveModified();
return 0L;
}
-//------------------------------------------------------------------------------
-IMPL_LINK_NOARG(OFieldExpressionControl, AsynchActivate)
-{
- ActivateCell();
- return 0L;
-}
-
-//------------------------------------------------------------------------------
-IMPL_LINK_NOARG(OFieldExpressionControl, AsynchDeactivate)
-{
- DeactivateCell();
- return 0L;
-}
//------------------------------------------------------------------------------
sal_Bool OFieldExpressionControl::IsTabAllowed(sal_Bool /*bForward*/) const
diff --git a/sfx2/inc/sfx2/tbxctrl.hxx b/sfx2/inc/sfx2/tbxctrl.hxx
index 1559713cae95..be49b8d8919d 100644
--- a/sfx2/inc/sfx2/tbxctrl.hxx
+++ b/sfx2/inc/sfx2/tbxctrl.hxx
@@ -127,7 +127,7 @@ private:
SAL_DLLPRIVATE SfxPopupWindow(SfxPopupWindow &); // not defined
SAL_DLLPRIVATE void operator =(SfxPopupWindow &); // not defined
- DECL_DLLPRIVATE_LINK( Delete, void * );
+ void Delete();
protected:
virtual void PopupModeEnd();
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index 53bfee21fddb..1e3fc03ebd3e 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -1291,7 +1291,7 @@ sal_Bool SfxPopupWindow::Close()
m_bFloating = sal_False;
FloatingWindow::Close();
- Delete(0);
+ Delete();
return sal_True;
}
@@ -1319,7 +1319,7 @@ void SfxPopupWindow::DeleteFloatingWindow()
if ( m_bFloating )
{
Hide();
- Delete(0);
+ Delete();
}
}
@@ -1403,12 +1403,11 @@ void SfxPopupWindow::StateChanged(
//--------------------------------------------------------------------
-IMPL_LINK_NOARG(SfxPopupWindow, Delete)
+void SfxPopupWindow::Delete()
{
if ( m_aDeleteLink.IsSet() )
m_aDeleteLink.Call( this );
delete this;
- return 0;
}
//--------------------------------------------------------------------
diff --git a/unusedcode.easy b/unusedcode.easy
index 58a4e927b5cf..7e8baf5f9f8b 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -46,8 +46,6 @@ SalGraphics::drawPolyLine(basegfx::B2DPolygon const&, double, basegfx::B2DVector
SalGraphics::drawPolyPolygon(basegfx::B2DPolyPolygon const&, double)
SanExtensionImpl::setCertExtn(com::sun::star::uno::Sequence<signed char>, com::sun::star::uno::Sequence<signed char>, unsigned char)
SanExtensionImpl::setCertExtn(unsigned char*, unsigned int, unsigned char*, unsigned int, unsigned char)
-SbxDecimal::getInt(int&)
-SbxDecimal::getUInt(unsigned int&)
ScAddInAsyncs::Insert(ScAddInAsync* const&, unsigned short&)
ScAddInAsyncs::Insert(ScAddInAsync* const*, unsigned short)
ScAddInAsyncs::Insert(ScAddInAsyncs const*, unsigned short, unsigned short)
@@ -134,7 +132,6 @@ SfxMedium::GetHdl()
SfxModuleArr_Impl::DeleteAndDestroy(unsigned short, unsigned short)
SfxNavigatorWrapper::GetChildWindowId()
SfxPartChildWnd_Impl::GetChildWindowId()
-SfxPopupWindow::LinkStubDelete(void*, void*)
SfxRecordingFloatWrapper_Impl::GetChildWindowId()
SfxUINT32s::Insert(SfxUINT32s const*, unsigned short, unsigned short, unsigned short)
SfxUINT32s::Remove(unsigned short, unsigned short)
@@ -979,8 +976,6 @@ psp::PrinterGfx::GetGlyphOutline(unsigned short, unsigned short**, Point**, unsi
psp::PrinterGfx::GetResolution(int&, int&) const
psp::PrinterGfx::PSRMoveTo(int, int)
psp::PrinterGfx::SetFallbackFont(int)
-rptui::OFieldExpressionControl::LinkStubAsynchActivate(void*, void*)
-rptui::OFieldExpressionControl::LinkStubAsynchDeactivate(void*, void*)
sd::LeftDrawPaneShell::RegisterInterface(SfxModule*)
sd::LeftImpressPaneShell::RegisterInterface(SfxModule*)
sd::ToolPanelPaneShell::RegisterInterface(SfxModule*)