diff options
| author | gt <gt@openoffice.org> | 2000-11-30 09:39:03 +0000 |
|---|---|---|
| committer | gt <gt@openoffice.org> | 2000-11-30 09:39:03 +0000 |
| commit | 167b35e3b0a11a8207c52a333a55778efcc118fa (patch) | |
| tree | 90ceaeb45b6d08a2a2309e6e8c346386ef859bce /sc | |
| parent | fc21c7a688ffeb874a25680fae9a2c0628eb7a29 (diff) | |
#79227# ImportExcel::Setup(): default paper size for unknown
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/filter/excel/impop.cxx | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx index 932ec48b52df..cfeab11ab0ae 100644 --- a/sc/source/filter/excel/impop.cxx +++ b/sc/source/filter/excel/impop.cxx @@ -2,9 +2,9 @@ * * $RCSfile: impop.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: gt $ $Date: 2000-10-30 12:22:26 $ + * last change: $Author: gt $ $Date: 2000-11-30 10:39:03 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -80,6 +80,7 @@ #include <svx/paperinf.hxx> #include <svx/sizeitem.hxx> #include <svx/ulspitem.hxx> +#include <sfx2/printer.hxx> #include <svtools/zforlist.hxx> #if defined( WNT ) || defined( WIN ) @@ -600,7 +601,7 @@ void ImportExcel::Name25( void ) const BOOL bHidden = TRUEBOOL( nOpt & EXC_NAME_HIDDEN ); const BOOL bBuildIn = TRUEBOOL( nOpt & EXC_NAME_BUILTIN ); - sal_Char cFirstNameChar = aName.GetChar( 0 ); + sal_Char cFirstNameChar = ( sal_Char ) aName.GetChar( 0 ); const BOOL bPrintArea = bBuildIn && ( cFirstNameChar == EXC_BUILTIN_PRINTAREA ); const BOOL bPrintTitles = bBuildIn && ( cFirstNameChar == EXC_BUILTIN_PRINTTITLES ); @@ -1504,6 +1505,10 @@ void ImportExcel::Setup( void ) else aSize = SvxPaperInfo::GetPaperSize( pSvxPS[ nPaperSize ] ); + if( aSize.nA == 0 || aSize.nB == 0 ) + // now try default from printer + aSize = SvxPaperInfo::GetPaperSize( pD->GetPrinter() ); + if( bLandscape ) { long nTmp; @@ -1875,7 +1880,7 @@ void ImportExcel::Name34( void ) // Namen einlesen String aName( ASSTOSTR( ReadString( aIn, nLenName ) ) ); - sal_Char cFirstNameChar = aName.GetChar( 0 ); + sal_Char cFirstNameChar = ( sal_Char ) aName.GetChar( 0 ); const UINT32 nFormStart = aIn.Tell(); @@ -2336,7 +2341,7 @@ void ImportExcel::ReadExcString( StringInfoLen eLen, ByteString& aString ) } if( nBytesLeft < nLaenge ) // hack for Applix rubbish, never needed before! - nLaenge = nBytesLeft; + nLaenge = ( UINT16 ) nBytesLeft; AppendString( aIn, aString, nLaenge ); nBytesLeft -= nLaenge; |