diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-01-28 20:00:21 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-01-28 20:26:23 +0100 |
| commit | 608953c42590c3100eaa46ba686560403d1b8d03 (patch) | |
| tree | a0b706f6199e17174fc61b8948c5b63e8490ff72 /sd/source/ui/view | |
| parent | e7d1a81ee3befa9e9444fe5bf5c4ced9c98eecf5 (diff) | |
bool improvements
Change-Id: Icac34936bdb551ad517170fd497212513719d2aa
Diffstat (limited to 'sd/source/ui/view')
34 files changed, 280 insertions, 280 deletions
diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx index fd952534f0d9..e1f5cc3aa268 100644 --- a/sd/source/ui/view/Outliner.cxx +++ b/sd/source/ui/view/Outliner.cxx @@ -136,13 +136,13 @@ Outliner::Outliner( SdDrawDocument* pDoc, sal_uInt16 nMode ) mpDrawDocument(pDoc), mnConversionLanguage(LANGUAGE_NONE), mnIgnoreCurrentPageChangesLevel(0), - mbStringFound(sal_False), + mbStringFound(false), mbMatchMayExist(false), mnPageCount(0), mnObjectCount(0), - mbEndOfSearch(sal_False), - mbFoundObject(sal_False), - mbError(sal_False), + mbEndOfSearch(false), + mbFoundObject(false), + mbError(false), mbDirectionIsForward(true), mbRestrictSearchToSelection(false), maMarkListCopy(), @@ -266,13 +266,13 @@ void Outliner::PrepareSpelling (void) ::boost::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock()); if (pViewShell) { - mbStringFound = sal_False; + mbStringFound = false; mbWholeDocumentProcessed = false; // Supposed that we are not located at the very beginning/end of // the document then there may be a match in the document // prior/after the current position. - mbMatchMayExist = sal_True; + mbMatchMayExist = true; maObjectIterator = ::sd::outliner::Iterator(); maSearchStartPosition = ::sd::outliner::Iterator(); @@ -499,7 +499,7 @@ bool Outliner::StartSearchAndReplace (const SvxSearchItem* pSearchItem) meMode = SEARCH; mpSearchItem = pSearchItem; - mbFoundObject = sal_False; + mbFoundObject = false; Initialize ( ! mpSearchItem->GetBackward()); @@ -1067,7 +1067,7 @@ void Outliner::EndOfSearch (void) if ( ! mbMatchMayExist) { ShowEndOfSearchDialog (); - mbEndOfSearch = sal_True; + mbEndOfSearch = true; } // Ask the user whether to wrap arround and continue the search or // to terminate. @@ -1210,8 +1210,8 @@ void Outliner::PrepareSpellCheck (void) if (eState == EE_SPELL_NOLANGUAGE) { - mbError = sal_True; - mbEndOfSearch = sal_True; + mbError = true; + mbEndOfSearch = true; ErrorBox aErrorBox (NULL, WB_OK, SD_RESSTR(STR_NOLANGUAGE)); @@ -1269,7 +1269,7 @@ void Outliner::SetViewMode (PageKind ePageKind) if (pDrawViewShell.get()!=NULL && ePageKind != pDrawViewShell->GetPageKind()) { // Restore old edit mode. - pDrawViewShell->ChangeEditMode(mpImpl->meOriginalEditMode, sal_False); + pDrawViewShell->ChangeEditMode(mpImpl->meOriginalEditMode, false); SetStatusEventHdl(Link()); OUString sViewURL; @@ -1338,7 +1338,7 @@ void Outliner::SetPage (EditMode eEditMode, sal_uInt16 nPageIndex) OSL_ASSERT(pDrawViewShell.get()!=NULL); if (pDrawViewShell.get() != NULL) { - pDrawViewShell->ChangeEditMode(eEditMode, sal_False); + pDrawViewShell->ChangeEditMode(eEditMode, false); pDrawViewShell->SwitchPage(nPageIndex); } } @@ -1378,7 +1378,7 @@ void Outliner::EnterEditMode (sal_Bool bGrabFocus) mpView->SdrBeginTextEdit(mpTextObj, pPV, mpWindow, sal_True, this, pOutlinerView, sal_True, sal_True, bGrabFocus); SetUpdateMode(sal_True); - mbFoundObject = sal_True; + mbFoundObject = true; } } @@ -1583,8 +1583,8 @@ void Outliner::PrepareConversion (void) if( HasConvertibleTextPortion( mnConversionLanguage ) ) { SetUpdateMode(sal_False); - mbStringFound = sal_True; - mbMatchMayExist = sal_True; + mbStringFound = true; + mbMatchMayExist = true; EnterEditMode (); @@ -1612,12 +1612,12 @@ void Outliner::BeginConversion (void) ::boost::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock()); if (pViewShell) { - mbStringFound = sal_False; + mbStringFound = false; // Supposed that we are not located at the very beginning/end of the // document then there may be a match in the document prior/after // the current position. - mbMatchMayExist = sal_True; + mbMatchMayExist = true; maObjectIterator = ::sd::outliner::Iterator(); maSearchStartPosition = ::sd::outliner::Iterator(); @@ -1711,13 +1711,13 @@ sal_uInt16 Outliner::ShowModalMessageBox (Dialog& rMessageBox) if (pChildWindow != NULL) pSearchDialog = pChildWindow->GetWindow(); if (pSearchDialog != NULL) - pSearchDialog->EnableInput(sal_False,sal_True); + pSearchDialog->EnableInput(false,sal_True); sal_uInt16 nResult = rMessageBox.Execute(); // Unlock the search dialog. if (pSearchDialog != NULL) - pSearchDialog->EnableInput(sal_True,sal_True); + pSearchDialog->EnableInput(true,sal_True); return nResult; } diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx index 8c5fb7678558..e8e7319b8f09 100644 --- a/sd/source/ui/view/ToolBarManager.cxx +++ b/sd/source/ui/view/ToolBarManager.cxx @@ -1060,7 +1060,7 @@ bool ToolBarManager::Implementation::CheckPlugInMode (const OUString& rsName) co if (pMedium == NULL) break; - SFX_ITEMSET_ARG(pMedium->GetItemSet(),pViewOnlyItem,SfxBoolItem,SID_VIEWONLY,sal_False); + SFX_ITEMSET_ARG(pMedium->GetItemSet(),pViewOnlyItem,SfxBoolItem,SID_VIEWONLY,false); if (pViewOnlyItem == NULL) break; diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index 6895ef7cd270..02e0a918ab27 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -1001,7 +1001,7 @@ OUString ViewShellBase::GetInitialViewShellType (void) // The page kind is invalid. This is probably an // error by the caller. We use the standard type to // keep things going. - DBG_ASSERT(sal_False, "ViewShellBase::GetInitialViewShellType: invalid page kind"); + DBG_ASSERT(false, "ViewShellBase::GetInitialViewShellType: invalid page kind"); sRequestedView = FrameworkHelper::msImpressViewURL; break; } diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx index 39b2cd9630b4..203f1a57854a 100644 --- a/sd/source/ui/view/ViewShellImplementation.cxx +++ b/sd/source/ui/view/ViewShellImplementation.cxx @@ -99,8 +99,8 @@ void ViewShell::Implementation::ProcessModifyPageSlot ( { SdDrawDocument* pDocument = mrViewShell.GetDoc(); SdrLayerAdmin& rLayerAdmin = pDocument->GetLayerAdmin(); - sal_uInt8 aBckgrnd = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), sal_False); - sal_uInt8 aBckgrndObj = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), sal_False); + sal_uInt8 aBckgrnd = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), false); + sal_uInt8 aBckgrndObj = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), false); SetOfByte aVisibleLayers; sal_Bool bHandoutMode = sal_False; SdPage* pHandoutMPage = NULL; @@ -133,10 +133,10 @@ void ViewShell::Implementation::ProcessModifyPageSlot ( } else if (pArgs->Count() == 4) { - SFX_REQUEST_ARG (rRequest, pNewName, SfxStringItem, ID_VAL_PAGENAME, sal_False); - SFX_REQUEST_ARG (rRequest, pNewAutoLayout, SfxUInt32Item, ID_VAL_WHATLAYOUT, sal_False); - SFX_REQUEST_ARG (rRequest, pBVisible, SfxBoolItem, ID_VAL_ISPAGEBACK, sal_False); - SFX_REQUEST_ARG (rRequest, pBObjsVisible, SfxBoolItem, ID_VAL_ISPAGEOBJ, sal_False); + SFX_REQUEST_ARG (rRequest, pNewName, SfxStringItem, ID_VAL_PAGENAME, false); + SFX_REQUEST_ARG (rRequest, pNewAutoLayout, SfxUInt32Item, ID_VAL_WHATLAYOUT, false); + SFX_REQUEST_ARG (rRequest, pBVisible, SfxBoolItem, ID_VAL_ISPAGEBACK, false); + SFX_REQUEST_ARG (rRequest, pBObjsVisible, SfxBoolItem, ID_VAL_ISPAGEOBJ, false); AutoLayout aLayout ((AutoLayout)pNewAutoLayout->GetValue ()); if (aLayout >= AUTOLAYOUT__START && aLayout < AUTOLAYOUT__END) @@ -204,8 +204,8 @@ void ViewShell::Implementation::ProcessModifyPageSlot ( pCurrentPage->SetAutoLayout(aNewAutoLayout, sal_True); - aBckgrnd = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), sal_False); - aBckgrndObj = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), sal_False); + aBckgrnd = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), false); + aBckgrndObj = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), false); aVisibleLayers.Set(aBckgrnd, bBVisible); aVisibleLayers.Set(aBckgrndObj, bBObjsVisible); pCurrentPage->TRG_SetMasterPageVisibleLayers(aVisibleLayers); @@ -239,8 +239,8 @@ void ViewShell::Implementation::ProcessModifyPageSlot ( void ViewShell::Implementation::AssignLayout ( SfxRequest& rRequest, PageKind ePageKind ) { - const SfxUInt32Item* pWhatPage = static_cast< const SfxUInt32Item* > ( rRequest.GetArg( ID_VAL_WHATPAGE, sal_False, TYPE(SfxUInt32Item) ) ); - const SfxUInt32Item* pWhatLayout = static_cast< const SfxUInt32Item* > ( rRequest.GetArg( ID_VAL_WHATLAYOUT, sal_False, TYPE(SfxUInt32Item) ) ); + const SfxUInt32Item* pWhatPage = static_cast< const SfxUInt32Item* > ( rRequest.GetArg( ID_VAL_WHATPAGE, false, TYPE(SfxUInt32Item) ) ); + const SfxUInt32Item* pWhatLayout = static_cast< const SfxUInt32Item* > ( rRequest.GetArg( ID_VAL_WHATLAYOUT, false, TYPE(SfxUInt32Item) ) ); SdDrawDocument* pDocument = mrViewShell.GetDoc(); if( !pDocument ) @@ -265,8 +265,8 @@ void ViewShell::Implementation::AssignLayout ( SfxRequest& rRequest, PageKind eP // Transform the given request into the four argument form that is // understood by ProcessModifyPageSlot(). SdrLayerAdmin& rLayerAdmin (mrViewShell.GetViewShellBase().GetDocument()->GetLayerAdmin()); - sal_uInt8 aBackground (rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), sal_False)); - sal_uInt8 aBackgroundObject (rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), sal_False)); + sal_uInt8 aBackground (rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), false)); + sal_uInt8 aBackgroundObject (rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), false)); SetOfByte aVisibleLayers; diff --git a/sd/source/ui/view/drbezob.cxx b/sd/source/ui/view/drbezob.cxx index b088846ff453..32dffba88de2 100644 --- a/sd/source/ui/view/drbezob.cxx +++ b/sd/source/ui/view/drbezob.cxx @@ -93,7 +93,7 @@ void BezierObjectBar::GetAttrState(SfxItemSet& rSet) { SfxItemSet aAttrSet( mpView->GetDoc().GetPool() ); mpView->GetAttributes( aAttrSet ); - rSet.Put(aAttrSet, sal_False); // <- sal_False, so DontCare-Status gets aquired + rSet.Put(aAttrSet, false); // <- sal_False, so DontCare-Status gets aquired rtl::Reference<FuPoor> xFunc( mpViewSh->GetCurrentFunction() ); @@ -102,12 +102,12 @@ void BezierObjectBar::GetAttrState(SfxItemSet& rSet) if(xFunc->ISA(FuSelection)) { sal_uInt16 nEditMode = static_cast<FuSelection*>(xFunc.get())->GetEditMode(); - rSet.Put(SfxBoolItem(nEditMode, sal_True)); + rSet.Put(SfxBoolItem(nEditMode, true)); } else if (xFunc->ISA(FuConstructBezierPolygon)) { sal_uInt16 nEditMode = static_cast<FuConstructBezierPolygon*>(xFunc.get())->GetEditMode(); - rSet.Put(SfxBoolItem(nEditMode, sal_True)); + rSet.Put(SfxBoolItem(nEditMode, true)); } } @@ -155,8 +155,8 @@ void BezierObjectBar::GetAttrState(SfxItemSet& rSet) switch (eSegm) { case SDRPATHSEGMENT_DONTCARE: rSet.InvalidateItem(SID_BEZIER_CONVERT); break; - case SDRPATHSEGMENT_LINE : rSet.Put(SfxBoolItem(SID_BEZIER_CONVERT,sal_False)); break; // Button down = curve - case SDRPATHSEGMENT_CURVE : rSet.Put(SfxBoolItem(SID_BEZIER_CONVERT,sal_True)); break; + case SDRPATHSEGMENT_LINE : rSet.Put(SfxBoolItem(SID_BEZIER_CONVERT,false)); break; // Button down = curve + case SDRPATHSEGMENT_CURVE : rSet.Put(SfxBoolItem(SID_BEZIER_CONVERT,true)); break; default: break; } } @@ -172,9 +172,9 @@ void BezierObjectBar::GetAttrState(SfxItemSet& rSet) switch (eSmooth) { case SDRPATHSMOOTH_DONTCARE : break; - case SDRPATHSMOOTH_ANGULAR : rSet.Put(SfxBoolItem(SID_BEZIER_EDGE, sal_True)); break; - case SDRPATHSMOOTH_ASYMMETRIC: rSet.Put(SfxBoolItem(SID_BEZIER_SMOOTH,sal_True)); break; - case SDRPATHSMOOTH_SYMMETRIC : rSet.Put(SfxBoolItem(SID_BEZIER_SYMMTR,sal_True)); break; + case SDRPATHSMOOTH_ANGULAR : rSet.Put(SfxBoolItem(SID_BEZIER_EDGE, true)); break; + case SDRPATHSMOOTH_ASYMMETRIC: rSet.Put(SfxBoolItem(SID_BEZIER_SMOOTH,true)); break; + case SDRPATHSMOOTH_SYMMETRIC : rSet.Put(SfxBoolItem(SID_BEZIER_SYMMTR,true)); break; } } if (!pIPPEC || !pIPPEC->IsOpenCloseMarkedObjectsPossible()) @@ -187,8 +187,8 @@ void BezierObjectBar::GetAttrState(SfxItemSet& rSet) switch (eClose) { case SDROBJCLOSED_DONTCARE: rSet.InvalidateItem(SID_BEZIER_CLOSE); break; - case SDROBJCLOSED_OPEN : rSet.Put(SfxBoolItem(SID_BEZIER_CLOSE,sal_False)); break; - case SDROBJCLOSED_CLOSED : rSet.Put(SfxBoolItem(SID_BEZIER_CLOSE,sal_True)); break; + case SDROBJCLOSED_OPEN : rSet.Put(SfxBoolItem(SID_BEZIER_CLOSE,false)); break; + case SDROBJCLOSED_CLOSED : rSet.Put(SfxBoolItem(SID_BEZIER_CLOSE,true)); break; default: break; } } diff --git a/sd/source/ui/view/drtxtob.cxx b/sd/source/ui/view/drtxtob.cxx index c03456716d1b..056f6f67ac4c 100644 --- a/sd/source/ui/view/drtxtob.cxx +++ b/sd/source/ui/view/drtxtob.cxx @@ -134,8 +134,8 @@ void TextObjectBar::GetCharState( SfxItemSet& rSet ) SfxItemSet aNewAttr( mpViewShell->GetPool(),EE_ITEMS_START,EE_ITEMS_END); - aNewAttr.Put(aCharAttrSet, sal_False); - rSet.Put(aNewAttr, sal_False); + aNewAttr.Put(aCharAttrSet, false); + rSet.Put(aNewAttr, false); SvxKerningItem aKern = ( (const SvxKerningItem&) aCharAttrSet.Get( EE_CHAR_KERNING ) ); //aKern.SetWhich(SID_ATTR_CHAR_KERNING); @@ -180,7 +180,7 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet ) sal_uInt16 stretchX = 100; sal_uInt16 stretchY = 100; SvxScriptSetItem aSetItem( nSlotId, GetPool() ); - aSetItem.GetItemSet().Put( aAttrSet, sal_False ); + aSetItem.GetItemSet().Put( aAttrSet, false ); sal_uInt16 nScriptType = mpView->GetScriptType(); @@ -420,7 +420,7 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet ) nWhich = aIter.NextWhich(); } - rSet.Put( aAttrSet, sal_False ); // <- sal_False, so DontCare-Status gets aquired + rSet.Put( aAttrSet, false ); // <- sal_False, so DontCare-Status gets aquired // these are disabled in outline-mode @@ -479,16 +479,16 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet ) switch( eAdj ) { case SVX_ADJUST_LEFT: - rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_LEFT, sal_True ) ); + rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_LEFT, true ) ); break; case SVX_ADJUST_CENTER: - rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_CENTER, sal_True ) ); + rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_CENTER, true ) ); break; case SVX_ADJUST_RIGHT: - rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_RIGHT, sal_True ) ); + rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_RIGHT, true ) ); break; case SVX_ADJUST_BLOCK: - rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_BLOCK, sal_True ) ); + rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_BLOCK, true ) ); break; default: break; @@ -520,13 +520,13 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet ) break; case FRMDIR_HORI_LEFT_TOP: - rSet.Put( SfxBoolItem( SID_ATTR_PARA_LEFT_TO_RIGHT, sal_True ) ); - rSet.Put( SfxBoolItem( SID_ATTR_PARA_RIGHT_TO_LEFT, sal_False ) ); + rSet.Put( SfxBoolItem( SID_ATTR_PARA_LEFT_TO_RIGHT, true ) ); + rSet.Put( SfxBoolItem( SID_ATTR_PARA_RIGHT_TO_LEFT, false ) ); break; case FRMDIR_HORI_RIGHT_TOP: - rSet.Put( SfxBoolItem( SID_ATTR_PARA_LEFT_TO_RIGHT, sal_False ) ); - rSet.Put( SfxBoolItem( SID_ATTR_PARA_RIGHT_TO_LEFT, sal_True ) ); + rSet.Put( SfxBoolItem( SID_ATTR_PARA_LEFT_TO_RIGHT, false ) ); + rSet.Put( SfxBoolItem( SID_ATTR_PARA_RIGHT_TO_LEFT, true ) ); break; // The case for the superordinate object is missing. @@ -565,13 +565,13 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet ) switch( nLineSpace ) { case 100: - rSet.Put( SfxBoolItem( SID_ATTR_PARA_LINESPACE_10, sal_True ) ); + rSet.Put( SfxBoolItem( SID_ATTR_PARA_LINESPACE_10, true ) ); break; case 150: - rSet.Put( SfxBoolItem( SID_ATTR_PARA_LINESPACE_15, sal_True ) ); + rSet.Put( SfxBoolItem( SID_ATTR_PARA_LINESPACE_15, true ) ); break; case 200: - rSet.Put( SfxBoolItem( SID_ATTR_PARA_LINESPACE_20, sal_True ) ); + rSet.Put( SfxBoolItem( SID_ATTR_PARA_LINESPACE_20, true ) ); break; } } @@ -581,9 +581,9 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet ) aAttrSet.Get( EE_CHAR_ESCAPEMENT ) ).GetEnumValue(); if( eEsc == SVX_ESCAPEMENT_SUPERSCRIPT ) - rSet.Put( SfxBoolItem( SID_SET_SUPER_SCRIPT, sal_True ) ); + rSet.Put( SfxBoolItem( SID_SET_SUPER_SCRIPT, true ) ); else if( eEsc == SVX_ESCAPEMENT_SUBSCRIPT ) - rSet.Put( SfxBoolItem( SID_SET_SUB_SCRIPT, sal_True ) ); + rSet.Put( SfxBoolItem( SID_SET_SUB_SCRIPT, true ) ); } /** diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx index d1328ee951f4..c661623ce509 100644 --- a/sd/source/ui/view/drtxtob1.cxx +++ b/sd/source/ui/view/drtxtob1.cxx @@ -148,7 +148,7 @@ void TextObjectBar::Execute( SfxRequest &rReq ) { SfxItemSet aAttr( pStyleSheet->GetItemSet() ); SfxItemSet aTmpSet( pOLV->GetOutliner()->GetParaAttribs( nPara ) ); - aAttr.Put( aTmpSet, sal_False ); // sal_False= InvalidItems is not default, handle it as "holes" + aAttr.Put( aTmpSet, false ); // sal_False= InvalidItems is not default, handle it as "holes" const SvxULSpaceItem& rItem = (const SvxULSpaceItem&) aAttr.Get( EE_PARA_ULSPACE ); SvxULSpaceItem* pNewItem = (SvxULSpaceItem*) rItem.Clone(); @@ -350,7 +350,7 @@ void TextObjectBar::Execute( SfxRequest &rReq ) case SID_THES: { OUString aReplaceText; - SFX_REQUEST_ARG( rReq, pItem2, SfxStringItem, SID_THES, sal_False ); + SFX_REQUEST_ARG( rReq, pItem2, SfxStringItem, SID_THES, false ); if (pItem2) aReplaceText = pItem2->GetValue(); if (!aReplaceText.isEmpty()) diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx index 3e8337191588..146aea802730 100644 --- a/sd/source/ui/view/drviews1.cxx +++ b/sd/source/ui/view/drviews1.cxx @@ -155,7 +155,7 @@ void DrawViewShell::SelectionHasChanged (void) Invalidate(); //Update3DWindow(); // 3D-Controller - SfxBoolItem aItem( SID_3D_STATE, sal_True ); + SfxBoolItem aItem( SID_3D_STATE, true ); GetViewFrame()->GetDispatcher()->Execute( SID_3D_STATE, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L ); diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index 003835e1feec..f3347dde6c4a 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -326,7 +326,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) { // const SfxPoolItem* pItem = rReq.GetArg( SID_HYPHENATION ); // ^-- should not be used (defaults are wrong) ! - SFX_REQUEST_ARG( rReq, pItem, SfxBoolItem, SID_HYPHENATION, sal_False); + SFX_REQUEST_ARG( rReq, pItem, SfxBoolItem, SID_HYPHENATION, false); if( pItem ) { @@ -499,9 +499,9 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) if (pArgs) if (pArgs->Count () == 3) { - SFX_REQUEST_ARG (rReq, pWidth, SfxUInt32Item, ID_VAL_PAGEWIDTH, sal_False); - SFX_REQUEST_ARG (rReq, pHeight, SfxUInt32Item, ID_VAL_PAGEHEIGHT, sal_False); - SFX_REQUEST_ARG (rReq, pScaleAll, SfxBoolItem, ID_VAL_SCALEOBJECTS, sal_False); + SFX_REQUEST_ARG (rReq, pWidth, SfxUInt32Item, ID_VAL_PAGEWIDTH, false); + SFX_REQUEST_ARG (rReq, pHeight, SfxUInt32Item, ID_VAL_PAGEHEIGHT, false); + SFX_REQUEST_ARG (rReq, pScaleAll, SfxBoolItem, ID_VAL_SCALEOBJECTS, false); Size aSize (pWidth->GetValue (), pHeight->GetValue ()); @@ -523,11 +523,11 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) if (pArgs) if (pArgs->Count () == 5) { - SFX_REQUEST_ARG (rReq, pLeft, SfxUInt32Item, ID_VAL_PAGELEFT, sal_False); - SFX_REQUEST_ARG (rReq, pRight, SfxUInt32Item, ID_VAL_PAGERIGHT, sal_False); - SFX_REQUEST_ARG (rReq, pUpper, SfxUInt32Item, ID_VAL_PAGETOP, sal_False); - SFX_REQUEST_ARG (rReq, pLower, SfxUInt32Item, ID_VAL_PAGEBOTTOM, sal_False); - SFX_REQUEST_ARG (rReq, pScaleAll, SfxBoolItem, ID_VAL_SCALEOBJECTS, sal_False); + SFX_REQUEST_ARG (rReq, pLeft, SfxUInt32Item, ID_VAL_PAGELEFT, false); + SFX_REQUEST_ARG (rReq, pRight, SfxUInt32Item, ID_VAL_PAGERIGHT, false); + SFX_REQUEST_ARG (rReq, pUpper, SfxUInt32Item, ID_VAL_PAGETOP, false); + SFX_REQUEST_ARG (rReq, pLower, SfxUInt32Item, ID_VAL_PAGEBOTTOM, false); + SFX_REQUEST_ARG (rReq, pScaleAll, SfxBoolItem, ID_VAL_SCALEOBJECTS, false); Size aEmptySize (0, 0); @@ -550,7 +550,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) if (pArgs && pArgs->Count () == 1 ) { - SFX_REQUEST_ARG (rReq, pScale, SfxUInt16Item, SID_ATTR_ZOOMSLIDER, sal_False); + SFX_REQUEST_ARG (rReq, pScale, SfxUInt16Item, SID_ATTR_ZOOMSLIDER, false); if (CHECK_RANGE (5, pScale->GetValue (), 3000)) { SetZoom (pScale->GetValue ()); @@ -575,7 +575,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) if (pArgs) if (pArgs->Count () == 1) { - SFX_REQUEST_ARG (rReq, pScale, SfxUInt32Item, ID_VAL_ZOOM, sal_False); + SFX_REQUEST_ARG (rReq, pScale, SfxUInt32Item, ID_VAL_ZOOM, false); if (CHECK_RANGE (10, pScale->GetValue (), 1000)) { SetZoom (pScale->GetValue ()); @@ -875,7 +875,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) { pSheet = mpActualPage->GetStyleSheetForPresObj(PRESOBJ_TITLE); if (pSheet) - pObj->SetStyleSheet(pSheet, sal_False); + pObj->SetStyleSheet(pSheet, false); } else if(pObj->GetObjIdentifier() == OBJ_OUTLINETEXT) { @@ -1439,7 +1439,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) pDlg->GetAttr( aNewAttr ); aLayerName = ((SdAttrLayerName &) aNewAttr.Get (ATTR_LAYER_NAME)).GetValue (); - if( rLayerAdmin.GetLayer( aLayerName, sal_False ) + if( rLayerAdmin.GetLayer( aLayerName, false ) || aLayerName.isEmpty() ) { // name already exists @@ -1483,10 +1483,10 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) } else { - SFX_REQUEST_ARG (rReq, pLayerName, SfxStringItem, ID_VAL_LAYERNAME, sal_False); - SFX_REQUEST_ARG (rReq, pIsVisible, SfxBoolItem, ID_VAL_ISVISIBLE, sal_False); - SFX_REQUEST_ARG (rReq, pIsLocked, SfxBoolItem, ID_VAL_ISLOCKED, sal_False); - SFX_REQUEST_ARG (rReq, pIsPrintable, SfxBoolItem, ID_VAL_ISPRINTABLE, sal_False); + SFX_REQUEST_ARG (rReq, pLayerName, SfxStringItem, ID_VAL_LAYERNAME, false); + SFX_REQUEST_ARG (rReq, pIsVisible, SfxBoolItem, ID_VAL_ISVISIBLE, false); + SFX_REQUEST_ARG (rReq, pIsLocked, SfxBoolItem, ID_VAL_ISLOCKED, false); + SFX_REQUEST_ARG (rReq, pIsPrintable, SfxBoolItem, ID_VAL_ISPRINTABLE, false); aLayerName = pLayerName->GetValue (); bIsVisible = pIsVisible->GetValue (); @@ -1511,7 +1511,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) } mpDrawView->InsertNewLayer(aLayerName, nPrevLayer + 1); - pLayer = rLayerAdmin.GetLayer(aLayerName, sal_False); + pLayer = rLayerAdmin.GetLayer(aLayerName, false); if( pLayer ) { pLayer->SetTitle( aLayerTitle ); @@ -1546,7 +1546,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) SdrLayerAdmin& rLayerAdmin = GetDoc()->GetLayerAdmin(); sal_uInt16 nCurPage = GetLayerTabControl()->GetCurPageId(); OUString aLayerName = GetLayerTabControl()->GetPageText(nCurPage); - SdrLayer* pLayer = rLayerAdmin.GetLayer(aLayerName, sal_False); + SdrLayer* pLayer = rLayerAdmin.GetLayer(aLayerName, false); OUString aLayerTitle = pLayer->GetTitle(); OUString aLayerDesc = pLayer->GetDescription(); @@ -1604,7 +1604,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) pDlg->GetAttr( aNewAttr ); aLayerName = ((SdAttrLayerName &) aNewAttr.Get (ATTR_LAYER_NAME)).GetValue (); - if( (rLayerAdmin.GetLayer( aLayerName, sal_False ) && + if( (rLayerAdmin.GetLayer( aLayerName, false ) && aLayerName != aOldLayerName) || aLayerName.isEmpty() ) { // name already exists @@ -1639,10 +1639,10 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) } else if (pArgs->Count () == 4) { - SFX_REQUEST_ARG (rReq, pLayerName, SfxStringItem, ID_VAL_LAYERNAME, sal_False); - SFX_REQUEST_ARG (rReq, pIsVisible, SfxBoolItem, ID_VAL_ISVISIBLE, sal_False); - SFX_REQUEST_ARG (rReq, pIsLocked, SfxBoolItem, ID_VAL_ISLOCKED, sal_False); - SFX_REQUEST_ARG (rReq, pIsPrintable, SfxBoolItem, ID_VAL_ISPRINTABLE, sal_False); + SFX_REQUEST_ARG (rReq, pLayerName, SfxStringItem, ID_VAL_LAYERNAME, false); + SFX_REQUEST_ARG (rReq, pIsVisible, SfxBoolItem, ID_VAL_ISVISIBLE, false); + SFX_REQUEST_ARG (rReq, pIsLocked, SfxBoolItem, ID_VAL_ISLOCKED, false); + SFX_REQUEST_ARG (rReq, pIsPrintable, SfxBoolItem, ID_VAL_ISPRINTABLE, false); aLayerName = pLayerName->GetValue (); bIsVisible = pIsVisible->GetValue (); @@ -1736,8 +1736,8 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) SfxFrameItem aFrm( SID_DOCFRAME, pFrame ); SfxStringItem aReferer( SID_REFERER, aReferName ); - SfxBoolItem aNewView( SID_OPEN_NEW_VIEW, sal_False ); - SfxBoolItem aBrowsing( SID_BROWSE, sal_True ); + SfxBoolItem aNewView( SID_OPEN_NEW_VIEW, false ); + SfxBoolItem aBrowsing( SID_BROWSE, true ); SfxViewFrame* pViewFrm = SfxViewFrame::Current(); if (pViewFrm) @@ -2859,9 +2859,9 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) SdrLayerAdmin& rLayerAdmin = GetDoc()->GetLayerAdmin(); sal_uInt8 aLayerId; if (nSId == SID_DISPLAY_MASTER_BACKGROUND) - aLayerId = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), sal_False); + aLayerId = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), false); else - aLayerId = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), sal_False); + aLayerId = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), false); aVisibleLayers.Set(aLayerId, !aVisibleLayers.IsSet(aLayerId)); pPage->TRG_SetMasterPageVisibleLayers(aVisibleLayers); } @@ -2889,7 +2889,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) default: { - DBG_ASSERT( 0, "Slot without function" ); + DBG_ASSERT( false, "Slot without function" ); Cancel(); rReq.Ignore (); } @@ -2929,7 +2929,7 @@ void DrawViewShell::ExecChar( SfxRequest &rReq ) case SID_ATTR_CHAR_FONT: if( rReq.GetArgs() ) { - SFX_REQUEST_ARG( rReq, pItem, SvxFontItem, SID_ATTR_CHAR_FONT , sal_False ); + SFX_REQUEST_ARG( rReq, pItem, SvxFontItem, SID_ATTR_CHAR_FONT , false ); if (pItem) { aNewAttr.Put(*pItem); @@ -2939,7 +2939,7 @@ void DrawViewShell::ExecChar( SfxRequest &rReq ) case SID_ATTR_CHAR_FONTHEIGHT: if( rReq.GetArgs() ) { - SFX_REQUEST_ARG( rReq, pItem, SvxFontHeightItem, SID_ATTR_CHAR_FONTHEIGHT , sal_False ); + SFX_REQUEST_ARG( rReq, pItem, SvxFontHeightItem, SID_ATTR_CHAR_FONTHEIGHT , false ); if (pItem) { aNewAttr.Put(*pItem); @@ -2950,7 +2950,7 @@ void DrawViewShell::ExecChar( SfxRequest &rReq ) if( rReq.GetArgs() ) { //const SvxWeightItem *pItem = (const SvxWeightItem*) rReq.GetArg( SID_ATTR_CHAR_WEIGHT, sal_False, TYPE(SvxWeightItem) ); - SFX_REQUEST_ARG( rReq, pItem, SvxWeightItem, SID_ATTR_CHAR_WEIGHT , sal_False ); + SFX_REQUEST_ARG( rReq, pItem, SvxWeightItem, SID_ATTR_CHAR_WEIGHT , false ); if (pItem) { aNewAttr.Put(*pItem); @@ -2961,7 +2961,7 @@ void DrawViewShell::ExecChar( SfxRequest &rReq ) if( rReq.GetArgs() ) { //const SvxPostureItem *pItem = (const SvxPostureItem*) rReq.GetArg( SID_ATTR_CHAR_POSTURE, sal_False, TYPE(SvxPostureItem) ); - SFX_REQUEST_ARG( rReq, pItem, SvxPostureItem, SID_ATTR_CHAR_POSTURE , sal_False ); + SFX_REQUEST_ARG( rReq, pItem, SvxPostureItem, SID_ATTR_CHAR_POSTURE , false ); if (pItem) { aNewAttr.Put(*pItem); @@ -2973,7 +2973,7 @@ void DrawViewShell::ExecChar( SfxRequest &rReq ) { //<<modify by wj for sym2_1873 //SFX_REQUEST_ARG( rReq, pItem, SvxTextLineItem, SID_ATTR_CHAR_UNDERLINE , sal_False ); - SFX_REQUEST_ARG( rReq, pItem, SvxUnderlineItem, SID_ATTR_CHAR_UNDERLINE , sal_False ); + SFX_REQUEST_ARG( rReq, pItem, SvxUnderlineItem, SID_ATTR_CHAR_UNDERLINE , false ); //end>> if (pItem) { @@ -2989,7 +2989,7 @@ void DrawViewShell::ExecChar( SfxRequest &rReq ) case SID_ATTR_CHAR_SHADOWED: if( rReq.GetArgs() ) { - SFX_REQUEST_ARG( rReq, pItem, SvxShadowedItem, SID_ATTR_CHAR_SHADOWED , sal_False ); + SFX_REQUEST_ARG( rReq, pItem, SvxShadowedItem, SID_ATTR_CHAR_SHADOWED , false ); if (pItem) { aNewAttr.Put(*pItem); @@ -2999,7 +2999,7 @@ void DrawViewShell::ExecChar( SfxRequest &rReq ) case SID_ATTR_CHAR_STRIKEOUT: if( rReq.GetArgs() ) { - SFX_REQUEST_ARG( rReq, pItem, SvxCrossedOutItem, SID_ATTR_CHAR_STRIKEOUT , sal_False ); + SFX_REQUEST_ARG( rReq, pItem, SvxCrossedOutItem, SID_ATTR_CHAR_STRIKEOUT , false ); if (pItem) { aNewAttr.Put(*pItem); @@ -3009,7 +3009,7 @@ void DrawViewShell::ExecChar( SfxRequest &rReq ) case SID_ATTR_CHAR_COLOR: if( rReq.GetArgs() ) { - SFX_REQUEST_ARG( rReq, pItem, SvxColorItem, SID_ATTR_CHAR_COLOR , sal_False ); + SFX_REQUEST_ARG( rReq, pItem, SvxColorItem, SID_ATTR_CHAR_COLOR , false ); if (pItem) { aNewAttr.Put(*pItem); @@ -3019,7 +3019,7 @@ void DrawViewShell::ExecChar( SfxRequest &rReq ) case SID_ATTR_CHAR_KERNING: if( rReq.GetArgs() ) { - SFX_REQUEST_ARG( rReq, pItem, SvxKerningItem, SID_ATTR_CHAR_KERNING , sal_False ); + SFX_REQUEST_ARG( rReq, pItem, SvxKerningItem, SID_ATTR_CHAR_KERNING , false ); if (pItem) { aNewAttr.Put(*pItem); @@ -3170,7 +3170,7 @@ void DrawViewShell::GetStatePropPanelAttr(SfxItemSet& rSet) } else { - rSet.Put(SfxBoolItem(nSlotId, sal_False)); + rSet.Put(SfxBoolItem(nSlotId, false)); } break; } diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx index 31e89a4b8e36..1f6359bdc9e7 100644 --- a/sd/source/ui/view/drviews3.cxx +++ b/sd/source/ui/view/drviews3.cxx @@ -129,7 +129,7 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq) // switch page in running slide show if(SlideShow::IsRunning(GetViewShellBase()) && rReq.GetArgs()) { - SFX_REQUEST_ARG(rReq, pWhatPage, SfxUInt32Item, ID_VAL_WHATPAGE, sal_False); + SFX_REQUEST_ARG(rReq, pWhatPage, SfxUInt32Item, ID_VAL_WHATPAGE, false); SlideShow::GetSlideShow(GetViewShellBase())->jumpToPageNumber((sal_Int32)((pWhatPage->GetValue()-1)>>1)); } else @@ -143,8 +143,8 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq) } else if (pArgs->Count () == 2) { - SFX_REQUEST_ARG (rReq, pWhatPage, SfxUInt32Item, ID_VAL_WHATPAGE, sal_False); - SFX_REQUEST_ARG (rReq, pWhatKind, SfxUInt32Item, ID_VAL_WHATKIND, sal_False); + SFX_REQUEST_ARG (rReq, pWhatPage, SfxUInt32Item, ID_VAL_WHATPAGE, false); + SFX_REQUEST_ARG (rReq, pWhatKind, SfxUInt32Item, ID_VAL_WHATKIND, false); sal_Int32 nWhatPage = (sal_Int32)pWhatPage->GetValue (); sal_Int32 nWhatKind = (sal_Int32)pWhatKind->GetValue (); @@ -203,7 +203,7 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq) if( pArgs && pArgs->Count () == 1) { - SFX_REQUEST_ARG (rReq, pWhatLayer, SfxUInt32Item, ID_VAL_WHATLAYER, sal_False); + SFX_REQUEST_ARG (rReq, pWhatLayer, SfxUInt32Item, ID_VAL_WHATLAYER, false); if( pWhatLayer ) nCurPage = (short) pWhatLayer->GetValue (); } @@ -222,8 +222,8 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq) if ( pArgs && pArgs->Count () == 2) { - SFX_REQUEST_ARG (rReq, pIsActive, SfxBoolItem, ID_VAL_ISACTIVE, sal_False); - SFX_REQUEST_ARG (rReq, pWhatKind, SfxUInt32Item, ID_VAL_WHATKIND, sal_False); + SFX_REQUEST_ARG (rReq, pIsActive, SfxBoolItem, ID_VAL_ISACTIVE, false); + SFX_REQUEST_ARG (rReq, pWhatKind, SfxUInt32Item, ID_VAL_WHATKIND, false); sal_Int32 nWhatKind = (sal_Int32)pWhatKind->GetValue (); if (CHECK_RANGE (PK_STANDARD, nWhatKind, PK_HANDOUT)) @@ -250,8 +250,8 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq) if ( pArgs && pArgs->Count () == 2) { - SFX_REQUEST_ARG (rReq, pWhatLayerMode, SfxBoolItem, ID_VAL_ISACTIVE, sal_False); - SFX_REQUEST_ARG (rReq, pWhatLayer, SfxUInt32Item, ID_VAL_WHATLAYER, sal_False); + SFX_REQUEST_ARG (rReq, pWhatLayerMode, SfxBoolItem, ID_VAL_ISACTIVE, false); + SFX_REQUEST_ARG (rReq, pWhatLayer, SfxUInt32Item, ID_VAL_WHATLAYER, false); sal_Int32 nWhatLayer = (sal_Int32)pWhatLayer->GetValue (); if (CHECK_RANGE (EM_PAGE, nWhatLayer, EM_MASTERPAGE)) @@ -397,7 +397,7 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq) { if( rReq.GetArgs() ) { - SFX_REQUEST_ARG(rReq, pBookmark, SfxStringItem, SID_JUMPTOMARK, sal_False); + SFX_REQUEST_ARG(rReq, pBookmark, SfxStringItem, SID_JUMPTOMARK, false); if (pBookmark) { diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx index eff3e14d70f7..24b89fa2f968 100644 --- a/sd/source/ui/view/drviews4.cxx +++ b/sd/source/ui/view/drviews4.cxx @@ -104,7 +104,7 @@ void DrawViewShell::DeleteActualLayer() if (QueryBox(GetActiveWindow(), WB_YES_NO, aString).Execute() == RET_YES) { - const SdrLayer* pLayer = rAdmin.GetLayer(rName, sal_False); + const SdrLayer* pLayer = rAdmin.GetLayer(rName, false); mpDrawView->DeleteLayer( pLayer->GetName() ); /* in order to redraw TabBar and Window; should be initiated later on by @@ -222,7 +222,7 @@ void DrawViewShell::StartRulerDrag ( { // #i34536# if no guide-lines are visible yet, that show them if( ! mpDrawView->IsHlplVisible()) - mpDrawView->SetHlplVisible( sal_True ); + mpDrawView->SetHlplVisible( true ); SdrHelpLineKind eKind; diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx index dbefd03303af..282e73a86d77 100644 --- a/sd/source/ui/view/drviews5.cxx +++ b/sd/source/ui/view/drviews5.cxx @@ -71,7 +71,7 @@ void DrawViewShell::ModelHasChanged() // that the navigator also gets an up to date state GetViewFrame()->GetBindings().Invalidate( SID_NAVIGATOR_STATE, sal_True, sal_False ); - SfxBoolItem aItem( SID_3D_STATE, sal_True ); + SfxBoolItem aItem( SID_3D_STATE, true ); GetViewFrame()->GetDispatcher()->Execute( SID_3D_STATE, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L ); diff --git a/sd/source/ui/view/drviews6.cxx b/sd/source/ui/view/drviews6.cxx index 14f7e6cb299b..b0131280896b 100644 --- a/sd/source/ui/view/drviews6.cxx +++ b/sd/source/ui/view/drviews6.cxx @@ -327,7 +327,7 @@ void DrawViewShell::ExecBmpMask( SfxRequest& rReq ) { SdrPageView* pPV = mpDrawView->GetSdrPageView(); - pNewObj->SetEmptyPresObj( sal_False ); + pNewObj->SetEmptyPresObj( false ); pNewObj->SetGraphic( ( (SvxBmpMask*) GetViewFrame()->GetChildWindow( SvxBmpMaskChildWindow::GetChildWindowId() )->GetWindow() )-> Mask( pNewObj->GetGraphic() ) ); diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx index 340fa3f7f9c0..59819b0d9207 100644 --- a/sd/source/ui/view/drviews7.cxx +++ b/sd/source/ui/view/drviews7.cxx @@ -206,7 +206,7 @@ IMPL_LINK( DrawViewShell, ClipboardChanged, TransferableDataHelper*, pDataHelper void DrawViewShell::GetDrawAttrState(SfxItemSet& rSet) { SfxItemSet aSet( mpDrawView->GetGeoAttrFromMarked() ); - rSet.Put(aSet,sal_False); + rSet.Put(aSet,false); } void DrawViewShell::GetMenuState( SfxItemSet &rSet ) @@ -247,7 +247,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) { sal_uInt16 nSId = GetCurrentFunction()->GetSlotID(); - rSet.Put( SfxBoolItem( nSId, sal_True ) ); + rSet.Put( SfxBoolItem( nSId, true ) ); // will cause a uncheck of a simulated slot sal_uInt16 nId = GetIdBySubId( nSId ); @@ -495,14 +495,14 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) } if (!mpDrawView->IsFrameDragSingles()) - rSet.Put(SfxBoolItem(SID_BEZIER_EDIT, sal_True)); + rSet.Put(SfxBoolItem(SID_BEZIER_EDIT, true)); else - rSet.Put(SfxBoolItem(SID_BEZIER_EDIT, sal_False)); + rSet.Put(SfxBoolItem(SID_BEZIER_EDIT, false)); if(dynamic_cast<FuEditGluePoints*>( GetCurrentFunction().get())) - rSet.Put(SfxBoolItem(SID_GLUE_EDITMODE, sal_True)); + rSet.Put(SfxBoolItem(SID_GLUE_EDITMODE, true)); else - rSet.Put(SfxBoolItem(SID_GLUE_EDITMODE, sal_False)); + rSet.Put(SfxBoolItem(SID_GLUE_EDITMODE, false)); if( !mpDrawView->IsMirrorAllowed( sal_True, sal_True ) ) { @@ -556,12 +556,12 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) if ( !mpDrawView->IsGroupEntered() ) { rSet.DisableItem( SID_LEAVE_GROUP ); - rSet.Put( SfxBoolItem( SID_LEAVE_ALL_GROUPS, sal_False ) ); + rSet.Put( SfxBoolItem( SID_LEAVE_ALL_GROUPS, false ) ); rSet.ClearItem( SID_LEAVE_ALL_GROUPS ); rSet.DisableItem( SID_LEAVE_ALL_GROUPS ); } else - rSet.Put( SfxBoolItem( SID_LEAVE_ALL_GROUPS, sal_True ) ); + rSet.Put( SfxBoolItem( SID_LEAVE_ALL_GROUPS, true ) ); if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_THESAURUS ) ) { @@ -741,11 +741,11 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) /********************************************************************** * page mode **********************************************************************/ - rSet.Put(SfxBoolItem(SID_PAGEMODE, sal_True)); - rSet.Put(SfxBoolItem(SID_MASTERPAGE, sal_False)); - rSet.Put(SfxBoolItem(SID_SLIDE_MASTERPAGE, sal_False)); - rSet.Put(SfxBoolItem(SID_NOTES_MASTERPAGE, sal_False)); - rSet.Put(SfxBoolItem(SID_HANDOUT_MASTERPAGE, sal_False)); + rSet.Put(SfxBoolItem(SID_PAGEMODE, true)); + rSet.Put(SfxBoolItem(SID_MASTERPAGE, false)); + rSet.Put(SfxBoolItem(SID_SLIDE_MASTERPAGE, false)); + rSet.Put(SfxBoolItem(SID_NOTES_MASTERPAGE, false)); + rSet.Put(SfxBoolItem(SID_HANDOUT_MASTERPAGE, false)); if (mePageKind == PK_STANDARD && rSet.GetItemState(SID_TITLE_MASTERPAGE) == SFX_ITEM_AVAILABLE) @@ -773,7 +773,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) } else { - rSet.Put(SfxBoolItem(SID_TITLE_MASTERPAGE, sal_False)); + rSet.Put(SfxBoolItem(SID_TITLE_MASTERPAGE, false)); } } else @@ -788,17 +788,17 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) } else { - rSet.Put(SfxBoolItem(SID_PAGEMODE, sal_False)); - rSet.Put(SfxBoolItem(SID_MASTERPAGE, sal_True)); + rSet.Put(SfxBoolItem(SID_PAGEMODE, false)); + rSet.Put(SfxBoolItem(SID_MASTERPAGE, true)); /********************************************************************** * Background page mode **********************************************************************/ if (mePageKind == PK_STANDARD) { - rSet.Put(SfxBoolItem(SID_SLIDE_MASTERPAGE, sal_True)); - rSet.Put(SfxBoolItem(SID_NOTES_MASTERPAGE, sal_False)); - rSet.Put(SfxBoolItem(SID_HANDOUT_MASTERPAGE, sal_False)); + rSet.Put(SfxBoolItem(SID_SLIDE_MASTERPAGE, true)); + rSet.Put(SfxBoolItem(SID_NOTES_MASTERPAGE, false)); + rSet.Put(SfxBoolItem(SID_HANDOUT_MASTERPAGE, false)); if (rSet.GetItemState(SID_TITLE_MASTERPAGE) == SFX_ITEM_AVAILABLE) { @@ -839,7 +839,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) if (bCheck) { - rSet.Put(SfxBoolItem(SID_SLIDE_MASTERPAGE, sal_False)); + rSet.Put(SfxBoolItem(SID_SLIDE_MASTERPAGE, false)); } rSet.Put(SfxBoolItem(SID_TITLE_MASTERPAGE, bCheck)); @@ -853,17 +853,17 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) } else if (mePageKind == PK_NOTES) { - rSet.Put(SfxBoolItem(SID_SLIDE_MASTERPAGE, sal_False)); + rSet.Put(SfxBoolItem(SID_SLIDE_MASTERPAGE, false)); rSet.DisableItem(SID_TITLE_MASTERPAGE); - rSet.Put(SfxBoolItem(SID_NOTES_MASTERPAGE, sal_True)); - rSet.Put(SfxBoolItem(SID_HANDOUT_MASTERPAGE, sal_False)); + rSet.Put(SfxBoolItem(SID_NOTES_MASTERPAGE, true)); + rSet.Put(SfxBoolItem(SID_HANDOUT_MASTERPAGE, false)); } else if (mePageKind == PK_HANDOUT) { - rSet.Put(SfxBoolItem(SID_SLIDE_MASTERPAGE, sal_False)); + rSet.Put(SfxBoolItem(SID_SLIDE_MASTERPAGE, false)); rSet.DisableItem(SID_TITLE_MASTERPAGE); - rSet.Put(SfxBoolItem(SID_NOTES_MASTERPAGE, sal_False)); - rSet.Put(SfxBoolItem(SID_HANDOUT_MASTERPAGE, sal_True)); + rSet.Put(SfxBoolItem(SID_NOTES_MASTERPAGE, false)); + rSet.Put(SfxBoolItem(SID_HANDOUT_MASTERPAGE, true)); } } @@ -1031,7 +1031,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) nCurrentSId != SID_ATTR_CHAR_VERTICAL ) nCurrentSId = SID_ATTR_CHAR; - rSet.Put( SfxBoolItem( nCurrentSId, sal_True ) ); + rSet.Put( SfxBoolItem( nCurrentSId, true ) ); // Short version of UpdateToolboxImages() rSet.Put( TbxImageItem( SID_DRAWTBX_TEXT, nCurrentSId ) ); @@ -1045,11 +1045,11 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) { if (GetDoc()->GetOnlineSpell()) { - rSet.Put(SfxBoolItem(SID_AUTOSPELL_CHECK, sal_True)); + rSet.Put(SfxBoolItem(SID_AUTOSPELL_CHECK, true)); } else { - rSet.Put(SfxBoolItem(SID_AUTOSPELL_CHECK, sal_False)); + rSet.Put(SfxBoolItem(SID_AUTOSPELL_CHECK, false)); } } @@ -1577,8 +1577,8 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) { SetOfByte aVisibleLayers = pPage->TRG_GetMasterPageVisibleLayers(); SdrLayerAdmin& rLayerAdmin = GetDoc()->GetLayerAdmin(); - sal_uInt8 aBackgroundId = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), sal_False); - sal_uInt8 aObjectId = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), sal_False); + sal_uInt8 aBackgroundId = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), false); + sal_uInt8 aObjectId = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), false); rSet.Put(SfxBoolItem(SID_DISPLAY_MASTER_BACKGROUND, aVisibleLayers.IsSet(aBackgroundId))); rSet.Put(SfxBoolItem(SID_DISPLAY_MASTER_OBJECTS, @@ -1592,25 +1592,25 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) void DrawViewShell::GetModeSwitchingMenuState (SfxItemSet &rSet) { //draview - rSet.Put(SfxBoolItem(SID_DIAMODE, sal_False)); - rSet.Put(SfxBoolItem(SID_OUTLINEMODE, sal_False)); + rSet.Put(SfxBoolItem(SID_DIAMODE, false)); + rSet.Put(SfxBoolItem(SID_OUTLINEMODE, false)); if (mePageKind == PK_NOTES) { - rSet.Put(SfxBoolItem(SID_DRAWINGMODE, sal_False)); - rSet.Put(SfxBoolItem(SID_NOTESMODE, sal_True)); - rSet.Put(SfxBoolItem(SID_HANDOUTMODE, sal_False)); + rSet.Put(SfxBoolItem(SID_DRAWINGMODE, false)); + rSet.Put(SfxBoolItem(SID_NOTESMODE, true)); + rSet.Put(SfxBoolItem(SID_HANDOUTMODE, false)); } else if (mePageKind == PK_HANDOUT) { - rSet.Put(SfxBoolItem(SID_DRAWINGMODE, sal_False)); - rSet.Put(SfxBoolItem(SID_NOTESMODE, sal_False)); - rSet.Put(SfxBoolItem(SID_HANDOUTMODE, sal_True)); + rSet.Put(SfxBoolItem(SID_DRAWINGMODE, false)); + rSet.Put(SfxBoolItem(SID_NOTESMODE, false)); + rSet.Put(SfxBoolItem(SID_HANDOUTMODE, true)); } else { - rSet.Put(SfxBoolItem(SID_DRAWINGMODE, sal_True)); - rSet.Put(SfxBoolItem(SID_NOTESMODE, sal_False)); - rSet.Put(SfxBoolItem(SID_HANDOUTMODE, sal_False)); + rSet.Put(SfxBoolItem(SID_DRAWINGMODE, true)); + rSet.Put(SfxBoolItem(SID_NOTESMODE, false)); + rSet.Put(SfxBoolItem(SID_HANDOUTMODE, false)); } // Removed [GetDocSh()->GetCurrentFunction() ||] from the following diff --git a/sd/source/ui/view/drviews8.cxx b/sd/source/ui/view/drviews8.cxx index 215158d51abf..39b245033f84 100644 --- a/sd/source/ui/view/drviews8.cxx +++ b/sd/source/ui/view/drviews8.cxx @@ -118,7 +118,7 @@ void DrawViewShell::ScannerEvent( const ::com::sun::star::lang::EventObject& ) if( pGrafObj->IsEmptyPresObj() ) { bInsertNewObject = sal_False; - pGrafObj->SetEmptyPresObj(sal_False); + pGrafObj->SetEmptyPresObj(false); pGrafObj->SetOutlinerParaObject(NULL); pGrafObj->SetGraphic( Graphic( aScanBmp ) ); } diff --git a/sd/source/ui/view/drviews9.cxx b/sd/source/ui/view/drviews9.cxx index e3cf6d5e48bc..ad9d93146d88 100644 --- a/sd/source/ui/view/drviews9.cxx +++ b/sd/source/ui/view/drviews9.cxx @@ -71,7 +71,7 @@ void DrawViewShell::ExecGallery(SfxRequest& rReq) const SfxItemSet* pArgs = rReq.GetArgs(); - SFX_ITEMSET_ARG( pArgs, pGalleryItem, SvxGalleryItem, SID_GALLERY_FORMATS, sal_False ); + SFX_ITEMSET_ARG( pArgs, pGalleryItem, SvxGalleryItem, SID_GALLERY_FORMATS, false ); if ( !pGalleryItem ) return; @@ -150,7 +150,7 @@ void DrawViewShell::ExecGallery(SfxRequest& rReq) bInsertNewObject = sal_False; SdrGrafObj* pNewGrafObj = (SdrGrafObj*) pGrafObj->Clone(); - pNewGrafObj->SetEmptyPresObj(sal_False); + pNewGrafObj->SetEmptyPresObj(false); pNewGrafObj->SetOutlinerParaObject(NULL); pNewGrafObj->SetGraphic(aGraphic); @@ -220,7 +220,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq) if (pArgs) if (pArgs->Count () == 1) { - SFX_REQUEST_ARG (rReq, pFillStyle, SfxUInt32Item, ID_VAL_STYLE, sal_False); + SFX_REQUEST_ARG (rReq, pFillStyle, SfxUInt32Item, ID_VAL_STYLE, false); if (CHECK_RANGE (XFILL_NONE, (sal_Int32)pFillStyle->GetValue (), XFILL_BITMAP)) { pAttr->ClearItem (XATTR_FILLSTYLE); @@ -242,7 +242,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq) if (pArgs) if (pArgs->Count () == 1) { - SFX_REQUEST_ARG (rReq, pLineStyle, SfxUInt32Item, ID_VAL_STYLE, sal_False); + SFX_REQUEST_ARG (rReq, pLineStyle, SfxUInt32Item, ID_VAL_STYLE, false); if (CHECK_RANGE (XLINE_NONE, (sal_Int32)pLineStyle->GetValue (), XLINE_DASH)) { pAttr->ClearItem (XATTR_LINESTYLE); @@ -264,7 +264,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq) if (pArgs) if (pArgs->Count () == 1) { - SFX_REQUEST_ARG (rReq, pLineWidth, SfxUInt32Item, ID_VAL_WIDTH, sal_False); + SFX_REQUEST_ARG (rReq, pLineWidth, SfxUInt32Item, ID_VAL_WIDTH, false); pAttr->ClearItem (XATTR_LINEWIDTH); pAttr->Put (XLineWidthItem (pLineWidth->GetValue ()), XATTR_LINEWIDTH); rBindings.Invalidate (SID_ATTR_LINE_WIDTH); @@ -279,9 +279,9 @@ void DrawViewShell::AttrExec (SfxRequest &rReq) if (pArgs) if (pArgs->Count () == 3) { - 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); + 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); pAttr->ClearItem (XATTR_FILLCOLOR); pAttr->ClearItem (XATTR_FILLSTYLE); @@ -303,9 +303,9 @@ void DrawViewShell::AttrExec (SfxRequest &rReq) if (pArgs) if (pArgs->Count () == 3) { - 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); + 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); pAttr->ClearItem (XATTR_LINECOLOR); pAttr->Put (XLineColorItem (-1, Color ((sal_uInt8) pRed->GetValue (), @@ -325,10 +325,10 @@ void DrawViewShell::AttrExec (SfxRequest &rReq) if (pArgs) if (pArgs->Count () == 4) { - 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); + 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); XGradientListRef pGradientList = GetDoc()->GetGradientList (); long nCounts = pGradientList->Count (); @@ -386,10 +386,10 @@ void DrawViewShell::AttrExec (SfxRequest &rReq) if (pArgs) if (pArgs->Count () == 4) { - 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); + 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); XHatchListRef pHatchList = GetDoc()->GetHatchList (); long nCounts = pHatchList->Count (); @@ -441,13 +441,13 @@ void DrawViewShell::AttrExec (SfxRequest &rReq) if (pArgs) if (pArgs->Count () == 7) { - 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); + 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); if (CHECK_RANGE (XDASH_RECT, (sal_Int32)pStyle->GetValue (), XDASH_ROUNDRELATIVE)) { @@ -491,14 +491,14 @@ void DrawViewShell::AttrExec (SfxRequest &rReq) if (pArgs) if (pArgs->Count () == 8) { - 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); + 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); if (CHECK_RANGE (XGRAD_LINEAR, (sal_Int32)pStyle->GetValue (), XGRAD_RECT) && CHECK_RANGE (0, (sal_Int32)pAngle->GetValue (), 360) && @@ -568,10 +568,10 @@ void DrawViewShell::AttrExec (SfxRequest &rReq) if (pArgs) if (pArgs->Count () == 4) { - 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); + 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); if (CHECK_RANGE (XHATCH_SINGLE, (sal_Int32)pStyle->GetValue (), XHATCH_TRIPLE) && CHECK_RANGE (0, (sal_Int32)pAngle->GetValue (), 360)) @@ -629,7 +629,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq) if (pArgs) if (pArgs->Count () == 1) { - SFX_REQUEST_ARG (rReq, pName, SfxStringItem, ID_VAL_INDEX, sal_False); + SFX_REQUEST_ARG (rReq, pName, SfxStringItem, ID_VAL_INDEX, false); XGradientListRef pGradientList = GetDoc()->GetGradientList (); long nCounts = pGradientList->Count (); @@ -664,7 +664,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq) if (pArgs) if (pArgs->Count () == 1) { - SFX_REQUEST_ARG (rReq, pName, SfxStringItem, ID_VAL_INDEX, sal_False); + SFX_REQUEST_ARG (rReq, pName, SfxStringItem, ID_VAL_INDEX, false); XHatchListRef pHatchList = GetDoc()->GetHatchList (); long nCounts = pHatchList->Count (); diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx index 0d48e74f6bf4..3c2daa7565d7 100644 --- a/sd/source/ui/view/drviewsa.cxx +++ b/sd/source/ui/view/drviewsa.cxx @@ -749,7 +749,7 @@ void DrawViewShell::GetStatusBarState(SfxItemSet& rSet) nLayer = pObj->GetLayer(); if( j != 0 && nLayer != nOldLayer ) - bOneLayer = sal_False; + bOneLayer = false; nOldLayer = nLayer; } diff --git a/sd/source/ui/view/drviewsb.cxx b/sd/source/ui/view/drviewsb.cxx index 31bc8879e563..efca498a4001 100644 --- a/sd/source/ui/view/drviewsb.cxx +++ b/sd/source/ui/view/drviewsb.cxx @@ -81,8 +81,8 @@ bool DrawViewShell::RenameSlide( sal_uInt16 nPageId, const OUString & rName ) // Undo SdPage* pUndoPage = pPageToRename; SdrLayerAdmin & rLayerAdmin = GetDoc()->GetLayerAdmin(); - sal_uInt8 nBackground = rLayerAdmin.GetLayerID( SD_RESSTR(STR_LAYER_BCKGRND), sal_False ); - sal_uInt8 nBgObj = rLayerAdmin.GetLayerID( SD_RESSTR(STR_LAYER_BCKGRNDOBJ), sal_False ); + sal_uInt8 nBackground = rLayerAdmin.GetLayerID( SD_RESSTR(STR_LAYER_BCKGRND), false ); + sal_uInt8 nBgObj = rLayerAdmin.GetLayerID( SD_RESSTR(STR_LAYER_BCKGRNDOBJ), false ); SetOfByte aVisibleLayers = mpActualPage->TRG_GetMasterPageVisibleLayers(); ::svl::IUndoManager* pManager = GetDoc()->GetDocSh()->GetUndoManager(); @@ -120,7 +120,7 @@ bool DrawViewShell::RenameSlide( sal_uInt16 nPageId, const OUString & rName ) GetDoc()->SetChanged( sal_True ); // inform navigator about change - SfxBoolItem aItem( SID_NAVIGATOR_INIT, sal_True ); + SfxBoolItem aItem( SID_NAVIGATOR_INIT, true ); GetViewFrame()->GetDispatcher()->Execute( SID_NAVIGATOR_INIT, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L ); diff --git a/sd/source/ui/view/drviewsd.cxx b/sd/source/ui/view/drviewsd.cxx index bdda90a94200..f89f6e318862 100644 --- a/sd/source/ui/view/drviewsd.cxx +++ b/sd/source/ui/view/drviewsd.cxx @@ -142,7 +142,7 @@ void DrawViewShell::ExecNavigatorWin( SfxRequest& rReq ) SfxStringItem aReferer(SID_REFERER, GetDocSh()->GetMedium()->GetName()); SfxViewFrame* pFrame = GetViewFrame(); SfxFrameItem aFrameItem(SID_DOCFRAME, pFrame); - SfxBoolItem aBrowseItem(SID_BROWSE, sal_True); + SfxBoolItem aBrowseItem(SID_BROWSE, true); pFrame->GetDispatcher()-> Execute(SID_OPENDOC, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aStrItem, &aFrameItem, &aBrowseItem, &aReferer, 0L); diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx index 556b32328400..0c83d6c3a309 100644 --- a/sd/source/ui/view/drviewse.cxx +++ b/sd/source/ui/view/drviewse.cxx @@ -264,7 +264,7 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq) case SID_FM_CREATE_FIELDCONTROL: { - SFX_REQUEST_ARG( rReq, pDescriptorItem, SfxUnoAnyItem, SID_FM_DATACCESS_DESCRIPTOR, sal_False ); + SFX_REQUEST_ARG( rReq, pDescriptorItem, SfxUnoAnyItem, SID_FM_DATACCESS_DESCRIPTOR, false ); DBG_ASSERT( pDescriptorItem, "DrawViewShell::FuPermanent(SID_FM_CREATE_FIELDCONTROL): invalid request args!" ); if(pDescriptorItem) @@ -807,7 +807,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) if( pReqArgs ) { - SFX_REQUEST_ARG( rReq, pIsActive, SfxUInt32Item, SID_CLIPBOARD_FORMAT_ITEMS, sal_False ); + SFX_REQUEST_ARG( rReq, pIsActive, SfxUInt32Item, SID_CLIPBOARD_FORMAT_ITEMS, false ); nFormat = pIsActive->GetValue(); } @@ -900,7 +900,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) if ( pReqArgs ) { - SFX_REQUEST_ARG (rReq, pIsActive, SfxBoolItem, SID_MASTERPAGE, sal_False); + SFX_REQUEST_ARG (rReq, pIsActive, SfxBoolItem, SID_MASTERPAGE, false); mbIsLayerModeActive = pIsActive->GetValue (); } @@ -1025,7 +1025,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) if ( pReqArgs ) { - SFX_REQUEST_ARG (rReq, pIsActive, SfxBoolItem, SID_RULER, sal_False); + SFX_REQUEST_ARG (rReq, pIsActive, SfxBoolItem, SID_RULER, false); SetRuler (pIsActive->GetValue ()); } else SetRuler (!HasRuler()); diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx index 6ed5dbc46fee..4032e6fb2e01 100644 --- a/sd/source/ui/view/drviewsf.cxx +++ b/sd/source/ui/view/drviewsf.cxx @@ -201,7 +201,7 @@ void DrawViewShell::GetCtrlState(SfxItemSet &rSet) if ( SFX_ITEM_AVAILABLE == rSet.GetItemState(SID_MAIL_SCROLLBODY_PAGEDOWN) ) { - rSet.Put( SfxBoolItem( SID_MAIL_SCROLLBODY_PAGEDOWN, sal_True ) ); + rSet.Put( SfxBoolItem( SID_MAIL_SCROLLBODY_PAGEDOWN, true ) ); } if ( SFX_ITEM_AVAILABLE == rSet.GetItemState(SID_ATTR_YEAR2000) ) @@ -295,7 +295,7 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet ) SvxAdjust eAdj = aItem.GetAdjust(); if ( eAdj == SVX_ADJUST_LEFT) { - rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_LEFT, sal_True ) ); + rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_LEFT, true ) ); } bAttr = sal_True; @@ -312,7 +312,7 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet ) SvxAdjust eAdj = aItem.GetAdjust(); if ( eAdj == SVX_ADJUST_CENTER) { - rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_CENTER, sal_True ) ); + rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_CENTER, true ) ); } bAttr = sal_True; @@ -329,7 +329,7 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet ) SvxAdjust eAdj = aItem.GetAdjust(); if ( eAdj == SVX_ADJUST_RIGHT) { - rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_RIGHT, sal_True ) ); + rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_RIGHT, true ) ); } bAttr = sal_True; @@ -346,7 +346,7 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet ) SvxAdjust eAdj = aItem.GetAdjust(); if ( eAdj == SVX_ADJUST_BLOCK) { - rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_BLOCK, sal_True ) ); + rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_BLOCK, true ) ); } bAttr = sal_True; @@ -487,7 +487,7 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet ) { ISfxTemplateCommon* pTemplateCommon = SFX_APP()->GetCurrentTemplateCommon(GetViewFrame()->GetBindings()); if (pTemplateCommon && pTemplateCommon->GetActualFamily() == SD_STYLE_FAMILY_PSEUDO) - rSet.Put(SfxBoolItem(nWhich,sal_False)); + rSet.Put(SfxBoolItem(nWhich,false)); else { SfxBoolItem aItem(nWhich, SD_MOD()->GetWaterCan()); @@ -559,7 +559,7 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet ) mpDrawView->GetAttributes( aEditAttr ); SfxItemSet aNewAttr( GetPool(), EE_ITEMS_START, EE_ITEMS_END ); - aNewAttr.Put( aEditAttr, sal_False ); + aNewAttr.Put( aEditAttr, false ); SvxNumRule* pNumRule = NULL; @@ -652,8 +652,8 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet ) } if (bEnable) { - rSet.Put(SfxBoolItem(FN_NUM_BULLET_ON, sal_False)); - rSet.Put(SfxBoolItem(FN_NUM_NUMBERING_ON, sal_False)); + rSet.Put(SfxBoolItem(FN_NUM_BULLET_ON, false)); + rSet.Put(SfxBoolItem(FN_NUM_NUMBERING_ON, false)); } else { @@ -672,10 +672,10 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet ) { pSet = new SfxItemSet( GetDoc()->GetPool() ); mpDrawView->GetAttributes( *pSet ); - rSet.Put( *pSet, sal_False ); + rSet.Put( *pSet, false ); } - rSet.Put( aAllSet, sal_False ); + rSet.Put( aAllSet, false ); // there were changes at area and/or line attributes if( bAttr && pSet ) @@ -720,11 +720,11 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet ) pSet->Get( EE_CHAR_ESCAPEMENT ) ).GetEnumValue(); if( eEsc == SVX_ESCAPEMENT_SUPERSCRIPT ) { - rSet.Put( SfxBoolItem( SID_SET_SUPER_SCRIPT, sal_True ) ); + rSet.Put( SfxBoolItem( SID_SET_SUPER_SCRIPT, true ) ); } else if( eEsc == SVX_ESCAPEMENT_SUBSCRIPT ) { - rSet.Put( SfxBoolItem( SID_SET_SUB_SCRIPT, sal_True ) ); + rSet.Put( SfxBoolItem( SID_SET_SUB_SCRIPT, true ) ); } eState = pSet->GetItemState( EE_CHAR_KERNING, sal_True ); diff --git a/sd/source/ui/view/drviewsi.cxx b/sd/source/ui/view/drviewsi.cxx index 049eb3b131db..37ca292fe701 100644 --- a/sd/source/ui/view/drviewsi.cxx +++ b/sd/source/ui/view/drviewsi.cxx @@ -135,12 +135,12 @@ void DrawViewShell::AssignFrom3DWindow() // assign only text-attribute SfxItemSet aTextSet( GetDoc()->GetPool(), EE_ITEMS_START, EE_ITEMS_END, 0 ); - aTextSet.Put( aSet, sal_False ); + aTextSet.Put( aSet, false ); GetView()->SetAttributes( aTextSet ); // transform text into 3D sal_uInt16 nSId = SID_CONVERT_TO_3D; - SfxBoolItem aItem( nSId, sal_True ); + SfxBoolItem aItem( nSId, true ); GetViewFrame()->GetDispatcher()->Execute( nSId, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L ); diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx index 1c3ff4d7adc4..8fd8643e8bd8 100644 --- a/sd/source/ui/view/frmview.cxx +++ b/sd/source/ui/view/frmview.cxx @@ -64,8 +64,8 @@ FrameView::FrameView(SdDrawDocument* pDrawDoc, FrameView* pFrameView /* = NULK * EnableExtendedMouseEventDispatcher(sal_False); EnableExtendedCommandEventDispatcher(sal_False); - SetGridFront( sal_False ); - SetHlplFront( sal_False ); + SetGridFront( false ); + SetHlplFront( false ); SetOConSnap( sal_False ); SetFrameDragSingles( sal_True ); SetSlidesPerRow(4); diff --git a/sd/source/ui/view/outlnvs2.cxx b/sd/source/ui/view/outlnvs2.cxx index 6bdb2b33656d..1f2370a6a14e 100644 --- a/sd/source/ui/view/outlnvs2.cxx +++ b/sd/source/ui/view/outlnvs2.cxx @@ -124,7 +124,7 @@ void OutlineViewShell::FuTemporary(SfxRequest &rReq) if (pArgs && pArgs->Count () == 1 ) { - SFX_REQUEST_ARG (rReq, pScale, SfxUInt16Item, SID_ATTR_ZOOMSLIDER, sal_False); + SFX_REQUEST_ARG (rReq, pScale, SfxUInt16Item, SID_ATTR_ZOOMSLIDER, false); if (CHECK_RANGE (5, pScale->GetValue (), 3000)) { SetZoom (pScale->GetValue ()); diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index f7842d5536af..5a7309922498 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -137,7 +137,7 @@ void OutlineViewShell::Construct(DrawDocShell* ) Size aSize(29700, 21000); Point aWinPos (0, 0); Point aViewOrigin(0, 0); - GetActiveWindow()->SetMinZoomAutoCalc(sal_False); + GetActiveWindow()->SetMinZoomAutoCalc(false); GetActiveWindow()->SetMinZoom( MIN_ZOOM ); GetActiveWindow()->SetMaxZoom( MAX_ZOOM ); InitWindows(aViewOrigin, aSize, aWinPos); @@ -280,7 +280,7 @@ void OutlineViewShell::ArrangeGUIElements () ::sd::Window* pWindow = mpContentWindow.get(); if (pWindow != NULL) { - pWindow->SetMinZoomAutoCalc(sal_False); + pWindow->SetMinZoomAutoCalc(false); // change OuputArea of the OutlinerView @@ -420,7 +420,7 @@ void OutlineViewShell::GetCtrlState(SfxItemSet &rSet) rSet.Put( SfxBoolItem( SID_READONLY_MODE, GetDocSh()->IsReadOnly() ) ); if ( SFX_ITEM_AVAILABLE == rSet.GetItemState(SID_MAIL_SCROLLBODY_PAGEDOWN) ) - rSet.Put( SfxBoolItem( SID_MAIL_SCROLLBODY_PAGEDOWN, sal_True ) ); + rSet.Put( SfxBoolItem( SID_MAIL_SCROLLBODY_PAGEDOWN, true ) ); if ( SFX_ITEM_AVAILABLE == rSet.GetItemState(SID_TRANSLITERATE_HALFWIDTH) || SFX_ITEM_AVAILABLE == rSet.GetItemState(SID_TRANSLITERATE_FULLWIDTH) || @@ -747,11 +747,11 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet ) { ViewShell::GetMenuState(rSet); - rSet.Put(SfxBoolItem(SID_DIAMODE, sal_False)); - rSet.Put(SfxBoolItem(SID_DRAWINGMODE, sal_False)); - rSet.Put(SfxBoolItem(SID_OUTLINEMODE, sal_True)); - rSet.Put(SfxBoolItem(SID_NOTESMODE, sal_False)); - rSet.Put(SfxBoolItem(SID_HANDOUTMODE, sal_False)); + rSet.Put(SfxBoolItem(SID_DIAMODE, false)); + rSet.Put(SfxBoolItem(SID_DRAWINGMODE, false)); + rSet.Put(SfxBoolItem(SID_OUTLINEMODE, true)); + rSet.Put(SfxBoolItem(SID_NOTESMODE, false)); + rSet.Put(SfxBoolItem(SID_HANDOUTMODE, false)); if (!mpZoomList->IsNextPossible()) { @@ -951,11 +951,11 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet ) { if (GetDoc()->GetOnlineSpell()) { - rSet.Put(SfxBoolItem(SID_AUTOSPELL_CHECK, sal_True)); + rSet.Put(SfxBoolItem(SID_AUTOSPELL_CHECK, true)); } else { - rSet.Put(SfxBoolItem(SID_AUTOSPELL_CHECK, sal_False)); + rSet.Put(SfxBoolItem(SID_AUTOSPELL_CHECK, false)); } } @@ -1616,7 +1616,7 @@ void OutlineViewShell::GetAttrState( SfxItemSet& rSet ) nWhich = aIter.NextWhich(); } - rSet.Put( aAllSet, sal_False ); + rSet.Put( aAllSet, false ); } @@ -1695,7 +1695,7 @@ bool OutlineViewShell::UpdateTitleObject( SdPage* pPage, Paragraph* pPara ) { DBG_ASSERT( pOlView->isRecordingUndo(), "sd::OutlineViewShell::UpdateTitleObject(), no undo for model change!?" ); pTO = pOlView->CreateTitleTextObject(pPage); - bNewObject = sal_True; + bNewObject = true; } // if we have a title object and a text, set the text @@ -1716,7 +1716,7 @@ bool OutlineViewShell::UpdateTitleObject( SdPage* pPage, Paragraph* pPara ) pOlView->AddUndo(GetDoc()->GetSdrUndoFactory().CreateUndoObjectSetText(*pTO,0)); pTO->SetOutlinerParaObject( pOPO ); - pTO->SetEmptyPresObj( sal_False ); + pTO->SetEmptyPresObj( false ); pTO->ActionChanged(); } } @@ -1736,7 +1736,7 @@ bool OutlineViewShell::UpdateTitleObject( SdPage* pPage, Paragraph* pPara ) if( pOlView->isRecordingUndo() ) pOlView->AddUndo(GetDoc()->GetSdrUndoFactory().CreateUndoObjectSetText(*pTO,0)); pPage->RestoreDefaultText( pTO ); - pTO->SetEmptyPresObj(sal_True); + pTO->SetEmptyPresObj(true); pTO->ActionChanged(); } } @@ -1821,7 +1821,7 @@ bool OutlineViewShell::UpdateOutlineObject( SdPage* pPage, Paragraph* pPara ) pOlView->AddUndo(GetDoc()->GetSdrUndoFactory().CreateUndoObjectSetText(*pTO,0)); pTO->SetOutlinerParaObject( pOPO ); - pTO->SetEmptyPresObj( sal_False ); + pTO->SetEmptyPresObj( false ); pTO->ActionChanged(); } } @@ -1844,7 +1844,7 @@ bool OutlineViewShell::UpdateOutlineObject( SdPage* pPage, Paragraph* pPara ) if( pOlView->isRecordingUndo() ) pOlView->AddUndo(GetDoc()->GetSdrUndoFactory().CreateUndoObjectSetText(*pTO,0)); pPage->RestoreDefaultText( pTO ); - pTO->SetEmptyPresObj(sal_True); + pTO->SetEmptyPresObj(true); pTO->ActionChanged(); } } diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx index cd78739dfaac..d550d5efda3b 100644 --- a/sd/source/ui/view/outlview.cxx +++ b/sd/source/ui/view/outlview.cxx @@ -444,7 +444,7 @@ SdPage* OutlineView::InsertSlideForParagraph( Paragraph* pPara ) // this page is exemplary SdPage* pExample = (SdPage*)mrDoc.GetSdPage((sal_uInt16)nExample, PK_STANDARD); - SdPage* pPage = (SdPage*)mrDoc.AllocPage(sal_False); + SdPage* pPage = (SdPage*)mrDoc.AllocPage(false); pPage->SetLayoutName(pExample->GetLayoutName()); @@ -481,7 +481,7 @@ SdPage* OutlineView::InsertSlideForParagraph( Paragraph* pPara ) |* now the notes page \*********************************************************************/ pExample = (SdPage*)mrDoc.GetSdPage((sal_uInt16)nExample, PK_NOTES); - SdPage* pNotesPage = (SdPage*)mrDoc.AllocPage(sal_False); + SdPage* pNotesPage = (SdPage*)mrDoc.AllocPage(false); pNotesPage->SetLayoutName(pExample->GetLayoutName()); @@ -1090,7 +1090,7 @@ sal_Bool OutlineView::GetAttributes( SfxItemSet& rTargetSet, sal_Bool ) const mrOutlineViewShell.GetActiveWindow()); DBG_ASSERT(pOlView, "keine OutlinerView gefunden"); - rTargetSet.Put( pOlView->GetAttribs(), sal_False ); + rTargetSet.Put( pOlView->GetAttribs(), false ); return sal_True; } @@ -1119,7 +1119,7 @@ void OutlineView::FillOutliner() if (pOPO) { sal_Bool bVertical = pOPO->IsVertical(); - pOPO->SetVertical( sal_False ); + pOPO->SetVertical( false ); mrOutliner.AddText(*pOPO); pOPO->SetVertical( bVertical ); pPara = mrOutliner.GetParagraph( mrOutliner.GetParagraphCount()-1 ); @@ -1162,7 +1162,7 @@ void OutlineView::FillOutliner() { sal_Int32 nParaCount1 = mrOutliner.GetParagraphCount(); sal_Bool bVertical = pOPO->IsVertical(); - pOPO->SetVertical( sal_False ); + pOPO->SetVertical( false ); mrOutliner.AddText(*pOPO); pOPO->SetVertical( bVertical ); diff --git a/sd/source/ui/view/presvish.cxx b/sd/source/ui/view/presvish.cxx index 1bc08e04db3d..bed8e9ed55b5 100644 --- a/sd/source/ui/view/presvish.cxx +++ b/sd/source/ui/view/presvish.cxx @@ -133,7 +133,7 @@ void PresentationViewShell::Activate( sal_Bool bIsMDIActivate ) if( bIsMDIActivate ) { - SfxBoolItem aItem( SID_NAVIGATOR_INIT, sal_True ); + SfxBoolItem aItem( SID_NAVIGATOR_INIT, true ); GetViewFrame()->GetDispatcher()->Execute( SID_NAVIGATOR_INIT, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L ); diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx index 5483746bbe6e..4b01b7d94bd7 100644 --- a/sd/source/ui/view/sdview.cxx +++ b/sd/source/ui/view/sdview.cxx @@ -112,7 +112,7 @@ View::View(SdDrawDocument& rDrawDoc, OutputDevice* pOutDev, mnDragSrcPgNum(SDRPAGE_NOTFOUND), mnAction(DND_ACTION_NONE), mnLockRedrawSmph(0), - mbIsDropAllowed(sal_True), + mbIsDropAllowed(true), maSmartTags(*this), mpClipboard (new ViewClipboard (*this)) { @@ -743,7 +743,7 @@ SdrEndTextEditKind View::SdrEndTextEdit(sal_Bool bDontDeleteReally ) { if( xObj.is() && !xObj->IsEmptyPresObj() ) { - xObj->SetEmptyPresObj( sal_True ); + xObj->SetEmptyPresObj( true ); } else { @@ -757,7 +757,7 @@ SdrEndTextEditKind View::SdrEndTextEdit(sal_Bool bDontDeleteReally ) { SdrPage* pPage = pObj->GetPage(); if( !pPage || !pPage->IsMasterPage() ) - pObj->SetEmptyPresObj( sal_False ); + pObj->SetEmptyPresObj( false ); } } @@ -1237,10 +1237,10 @@ bool View::ShouldToggleOn( { // If setting bullets/numbering by the dialog, always should toggle on. if (!bBulletOnOffMode) - return sal_True; + return true; SdrModel* pSdrModel = GetModel(); if (!pSdrModel) - return sal_False; + return false; sal_Bool bToggleOn = sal_False; SdrOutliner* pOutliner = SdrMakeOutliner(OUTLINERMODE_TEXTOBJECT, pSdrModel); diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx index f0f21cf2e0f1..e3e4efac6ebc 100644 --- a/sd/source/ui/view/sdview3.cxx +++ b/sd/source/ui/view/sdview3.cxx @@ -259,7 +259,7 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper, { maDropPos = rPos; mnAction = rDnDAction; - mbIsDropAllowed = sal_False; + mbIsDropAllowed = false; TransferableDataHelper aDataHelper( rDataHelper ); SdrObject* pPickObj = NULL; @@ -501,7 +501,7 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper, SdrEdgeObj* pCloneEdge = (SdrEdgeObj*)pRem->pClone; // test first connection - SdrObjConnection& rConn0 = pOrigEdge->GetConnection(sal_False); + SdrObjConnection& rConn0 = pOrigEdge->GetConnection(false); SdrObject* pConnObj = rConn0.GetObject(); if(pConnObj) { @@ -509,8 +509,8 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper, if(pConnClone) { // if dest obj was cloned, too, re-establish connection - pCloneEdge->ConnectToNode(sal_False, pConnClone); - pCloneEdge->GetConnection(sal_False).SetConnectorId(rConn0.GetConnectorId()); + pCloneEdge->ConnectToNode(false, pConnClone); + pCloneEdge->GetConnection(false).SetConnectorId(rConn0.GetConnectorId()); } else { @@ -533,7 +533,7 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper, } // test second connection - SdrObjConnection& rConn1 = pOrigEdge->GetConnection(sal_True); + SdrObjConnection& rConn1 = pOrigEdge->GetConnection(true); pConnObj = rConn1.GetObject(); if(pConnObj) { @@ -541,8 +541,8 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper, if(pConnClone) { // if dest obj was cloned, too, re-establish connection - pCloneEdge->ConnectToNode(sal_True, pConnClone); - pCloneEdge->GetConnection(sal_True).SetConnectorId(rConn1.GetConnectorId()); + pCloneEdge->ConnectToNode(true, pConnClone); + pCloneEdge->GetConnection(true).SetConnectorId(rConn1.GetConnectorId()); } else { @@ -1483,7 +1483,7 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper, } MarkListHasChanged(); - mbIsDropAllowed = sal_True; + mbIsDropAllowed = true; rDnDAction = mnAction; delete pImageMap; @@ -1499,7 +1499,7 @@ bool View::PasteRTFTable( SotStorageStreamRef xStm, SdrPage* pPage, sal_uLong nP pModel->GetItemPool().SetDefaultMetric(SFX_MAPUNIT_100TH_MM); pModel->InsertPage(pModel->AllocPage(false)); - Reference< XComponent > xComponent( new SdXImpressDocument( pModel, sal_True ) ); + Reference< XComponent > xComponent( new SdXImpressDocument( pModel, true ) ); pModel->setUnoModel( Reference< XInterface >::query( xComponent ) ); CreateTableFromRTF( *xStm, pModel ); diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx index bd729b51d6e4..4c5e2c575d89 100644 --- a/sd/source/ui/view/sdview4.cxx +++ b/sd/source/ui/view/sdview4.cxx @@ -113,15 +113,15 @@ SdrGrafObj* View::InsertGraphic( const Graphic& rGraphic, sal_Int8& rAction, else { pNewGrafObj = new SdrGrafObj( rGraphic, pPickObj->GetSnapRect() ); - pNewGrafObj->SetEmptyPresObj(sal_True); + pNewGrafObj->SetEmptyPresObj(true); } if ( pNewGrafObj->IsEmptyPresObj() ) { Rectangle aRect( pNewGrafObj->GetLogicRect() ); - pNewGrafObj->AdjustToMaxRect( aRect, sal_False ); + pNewGrafObj->AdjustToMaxRect( aRect, false ); pNewGrafObj->SetOutlinerParaObject(NULL); - pNewGrafObj->SetEmptyPresObj(sal_False); + pNewGrafObj->SetEmptyPresObj(false); } if (pPage && pPage->IsPresObj(pPickObj)) @@ -184,7 +184,7 @@ SdrGrafObj* View::InsertGraphic( const Graphic& rGraphic, sal_Int8& rAction, Size aPageSize( pPage->GetSize() ); aPageSize.Width() -= pPage->GetLftBorder() + pPage->GetRgtBorder(); aPageSize.Height() -= pPage->GetUppBorder() + pPage->GetLwrBorder(); - pNewGrafObj->AdjustToMaxRect( Rectangle( Point(), aPageSize ), sal_True ); + pNewGrafObj->AdjustToMaxRect( Rectangle( Point(), aPageSize ), true ); sal_uLong nOptions = SDRINSERT_SETDEFLAYER; sal_Bool bIsPresTarget = sal_False; diff --git a/sd/source/ui/view/unmodpg.cxx b/sd/source/ui/view/unmodpg.cxx index a59efad935c0..cc5a675dfc50 100644 --- a/sd/source/ui/view/unmodpg.cxx +++ b/sd/source/ui/view/unmodpg.cxx @@ -59,8 +59,8 @@ ModifyPageUndoAction::ModifyPageUndoAction( { maOldName = mpPage->GetName(); SdrLayerAdmin& rLayerAdmin = mpDoc->GetLayerAdmin(); - sal_uInt8 aBckgrnd = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), sal_False); - sal_uInt8 aBckgrndObj = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), sal_False); + sal_uInt8 aBckgrnd = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), false); + sal_uInt8 aBckgrndObj = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), false); SetOfByte aVisibleLayers = mpPage->TRG_GetMasterPageVisibleLayers(); mbOldBckgrndVisible = aVisibleLayers.IsSet(aBckgrnd); @@ -107,8 +107,8 @@ void ModifyPageUndoAction::Undo() } SdrLayerAdmin& rLayerAdmin = mpDoc->GetLayerAdmin(); - sal_uInt8 aBckgrnd = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), sal_False); - sal_uInt8 aBckgrndObj = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), sal_False); + sal_uInt8 aBckgrnd = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), false); + sal_uInt8 aBckgrndObj = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), false); SetOfByte aVisibleLayers; aVisibleLayers.Set(aBckgrnd, mbOldBckgrndVisible); aVisibleLayers.Set(aBckgrndObj, mbOldBckgrndObjsVisible); @@ -151,8 +151,8 @@ void ModifyPageUndoAction::Redo() } SdrLayerAdmin& rLayerAdmin = mpDoc->GetLayerAdmin(); - sal_uInt8 aBckgrnd = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), sal_False); - sal_uInt8 aBckgrndObj = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), sal_False); + sal_uInt8 aBckgrnd = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), false); + sal_uInt8 aBckgrndObj = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), false); SetOfByte aVisibleLayers; aVisibleLayers.Set(aBckgrnd, mbNewBckgrndVisible); aVisibleLayers.Set(aBckgrndObj, mbNewBckgrndObjsVisible); diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx index 1e7ddcd9e32e..d80b23c9e96c 100644 --- a/sd/source/ui/view/viewshe2.cxx +++ b/sd/source/ui/view/viewshe2.cxx @@ -793,7 +793,7 @@ sal_Bool ViewShell::ActivateObject(SdrOle2Obj* pObj, long nVerb) if ( xObj.is() ) { // OLE object is no longer empty - pObj->SetEmptyPresObj(sal_False); + pObj->SetEmptyPresObj(false); pObj->SetOutlinerParaObject(NULL); pObj->SetGraphic(NULL); diff --git a/sd/source/ui/view/viewshe3.cxx b/sd/source/ui/view/viewshe3.cxx index 3c2b5d0ae5a5..35e5751e9cf2 100644 --- a/sd/source/ui/view/viewshe3.cxx +++ b/sd/source/ui/view/viewshe3.cxx @@ -198,8 +198,8 @@ SdPage* ViewShell::CreateOrDuplicatePage ( sal_uInt16 nSId = rRequest.GetSlot(); SdDrawDocument* pDocument = GetDoc(); SdrLayerAdmin& rLayerAdmin = pDocument->GetLayerAdmin(); - sal_uInt8 aBckgrnd = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), sal_False); - sal_uInt8 aBckgrndObj = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), sal_False); + sal_uInt8 aBckgrnd = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), false); + sal_uInt8 aBckgrndObj = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), false); SetOfByte aVisibleLayers; // Determine the page from which to copy some values, such as layers, // size, master page, to the new page. This is usually the given page. @@ -241,7 +241,7 @@ SdPage* ViewShell::CreateOrDuplicatePage ( else if (pArgs->Count() == 1) { pDocument->StopWorkStartupDelay(); - SFX_REQUEST_ARG (rRequest, pLayout, SfxUInt32Item, ID_VAL_WHATLAYOUT, sal_False); + SFX_REQUEST_ARG (rRequest, pLayout, SfxUInt32Item, ID_VAL_WHATLAYOUT, false); if( pLayout ) { if (ePageKind == PK_NOTES) @@ -259,10 +259,10 @@ SdPage* ViewShell::CreateOrDuplicatePage ( // AutoLayouts must be ready pDocument->StopWorkStartupDelay(); - SFX_REQUEST_ARG (rRequest, pPageName, SfxStringItem, ID_VAL_PAGENAME, sal_False); - SFX_REQUEST_ARG (rRequest, pLayout, SfxUInt32Item, ID_VAL_WHATLAYOUT, sal_False); - SFX_REQUEST_ARG (rRequest, pIsPageBack, SfxBoolItem, ID_VAL_ISPAGEBACK, sal_False); - SFX_REQUEST_ARG (rRequest, pIsPageObj, SfxBoolItem, ID_VAL_ISPAGEOBJ, sal_False); + SFX_REQUEST_ARG (rRequest, pPageName, SfxStringItem, ID_VAL_PAGENAME, false); + SFX_REQUEST_ARG (rRequest, pLayout, SfxUInt32Item, ID_VAL_WHATLAYOUT, false); + SFX_REQUEST_ARG (rRequest, pIsPageBack, SfxBoolItem, ID_VAL_ISPAGEBACK, false); + SFX_REQUEST_ARG (rRequest, pIsPageObj, SfxBoolItem, ID_VAL_ISPAGEOBJ, false); if (CHECK_RANGE (AUTOLAYOUT__START, (AutoLayout) pLayout->GetValue (), AUTOLAYOUT__END)) { diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx index 6b19b91e4465..6a417fab4b25 100644 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -320,7 +320,7 @@ void ViewShell::Activate(sal_Bool bIsMDIActivate) if (bIsMDIActivate) { // thus, the Navigator will also get a current status - SfxBoolItem aItem( SID_NAVIGATOR_INIT, sal_True ); + SfxBoolItem aItem( SID_NAVIGATOR_INIT, true ); if (GetDispatcher() != NULL) GetDispatcher()->Execute( SID_NAVIGATOR_INIT, |