summaryrefslogtreecommitdiffstats
path: root/sc/source/ui/drawfunc/drawsh5.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/ui/drawfunc/drawsh5.cxx')
-rw-r--r--sc/source/ui/drawfunc/drawsh5.cxx52
1 files changed, 26 insertions, 26 deletions
diff --git a/sc/source/ui/drawfunc/drawsh5.cxx b/sc/source/ui/drawfunc/drawsh5.cxx
index e79097ef8874..3130e39b79f1 100644
--- a/sc/source/ui/drawfunc/drawsh5.cxx
+++ b/sc/source/ui/drawfunc/drawsh5.cxx
@@ -83,7 +83,7 @@ void ScDrawShell::GetHLinkState( SfxItemSet& rSet ) // Hyperlink
{
ScDrawView* pView = pViewData->GetScDrawView();
const SdrMarkList& rMarkList = pView->GetMarkedObjectList();
- ULONG nMarkCount = rMarkList.GetMarkCount();
+ sal_uLong nMarkCount = rMarkList.GetMarkCount();
// Hyperlink
@@ -163,14 +163,14 @@ void ScDrawShell::ExecuteHLink( SfxRequest& rReq )
{
const SfxItemSet* pReqArgs = rReq.GetArgs();
- USHORT nSlot = rReq.GetSlot();
+ sal_uInt16 nSlot = rReq.GetSlot();
switch ( nSlot )
{
case SID_HYPERLINK_SETLINK:
if( pReqArgs )
{
const SfxPoolItem* pItem;
- if ( pReqArgs->GetItemState( SID_HYPERLINK_SETLINK, TRUE, &pItem ) == SFX_ITEM_SET )
+ if ( pReqArgs->GetItemState( SID_HYPERLINK_SETLINK, sal_True, &pItem ) == SFX_ITEM_SET )
{
const SvxHyperlinkItem* pHyper = (const SvxHyperlinkItem*) pItem;
const String& rName = pHyper->GetName();
@@ -178,7 +178,7 @@ void ScDrawShell::ExecuteHLink( SfxRequest& rReq )
const String& rTarget = pHyper->GetTargetFrame();
SvxLinkInsertMode eMode = pHyper->GetInsertMode();
- BOOL bDone = FALSE;
+ sal_Bool bDone = sal_False;
if ( eMode == HLINK_FIELD || eMode == HLINK_BUTTON )
{
ScDrawView* pView = pViewData->GetScDrawView();
@@ -239,14 +239,14 @@ void ScDrawShell::ExecuteHLink( SfxRequest& rReq )
//! Undo ???
pViewData->GetDocShell()->SetDocumentModified();
- bDone = TRUE;
+ bDone = sal_True;
}
}
#ifdef ISSUE66550_HLINK_FOR_SHAPES
else
{
SetHlinkForObject( pObj, rURL );
- bDone = TRUE;
+ bDone = sal_True;
}
#endif
}
@@ -254,7 +254,7 @@ void ScDrawShell::ExecuteHLink( SfxRequest& rReq )
if (!bDone)
pViewData->GetViewShell()->
- InsertURL( rName, rURL, rTarget, (USHORT) eMode );
+ InsertURL( rName, rURL, rTarget, (sal_uInt16) eMode );
// InsertURL an der ViewShell schaltet bei "Text" die DrawShell ab !!!
}
@@ -265,7 +265,7 @@ void ScDrawShell::ExecuteHLink( SfxRequest& rReq )
}
}
-USHORT ScGetFontWorkId(); // wegen CLOOKs - in drtxtob2
+sal_uInt16 ScGetFontWorkId(); // wegen CLOOKs - in drtxtob2
//------------------------------------------------------------------
@@ -279,7 +279,7 @@ void ScDrawShell::ExecDrawFunc( SfxRequest& rReq )
ScTabView* pTabView = pViewData->GetView();
ScDrawView* pView = pTabView->GetScDrawView();
const SfxItemSet *pArgs = rReq.GetArgs();
- USHORT nSlotId = rReq.GetSlot();
+ sal_uInt16 nSlotId = rReq.GetSlot();
//!!!
// wer weiss, wie lange das funktioniert? (->vom Abreisscontrol funktioniert es)
@@ -300,7 +300,7 @@ void ScDrawShell::ExecDrawFunc( SfxRequest& rReq )
rBindings.Invalidate(SID_OBJECT_HELL);
// leave draw shell if nothing selected (layer may be locked)
if ( pView->GetMarkedObjectList().GetMarkCount() == 0 )
- pViewData->GetViewShell()->SetDrawShell( FALSE );
+ pViewData->GetViewShell()->SetDrawShell( sal_False );
break;
case SID_FRAME_TO_TOP:
@@ -371,13 +371,13 @@ void ScDrawShell::ExecDrawFunc( SfxRequest& rReq )
case SID_DELETE_CONTENTS:
pView->DeleteMarked();
if (!pTabView->IsDrawSelMode())
- pViewData->GetViewShell()->SetDrawShell( FALSE );
+ pViewData->GetViewShell()->SetDrawShell( sal_False );
break;
case SID_CUT:
pView->DoCut();
if (!pTabView->IsDrawSelMode())
- pViewData->GetViewShell()->SetDrawShell( FALSE );
+ pViewData->GetViewShell()->SetDrawShell( sal_False );
break;
case SID_COPY:
@@ -433,7 +433,7 @@ void ScDrawShell::ExecDrawFunc( SfxRequest& rReq )
rBindings.Invalidate( SID_OBJECT_MIRROR );
if (eMode == SDRDRAG_ROTATE && !pView->IsFrameDragSingles())
{
- pView->SetFrameDragSingles( TRUE );
+ pView->SetFrameDragSingles( sal_True );
rBindings.Invalidate( SID_BEZIER_EDIT );
}
}
@@ -450,14 +450,14 @@ void ScDrawShell::ExecDrawFunc( SfxRequest& rReq )
rBindings.Invalidate( SID_OBJECT_MIRROR );
if (eMode == SDRDRAG_MIRROR && !pView->IsFrameDragSingles())
{
- pView->SetFrameDragSingles( TRUE );
+ pView->SetFrameDragSingles( sal_True );
rBindings.Invalidate( SID_BEZIER_EDIT );
}
}
break;
case SID_BEZIER_EDIT:
{
- BOOL bOld = pView->IsFrameDragSingles();
+ sal_Bool bOld = pView->IsFrameDragSingles();
pView->SetFrameDragSingles( !bOld );
rBindings.Invalidate( SID_BEZIER_EDIT );
if (bOld && pView->GetDragMode() != SDRDRAG_MOVE)
@@ -471,7 +471,7 @@ void ScDrawShell::ExecDrawFunc( SfxRequest& rReq )
case SID_FONTWORK:
{
- USHORT nId = ScGetFontWorkId();
+ sal_uInt16 nId = ScGetFontWorkId();
SfxViewFrame* pViewFrm = pViewData->GetViewShell()->GetViewFrame();
if ( rReq.GetArgs() )
@@ -493,11 +493,11 @@ void ScDrawShell::ExecDrawFunc( SfxRequest& rReq )
case SID_ENABLE_HYPHENATION:
{
- SFX_REQUEST_ARG( rReq, pItem, SfxBoolItem, SID_ENABLE_HYPHENATION, FALSE);
+ SFX_REQUEST_ARG( rReq, pItem, SfxBoolItem, SID_ENABLE_HYPHENATION, sal_False);
if( pItem )
{
SfxItemSet aSet( GetPool(), EE_PARA_HYPHENATE, EE_PARA_HYPHENATE );
- BOOL bValue = ( (const SfxBoolItem*) pItem)->GetValue();
+ sal_Bool bValue = ( (const SfxBoolItem*) pItem)->GetValue();
aSet.Put( SfxBoolItem( EE_PARA_HYPHENATE, bValue ) );
pView->SetAttributes( aSet );
}
@@ -565,7 +565,7 @@ void ScDrawShell::ExecDrawFunc( SfxRequest& rReq )
}
// ChartListenerCollectionNeedsUpdate is needed for Navigator update
- pDocSh->GetDocument()->SetChartListenerCollectionNeedsUpdate( TRUE );
+ pDocSh->GetDocument()->SetChartListenerCollectionNeedsUpdate( sal_True );
pDocSh->SetDrawModified();
}
@@ -604,7 +604,7 @@ void ScDrawShell::ExecDrawFunc( SfxRequest& rReq )
pSelected->SetDescription(aDescription);
// ChartListenerCollectionNeedsUpdate is needed for Navigator update
- pDocSh->GetDocument()->SetChartListenerCollectionNeedsUpdate( TRUE );
+ pDocSh->GetDocument()->SetChartListenerCollectionNeedsUpdate( sal_True );
pDocSh->SetDrawModified();
}
@@ -690,12 +690,12 @@ void ScDrawShell::ExecFormText(SfxRequest& rReq)
pDrView->ScEndTextEdit();
if ( SFX_ITEM_SET ==
- rSet.GetItemState(XATTR_FORMTXTSTDFORM, TRUE, &pItem)
+ rSet.GetItemState(XATTR_FORMTXTSTDFORM, sal_True, &pItem)
&& XFTFORM_NONE !=
((const XFormTextStdFormItem*) pItem)->GetValue() )
{
- USHORT nId = SvxFontWorkChildWindow::GetChildWindowId();
+ sal_uInt16 nId = SvxFontWorkChildWindow::GetChildWindowId();
SfxViewFrame* pViewFrm = pViewData->GetViewShell()->GetViewFrame();
SvxFontWorkDialog* pDlg = (SvxFontWorkDialog*)
(pViewFrm->
@@ -723,7 +723,7 @@ void ScDrawShell::ExecFormatPaintbrush( SfxRequest& rReq )
}
else
{
- BOOL bLock = FALSE;
+ sal_Bool bLock = sal_False;
const SfxItemSet *pArgs = rReq.GetArgs();
if( pArgs && pArgs->Count() >= 1 )
bLock = static_cast<const SfxBoolItem&>(pArgs->Get(SID_FORMATPAINTBRUSH)).GetValue();
@@ -731,7 +731,7 @@ void ScDrawShell::ExecFormatPaintbrush( SfxRequest& rReq )
ScDrawView* pDrawView = pViewData->GetScDrawView();
if ( pDrawView && pDrawView->AreObjectsMarked() )
{
- BOOL bOnlyHardAttr = TRUE;
+ sal_Bool bOnlyHardAttr = sal_True;
SfxItemSet* pItemSet = new SfxItemSet( pDrawView->GetAttrFromMarked(bOnlyHardAttr) );
pView->SetDrawBrushSet( pItemSet, bLock );
}
@@ -741,8 +741,8 @@ void ScDrawShell::ExecFormatPaintbrush( SfxRequest& rReq )
void ScDrawShell::StateFormatPaintbrush( SfxItemSet& rSet )
{
ScDrawView* pDrawView = pViewData->GetScDrawView();
- BOOL bSelection = pDrawView && pDrawView->AreObjectsMarked();
- BOOL bHasPaintBrush = pViewData->GetView()->HasPaintBrush();
+ sal_Bool bSelection = pDrawView && pDrawView->AreObjectsMarked();
+ sal_Bool bHasPaintBrush = pViewData->GetView()->HasPaintBrush();
if ( !bHasPaintBrush && !bSelection )
rSet.DisableItem( SID_FORMATPAINTBRUSH );