summaryrefslogtreecommitdiff
path: root/toolkit
diff options
context:
space:
mode:
authorTakeshi Abe <tabe@fixedpoint.jp>2012-06-12 14:16:45 +0900
committerTakeshi Abe <tabe@fixedpoint.jp>2012-06-12 14:16:45 +0900
commit16738213c400f9192abc2ff6c08d7f711dee8d34 (patch)
tree3e17fbd6d8ab5a823ea4333a2325ee233ca8e4a7 /toolkit
parenta3451df90e0db9d37a7c6950c2eea53a96616e12 (diff)
nuke dead code
Change-Id: If8b6b4a3d9222726ae562e5b685710d86b5fe332
Diffstat (limited to 'toolkit')
-rw-r--r--toolkit/source/awt/vclxtabpagecontainer.cxx14
-rw-r--r--toolkit/source/awt/vclxtoolkit.cxx43
-rw-r--r--toolkit/source/awt/vclxwindow.cxx13
-rw-r--r--toolkit/source/controls/unocontrols.cxx9
4 files changed, 0 insertions, 79 deletions
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)