diff options
author | Takeshi Abe <tabe@fixedpoint.jp> | 2012-06-12 14:16:45 +0900 |
---|---|---|
committer | Takeshi Abe <tabe@fixedpoint.jp> | 2012-06-12 14:16:45 +0900 |
commit | 16738213c400f9192abc2ff6c08d7f711dee8d34 (patch) | |
tree | 3e17fbd6d8ab5a823ea4333a2325ee233ca8e4a7 | |
parent | a3451df90e0db9d37a7c6950c2eea53a96616e12 (diff) |
nuke dead code
Change-Id: If8b6b4a3d9222726ae562e5b685710d86b5fe332
-rw-r--r-- | sw/source/core/layout/calcmove.cxx | 15 | ||||
-rw-r--r-- | sw/source/core/layout/flyincnt.cxx | 11 | ||||
-rw-r--r-- | sw/source/ui/shells/tabsh.cxx | 10 | ||||
-rw-r--r-- | toolkit/source/awt/vclxtabpagecontainer.cxx | 14 | ||||
-rw-r--r-- | toolkit/source/awt/vclxtoolkit.cxx | 43 | ||||
-rw-r--r-- | toolkit/source/awt/vclxwindow.cxx | 13 | ||||
-rw-r--r-- | toolkit/source/controls/unocontrols.cxx | 9 | ||||
-rw-r--r-- | tools/source/fsys/dirent.cxx | 6 | ||||
-rw-r--r-- | ucb/source/ucp/odma/odma_provider.cxx | 7 | ||||
-rw-r--r-- | ucb/source/ucp/webdav/DateTimeHelper.cxx | 22 | ||||
-rw-r--r-- | unotools/inc/unotools/viewoptions.hxx | 28 | ||||
-rw-r--r-- | unotools/source/misc/fontcvt.cxx | 77 | ||||
-rw-r--r-- | unoxml/source/dom/node.cxx | 4 |
13 files changed, 0 insertions, 259 deletions
diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx index b0499133228c..70aafc0caf4b 100644 --- a/sw/source/core/layout/calcmove.cxx +++ b/sw/source/core/layout/calcmove.cxx @@ -731,10 +731,6 @@ void SwPageFrm::MakeAll() if ( nWidth < pSh->GetBrowseWidth() ) nWidth = pSh->GetBrowseWidth(); nWidth += + 2 * aBorder.Width(); -/* - long nWidth = GetUpper() ? ((SwRootFrm*)GetUpper())->GetBrowseWidth() + 2 * aBorder.Width() : 0; - if ( nWidth < pSh->VisArea().Width() ) - nWidth = pSh->VisArea().Width(); */ nWidth = Max( nWidth, 2L * aBorder.Width() + 4L*MM50 ); Frm().Width( nWidth ); @@ -1066,17 +1062,6 @@ sal_Bool SwCntntFrm::MakePrtArea( const SwBorderAttrs &rAttrs ) nUpper=0; nLower=0; } -// // in balanced columned section frames we do not want the -// // common border -// sal_Bool bCommonBorder = sal_True; -// if ( IsInSct() && GetUpper()->IsColBodyFrm() ) -// { -// const SwSectionFrm* pSct = FindSctFrm(); -// bCommonBorder = pSct->GetFmt()->GetBalancedColumns().GetValue(); -// } -// SwTwips nLower = bCommonBorder ? -// rAttrs.GetBottomLine( this ) : -// rAttrs.CalcBottomLine(); (Prt().*fnRect->fnSetPosY)( (!bVert || bReverse) ? nUpper : nLower); nUpper += nLower; diff --git a/sw/source/core/layout/flyincnt.cxx b/sw/source/core/layout/flyincnt.cxx index 676191befdbb..5caf39b35e72 100644 --- a/sw/source/core/layout/flyincnt.cxx +++ b/sw/source/core/layout/flyincnt.cxx @@ -282,17 +282,6 @@ void SwFlyInCntFrm::MakeAll() if ( !bValidSize ) { bValidPrtArea = sal_False; -/* - // This is also done in the Format function, so I think - // this code is not necessary anymore: - long nOldWidth = aFrm.Width(); - const Size aRelSize( CalcRel( rFrmSz ) ); - aFrm.Width( aRelSize.Width() ); - - if ( aFrm.Width() > nOldWidth ) - //Damit sich der Inhalt anpasst - aFrm.Height( aRelSize.Height() ); -*/ } if ( !bValidPrtArea ) diff --git a/sw/source/ui/shells/tabsh.cxx b/sw/source/ui/shells/tabsh.cxx index 32eb4e01c2a1..947f9ea03cbf 100644 --- a/sw/source/ui/shells/tabsh.cxx +++ b/sw/source/ui/shells/tabsh.cxx @@ -82,16 +82,6 @@ #include <tblsel.hxx> #include <dialog.hrc> - -//!!! new: insert table -/* -#include <svx/htmlmode.hxx> -#include <modcfg.hxx> -#include <tblafmt.hxx> -#include <instable.hxx> -*/ -//!!! - #include <popup.hrc> #include <shells.hrc> #include <cmdid.h> diff --git a/toolkit/source/awt/vclxtabpagecontainer.cxx b/toolkit/source/awt/vclxtabpagecontainer.cxx index 618e052a1f5b..2af2e05fe666 100644 --- a/toolkit/source/awt/vclxtabpagecontainer.cxx +++ b/toolkit/source/awt/vclxtabpagecontainer.cxx @@ -85,19 +85,6 @@ void SAL_CALL VCLXTabPageContainer::draw( sal_Int32 nX, sal_Int32 nY ) throw(Run } VCLXWindow::draw( nX, nY ); -/* - if ( pWindow ) - { - OutputDevice* pDev = VCLUnoHelper::GetOutputDevice( getGraphics() ); - if ( !pDev ) - pDev = pWindow->GetParent(); - - Size aSize = pDev->PixelToLogic( pWindow->GetSizePixel() ); - Point aPos = pDev->PixelToLogic( Point( nX, nY ) ); - - pWindow->Draw( pDev, aPos, aSize, WINDOW_DRAW_NOCONTROLS ); - } -*/ } ::com::sun::star::awt::DeviceInfo VCLXTabPageContainer::getInfo() throw(RuntimeException) @@ -177,7 +164,6 @@ void VCLXTabPageContainer::ProcessWindowEvent( const VclWindowEvent& _rVclWindow { case VCLEVENT_TABPAGE_ACTIVATE: { -// allocateArea( maAllocation ); sal_uLong page = (sal_uLong)_rVclWindowEvent.GetData(); awt::tab::TabPageActivatedEvent aEvent(NULL,page); m_aTabPageListeners.tabPageActivated(aEvent); diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index 93dbbee5aac8..7f775fb3dac2 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -387,7 +387,6 @@ sal_uInt16 ImplGetComponentType( const String& rServiceName ) static sal_Int32 nVCLToolkitInstanceCount = 0; static sal_Bool bInitedByVCLToolkit = sal_False; -//static cppu::OInterfaceContainerHelper * pToolkits = 0; static osl::Mutex & getInitMutex() { @@ -456,20 +455,6 @@ static void SAL_CALL ToolkitWorkerFunction( void* pArgs ) catch( com::sun::star::uno::Exception & ) { } - /* - if( pToolkits ) - { - cppu::OInterfaceIteratorHelper aIt( *pToolkits ); - ::com::sun::star::uno::XInterface * pI; - while( pI = aIt.next() ) - ((::com::sun::star::lang::XComponent *)pI)->dispose(); - - // delete toolkit container - osl::Guard< osl::Mutex > aGuard( getInitMutex() ); - delete pToolkits; - pToolkits = 0; - } - */ DeInitVCL(); } else @@ -508,15 +493,6 @@ VCLXToolkit::VCLXToolkit( const ::com::sun::star::uno::Reference< ::com::sun::st // setup execute thread CreateMainLoopThread( ToolkitWorkerFunction, new ToolkitThreadData( rSMgr, this ) ); getInitCondition().wait(); - /* - if( bInitedByVCLToolkit ) - { - // insert in disposing list - if( !pToolkits ) - pToolkits = new cppu::OInterfaceContainerHelper( getInitMutex() ); - pToolkits->addInterface( (::com::sun::star::lang::XComponent *)this ); - } - */ } } @@ -562,16 +538,6 @@ void SAL_CALL VCLXToolkit::disposing() m_aTopWindowListeners.disposeAndClear(aEvent); m_aKeyHandlers.disposeAndClear(aEvent); m_aFocusListeners.disposeAndClear(aEvent); - -/* - osl::Guard< osl::Mutex > aGuard( getInitMutex() ); - // insert in disposing list - if( pToolkits ) - { - // remove from the disposing list - pToolkits->removeInterface( (::com::sun::star::lang::XComponent *)this ); - } -*/ } @@ -895,15 +861,6 @@ Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp, pNewWindow = new TabDialog( pParent, nWinBits ); break; case WINDOW_TABPAGE: - /* - if ( rDescriptor.WindowServiceName.equalsIgnoreAsciiCaseAsciiL( - RTL_CONSTASCII_STRINGPARAM("tabpagemodel") ) ) - { - pNewWindow = new TabControl( pParent, nWinBits ); - *ppNewComp = new VCLXTabPageContainer; - } - else - */ { pNewWindow = new TabPage( pParent, nWinBits ); *ppNewComp = new VCLXTabPage; diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx index 88f7e8ded6ae..a2092ea0dcb4 100644 --- a/toolkit/source/awt/vclxwindow.cxx +++ b/toolkit/source/awt/vclxwindow.cxx @@ -1038,19 +1038,6 @@ void VCLXWindow::setVisible( sal_Bool bVisible ) throw(::com::sun::star::uno::Ru Window* pWindow = GetWindow(); if ( pWindow ) { -/* - if ( bVisible ) - { - // #57167# TopWindows mit unsichtbaren Parent anzeigen... - ::com::sun::star::uno::Any aTest = queryInterface( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTopWindow >*) 0 ) ); - if ( aTest.hasValue() ) - { - Window* pParent = pWindow->GetWindow( WINDOW_PARENTOVERLAP ); - if ( pParent && !pParent->IsReallyVisible() ) - pWindow->SetParent( pWindow->GetWindow( WINDOW_FRAME ) ); - } - } -*/ mpImpl->setDirectVisible( bVisible ); pWindow->Show( bVisible && mpImpl->isEnableVisible() ); } diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx index 3da984802618..178e5ef3546b 100644 --- a/toolkit/source/controls/unocontrols.cxx +++ b/toolkit/source/controls/unocontrols.cxx @@ -348,15 +348,6 @@ namespace if ( _rSel.Min > _rSel.Max ) ::std::swap( _rSel.Min, _rSel.Max ); } - -/* - static bool lcl_intersect( const awt::Selection& _rLHS, const awt::Selection& _rRHS ) - { - OSL_PRECOND( _rLHS.Min <= _rLHS.Max, "lcl_intersect: LHS to be normalized!" ); - OSL_PRECOND( _rRHS.Min <= _rRHS.Max, "lcl_intersect: RHS to be normalized!" ); - return !( ( _rLHS.Max < _rRHS.Min ) || ( _rLHS.Min > _rRHS.Max ) ); - } -*/ } void UnoEditControl::insertText( const awt::Selection& rSel, const ::rtl::OUString& rNewText ) throw(uno::RuntimeException) diff --git a/tools/source/fsys/dirent.cxx b/tools/source/fsys/dirent.cxx index 1bf81220b7b5..8365d4236350 100644 --- a/tools/source/fsys/dirent.cxx +++ b/tools/source/fsys/dirent.cxx @@ -1770,12 +1770,6 @@ FSysError DirEntry::MoveTo( const DirEntry& rNewName ) const { DBG_CHKTHIS( DirEntry, ImpCheckDirEntry ); -/* - FileStat aSourceStat(*this); - if ( !aSourceStat.IsKind(FSYS_KIND_FILE) ) - return FSYS_ERR_NOTAFILE; -*/ - DirEntry aDest(rNewName); FileStat aDestStat(rNewName); if ( aDestStat.IsKind(FSYS_KIND_DIR ) ) diff --git a/ucb/source/ucp/odma/odma_provider.cxx b/ucb/source/ucp/odma/odma_provider.cxx index 618a6c7352c6..90a0d7309d36 100644 --- a/ucb/source/ucp/odma/odma_provider.cxx +++ b/ucb/source/ucp/odma/odma_provider.cxx @@ -406,13 +406,6 @@ void ContentProvider::fillDocumentProperties(const ::rtl::Reference<ContentPrope if(odm == ODM_SUCCESS) _rProp->m_sKeywords = ::rtl::OStringToOUString(rtl::OString(lpszDocInfo),RTL_TEXTENCODING_ASCII_US); -/* - odm = NODMGetDocInfo( getHandle(), - const_cast<sal_Char*>(_rProp->m_sDocumentId.getStr()), - ODM_URL, - lpszDocInfo, - ODM_DOCID_MAX); -*/ delete [] lpszDocInfo; } // ----------------------------------------------------------------------------- diff --git a/ucb/source/ucp/webdav/DateTimeHelper.cxx b/ucb/source/ucp/webdav/DateTimeHelper.cxx index 7044aaee9422..f47e29714880 100644 --- a/ucb/source/ucp/webdav/DateTimeHelper.cxx +++ b/ucb/source/ucp/webdav/DateTimeHelper.cxx @@ -117,28 +117,6 @@ bool DateTimeHelper::ISO8601_To_DateTime (const OUString& s, return false; } -/* -sal_Int32 DateTimeHelper::convertDayToInt (const OUString& day) -{ - if (day.compareToAscii ("Sun") == 0) - return 0; - else if (day.compareToAscii ("Mon") == 0) - return 1; - else if (day.compareToAscii ("Tue") == 0) - return 2; - else if (day.compareToAscii ("Wed") == 0) - return 3; - else if (day.compareToAscii ("Thu") == 0) - return 4; - else if (day.compareToAscii ("Fri") == 0) - return 5; - else if (day.compareToAscii ("Sat") == 0) - return 6; - else - return -1; -} -*/ - sal_Int32 DateTimeHelper::convertMonthToInt (const OUString& month) { if (month.compareToAscii ("Jan") == 0) diff --git a/unotools/inc/unotools/viewoptions.hxx b/unotools/inc/unotools/viewoptions.hxx index 34c00590dc0a..94044c26926a 100644 --- a/unotools/inc/unotools/viewoptions.hxx +++ b/unotools/inc/unotools/viewoptions.hxx @@ -122,28 +122,6 @@ enum EViewType class UNOTOOLS_DLLPUBLIC SvtViewOptions: public utl::detail::Options { - /* - #ifdef TF_OLDVIEW - public: - void GetPosition ( sal_Int32& nX , - sal_Int32& nY ) const; - void SetPosition ( sal_Int32 nX , - sal_Int32 nY ); - void GetSize ( sal_Int32& nWidth , - sal_Int32& nHeight ) const; - void SetSize ( sal_Int32 nWidth , - sal_Int32 nHeight ); - ::rtl::OUString GetUserData ( ) const; - void SetUserData ( const ::rtl::OUString& sData ); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SeperateUserData( const ::rtl::OUString& sData , - sal_Unicode cSeperator=';' ); - static ::rtl::OUString GenerateUserData( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& seqData , - sal_Unicode cSeperator=';' ); - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > GetAnyData ( ) const; - void SetAnyData ( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lData ); - #endif - */ - //------------------------------------------------------------------------------------------------------------- // public methods //------------------------------------------------------------------------------------------------------------- @@ -273,13 +251,7 @@ class UNOTOOLS_DLLPUBLIC SvtViewOptions: public utl::detail::Options @onerror In the non-product version, an assertion is made. In a product version, errors are silently ignored. *//*-*****************************************************************************************************/ -/* -#ifdef TF_OLDVIEW - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > GetUserData( sal_Bool bMakeItDifferent ) const; -#else -*/ ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > GetUserData( ) const; -//#endif void SetUserData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& lData ); /*-****************************************************************************************************//** diff --git a/unotools/source/misc/fontcvt.cxx b/unotools/source/misc/fontcvt.cxx index b65a1cce01b5..388f71bf02b6 100644 --- a/unotools/source/misc/fontcvt.cxx +++ b/unotools/source/misc/fontcvt.cxx @@ -656,83 +656,6 @@ static const sal_Unicode aMonotypeSortsTab[224] = // ----------------------------------------------------------------------- -/* -static const sal_Unicode aMonotypeSorts2Tab[224] = -{ -//TODO: - // F020 - 0, 0, 0, 0, - 0, 0, 0, 0, - 0, 0, 0, 0, - 0, 0, 0, 0, - // F030 - 0, 0, 0, 0, - 0, 0, 0, 0, - 0, 0, 0, 0, - 0, 0, 0, 0, - // F040 - 0, 0, 0, 0, - 0, 0, 0, 0, - 0, 0, 0, 0, - 0, 0, 0, 0, - // F050 - 0, 0, 0, 0, - 0, 0, 0, 0, - 0, 0, 0, 0, - 0, 0, 0, 0, - // F060 - 0, 0, 0, 0, - 0, 0, 0, 0, - 0, 0, 0, 0, - 0, 0, 0, 0, - // F070 - 0, 0, 0, 0, - 0, 0, 0, 0, - 0, 0, 0, 0, - 0, 0, 0, 0, - // F080 - 0, 0, 0, 0, - 0, 0, 0, 0, - 0, 0, 0, 0, - 0, 0, 0, 0, - // F090 - 0, 0, 0, 0, - 0, 0, 0, 0, - 0, 0, 0, 0, - 0, 0, 0, 0, - // F0a0 - 0, 0, 0, 0, - 0, 0, 0, 0, - 0, 0, 0, 0, - 0, 0, 0, 0, - // F0b0 - 0, 0, 0, 0, - 0, 0, 0, 0, - 0, 0, 0, 0, - 0, 0, 0, 0, - // F0c0 - 0, 0, 0, 0, - 0, 0, 0, 0, - 0, 0, 0, 0, - 0, 0, 0, 0, - // F0d0 - 0, 0, 0, 0, - 0, 0, 0, 0, - 0, 0, 0, 0, - 0, 0, 0, 0, - // F0e0 - 0, 0, 0, 0, - 0, 0, 0, 0, - 0, 0, 0, 0, - 0, 0, 0, 0, - // F0f0 - 0, 0, 0, 0, - 0, 0, 0, 0, - 0, 0, 0, 0, - 0, 0, 0, 0, -}; -*/ - static const sal_Unicode aMTExtraTab[224] = { // F020 diff --git a/unoxml/source/dom/node.cxx b/unoxml/source/dom/node.cxx index 5ce052f6d041..2fc27560019b 100644 --- a/unoxml/source/dom/node.cxx +++ b/unoxml/source/dom/node.cxx @@ -861,10 +861,6 @@ namespace DOM ::osl::ClearableMutexGuard guard(m_rMutex); -/* - Reference< XNode > aNode = removeChild(oldChild); - appendChild(newChild); -*/ ::rtl::Reference<CNode> const pOldNode( CNode::GetImplementation(xOldChild)); ::rtl::Reference<CNode> const pNewNode( |