[Libreoffice] [PATCH] Remove unused code
Hello lo-devs, There is never an instance of mpDateTable allocated and a lot of code is never executed because of that. This patch removes the unused code. regards Marcel --- svtools/inc/svtools/calendar.hxx|3 - svtools/source/control/calendar.cxx | 119 ++- 2 files changed, 6 insertions(+), 116 deletions(-) diff --git a/svtools/inc/svtools/calendar.hxx b/svtools/inc/svtools/calendar.hxx index d17d970..9395b0a 100644 --- a/svtools/inc/svtools/calendar.hxx +++ b/svtools/inc/svtools/calendar.hxx @@ -45,8 +45,6 @@ class HelpEvent; class DataChangedEvent; class FloatingWindow; class PushButton; -struct ImplDateInfo; -class ImplDateTable; class ImplCFieldFloatWin; /* @@ -173,7 +171,6 @@ oder durch Beendigung einer Selektion ausgeloest. class SVT_DLLPUBLIC Calendar : public Control { private: -ImplDateTable* mpDateTable; Table* mpSelectTable; Table* mpOldSelectTable; Table* mpRestoreSelectTable; diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx index e1d536d..20dce27 100644 --- a/svtools/source/control/calendar.cxx +++ b/svtools/source/control/calendar.cxx @@ -77,23 +77,6 @@ using namespace ::com::sun::star; // === -struct ImplDateInfo -{ -XubString maText; -Color* mpTextColor; -Color* mpFrameColor; -sal_uInt16 mnFlags; - -ImplDateInfo( const XubString& rText ) : -maText( rText ) -{ mpTextColor = mpFrameColor = NULL; mnFlags = 0; } -~ImplDateInfo() { delete mpTextColor; delete mpFrameColor; } -}; - -DECLARE_TABLE( ImplDateTable, ImplDateInfo* ) - -// === - static void ImplCalendarSelectDate( Table* pTable, const Date& rDate, sal_Bool bSelect ) { if ( bSelect ) @@ -196,7 +179,6 @@ inline void ImplCalendarClearSelectDate( Table* pTable ) void Calendar::ImplInit( WinBits nWinStyle ) { -mpDateTable = NULL; mpSelectTable = new Table; mpOldSelectTable= NULL; mpRestoreSelectTable= NULL; @@ -307,18 +289,6 @@ Calendar::~Calendar() delete mpSaturdayColor; delete mpSundayColor; -if ( mpDateTable ) -{ -ImplDateInfo* pDateInfo = mpDateTable->First(); -while ( pDateInfo ) -{ -delete pDateInfo; -pDateInfo = mpDateTable->Next(); -} - -delete mpDateTable; -} - delete mpSelectTable; if ( mpOldSelectTable ) delete mpOldSelectTable; @@ -770,7 +740,6 @@ void Calendar::ImplDrawDate( long nX, long nY, DayOfWeek eDayOfWeek, sal_Bool bBack, sal_Bool bOther, sal_uLong nToday ) { -ImplDateInfo* pDateInfo; Color* pTextColor = NULL; const String& rDay = *(mpDayText[nDay-1]); Rectangle aDateRect( nX, nY, nX+mnDayWidth-1, nY+mnDayHeight-1 ); @@ -788,16 +757,6 @@ void Calendar::ImplDrawDate( long nX, long nY, bSel = sal_True; } -// Dateinfo ermitteln -if ( mpDateTable ) -{ -pDateInfo = mpDateTable->Get( Date( nDay, nMonth, nYear ).GetDate() ); -if ( !pDateInfo ) -pDateInfo = mpDateTable->Get( Date( nDay, nMonth, 0 ).GetDate() ); -} -else -pDateInfo = NULL; - // Textfarbe ermitteln if ( bSel ) pTextColor = &maSelColor; @@ -805,17 +764,12 @@ void Calendar::ImplDrawDate( long nX, long nY, pTextColor = &maOtherColor; else { -if ( pDateInfo && pDateInfo->mpTextColor ) -pTextColor = pDateInfo->mpTextColor; -else -{ -if ( eDayOfWeek == SATURDAY ) -pTextColor = mpSaturdayColor; -else if ( eDayOfWeek == SUNDAY ) -pTextColor = mpSundayColor; -if ( !pTextColor ) -pTextColor = mpStandardColor; -} +if ( eDayOfWeek == SATURDAY ) +pTextColor = mpSaturdayColor; +else if ( eDayOfWeek == SUNDAY ) +pTextColor = mpSundayColor; +if ( !pTextColor ) +pTextColor = mpStandardColor; } if ( bFocus ) @@ -824,17 +778,6 @@ void Calendar::ImplDrawDate( long nX, long nY, // Font ermitteln Font aOldFont = GetFont(); sal_Bool bBoldFont = sal_False; -if ( (mnWinStyle & WB_BOLDTEXT) && - pDateInfo && (pDateInfo->mnFlags & DIB_BOLD) ) -{ -bBoldFont = sal_True; -Font aFont = aOldFont; -if ( aFont.GetWeight() < WEIGHT_BOLD ) -aFont.SetWeight( WEIGHT_BOLD ); -else -aFont.SetWeight( WEIGHT_NORMAL ); -SetFont( aFont ); -} // Hintergrund ausgeben const Styl
[Libreoffice] [PATCH] Remove unused code
This patch removes unused code as listed in unusedcode.easy From aea46d66c3f360782436ff53150d92877b687a45 Mon Sep 17 00:00:00 2001 From: Santiago Martinez Date: Fri, 20 Jan 2012 19:42:48 +0100 Subject: [PATCH] Removed unused code as listed in unusedcode.easy --- filter/inc/filter/msfilter/mstoolbar.hxx |1 - filter/source/msfilter/mstoolbar.cxx |5 - unusedcode.easy |1 - 3 files changed, 0 insertions(+), 7 deletions(-) diff --git a/filter/inc/filter/msfilter/mstoolbar.hxx b/filter/inc/filter/msfilter/mstoolbar.hxx index ccbefb2..35b05da 100644 --- a/filter/inc/filter/msfilter/mstoolbar.hxx +++ b/filter/inc/filter/msfilter/mstoolbar.hxx @@ -326,7 +326,6 @@ public: WString& getName(){ return name; } bool IsEnabled(); bool IsMenuToolbar(){ return ( ( ltbtr & 0x200 ) == 0x200 ); } -bool NeedsPositioning(); }; class MSFILTER_DLLPUBLIC SRECT : public TBBase diff --git a/filter/source/msfilter/mstoolbar.cxx b/filter/source/msfilter/mstoolbar.cxx index 044c691..fbac37f 100644 --- a/filter/source/msfilter/mstoolbar.cxx +++ b/filter/source/msfilter/mstoolbar.cxx @@ -781,11 +781,6 @@ bool TB::IsEnabled() return ( bFlags & 0x01 ) != 0x01; } -bool TB::NeedsPositioning() -{ -return ( bFlags & 0x10 ) == 0x10; -} - void TB::Print( FILE* fp ) { Indent a; diff --git a/unusedcode.easy b/unusedcode.easy index 18a54b3..f3f518b 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -711,7 +711,6 @@ SwpHtStart::Insert(SwTxtAttr const**, unsigned short) SwpHtStart::Insert(SwpHtStart const*, unsigned short, unsigned short) SwpHtStart::Remove(SwTxtAttr const*&, unsigned short) SystemChildWindow::SystemChildWindow(Window*, ResId const&) -TB::NeedsPositioning() TESortedPositions::Insert(TESortedPositions const*, unsigned short, unsigned short) TESortedPositions::Insert(unsigned long const&, unsigned short&) TESortedPositions::Insert(unsigned long const*, unsigned short) -- 1.7.7.5 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH] Remove unused code
From b42ee34845fdaf5e794a8b9319cf5a736fcbf653 Mon Sep 17 00:00:00 2001 From: Santiago Martinez Date: Fri, 20 Jan 2012 20:06:44 +0100 Subject: [PATCH] Remove unused code. --- unusedcode.easy |1 - vcl/inc/vcl/vclevent.hxx|1 - vcl/source/app/vclevent.cxx |4 3 files changed, 0 insertions(+), 6 deletions(-) diff --git a/unusedcode.easy b/unusedcode.easy index f3f518b..af3da47 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -754,7 +754,6 @@ VbaFontBase::getUnderline() VbaFontBase::setUnderline(com::sun::star::uno::Any const&) VbaFoundFilesEnum::SetFileList(com::sun::star::uno::Sequence&) VbaFoundFilesEnum::VbaFoundFilesEnum() -VclEventListeners2::~VclEventListeners2() ViewShell::getIDocumentFieldsAccess() const WP1FixedLengthGroup::isGroupConsistent(WPXInputStream*, WPXEncryption*, unsigned char) WP3ResourceFork::getResourcesByID(unsigned int) const diff --git a/vcl/inc/vcl/vclevent.hxx b/vcl/inc/vcl/vclevent.hxx index 51c5591..b1d5dd5 100644 --- a/vcl/inc/vcl/vclevent.hxx +++ b/vcl/inc/vcl/vclevent.hxx @@ -294,7 +294,6 @@ class VCL_DLLPUBLIC VclEventListeners2 : public vcl::DeletionNotifier public: VclEventListeners2(); -~VclEventListeners2(); void addListener( const Link& ); void removeListener( const Link& ); diff --git a/vcl/source/app/vclevent.cxx b/vcl/source/app/vclevent.cxx index 613a659..ceb78bc 100644 --- a/vcl/source/app/vclevent.cxx +++ b/vcl/source/app/vclevent.cxx @@ -118,10 +118,6 @@ VclEventListeners2::VclEventListeners2() { } -VclEventListeners2::~VclEventListeners2() -{ -} - void VclEventListeners2::addListener( const Link& i_rLink ) { // ensure uniqueness -- 1.7.7.5 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH] Remove unused code
This patch removes unused code as listed in unusedcode.easy From 7696cfebc875621dd68cbc65dc45772e530a79e7 Mon Sep 17 00:00:00 2001 From: Santiago Martinez Date: Fri, 27 Jan 2012 21:45:33 +0100 Subject: [PATCH] Remove unused code as listed in unusedcode.easy --- sc/source/ui/vba/vbachart.cxx | 33 - sc/source/ui/vba/vbachart.hxx |1 - unusedcode.easy |1 - 3 files changed, 0 insertions(+), 35 deletions(-) diff --git a/sc/source/ui/vba/vbachart.cxx b/sc/source/ui/vba/vbachart.cxx index 94d2900..db9d23e 100644 --- a/sc/source/ui/vba/vbachart.cxx +++ b/sc/source/ui/vba/vbachart.cxx @@ -1028,39 +1028,6 @@ ScVbaChart::assignDiagramAttributes() xTwoAxisYSupplier.set( mxDiagramPropertySet, uno::UNO_QUERY_THROW ); } -bool -ScVbaChart::isSeriesIndexValid(sal_Int32 _seriesindex) throw( script::BasicErrorException ) -{ -bool bret = false; -try -{ -uno::Reference< chart::XChartDataArray > xChartDataArray( mxChartDocument->getData(), uno::UNO_QUERY_THROW ); -//TODO I guess we have to differentiate between XlRowCol -if ( !xChartDataArray.is() ) -{ -if (getPlotBy() == xlRows) -{ -if ((_seriesindex < xChartDataArray->getRowDescriptions().getLength() ) && (_seriesindex >= 0)) -bret = true; -} -else -{ -if ((_seriesindex < xChartDataArray->getColumnDescriptions().getLength() ) && (_seriesindex >= 0)) -bret = true; -} -} -} -catch (const uno::Exception&) -{ -throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() ); -} -if (!bret) -{ -throw script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_OUT_OF_RANGE, rtl::OUString() ); -} -return bret; -} - uno::Reference< beans::XPropertySet > ScVbaChart::getAxisPropertySet(sal_Int32 _nAxisType, sal_Int32 _nAxisGroup) throw ( script::BasicErrorException ) diff --git a/sc/source/ui/vba/vbachart.hxx b/sc/source/ui/vba/vbachart.hxx index 104cc55..e984ecf 100644 --- a/sc/source/ui/vba/vbachart.hxx +++ b/sc/source/ui/vba/vbachart.hxx @@ -74,7 +74,6 @@ public: // Non-interface css::uno::Reference< css::beans::XPropertySet > xDiagramPropertySet() const { return mxDiagramPropertySet; } -bool isSeriesIndexValid(sal_Int32 _seriesindex) throw( css::script::BasicErrorException ); bool is3D() throw ( css::uno::RuntimeException ); css::uno::Reference< css::beans::XPropertySet > getAxisPropertySet(sal_Int32 _nAxisType, sal_Int32 _nAxisGroup) throw ( css::script::BasicErrorException ); // Methods diff --git a/unusedcode.easy b/unusedcode.easy index d75fd4f..23f628c 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -215,7 +215,6 @@ ScValidationEntries_Impl::Insert(ScValidationEntries_Impl const*, unsigned short ScValidationEntries_Impl::Remove(ScValidationData* const&, unsigned short) ScValidationEntries_Impl::Remove(unsigned short, unsigned short) ScValueCell::ScValueCell() -ScVbaChart::isSeriesIndexValid(int) ScVbaColorFormat::setColorFormat(short) ScVbaCommandBarControl::ScVbaCommandBarControl(com::sun::star::uno::Reference const&, com::sun::star::uno::Reference const&, com::sun::star::uno::Reference const&, boost::shared_ptr, com::sun::star::uno::Reference const&, rtl::OUString const&, int, unsigned char) ScVbaCommentShape::ScVbaCommentShape(com::sun::star::uno::Reference const&, com::sun::star::uno::Reference const&, com::sun::star::uno::Reference const&, com::sun::star::uno::Reference const&, com::sun::star::uno::Reference const&, com::sun::star::uno::Reference const&, int) -- 1.7.7.6 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH] Remove unused code
--- sc/inc/scdll.hxx |1 - sc/source/core/inc/ddelink.hxx|1 - sc/source/core/tool/ddelink.cxx | 11 - sc/source/ui/app/scdll.cxx| 10 sc/source/ui/dbgui/fieldwnd.cxx |5 sc/source/ui/inc/areasave.hxx |1 - sc/source/ui/inc/cellmergeoption.hxx |1 - sc/source/ui/inc/fieldwnd.hxx |1 - sc/source/ui/inc/scuitphfedit.hxx |4 --- sc/source/ui/pagedlg/scuitphfedit.cxx | 39 - sc/source/ui/undo/areasave.cxx|5 sc/source/ui/view/cellmergeoption.cxx |9 --- unusedcode.easy |9 --- 13 files changed, 0 insertions(+), 97 deletions(-) diff --git a/sc/inc/scdll.hxx b/sc/inc/scdll.hxx index 93cff7e..43a9c9f 100644 --- a/sc/inc/scdll.hxx +++ b/sc/inc/scdll.hxx @@ -61,7 +61,6 @@ public: // DLL-init/exit-code must be linked to the DLL only static void Init(); // called directly after loading the DLL -static void Exit(); // called directly befor unloading the DLL static sal_uLongDetectFilter( SfxMedium& rMedium, const SfxFilter** ppFilter, SfxFilterFlags nMust, SfxFilterFlags nDont ); diff --git a/sc/source/core/inc/ddelink.hxx b/sc/source/core/inc/ddelink.hxx index e3794e4..216d6d6 100644 --- a/sc/source/core/inc/ddelink.hxx +++ b/sc/source/core/inc/ddelink.hxx @@ -87,7 +87,6 @@ public: const String& GetItem() const { return aItem; } sal_uInt8 GetMode() const { return nMode; } -voidResetValue(); // Wert zuruecksetzen voidTryUpdate(); sal_BoolNeedsUpdate() const { return bNeedUpdate; } diff --git a/sc/source/core/tool/ddelink.cxx b/sc/source/core/tool/ddelink.cxx index 3bd75ae..5d36e52 100644 --- a/sc/source/core/tool/ddelink.cxx +++ b/sc/source/core/tool/ddelink.cxx @@ -228,17 +228,6 @@ sfx2::SvBaseLink::UpdateResult ScDdeLink::DataChanged( return SUCCESS; } -void ScDdeLink::ResetValue() -{ -pResult.reset(); - -// Es hat sich was getan... -// Tracking, FID_DATACHANGED etc. passiert von aussen - -if (HasListeners()) -Broadcast( ScHint( SC_HINT_DATACHANGED, ScAddress(), NULL ) ); -} - void ScDdeLink::ListenersGone() { sal_Bool bWas = bIsInUpdate; diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx index 9cf9555..0a57bf6 100644 --- a/sc/source/ui/app/scdll.cxx +++ b/sc/source/ui/app/scdll.cxx @@ -312,16 +312,6 @@ void ScDLL::Init() // StarOne Services are now handled in the registry } -void ScDLL::Exit() -{ -// the SxxModule must be destroyed -ScModule **ppShlPtr = (ScModule**) GetAppData(SHL_CALC); -delete (*ppShlPtr); -(*ppShlPtr) = NULL; - -// ScGlobal::Clear ist schon im Module-dtor -} - //-- // Statusbar //-- diff --git a/sc/source/ui/dbgui/fieldwnd.cxx b/sc/source/ui/dbgui/fieldwnd.cxx index 40eb873..9139be4 100644 --- a/sc/source/ui/dbgui/fieldwnd.cxx +++ b/sc/source/ui/dbgui/fieldwnd.cxx @@ -254,11 +254,6 @@ size_t ScDPFieldControlBase::GetSelectedField() const return mnFieldSelected; } -void ScDPFieldControlBase::SetSelectedField(size_t nSelected) -{ -mnFieldSelected = nSelected; -} - vector& ScDPFieldControlBase::GetFieldNames() { return maFieldNames; diff --git a/sc/source/ui/inc/areasave.hxx b/sc/source/ui/inc/areasave.hxx index c9ff348..1a0b1cd 100644 --- a/sc/source/ui/inc/areasave.hxx +++ b/sc/source/ui/inc/areasave.hxx @@ -78,7 +78,6 @@ public: const ScAreaLinkSaver* operator[](size_t nIndex) const; size_t size() const; -void clear(); void push_back(ScAreaLinkSaver* p); }; diff --git a/sc/source/ui/inc/cellmergeoption.hxx b/sc/source/ui/inc/cellmergeoption.hxx index ad5fe34..62e4279 100644 --- a/sc/source/ui/inc/cellmergeoption.hxx +++ b/sc/source/ui/inc/cellmergeoption.hxx @@ -44,7 +44,6 @@ struct ScCellMergeOption SCROW mnEndRow; bool mbCenter; -explicit ScCellMergeOption(); explicit ScCellMergeOption(const ScRange& rRange); explicit ScCellMergeOption(SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, diff --git a/sc/source/ui/inc/fieldwnd.hxx b/sc/source/ui/inc/fieldwnd.hxx index 2b232cf..49fc2ed 100644 --- a/sc/source/ui/inc/fieldwnd.hxx +++ b/sc/source/ui/inc/fieldwnd.hxx @@ -149,7 +149,6 @@ public: voidGetExistingIndex( const Point& rPos, size_t& rnIndex ); size_t GetSelectedField() const; -void SetSelectedField(size_t nSelected); /** Selects the next field. Called i.e. after moving a field from SELECT area. */ voidSelectNext(); diff --git a/sc/source/ui/inc/scuitphfedit.hxx b/sc/source/ui/inc/scuitphfedit.hxx index b8c3e20..f14d5fc 100
[Libreoffice] [PATCH] Remove unused code
This patch removes unused code as listed in unusedcode.easy From 4eaa8adb17c0334f08c83509644b45553254376e Mon Sep 17 00:00:00 2001 From: Santiago Martinez Date: Tue, 31 Jan 2012 19:59:31 +0100 Subject: [PATCH] Remove unused code. --- chart2/source/view/axes/Tickmarks_Equidistant.cxx | 27 - chart2/source/view/axes/Tickmarks_Equidistant.hxx |5 unusedcode.easy |3 -- 3 files changed, 0 insertions(+), 35 deletions(-) diff --git a/chart2/source/view/axes/Tickmarks_Equidistant.cxx b/chart2/source/view/axes/Tickmarks_Equidistant.cxx index 7e15dda..73379b0 100644 --- a/chart2/source/view/axes/Tickmarks_Equidistant.cxx +++ b/chart2/source/view/axes/Tickmarks_Equidistant.cxx @@ -626,33 +626,6 @@ bool EquidistantTickIter::gotoNext() return true; } -bool EquidistantTickIter::gotoIndex( sal_Int32 nTickIndex ) -{ -if( nTickIndex < 0 ) -return false; -if( nTickIndex >= m_nTickCount ) -return false; - -if( nTickIndex < m_nCurrentPos ) -if( !gotoFirst() ) -return false; - -while( nTickIndex > m_nCurrentPos ) -if( !gotoNext() ) -return false; - -return true; -} - -sal_Int32 EquidistantTickIter::getCurrentIndex() const -{ -return m_nCurrentPos; -} -sal_Int32 EquidistantTickIter::getMaxIndex() const -{ -return m_nTickCount-1; -} - double* EquidistantTickIter::nextValue() { if( gotoNext() ) diff --git a/chart2/source/view/axes/Tickmarks_Equidistant.hxx b/chart2/source/view/axes/Tickmarks_Equidistant.hxx index c312b2f..c9f2dc5 100644 --- a/chart2/source/view/axes/Tickmarks_Equidistant.hxx +++ b/chart2/source/view/axes/Tickmarks_Equidistant.hxx @@ -60,11 +60,6 @@ public: sal_Int32 getCurrentDepth() const { return m_nCurrentDepth; } -protected: -boolgotoIndex( sal_Int32 nTickIndex ); -sal_Int32 getCurrentIndex() const; -sal_Int32 getMaxIndex() const; - private: //methods sal_Int32 getIntervalCount( sal_Int32 nDepth ); boolisAtLastPartTick(); diff --git a/unusedcode.easy b/unusedcode.easy index a54e369..32f3dac 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -1228,9 +1228,6 @@ canvas::tools::mergeViewAndRenderState(com::sun::star::rendering::ViewState&, co canvas::tools::prependToViewState(com::sun::star::rendering::ViewState&, basegfx::B2DHomMatrix const&) canvas::tools::verifyInput(com::sun::star::geometry::RealSize2D const&, char const*, com::sun::star::uno::Reference const&, short) canvas::tools::verifyInput(com::sun::star::rendering::FloatingPointBitmapLayout const&, char const*, com::sun::star::uno::Reference const&, short) -chart::EquidistantTickIter::getCurrentIndex() const -chart::EquidistantTickIter::getMaxIndex() const -chart::EquidistantTickIter::gotoIndex(int) cmis::Content::exchangeIdentity(com::sun::star::uno::Reference const&) cmis::Content::queryChildren(std::__debug::list, std::allocator > >&) comphelper::AccessibleEventNotifier::getEventListeners(unsigned int) -- 1.7.7.6 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH] Remove unused code
Some more blocks of unused code in libs-gui and libs-core. All have been commented out since at least 2006. Anders Jonsson (LGPLv3+,MPL) 0001-Remove-large-blocks-of-commented-code.patch Description: application/mbox 0002-Remove-large-blocks-of-commented-code.patch Description: application/mbox ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH] Remove unused code
Some more unused code, this time in ure and impress. All code has been commented out at least since 2005. Anders Jonsson (LGPLv3+,MPL) >From 055470cbc7c315c37032667822417f109b7235d1 Mon Sep 17 00:00:00 2001 From: Anders Jonsson Date: Wed, 22 Dec 2010 08:22:12 +0100 Subject: Remove commented code --- codemaker/source/cunomaker/cunotype.cxx | 233 --- sal/qa/osl/socket/sockethelper.cxx | 90 stoc/test/testsmgr_cpnt.cxx | 123 3 files changed, 0 insertions(+), 446 deletions(-) diff --git a/codemaker/source/cunomaker/cunotype.cxx b/codemaker/source/cunomaker/cunotype.cxx index 40637c7..1258885 100644 --- a/codemaker/source/cunomaker/cunotype.cxx +++ b/codemaker/source/cunomaker/cunotype.cxx @@ -295,15 +295,6 @@ void CunoType::dumpDefaultHIncludes(FileStream& o) o << "#ifndef _UNO_CUNO_H_\n" << "#include \n" << "#endif\n"; -/* -if (m_typeMgr.getTypeClass(m_typeName) == RT_TYPE_INTERFACE && -!m_typeName.equals("com/sun/star/uno/XInterface") ) -{ -o << "#ifndef _COM_SUN_STAR_UNO_XINTERFACE_H_\n" - << "#include \n" - << "#endif\n"; -} -*/ } void CunoType::dumpDefaultCIncludes(FileStream& o) @@ -415,12 +406,6 @@ void CunoType::dumpDepIncludes(FileStream& o, const OString& typeName, sal_Char* iLastS = outerNamespace.lastIndexOf('/'); OString outerClass(outerNamespace.copy(iLastS+1)); - -// o << "\n"; -// dumpNameSpace(o, sal_True, sal_False, outerNamespace); -// o << "\nclass " << outerClass << "::" << innerClass << ";\n"; -// dumpNameSpace(o, sal_False, sal_False, outerNamespace); -// o << "\n\n"; } else { @@ -1548,27 +1533,6 @@ sal_Bool InterfaceType::dumpHFile(FileStream& o) << "#endif\n\n"; } -/* -if (getNestedTypeNames().getLength() > 0) -{ -o << indent() << "// nested types\n\n"; -for (sal_uInt32 i = 0; i < getNestedTypeNames().getLength(); i++) -{ -OUString s(getNestedTypeNames().getElement(i)); - -OString nestedName(s.getStr(), s.getLength(), RTL_TEXTENCODING_UTF8); - -nestedName = checkRealBaseType(nestedName.copy(5)); - -if (nestedName.lastIndexOf(']') < 0) -{ -o << "inline const ::com::sun::star::uno::Type& SAL_CALL getCunoType( "; -dumpType(o, nestedName, sal_True, sal_False); -o << "* ) SAL_THROW( () );\n\n"; -} -} -} -*/ dumpCloseExternC(o); o << "#endif /* "<< headerDefine << " */\n"; @@ -1598,65 +1562,7 @@ sal_Bool InterfaceType::dumpDeclaration(FileStream& o) OString superType(m_reader.getSuperTypeName()); if (superType.getLength() > 0) dumpInheritedFunctions(o, superType); -/* -if (getNestedTypeNames().getLength() > 0) -{ -inc(); -o << indent() << "// nested types\n\n"; -for (sal_uInt32 i = 0; i < getNestedTypeNames().getLength(); i++) -{ -OUString s(getNestedTypeNames().getElement(i)); - -OString nestedName(s.getStr(), s.getLength(), RTL_TEXTENCODING_UTF8); - -nestedName = nestedName.copy(5); -o << indent() << "// " << nestedName.getStr() << "\n"; - -TypeReader reader(m_typeMgr.getTypeReader(nestedName)); - -if (reader.isValid()) -{ -RTTypeClass typeClass = reader.getTypeClass(); -switch (typeClass) { -case RT_TYPE_INTERFACE: -{ -InterfaceType iType(reader, nestedName, m_typeMgr, m_dependencies); -iType.dumpDeclaration(o); -} -break; -case RT_TYPE_STRUCT: -{ -StructureType sType(reader, nestedName, m_typeMgr, m_dependencies); -sType.dumpDeclaration(o); -} -break; -case RT_TYPE_ENUM: -{ -EnumType enType(reader, nestedName, m_typeMgr, m_dependencies); -enType.dumpDeclaration(o); -} -break; -case RT_TYPE_EXCEPTION: -{ -ExceptionType eType(reader, nestedName, m_typeMgr, m_dependencies); -eType.dumpDeclaration(o); -} -break; -case RT_TYPE_TYPEDEF: -{ -TypeDefType tdType(reader, nestedName, m_typeMgr, m_dependencies); -tdType.dumpDeclaration(o); -
[Libreoffice] [PATCH] Remove unused code
Some more commented code, this time in calc. All code has been commented out at least since 2005. Anders Jonsson, (LGPLv3+,MPL) >From 732c13e33612b80ce4e4479698e0710f791de2c4 Mon Sep 17 00:00:00 2001 From: Anders Jonsson Date: Tue, 11 Jan 2011 22:17:44 +0100 Subject: Remove commented code --- sc/source/filter/xml/xmlexprt.cxx | 99 - sc/source/ui/drawfunc/futext.cxx | 67 - sc/source/ui/optdlg/opredlin.cxx | 48 -- 3 files changed, 0 insertions(+), 214 deletions(-) diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index 1c62691..9799058 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -1967,10 +1967,6 @@ void ScXMLExport::_ExportStyles( sal_Bool bUsed ) if (pSharedData->HasShapes()) { GetShapeExport()->ExportGraphicDefaults(); -/*xInterface = xMultiServiceFactory->createInstance(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.Defaults"))); -uno::Reference xDrawProperties(xInterface, uno::UNO_QUERY); -if (xDrawProperties.is()) -aStylesExp.exportDefaultStyle(xDrawProperties, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_SD_GRAPHICS_NAME)), GetShapeExport()->CreateShapePropMapper(*this));*/ } } uno::Reference xStyleFamiliesSupplier (GetModel(), uno::UNO_QUERY); @@ -2849,44 +2845,6 @@ sal_Bool ScXMLExport::IsMatrix (const ScAddress& aCell, } return sal_False; - -/* uno::Reference xArrayFormulaRange (xCell, uno::UNO_QUERY); -if (xArrayFormulaRange.is()) -{ -rtl::OUString sArrayFormula(xArrayFormulaRange->getArrayFormula()); -if (sArrayFormula.getLength()) -{ -uno::Reference xMatrixSheetCellRange (xCell, uno::UNO_QUERY); -if (xMatrixSheetCellRange.is()) -{ -uno::Reference xMatrixSheetCursor(xTable->createCursorByRange(xMatrixSheetCellRange)); -if (xMatrixSheetCursor.is()) -{ -xMatrixSheetCursor->collapseToCurrentArray(); -uno::Reference xMatrixCellAddress (xMatrixSheetCursor, uno::UNO_QUERY); -if (xMatrixCellAddress.is()) -{ -aCellAddress = xMatrixCellAddress->getRangeAddress(); -if ((aCellAddress.StartColumn == nCol && aCellAddress.StartRow == nRow) && -(aCellAddress.EndColumn > nCol || aCellAddress.EndRow > nRow)) -{ -bIsFirst = sal_True; -return sal_True; -} -else if (aCellAddress.StartColumn != nCol || aCellAddress.StartRow != nRow || -aCellAddress.EndColumn != nCol || aCellAddress.EndRow != nRow) -return sal_True; -else -{ -bIsFirst = sal_True; -return sal_True; -} -} -} -} -} -} -return sal_False;*/ } sal_Bool ScXMLExport::GetCellText (ScMyCell& rMyCell, const ScAddress& aPos) const @@ -2895,17 +2853,9 @@ sal_Bool ScXMLExport::GetCellText (ScMyCell& rMyCell, const ScAddress& aPos) con return sal_True; else { -/* if (!rMyCell.bHasXText) -{ -rMyCell.xText.set(xCurrentTableCellRange->getCellByPosition(rMyCell.aCellAddress.Column, rMyCell.aCellAddress.Row), uno::UNO_QUERY); -rMyCell.bHasXText = sal_True; -}*/ -// if (rMyCell.xText.is()) -// { rMyCell.sStringValue = ScCellObj::GetOutputString_Impl(pDoc, aPos); rMyCell.bHasStringValue = sal_True; return sal_True; -// } } } @@ -3199,15 +3149,6 @@ void ScXMLExport::ExportShape(const uno::Reference < drawing::XShape >& xShape, //BM } //BM } -/* SchMemChart* pMemChart = pDoc->FindChartData(sName); -if (pMemChart && pMemChart->GetSeriesAddresses().getLength()) -{ -bMemChart = sal_True; -rtl::OUString sRanges(pMemChart->getXMLStringForChartRange()); -if (sRanges.getLength()) -AddAttribute(XML_NAMESPACE_DRAW, XML_NOTIFY_ON_UPDATE_OF_RANGES, sRanges); -GetShapeExport()->exportShape(xShape, SEF_EXPORT_NO_CHART_DATA | SEF_DEFAULT, pPoint); -}*/ } } } @@ -3403,46 +3344,6 @@ void ScXMLExport::WriteAnnotation(ScMyCell& rMyCell) { if( rMyCell.bHasAnnotation && rMyCell.xAnnotation.is()) { -/* rtl::OUString sAuthor(rMyCell.xAnnotation->getAuthor()); -
Re: [Libreoffice] [PATCH] Remove unused code
On 20/01/12 19:56, Santiago Martinez wrote: > This patch removes unused code as listed in unusedcode.easy thanks Santiago for the patch, pushed: http://cgit.freedesktop.org/libreoffice/core/commit/?id=7ce98f34150d430b12804eb9796e4142b7c6517c ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] Remove unused code
On 20/01/12 20:13, Santiago Martinez wrote: > -VclEventListeners2::~VclEventListeners2() > -{ > -} i'm not sure this is right; if a destructor of a class is unused, but its other methods are used, then that usually indicates a memory leak: the destructor is never called because all instances are leaked. regards, michael ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] Remove unused code
On 01/20/2012 09:57 PM, Michael Stahl wrote: i'm not sure this is right; if a destructor of a class is unused, but its other methods are used, then that usually indicates a memory leak: the destructor is never called because all instances are leaked. It might make sense to treat destructors specially in callcatcher, as they indicate "resource leak" (unless all the constructors of a given class are also unused) rather than "unused code." Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] Remove unused code
Hi Michael, On Friday, 2012-01-20 21:57:25 +0100, Michael Stahl wrote: > > -VclEventListeners2::~VclEventListeners2() > > -{ > > -} > > i'm not sure this is right; if a destructor of a class is unused, but > its other methods are used, then that usually indicates a memory leak: > the destructor is never called because all instances are leaked. Yup.. given that we have class VclEventListeners2 : public vcl::DeletionNotifier { ~VclEventListeners2(); } maybe it's sufficient to make the dtor virtual if there's a delete baseclasspointer somewhere? Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD pgpjfZc971kQS.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] Remove unused code
Hi Elton First thanks for submitting your patch, it's appreciated however could I ask if you could please repost your patch as an attachment [1] ? patch content inline in a mail message just does't work as the mail client breaks the lines in such a way as the patch program no longer understands the diff. A patch as an attachmentwill help the reviewers integrate your work easily, thanks again Noel p.s. could you also confirm you contribution is under the MPL 1.1 / GPLv3+ / LGPLv3+ license(s) [1] http://wiki.documentfoundation.org/Development/Patch_Handling_Guidelines#How_to_submit_a_patch On 31/01/12 07:58, Elton Chung wrote: --- sc/inc/scdll.hxx |1 - sc/source/core/inc/ddelink.hxx|1 - sc/source/core/tool/ddelink.cxx | 11 - sc/source/ui/app/scdll.cxx| 10 sc/source/ui/dbgui/fieldwnd.cxx |5 sc/source/ui/inc/areasave.hxx |1 - sc/source/ui/inc/cellmergeoption.hxx |1 - sc/source/ui/inc/fieldwnd.hxx |1 - sc/source/ui/inc/scuitphfedit.hxx |4 --- sc/source/ui/pagedlg/scuitphfedit.cxx | 39 - sc/source/ui/undo/areasave.cxx|5 sc/source/ui/view/cellmergeoption.cxx |9 --- unusedcode.easy |9 --- 13 files changed, 0 insertions(+), 97 deletions(-) diff --git a/sc/inc/scdll.hxx b/sc/inc/scdll.hxx index 93cff7e..43a9c9f 100644 --- a/sc/inc/scdll.hxx +++ b/sc/inc/scdll.hxx @@ -61,7 +61,6 @@ public: // DLL-init/exit-code must be linked to the DLL only static void Init(); // called directly after loading the DLL -static void Exit(); // called directly befor unloading the DLL static sal_uLongDetectFilter( SfxMedium& rMedium, const SfxFilter** ppFilter, SfxFilterFlags nMust, SfxFilterFlags nDont ); diff --git a/sc/source/core/inc/ddelink.hxx b/sc/source/core/inc/ddelink.hxx index e3794e4..216d6d6 100644 --- a/sc/source/core/inc/ddelink.hxx +++ b/sc/source/core/inc/ddelink.hxx @@ -87,7 +87,6 @@ public: const String&GetItem() const { return aItem; } sal_uInt8 GetMode() const { return nMode; } -voidResetValue(); // Wert zuruecksetzen voidTryUpdate(); sal_BoolNeedsUpdate() const { return bNeedUpdate; } diff --git a/sc/source/core/tool/ddelink.cxx b/sc/source/core/tool/ddelink.cxx index 3bd75ae..5d36e52 100644 --- a/sc/source/core/tool/ddelink.cxx +++ b/sc/source/core/tool/ddelink.cxx @@ -228,17 +228,6 @@ sfx2::SvBaseLink::UpdateResult ScDdeLink::DataChanged( return SUCCESS; } -void ScDdeLink::ResetValue() -{ -pResult.reset(); - -// Es hat sich was getan... -// Tracking, FID_DATACHANGED etc. passiert von aussen - -if (HasListeners()) -Broadcast( ScHint( SC_HINT_DATACHANGED, ScAddress(), NULL ) ); -} - void ScDdeLink::ListenersGone() { sal_Bool bWas = bIsInUpdate; diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx index 9cf9555..0a57bf6 100644 --- a/sc/source/ui/app/scdll.cxx +++ b/sc/source/ui/app/scdll.cxx @@ -312,16 +312,6 @@ void ScDLL::Init() // StarOne Services are now handled in the registry } -void ScDLL::Exit() -{ -// the SxxModule must be destroyed -ScModule **ppShlPtr = (ScModule**) GetAppData(SHL_CALC); -delete (*ppShlPtr); -(*ppShlPtr) = NULL; - -// ScGlobal::Clear ist schon im Module-dtor -} - //-- // Statusbar //-- diff --git a/sc/source/ui/dbgui/fieldwnd.cxx b/sc/source/ui/dbgui/fieldwnd.cxx index 40eb873..9139be4 100644 --- a/sc/source/ui/dbgui/fieldwnd.cxx +++ b/sc/source/ui/dbgui/fieldwnd.cxx @@ -254,11 +254,6 @@ size_t ScDPFieldControlBase::GetSelectedField() const return mnFieldSelected; } -void ScDPFieldControlBase::SetSelectedField(size_t nSelected) -{ -mnFieldSelected = nSelected; -} - vector& ScDPFieldControlBase::GetFieldNames() { return maFieldNames; diff --git a/sc/source/ui/inc/areasave.hxx b/sc/source/ui/inc/areasave.hxx index c9ff348..1a0b1cd 100644 --- a/sc/source/ui/inc/areasave.hxx +++ b/sc/source/ui/inc/areasave.hxx @@ -78,7 +78,6 @@ public: const ScAreaLinkSaver* operator[](size_t nIndex) const; size_t size() const; -void clear(); void push_back(ScAreaLinkSaver* p); }; diff --git a/sc/source/ui/inc/cellmergeoption.hxx b/sc/source/ui/inc/cellmergeoption.hxx index ad5fe34..62e4279 100644 --- a/sc/source/ui/inc/cellmergeoption.hxx +++ b/sc/source/ui/inc/cellmergeoption.hxx @@ -44,7 +44,6 @@ struct ScCellMergeOption SCROW mnEndRow; bool mbCenter; -explicit ScCellMergeOption(); explicit ScCellMergeOption(const ScRange& rRange); explicit ScCellMergeOpt
Re: [Libreoffice] [PATCH] Remove unused code
Hi Noel, *, I have attached the patch as an attachment. I also confirm that this contribution, as well as future ones are licensed under MPL 1.1 / GPL v3+ / LGPL v3+. Best Regards, Elton -- Elton Chung Administrator, sponsor of mirror.layerjet.com Language Maintainer of ReactOS Open Source operating system project | http://reactos.org Email/ IM: el...@elton.tk 0001-Remove-unused-code.patch Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] Remove unused code
On 31/01/12 11:05, Elton Chung wrote: Hi Noel, *, I have attached the patch as an attachment. I also confirm that this contribution, as well as future ones are licensed under MPL 1.1 / GPL v3+ / LGPL v3+. ok, pushed, thank, ps. next time don't chop off the header of the formatted patch 'cause 'git am' had problems processing the patch, anyway not to worry as 'patch' still accepted it and I added the author and description manually thanks again Noel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] Remove unused code
Hi Anders, thanks for your patch. Looks good to me so I pushed it. It contains sd/ module changes only though, so maybe you forget the ure part? Cheers Radek On Wed, 2010-12-22 at 08:31 +0100, Anders Jonsson wrote: > Some more unused code, this time in ure and impress. All code has been > commented out at least since 2005. > > > Anders Jonsson > (LGPLv3+,MPL) > ___ > LibreOffice mailing list > LibreOffice@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] Remove unused code
On Wed, 2010-12-22 at 11:29 +0100, Radek Doulik wrote: > Hi Anders, > > thanks for your patch. Looks good to me so I pushed it. > > It contains sd/ module changes only though, so maybe you forget the ure > part? ops, sorry. I managed to miss it when reading your mail, I will review it as well. Cheers Radek > Cheers > Radek > > On Wed, 2010-12-22 at 08:31 +0100, Anders Jonsson wrote: > > Some more unused code, this time in ure and impress. All code has been > > commented out at least since 2005. > > > > > > Anders Jonsson > > (LGPLv3+,MPL) > > ___ > > LibreOffice mailing list > > LibreOffice@lists.freedesktop.org > > http://lists.freedesktop.org/mailman/listinfo/libreoffice > > > ___ > LibreOffice mailing list > LibreOffice@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] Remove unused code
On Wed, 2010-12-22 at 12:00 +0100, Radek Doulik wrote: > On Wed, 2010-12-22 at 11:29 +0100, Radek Doulik wrote: > > Hi Anders, > > > > thanks for your patch. Looks good to me so I pushed it. > > > > It contains sd/ module changes only though, so maybe you forget the ure > > part? > > ops, sorry. I managed to miss it when reading your mail, I will review > it as well. pushed it too. Thanks once more! Cheers Radek > Cheers > Radek > > > Cheers > > Radek > > > > On Wed, 2010-12-22 at 08:31 +0100, Anders Jonsson wrote: > > > Some more unused code, this time in ure and impress. All code has been > > > commented out at least since 2005. > > > > > > > > > Anders Jonsson > > > (LGPLv3+,MPL) > > > ___ > > > LibreOffice mailing list > > > LibreOffice@lists.freedesktop.org > > > http://lists.freedesktop.org/mailman/listinfo/libreoffice > > > > > > ___ > > LibreOffice mailing list > > LibreOffice@lists.freedesktop.org > > http://lists.freedesktop.org/mailman/listinfo/libreoffice > > > ___ > LibreOffice mailing list > LibreOffice@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Re: [Libreoffice] [PATCH] Remove unused code
Noel Power píše v Út 31. 01. 2012 v 12:39 +: > ok, pushed, Just marking the thread [PUSHED] :-) Regards, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [PATCH] Remove unused code and fix typos
Hi, Here is a bunch of cleanup on base. Cheers, -- Takeshi Abe >From 17a5c538b6e9ed1c13efda786e39986a82163a98 Mon Sep 17 00:00:00 2001 From: Takeshi Abe Date: Sun, 9 Jan 2011 02:04:00 +0900 Subject: [PATCH] Remove unused code and fix typos --- dbaccess/source/core/api/RowSetCache.cxx |1 - dbaccess/source/core/api/tablecontainer.cxx|3 +-- dbaccess/source/core/api/viewcontainer.cxx |1 - .../source/core/dataaccess/definitioncontainer.cxx |2 +- dbaccess/source/ui/dlg/ConnectionHelper.cxx| 10 +++--- dbaccess/source/ui/dlg/ConnectionPageSetup.cxx |1 - dbaccess/source/ui/dlg/ExtensionNotPresent.cxx |1 - dbaccess/source/ui/dlg/adminpages.cxx |2 +- dbaccess/source/ui/inc/ExtensionNotPresent.hxx |4 dbaccess/source/ui/inc/WTabPage.hxx|2 +- dbaccess/source/ui/misc/HtmlReader.cxx |4 dbaccess/source/ui/misc/UITools.cxx|1 - dbaccess/source/ui/misc/WColumnSelect.cxx |2 -- dbaccess/source/ui/querydesign/JoinTableView.cxx |9 - dbaccess/source/ui/uno/dbinteraction.cxx |2 +- reportdesign/inc/reportformula.hxx |2 +- reportdesign/qa/complex/ReportDesignerTest.java|8 reportdesign/source/core/sdr/RptPage.cxx |1 - reportdesign/source/core/sdr/UndoEnv.cxx |2 -- reportdesign/source/ui/inc/DateTime.hxx|1 - reportdesign/source/ui/inc/FixedTextColor.hxx |2 -- .../source/ui/inc/ReportControllerObserver.hxx |8 +--- reportdesign/source/ui/inc/ViewsWindow.hxx |2 -- .../ui/inspection/ReportComponentHandler.cxx |1 - reportdesign/source/ui/report/ReportSection.cxx|2 +- 25 files changed, 15 insertions(+), 59 deletions(-) diff --git a/dbaccess/source/core/api/RowSetCache.cxx b/dbaccess/source/core/api/RowSetCache.cxx index bd2f8b8..f795ce7 100644 --- a/dbaccess/source/core/api/RowSetCache.cxx +++ b/dbaccess/source/core/api/RowSetCache.cxx @@ -186,7 +186,6 @@ ORowSetCache::ORowSetCache(const Reference< XResultSet >& _xRs, } catch(const Exception&) { -// DBG_UNHANDLED_EXCEPTION(); } m_pCacheSet = NULL; m_xCacheSet.clear(); diff --git a/dbaccess/source/core/api/tablecontainer.cxx b/dbaccess/source/core/api/tablecontainer.cxx index 6aa893e..d139482 100644 --- a/dbaccess/source/core/api/tablecontainer.cxx +++ b/dbaccess/source/core/api/tablecontainer.cxx @@ -130,7 +130,6 @@ OTableContainer::OTableContainer(::cppu::OWeakObject& _rParent, OTableContainer::~OTableContainer() { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "api", "ocke.jans...@sun.com", "OTableContainer::OTableContainer" ); -// dispose(); DBG_DTOR(OTableContainer, NULL); } @@ -480,7 +479,7 @@ void SAL_CALL OTableContainer::disposing() { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "api", "ocke.jans...@sun.com", "OTableContainer::disposing" ); OFilteredContainer::disposing(); -// say our listeners goobye +// say our listeners goodbye m_xTableDefinitions = NULL; m_pTableMediator = NULL; } diff --git a/dbaccess/source/core/api/viewcontainer.cxx b/dbaccess/source/core/api/viewcontainer.cxx index 4589fb9..3a2d965 100644 --- a/dbaccess/source/core/api/viewcontainer.cxx +++ b/dbaccess/source/core/api/viewcontainer.cxx @@ -89,7 +89,6 @@ OViewContainer::OViewContainer(::cppu::OWeakObject& _rParent OViewContainer::~OViewContainer() { -// dispose(); DBG_DTOR(OViewContainer, NULL); } diff --git a/dbaccess/source/core/dataaccess/definitioncontainer.cxx b/dbaccess/source/core/dataaccess/definitioncontainer.cxx index a918726..9638290 100644 --- a/dbaccess/source/core/dataaccess/definitioncontainer.cxx +++ b/dbaccess/source/core/dataaccess/definitioncontainer.cxx @@ -135,7 +135,7 @@ void SAL_CALL ODefinitionContainer::disposing() MutexGuard aGuard(m_aMutex); -// say our listeners goobye +// say our listeners goodbye EventObject aEvt(*this); m_aApproveListeners.disposeAndClear(aEvt); m_aContainerListeners.disposeAndClear(aEvt); diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx index 0cf7283..b1d0971 100644 --- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx @@ -58,7 +58,6 @@ #include #include #include -// #106016# #include #include #include "UITools.hxx" @@ -328,7 +327,6 @@ DBG_NAME(OConnectionHelper) if (RET_OK == aSelector.Execute()) { setURLNoPrefix(aSelector.GetSelected()); -// checkCreateDatabase( ::dbaccess::DST_ADABAS); SetRoadmapStateValue(sal_True); ca