summaryrefslogtreecommitdiffstats
path: root/sc/source/filter/rtf/eeimpars.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/filter/rtf/eeimpars.cxx')
-rw-r--r--sc/source/filter/rtf/eeimpars.cxx78
1 files changed, 39 insertions, 39 deletions
diff --git a/sc/source/filter/rtf/eeimpars.cxx b/sc/source/filter/rtf/eeimpars.cxx
index 7fb3d16c6c8d..58c0fac79a78 100644
--- a/sc/source/filter/rtf/eeimpars.cxx
+++ b/sc/source/filter/rtf/eeimpars.cxx
@@ -83,8 +83,8 @@ ScEEImport::ScEEImport( ScDocument* pDocP, const ScRange& rRange ) :
const ScPatternAttr* pPattern = mpDoc->GetPattern(
maRange.aStart.Col(), maRange.aStart.Row(), maRange.aStart.Tab() );
mpEngine = new ScTabEditEngine( *pPattern, mpDoc->GetEditPool() );
- mpEngine->SetUpdateMode( FALSE );
- mpEngine->EnableUndo( FALSE );
+ mpEngine->SetUpdateMode( sal_False );
+ mpEngine->EnableUndo( sal_False );
}
@@ -97,9 +97,9 @@ ScEEImport::~ScEEImport()
}
-ULONG ScEEImport::Read( SvStream& rStream, const String& rBaseURL )
+sal_uLong ScEEImport::Read( SvStream& rStream, const String& rBaseURL )
{
- ULONG nErr = mpParser->Read( rStream, rBaseURL );
+ sal_uLong nErr = mpParser->Read( rStream, rBaseURL );
SCCOL nEndCol;
SCROW nEndRow;
@@ -126,11 +126,11 @@ ULONG ScEEImport::Read( SvStream& rStream, const String& rBaseURL )
}
-void ScEEImport::WriteToDocument( BOOL bSizeColsRows, double nOutputFactor, SvNumberFormatter* pFormatter, bool bConvertDate )
+void ScEEImport::WriteToDocument( sal_Bool bSizeColsRows, double nOutputFactor, SvNumberFormatter* pFormatter, bool bConvertDate )
{
ScProgress* pProgress = new ScProgress( mpDoc->GetDocumentShell(),
ScGlobal::GetRscString( STR_LOAD_DOC ), mpParser->Count() );
- ULONG nProgress = 0;
+ sal_uLong nProgress = 0;
SCCOL nStartCol, nEndCol;
SCROW nStartRow, nEndRow;
@@ -145,7 +145,7 @@ void ScEEImport::WriteToDocument( BOOL bSizeColsRows, double nOutputFactor, SvNu
nOverlapRowMax = 0;
nMergeColAdd = 0;
nLastMergedRow = SCROW_MAX;
- BOOL bHasGraphics = FALSE;
+ sal_Bool bHasGraphics = sal_False;
ScEEParseEntry* pE;
if (!pFormatter)
pFormatter = mpDoc->GetFormatTable();
@@ -190,28 +190,28 @@ void ScEEImport::WriteToDocument( BOOL bSizeColsRows, double nOutputFactor, SvNu
aSet.ClearItem( EE_PARA_JUST );
// Testen, ob einfacher String ohne gemischte Attribute
- BOOL bSimple = ( pE->aSel.nStartPara == pE->aSel.nEndPara );
- for (USHORT nId = EE_CHAR_START; nId <= EE_CHAR_END && bSimple; nId++)
+ sal_Bool bSimple = ( pE->aSel.nStartPara == pE->aSel.nEndPara );
+ for (sal_uInt16 nId = EE_CHAR_START; nId <= EE_CHAR_END && bSimple; nId++)
{
const SfxPoolItem* pItem = 0;
- SfxItemState eState = aSet.GetItemState( nId, TRUE, &pItem );
+ SfxItemState eState = aSet.GetItemState( nId, sal_True, &pItem );
if (eState == SFX_ITEM_DONTCARE)
- bSimple = FALSE;
+ bSimple = sal_False;
else if (eState == SFX_ITEM_SET)
{
if ( nId == EE_CHAR_ESCAPEMENT ) // Hoch-/Tiefstellen immer ueber EE
{
if ( (SvxEscapement)((const SvxEscapementItem*)pItem)->GetEnumValue()
!= SVX_ESCAPEMENT_OFF )
- bSimple = FALSE;
+ bSimple = sal_False;
}
}
}
if ( bSimple )
{ // Feldbefehle enthalten?
- SfxItemState eFieldState = aSet.GetItemState( EE_FEATURE_FIELD, FALSE );
+ SfxItemState eFieldState = aSet.GetItemState( EE_FEATURE_FIELD, sal_False );
if ( eFieldState == SFX_ITEM_DONTCARE || eFieldState == SFX_ITEM_SET )
- bSimple = FALSE;
+ bSimple = sal_False;
}
// HTML
@@ -241,43 +241,43 @@ void ScEEImport::WriteToDocument( BOOL bSizeColsRows, double nOutputFactor, SvNu
if ( rESet.Count() )
{
const SfxPoolItem* pItem;
- if ( rESet.GetItemState( ATTR_BACKGROUND, FALSE, &pItem) == SFX_ITEM_SET )
+ if ( rESet.GetItemState( ATTR_BACKGROUND, sal_False, &pItem) == SFX_ITEM_SET )
rSet.Put( *pItem );
- if ( rESet.GetItemState( ATTR_BORDER, FALSE, &pItem) == SFX_ITEM_SET )
+ if ( rESet.GetItemState( ATTR_BORDER, sal_False, &pItem) == SFX_ITEM_SET )
rSet.Put( *pItem );
- if ( rESet.GetItemState( ATTR_SHADOW, FALSE, &pItem) == SFX_ITEM_SET )
+ if ( rESet.GetItemState( ATTR_SHADOW, sal_False, &pItem) == SFX_ITEM_SET )
rSet.Put( *pItem );
// HTML
- if ( rESet.GetItemState( ATTR_HOR_JUSTIFY, FALSE, &pItem) == SFX_ITEM_SET )
+ if ( rESet.GetItemState( ATTR_HOR_JUSTIFY, sal_False, &pItem) == SFX_ITEM_SET )
rSet.Put( *pItem );
- if ( rESet.GetItemState( ATTR_VER_JUSTIFY, FALSE, &pItem) == SFX_ITEM_SET )
+ if ( rESet.GetItemState( ATTR_VER_JUSTIFY, sal_False, &pItem) == SFX_ITEM_SET )
rSet.Put( *pItem );
- if ( rESet.GetItemState( ATTR_LINEBREAK, FALSE, &pItem) == SFX_ITEM_SET )
+ if ( rESet.GetItemState( ATTR_LINEBREAK, sal_False, &pItem) == SFX_ITEM_SET )
rSet.Put( *pItem );
- if ( rESet.GetItemState( ATTR_FONT_COLOR, FALSE, &pItem) == SFX_ITEM_SET )
+ if ( rESet.GetItemState( ATTR_FONT_COLOR, sal_False, &pItem) == SFX_ITEM_SET )
rSet.Put( *pItem );
- if ( rESet.GetItemState( ATTR_FONT_UNDERLINE, FALSE, &pItem) == SFX_ITEM_SET )
+ if ( rESet.GetItemState( ATTR_FONT_UNDERLINE, sal_False, &pItem) == SFX_ITEM_SET )
rSet.Put( *pItem );
// HTML LATIN/CJK/CTL script type dependent
const SfxPoolItem* pFont;
- if ( rESet.GetItemState( ATTR_FONT, FALSE, &pFont) != SFX_ITEM_SET )
+ if ( rESet.GetItemState( ATTR_FONT, sal_False, &pFont) != SFX_ITEM_SET )
pFont = 0;
const SfxPoolItem* pHeight;
- if ( rESet.GetItemState( ATTR_FONT_HEIGHT, FALSE, &pHeight) != SFX_ITEM_SET )
+ if ( rESet.GetItemState( ATTR_FONT_HEIGHT, sal_False, &pHeight) != SFX_ITEM_SET )
pHeight = 0;
const SfxPoolItem* pWeight;
- if ( rESet.GetItemState( ATTR_FONT_WEIGHT, FALSE, &pWeight) != SFX_ITEM_SET )
+ if ( rESet.GetItemState( ATTR_FONT_WEIGHT, sal_False, &pWeight) != SFX_ITEM_SET )
pWeight = 0;
const SfxPoolItem* pPosture;
- if ( rESet.GetItemState( ATTR_FONT_POSTURE, FALSE, &pPosture) != SFX_ITEM_SET )
+ if ( rESet.GetItemState( ATTR_FONT_POSTURE, sal_False, &pPosture) != SFX_ITEM_SET )
pPosture = 0;
if ( pFont || pHeight || pWeight || pPosture )
{
String aStr( mpEngine->GetText( pE->aSel ) );
- BYTE nScriptType = mpDoc->GetStringScriptType( aStr );
- const BYTE nScripts[3] = { SCRIPTTYPE_LATIN,
+ sal_uInt8 nScriptType = mpDoc->GetStringScriptType( aStr );
+ const sal_uInt8 nScripts[3] = { SCRIPTTYPE_LATIN,
SCRIPTTYPE_ASIAN, SCRIPTTYPE_COMPLEX };
- for ( BYTE i=0; i<3; ++i )
+ for ( sal_uInt8 i=0; i<3; ++i )
{
if ( nScriptType & nScripts[i] )
{
@@ -324,7 +324,7 @@ void ScEEImport::WriteToDocument( BOOL bSizeColsRows, double nOutputFactor, SvNu
const ScStyleSheet* pStyleSheet =
mpDoc->GetPattern( nCol, nRow, nTab )->GetStyleSheet();
aAttr.SetStyleSheet( (ScStyleSheet*)pStyleSheet );
- mpDoc->SetPattern( nCol, nRow, nTab, aAttr, TRUE );
+ mpDoc->SetPattern( nCol, nRow, nTab, aAttr, sal_True );
// Daten eintragen
if (bSimple)
@@ -393,7 +393,7 @@ void ScEEImport::WriteToDocument( BOOL bSizeColsRows, double nOutputFactor, SvNu
bHasGraphics |= GraphicSize( nCol, nRow, nTab, pE );
if ( pE->pName )
{ // Anchor Name => RangeName
- USHORT nIndex;
+ sal_uInt16 nIndex;
if ( !pRangeNames->SearchName( *pE->pName, nIndex ) )
{
ScRangeData* pData = new ScRangeData( mpDoc, *pE->pName,
@@ -414,7 +414,7 @@ void ScEEImport::WriteToDocument( BOOL bSizeColsRows, double nOutputFactor, SvNu
pProgress->SetState( nProgress, nEndCol - nStartCol + 1 );
for ( SCCOL nCol = nStartCol; nCol <= nEndCol; nCol++ )
{
- USHORT nWidth = (USHORT)(ULONG) pColWidths->Get( nCol );
+ sal_uInt16 nWidth = (sal_uInt16)(sal_uLong) pColWidths->Get( nCol );
if ( nWidth )
mpDoc->SetColWidth( nCol, nTab, nWidth );
pProgress->SetState( ++nProgress );
@@ -428,13 +428,13 @@ void ScEEImport::WriteToDocument( BOOL bSizeColsRows, double nOutputFactor, SvNu
double nPPTY = ScGlobal::nScreenPPTY * (double) aZoom;
VirtualDevice aVirtDev;
mpDoc->SetOptimalHeight( 0, nEndRow, 0,
- static_cast< USHORT >( ScGlobal::nLastRowHeightExtra ), &aVirtDev,
- nPPTX, nPPTY, aZoom, aZoom, FALSE );
+ static_cast< sal_uInt16 >( ScGlobal::nLastRowHeightExtra ), &aVirtDev,
+ nPPTX, nPPTY, aZoom, aZoom, sal_False );
if ( mpRowHeights->Count() )
{
for ( SCROW nRow = nStartRow; nRow <= nEndRow; nRow++ )
{
- USHORT nHeight = (USHORT)(ULONG) mpRowHeights->Get( nRow );
+ sal_uInt16 nHeight = (sal_uInt16)(sal_uLong) mpRowHeights->Get( nRow );
if ( nHeight > mpDoc->GetRowHeight( nRow, nTab ) )
mpDoc->SetRowHeight( nRow, nTab, nHeight );
}
@@ -458,13 +458,13 @@ void ScEEImport::WriteToDocument( BOOL bSizeColsRows, double nOutputFactor, SvNu
}
-BOOL ScEEImport::GraphicSize( SCCOL nCol, SCROW nRow, SCTAB /*nTab*/,
+sal_Bool ScEEImport::GraphicSize( SCCOL nCol, SCROW nRow, SCTAB /*nTab*/,
ScEEParseEntry* pE )
{
ScHTMLImageList* pIL = pE->pImageList;
if ( !pIL || !pIL->Count() )
- return FALSE;
- BOOL bHasGraphics = FALSE;
+ return sal_False;
+ sal_Bool bHasGraphics = sal_False;
OutputDevice* pDefaultDev = Application::GetDefaultDevice();
long nWidth, nHeight;
nWidth = nHeight = 0;
@@ -472,7 +472,7 @@ BOOL ScEEImport::GraphicSize( SCCOL nCol, SCROW nRow, SCTAB /*nTab*/,
for ( ScHTMLImage* pI = pIL->First(); pI; pI = pIL->Next() )
{
if ( pI->pGraphic )
- bHasGraphics = TRUE;
+ bHasGraphics = sal_True;
Size aSizePix = pI->aSize;
aSizePix.Width() += 2 * pI->aSpace.X();
aSizePix.Height() += 2 * pI->aSpace.Y();