summaryrefslogtreecommitdiff
path: root/sd/source/ui/view/drviews9.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sd/source/ui/view/drviews9.cxx')
-rwxr-xr-x[-rw-r--r--]sd/source/ui/view/drviews9.cxx114
1 files changed, 57 insertions, 57 deletions
diff --git a/sd/source/ui/view/drviews9.cxx b/sd/source/ui/view/drviews9.cxx
index 217ef520c..ced5235cb 100644..100755
--- a/sd/source/ui/view/drviews9.cxx
+++ b/sd/source/ui/view/drviews9.cxx
@@ -97,12 +97,12 @@ void DrawViewShell::ExecGallery(SfxRequest& rReq)
if ( pArgs )
{
- const UINT32 nFormats = ( (SfxUInt32Item&) pArgs->Get( SID_GALLERY_FORMATS ) ).GetValue();
+ const sal_uInt32 nFormats = ( (SfxUInt32Item&) pArgs->Get( SID_GALLERY_FORMATS ) ).GetValue();
GalleryExplorer* pGal = SVX_GALLERY();
if ( pGal )
{
- GetDocSh()->SetWaitCursor( TRUE );
+ GetDocSh()->SetWaitCursor( sal_True );
// Graphik einfuegen
if (nFormats & SGA_FORMAT_GRAPHIC)
@@ -155,7 +155,7 @@ void DrawViewShell::ExecGallery(SfxRequest& rReq)
SdrGrafObj* pGrafObj = NULL;
- BOOL bInsertNewObject = TRUE;
+ sal_Bool bInsertNewObject = sal_True;
if ( mpDrawView->AreObjectsMarked() )
{
@@ -179,10 +179,10 @@ void DrawViewShell::ExecGallery(SfxRequest& rReq)
* Das leere Graphik-Objekt bekommt eine neue
* Graphik
******************************************/
- bInsertNewObject = FALSE;
+ bInsertNewObject = sal_False;
SdrGrafObj* pNewGrafObj = (SdrGrafObj*) pGrafObj->Clone();
- pNewGrafObj->SetEmptyPresObj(FALSE);
+ pNewGrafObj->SetEmptyPresObj(sal_False);
pNewGrafObj->SetOutlinerParaObject(NULL);
pNewGrafObj->SetGraphic(aGraphic);
@@ -217,7 +217,7 @@ void DrawViewShell::ExecGallery(SfxRequest& rReq)
GetViewFrame()->GetDispatcher()->Execute( SID_INSERT_AVMEDIA, SFX_CALLMODE_SYNCHRON, &aMediaURLItem, 0L );
}
- GetDocSh()->SetWaitCursor( FALSE );
+ GetDocSh()->SetWaitCursor( sal_False );
}
}
}
@@ -268,7 +268,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
if (pArgs)
if (pArgs->Count () == 1)
{
- SFX_REQUEST_ARG (rReq, pFillStyle, SfxUInt32Item, ID_VAL_STYLE, FALSE);
+ SFX_REQUEST_ARG (rReq, pFillStyle, SfxUInt32Item, ID_VAL_STYLE, sal_False);
if (CHECK_RANGE (XFILL_NONE, (sal_Int32)pFillStyle->GetValue (), XFILL_BITMAP))
{
pAttr->ClearItem (XATTR_FILLSTYLE);
@@ -288,7 +288,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
if (pArgs)
if (pArgs->Count () == 1)
{
- SFX_REQUEST_ARG (rReq, pLineStyle, SfxUInt32Item, ID_VAL_STYLE, FALSE);
+ SFX_REQUEST_ARG (rReq, pLineStyle, SfxUInt32Item, ID_VAL_STYLE, sal_False);
if (CHECK_RANGE (XLINE_NONE, (sal_Int32)pLineStyle->GetValue (), XLINE_DASH))
{
pAttr->ClearItem (XATTR_LINESTYLE);
@@ -308,7 +308,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
if (pArgs)
if (pArgs->Count () == 1)
{
- SFX_REQUEST_ARG (rReq, pLineWidth, SfxUInt32Item, ID_VAL_WIDTH, FALSE);
+ SFX_REQUEST_ARG (rReq, pLineWidth, SfxUInt32Item, ID_VAL_WIDTH, sal_False);
pAttr->ClearItem (XATTR_LINEWIDTH);
pAttr->Put (XLineWidthItem (pLineWidth->GetValue ()), XATTR_LINEWIDTH);
rBindings.Invalidate (SID_ATTR_LINE_WIDTH);
@@ -322,15 +322,15 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
if (pArgs)
if (pArgs->Count () == 3)
{
- SFX_REQUEST_ARG (rReq, pRed, SfxUInt32Item, ID_VAL_RED, FALSE);
- SFX_REQUEST_ARG (rReq, pGreen, SfxUInt32Item, ID_VAL_GREEN, FALSE);
- SFX_REQUEST_ARG (rReq, pBlue, SfxUInt32Item, ID_VAL_BLUE, FALSE);
+ SFX_REQUEST_ARG (rReq, pRed, SfxUInt32Item, ID_VAL_RED, sal_False);
+ SFX_REQUEST_ARG (rReq, pGreen, SfxUInt32Item, ID_VAL_GREEN, sal_False);
+ SFX_REQUEST_ARG (rReq, pBlue, SfxUInt32Item, ID_VAL_BLUE, sal_False);
pAttr->ClearItem (XATTR_FILLCOLOR);
pAttr->ClearItem (XATTR_FILLSTYLE);
- pAttr->Put (XFillColorItem (-1, Color ((BYTE) pRed->GetValue (),
- (BYTE) pGreen->GetValue (),
- (BYTE) pBlue->GetValue ())),
+ pAttr->Put (XFillColorItem (-1, Color ((sal_uInt8) pRed->GetValue (),
+ (sal_uInt8) pGreen->GetValue (),
+ (sal_uInt8) pBlue->GetValue ())),
XATTR_FILLCOLOR);
pAttr->Put (XFillStyleItem (XFILL_SOLID), XATTR_FILLSTYLE);
rBindings.Invalidate (SID_ATTR_FILL_COLOR);
@@ -345,14 +345,14 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
if (pArgs)
if (pArgs->Count () == 3)
{
- SFX_REQUEST_ARG (rReq, pRed, SfxUInt32Item, ID_VAL_RED, FALSE);
- SFX_REQUEST_ARG (rReq, pGreen, SfxUInt32Item, ID_VAL_GREEN, FALSE);
- SFX_REQUEST_ARG (rReq, pBlue, SfxUInt32Item, ID_VAL_BLUE, FALSE);
+ SFX_REQUEST_ARG (rReq, pRed, SfxUInt32Item, ID_VAL_RED, sal_False);
+ SFX_REQUEST_ARG (rReq, pGreen, SfxUInt32Item, ID_VAL_GREEN, sal_False);
+ SFX_REQUEST_ARG (rReq, pBlue, SfxUInt32Item, ID_VAL_BLUE, sal_False);
pAttr->ClearItem (XATTR_LINECOLOR);
- pAttr->Put (XLineColorItem (-1, Color ((BYTE) pRed->GetValue (),
- (BYTE) pGreen->GetValue (),
- (BYTE) pBlue->GetValue ())),
+ pAttr->Put (XLineColorItem (-1, Color ((sal_uInt8) pRed->GetValue (),
+ (sal_uInt8) pGreen->GetValue (),
+ (sal_uInt8) pBlue->GetValue ())),
XATTR_LINECOLOR);
rBindings.Invalidate (SID_ATTR_LINE_COLOR);
break;
@@ -366,16 +366,16 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
if (pArgs)
if (pArgs->Count () == 4)
{
- SFX_REQUEST_ARG (rReq, pName, SfxStringItem, ID_VAL_INDEX, FALSE);
- SFX_REQUEST_ARG (rReq, pRed, SfxUInt32Item, ID_VAL_RED, FALSE);
- SFX_REQUEST_ARG (rReq, pGreen, SfxUInt32Item, ID_VAL_GREEN, FALSE);
- SFX_REQUEST_ARG (rReq, pBlue, SfxUInt32Item, ID_VAL_BLUE, FALSE);
+ SFX_REQUEST_ARG (rReq, pName, SfxStringItem, ID_VAL_INDEX, sal_False);
+ SFX_REQUEST_ARG (rReq, pRed, SfxUInt32Item, ID_VAL_RED, sal_False);
+ SFX_REQUEST_ARG (rReq, pGreen, SfxUInt32Item, ID_VAL_GREEN, sal_False);
+ SFX_REQUEST_ARG (rReq, pBlue, SfxUInt32Item, ID_VAL_BLUE, sal_False);
XGradientList *pGradientList = GetDoc()->GetGradientList ();
long nCounts = pGradientList->Count ();
- Color aColor ((BYTE) pRed->GetValue (),
- (BYTE) pGreen->GetValue (),
- (BYTE) pBlue->GetValue ());
+ Color aColor ((sal_uInt8) pRed->GetValue (),
+ (sal_uInt8) pGreen->GetValue (),
+ (sal_uInt8) pBlue->GetValue ());
long i;
pAttr->ClearItem (XATTR_FILLGRADIENT);
@@ -426,16 +426,16 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
if (pArgs)
if (pArgs->Count () == 4)
{
- SFX_REQUEST_ARG (rReq, pName, SfxStringItem, ID_VAL_INDEX, FALSE);
- SFX_REQUEST_ARG (rReq, pRed, SfxUInt32Item, ID_VAL_RED, FALSE);
- SFX_REQUEST_ARG (rReq, pGreen, SfxUInt32Item, ID_VAL_GREEN, FALSE);
- SFX_REQUEST_ARG (rReq, pBlue, SfxUInt32Item, ID_VAL_BLUE, FALSE);
+ SFX_REQUEST_ARG (rReq, pName, SfxStringItem, ID_VAL_INDEX, sal_False);
+ SFX_REQUEST_ARG (rReq, pRed, SfxUInt32Item, ID_VAL_RED, sal_False);
+ SFX_REQUEST_ARG (rReq, pGreen, SfxUInt32Item, ID_VAL_GREEN, sal_False);
+ SFX_REQUEST_ARG (rReq, pBlue, SfxUInt32Item, ID_VAL_BLUE, sal_False);
XHatchList *pHatchList = GetDoc()->GetHatchList ();
long nCounts = pHatchList->Count ();
- Color aColor ((BYTE) pRed->GetValue (),
- (BYTE) pGreen->GetValue (),
- (BYTE) pBlue->GetValue ());
+ Color aColor ((sal_uInt8) pRed->GetValue (),
+ (sal_uInt8) pGreen->GetValue (),
+ (sal_uInt8) pBlue->GetValue ());
long i;
pAttr->ClearItem (XATTR_FILLHATCH);
@@ -480,13 +480,13 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
if (pArgs)
if (pArgs->Count () == 7)
{
- SFX_REQUEST_ARG (rReq, pName, SfxStringItem, ID_VAL_INDEX, FALSE);
- SFX_REQUEST_ARG (rReq, pStyle, SfxUInt32Item, ID_VAL_STYLE, FALSE);
- SFX_REQUEST_ARG (rReq, pDots, SfxUInt32Item, ID_VAL_DOTS, FALSE);
- SFX_REQUEST_ARG (rReq, pDotLen, SfxUInt32Item, ID_VAL_DOTLEN, FALSE);
- SFX_REQUEST_ARG (rReq, pDashes, SfxUInt32Item, ID_VAL_DASHES, FALSE);
- SFX_REQUEST_ARG (rReq, pDashLen, SfxUInt32Item, ID_VAL_DASHLEN, FALSE);
- SFX_REQUEST_ARG (rReq, pDistance, SfxUInt32Item, ID_VAL_DISTANCE, FALSE);
+ SFX_REQUEST_ARG (rReq, pName, SfxStringItem, ID_VAL_INDEX, sal_False);
+ SFX_REQUEST_ARG (rReq, pStyle, SfxUInt32Item, ID_VAL_STYLE, sal_False);
+ SFX_REQUEST_ARG (rReq, pDots, SfxUInt32Item, ID_VAL_DOTS, sal_False);
+ SFX_REQUEST_ARG (rReq, pDotLen, SfxUInt32Item, ID_VAL_DOTLEN, sal_False);
+ SFX_REQUEST_ARG (rReq, pDashes, SfxUInt32Item, ID_VAL_DASHES, sal_False);
+ SFX_REQUEST_ARG (rReq, pDashLen, SfxUInt32Item, ID_VAL_DASHLEN, sal_False);
+ SFX_REQUEST_ARG (rReq, pDistance, SfxUInt32Item, ID_VAL_DISTANCE, sal_False);
if (CHECK_RANGE (XDASH_RECT, (sal_Int32)pStyle->GetValue (), XDASH_ROUNDRELATIVE))
{
@@ -528,14 +528,14 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
if (pArgs)
if (pArgs->Count () == 8)
{
- SFX_REQUEST_ARG (rReq, pName, SfxStringItem, ID_VAL_INDEX, FALSE);
- SFX_REQUEST_ARG (rReq, pStyle, SfxUInt32Item, ID_VAL_STYLE, FALSE);
- SFX_REQUEST_ARG (rReq, pAngle, SfxUInt32Item, ID_VAL_ANGLE, FALSE);
- SFX_REQUEST_ARG (rReq, pBorder, SfxUInt32Item, ID_VAL_BORDER, FALSE);
- SFX_REQUEST_ARG (rReq, pCenterX, SfxUInt32Item, ID_VAL_CENTER_X, FALSE);
- SFX_REQUEST_ARG (rReq, pCenterY, SfxUInt32Item, ID_VAL_CENTER_Y, FALSE);
- SFX_REQUEST_ARG (rReq, pStart, SfxUInt32Item, ID_VAL_STARTINTENS, FALSE);
- SFX_REQUEST_ARG (rReq, pEnd, SfxUInt32Item, ID_VAL_ENDINTENS, FALSE);
+ SFX_REQUEST_ARG (rReq, pName, SfxStringItem, ID_VAL_INDEX, sal_False);
+ SFX_REQUEST_ARG (rReq, pStyle, SfxUInt32Item, ID_VAL_STYLE, sal_False);
+ SFX_REQUEST_ARG (rReq, pAngle, SfxUInt32Item, ID_VAL_ANGLE, sal_False);
+ SFX_REQUEST_ARG (rReq, pBorder, SfxUInt32Item, ID_VAL_BORDER, sal_False);
+ SFX_REQUEST_ARG (rReq, pCenterX, SfxUInt32Item, ID_VAL_CENTER_X, sal_False);
+ SFX_REQUEST_ARG (rReq, pCenterY, SfxUInt32Item, ID_VAL_CENTER_Y, sal_False);
+ SFX_REQUEST_ARG (rReq, pStart, SfxUInt32Item, ID_VAL_STARTINTENS, sal_False);
+ SFX_REQUEST_ARG (rReq, pEnd, SfxUInt32Item, ID_VAL_ENDINTENS, sal_False);
if (CHECK_RANGE (XGRAD_LINEAR, (sal_Int32)pStyle->GetValue (), XGRAD_RECT) &&
CHECK_RANGE (0, (sal_Int32)pAngle->GetValue (), 360) &&
@@ -603,10 +603,10 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
if (pArgs)
if (pArgs->Count () == 4)
{
- SFX_REQUEST_ARG (rReq, pName, SfxStringItem, ID_VAL_INDEX, FALSE);
- SFX_REQUEST_ARG (rReq, pStyle, SfxUInt32Item, ID_VAL_STYLE, FALSE);
- SFX_REQUEST_ARG (rReq, pDistance, SfxUInt32Item, ID_VAL_DISTANCE, FALSE);
- SFX_REQUEST_ARG (rReq, pAngle, SfxUInt32Item, ID_VAL_ANGLE, FALSE);
+ SFX_REQUEST_ARG (rReq, pName, SfxStringItem, ID_VAL_INDEX, sal_False);
+ SFX_REQUEST_ARG (rReq, pStyle, SfxUInt32Item, ID_VAL_STYLE, sal_False);
+ SFX_REQUEST_ARG (rReq, pDistance, SfxUInt32Item, ID_VAL_DISTANCE, sal_False);
+ SFX_REQUEST_ARG (rReq, pAngle, SfxUInt32Item, ID_VAL_ANGLE, sal_False);
if (CHECK_RANGE (XHATCH_SINGLE, (sal_Int32)pStyle->GetValue (), XHATCH_TRIPLE) &&
CHECK_RANGE (0, (sal_Int32)pAngle->GetValue (), 360))
@@ -662,7 +662,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
if (pArgs)
if (pArgs->Count () == 1)
{
- SFX_REQUEST_ARG (rReq, pName, SfxStringItem, ID_VAL_INDEX, FALSE);
+ SFX_REQUEST_ARG (rReq, pName, SfxStringItem, ID_VAL_INDEX, sal_False);
XGradientList *pGradientList = GetDoc()->GetGradientList ();
long nCounts = pGradientList->Count ();
@@ -696,7 +696,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
if (pArgs)
if (pArgs->Count () == 1)
{
- SFX_REQUEST_ARG (rReq, pName, SfxStringItem, ID_VAL_INDEX, FALSE);
+ SFX_REQUEST_ARG (rReq, pName, SfxStringItem, ID_VAL_INDEX, sal_False);
XHatchList *pHatchList = GetDoc()->GetHatchList ();
long nCounts = pHatchList->Count ();
@@ -777,7 +777,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
void DrawViewShell::AttrState (SfxItemSet& rSet)
{
SfxWhichIter aIter (rSet);
- USHORT nWhich = aIter.FirstWhich ();
+ sal_uInt16 nWhich = aIter.FirstWhich ();
SfxItemSet aAttr( GetDoc()->GetPool() );
mpDrawView->GetAttributes( aAttr );
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-25 03:14:06 +0000