summaryrefslogtreecommitdiff
path: root/basic
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2004-09-20 11:29:19 +0000
committerRüdiger Timm <rt@openoffice.org>2004-09-20 11:29:19 +0000
commit037972d45d3efcbab18c64034620b57f31df19d2 (patch)
tree8925b9adb84c44c679837f1d406f5be89ccfef9a /basic
parentcd900f65733824f5227b18c53fd2a96054110af2 (diff)
INTEGRATION: CWS gh7 (1.5.74); FILE MERGED
2004/08/18 10:31:49 gh 1.5.74.1: #i32317#change initialisation of taskbar and invalidate
Diffstat (limited to 'basic')
-rw-r--r--basic/source/app/status.cxx31
1 files changed, 12 insertions, 19 deletions
diff --git a/basic/source/app/status.cxx b/basic/source/app/status.cxx
index c5f470c39a54..e15fd2eba75e 100644
--- a/basic/source/app/status.cxx
+++ b/basic/source/app/status.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: status.cxx,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: vg $ $Date: 2004-01-06 19:40:18 $
+ * last change: $Author: rt $ $Date: 2004-09-20 12:29:19 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -70,26 +70,18 @@ StatusLine::StatusLine( BasicFrame* p )
: TaskBar( p )
, pFrame( p )
{
- Show();
-}
+ // initialize TaskToolBox
+ TaskToolBox* pTempTaskToolBox = GetTaskToolBox();
+ pTempTaskToolBox->SetActivateTaskHdl( LINK( this, StatusLine, ActivateTask ) );
-TaskToolBox* StatusLine::CreateTaskToolBox()
-{
- TaskToolBox *pTTB = new TaskToolBox( this );
- pTTB->SetActivateTaskHdl( LINK( this, StatusLine, ActivateTask ) );
-// pTTB->Show();
- return pTTB;
-}
-
-TaskStatusBar* StatusLine::CreateTaskStatusBar()
-{
- TaskStatusBar* pBar = new TaskStatusBar( this, WB_3DLOOK | WB_BORDER | WB_LEFT );
+ // initialize TaskStatusBar
+ TaskStatusBar* pTempStatusBar = GetStatusBar();
USHORT nCharWidth = GetTextWidth( '0' ); // Angenommen, alle Zahlen sind gleich breit
+ pTempStatusBar->InsertItem( ST_MESSAGE, GetTextWidth( 'X' ) * 20, SIB_LEFT | SIB_IN | SIB_AUTOSIZE );
+ pTempStatusBar->InsertItem( ST_LINE, 5*nCharWidth );
+ pTempStatusBar->InsertStatusField();
- pBar->InsertItem( ST_MESSAGE, GetTextWidth( 'X' ) * 20, SIB_LEFT | SIB_IN | SIB_AUTOSIZE );
- pBar->InsertItem( ST_LINE, 5*nCharWidth );
- pBar->InsertStatusField();
- return pBar;
+ Show();
}
void StatusLine::Message( String& s )
@@ -151,6 +143,7 @@ void StatusLine::LoadTaskToolBox()
pTaskToolBox->EndUpdateTask();
Resize();
+ Invalidate();
}