[Libreoffice-commits] core.git: connectivity/source dbaccess/source include/connectivity include/sfx2 include/svx sfx2/source svx/source unusedcode.easy vcl/unx
Caolán McNamara
caolanm at redhat.com
Thu Feb 5 01:48:18 PST 2015
connectivity/source/sdbcx/VView.cxx | 7 -----
dbaccess/source/core/dataaccess/databasedocument.cxx | 6 ----
dbaccess/source/core/dataaccess/databasedocument.hxx | 3 --
dbaccess/source/ui/control/FieldControls.cxx | 23 -------------------
dbaccess/source/ui/inc/FieldControls.hxx | 9 -------
include/connectivity/sdbcx/VView.hxx | 3 --
include/sfx2/progress.hxx | 1
include/svx/fontlb.hxx | 2 -
sfx2/source/bastyp/progress.cxx | 20 ----------------
svx/source/dialog/fontlb.cxx | 8 ------
unusedcode.easy | 12 ++-------
vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx | 12 ---------
vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx | 6 ----
vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx | 7 -----
vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx | 5 ----
15 files changed, 3 insertions(+), 121 deletions(-)
New commits:
commit 194016b1d7a3f09baeaddfcfdb369adf15f9cff2
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Feb 5 09:24:25 2015 +0000
callcatcher: update unused code
Change-Id: I540d192a361938cd4dca811e7170d762841662ee
diff --git a/connectivity/source/sdbcx/VView.cxx b/connectivity/source/sdbcx/VView.cxx
index adc2e3d..be69eb6 100644
--- a/connectivity/source/sdbcx/VView.cxx
+++ b/connectivity/source/sdbcx/VView.cxx
@@ -75,13 +75,6 @@ void OView::construct()
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CHECKOPTION), PROPERTY_ID_CHECKOPTION,nAttrib,&m_CheckOption, ::cppu::UnoType<sal_Int32>::get());
}
-void OView::disposing(void)
-{
- OPropertySetHelper::disposing();
-
- ::osl::MutexGuard aGuard(m_aMutex);
-}
-
Sequence< Type > SAL_CALL OView::getTypes( ) throw(RuntimeException, std::exception)
{
return ::comphelper::concatSequences(ODescriptor::getTypes(),OView_BASE::getTypes());
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx
index 4e8099d..3cc3484 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -1997,12 +1997,6 @@ Reference< XNameReplace > SAL_CALL ODatabaseDocument::getEvents( ) throw (Runti
return m_pEventContainer;
}
-void SAL_CALL ODatabaseDocument::disposing( const ::com::sun::star::lang::EventObject& Source ) throw(RuntimeException)
-{
- if ( m_pImpl.is() )
- m_pImpl->disposing(Source);
-}
-
Reference< XInterface > ODatabaseDocument::getThis() const
{
return *const_cast< ODatabaseDocument* >( this );
diff --git a/dbaccess/source/core/dataaccess/databasedocument.hxx b/dbaccess/source/core/dataaccess/databasedocument.hxx
index 56e374b..cc29925 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.hxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.hxx
@@ -314,9 +314,6 @@ public:
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- // XEventListener
- void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException);
-
// XComponent
virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/dbaccess/source/ui/control/FieldControls.cxx b/dbaccess/source/ui/control/FieldControls.cxx
index 9335be8..e827fcc 100644
--- a/dbaccess/source/ui/control/FieldControls.cxx
+++ b/dbaccess/source/ui/control/FieldControls.cxx
@@ -47,15 +47,6 @@ OPropColumnEditCtrl::OPropColumnEditCtrl(vcl::Window* pParent,
m_strHelpText = ModuleRes(nHelpId);
}
-void
-OPropColumnEditCtrl::SetSpecialReadOnly(bool _bReadOnly)
-{
- SetReadOnly(_bReadOnly);
- lcl_setSpecialReadOnly(_bReadOnly,this);
-}
-
-
-
OPropEditCtrl::OPropEditCtrl(vcl::Window* pParent, sal_uInt16 nHelpId, short nPosition, WinBits nWinStyle)
:Edit(pParent, nWinStyle)
,m_nPos(nPosition)
@@ -64,13 +55,6 @@ OPropEditCtrl::OPropEditCtrl(vcl::Window* pParent, sal_uInt16 nHelpId, short nPo
}
void
-OPropEditCtrl::SetSpecialReadOnly(bool _bReadOnly)
-{
- SetReadOnly(_bReadOnly);
- lcl_setSpecialReadOnly(_bReadOnly,this);
-}
-
-void
OPropNumericEditCtrl::SetSpecialReadOnly(bool _bReadOnly)
{
SetReadOnly(_bReadOnly);
@@ -92,11 +76,4 @@ OPropListBoxCtrl::OPropListBoxCtrl(vcl::Window* pParent, sal_uInt16 nHelpId, sho
m_strHelpText = ModuleRes(nHelpId);
}
-void
-OPropListBoxCtrl::SetSpecialReadOnly(bool _bReadOnly)
-{
- SetReadOnly(_bReadOnly);
- lcl_setSpecialReadOnly(_bReadOnly,this);
-}
-
} // end namespace dbaui
diff --git a/dbaccess/source/ui/inc/FieldControls.hxx b/dbaccess/source/ui/inc/FieldControls.hxx
index 5bd4a7e..e944ebe 100644
--- a/dbaccess/source/ui/inc/FieldControls.hxx
+++ b/dbaccess/source/ui/inc/FieldControls.hxx
@@ -40,9 +40,6 @@ namespace dbaui
short GetPos() const { return m_nPos; }
OUString GetHelp() const { return m_strHelpText; }
-
- void SetSpecialReadOnly(bool _bReadOnly);
-
};
class OPropEditCtrl : public Edit
@@ -58,8 +55,6 @@ namespace dbaui
short GetPos() const { return m_nPos; }
OUString GetHelp() const { return m_strHelpText; }
-
- void SetSpecialReadOnly(bool _bReadOnly);
};
class OPropNumericEditCtrl : public NumericField
@@ -76,7 +71,6 @@ namespace dbaui
OUString GetHelp() const { return m_strHelpText; }
void SetSpecialReadOnly(bool _bReadOnly);
-
};
class OPropListBoxCtrl : public ListBox
@@ -91,9 +85,6 @@ namespace dbaui
short GetPos() const { return m_nPos; }
OUString GetHelp() const { return m_strHelpText; }
-
- void SetSpecialReadOnly(bool _bReadOnly);
-
};
}
diff --git a/include/connectivity/sdbcx/VView.hxx b/include/connectivity/sdbcx/VView.hxx
index d41bee6..d70889396 100644
--- a/include/connectivity/sdbcx/VView.hxx
+++ b/include/connectivity/sdbcx/VView.hxx
@@ -78,9 +78,6 @@ namespace connectivity
// ODescriptor
virtual void construct() SAL_OVERRIDE;
- // ::cppu::OComponentHelper
- void SAL_CALL disposing(void);
-
// XInterface
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL acquire() throw() SAL_OVERRIDE;
diff --git a/include/sfx2/progress.hxx b/include/sfx2/progress.hxx
index 2fb0143..4a618c5 100644
--- a/include/sfx2/progress.hxx
+++ b/include/sfx2/progress.hxx
@@ -46,7 +46,6 @@ public:
bool bWait = true );
virtual ~SfxProgress();
- void SetText( const OUString& rText );
bool SetStateText( sal_uIntPtr nVal, const rtl::OUString &rVal, sal_uIntPtr nNewRange = 0 );
bool SetState( sal_uIntPtr nVal, sal_uIntPtr nNewRange = 0 );
sal_uIntPtr GetState() const { return nVal; }
diff --git a/include/svx/fontlb.hxx b/include/svx/fontlb.hxx
index 5755a30..1b50e67 100644
--- a/include/svx/fontlb.hxx
+++ b/include/svx/fontlb.hxx
@@ -85,8 +85,6 @@ public:
/** Returns the position of the entry currently selected or TREELIST_APPEND.
*/
sal_uLong GetSelectEntryPos() const;
- /** Returns the text of the selected entry or an empty string. */
- OUString GetSelectEntry() const;
protected:
/** Initializes a new SvLBoxFontString entry.
diff --git a/sfx2/source/bastyp/progress.cxx b/sfx2/source/bastyp/progress.cxx
index e51a1d3..1593ef3 100644
--- a/sfx2/source/bastyp/progress.cxx
+++ b/sfx2/source/bastyp/progress.cxx
@@ -217,24 +217,6 @@ void SfxProgress::Stop()
pImp->Enable_Impl(true);
}
-
-
-void SfxProgress::SetText( const OUString& /* new Text */)
-
-/* [Description]
-
- Changes the text that appears to the left next to progress bar.
-*/
-
-{
- if( pImp->pActiveProgress ) return;
- if ( pImp->xStatusInd.is() )
- {
- pImp->xStatusInd->reset();
- pImp->xStatusInd->start( pImp->aText, pImp->nMax );
- }
-}
-
bool SfxProgress::SetStateText
(
sal_uLong nNewVal, /* New value for the progress-bar */
@@ -247,8 +229,6 @@ bool SfxProgress::SetStateText
return SetState( nNewVal, nNewRange );
}
-
-
bool SfxProgress::SetState
(
sal_uLong nNewVal, /* new value for the progress bar */
diff --git a/svx/source/dialog/fontlb.cxx b/svx/source/dialog/fontlb.cxx
index dd4d1d6..5ae4c21 100644
--- a/svx/source/dialog/fontlb.cxx
+++ b/svx/source/dialog/fontlb.cxx
@@ -24,9 +24,6 @@
#include "svtools/treelistentry.hxx"
#include "svtools/viewdataentry.hxx"
-
-
-
SvLBoxFontString::SvLBoxFontString()
: SvLBoxString()
, mbUseColor(false)
@@ -132,11 +129,6 @@ sal_uLong SvxFontListBox::GetSelectEntryPos() const
return pSvLBoxEntry ? GetModel()->GetAbsPos( pSvLBoxEntry ) : TREELIST_ENTRY_NOTFOUND;
}
-OUString SvxFontListBox::GetSelectEntry() const
-{
- return GetEntryText(GetSelectEntryPos());
-}
-
void SvxFontListBox::InitEntry(
SvTreeListEntry* pEntry, const OUString& rEntryText,
const Image& rCollImg, const Image& rExpImg,
diff --git a/unusedcode.easy b/unusedcode.easy
index 0d0ec39..089c5e4 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -24,21 +24,21 @@ Primitive2dXmlDump::filterActionType(unsigned short, bool)
Primitive2dXmlDump::filterAllActionTypes()
Printer::Error()
SalGraphics::drawTransformedBitmap(basegfx::B2DPoint const&, basegfx::B2DPoint const&, basegfx::B2DPoint const&, SalBitmap const&, SalBitmap const*)
-SalGtkFilePicker::disposing(com::sun::star::lang::EventObject const&)
-SalGtkFolderPicker::disposing(com::sun::star::lang::EventObject const&)
ScBroadcastAreaSlotMachine::AreaBroadcastInRange(ScRange const&, ScHint const&) const
ScCellValue::set(ScRefCellValue const&)
ScCondFormatManagerDlg::IsInRefMode() const
ScDocument::CreateFormatTable() const
ScDocument::EndAllListeners(ScRange const&)
+ScImportExport::ImportData(rtl::OUString const&, com::sun::star::uno::Any const&)
+ScImportExport::ScImportExport(ScDocument*, rtl::OUString const&)
ScPrivatSplit::GetDeltaX()
ScTbxInsertCtrl::Select(bool)
+ScTokenArray::GetWeight() const
ScVbaFormat<ooo::vba::excel::XStyle>::getAddIndent()
ScVbaFormat<ooo::vba::excel::XStyle>::setAddIndent(com::sun::star::uno::Any const&)
SdrUndoObjList::SetOrdNum(unsigned int)
SecurityEnvironment_NssImpl::getCertificate(rtl::OUString const&, rtl::OUString const&)
SfxAppMenuControl_Impl::RegisterControl(unsigned short, SfxModule*)
-SfxProgress::SetText(rtl::OUString const&)
SotObject::GetInterface(SvGlobalName const&)
StylePool::getCount() const
StyleSettings::SetAlternatingRowColor(Color const&)
@@ -53,7 +53,6 @@ SvpSalFrame::enableDamageTracker(bool)
SvpSalInstance::PostedEventsInQueue()
SvtListener::IsListening(SvtBroadcaster&) const
SvxColorTabPage::GetPropertyList(XPropertyListType)
-SvxFontListBox::GetSelectEntry() const
SvxOpenGLObject::getRenderer()
SvxOpenGLObject::setRenderer(IOpenGLRenderer*)
Test::testCopyPasteSkipEmptyConditionalFormatting()
@@ -189,9 +188,7 @@ connectivity::firebird::release(int&, cppu::OBroadcastHelperVar<cppu::OMultiType
connectivity::odbc::appendSQLWCHARs(rtl::OUStringBuffer&, wchar_t const*, int)
connectivity::sdbcx::OGroup::OGroup(bool)
connectivity::sdbcx::OGroup::OGroup(rtl::OUString const&, bool)
-connectivity::sdbcx::OView::disposing()
dbaccess::OBookmarkContainer::dispose()
-dbaccess::ODatabaseDocument::disposing(com::sun::star::lang::EventObject const&)
dbaccess::StorageInputStream::close()
dbaui::OConnectionLineAccess::contains(com::sun::star::awt::Point const&)
dbaui::OConnectionLineAccess::isEditable() const
@@ -201,9 +198,6 @@ dbaui::OConnectionLineAccess::isVisible()
dbaui::OGenericUnoController::InvalidateFeature(rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::frame::XStatusListener> const&, bool)
dbaui::OJoinDesignViewAccess::isEditable() const
dbaui::OJoinTableView::StartDrag(signed char, Point const&)
-dbaui::OPropColumnEditCtrl::SetSpecialReadOnly(bool)
-dbaui::OPropEditCtrl::SetSpecialReadOnly(bool)
-dbaui::OPropListBoxCtrl::SetSpecialReadOnly(bool)
dbaui::OQueryViewSwitch::resizeDocumentView(Rectangle&)
dbaui::OQueryViewSwitch::setReadOnly(bool)
dbaui::OTableRowView::SetUpdatable(bool)
diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
index 7a613a7..3b60803 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
@@ -300,18 +300,6 @@ void SAL_CALL SalGtkFilePicker::removeFilePickerListener( const uno::Reference<X
m_xListener.clear();
}
-// XEventListener
-
-void SAL_CALL SalGtkFilePicker::disposing( const lang::EventObject& aEvent ) throw( uno::RuntimeException )
-{
- // no member access => no mutex needed
-
- uno::Reference<XFilePickerListener> xFilePickerListener( aEvent.Source, ::com::sun::star::uno::UNO_QUERY );
-
- if( xFilePickerListener.is() )
- removeFilePickerListener( xFilePickerListener );
-}
-
// FilePicker Event functions
void SalGtkFilePicker::impl_fileSelectionChanged( FilePickerEvent aEvent )
diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx
index 3a0379c..1b12143 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx
@@ -164,12 +164,6 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base
virtual void SAL_CALL cancel( )
throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- // XEventListener
-
- using cppu::WeakComponentImplHelperBase::disposing;
- void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent )
- throw(::com::sun::star::uno::RuntimeException);
-
// FilePicker Event functions
private:
diff --git a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
index f4bd4b5..0754101 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
@@ -63,13 +63,6 @@ SalGtkFolderPicker::SalGtkFolderPicker( const uno::Reference< uno::XComponentCon
gtk_file_chooser_set_select_multiple( GTK_FILE_CHOOSER( m_pDialog ), false );
}
-// XEventListener
-
-void SAL_CALL SalGtkFolderPicker::disposing( const lang::EventObject& )
- throw( uno::RuntimeException )
-{
-}
-
void SAL_CALL SalGtkFolderPicker::setDisplayDirectory( const OUString& aDirectory )
throw( lang::IllegalArgumentException, uno::RuntimeException, std::exception )
{
diff --git a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx
index 24017a2..f309ddd 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx
@@ -64,11 +64,6 @@ class SalGtkFolderPicker :
virtual void SAL_CALL cancel( )
throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- // XEventListener
-
- void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent )
- throw(::com::sun::star::uno::RuntimeException);
-
private:
// prevent copy and assignment
SalGtkFolderPicker( const SalGtkFolderPicker& );
More information about the Libreoffice-commits
mailing list