diff options
| author | obo <obo@openoffice.org> | 2010-06-21 13:30:01 +0200 |
|---|---|---|
| committer | obo <obo@openoffice.org> | 2010-06-21 13:30:01 +0200 |
| commit | 943661174d0a2c1264d2c35e1ac7426ed3668774 (patch) | |
| tree | c8fdfc84115ff1efe4c45b25817c0e235af68fc8 /sc/source/ui/app | |
| parent | 04702d4ba168df48dcfd3e5693a0346b2f09c78a (diff) | |
| parent | 7406378b5b58fb693b9e5e77d7ccf267823d282a (diff) | |
CWS-TOOLING: integrate CWS calctabcolor
Diffstat (limited to 'sc/source/ui/app')
| -rw-r--r-- | sc/source/ui/app/scmod.cxx | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index 94e18def8a11..8f46b11236ae 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -2192,9 +2192,6 @@ IMPL_LINK( ScModule, CalcFieldValueHdl, EditFieldInfo*, pInfo ) return 0; } - - -//<!--Added by PengYunQuan for Validity Cell Range Picker BOOL ScModule::RegisterRefWindow( USHORT nSlotId, Window *pWnd ) { std::list<Window*> & rlRefWindow = m_mapRefWindow[nSlotId]; @@ -2244,10 +2241,13 @@ BOOL ScModule::IsAliveRefDlg( USHORT nSlotId, Window *pWnd ) Window * ScModule::Find1RefWindow( USHORT nSlotId, Window *pWndAncestor ) { + if (!pWndAncestor) + return NULL; + std::map<USHORT, std::list<Window*> >::iterator iSlot = m_mapRefWindow.find( nSlotId ); if( iSlot == m_mapRefWindow.end() ) - return FALSE; + return NULL; std::list<Window*> & rlRefWindow = iSlot->second; @@ -2262,6 +2262,9 @@ Window * ScModule::Find1RefWindow( USHORT nSlotId, Window *pWndAncestor ) Window * ScModule::Find1RefWindow( Window *pWndAncestor ) { + if (!pWndAncestor) + return NULL; + while( Window *pParent = pWndAncestor->GetParent() ) pWndAncestor = pParent; for( std::map<USHORT, std::list<Window*> >::iterator i = m_mapRefWindow.begin(); @@ -2272,4 +2275,4 @@ Window * ScModule::Find1RefWindow( Window *pWndAncestor ) return NULL; } -//<!--Added by PengYunQuan for Validity Cell Range Picker + |