summaryrefslogtreecommitdiffstats
path: root/sc/source/ui/drawfunc/fuins2.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/ui/drawfunc/fuins2.cxx')
-rw-r--r--sc/source/ui/drawfunc/fuins2.cxx44
1 files changed, 22 insertions, 22 deletions
diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx
index 297e8fa38651..0c68c871ece1 100644
--- a/sc/source/ui/drawfunc/fuins2.cxx
+++ b/sc/source/ui/drawfunc/fuins2.cxx
@@ -98,7 +98,7 @@ extern SdrObject* pSkipPaintObj; // output.cxx - dieses Objekt nicht
//------------------------------------------------------------------------
#define IS_AVAILABLE(WhichId,ppItem) \
- (pReqArgs->GetItemState((WhichId), TRUE, ppItem ) == SFX_ITEM_SET)
+ (pReqArgs->GetItemState((WhichId), sal_True, ppItem ) == SFX_ITEM_SET)
void lcl_ChartInit( const uno::Reference < embed::XEmbeddedObject >& xObj, ScViewData* pViewData,
const rtl::OUString& rRangeParam )
@@ -118,7 +118,7 @@ void lcl_ChartInit( const uno::Reference < embed::XEmbeddedObject >& xObj, ScVie
ScMarkData& rMark = pViewData->GetMarkData();
if ( !rMark.IsMarked() )
- pViewData->GetView()->MarkDataArea( TRUE );
+ pViewData->GetView()->MarkDataArea( sal_True );
if ( pViewData->GetSimpleArea( nCol1,nRow1,nTab1, nCol2,nRow2,nTab2 ) == SC_MARK_SIMPLE )
{
@@ -228,7 +228,7 @@ FuInsertOLE::FuInsertOLE(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pVie
uno::Reference < embed::XEmbeddedObject > xObj;
uno::Reference < embed::XStorage > xStorage = comphelper::OStorageHelper::GetTemporaryStorage();
- BOOL bIsFromFile = FALSE;
+ sal_Bool bIsFromFile = sal_False;
::rtl::OUString aName;
sal_Int64 nAspect = embed::Aspects::MSOLE_CONTENT;
@@ -236,7 +236,7 @@ FuInsertOLE::FuInsertOLE(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pVie
uno::Reference< io::XInputStream > xIconMetaFile;
- USHORT nSlot = rReq.GetSlot();
+ sal_uInt16 nSlot = rReq.GetSlot();
SFX_REQUEST_ARG( rReq, pNameItem, SfxGlobalNameItem, SID_INSERT_OBJECT, sal_False );
if ( nSlot == SID_INSERT_OBJECT && pNameItem )
{
@@ -427,7 +427,7 @@ FuInsertOLE::FuInsertOLE(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pVie
if (bIsFromFile)
{
// #45012# Objekt ist selektiert, also Draw-Shell aktivieren
- pViewShell->SetDrawShell( TRUE );
+ pViewShell->SetDrawShell( sal_True );
}
else
{
@@ -516,7 +516,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView*
bool bAutomaticMark = false;
if ( !rMark.IsMarked() && !rMark.IsMultiMarked() )
{
- pViewSh->GetViewData()->GetView()->MarkDataArea( TRUE );
+ pViewSh->GetViewData()->GetView()->MarkDataArea( sal_True );
bAutomaticMark = true;
}
@@ -524,18 +524,18 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView*
aMultiMark.MarkToMulti();
ScRangeList aRanges;
- aMultiMark.FillRangeListWithMarks( &aRanges, FALSE );
+ aMultiMark.FillRangeListWithMarks( &aRanges, sal_False );
String aStr;
ScDocument* pDocument = pViewSh->GetViewData()->GetDocument();
aRanges.Format( aStr, SCR_ABS_3D, pDocument, pDocument->GetAddressConvention() );
aRangeString = aStr;
// get "total" range for positioning
- ULONG nCount = aRanges.Count();
+ sal_uLong nCount = aRanges.Count();
if ( nCount > 0 )
{
aPositionRange = *aRanges.GetObject(0);
- for (ULONG i=1; i<nCount; i++)
+ for (sal_uLong i=1; i<nCount; i++)
aPositionRange.ExtendTo( *aRanges.GetObject(i) );
}
@@ -566,7 +566,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView*
ScRangeListRef aDummy;
Rectangle aMarkDest;
SCTAB nMarkTab;
- BOOL bDrawRect = pViewShell->GetChartArea( aDummy, aMarkDest, nMarkTab );
+ sal_Bool bDrawRect = pViewShell->GetChartArea( aDummy, aMarkDest, nMarkTab );
// Objekt-Groesse
awt::Size aSz = xObj->getVisualAreaSize( nAspect );
@@ -574,17 +574,17 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView*
MapUnit aMapUnit = VCLUnoHelper::UnoEmbed2VCLMapUnit( xObj->getMapUnit( nAspect ) );
- BOOL bSizeCh = FALSE;
+ sal_Bool bSizeCh = sal_False;
if (bDrawRect && !aMarkDest.IsEmpty())
{
aSize = aMarkDest.GetSize();
- bSizeCh = TRUE;
+ bSizeCh = sal_True;
}
if (aSize.Height() <= 0 || aSize.Width() <= 0)
{
aSize.Width() = 5000;
aSize.Height() = 5000;
- bSizeCh = TRUE;
+ bSizeCh = sal_True;
}
if (bSizeCh)
{
@@ -597,12 +597,12 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView*
ScViewData* pData = pViewSh->GetViewData();
ScDocShell* pScDocSh = pData->GetDocShell();
ScDocument* pScDoc = pScDocSh->GetDocument();
- BOOL bUndo (pScDoc->IsUndoEnabled());
+ sal_Bool bUndo (pScDoc->IsUndoEnabled());
if( pReqArgs )
{
const SfxPoolItem* pItem;
- UINT16 nToTable = 0;
+ sal_uInt16 nToTable = 0;
if( IS_AVAILABLE( FN_PARAM_4, &pItem ) )
{
@@ -614,15 +614,15 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView*
// -> wenn gesetzt, neue Tabelle, sonst aktuelle Tabelle
if ( ((const SfxBoolItem*)pItem)->GetValue() )
- nToTable = static_cast<UINT16>(pScDoc->GetTableCount());
+ nToTable = static_cast<sal_uInt16>(pScDoc->GetTableCount());
else
- nToTable = static_cast<UINT16>(pData->GetTabNo());
+ nToTable = static_cast<sal_uInt16>(pData->GetTabNo());
}
}
else
{
if (bDrawRect)
- nToTable = static_cast<UINT16>(nMarkTab);
+ nToTable = static_cast<sal_uInt16>(nMarkTab);
rReq.AppendItem( SfxUInt16Item( FN_PARAM_4, nToTable ) );
}
@@ -637,7 +637,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView*
if ( pScDoc->InsertTab( nNewTab, aTabName ) )
{
- BOOL bAppend = TRUE;
+ sal_Bool bAppend = sal_True;
if (bUndo)
{
@@ -647,7 +647,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView*
}
pScDocSh->Broadcast( ScTablesHint( SC_TAB_INSERTED, nNewTab ) );
- pViewSh->SetTabNo( nNewTab, TRUE );
+ pViewSh->SetTabNo( nNewTab, sal_True );
pScDocSh->PostPaintExtras(); //! erst hinterher ???
}
else
@@ -657,7 +657,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView*
}
else if ( nToTable != pData->GetTabNo() )
{
- pViewSh->SetTabNo( nToTable, TRUE );
+ pViewSh->SetTabNo( nToTable, sal_True );
}
}
@@ -788,7 +788,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView*
bAddUndo = false; // don't create the undo action for inserting
// leave the draw shell
- pViewShell->SetDrawShell( FALSE );
+ pViewShell->SetDrawShell( sal_False );
}
else
{