diff options
| author | Kohei Yoshida <kyoshida@novell.com> | 2011-03-10 16:55:21 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kyoshida@novell.com> | 2011-03-10 20:21:13 -0500 |
| commit | 12343c15568dcc2c9209d8ca41fda2263122448f (patch) | |
| tree | 3212a89c6cd8ea2e0aee7103aa9669bbb8a6f307 /sc/source/ui/docshell/docsh2.cxx | |
| parent | 99745dbcbb25b61437914c9782475d0b67a4b0bd (diff) | |
| parent | ce6308e4fad2281241bf4ca78280eba29f744d43 (diff) | |
Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
Diffstat (limited to 'sc/source/ui/docshell/docsh2.cxx')
| -rw-r--r-- | sc/source/ui/docshell/docsh2.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sc/source/ui/docshell/docsh2.cxx b/sc/source/ui/docshell/docsh2.cxx index d4d581dc7783..52d99479f27d 100644 --- a/sc/source/ui/docshell/docsh2.cxx +++ b/sc/source/ui/docshell/docsh2.cxx @@ -68,22 +68,22 @@ using namespace com::sun::star; //------------------------------------------------------------------ -BOOL ScDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor ) +sal_Bool ScDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor ) { RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "nn93723", "ScDocShell::InitNew" ); - BOOL bRet = SfxObjectShell::InitNew( xStor ); + sal_Bool bRet = SfxObjectShell::InitNew( xStor ); aDocument.MakeTable(0); // zusaetzliche Tabellen werden von der ersten View angelegt, - // wenn bIsEmpty dann noch TRUE ist + // wenn bIsEmpty dann noch sal_True ist if( bRet ) { Size aSize( (long) ( STD_COL_WIDTH * HMM_PER_TWIPS * OLE_STD_CELLS_X ), (long) ( ScGlobal::nStdRowHeight * HMM_PER_TWIPS * OLE_STD_CELLS_Y ) ); // hier muss auch der Start angepasst werden - SetVisAreaOrSize( Rectangle( Point(), aSize ), TRUE ); + SetVisAreaOrSize( Rectangle( Point(), aSize ), sal_True ); } aDocument.SetDrawDefaults(); // drawing layer defaults that are set only in InitNew @@ -104,13 +104,13 @@ BOOL ScDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor ) //------------------------------------------------------------------ -BOOL ScDocShell::IsEmpty() const +sal_Bool ScDocShell::IsEmpty() const { return bIsEmpty; } -void ScDocShell::SetEmpty(BOOL bSet) +void ScDocShell::SetEmpty(sal_Bool bSet) { bIsEmpty = bSet; } @@ -151,7 +151,7 @@ void ScDocShell::InitItems() !aDocument.IsValidAsianCompression() || !aDocument.IsValidAsianKerning() ) { // get settings from SvxAsianConfig - SvxAsianConfig aAsian( sal_False ); + SvxAsianConfig aAsian( false ); if ( !aDocument.GetForbiddenCharacters().is() ) { @@ -179,7 +179,7 @@ void ScDocShell::InitItems() if ( !aDocument.IsValidAsianCompression() ) { // set compression mode from configuration if not already set (e.g. XML import) - aDocument.SetAsianCompression( sal::static_int_cast<BYTE>( aAsian.GetCharDistanceCompression() ) ); + aDocument.SetAsianCompression( sal::static_int_cast<sal_uInt8>( aAsian.GetCharDistanceCompression() ) ); } if ( !aDocument.IsValidAsianKerning() ) |