summaryrefslogtreecommitdiff
path: root/sc/source/ui/app
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/ui/app')
-rwxr-xr-x[-rw-r--r--]sc/source/ui/app/inputwin.cxx6
-rw-r--r--sc/source/ui/app/scdll.cxx54
-rw-r--r--sc/source/ui/app/scmod.cxx62
3 files changed, 5 insertions, 117 deletions
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 2cabe7f9f2d6..b028a0a153ce 100644..100755
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -757,7 +757,11 @@ ScTextWnd::ScTextWnd( Window* pParent )
aTextFont.SetColor (aTxtColor);
aTextFont.SetWeight ( WEIGHT_NORMAL );
- SetSizePixel ( Size(1,TBX_WINDOW_HEIGHT) );
+ Size aSize(1,TBX_WINDOW_HEIGHT);
+ Size aMinEditSize( Edit::GetMinimumEditSize() );
+ if( aMinEditSize.Height() > aSize.Height() )
+ aSize.Height() = aMinEditSize.Height();
+ SetSizePixel ( aSize );
SetBackground ( aBgColor );
SetLineColor ( COL_BLACK );
SetMapMode ( MAP_TWIP );
diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx
index a1b8f05d2918..8051399d06fa 100644
--- a/sc/source/ui/app/scdll.cxx
+++ b/sc/source/ui/app/scdll.cxx
@@ -361,59 +361,5 @@ void ScDLL::Exit()
// ScGlobal::Clear ist schon im Module-dtor
}
-//------------------------------------------------------------------
-// Statusbar
-//------------------------------------------------------------------
-
-#define TEXT_WIDTH(s) rStatusBar.GetTextWidth((s))
-
-//UNUSED2008-05 void ScDLL::FillStatusBar(StatusBar &rStatusBar)
-//UNUSED2008-05 {
-//UNUSED2008-05 // Dokumentposition (Tabelle x / y)
-//UNUSED2008-05 rStatusBar.InsertItem( SID_STATUS_DOCPOS,
-//UNUSED2008-05 TEXT_WIDTH( String().Fill( 10, 'X' ) ),
-//UNUSED2008-05 SIB_LEFT|SIB_AUTOSIZE );
-//UNUSED2008-05
-//UNUSED2008-05 // Seitenvorlage
-//UNUSED2008-05 rStatusBar.InsertItem( SID_STATUS_PAGESTYLE,
-//UNUSED2008-05 TEXT_WIDTH( String().Fill( 15, 'X' ) ),
-//UNUSED2008-05 SIB_LEFT|SIB_AUTOSIZE );
-//UNUSED2008-05
-//UNUSED2008-05 // Ma"sstab
-//UNUSED2008-05 rStatusBar.InsertItem( SID_ATTR_ZOOM,
-//UNUSED2008-05 SvxZoomStatusBarControl::GetDefItemWidth(rStatusBar),
-//UNUSED2008-05 SIB_CENTER );
-//UNUSED2008-05
-//UNUSED2008-05 // Einfuege-/Ueberschreibmodus
-//UNUSED2008-05 rStatusBar.InsertItem( SID_ATTR_INSERT,
-//UNUSED2008-05 SvxInsertStatusBarControl::GetDefItemWidth(rStatusBar),
-//UNUSED2008-05 SIB_CENTER );
-//UNUSED2008-05
-//UNUSED2008-05 // Selektionsmodus
-//UNUSED2008-05 rStatusBar.InsertItem( SID_STATUS_SELMODE,
-//UNUSED2008-05 SvxSelectionModeControl::GetDefItemWidth(rStatusBar),
-//UNUSED2008-05 SIB_CENTER );
-//UNUSED2008-05
-//UNUSED2008-05 // Dokument geaendert
-//UNUSED2008-05 rStatusBar.InsertItem( SID_DOC_MODIFIED,
-//UNUSED2008-05 SvxModifyControl::GetDefItemWidth(rStatusBar));
-//UNUSED2008-05
-//UNUSED2008-05 // signatures
-//UNUSED2008-05 rStatusBar.InsertItem( SID_SIGNATURE, XmlSecStatusBarControl::GetDefItemWidth( rStatusBar ), SIB_USERDRAW );
-//UNUSED2008-05 rStatusBar.SetHelpId(SID_SIGNATURE, SID_SIGNATURE);
-//UNUSED2008-05
-//UNUSED2008-05 // Mail
-//UNUSED2008-05 rStatusBar.InsertItem( SID_MAIL_NOTIFY,
-//UNUSED2008-05 TEXT_WIDTH( String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("Mail")) ),
-//UNUSED2008-05 SIB_CENTER );
-//UNUSED2008-05
-//UNUSED2008-05 // den aktuellen Kontext anzeigen Uhrzeit / FramePos / TabellenInfo / Errors
-//UNUSED2008-05 rStatusBar.InsertItem( SID_ATTR_SIZE,
-//UNUSED2008-05 SvxPosSizeStatusBarControl::GetDefItemWidth(rStatusBar),
-//UNUSED2008-05 SIB_AUTOSIZE|SIB_LEFT|SIB_USERDRAW);
-//UNUSED2008-05 }
-
-#undef TEXT_WIDTH
-
// DetectFilter functionality has moved - please update your bookmarks
// see sc/source/ui/unoobj/scdetect.cxx, have a nice day.
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index 272852efcf71..f7a02e1577f7 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -372,68 +372,6 @@ void ScModule::DeleteCfg()
}
//------------------------------------------------------------------
-
-#define TEXT_WIDTH(s) rStatusBar.GetTextWidth((s))
-
-void ScModule::FillStatusBar(StatusBar& rStatusBar)
-{
- // Dokumentposition (Tabelle x / y)
- rStatusBar.InsertItem( SID_STATUS_DOCPOS,
- TEXT_WIDTH( String().Fill( 10, 'X' ) ),
- SIB_LEFT|SIB_AUTOSIZE );
- rStatusBar.SetHelpId( SID_STATUS_DOCPOS, SID_STATUS_DOCPOS );
-
- // Seitenvorlage
- rStatusBar.InsertItem( SID_STATUS_PAGESTYLE,
- TEXT_WIDTH( String().Fill( 15, 'X' ) ),
- SIB_LEFT|SIB_AUTOSIZE );
- rStatusBar.SetHelpId( SID_STATUS_PAGESTYLE, SID_STATUS_PAGESTYLE );
-
- // Einfuege-/Ueberschreibmodus
- rStatusBar.InsertItem( SID_ATTR_INSERT,
- SvxInsertStatusBarControl::GetDefItemWidth(rStatusBar),
- SIB_CENTER );
- rStatusBar.SetHelpId( SID_ATTR_INSERT, SID_ATTR_INSERT );
-
- // Selektionsmodus
- rStatusBar.InsertItem( SID_STATUS_SELMODE,
- SvxSelectionModeControl::GetDefItemWidth(rStatusBar),
- SIB_CENTER );
- rStatusBar.SetHelpId( SID_STATUS_SELMODE, SID_STATUS_SELMODE );
-
- // Dokument geaendert
- rStatusBar.InsertItem( SID_DOC_MODIFIED,
- SvxModifyControl::GetDefItemWidth(rStatusBar));
-
- // signatures
- rStatusBar.InsertItem( SID_SIGNATURE, XmlSecStatusBarControl::GetDefItemWidth( rStatusBar ), SIB_USERDRAW );
- rStatusBar.SetHelpId(SID_SIGNATURE, SID_SIGNATURE);
-
-
- rStatusBar.SetHelpId( SID_DOC_MODIFIED, SID_DOC_MODIFIED );
-
- // den aktuellen Kontext anzeigen Uhrzeit / FramePos / TabellenInfo / Errors
- rStatusBar.InsertItem( SID_ATTR_SIZE,
- SvxPosSizeStatusBarControl::GetDefItemWidth(rStatusBar),
- SIB_AUTOSIZE|SIB_LEFT|SIB_USERDRAW);
- rStatusBar.SetHelpId( SID_ATTR_SIZE, SID_ATTR_SIZE );
-
- // Ma"sstab
- rStatusBar.InsertItem( SID_ATTR_ZOOM,
- SvxZoomStatusBarControl::GetDefItemWidth(rStatusBar),
- SIB_CENTER );
- rStatusBar.SetHelpId( SID_ATTR_ZOOM, SID_ATTR_ZOOM );
-
- // ZoomSlider
- rStatusBar.InsertItem( SID_ATTR_ZOOMSLIDER,
- TEXT_WIDTH( String().Fill( 15, 'X' ) ),
- SIB_CENTER );
- rStatusBar.SetHelpId( SID_ATTR_ZOOMSLIDER, SID_ATTR_ZOOMSLIDER );
-}
-
-#undef TEXT_WIDTH
-
-//------------------------------------------------------------------
//
// von der Applikation verschoben:
//