diff options
Diffstat (limited to 'sc/source/ui/view/reffact.cxx')
-rw-r--r-- | sc/source/ui/view/reffact.cxx | 84 |
1 files changed, 42 insertions, 42 deletions
diff --git a/sc/source/ui/view/reffact.cxx b/sc/source/ui/view/reffact.cxx index 21d66c5a39be..6c31e3b41d32 100644 --- a/sc/source/ui/view/reffact.cxx +++ b/sc/source/ui/view/reffact.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -76,18 +76,18 @@ SFX_IMPL_CHILDWINDOW(ScArgumentDlgWrapper, SID_OPENDLG_ARGUMENT ) //SFX_IMPL_MODELESSDIALOG(ScValidityRefChildWin, SID_VALIDITY_REFERENCE ) SFX_IMPL_CHILDWINDOW(ScValidityRefChildWin, SID_VALIDITY_REFERENCE) SfxChildWinInfo __EXPORT ScValidityRefChildWin::GetInfo() const -{ +{ SfxChildWinInfo anInfo = SfxChildWindow::GetInfo(); - + if( Window *pWnd = GetWindow() ) - { + { anInfo.aSize = pWnd->GetSizePixel(); - + if( pWnd->IsDialog() ) if ( static_cast<Dialog*>(pWnd)->IsRollUp() ) anInfo.nFlags |= SFX_CHILDWIN_ZOOMIN; } - + return anInfo; } @@ -95,28 +95,28 @@ namespace { ScTabViewShell * lcl_GetTabViewShell( SfxBindings *pBindings ); } //<!--Added by PengYunQuan for Validity Cell Range Picker #define IMPL_CHILD_CTOR(Class,sid) \ - Class::Class( Window* pParentP, \ - USHORT nId, \ - SfxBindings* p, \ - SfxChildWinInfo* pInfo ) \ - : SfxChildWindow(pParentP, nId) \ - { \ + Class::Class( Window* pParentP, \ + USHORT nId, \ + SfxBindings* p, \ + SfxChildWinInfo* pInfo ) \ + : SfxChildWindow(pParentP, nId) \ + { \ /*//<!--Added by PengYunQuan for Validity Cell Range Picker*/\ /************************************************************************************/\ - /* When a new document is creating, the SfxViewFrame may be ready, */\ - /* But the ScTabViewShell may have not been activated yet. In this */\ - /* situation, SfxViewShell::Current() does not get the correct shell, */\ - /* and we should lcl_GetTabViewShell( p ) instead of SfxViewShell::Current() */\ + /* When a new document is creating, the SfxViewFrame may be ready, */\ + /* But the ScTabViewShell may have not been activated yet. In this */\ + /* situation, SfxViewShell::Current() does not get the correct shell, */\ + /* and we should lcl_GetTabViewShell( p ) instead of SfxViewShell::Current() */\ /************************************************************************************/\ ScTabViewShell* pViewShell = lcl_GetTabViewShell( p ); \ /*//-->Added by PengYunQuan for Validity Cell Range Picker*/\ if (!pViewShell) \ pViewShell = PTR_CAST( ScTabViewShell, SfxViewShell::Current() ); \ - DBG_ASSERT( pViewShell, "missing view shell :-(" ); \ - pWindow = pViewShell ? \ - pViewShell->CreateRefDialog( p, this, pInfo, pParentP, sid ) : NULL; \ - if (pViewShell && !pWindow) \ - pViewShell->GetViewFrame()->SetChildWindow( nId, FALSE ); \ + DBG_ASSERT( pViewShell, "missing view shell :-(" ); \ + pWindow = pViewShell ? \ + pViewShell->CreateRefDialog( p, this, pInfo, pParentP, sid ) : NULL; \ + if (pViewShell && !pWindow) \ + pViewShell->GetViewFrame()->SetChildWindow( nId, FALSE ); \ } @@ -205,21 +205,21 @@ IMPL_CHILD_CTOR( ScFormulaDlgWrapper, SID_OPENDLG_FUNCTION ) // ScSimpleRefDlgWrapper //------------------------------------------------------------------------- -static BOOL bScSimpleRefFlag; -static long nScSimpleRefHeight; -static long nScSimpleRefWidth; -static long nScSimpleRefX; -static long nScSimpleRefY; -static BOOL bAutoReOpen=TRUE; +static BOOL bScSimpleRefFlag; +static long nScSimpleRefHeight; +static long nScSimpleRefWidth; +static long nScSimpleRefX; +static long nScSimpleRefY; +static BOOL bAutoReOpen=TRUE; ScSimpleRefDlgWrapper::ScSimpleRefDlgWrapper( Window* pParentP, - USHORT nId, - SfxBindings* p, - SfxChildWinInfo* pInfo ) + USHORT nId, + SfxBindings* p, + SfxChildWinInfo* pInfo ) : SfxChildWindow(pParentP, nId) { -// ScTabViewShell* pViewShell = -// PTR_CAST( ScTabViewShell, SfxViewShell::Current() ); +// ScTabViewShell* pViewShell = +// PTR_CAST( ScTabViewShell, SfxViewShell::Current() ); ScTabViewShell* pViewShell = NULL; SfxDispatcher* pDisp = p->GetDispatcher(); @@ -325,7 +325,7 @@ void ScSimpleRefDlgWrapper::StartRefInput() // ScAcceptChgDlgWrapper //Kommentar: sollte in die ViewShell //------------------------------------------------------------------------- -ScAcceptChgDlgWrapper::ScAcceptChgDlgWrapper( Window* pParentP, +ScAcceptChgDlgWrapper::ScAcceptChgDlgWrapper( Window* pParentP, USHORT nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ) : @@ -396,29 +396,29 @@ namespace if( SfxViewFrame *pFrm = pDisp->GetFrame() ) if( SfxViewShell* pViewSh = pFrm->GetViewShell() ) return dynamic_cast<ScTabViewShell*>( pViewSh ); - + return NULL; } } -ScValidityRefChildWin::ScValidityRefChildWin( Window* pParentP, \ - USHORT nId, \ - SfxBindings* p, \ - SfxChildWinInfo* /*pInfo*/ ) \ +ScValidityRefChildWin::ScValidityRefChildWin( Window* pParentP, \ + USHORT nId, \ + SfxBindings* p, \ + SfxChildWinInfo* /*pInfo*/ ) \ : SfxChildWindow(pParentP, nId), m_bVisibleLock( false ), m_bFreeWindowLock( false ), m_pSavedWndParent( NULL ) { SetWantsFocus( FALSE );\ - ScTabViewShell* pViewShell = \ + ScTabViewShell* pViewShell = \ NULL != ( pWindow = ScValidationDlg::Find1AliveObject( pParentP ) ) ? static_cast<ScValidationDlg*>(pWindow)->GetTabViewShell() : lcl_GetTabViewShell( p ); if (!pViewShell) pViewShell = PTR_CAST( ScTabViewShell, SfxViewShell::Current() ); - DBG_ASSERT( pViewShell, "missing view shell :-(" ); \ - if (pViewShell && !pWindow) \ - pViewShell->GetViewFrame()->SetChildWindow( nId, FALSE ); \ + DBG_ASSERT( pViewShell, "missing view shell :-(" ); \ + if (pViewShell && !pWindow) \ + pViewShell->GetViewFrame()->SetChildWindow( nId, FALSE ); \ else if( pWindow /*&& pWindow->ISA(ScValidationDlg)*/ ) {}//pWindow = new Window( pParentP, WB_HIDE ); |