Kaydet (Commit) 48bcca54 authored tarafından Vladimir Glazounov's avatar Vladimir Glazounov

INTEGRATION: CWS gh10 (1.14.4); FILE MERGED

2005/03/16 15:24:58 gh 1.14.4.1: #i44486#do not link obj files against shared library
üst 2baeb822
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: sta_list.cxx,v $ * $RCSfile: sta_list.cxx,v $
* *
* $Revision: 1.14 $ * $Revision: 1.15 $
* *
* last change: $Author: rt $ $Date: 2004-12-10 17:13:40 $ * last change: $Author: vg $ $Date: 2005-03-23 15:48:00 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -143,6 +143,9 @@ Window* StatementList::pFirstDocFrame = NULL; ...@@ -143,6 +143,9 @@ Window* StatementList::pFirstDocFrame = NULL;
BOOL StatementList::bCatchGPF = TRUE; BOOL StatementList::bCatchGPF = TRUE;
IMPL_GEN_RES_STR;
static TTSettings* pTTSettings = NULL; static TTSettings* pTTSettings = NULL;
TTSettings* GetTTSettings() TTSettings* GetTTSettings()
...@@ -1015,6 +1018,8 @@ String StatementList::ClientTree(Window *pBase, int Indent) ...@@ -1015,6 +1018,8 @@ String StatementList::ClientTree(Window *pBase, int Indent)
WRITE(sIndent); WRITE(sIndent);
WRITEc("UId : "); WRITEc("UId : ");
WRITE(UIdString(pBase->GetSmartUniqueOrHelpId())); WRITE(UIdString(pBase->GetSmartUniqueOrHelpId()));
WRITEc(":0x");
WRITE(String::CreateFromInt64( sal_Int64(pBase), 16 ));
WRITEc(":"); WRITEc(":");
WRITE(pBase->GetQuickHelpText()); WRITE(pBase->GetQuickHelpText());
WRITEc(":"); WRITEc(":");
...@@ -1116,6 +1121,9 @@ void StatementList::DirectLog( ULONG nType, String aMessage ) ...@@ -1116,6 +1121,9 @@ void StatementList::DirectLog( ULONG nType, String aMessage )
void ImplKeyInput( Window* pWin, KeyEvent &aKEvnt ) void ImplKeyInput( Window* pWin, KeyEvent &aKEvnt )
{ {
// Application::PostKeyEvent( VCLEVENT_WINDOW_KEYINPUT, pWin, &aKEvnt );
// Application::PostKeyEvent( VCLEVENT_WINDOW_KEYUP, pWin, &aKEvnt );
if ( !Application::CallAccel( aKEvnt.GetKeyCode() ) ) if ( !Application::CallAccel( aKEvnt.GetKeyCode() ) )
{ {
CALL_EVENT_WITH_NOTIFY( EVENT_KEYINPUT, aKEvnt, pWin, KeyInput ) CALL_EVENT_WITH_NOTIFY( EVENT_KEYINPUT, aKEvnt, pWin, KeyInput )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment