[Libreoffice-commits] .: svtools/source toolkit/workben vcl/source
Caolán McNamara
caolan at kemper.freedesktop.org
Sat Dec 18 11:01:31 PST 2010
svtools/source/dialogs/property.cxx | 142 ----------------------------
toolkit/workben/controls.cxx | 178 ------------------------------------
vcl/source/window/window.cxx | 103 --------------------
vcl/source/window/window2.cxx | 104 ---------------------
4 files changed, 527 deletions(-)
New commits:
commit 46263003c783e8a96542d8c2258fbe58bbdded08
Author: Anders Jonsson <anders.jonsson at norsjonet.se>
Date: Sat Dec 18 13:35:19 2010 +0100
Remove large blocks of commented code
diff --git a/svtools/source/dialogs/property.cxx b/svtools/source/dialogs/property.cxx
index 6a5c791..eae08c8 100644
--- a/svtools/source/dialogs/property.cxx
+++ b/svtools/source/dialogs/property.cxx
@@ -1406,146 +1406,4 @@ void SvBasicPropertyDataControl::SetIsCorrect(BOOL nFlag)
bCorrectness=nFlag;
}
-
-
-//========================================================================
-// Property-Dialog:
-/* zum TESTEN im CALC*/
-//========================================================================
-/*
-ScPropertyDlg::ScPropertyDlg( Window* pParent) :
- ModalDialog ( pParent, ScResId( RID_SCDLG_PROPERTIES) ),
- aPropListBox ( this, ResId( CTR_PROPLINE) ),
- aKindOfListBox (this,ResId( LB_KIND_OF_PROP)),
- aModAnswer (this,ResId(FT_ANSMOD )),
- aClickAnswer (this,ResId(FT_ANSCLICK )),
- aCommitAnswer (this,ResId(FT_ANSCOMMIT)),
- aSelectAnswer (this,ResId(FT_ANSSELECT)),
- anOk(this,ResId( BTN_OK)),
- aCancel(this,ResId( BTN_CANCEL))
-{
- FreeResource();
-
- aKindOfListBox.SelectEntryPos(0);
- aKindOfListBox.SetSelectHdl(
- LINK( this, ScPropertyDlg, ModifiedHdl ));
- nCount=0;
- nClickCount=0;
-
- String aString("Don't know ");
-
- aBaProDatCtr.SetModifyHdl (LINK( this, ScPropertyDlg, RowModifiedHdl ));
- aBaProDatCtr.SetClickedHdl(LINK( this, ScPropertyDlg, ClickHdl ));
- aBaProDatCtr.SetCommitHdl (LINK( this, ScPropertyDlg, SelectHdl ));
- aBaProDatCtr.SetSelectHdl (LINK( this, ScPropertyDlg, CommitHdl ));
-
- aPropListBox.SetController(&aBaProDatCtr);
-
- USHORT nPageId=aPropListBox.AppendPage("YabbaDabbaDo");
- aPropListBox.SetPage(nPageId);
- aProperty.eKind=KOC_EDIT;
- aProperty.aName=aString;
- aProperty.aName+=String((USHORT)++nCount);
- aProperty.aValue=sizeof ComboBox;
- aProperty.bHasVisibleXButton=FALSE;
- aProperty.bIsHyperLink=FALSE;
- aProperty.bIsLocked=FALSE;
- aProperty.pDataPtr=NULL;
- aProperty.pControl=NULL;
- aProperty.theValues.Insert(new String("1"),aProperty.theValues.Count());
- aProperty.theValues.Insert(new String("2"),aProperty.theValues.Count());
- aProperty.theValues.Insert(new String("3"),aProperty.theValues.Count());
- aProperty.theValues.Insert(new String("4"),aProperty.theValues.Count());
- aPropListBox.InsertEntry(aProperty);
- aProperty.bHasVisibleXButton=TRUE;
- aProperty.aName=aString;
- aProperty.aName+=String((USHORT)++nCount);
- aProperty.aValue="42";
- aProperty.eKind=KOC_LISTBOX;
- aPropListBox.InsertEntry(aProperty);
- aProperty.aName=aString;
- aProperty.aName+=String((USHORT)++nCount);
- aProperty.eKind=KOC_COMBOBOX;
- aProperty.bHasVisibleXButton=FALSE;
- aPropListBox.InsertEntry(aProperty);
-}
-
-ScPropertyDlg::~ScPropertyDlg()
-{
- delete aProperty.theValues[0];
- delete aProperty.theValues[1];
- delete aProperty.theValues[2];
- delete aProperty.theValues[3];
-}
-
-IMPL_LINK( ScPropertyDlg, ModifiedHdl, ListBox*, pLB )
-{
- if(pLB!=NULL)
- {
- String aString("Don't know ");
- aProperty.aName=aString;
- aProperty.aName+=String((USHORT)++nCount);
- if(nCount>20)
- {
- String aStr("Yabba ");
- aStr+=aPropListBox.GetCurPage();
- USHORT nPageId=aPropListBox.AppendPage(aStr);
- aPropListBox.SetPage(nPageId);
- nCount=0;
- }
-
- aProperty.eKind=(eKindOfControl)(aKindOfListBox.GetSelectEntryPos()+1);
- aProperty.bHasVisibleXButton=FALSE;
- if((nCount % 5)==0) aProperty.bHasVisibleXButton=TRUE;
- aPropListBox.InsertEntry(aProperty);
- }
- return 0;
-}
-
-IMPL_LINK( ScPropertyDlg, RowModifiedHdl, SvBasicPropertyDataControl* ,pProCtr)
-{
- if(pProCtr!=NULL)
- {
- aModAnswer.SetText(aBaProDatCtr.GetProperty());
- aModAnswer.Invalidate();
- aBaProDatCtr.SetIsCorrect(TRUE);
- }
- return 0;
-}
-
-IMPL_LINK( ScPropertyDlg, CommitHdl, SvBasicPropertyDataControl*,pProCtr)
-{
- if(pProCtr!=NULL)
- {
- aCommitAnswer.SetText(aBaProDatCtr.GetProperty());
- aCommitAnswer.Invalidate();
- aBaProDatCtr.SetIsCorrect(TRUE);
- }
- return 0;
-}
-
-IMPL_LINK( ScPropertyDlg, ClickHdl, SvBasicPropertyDataControl*,pProCtr)
-{
- if(pProCtr!=NULL)
- {
- aClickAnswer.SetText(aBaProDatCtr.GetName());
- aClickAnswer.Invalidate();
- aBaProDatCtr.SetIsCorrect(TRUE);
- }
- return 0;
-}
-
-IMPL_LINK( ScPropertyDlg, SelectHdl, SvBasicPropertyDataControl*,pProCtr)
-{
- if(pProCtr!=NULL)
- {
- aSelectAnswer.SetText(aBaProDatCtr.GetName());
- aSelectAnswer.Invalidate();
- aBaProDatCtr.SetIsCorrect(TRUE);
- }
- return 0;
-}
-*/
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/toolkit/workben/controls.cxx b/toolkit/workben/controls.cxx
index 46e432e..0b7fd88 100644
--- a/toolkit/workben/controls.cxx
+++ b/toolkit/workben/controls.cxx
@@ -121,35 +121,6 @@ void MyWin::MouseButtonDown( const MouseEvent& rMEvt )
XViewRef xV( xDrawCtrl, USR_QUERY );
XWindowRef xC( xDrawCtrl, USR_QUERY );
xV->draw( xC->getPosSize().Left(), xC->getPosSize().Top() );
-
- // Printer Testen...
-/*
- XServiceManagerRef xProv = getGlobalServiceManager();
- XServiceProviderRef xSSI = xProv->queryServiceProvider( L"stardiv.vcl.PrinterServer" );
- XPrinterServerRef xPrinterServer( xSSI->createInstance(), USR_QUERY );
-
- Sequence< UString > aPrinterNames = xPrinterServer->getPrinterNames();
- USHORT nPrinters = aPrinterNames.getLen();
- String aInfo( "Printers: " );
- aInfo += nPrinters;
- if ( nPrinters )
- {
- for ( USHORT n = 0; n < nPrinters; n++ )
- {
- aInfo += '\n';
- aInfo += OUStringToString( aPrinterNames.getConstArray()[n], CHARSET_SYSTEM );
- }
-
- XPrinterRef xPrinter = xPrinterServer->createPrinter( aPrinterNames.getConstArray()[0] );
- xPrinter->start( L"UNOPrinterTest", 1, TRUE );
- XDeviceRef xDev = xPrinter->startPage();
- XGraphicsRef xGraphics = xDev->createGraphics();
- xGraphics->drawText( 200, 200, L"Printed with UNO" );
- xPrinter->endPage();
- xPrinter->end();
- }
- InfoBox( this, aInfo ).Execute();
-*/
}
else if( rMEvt.GetClicks() == 1 )
{
@@ -263,135 +234,6 @@ void MyWin::MouseButtonDown( const MouseEvent& rMEvt )
xCont->addControl( L"", xButton1 );
-/*
-
- // ListBox...
- xModelProv = xProv->queryServiceProvider( L"stardiv.vcl.controlmodel.ListBox" );
- xModel = (XInterface*)xModelProv->createInstance()->queryInterface( XInterface::getSmartUik() );
-
- xPSet = (XPropertySet*)xModel->queryInterface( XPropertySet::getSmartUik() );
- Sequence<UString> aSeq( 7 );
- aSeq.getArray()[0] = L"Item1";
- aSeq.getArray()[1] = L"Item2";
- aSeq.getArray()[2] = L"Item3";
- aSeq.getArray()[3] = L"Item4";
- aSeq.getArray()[4] = L"Item5";
- aSeq.getArray()[5] = L"Item6";
- aSeq.getArray()[6] = L"Item7";
- xPSet->setPropertyValue( L"StringItemList", UsrAny( &aSeq, Sequence<UString>::getReflection() ) );
- xPSet->setPropertyValue( L"LineCount", UsrAny_UINT16( 4 ) );
- xPSet->setPropertyValue( L"Dropdown", UsrAny( (BOOL)TRUE ) );
-
- XServiceProviderRef xListBoxCtrlProv = xProv->queryServiceProvider( L"stardiv.vcl.control.ListBox" );
- XControlRef xListBox1 = (XControl*)xListBoxCtrlProv->createInstance()->queryInterface( XControl::getSmartUik() );
- xListBox1->setModel( (XControlModel*)xModel->queryInterface( XControlModel::getSmartUik() ) );
- XWindowRef xListBoxCmp1 = (XWindow*)xListBox1->queryInterface( XWindow::getSmartUik() );
- xListBoxCmp1->setPosSize( 20, 250, 200, 20, PosSize_POSSIZE );
- xCont->addControl( L"", xListBox1 );
-
- // FixedText...
- xModelProv = xProv->queryServiceProvider( L"stardiv.vcl.controlmodel.FixedText" );
- xModel = (XInterface*)xModelProv->createInstance()->queryInterface( XInterface::getSmartUik() );
- DBG_ASSERT( xModel, "No Model!" );
-
- xPSet = (XPropertySet*)xModel->queryInterface( XPropertySet::getSmartUik() );
- xPSet->setPropertyValue( L"Label", UsrAny( L"Label:" ) );
- xPSet->setPropertyValue( L"BackgroundColor", UsrAny( (UINT32)0x00888888) );
-
- Font_Attribs aFontAttrs;
- aFontAttrs.Italic = ITALIC_NORMAL;
- xPSet->setPropertyValue( L"Font_Attribs", UsrAny( &aFontAttrs, Font_Attribs_getReflection() ) );
-
- XPropertyStateRef xState = (XPropertyState*)xPSet->queryInterface( XPropertyState::getSmartUik() );
- xState->getPropertyState( L"Font_Attribs" );
- xState->getPropertyState( L"Font_Size" );
-
- XServiceProviderRef xFixedTextCtrlProv = xProv->queryServiceProvider( L"stardiv.vcl.control.FixedText" );
- XControlRef xFixedText1 = (XControl*)xFixedTextCtrlProv->createInstance()->queryInterface( XControl::getSmartUik() );
- DBG_ASSERT( xFixedText1, "No FixedText!" );
- xFixedText1->setModel( (XControlModel*)xModel->queryInterface( XControlModel::getSmartUik() ) );
- XWindowRef xFixedTextCmp1 = (XWindow*)xFixedText1->queryInterface( XWindow::getSmartUik() );
- xFixedTextCmp1->setPosSize( 20, 20, 120, 20, PosSize_POSSIZE );
- xCont->addControl( L"", xFixedText1 );
-
- // TabTest...
- xModelProv = xProv->queryServiceProvider( L"stardiv.vcl.controlmodel.GroupBox" );
- xModel = (XInterface*)xModelProv->createInstance()->queryInterface( XInterface::getSmartUik() );
- xPSet = (XPropertySet*)xModel->queryInterface( XPropertySet::getSmartUik() );
- xPSet->setPropertyValue( L"Label", UsrAny( L"Radio-Test:" ) );
- XServiceProviderRef xGroupBoxCtrlProv = xProv->queryServiceProvider( L"stardiv.vcl.control.GroupBox" );
- XControlRef xGroupBox1 = (XControl*)xGroupBoxCtrlProv->createInstance()->queryInterface( XControl::getSmartUik() );
- xGroupBox1->setModel( (XControlModel*)xModel->queryInterface( XControlModel::getSmartUik() ) );
- XWindowRef xGroupBoxCmp1 = (XWindow*)xGroupBox1->queryInterface( XWindow::getSmartUik() );
- xGroupBoxCmp1->setPosSize( 30, 410, 100, 130, PosSize_POSSIZE );
- xCont->addControl( L"", xGroupBox1 );
-
- XServiceProviderRef xRadioButtonModelProv = xProv->queryServiceProvider( L"stardiv.vcl.controlmodel.RadioButton" );
- XServiceProviderRef xRadioButtonCtrlProv = xProv->queryServiceProvider( L"stardiv.vcl.control.RadioButton" );
-
- xModel = (XInterface*)xRadioButtonModelProv->createInstance()->queryInterface( XInterface::getSmartUik() );
- XControlRef xT1 = (XControl*)xRadioButtonCtrlProv->createInstance()->queryInterface( XControl::getSmartUik() );
- xT1->setModel( (XControlModel*)xModel->queryInterface( XControlModel::getSmartUik() ) );
- XWindowRef xTC1 = (XWindow*)xT1->queryInterface( XWindow::getSmartUik() );
- xTC1->setPosSize( 40, 430, 80, 20, PosSize_POSSIZE );
- xCont->addControl( L"", xT1 );
- xPSet = (XPropertySet*)xModel->queryInterface( XPropertySet::getSmartUik() );
- xPSet->setPropertyValue( L"Label", UsrAny( L"Radio1" ) );
- xPSet->setPropertyValue( L"State", UsrAny_UINT16( 1 ) );
-
- xModel = (XInterface*)xRadioButtonModelProv->createInstance()->queryInterface( XInterface::getSmartUik() );
- XControlRef xT2 = (XControl*)xRadioButtonCtrlProv->createInstance()->queryInterface( XControl::getSmartUik() );
- xT2->setModel( (XControlModel*)xModel->queryInterface( XControlModel::getSmartUik() ) );
- XWindowRef xTC2 = (XWindow*)xT2->queryInterface( XWindow::getSmartUik() );
- xTC2->setPosSize( 40, 470, 80, 20, PosSize_POSSIZE );
- xCont->addControl( L"", xT2 );
- xPSet = (XPropertySet*)xModel->queryInterface( XPropertySet::getSmartUik() );
- xPSet->setPropertyValue( L"Label", UsrAny( L"Radio2" ) );
-
- xModel = (XInterface*)xRadioButtonModelProv->createInstance()->queryInterface( XInterface::getSmartUik() );
- XControlRef xT3 = (XControl*)xRadioButtonCtrlProv->createInstance()->queryInterface( XControl::getSmartUik() );
- xT3->setModel( (XControlModel*)xModel->queryInterface( XControlModel::getSmartUik() ) );
- XWindowRef xTC3 = (XWindow*)xT3->queryInterface( XWindow::getSmartUik() );
- xTC3->setPosSize( 40, 510, 80, 20, PosSize_POSSIZE );
- xCont->addControl( L"", xT3 );
- xPSet = (XPropertySet*)xModel->queryInterface( XPropertySet::getSmartUik() );
- xPSet->setPropertyValue( L"Label", UsrAny( L"Radio3" ) );
-
- xModel = (XInterface*)xRadioButtonModelProv->createInstance()->queryInterface( XInterface::getSmartUik() );
- XControlRef xT4 = (XControl*)xRadioButtonCtrlProv->createInstance()->queryInterface( XControl::getSmartUik() );
- xT4->setModel( (XControlModel*)xModel->queryInterface( XControlModel::getSmartUik() ) );
- XWindowRef xTC4 = (XWindow*)xT4->queryInterface( XWindow::getSmartUik() );
- xTC4->setPosSize( 40, 550, 80, 20, PosSize_POSSIZE );
- xCont->addControl( L"", xT4 );
- xPSet = (XPropertySet*)xModel->queryInterface( XPropertySet::getSmartUik() );
- xPSet->setPropertyValue( L"Label", UsrAny( L"Radio4 - no" ) );
- xPSet->setPropertyValue( L"Tabstop", UsrAny( (BOOL)TRUE ) );
-
- // TabController:
- xModelProv = xProv->queryServiceProvider( L"stardiv.vcl.controlmodel.TabController" );
- xModel = (XInterface*)xModelProv->createInstance()->queryInterface( XInterface::getSmartUik() );
- XTabControllerModelRef xTCModel = (XTabControllerModel*)xModel->queryInterface( XTabControllerModel::getSmartUik() );
-
- XServiceProviderRef xTCProv = xProv->queryServiceProvider( L"stardiv.vcl.control.TabController" );
- XTabControllerRef xTC = (XTabController*)xTCProv->createInstance()->queryInterface( XTabController::getSmartUik() );
- xTC->setModel( (XTabControllerModel*)xModel->queryInterface( XTabControllerModel::getSmartUik() ) );
- XUnoControlContainerRef xUCC = (XUnoControlContainer*)xCont->queryInterface( XUnoControlContainer::getSmartUik() );
- xUCC->addTabController( xTC );
-
- Sequence<XControlModelRef> aControls( 5 );
- aControls.getArray()[0] = xGroupBox1->getModel();
- aControls.getArray()[1] = xT1->getModel();
- aControls.getArray()[2] = xT3->getModel();
- aControls.getArray()[3] = xT2->getModel();
- aControls.getArray()[4] = xT4->getModel();
- xTCModel->setControls( aControls );
-
- Sequence<XControlModelRef> aGroup( 3 );
- aGroup.getArray()[0] = xT1->getModel();
- aGroup.getArray()[1] = xT3->getModel();
- aGroup.getArray()[2] = xT2->getModel();
- xTCModel->setGroup( aGroup, L"test" );
-*/
// Container anzeigen...
// Als Child zu diesem Fenster
xContControl->createPeer( XToolkitRef(), GetComponentInterface( TRUE ) );
@@ -401,26 +243,6 @@ void MyWin::MouseButtonDown( const MouseEvent& rMEvt )
XViewRef xV ( xDrawCtrl, USR_QUERY );
xV->setGraphics( xG );
-// ((UnoControl*)(XControl*)xNumField))->updateFromModel();
-
-/*
- // TEST:
- WindowDecriptor aDescr;
- aDescr.ComponentServiceName = "window";
- aDescr.Type = VCLCOMPONENTTYPE_CONTAINER;
- aDescr.Parent = GetComponentInterface( TRUE );
- aDescr.WindowAttributes = WA_SHOW|WA_BORDER;
- aDescr.Bounds = Rectangle( Point( 500, 50 ), Size( 300, 200 ) );
- XVclWindowPeerRef xSPWin = xToolkit->createComponent( aDescr );
-
- WindowDecriptor aDescr2;
- aDescr2.ComponentServiceName = "scrollbar";
- aDescr2.Type = VCLCOMPONENTTYPE_SIMPLE;
- aDescr2.Parent = xSPWin;
- aDescr2.WindowAttributes = WA_SHOW|WA_BORDER|WA_VSCROLL;
- aDescr2.Bounds = Rectangle( Point( 250, 0 ), Size( 50, 200 ) );
- XVclWindowPeerRef xSB = xToolkit->createComponent( aDescr2 );
-*/
}
return;
}
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 82665be..7461c95 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -4080,110 +4080,7 @@ void Window::ImplGrabFocus( USHORT nFlags )
pNewRealWindow->Activate();
}
}
-/*
- // call Deactivate and Activate
- Window* pDeactivateParent;
- Window* pActivateParent;
- Window* pParent;
- Window* pLastParent;
- pDeactivateParent = pOldFocusWindow;
- while ( pDeactivateParent )
- {
- pParent = pDeactivateParent;
- if ( pParent->ImplIsChild( this ) )
- break;
-
- if ( pDeactivateParent->ImplIsOverlapWindow() )
- {
- if ( !pDeactivateParent->mpWindowImpl->mbParentActive )
- break;
- }
-
- pDeactivateParent = pDeactivateParent->ImplGetParent();
- }
- if ( pOldFocusWindow )
- {
- pActivateParent = this;
- while ( pActivateParent )
- {
- pParent = pActivateParent;
- if ( pParent->ImplIsChild( pOldFocusWindow ) )
- break;
-
- if ( pActivateParent->ImplIsOverlapWindow() )
- {
- if ( !pActivateParent->mpWindowImpl->mbParentActive )
- break;
- }
-
- pActivateParent = pActivateParent->ImplGetParent();
- }
- }
- else
- {
- if ( ImplIsOverlapWindow() )
- pActivateParent = this;
- else
- pActivateParent = mpWindowImpl->mpOverlapWindow;
- while ( pActivateParent )
- {
- if ( pActivateParent->ImplIsOverlapWindow() )
- {
- if ( !pActivateParent->mpWindowImpl->mbParentActive )
- break;
- }
-
- pActivateParent = pActivateParent->ImplGetParent();
- }
- }
- if ( pDeactivateParent )
- {
- do
- {
- pLastParent = pOldFocusWindow;
- if ( pLastParent != pDeactivateParent )
- {
- pParent = pLastParent->ImplGetParent();
- while ( pParent )
- {
- if ( pParent == pDeactivateParent )
- break;
- pLastParent = pParent;
- pParent = pParent->ImplGetParent();
- }
- }
- else
- pParent = pLastParent;
- pParent->mpWindowImpl->mbActive = FALSE;
- pParent->Deactivate();
- pDeactivateParent = pLastParent;
- }
- while ( pDeactivateParent != pOldFocusWindow );
- }
- do
- {
- pLastParent = this;
- if ( pLastParent != pActivateParent )
- {
- pParent = pLastParent->ImplGetParent();
- while ( pParent )
- {
- if ( pParent == pActivateParent )
- break;
- pLastParent = pParent;
- pParent = pParent->ImplGetParent();
- }
- }
- else
- pParent = pLastParent;
-
- pParent->mpWindowImpl->mbActive = TRUE;
- pParent->Activate();
- pActivateParent = pLastParent;
- }
- while ( pActivateParent != this );
-*/
// call Get- and LoseFocus
if ( pOldFocusWindow && ! aOldFocusDel.IsDelete() )
{
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index 1923f11..80fb196 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -1298,110 +1298,6 @@ void Window::ImplHandleScroll( ScrollBar* pHScrl, long nX,
}
}
-// support for docking
-// this is currently handled in ImplDockingWindowWrapper
-/*
-void Window::ImplSetFloatingMode( BOOL bFloatMode )
-{
- // if the window is docked, put it into a flaoting window
- // if it is floating put it back in the old frame
-
- ImplDockingWindowWrapper *pWrapper = pDockingMgr->GetDockingWindowWrapper( this );
- if( !pDockingData )
- return;
-
- if ( pWrapper->IsFloatingMode() != bFloatMode )
- {
- if ( pWrapper->PrepareToggleFloatingMode() )
- {
- BOOL bVisible = IsVisible();
-
- if ( bFloatMode )
- {
- Show( FALSE, SHOW_NOFOCUSCHANGE );
-
- pWrapper->maDockPos = GetPosPixel();
-
- Window* pRealParent = mpWindowImpl->mpRealParent;
- pWrapper->mpOldBorderWin = mpWindowImpl->mpBorderWindow;
-
- ImplDockFloatWin* pWin =
- new ImplDockFloatWin2(
- mpWindowImpl->mpParent,
- mnFloatBits & ( WB_MOVEABLE | WB_SIZEABLE | WB_CLOSEABLE ) ? mnFloatBits | WB_SYSTEMWINDOW : mnFloatBits,
- pWrapper );
- pWrapper->mpFloatWin = pWin;
- mpWindowImpl->mpBorderWindow = NULL;
- mpWindowImpl->mnLeftBorder = 0;
- mpWindowImpl->mnTopBorder = 0;
- mpWindowImpl->mnRightBorder = 0;
- mpWindowImpl->mnBottomBorder = 0;
- // Falls Parent zerstoert wird, muessen wir auch vom
- // BorderWindow den Parent umsetzen
- if ( pWrapper->mpOldBorderWin )
- pWrapper->mpOldBorderWin->SetParent( pWin );
- SetParent( pWin );
- pWin->SetPosPixel( Point() );
- mpWindowImpl->mpBorderWindow = pWin;
- pWin->mpWindowImpl->mpClientWindow = this;
- mpWindowImpl->mpRealParent = pRealParent;
- pWin->SetText( GetText() );
- pWin->SetOutputSizePixel( GetSizePixel() );
- pWin->SetPosPixel( pWrapper->maFloatPos );
- // DockingDaten ans FloatingWindow weiterreichen
- pWin->ShowTitleButton( TITLE_BUTTON_DOCKING, pWrapper->mbDockBtn );
- pWin->ShowTitleButton( TITLE_BUTTON_HIDE, pWrapper->mbHideBtn );
- pWin->SetPin( pWrapper->mbPined );
- if ( pWrapper->mbRollUp )
- pWin->RollUp();
- else
- pWin->RollDown();
- pWin->SetRollUpOutputSizePixel( pWrapper->maRollUpOutSize );
- pWin->SetMinOutputSizePixel( pWrapper->maMinOutSize );
-
- pWrapper->ToggleFloatingMode();
-
- if ( bVisible )
- Show();
- }
- else
- {
- Show( FALSE, SHOW_NOFOCUSCHANGE );
-
- // FloatingDaten wird im FloatingWindow speichern
- pWrapper->maFloatPos = mpFloatWin->GetPosPixel();
- pWrapper->mbDockBtn = mpFloatWin->IsTitleButtonVisible( TITLE_BUTTON_DOCKING );
- pWrapper->mbHideBtn = mpFloatWin->IsTitleButtonVisible( TITLE_BUTTON_HIDE );
- pWrapper->mbPined = mpFloatWin->IsPined();
- pWrapper->mbRollUp = mpFloatWin->IsRollUp();
- pWrapper->maRollUpOutSize = mpFloatWin->GetRollUpOutputSizePixel();
- pWrapper->maMinOutSize = mpFloatWin->GetMinOutputSizePixel();
-
- Window* pRealParent = mpWindowImpl->mpRealParent;
- mpWindowImpl->mpBorderWindow = NULL;
- if ( pWrapper->mpOldBorderWin )
- {
- SetParent( pWrapper->mpOldBorderWin );
- ((ImplBorderWindow*)pWrapper->mpOldBorderWin)->GetBorder( mpWindowImpl->mnLeftBorder, mpWindowImpl->mnTopBorder, mpWindowImpl->mnRightBorder, mpWindowImpl->mnBottomBorder );
- pWrapper->mpOldBorderWin->Resize();
- }
- mpWindowImpl->mpBorderWindow = pWrapper->mpOldBorderWin;
- SetParent( pRealParent );
- mpWindowImpl->mpRealParent = pRealParent;
- delete static_cast<ImplDockFloatWin*>(mpFloatWin);
- pWrapper->mpFloatWin = NULL;
- SetPosPixel( maDockPos );
-
- pWrapper->ToggleFloatingMode();
-
- if ( bVisible )
- Show();
- }
- }
- }
-}
-*/
-
DockingManager* Window::GetDockingManager()
{
return ImplGetDockingManager();
More information about the Libreoffice-commits
mailing list