diff options
Diffstat (limited to 'sfx2')
54 files changed, 345 insertions, 345 deletions
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx index 039ae609d011..69d5b9e4161d 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -200,7 +200,7 @@ SfxApplication::SfxApplication() aStr.append(static_cast<sal_Int32>(GetDdeService()->GetError())); else aStr.append('?'); - DBG_ASSERT( sal_False, aStr.getStr() ); + DBG_ASSERT( false, aStr.getStr() ); } #else (void)bOk; diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx index 3251a9271cf8..62efd5d4f3db 100644 --- a/sfx2/source/appl/appbas.cxx +++ b/sfx2/source/appl/appbas.cxx @@ -174,7 +174,7 @@ void SfxApplication::PropExec_Impl( SfxRequest &rReq ) { case SID_CREATE_BASICOBJECT: { - SFX_REQUEST_ARG(rReq, pItem, SfxStringItem, nSID, sal_False); + SFX_REQUEST_ARG(rReq, pItem, SfxStringItem, nSID, false); if ( pItem ) { SbxObject* pObject = SbxBase::CreateObject( pItem->GetValue() ); @@ -191,7 +191,7 @@ void SfxApplication::PropExec_Impl( SfxRequest &rReq ) case SID_ATTR_UNDO_COUNT: { - SFX_REQUEST_ARG(rReq, pCountItem, SfxUInt16Item, nSID, sal_False); + SFX_REQUEST_ARG(rReq, pCountItem, SfxUInt16Item, nSID, false); boost::shared_ptr< comphelper::ConfigurationChanges > batch( comphelper::ConfigurationChanges::create()); officecfg::Office::Common::Undo::Steps::set( @@ -207,7 +207,7 @@ void SfxApplication::PropExec_Impl( SfxRequest &rReq ) case SID_OFFICE_CUSTOMERNUMBER: { - SFX_REQUEST_ARG(rReq, pStringItem, SfxStringItem, nSID, sal_False); + SFX_REQUEST_ARG(rReq, pStringItem, SfxStringItem, nSID, false); if ( pStringItem ) SvtUserOptions().SetCustomerNumber( pStringItem->GetValue() ); diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx index 98bca5621b2f..18a9aae3cb7b 100644 --- a/sfx2/source/appl/appinit.cxx +++ b/sfx2/source/appl/appinit.cxx @@ -269,7 +269,7 @@ bool SfxApplication::Initialize_Impl() SetPool( pAppData_Impl->pPool ); if ( pAppData_Impl->bDowning ) - return sal_False; + return false; // App-Dispatcher aufbauen pAppData_Impl->pAppDispat->Push(*this); @@ -282,7 +282,7 @@ bool SfxApplication::Initialize_Impl() Edit::SetGetSpecialCharsFunction(&GetSpecialCharsForEdit); } - return sal_True; + return true; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx index 82d5ae1cddd5..a1d7aa6533b7 100644 --- a/sfx2/source/appl/appmisc.cxx +++ b/sfx2/source/appl/appmisc.cxx @@ -227,7 +227,7 @@ bool SfxApplication::loadBrandSvg(const char *pName, BitmapEx &rBitmap, int nWid } catch(const uno::Exception&) { - OSL_ENSURE(sal_False, "Got no graphic::XPrimitive2DRenderer (!)" ); + OSL_ENSURE(false, "Got no graphic::XPrimitive2DRenderer (!)" ); } return false; } diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx index f1aca79f13aa..bf947fb40131 100644 --- a/sfx2/source/appl/appopen.cxx +++ b/sfx2/source/appl/appopen.cxx @@ -261,12 +261,12 @@ sal_uInt32 CheckPasswd_Impl { // use the comphelper password helper to request a password OUString aPassword; - SFX_ITEMSET_ARG( pSet, pPasswordItem, SfxStringItem, SID_PASSWORD, sal_False); + SFX_ITEMSET_ARG( pSet, pPasswordItem, SfxStringItem, SID_PASSWORD, false); if ( pPasswordItem ) aPassword = pPasswordItem->GetValue(); uno::Sequence< beans::NamedValue > aEncryptionData; - SFX_ITEMSET_ARG( pSet, pEncryptionDataItem, SfxUnoAnyItem, SID_ENCRYPTIONDATA, sal_False); + SFX_ITEMSET_ARG( pSet, pEncryptionDataItem, SfxUnoAnyItem, SID_ENCRYPTIONDATA, false); if ( pEncryptionDataItem ) pEncryptionDataItem->GetValue() >>= aEncryptionData; @@ -350,7 +350,7 @@ sal_uIntPtr SfxApplication::LoadTemplate( SfxObjectShellLock& xDoc, const OUStri SfxStringItem aName( SID_FILE_NAME, rFileName ); SfxStringItem aReferer( SID_REFERER, OUString("private:user") ); SfxStringItem aFlags( SID_OPTIONS, OUString("T") ); - SfxBoolItem aHidden( SID_HIDDEN, sal_True ); + SfxBoolItem aHidden( SID_HIDDEN, true ); const SfxPoolItem *pRet = GetDispatcher_Impl()->Execute( SID_OPENDOC, SFX_CALLMODE_SYNCHRON, &aName, &aHidden, &aReferer, &aFlags, 0L ); const SfxObjectItem *pObj = PTR_CAST( SfxObjectItem, pRet ); if ( pObj ) @@ -442,7 +442,7 @@ sal_uIntPtr SfxApplication::LoadTemplate( SfxObjectShellLock& xDoc, const OUStri void SfxApplication::NewDocDirectExec_Impl( SfxRequest& rReq ) { - SFX_REQUEST_ARG( rReq, pFactoryItem, SfxStringItem, SID_NEWDOCDIRECT, sal_False); + SFX_REQUEST_ARG( rReq, pFactoryItem, SfxStringItem, SID_NEWDOCDIRECT, false); OUString aFactName; if ( pFactoryItem ) aFactName = pFactoryItem->GetValue(); @@ -458,10 +458,10 @@ void SfxApplication::NewDocDirectExec_Impl( SfxRequest& rReq ) aReq.AppendItem( SfxStringItem( SID_TARGETNAME, OUString( "_default" ) ) ); // TODO/LATER: Should the other arguments be transferred as well? - SFX_REQUEST_ARG( rReq, pDefaultPathItem, SfxStringItem, SID_DEFAULTFILEPATH, sal_False); + SFX_REQUEST_ARG( rReq, pDefaultPathItem, SfxStringItem, SID_DEFAULTFILEPATH, false); if ( pDefaultPathItem ) aReq.AppendItem( *pDefaultPathItem ); - SFX_REQUEST_ARG( rReq, pDefaultNameItem, SfxStringItem, SID_DEFAULTFILENAME, sal_False); + SFX_REQUEST_ARG( rReq, pDefaultNameItem, SfxStringItem, SID_DEFAULTFILENAME, false); if ( pDefaultNameItem ) aReq.AppendItem( *pDefaultNameItem ); @@ -476,9 +476,9 @@ void SfxApplication::NewDocDirectExec_Impl( SfxRequest& rReq ) void SfxApplication::NewDocExec_Impl( SfxRequest& rReq ) { // No Parameter from BASIC only Factory given? - SFX_REQUEST_ARG(rReq, pTemplNameItem, SfxStringItem, SID_TEMPLATE_NAME, sal_False); - SFX_REQUEST_ARG(rReq, pTemplFileNameItem, SfxStringItem, SID_FILE_NAME, sal_False); - SFX_REQUEST_ARG(rReq, pTemplRegionNameItem, SfxStringItem, SID_TEMPLATE_REGIONNAME, sal_False); + SFX_REQUEST_ARG(rReq, pTemplNameItem, SfxStringItem, SID_TEMPLATE_NAME, false); + SFX_REQUEST_ARG(rReq, pTemplFileNameItem, SfxStringItem, SID_FILE_NAME, false); + SFX_REQUEST_ARG(rReq, pTemplRegionNameItem, SfxStringItem, SID_TEMPLATE_REGIONNAME, false); SfxObjectShellLock xDoc; @@ -530,7 +530,7 @@ void SfxApplication::NewDocExec_Impl( SfxRequest& rReq ) sal_uIntPtr lErr = 0; SfxItemSet* pSet = new SfxAllItemSet( GetPool() ); - pSet->Put( SfxBoolItem( SID_TEMPLATE, sal_True ) ); + pSet->Put( SfxBoolItem( SID_TEMPLATE, true ) ); if ( !bDirect ) { SfxDocumentTemplates aTmpFac; @@ -610,7 +610,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) aDocService = pDocSrvItem->GetValue(); sal_uInt16 nSID = rReq.GetSlot(); - SFX_REQUEST_ARG( rReq, pFileNameItem, SfxStringItem, SID_FILE_NAME, sal_False ); + SFX_REQUEST_ARG( rReq, pFileNameItem, SfxStringItem, SID_FILE_NAME, false ); if ( pFileNameItem ) { OUString aCommand( pFileNameItem->GetValue() ); @@ -637,7 +637,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) OUString aFilter; SfxItemSet* pSet = NULL; OUString aPath; - SFX_REQUEST_ARG( rReq, pFolderNameItem, SfxStringItem, SID_PATH, sal_False ); + SFX_REQUEST_ARG( rReq, pFolderNameItem, SfxStringItem, SID_PATH, false ); if ( pFolderNameItem ) aPath = pFolderNameItem->GetValue(); else if ( nSID == SID_OPENTEMPLATE ) @@ -648,19 +648,19 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) } sal_Int16 nDialog = SFX2_IMPL_DIALOG_CONFIG; - SFX_REQUEST_ARG( rReq, pSystemDialogItem, SfxBoolItem, SID_FILE_DIALOG, sal_False ); + SFX_REQUEST_ARG( rReq, pSystemDialogItem, SfxBoolItem, SID_FILE_DIALOG, false ); if ( pSystemDialogItem ) nDialog = pSystemDialogItem->GetValue() ? SFX2_IMPL_DIALOG_SYSTEM : SFX2_IMPL_DIALOG_OOO; OUString sStandardDir; - SFX_REQUEST_ARG( rReq, pStandardDirItem, SfxStringItem, SID_STANDARD_DIR, sal_False ); + SFX_REQUEST_ARG( rReq, pStandardDirItem, SfxStringItem, SID_STANDARD_DIR, false ); if ( pStandardDirItem ) sStandardDir = pStandardDirItem->GetValue(); ::com::sun::star::uno::Sequence< OUString > aBlackList; - SFX_REQUEST_ARG( rReq, pBlackListItem, SfxStringListItem, SID_BLACK_LIST, sal_False ); + SFX_REQUEST_ARG( rReq, pBlackListItem, SfxStringListItem, SID_BLACK_LIST, false ); if ( pBlackListItem ) pBlackListItem->GetStringList( aBlackList ); @@ -686,7 +686,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) if(!pURLList.empty()) { if ( nSID == SID_OPENTEMPLATE ) - rReq.AppendItem( SfxBoolItem( SID_TEMPLATE, sal_False ) ); + rReq.AppendItem( SfxBoolItem( SID_TEMPLATE, false ) ); // This helper wraps an existing (or may new created InteractionHandler) // intercept all incoming interactions and provide useful information @@ -697,7 +697,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) css::uno::Reference< css::task::XInteractionHandler > xWrappedHandler; // wrap existing handler or create new UUI handler - SFX_REQUEST_ARG(rReq, pInteractionItem, SfxUnoAnyItem, SID_INTERACTIONHANDLER, sal_False); + SFX_REQUEST_ARG(rReq, pInteractionItem, SfxUnoAnyItem, SID_INTERACTIONHANDLER, false); if (pInteractionItem) { pInteractionItem->GetValue() >>= xWrappedHandler; @@ -768,7 +768,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) } else if ( nSID == SID_OPENTEMPLATE ) { - rReq.AppendItem( SfxBoolItem( SID_TEMPLATE, sal_False ) ); + rReq.AppendItem( SfxBoolItem( SID_TEMPLATE, false ) ); } // pass URL to OS by using ShellExecuter or open it internal // if it seams to be an own format. @@ -787,22 +787,22 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) // no else here! It's optional ... if (!bHyperlinkUsed) { - SFX_REQUEST_ARG(rReq, pHyperLinkUsedItem, SfxBoolItem, SID_BROWSE, sal_False); + SFX_REQUEST_ARG(rReq, pHyperLinkUsedItem, SfxBoolItem, SID_BROWSE, false); if ( pHyperLinkUsedItem ) bHyperlinkUsed = pHyperLinkUsedItem->GetValue(); // no "official" item, so remove it from ItemSet before using UNO-API rReq.RemoveItem( SID_BROWSE ); } - SFX_REQUEST_ARG( rReq, pFileName, SfxStringItem, SID_FILE_NAME, sal_False ); + SFX_REQUEST_ARG( rReq, pFileName, SfxStringItem, SID_FILE_NAME, false ); OUString aFileName = pFileName->GetValue(); OUString aReferer; - SFX_REQUEST_ARG( rReq, pRefererItem, SfxStringItem, SID_REFERER, sal_False ); + SFX_REQUEST_ARG( rReq, pRefererItem, SfxStringItem, SID_REFERER, false ); if ( pRefererItem ) aReferer = pRefererItem->GetValue(); - SFX_REQUEST_ARG( rReq, pFileFlagsItem, SfxStringItem, SID_OPTIONS, sal_False); + SFX_REQUEST_ARG( rReq, pFileFlagsItem, SfxStringItem, SID_OPTIONS, false); if ( pFileFlagsItem ) { OUString aFileFlags = pFileFlagsItem->GetValue(); @@ -810,25 +810,25 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) if ( -1 != aFileFlags.indexOf( 0x0054 ) ) // T = 54h { rReq.RemoveItem( SID_TEMPLATE ); - rReq.AppendItem( SfxBoolItem( SID_TEMPLATE, sal_True ) ); + rReq.AppendItem( SfxBoolItem( SID_TEMPLATE, true ) ); } if ( -1 != aFileFlags.indexOf( 0x0048 ) ) // H = 48h { rReq.RemoveItem( SID_HIDDEN ); - rReq.AppendItem( SfxBoolItem( SID_HIDDEN, sal_True ) ); + rReq.AppendItem( SfxBoolItem( SID_HIDDEN, true ) ); } if ( -1 != aFileFlags.indexOf( 0x0052 ) ) // R = 52h { rReq.RemoveItem( SID_DOC_READONLY ); - rReq.AppendItem( SfxBoolItem( SID_DOC_READONLY, sal_True ) ); + rReq.AppendItem( SfxBoolItem( SID_DOC_READONLY, true ) ); } if ( -1 != aFileFlags.indexOf( 0x0042 ) ) // B = 42h { rReq.RemoveItem( SID_PREVIEW ); - rReq.AppendItem( SfxBoolItem( SID_PREVIEW, sal_True ) ); + rReq.AppendItem( SfxBoolItem( SID_PREVIEW, true ) ); } rReq.RemoveItem( SID_OPTIONS ); @@ -965,13 +965,13 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) SfxFrame* pTargetFrame = NULL; Reference< XFrame > xTargetFrame; - SFX_REQUEST_ARG(rReq, pFrameItem, SfxFrameItem, SID_DOCFRAME, sal_False); + SFX_REQUEST_ARG(rReq, pFrameItem, SfxFrameItem, SID_DOCFRAME, false); if ( pFrameItem ) pTargetFrame = pFrameItem->GetFrame(); if ( !pTargetFrame ) { - SFX_REQUEST_ARG(rReq, pUnoFrameItem, SfxUnoFrameItem, SID_FILLFRAME, sal_False); + SFX_REQUEST_ARG(rReq, pUnoFrameItem, SfxUnoFrameItem, SID_FILLFRAME, false); if ( pUnoFrameItem ) xTargetFrame = pUnoFrameItem->GetFrame(); } @@ -980,7 +980,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) pTargetFrame = &SfxViewFrame::Current()->GetFrame(); // check if caller has set a callback - SFX_REQUEST_ARG(rReq, pLinkItem, SfxLinkItem, SID_DONELINK, sal_False ); + SFX_REQUEST_ARG(rReq, pLinkItem, SfxLinkItem, SID_DONELINK, false ); // remove from Itemset, because it confuses the parameter transformation if ( pLinkItem ) @@ -990,19 +990,19 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) // check if the view must be hidden sal_Bool bHidden = sal_False; - SFX_REQUEST_ARG(rReq, pHidItem, SfxBoolItem, SID_HIDDEN, sal_False); + SFX_REQUEST_ARG(rReq, pHidItem, SfxBoolItem, SID_HIDDEN, false); if ( pHidItem ) bHidden = pHidItem->GetValue(); // This request is a UI call. We have to set the right values inside the MediaDescriptor // for: InteractionHandler, StatusIndicator, MacroExecutionMode and DocTemplate. // But we have to look for already existing values or for real hidden requests. - SFX_REQUEST_ARG(rReq, pPreviewItem, SfxBoolItem, SID_PREVIEW, sal_False); + SFX_REQUEST_ARG(rReq, pPreviewItem, SfxBoolItem, SID_PREVIEW, false); if (!bHidden && ( !pPreviewItem || !pPreviewItem->GetValue() ) ) { - SFX_REQUEST_ARG(rReq, pInteractionItem, SfxUnoAnyItem, SID_INTERACTIONHANDLER, sal_False); - SFX_REQUEST_ARG(rReq, pMacroExecItem , SfxUInt16Item, SID_MACROEXECMODE , sal_False); - SFX_REQUEST_ARG(rReq, pDocTemplateItem, SfxUInt16Item, SID_UPDATEDOCMODE , sal_False); + SFX_REQUEST_ARG(rReq, pInteractionItem, SfxUnoAnyItem, SID_INTERACTIONHANDLER, false); + SFX_REQUEST_ARG(rReq, pMacroExecItem , SfxUInt16Item, SID_MACROEXECMODE , false); + SFX_REQUEST_ARG(rReq, pDocTemplateItem, SfxUInt16Item, SID_UPDATEDOCMODE , false); if (!pInteractionItem) { @@ -1017,12 +1017,12 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) // extract target name OUString aTarget; - SFX_REQUEST_ARG(rReq, pTargetItem, SfxStringItem, SID_TARGETNAME, sal_False); + SFX_REQUEST_ARG(rReq, pTargetItem, SfxStringItem, SID_TARGETNAME, false); if ( pTargetItem ) aTarget = pTargetItem->GetValue(); else { - SFX_REQUEST_ARG( rReq, pNewViewItem, SfxBoolItem, SID_OPEN_NEW_VIEW, sal_False ); + SFX_REQUEST_ARG( rReq, pNewViewItem, SfxBoolItem, SID_OPEN_NEW_VIEW, false ); if ( pNewViewItem && pNewViewItem->GetValue() ) aTarget = "_blank" ; } @@ -1049,7 +1049,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) } // make URL ready - SFX_REQUEST_ARG( rReq, pURLItem, SfxStringItem, SID_FILE_NAME, sal_False ); + SFX_REQUEST_ARG( rReq, pURLItem, SfxStringItem, SID_FILE_NAME, false ); aFileName = pURLItem->GetValue(); if( aFileName.startsWith("#") ) // Mark without URL { diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index 5717f7aa2058..66f32d8a0a3d 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -341,7 +341,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) if ( pFact ) { SFX_REQUEST_ARG(rReq, pStringItem, - SfxStringItem, SID_CONFIG, sal_False); + SfxStringItem, SID_CONFIG, false); SfxItemSet aSet( GetPool(), SID_CONFIG, SID_CONFIG ); @@ -354,7 +354,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) Reference< XFrame > xFrame; const SfxItemSet* pIntSet = rReq.GetInternalArgs_Impl(); - SFX_ITEMSET_ARG( pIntSet, pFrameItem, SfxUnoFrameItem, SID_FILLFRAME, sal_False ); + SFX_ITEMSET_ARG( pIntSet, pFrameItem, SfxUnoFrameItem, SID_FILLFRAME, false ); if ( pFrameItem ) xFrame = pFrameItem->GetFrame(); @@ -478,7 +478,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) case SID_HELPTIPS: { // Evaluate Parameter - SFX_REQUEST_ARG(rReq, pOnItem, SfxBoolItem, SID_HELPTIPS, sal_False); + SFX_REQUEST_ARG(rReq, pOnItem, SfxBoolItem, SID_HELPTIPS, false); bool bOn = pOnItem ? ((SfxBoolItem*)pOnItem)->GetValue() : !Help::IsQuickHelpEnabled(); @@ -505,7 +505,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) case SID_HELPBALLOONS: { // Evaluate Parameter - SFX_REQUEST_ARG(rReq, pOnItem, SfxBoolItem, SID_HELPBALLOONS, sal_False); + SFX_REQUEST_ARG(rReq, pOnItem, SfxBoolItem, SID_HELPBALLOONS, false); bool bOn = pOnItem ? ((SfxBoolItem*)pOnItem)->GetValue() : !Help::IsBalloonHelpEnabled(); @@ -1001,7 +1001,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq ) case SID_OPTIONS_TREEDIALOG: { OUString sPageURL; - SFX_REQUEST_ARG( rReq, pURLItem, SfxStringItem, SID_OPTIONS_PAGEURL, sal_False ); + SFX_REQUEST_ARG( rReq, pURLItem, SfxStringItem, SID_OPTIONS_PAGEURL, false ); if ( pURLItem ) sPageURL = pURLItem->GetValue(); const SfxItemSet* pArgs = rReq.GetInternalArgs_Impl(); @@ -1180,7 +1180,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq ) Reference< XFrame > xFrame; const SfxItemSet* pIntSet = rReq.GetInternalArgs_Impl(); - SFX_ITEMSET_ARG( pIntSet, pFrameItem, SfxUnoFrameItem, SID_FILLFRAME, sal_False ); + SFX_ITEMSET_ARG( pIntSet, pFrameItem, SfxUnoFrameItem, SID_FILLFRAME, false ); if ( pFrameItem ) xFrame = pFrameItem->GetFrame(); @@ -1263,7 +1263,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq ) case SID_OFFICE_CHECK_PLZ: { sal_Bool bRet = sal_False; - SFX_REQUEST_ARG(rReq, pStringItem, SfxStringItem, rReq.GetSlot(), sal_False); + SFX_REQUEST_ARG(rReq, pStringItem, SfxStringItem, rReq.GetSlot(), false); if ( pStringItem ) { diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx index 59f415c1cb88..31229337f567 100644 --- a/sfx2/source/appl/appuno.cxx +++ b/sfx2/source/appl/appuno.cxx @@ -1281,7 +1281,7 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, uno::Sequence<b // slot is a property sal_uInt16 nWhich = rSet.GetPool()->GetWhich(nSlotId); sal_Bool bConvertTwips = ( rSet.GetPool()->GetMetric( nWhich ) == SFX_MAPUNIT_TWIP ); - SFX_ITEMSET_ARG( &rSet, pItem, SfxPoolItem, nWhich, sal_False ); + SFX_ITEMSET_ARG( &rSet, pItem, SfxPoolItem, nWhich, false ); if ( pItem ) //??? { sal_uInt16 nSubCount = pType->nAttribs; @@ -1333,7 +1333,7 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, uno::Sequence<b const SfxFormalArgument &rArg = pSlot->GetFormalArgument( nArg ); sal_uInt16 nWhich = rSet.GetPool()->GetWhich( rArg.nSlotId ); sal_Bool bConvertTwips = ( rSet.GetPool()->GetMetric( nWhich ) == SFX_MAPUNIT_TWIP ); - SFX_ITEMSET_ARG( &rSet, pItem, SfxPoolItem, nWhich, sal_False ); + SFX_ITEMSET_ARG( &rSet, pItem, SfxPoolItem, nWhich, false ); if ( pItem ) //??? { sal_uInt16 nSubCount = rArg.pType->nAttribs; diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx index e51bea83fb16..c5f78a5671cc 100644 --- a/sfx2/source/appl/childwin.cxx +++ b/sfx2/source/appl/childwin.cxx @@ -669,13 +669,13 @@ void SfxChildWindow::Show( sal_uInt16 nFlags ) switch ( pWindow->GetType() ) { case RSC_DOCKINGWINDOW : - ((DockingWindow*)pWindow)->Show( sal_True, nFlags ); + ((DockingWindow*)pWindow)->Show( true, nFlags ); break; case RSC_TOOLBOX : - ((ToolBox*)pWindow)->Show( sal_True, nFlags ); + ((ToolBox*)pWindow)->Show( true, nFlags ); break; default: - pWindow->Show( sal_True, nFlags ); + pWindow->Show( true, nFlags ); break; } } diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx index e1e460616a57..f72d436b6a9c 100644 --- a/sfx2/source/appl/linkmgr2.cxx +++ b/sfx2/source/appl/linkmgr2.cxx @@ -577,7 +577,7 @@ sal_Bool SvxInternalLink::Connect( sfx2::SvBaseLink* pLink ) if( pShell && pShell->GetMedium() ) { sReferer = pShell->GetMedium()->GetBaseURL(); - SFX_ITEMSET_ARG( pShell->GetMedium()->GetItemSet(), pItem, SfxUInt16Item, SID_UPDATEDOCMODE, sal_False ); + SFX_ITEMSET_ARG( pShell->GetMedium()->GetItemSet(), pItem, SfxUInt16Item, SID_UPDATEDOCMODE, false ); if ( pItem ) nUpdateMode = pItem->GetValue(); } @@ -649,8 +649,8 @@ sal_Bool SvxInternalLink::Connect( sfx2::SvBaseLink* pLink ) INET_PROT_HTTP != aURL.GetProtocol() ) { SfxStringItem aName( SID_FILE_NAME, sTopic ); - SfxBoolItem aMinimized(SID_MINIMIZED, sal_True); - SfxBoolItem aHidden(SID_HIDDEN, sal_True); + SfxBoolItem aMinimized(SID_MINIMIZED, true); + SfxBoolItem aHidden(SID_HIDDEN, true); SfxStringItem aTarget( SID_TARGETNAME, OUString("_blank") ); SfxStringItem aReferer( SID_REFERER, sReferer ); SfxUInt16Item aUpdate( SID_UPDATEDOCMODE, nUpdateMode ); diff --git a/sfx2/source/appl/macroloader.cxx b/sfx2/source/appl/macroloader.cxx index 9291e7016700..ba1a0dbcd33c 100644 --- a/sfx2/source/appl/macroloader.cxx +++ b/sfx2/source/appl/macroloader.cxx @@ -252,8 +252,8 @@ ErrCode SfxMacroLoader::loadMacro( const OUString& rURL, com::sun::star::uno::An else if ( pDoc && pDoc->GetMedium() ) { pDoc->AdjustMacroMode( OUString() ); - SFX_ITEMSET_ARG( pDoc->GetMedium()->GetItemSet(), pUpdateDocItem, SfxUInt16Item, SID_UPDATEDOCMODE, sal_False); - SFX_ITEMSET_ARG( pDoc->GetMedium()->GetItemSet(), pMacroExecModeItem, SfxUInt16Item, SID_MACROEXECMODE, sal_False); + SFX_ITEMSET_ARG( pDoc->GetMedium()->GetItemSet(), pUpdateDocItem, SfxUInt16Item, SID_UPDATEDOCMODE, false); + SFX_ITEMSET_ARG( pDoc->GetMedium()->GetItemSet(), pMacroExecModeItem, SfxUInt16Item, SID_MACROEXECMODE, false); if ( pUpdateDocItem && pMacroExecModeItem && pUpdateDocItem->GetValue() == document::UpdateDocMode::NO_UPDATE && pMacroExecModeItem->GetValue() == document::MacroExecMode::NEVER_EXECUTE ) diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx index 4b5b3fd17a3c..eac80211f7d0 100644 --- a/sfx2/source/appl/sfxpicklist.cxx +++ b/sfx2/source/appl/sfxpicklist.cxx @@ -174,7 +174,7 @@ void SfxPickList::AddDocumentToPickList( SfxObjectShell* pDocSh ) return; // add no document that forbids this (for example Message-Body) - SFX_ITEMSET_ARG( pMed->GetItemSet(), pPicklistItem, SfxBoolItem, SID_PICKLIST, sal_False ); + SFX_ITEMSET_ARG( pMed->GetItemSet(), pPicklistItem, SfxBoolItem, SID_PICKLIST, false ); if ( pPicklistItem && !pPicklistItem->GetValue() ) return; @@ -323,7 +323,7 @@ void SfxPickList::ExecuteEntry( sal_uInt32 nIndex ) } aReq.AppendItem(SfxStringItem( SID_FILTER_NAME, aFilter )); - aReq.AppendItem( SfxBoolItem( SID_TEMPLATE, sal_False ) ); + aReq.AppendItem( SfxBoolItem( SID_TEMPLATE, false ) ); SFX_APP()->ExecuteSlot( aReq ); } } diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx index 5614f494df34..2e28bf0ec9ae 100644 --- a/sfx2/source/appl/shutdownicon.cxx +++ b/sfx2/source/appl/shutdownicon.cxx @@ -743,9 +743,9 @@ void SAL_CALL ShutdownIcon::initialize( const ::com::sun::star::uno::Sequence< : sal_Bool bAutostart = sal_False; bAutostart = ::cppu::any2bool( aArguments[1] ); if (bAutostart && !GetAutostart()) - SetAutostart( sal_True ); + SetAutostart( true ); if (!bAutostart && GetAutostart()) - SetAutostart( sal_False ); + SetAutostart( false ); } } @@ -754,14 +754,14 @@ void SAL_CALL ShutdownIcon::initialize( const ::com::sun::star::uno::Sequence< : void ShutdownIcon::EnterModalMode() { - bModalMode = sal_True; + bModalMode = true; } // ------------------------------- void ShutdownIcon::LeaveModalMode() { - bModalMode = sal_False; + bModalMode = false; } #ifdef WNT diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx index b4590f4f0049..0c588bf70a7a 100644 --- a/sfx2/source/appl/workwin.cxx +++ b/sfx2/source/appl/workwin.cxx @@ -1080,13 +1080,13 @@ void SfxWorkWindow::ShowChildren_Impl() switch ( pCli->pWin->GetType() ) { case RSC_DOCKINGWINDOW : - ((DockingWindow*)pCli->pWin)->Show( sal_True, nFlags ); + ((DockingWindow*)pCli->pWin)->Show( true, nFlags ); break; case RSC_SPLITWINDOW : - ((SplitWindow*)pCli->pWin)->Show( sal_True, nFlags ); + ((SplitWindow*)pCli->pWin)->Show( true, nFlags ); break; default: - pCli->pWin->Show( sal_True, nFlags ); + pCli->pWin->Show( true, nFlags ); break; } @@ -1293,7 +1293,7 @@ sal_Bool SfxWorkWindow::IsPluginMode( SfxObjectShell* pObjShell ) { if ( pObjShell && pObjShell->GetMedium() ) { - SFX_ITEMSET_ARG( pObjShell->GetMedium()->GetItemSet(), pViewOnlyItem, SfxBoolItem, SID_VIEWONLY, sal_False ); + SFX_ITEMSET_ARG( pObjShell->GetMedium()->GetItemSet(), pViewOnlyItem, SfxBoolItem, SID_VIEWONLY, false ); if ( pViewOnlyItem && pViewOnlyItem->GetValue() ) return sal_True; } @@ -1764,7 +1764,7 @@ void SfxWorkWindow::ConfigChild_Impl(SfxChildIdentifier eChild, pWin = pSplitWin->GetSplitWindow(); if ( pSplitWin->GetWindowCount() == 1 ) - ((SplitWindow*)pWin)->Show( sal_True, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE ); + ((SplitWindow*)pWin)->Show( true, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE ); } } diff --git a/sfx2/source/appl/xpackcreator.cxx b/sfx2/source/appl/xpackcreator.cxx index 6229c61f7130..8b3c83118ce2 100644 --- a/sfx2/source/appl/xpackcreator.cxx +++ b/sfx2/source/appl/xpackcreator.cxx @@ -77,14 +77,14 @@ void SAL_CALL OPackageStructureCreator::convertToPackage( const OUString& aFolde UCBStorage* pUCBStorage = new UCBStorage( aContent, aFolderUrl, STREAM_READ, - sal_False, - sal_True ); + false, + true ); SotStorageRef aStorage = new SotStorage( pUCBStorage ); if ( !aTempURL.isEmpty() ) { pTempStream = new SvFileStream( aTempURL, STREAM_STD_READWRITE ); - SotStorageRef aTargetStorage = new SotStorage( sal_True, *pTempStream ); + SotStorageRef aTargetStorage = new SotStorage( true, *pTempStream ); aStorage->CopyTo( aTargetStorage ); aTargetStorage->Commit(); diff --git a/sfx2/source/bastyp/bitset.cxx b/sfx2/source/bastyp/bitset.cxx index d1d195d432b3..ca778484ebad 100644 --- a/sfx2/source/bastyp/bitset.cxx +++ b/sfx2/source/bastyp/bitset.cxx @@ -309,7 +309,7 @@ sal_uInt16 IndexBitSet::GetFreeIndex() *this|=i; return i; } - DBG_ASSERT(sal_False, "IndexBitSet enthaelt mehr als USHRT_MAX Eintraege"); + DBG_ASSERT(false, "IndexBitSet enthaelt mehr als USHRT_MAX Eintraege"); return 0; } diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx index 2e8371780b3a..a7a6bf8f1505 100644 --- a/sfx2/source/bastyp/fltfnc.cxx +++ b/sfx2/source/bastyp/fltfnc.cxx @@ -556,7 +556,7 @@ sal_uInt32 SfxFilterMatcher::DetectFilter( SfxMedium& rMedium, const SfxFilter** pOldFilter = 0; else { - SFX_ITEMSET_ARG( rMedium.GetItemSet(), pSalvageItem, SfxStringItem, SID_DOC_SALVAGE, sal_False); + SFX_ITEMSET_ARG( rMedium.GetItemSet(), pSalvageItem, SfxStringItem, SID_DOC_SALVAGE, false); if ( ( pOldFilter->GetFilterFlags() & SFX_FILTER_PACKED ) && pSalvageItem ) // Salvage is always done without packing pOldFilter = 0; @@ -566,7 +566,7 @@ sal_uInt32 SfxFilterMatcher::DetectFilter( SfxMedium& rMedium, const SfxFilter** const SfxFilter* pFilter = pOldFilter; sal_Bool bPreview = rMedium.IsPreview_Impl(); - SFX_ITEMSET_ARG(rMedium.GetItemSet(), pReferer, SfxStringItem, SID_REFERER, sal_False); + SFX_ITEMSET_ARG(rMedium.GetItemSet(), pReferer, SfxStringItem, SID_REFERER, false); if ( bPreview && rMedium.IsRemote() && ( !pReferer || !pReferer->GetValue().match("private:searchfolder:") ) ) return ERRCODE_ABORT; @@ -603,7 +603,7 @@ sal_uInt32 SfxFilterMatcher::DetectFilter( SfxMedium& rMedium, const SfxFilter** } sal_Bool bHidden = bPreview; - SFX_ITEMSET_ARG( rMedium.GetItemSet(), pFlags, SfxStringItem, SID_OPTIONS, sal_False); + SFX_ITEMSET_ARG( rMedium.GetItemSet(), pFlags, SfxStringItem, SID_OPTIONS, false); if ( !bHidden && pFlags ) { OUString aFlags( pFlags->GetValue() ); diff --git a/sfx2/source/bastyp/progress.cxx b/sfx2/source/bastyp/progress.cxx index f2c5d0cddd65..ebe147067906 100644 --- a/sfx2/source/bastyp/progress.cxx +++ b/sfx2/source/bastyp/progress.cxx @@ -320,11 +320,11 @@ sal_Bool SfxProgress::SetState { // don't show status indicator for hidden documents (only valid while loading) SfxMedium* pMedium = pObjSh->GetMedium(); - SFX_ITEMSET_ARG( pMedium->GetItemSet(), pHiddenItem, SfxBoolItem, SID_HIDDEN, sal_False ); + SFX_ITEMSET_ARG( pMedium->GetItemSet(), pHiddenItem, SfxBoolItem, SID_HIDDEN, false ); if ( !pHiddenItem || !pHiddenItem->GetValue() ) { { - SFX_ITEMSET_ARG( pMedium->GetItemSet(), pIndicatorItem, SfxUnoAnyItem, SID_PROGRESS_STATUSBAR_CONTROL, sal_False ); + SFX_ITEMSET_ARG( pMedium->GetItemSet(), pIndicatorItem, SfxUnoAnyItem, SID_PROGRESS_STATUSBAR_CONTROL, false ); Reference< XStatusIndicator > xInd; if ( pIndicatorItem && (pIndicatorItem->GetValue()>>=xInd) ) pImp->xStatusInd = xInd; diff --git a/sfx2/source/config/evntconf.cxx b/sfx2/source/config/evntconf.cxx index 06f056d28483..c70d94caf9e9 100644 --- a/sfx2/source/config/evntconf.cxx +++ b/sfx2/source/config/evntconf.cxx @@ -82,7 +82,7 @@ bool SfxEventNamesItem::operator==( const SfxPoolItem& rAttr ) const const SfxEventNamesList& rOther = ( (SfxEventNamesItem&) rAttr ).aEventsList; if ( rOwn.size() != rOther.size() ) - return sal_False; + return false; for ( size_t nNo = 0, nCnt = rOwn.size(); nNo < nCnt; ++nNo ) { @@ -91,10 +91,10 @@ bool SfxEventNamesItem::operator==( const SfxPoolItem& rAttr ) const if ( pOwn->mnId != pOther->mnId || pOwn->maEventName != pOther->maEventName || pOwn->maUIName != pOther->maUIName ) - return sal_False; + return false; } - return sal_True; + return true; } diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx index 51bebd48170e..0a007471dda1 100644 --- a/sfx2/source/control/bindings.cxx +++ b/sfx2/source/control/bindings.cxx @@ -456,7 +456,7 @@ void SfxBindings::InvalidateSlotsInMap_Impl() void SfxBindings::AddSlotToInvalidateSlotsMap_Impl( sal_uInt16 nId ) { - pImp->m_aInvalidateSlots[nId] = sal_True; + pImp->m_aInvalidateSlots[nId] = true; } //-------------------------------------------------------------------- @@ -1267,7 +1267,7 @@ void SfxBindings::Execute_Impl( SfxRequest& aReq, const SfxSlot* pSlot, SfxShell if ( pNewItem->ISA(SfxBoolItem) ) { // we can toggle Bools - ((SfxBoolItem*)pNewItem)->SetValue( sal_True ); + ((SfxBoolItem*)pNewItem)->SetValue( true ); aReq.AppendItem( *pNewItem ); } else if ( pNewItem->ISA(SfxEnumItemInterface) && diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx index 308c91dda645..830397cb696d 100644 --- a/sfx2/source/control/dispatch.cxx +++ b/sfx2/source/control/dispatch.cxx @@ -777,7 +777,7 @@ void SfxDispatcher::DoActivate_Impl( sal_Bool bMDI, SfxViewFrame* /* pOld */ ) SfxBindings *pBind = GetBindings(); while ( pBind ) { - pBind->HidePopupCtrls_Impl( sal_False ); + pBind->HidePopupCtrls_Impl( false ); pBind = pBind->GetSubBindings_Impl(); } @@ -871,7 +871,7 @@ void SfxDispatcher::DoDeactivate_Impl( sal_Bool bMDI, SfxViewFrame* pNew ) SfxBindings *pBind = GetBindings(); while ( pBind ) { - pBind->HidePopupCtrls_Impl( sal_True ); + pBind->HidePopupCtrls_Impl( true ); pBind = pBind->GetSubBindings_Impl(); } @@ -1492,7 +1492,7 @@ void SfxDispatcher::_Update_Impl( sal_Bool bUIActive, sal_Bool bIsMDIApp, sal_Bo { sal_Bool bViewerTbx = SFX_VISIBILITY_VIEWER == ( nPos & SFX_VISIBILITY_VIEWER ); SfxObjectShell* pSh = pImp->pFrame->GetObjectShell(); - SFX_ITEMSET_ARG( pSh->GetMedium()->GetItemSet(), pItem, SfxBoolItem, SID_VIEWONLY, sal_False ); + SFX_ITEMSET_ARG( pSh->GetMedium()->GetItemSet(), pItem, SfxBoolItem, SID_VIEWONLY, false ); sal_Bool bIsViewer = pItem && pItem->GetValue(); if ( bIsViewer != bViewerTbx ) continue; @@ -1665,7 +1665,7 @@ void SfxDispatcher::FlushImpl() bFound = (pPopped == i->pCluster); // Mark the moved Shell - aToDoCopy.push_front(SfxToDo_Impl(sal_False, i->bDelete, sal_False, *pPopped)); + aToDoCopy.push_front(SfxToDo_Impl(false, i->bDelete, false, *pPopped)); } while(i->bUntil && !bFound); DBG_ASSERT( bFound, "wrong SfxShell popped" ); diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx index 4bba70f389b5..eedd2d963f54 100644 --- a/sfx2/source/dialog/basedlgs.cxx +++ b/sfx2/source/dialog/basedlgs.cxx @@ -414,7 +414,7 @@ sal_Bool SfxModelessDialog::Close() { // Execute with Parameters, since Toggle is ignored by some ChildWindows. - SfxBoolItem aValue( pImp->pMgr->GetType(), sal_False); + SfxBoolItem aValue( pImp->pMgr->GetType(), false); pBindings->GetDispatcher_Impl()->Execute( pImp->pMgr->GetType(), SFX_CALLMODE_RECORD|SFX_CALLMODE_SYNCHRON, &aValue, 0L ); @@ -529,7 +529,7 @@ sal_Bool SfxFloatingWindow::Close() { // Execute with Parameters, since Toggle is ignored by some ChildWindows. - SfxBoolItem aValue( pImp->pMgr->GetType(), sal_False); + SfxBoolItem aValue( pImp->pMgr->GetType(), false); pBindings->GetDispatcher_Impl()->Execute( pImp->pMgr->GetType(), SFX_CALLMODE_RECORD|SFX_CALLMODE_SYNCHRON, &aValue, 0L ); diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index 978bde987548..57c664243f95 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -550,7 +550,7 @@ bool SfxDocumentInfoItem::QueryValue( Any& rVal, sal_uInt8 nMemberId ) const break; default: OSL_FAIL("Wrong MemberId!"); - return sal_False; + return false; } if ( bIsString ) @@ -716,7 +716,7 @@ void SfxDocumentDescPage::Reset(const SfxItemSet &rSet) m_pKeywordsEd->SetText( m_pInfoItem->getKeywords() ); m_pCommentEd->SetText( m_pInfoItem->getDescription() ); - SFX_ITEMSET_ARG( &rSet, pROItem, SfxBoolItem, SID_DOC_READONLY, sal_False ); + SFX_ITEMSET_ARG( &rSet, pROItem, SfxBoolItem, SID_DOC_READONLY, false ); if ( pROItem && pROItem->GetValue() ) { m_pTitleEd->SetReadOnly( sal_True ); @@ -906,7 +906,7 @@ void SfxDocumentPage::ImplCheckPasswordState() SfxItemSet* pMedSet = pShell->GetMedium()->GetItemSet(); if (!pMedSet) break; - SFX_ITEMSET_ARG( pMedSet, pEncryptionDataItem, SfxUnoAnyItem, SID_ENCRYPTIONDATA, sal_False); + SFX_ITEMSET_ARG( pMedSet, pEncryptionDataItem, SfxUnoAnyItem, SID_ENCRYPTIONDATA, false); uno::Sequence< beans::NamedValue > aEncryptionData; if (pEncryptionDataItem) pEncryptionDataItem->GetValue() >>= aEncryptionData; @@ -988,7 +988,7 @@ sal_Bool SfxDocumentPage::FillItemSet( SfxItemSet& rSet ) bRet = sal_True; } - if ( /* m_pReadOnlyCB->IsModified() */ sal_True ) + if ( /* m_pReadOnlyCB->IsModified() */ true ) { rSet.Put( SfxBoolItem( ID_FILETP_READONLY, m_pReadOnlyCB->IsChecked() ) ); bRet = sal_True; @@ -1137,7 +1137,7 @@ SfxDocumentInfoDialog::SfxDocumentInfoDialog( Window* pParent, &(const SfxDocumentInfoItem &)rItemSet.Get( SID_DOCINFO ); #ifdef DBG_UTIL - SFX_ITEMSET_ARG( &rItemSet, pURLItem, SfxStringItem, SID_BASEURL, sal_False ); + SFX_ITEMSET_ARG( &rItemSet, pURLItem, SfxStringItem, SID_BASEURL, false ); DBG_ASSERT( pURLItem, "No BaseURL provided for InternetTabPage!" ); #endif diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx index 823be0b97675..4c9670197718 100644 --- a/sfx2/source/dialog/dockwin.cxx +++ b/sfx2/source/dialog/dockwin.cxx @@ -790,7 +790,7 @@ void SfxDockingWindow::EndDocking( const Rectangle& rRect, sal_Bool bFloatMode ) // before Show() is called must the reassignment have been made, // therefore the base class can not be called if ( IsFloatingMode() || !pImp->bSplitable ) - Show( sal_False, SHOW_NOFOCUSCHANGE ); + Show( false, SHOW_NOFOCUSCHANGE ); // Set the size for toggling. pImp->aSplitSize = rRect.GetSize(); @@ -798,7 +798,7 @@ void SfxDockingWindow::EndDocking( const Rectangle& rRect, sal_Bool bFloatMode ) { SetFloatingMode( bFloatMode ); if ( IsFloatingMode() || !pImp->bSplitable ) - Show( sal_True, SHOW_NOFOCUSCHANGE ); + Show( true, SHOW_NOFOCUSCHANGE ); } else { @@ -1681,7 +1681,7 @@ sal_Bool SfxDockingWindow::Close() if ( !pMgr ) return sal_True; - SfxBoolItem aValue( pMgr->GetType(), sal_False); + SfxBoolItem aValue( pMgr->GetType(), false); pBindings->GetDispatcher_Impl()->Execute( pMgr->GetType(), SFX_CALLMODE_RECORD | SFX_CALLMODE_ASYNCHRON, &aValue, 0L ); return sal_True; diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index c8178a4420f6..444ef133c8c9 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -880,24 +880,24 @@ FileDialogHelper_Impl::FileDialogHelper_Impl( mpPreferredParentWindow = _pPreferredParentWindow; mpAntiImpl = _pAntiImpl; mnError = ERRCODE_NONE; - mbHasAutoExt = sal_False; - mbHasPassword = sal_False; - m_bHaveFilterOptions = sal_False; - mbIsPwdEnabled = sal_True; - mbHasVersions = sal_False; - mbHasPreview = sal_False; - mbShowPreview = sal_False; + mbHasAutoExt = false; + mbHasPassword = false; + m_bHaveFilterOptions = false; + mbIsPwdEnabled = true; + mbHasVersions = false; + mbHasPreview = false; + mbShowPreview = false; mbAddGraphicFilter = SFXWB_GRAPHIC == (nFlags & SFXWB_GRAPHIC); - mbDeleteMatcher = sal_False; + mbDeleteMatcher = false; mbInsert = SFXWB_INSERT == ( nFlags & SFXWB_INSERT ); mbExport = SFXWB_EXPORT == ( nFlags & SFXWB_EXPORT ); - mbIsSaveDlg = sal_False; + mbIsSaveDlg = false; mbIsSaveACopyDlg = SFXWB_SAVEACOPY == ( nFlags & SFXWB_SAVEACOPY ); - mbPwdCheckBoxState = sal_False; - mbSelection = sal_False; - mbSelectionEnabled = sal_True; - mbHasSelectionBox = sal_False; - mbSelectionFltrEnabled = sal_False; + mbPwdCheckBoxState = false; + mbSelection = false; + mbSelectionEnabled = true; + mbHasSelectionBox = false; + mbSelectionFltrEnabled = false; // default settings m_nDontFlags = SFX_FILTER_INTERNAL | SFX_FILTER_NOTINFILEDLG | SFX_FILTER_NOTINSTALLED; @@ -937,21 +937,21 @@ FileDialogHelper_Impl::FileDialogHelper_Impl( case FILESAVE_SIMPLE: nTemplateDescription = TemplateDescription::FILESAVE_SIMPLE; - mbIsSaveDlg = sal_True; + mbIsSaveDlg = true; break; case FILESAVE_AUTOEXTENSION_PASSWORD: nTemplateDescription = TemplateDescription::FILESAVE_AUTOEXTENSION_PASSWORD; - mbHasPassword = sal_True; - mbHasAutoExt = sal_True; - mbIsSaveDlg = sal_True; + mbHasPassword = true; + mbHasAutoExt = true; + mbIsSaveDlg = true; break; case FILESAVE_AUTOEXTENSION_PASSWORD_FILTEROPTIONS: nTemplateDescription = TemplateDescription::FILESAVE_AUTOEXTENSION_PASSWORD_FILTEROPTIONS; - mbHasPassword = sal_True; + mbHasPassword = true; - m_bHaveFilterOptions = sal_True; + m_bHaveFilterOptions = true; if( xFactory.is() ) { mxFilterCFG = uno::Reference< XNameAccess >( @@ -959,15 +959,15 @@ FileDialogHelper_Impl::FileDialogHelper_Impl( UNO_QUERY ); } - mbHasAutoExt = sal_True; - mbIsSaveDlg = sal_True; + mbHasAutoExt = true; + mbIsSaveDlg = true; break; case FILESAVE_AUTOEXTENSION_SELECTION: nTemplateDescription = TemplateDescription::FILESAVE_AUTOEXTENSION_SELECTION; - mbHasAutoExt = sal_True; - mbIsSaveDlg = sal_True; - mbHasSelectionBox = sal_True; + mbHasAutoExt = true; + mbIsSaveDlg = true; + mbHasSelectionBox = true; if ( mbExport && !mxFilterCFG.is() && xFactory.is() ) { mxFilterCFG = uno::Reference< XNameAccess >( @@ -978,13 +978,13 @@ FileDialogHelper_Impl::FileDialogHelper_Impl( case FILESAVE_AUTOEXTENSION_TEMPLATE: nTemplateDescription = TemplateDescription::FILESAVE_AUTOEXTENSION_TEMPLATE; - mbHasAutoExt = sal_True; - mbIsSaveDlg = sal_True; + mbHasAutoExt = true; + mbIsSaveDlg = true; break; case FILEOPEN_LINK_PREVIEW_IMAGE_TEMPLATE: nTemplateDescription = TemplateDescription::FILEOPEN_LINK_PREVIEW_IMAGE_TEMPLATE; - mbHasPreview = sal_True; + mbHasPreview = true; // aPreviewTimer maPreviewTimer.SetTimeout( 500 ); @@ -997,12 +997,12 @@ FileDialogHelper_Impl::FileDialogHelper_Impl( case FILEOPEN_READONLY_VERSION: nTemplateDescription = TemplateDescription::FILEOPEN_READONLY_VERSION; - mbHasVersions = sal_True; + mbHasVersions = true; break; case FILEOPEN_LINK_PREVIEW: nTemplateDescription = TemplateDescription::FILEOPEN_LINK_PREVIEW; - mbHasPreview = sal_True; + mbHasPreview = true; // aPreviewTimer maPreviewTimer.SetTimeout( 500 ); maPreviewTimer.SetTimeoutHdl( LINK( this, FileDialogHelper_Impl, TimeOutHdl_Impl ) ); @@ -1010,8 +1010,8 @@ FileDialogHelper_Impl::FileDialogHelper_Impl( case FILESAVE_AUTOEXTENSION: nTemplateDescription = TemplateDescription::FILESAVE_AUTOEXTENSION; - mbHasAutoExt = sal_True; - mbIsSaveDlg = sal_True; + mbHasAutoExt = true; + mbIsSaveDlg = true; break; default: @@ -1408,19 +1408,19 @@ ErrCode FileDialogHelper_Impl::execute( std::vector<OUString>& rpURLList, // check password checkbox if the document had password before if( mbHasPassword ) { - SFX_ITEMSET_ARG( rpSet, pPassItem, SfxBoolItem, SID_PASSWORDINTERACTION, sal_False ); + SFX_ITEMSET_ARG( rpSet, pPassItem, SfxBoolItem, SID_PASSWORDINTERACTION, false ); mbPwdCheckBoxState = ( pPassItem != NULL && pPassItem->GetValue() ); // in case the document has password to modify, the dialog should be shown - SFX_ITEMSET_ARG( rpSet, pPassToModifyItem, SfxUnoAnyItem, SID_MODIFYPASSWORDINFO, sal_False ); + SFX_ITEMSET_ARG( rpSet, pPassToModifyItem, SfxUnoAnyItem, SID_MODIFYPASSWORDINFO, false ); mbPwdCheckBoxState |= ( pPassToModifyItem && pPassToModifyItem->GetValue().hasValue() ); } - SFX_ITEMSET_ARG( rpSet, pSelectItem, SfxBoolItem, SID_SELECTION, sal_False ); + SFX_ITEMSET_ARG( rpSet, pSelectItem, SfxBoolItem, SID_SELECTION, false ); if ( pSelectItem ) mbSelection = pSelectItem->GetValue(); else - mbSelectionEnabled = sal_False; + mbSelectionEnabled = false; // the password will be set in case user decide so rpSet->ClearItem( SID_PASSWORDINTERACTION ); @@ -1470,7 +1470,7 @@ ErrCode FileDialogHelper_Impl::execute( std::vector<OUString>& rpURLList, // set the read-only flag. When inserting a file, this flag is always set if ( mbInsert ) - rpSet->Put( SfxBoolItem( SID_DOC_READONLY, sal_True ) ); + rpSet->Put( SfxBoolItem( SID_DOC_READONLY, true ) ); else { if ( ( FILEOPEN_READONLY_VERSION == m_nDialogType ) && xCtrlAccess.is() ) @@ -1722,7 +1722,7 @@ void FileDialogHelper_Impl::createMatcher( const OUString& rFactory ) delete mpMatcher; mpMatcher = new SfxFilterMatcher( SfxObjectShell::GetServiceNameFromFactory(rFactory) ); - mbDeleteMatcher = sal_True; + mbDeleteMatcher = true; } void FileDialogHelper_Impl::addFilters( const OUString& rFactory, @@ -1742,12 +1742,12 @@ void FileDialogHelper_Impl::addFilters( const OUString& rFactory, { SfxApplication *pSfxApp = SFX_APP(); mpMatcher = &pSfxApp->GetFilterMatcher(); - mbDeleteMatcher = sal_False; + mbDeleteMatcher = false; } else { mpMatcher = new SfxFilterMatcher( rFactory ); - mbDeleteMatcher = sal_True; + mbDeleteMatcher = true; } uno::Reference< XMultiServiceFactory > xSMGR = ::comphelper::getProcessServiceFactory(); @@ -2693,7 +2693,7 @@ ErrCode RequestPassword(const SfxFilter* pCurrentFilter, OUString& aURL, SfxItem } if ( pPasswordRequest->getRecommendReadOnly() ) - pSet->Put( SfxBoolItem( SID_RECOMMENDREADONLY, sal_True ) ); + pSet->Put( SfxBoolItem( SID_RECOMMENDREADONLY, true ) ); if ( bMSType ) { diff --git a/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx index f457753f574b..8e2110a24e08 100644 --- a/sfx2/source/dialog/mailmodel.cxx +++ b/sfx2/source/dialog/mailmodel.cxx @@ -119,7 +119,7 @@ void PrepareListener_Impl::statusChanged(const css::frame::FeatureStateEvent& rE if( rEvent.IsEnabled ) rEvent.State >>= m_bState; else - m_bState = sal_False; + m_bState = false; } void PrepareListener_Impl::disposing(const css::lang::EventObject& /*rEvent*/) throw(css::uno::RuntimeException) @@ -507,7 +507,7 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat( // This makes it possible to store the file for "send document as e-mail" // with the original file name. We cannot use the original file as // some mail programs need exclusive access. - ::utl::TempFile aTempDir( NULL, sal_True ); + ::utl::TempFile aTempDir( NULL, true ); INetURLObject aFilePathObj( aTempDir.GetURL() ); aFilePathObj.insertName( aFileName ); diff --git a/sfx2/source/dialog/recfloat.cxx b/sfx2/source/dialog/recfloat.cxx index d943ddc51972..b60e37848f4d 100644 --- a/sfx2/source/dialog/recfloat.cxx +++ b/sfx2/source/dialog/recfloat.cxx @@ -139,7 +139,7 @@ SfxRecordingFloatWrapper_Impl::SfxRecordingFloatWrapper_Impl( Window* pParentWnd SfxRecordingFloatWrapper_Impl::~SfxRecordingFloatWrapper_Impl() { - SfxBoolItem aItem( FN_PARAM_1, sal_True ); + SfxBoolItem aItem( FN_PARAM_1, true ); com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder > xRecorder = pBindings->GetRecorder(); if ( xRecorder.is() ) pBindings->GetDispatcher()->Execute( SID_STOP_RECORDING, SFX_CALLMODE_SYNCHRON, &aItem, 0L ); @@ -197,7 +197,7 @@ SfxRecordingFloat_Impl::SfxRecordingFloat_Impl( aTbx.SetSelectHdl( LINK( this, SfxRecordingFloat_Impl, Select ) ); // start recording - SfxBoolItem aItem( SID_RECORDMACRO, sal_True ); + SfxBoolItem aItem( SID_RECORDMACRO, true ); GetBindings().GetDispatcher()->Execute( SID_RECORDMACRO, SFX_CALLMODE_SYNCHRON, &aItem, 0L ); } diff --git a/sfx2/source/dialog/srchdlg.cxx b/sfx2/source/dialog/srchdlg.cxx index 3c14275d705e..6fe71ea9cfe0 100644 --- a/sfx2/source/dialog/srchdlg.cxx +++ b/sfx2/source/dialog/srchdlg.cxx @@ -152,7 +152,7 @@ void SearchDialog::StateChanged( StateChangedType nStateChange ) { if (!m_sWinState.isEmpty()) SetWindowState( m_sWinState ); - m_bIsConstructed = sal_True; + m_bIsConstructed = true; } ModelessDialog::StateChanged( nStateChange ); diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index 6bfc27fa9181..f0ac157d2eed 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -373,7 +373,7 @@ const SfxPoolItem* SfxTabPage::GetOldItem( const SfxItemSet& rSet, void SfxTabPage::PageCreated( SfxAllItemSet /*aSet*/ ) { - DBG_ASSERT(0, "SfxTabPage::PageCreated should not be called"); + DBG_ASSERT(false, "SfxTabPage::PageCreated should not be called"); } // ----------------------------------------------------------------------- diff --git a/sfx2/source/dialog/taskpane.cxx b/sfx2/source/dialog/taskpane.cxx index 9ac3dbf9709e..0892b06d17e4 100644 --- a/sfx2/source/dialog/taskpane.cxx +++ b/sfx2/source/dialog/taskpane.cxx @@ -176,7 +176,7 @@ namespace sfx2 aCommandName.append( sImageURL.copy( nCommandImagePrefixLen ) ); const OUString sCommandName( aCommandName.makeStringAndClear() ); - const Image aPanelImage( GetImage( i_rDocFrame, sCommandName, sal_False ) ); + const Image aPanelImage( GetImage( i_rDocFrame, sCommandName, false ) ); return aPanelImage; } diff --git a/sfx2/source/dialog/titledockwin.cxx b/sfx2/source/dialog/titledockwin.cxx index d01f69d208ee..1dc45b033f7c 100644 --- a/sfx2/source/dialog/titledockwin.cxx +++ b/sfx2/source/dialog/titledockwin.cxx @@ -265,7 +265,7 @@ namespace sfx2 // the closer EndTracking(); const sal_uInt16 nChildWindowId( GetChildWindow_Impl()->GetType() ); - const SfxBoolItem aVisibility( nChildWindowId, sal_False ); + const SfxBoolItem aVisibility( nChildWindowId, false ); GetBindings().GetDispatcher()->Execute( nChildWindowId, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx index 46f28a6aa5cc..c90207f4f520 100644 --- a/sfx2/source/dialog/versdlg.cxx +++ b/sfx2/source/dialog/versdlg.cxx @@ -471,8 +471,8 @@ IMPL_LINK( SfxVersionDialog, ButtonHdl_Impl, Button*, pButton ) aSet.Put( SfxStringItem( SID_FILE_NAME, pObjShell->GetMedium()->GetName() ) ); SfxItemSet* pSet = pObjShell->GetMedium()->GetItemSet(); - SFX_ITEMSET_ARG( pSet, pFilterItem, SfxStringItem, SID_FILTER_NAME, sal_False ); - SFX_ITEMSET_ARG( pSet, pFilterOptItem, SfxStringItem, SID_FILE_FILTEROPTIONS, sal_False ); + SFX_ITEMSET_ARG( pSet, pFilterItem, SfxStringItem, SID_FILTER_NAME, false ); + SFX_ITEMSET_ARG( pSet, pFilterOptItem, SfxStringItem, SID_FILE_FILTEROPTIONS, false ); if ( pFilterItem ) aSet.Put( *pFilterItem ); if ( pFilterOptItem ) diff --git a/sfx2/source/doc/docinsert.cxx b/sfx2/source/doc/docinsert.cxx index dddca2275750..0b226d33ac56 100644 --- a/sfx2/source/doc/docinsert.cxx +++ b/sfx2/source/doc/docinsert.cxx @@ -228,7 +228,7 @@ IMPL_LINK_NOARG(DocumentInserter, DialogClosedHdl) // set the read-only flag. When inserting a file, this flag is always set if ( SFXWB_INSERT == ( m_nDlgFlags & SFXWB_INSERT ) ) - m_pItemSet->Put( SfxBoolItem( SID_DOC_READONLY, sal_True ) ); + m_pItemSet->Put( SfxBoolItem( SID_DOC_READONLY, true ) ); else { if ( ( TemplateDescription::FILEOPEN_READONLY_VERSION == nDlgType ) ) diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx index dd8f8afe562f..97d66c4e3c82 100644 --- a/sfx2/source/doc/doctempl.cxx +++ b/sfx2/source/doc/doctempl.cxx @@ -908,12 +908,12 @@ sal_Bool SfxDocumentTemplates::CopyFrom } else { - DBG_ASSERT( sal_False, "CopyFrom(): The content should contain target URL!" ); + DBG_ASSERT( false, "CopyFrom(): The content should contain target URL!" ); } } else { - DBG_ASSERT( sal_False, "CopyFrom(): The content just was created!" ); + DBG_ASSERT( false, "CopyFrom(): The content just was created!" ); } } diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx index 9a8d84ba04b5..effac011e496 100644 --- a/sfx2/source/doc/guisaveas.cxx +++ b/sfx2/source/doc/guisaveas.cxx @@ -137,7 +137,7 @@ static sal_uInt16 getSlotIDFromMode( sal_Int8 nStoreMode ) else if ( nStoreMode == SAVEAS_REQUESTED || nStoreMode == ( EXPORT_REQUESTED | WIDEEXPORT_REQUESTED ) ) nResult = SID_SAVEASDOC; else { - DBG_ASSERT( sal_False, "Unacceptable slot name is provided!\n" ); + DBG_ASSERT( false, "Unacceptable slot name is provided!\n" ); } return nResult; @@ -1057,7 +1057,7 @@ sal_Bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode, { // the file dialog preselects the password checkbox if the provided mediadescriptor has encryption data entry // after dialog execution the password interaction flag will be either removed or not - aDialogParams.Put( SfxBoolItem( SID_PASSWORDINTERACTION, sal_True ) ); + aDialogParams.Put( SfxBoolItem( SID_PASSWORDINTERACTION, true ) ); } // aStringTypeFN is a pure output parameter, pDialogParams is an in/out parameter @@ -1073,7 +1073,7 @@ sal_Bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode, // the following two arguments can not be converted in MediaDescriptor, // so they should be removed from the ItemSet after retrieving - SFX_ITEMSET_ARG( pDialogParams, pRecommendReadOnly, SfxBoolItem, SID_RECOMMENDREADONLY, sal_False ); + SFX_ITEMSET_ARG( pDialogParams, pRecommendReadOnly, SfxBoolItem, SID_RECOMMENDREADONLY, false ); m_bRecommendReadOnly = ( pRecommendReadOnly && pRecommendReadOnly->GetValue() ); pDialogParams->ClearItem( SID_RECOMMENDREADONLY ); @@ -1625,7 +1625,7 @@ sal_Bool SfxStoringHelper::GUIStoreModel( uno::Reference< frame::XModel > xModel } else { - DBG_ASSERT( sal_False, "This code must be unreachable!\n" ); + DBG_ASSERT( false, "This code must be unreachable!\n" ); throw task::ErrorCodeIOException( "SfxStoringHelper::GUIStoreModel: ERRCODE_IO_INVALIDPARAMETER", uno::Reference< uno::XInterface >(), ERRCODE_IO_INVALIDPARAMETER); diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx index 3a035bc8e646..efb8bc5eb099 100644 --- a/sfx2/source/doc/new.cxx +++ b/sfx2/source/doc/new.cxx @@ -255,8 +255,8 @@ IMPL_LINK_NOARG(SfxNewFileDialog_Impl, Update) SfxApplication *pSfxApp = SFX_APP(); sal_uIntPtr lErr; SfxItemSet* pSet = new SfxAllItemSet( pSfxApp->GetPool() ); - pSet->Put( SfxBoolItem( SID_TEMPLATE, sal_True ) ); - pSet->Put( SfxBoolItem( SID_PREVIEW, sal_True ) ); + pSet->Put( SfxBoolItem( SID_TEMPLATE, true ) ); + pSet->Put( SfxBoolItem( SID_PREVIEW, true ) ); lErr = pSfxApp->LoadTemplate( xDocShell, aFileName, sal_True, pSet ); if( lErr ) ErrorHandler::HandleError(lErr); diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx index b05698b7ae77..46efe15b8931 100644 --- a/sfx2/source/doc/objcont.cxx +++ b/sfx2/source/doc/objcont.cxx @@ -103,7 +103,7 @@ bool operator> (const util::DateTime& i_rLeft, const util::DateTime& i_rRight) if ( i_rLeft.NanoSeconds != i_rRight.NanoSeconds ) return i_rLeft.NanoSeconds > i_rRight.NanoSeconds; - return sal_False; + return false; } ::boost::shared_ptr<GDIMetaFile> @@ -389,7 +389,7 @@ void SfxObjectShell::UpdateFromTemplate_Impl( ) if ( !pFile->GetFilter() || !pFile->GetFilter()->IsOwnFormat() ) return; - SFX_ITEMSET_ARG( pFile->GetItemSet(), pUpdateDocItem, SfxUInt16Item, SID_UPDATEDOCMODE, sal_False); + SFX_ITEMSET_ARG( pFile->GetItemSet(), pUpdateDocItem, SfxUInt16Item, SID_UPDATEDOCMODE, false); sal_Int16 bCanUpdateFromTemplate = pUpdateDocItem ? pUpdateDocItem->GetValue() : document::UpdateDocMode::NO_UPDATE; // created from template? diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index 357ebe6f6c71..6a149c0ac4e8 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -437,7 +437,7 @@ void SfxObjectShell::SetReadOnly() pMedium->CloseInStream(); pMedium->SetOpenMode( SFX_STREAM_READONLY, sal_True ); - pMedium->GetItemSet()->Put( SfxBoolItem( SID_DOC_READONLY, sal_True ) ); + pMedium->GetItemSet()->Put( SfxBoolItem( SID_DOC_READONLY, true ) ); if ( !bWasROUI ) Broadcast( SfxSimpleHint(SFX_HINT_MODECHANGED) ); @@ -825,7 +825,7 @@ OUString SfxObjectShell::GetTitle if ( pMed ) { - SFX_ITEMSET_ARG( pMed->GetItemSet(), pNameItem, SfxStringItem, SID_DOCINFO_TITLE, sal_False ); + SFX_ITEMSET_ARG( pMed->GetItemSet(), pNameItem, SfxStringItem, SID_DOCINFO_TITLE, false ); if ( pNameItem ) aTitle = pNameItem->GetValue(); } @@ -852,7 +852,7 @@ OUString SfxObjectShell::GetTitle // If a specific title was given at open: // important for URLs: use INET_PROT_FILE for which the set title is not // considered. (See below, analysis of aTitleMap_Impl) - SFX_ITEMSET_ARG( pMed->GetItemSet(), pNameItem, SfxStringItem, SID_DOCINFO_TITLE, sal_False ); + SFX_ITEMSET_ARG( pMed->GetItemSet(), pNameItem, SfxStringItem, SID_DOCINFO_TITLE, false ); if ( pNameItem ) return X( pNameItem->GetValue() ); } @@ -1015,15 +1015,15 @@ void SfxObjectShell::PostActivateEvent_Impl( SfxViewFrame* pFrame ) SfxApplication* pSfxApp = SFX_APP(); if ( !pSfxApp->IsDowning() && !IsLoading() && pFrame && !pFrame->GetFrame().IsClosing_Impl() ) { - SFX_ITEMSET_ARG( pMedium->GetItemSet(), pHiddenItem, SfxBoolItem, SID_HIDDEN, sal_False ); + SFX_ITEMSET_ARG( pMedium->GetItemSet(), pHiddenItem, SfxBoolItem, SID_HIDDEN, false ); if ( !pHiddenItem || !pHiddenItem->GetValue() ) { sal_uInt16 nId = pImp->nEventId; pImp->nEventId = 0; if ( nId == SFX_EVENT_OPENDOC ) - pSfxApp->NotifyEvent(SfxViewEventHint( nId, GlobalEventConfig::GetEventName(STR_EVENT_OPENDOC), this, pFrame->GetFrame().GetController() ), sal_False); + pSfxApp->NotifyEvent(SfxViewEventHint( nId, GlobalEventConfig::GetEventName(STR_EVENT_OPENDOC), this, pFrame->GetFrame().GetController() ), false); else if (nId == SFX_EVENT_CREATEDOC ) - pSfxApp->NotifyEvent(SfxViewEventHint( nId, GlobalEventConfig::GetEventName(STR_EVENT_CREATEDOC), this, pFrame->GetFrame().GetController() ), sal_False); + pSfxApp->NotifyEvent(SfxViewEventHint( nId, GlobalEventConfig::GetEventName(STR_EVENT_CREATEDOC), this, pFrame->GetFrame().GetController() ), false); } } } @@ -1154,7 +1154,7 @@ void SfxObjectShell::InitOwnModel_Impl() { if ( !pImp->bModelInitialized ) { - SFX_ITEMSET_ARG( pMedium->GetItemSet(), pSalvageItem, SfxStringItem, SID_DOC_SALVAGE, sal_False); + SFX_ITEMSET_ARG( pMedium->GetItemSet(), pSalvageItem, SfxStringItem, SID_DOC_SALVAGE, false); if ( pSalvageItem ) { pImp->aTempName = pMedium->GetPhysicalName(); @@ -1189,7 +1189,7 @@ void SfxObjectShell::InitOwnModel_Impl() void SfxObjectShell::FinishedLoading( sal_uInt16 nFlags ) { sal_Bool bSetModifiedTRUE = sal_False; - SFX_ITEMSET_ARG( pMedium->GetItemSet(), pSalvageItem, SfxStringItem, SID_DOC_SALVAGE, sal_False ); + SFX_ITEMSET_ARG( pMedium->GetItemSet(), pSalvageItem, SfxStringItem, SID_DOC_SALVAGE, false ); if( ( nFlags & SFX_LOADED_MAINDOCUMENT ) && !(pImp->nLoadedFlags & SFX_LOADED_MAINDOCUMENT ) && !(pImp->nFlagsInProgress & SFX_LOADED_MAINDOCUMENT )) { @@ -1250,7 +1250,7 @@ void SfxObjectShell::FinishedLoading( sal_uInt16 nFlags ) if ( (pImp->nLoadedFlags & SFX_LOADED_MAINDOCUMENT ) && (pImp->nLoadedFlags & SFX_LOADED_IMAGES ) ) { - SFX_ITEMSET_ARG( pMedium->GetItemSet(), pTemplateItem, SfxBoolItem, SID_TEMPLATE, sal_False); + SFX_ITEMSET_ARG( pMedium->GetItemSet(), pTemplateItem, SfxBoolItem, SID_TEMPLATE, false); sal_Bool bTemplate = pTemplateItem && pTemplateItem->GetValue(); // closing the streams on loading should be under control of SFX! @@ -1290,7 +1290,7 @@ void SfxObjectShell::TemplateDisconnectionAfterLoad() if ( pTmpMedium ) { OUString aName( pTmpMedium->GetName() ); - SFX_ITEMSET_ARG( pTmpMedium->GetItemSet(), pTemplNamItem, SfxStringItem, SID_TEMPLATE_NAME, sal_False); + SFX_ITEMSET_ARG( pTmpMedium->GetItemSet(), pTemplNamItem, SfxStringItem, SID_TEMPLATE_NAME, false); OUString aTemplateName; if ( pTemplNamItem ) aTemplateName = pTemplNamItem->GetValue(); @@ -1336,7 +1336,7 @@ void SfxObjectShell::TemplateDisconnectionAfterLoad() assert(pMedium != 0); if( ok ) { - SFX_ITEMSET_ARG( pMedium->GetItemSet(), pSalvageItem, SfxStringItem, SID_DOC_SALVAGE, sal_False ); + SFX_ITEMSET_ARG( pMedium->GetItemSet(), pSalvageItem, SfxStringItem, SID_DOC_SALVAGE, false ); sal_Bool bSalvage = pSalvageItem ? sal_True : sal_False; if ( !bSalvage ) @@ -1381,7 +1381,7 @@ void SfxObjectShell::PositionView_Impl() { SfxViewShell* pSh = pMark->pFrame->GetViewShell(); if( !pMark->aUserData.isEmpty() ) - pSh->ReadUserData( pMark->aUserData, sal_True ); + pSh->ReadUserData( pMark->aUserData, true ); else if( !pMark->aMark.isEmpty() ) pSh->JumpToMark( pMark->aMark ); DELETEZ( Get_Impl()->pMarkData ); @@ -1442,7 +1442,7 @@ void AutoReloadTimer_Impl::Timeout() } SfxAllItemSet aSet( SFX_APP()->GetPool() ); - aSet.Put( SfxBoolItem( SID_AUTOLOAD, sal_True ) ); + aSet.Put( SfxBoolItem( SID_AUTOLOAD, true ) ); if ( !aUrl.isEmpty() ) aSet.Put( SfxStringItem( SID_FILE_NAME, aUrl ) ); if (pObjSh->HasName()) { @@ -1555,7 +1555,7 @@ ErrCode SfxObjectShell::CallXScript( const Reference< XInterface >& _rxScriptCon catch ( const uno::Exception& ) { aException = ::cppu::getCaughtException(); - bCaughtException = sal_True; + bCaughtException = true; nErr = ERRCODE_BASIC_INTERNAL_ERROR; } @@ -1685,7 +1685,7 @@ sal_Bool SfxObjectShell::IsPreview() const return sal_False; sal_Bool bPreview = sal_False; - SFX_ITEMSET_ARG( pMedium->GetItemSet(), pFlags, SfxStringItem, SID_OPTIONS, sal_False); + SFX_ITEMSET_ARG( pMedium->GetItemSet(), pFlags, SfxStringItem, SID_OPTIONS, false); if ( pFlags ) { // Distributed values among individual items @@ -1697,7 +1697,7 @@ sal_Bool SfxObjectShell::IsPreview() const if ( !bPreview ) { - SFX_ITEMSET_ARG( pMedium->GetItemSet(), pItem, SfxBoolItem, SID_PREVIEW, sal_False); + SFX_ITEMSET_ARG( pMedium->GetItemSet(), pItem, SfxBoolItem, SID_PREVIEW, false); if ( pItem ) bPreview = pItem->GetValue(); } @@ -1750,7 +1750,7 @@ Window* SfxObjectShell::GetDialogParent( SfxMedium* pLoadingMedium ) { Window* pWindow = 0; SfxItemSet* pSet = pLoadingMedium ? pLoadingMedium->GetItemSet() : GetMedium()->GetItemSet(); - SFX_ITEMSET_ARG( pSet, pUnoItem, SfxUnoFrameItem, SID_FILLFRAME, sal_False ); + SFX_ITEMSET_ARG( pSet, pUnoItem, SfxUnoFrameItem, SID_FILLFRAME, false ); if ( pUnoItem ) { uno::Reference < frame::XFrame > xFrame( pUnoItem->GetFrame() ); @@ -1760,7 +1760,7 @@ Window* SfxObjectShell::GetDialogParent( SfxMedium* pLoadingMedium ) if ( !pWindow ) { SfxFrame* pFrame = 0; - SFX_ITEMSET_ARG( pSet, pFrameItem, SfxFrameItem, SID_DOCFRAME, sal_False ); + SFX_ITEMSET_ARG( pSet, pFrameItem, SfxFrameItem, SID_DOCFRAME, false ); if( pFrameItem && pFrameItem->GetFrame() ) // get target frame from ItemSet pFrame = pFrameItem->GetFrame(); @@ -1783,7 +1783,7 @@ Window* SfxObjectShell::GetDialogParent( SfxMedium* pLoadingMedium ) if ( pWindow ) { // this frame may be invisible, show it if it is allowed - SFX_ITEMSET_ARG( pSet, pHiddenItem, SfxBoolItem, SID_HIDDEN, sal_False ); + SFX_ITEMSET_ARG( pSet, pHiddenItem, SfxBoolItem, SID_HIDDEN, false ); if ( !pHiddenItem || !pHiddenItem->GetValue() ) { pWindow->Show(); @@ -1865,7 +1865,7 @@ sal_Int16 SfxObjectShell_Impl::getCurrentMacroExecMode() const OSL_PRECOND( pMedium, "SfxObjectShell_Impl::getCurrentMacroExecMode: no medium!" ); if ( pMedium ) { - SFX_ITEMSET_ARG( pMedium->GetItemSet(), pMacroModeItem, SfxUInt16Item, SID_MACROEXECMODE, sal_False); + SFX_ITEMSET_ARG( pMedium->GetItemSet(), pMacroModeItem, SfxUInt16Item, SID_MACROEXECMODE, false); if ( pMacroModeItem ) nImposedExecMode = pMacroModeItem->GetValue(); } diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx index fb292278b131..988fc98e3309 100644 --- a/sfx2/source/doc/objserv.cxx +++ b/sfx2/source/doc/objserv.cxx @@ -297,14 +297,14 @@ sal_Bool SfxObjectShell::APISaveAs_Impl if ( GetMedium() ) { OUString aFilterName; - SFX_ITEMSET_ARG( aParams, pFilterNameItem, SfxStringItem, SID_FILTER_NAME, sal_False ); + SFX_ITEMSET_ARG( aParams, pFilterNameItem, SfxStringItem, SID_FILTER_NAME, false ); if( pFilterNameItem ) { aFilterName = pFilterNameItem->GetValue(); } else { - SFX_ITEMSET_ARG( aParams, pContentTypeItem, SfxStringItem, SID_CONTENTTYPE, sal_False ); + SFX_ITEMSET_ARG( aParams, pContentTypeItem, SfxStringItem, SID_CONTENTTYPE, false ); if ( pContentTypeItem ) { const SfxFilter* pFilter = SfxFilterMatcher( OUString::createFromAscii(GetFactory().GetShortName()) ).GetFilter4Mime( pContentTypeItem->GetValue(), SFX_FILTER_EXPORT ); @@ -330,7 +330,7 @@ sal_Bool SfxObjectShell::APISaveAs_Impl SfxObjectShellRef xLock( this ); // ??? // use the title that is provided in the media descriptor - SFX_ITEMSET_ARG( aParams, pDocTitleItem, SfxStringItem, SID_DOCINFO_TITLE, sal_False ); + SFX_ITEMSET_ARG( aParams, pDocTitleItem, SfxStringItem, SID_DOCINFO_TITLE, false ); if ( pDocTitleItem ) getDocProperties()->setTitle( pDocTitleItem->GetValue() ); @@ -476,7 +476,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - case SID_DOCINFO: { - SFX_REQUEST_ARG(rReq, pDocInfItem, SfxDocumentInfoItem, SID_DOCINFO, sal_False); + SFX_REQUEST_ARG(rReq, pDocInfItem, SfxDocumentInfoItem, SID_DOCINFO, false); if ( pDocInfItem ) { // parameter, e.g. from replayed macro @@ -487,7 +487,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) { // no argument containing DocInfo; check optional arguments sal_Bool bReadOnly = IsReadOnly(); - SFX_REQUEST_ARG(rReq, pROItem, SfxBoolItem, SID_DOC_READONLY, sal_False); + SFX_REQUEST_ARG(rReq, pROItem, SfxBoolItem, SID_DOC_READONLY, false); if ( pROItem ) // override readonly attribute of document // e.g. if a readonly document is saved elsewhere and user asks for editing DocInfo before @@ -529,7 +529,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) SfxDocumentInfoDialog *pDlg = CreateDocumentInfoDialog(0, aSet); if ( RET_OK == pDlg->Execute() ) { - SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pDocInfoItem, SfxDocumentInfoItem, SID_DOCINFO, sal_False); + SFX_ITEMSET_ARG( pDlg->GetOutputItemSet(), pDocInfoItem, SfxDocumentInfoItem, SID_DOCINFO, false); if ( pDocInfoItem ) { // user has done some changes to DocumentInfo @@ -568,7 +568,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) // derived class may decide to abort this if( !QuerySlotExecutable( nId ) ) { - rReq.SetReturnValue( SfxBoolItem( 0, sal_False ) ); + rReq.SetReturnValue( SfxBoolItem( 0, false ) ); return; } @@ -592,15 +592,15 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) if ( nId == SID_SAVEASDOC ) { // in case of plugin mode the SaveAs operation means SaveTo - SFX_ITEMSET_ARG( GetMedium()->GetItemSet(), pViewOnlyItem, SfxBoolItem, SID_VIEWONLY, sal_False ); + SFX_ITEMSET_ARG( GetMedium()->GetItemSet(), pViewOnlyItem, SfxBoolItem, SID_VIEWONLY, false ); if ( pViewOnlyItem && pViewOnlyItem->GetValue() ) - rReq.AppendItem( SfxBoolItem( SID_SAVETO, sal_True ) ); + rReq.AppendItem( SfxBoolItem( SID_SAVETO, true ) ); } // TODO/LATER: do the following GUI related actions in standalown method // ======================================================================================================== // Introduce a status indicator for GUI operation - SFX_REQUEST_ARG( rReq, pStatusIndicatorItem, SfxUnoAnyItem, SID_PROGRESS_STATUSBAR_CONTROL, sal_False ); + SFX_REQUEST_ARG( rReq, pStatusIndicatorItem, SfxUnoAnyItem, SID_PROGRESS_STATUSBAR_CONTROL, false ); if ( !pStatusIndicatorItem ) { // get statusindicator @@ -637,7 +637,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) } // Introduce an interaction handler for GUI operation - SFX_REQUEST_ARG( rReq, pInteractionHandlerItem, SfxUnoAnyItem, SID_INTERACTIONHANDLER, sal_False ); + SFX_REQUEST_ARG( rReq, pInteractionHandlerItem, SfxUnoAnyItem, SID_INTERACTIONHANDLER, false ); if ( !pInteractionHandlerItem ) { uno::Reference< uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext(); @@ -663,8 +663,8 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) // ======================================================================================================== sal_Bool bPreselectPassword = sal_False; - SFX_ITEMSET_ARG( GetMedium()->GetItemSet(), pOldEncryptionDataItem, SfxUnoAnyItem, SID_ENCRYPTIONDATA, sal_False ); - SFX_ITEMSET_ARG( GetMedium()->GetItemSet(), pOldPasswordItem, SfxStringItem, SID_PASSWORD, sal_False ); + SFX_ITEMSET_ARG( GetMedium()->GetItemSet(), pOldEncryptionDataItem, SfxUnoAnyItem, SID_ENCRYPTIONDATA, false ); + SFX_ITEMSET_ARG( GetMedium()->GetItemSet(), pOldPasswordItem, SfxStringItem, SID_PASSWORD, false ); if ( pOldEncryptionDataItem || pOldPasswordItem ) bPreselectPassword = sal_True; @@ -734,7 +734,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) if ( lErr && nErrorCode == ERRCODE_NONE ) { - SFX_REQUEST_ARG( rReq, pWarnItem, SfxBoolItem, SID_FAIL_ON_WARNING, sal_False ); + SFX_REQUEST_ARG( rReq, pWarnItem, SfxBoolItem, SID_FAIL_ON_WARNING, false ); if ( pWarnItem && pWarnItem->GetValue() ) nErrorCode = lErr; } @@ -770,7 +770,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) case SID_SAVEACOPY: { SfxAllItemSet aArgs( GetPool() ); - aArgs.Put( SfxBoolItem( SID_SAVEACOPYITEM, sal_True ) ); + aArgs.Put( SfxBoolItem( SID_SAVEACOPYITEM, true ) ); SfxRequest aSaveACopyReq( SID_EXPORTDOC, SFX_CALLMODE_API, aArgs ); ExecFile_Impl( aSaveACopyReq ); if ( !aSaveACopyReq.IsDone() ) @@ -827,8 +827,8 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) } // Evaluate Parameter - SFX_REQUEST_ARG(rReq, pSaveItem, SfxBoolItem, SID_CLOSEDOC_SAVE, sal_False); - SFX_REQUEST_ARG(rReq, pNameItem, SfxStringItem, SID_CLOSEDOC_FILENAME, sal_False); + SFX_REQUEST_ARG(rReq, pSaveItem, SfxBoolItem, SID_CLOSEDOC_SAVE, false); + SFX_REQUEST_ARG(rReq, pNameItem, SfxStringItem, SID_CLOSEDOC_FILENAME, false); if ( pSaveItem ) { if ( pSaveItem->GetValue() ) @@ -859,7 +859,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) // Cancelled by the user? if ( !PrepareClose( 2 ) ) { - rReq.SetReturnValue( SfxBoolItem(0, sal_False) ); + rReq.SetReturnValue( SfxBoolItem(0, false) ); rReq.Done(); return; } @@ -868,7 +868,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) sal_uIntPtr lErr = GetErrorCode(); ErrorHandler::HandleError(lErr); - rReq.SetReturnValue( SfxBoolItem(0, sal_True) ); + rReq.SetReturnValue( SfxBoolItem(0, true) ); rReq.Done(); rReq.ReleaseArgs(); // because the pool is destroyed in Close DoClose(); @@ -1296,7 +1296,7 @@ void SfxObjectShell::ExecView_Impl(SfxRequest &rReq) if ( !aFileName.isEmpty() ) { SfxStringItem aName( SID_FILE_NAME, aFileName ); - SfxBoolItem aCreateView( SID_OPEN_NEW_VIEW, sal_True ); + SfxBoolItem aCreateView( SID_OPEN_NEW_VIEW, true ); SFX_APP()->GetAppDispatcher_Impl()->Execute( SID_OPENDOC, SFX_CALLMODE_ASYNCHRON, &aName, &aCreateView, 0L); diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index 47331fdf0c10..4a9a2bc9daf8 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -189,7 +189,7 @@ bool GetEncryptionData_Impl( const SfxItemSet* pSet, uno::Sequence< beans::Named bool bResult = false; if ( pSet ) { - SFX_ITEMSET_ARG( pSet, pEncryptionDataItem, SfxUnoAnyItem, SID_ENCRYPTIONDATA, sal_False); + SFX_ITEMSET_ARG( pSet, pEncryptionDataItem, SfxUnoAnyItem, SID_ENCRYPTIONDATA, false); if ( pEncryptionDataItem ) { pEncryptionDataItem->GetValue() >>= o_rEncryptionData; @@ -197,7 +197,7 @@ bool GetEncryptionData_Impl( const SfxItemSet* pSet, uno::Sequence< beans::Named } else { - SFX_ITEMSET_ARG( pSet, pPasswordItem, SfxStringItem, SID_PASSWORD, sal_False); + SFX_ITEMSET_ARG( pSet, pPasswordItem, SfxStringItem, SID_PASSWORD, false); if ( pPasswordItem ) { OUString aPassword = pPasswordItem->GetValue(); @@ -634,7 +634,7 @@ sal_Bool SfxObjectShell::DoLoad( SfxMedium *pMed ) { SFX_ITEMSET_ARG( pSet, pTemplateItem, SfxBoolItem, - SID_TEMPLATE, sal_False); + SID_TEMPLATE, false); SetActivateEvent_Impl( ( pTemplateItem && pTemplateItem->GetValue() ) ? SFX_EVENT_CREATEDOC : SFX_EVENT_OPENDOC ); @@ -642,9 +642,9 @@ sal_Bool SfxObjectShell::DoLoad( SfxMedium *pMed ) SFX_ITEMSET_ARG( pSet, pBaseItem, SfxStringItem, - SID_BASEURL, sal_False); + SID_BASEURL, false); OUString aBaseURL; - SFX_ITEMSET_ARG( pMedium->GetItemSet(), pSalvageItem, SfxStringItem, SID_DOC_SALVAGE, sal_False); + SFX_ITEMSET_ARG( pMedium->GetItemSet(), pSalvageItem, SfxStringItem, SID_DOC_SALVAGE, false); if( pBaseItem ) aBaseURL = pBaseItem->GetValue(); else @@ -672,7 +672,7 @@ sal_Bool SfxObjectShell::DoLoad( SfxMedium *pMed ) SetError( nError, OUString( OSL_LOG_PREFIX ) ); if (pMedium->GetFilter()->GetFilterFlags() & SFX_FILTER_STARTPRESENTATION) - pSet->Put( SfxBoolItem( SID_DOC_STARTPRESENTATION, sal_True) ); + pSet->Put( SfxBoolItem( SID_DOC_STARTPRESENTATION, true) ); } EnableSetModified( sal_False ); @@ -691,7 +691,7 @@ sal_Bool SfxObjectShell::DoLoad( SfxMedium *pMed ) try { sal_Bool bWarnMediaTypeFallback = sal_False; - SFX_ITEMSET_ARG( pMedium->GetItemSet(), pRepairPackageItem, SfxBoolItem, SID_REPAIRPACKAGE, sal_False); + SFX_ITEMSET_ARG( pMedium->GetItemSet(), pRepairPackageItem, SfxBoolItem, SID_REPAIRPACKAGE, false); // treat the package as broken if the mediatype was retrieved as a fallback uno::Reference< beans::XPropertySet > xStorProps( xStorage, uno::UNO_QUERY_THROW ); @@ -726,7 +726,7 @@ sal_Bool SfxObjectShell::DoLoad( SfxMedium *pMed ) if ( bOk ) { // the document loaded from template has no name - SFX_ITEMSET_ARG( pMedium->GetItemSet(), pTemplateItem, SfxBoolItem, SID_TEMPLATE, sal_False); + SFX_ITEMSET_ARG( pMedium->GetItemSet(), pTemplateItem, SfxBoolItem, SID_TEMPLATE, false); if ( !pTemplateItem || !pTemplateItem->GetValue() ) bHasName = sal_True; } @@ -846,9 +846,9 @@ sal_Bool SfxObjectShell::DoLoad( SfxMedium *pMed ) if ( SFX_CREATE_MODE_EMBEDDED != eCreateMode ) { - SFX_ITEMSET_ARG( pMedium->GetItemSet(), pAsTempItem, SfxBoolItem, SID_TEMPLATE, sal_False); - SFX_ITEMSET_ARG( pMedium->GetItemSet(), pPreviewItem, SfxBoolItem, SID_PREVIEW, sal_False); - SFX_ITEMSET_ARG( pMedium->GetItemSet(), pHiddenItem, SfxBoolItem, SID_HIDDEN, sal_False); + SFX_ITEMSET_ARG( pMedium->GetItemSet(), pAsTempItem, SfxBoolItem, SID_TEMPLATE, false); + SFX_ITEMSET_ARG( pMedium->GetItemSet(), pPreviewItem, SfxBoolItem, SID_PREVIEW, false); + SFX_ITEMSET_ARG( pMedium->GetItemSet(), pHiddenItem, SfxBoolItem, SID_HIDDEN, false); if( bOk && !pMedium->GetOrigURL().isEmpty() && !( pAsTempItem && pAsTempItem->GetValue() ) && !( pPreviewItem && pPreviewItem->GetValue() ) @@ -882,8 +882,8 @@ sal_uInt32 SfxObjectShell::HandleFilter( SfxMedium* pMedium, SfxObjectShell* pDo { sal_uInt32 nError = ERRCODE_NONE; SfxItemSet* pSet = pMedium->GetItemSet(); - SFX_ITEMSET_ARG( pSet, pOptions, SfxStringItem, SID_FILE_FILTEROPTIONS, sal_False ); - SFX_ITEMSET_ARG( pSet, pData, SfxUnoAnyItem, SID_FILTER_DATA, sal_False ); + SFX_ITEMSET_ARG( pSet, pOptions, SfxStringItem, SID_FILE_FILTEROPTIONS, false ); + SFX_ITEMSET_ARG( pSet, pData, SfxUnoAnyItem, SID_FILTER_DATA, false ); if ( !pData && !pOptions ) { com::sun::star::uno::Reference< XMultiServiceFactory > xServiceManager = ::comphelper::getProcessServiceFactory(); @@ -944,7 +944,7 @@ sal_uInt32 SfxObjectShell::HandleFilter( SfxMedium* pMedium, SfxObjectShell* pDo pFilterOptions, SfxStringItem, SID_FILE_FILTEROPTIONS, - sal_False ); + false ); if ( pFilterOptions ) pSet->Put( *pFilterOptions ); @@ -952,7 +952,7 @@ sal_uInt32 SfxObjectShell::HandleFilter( SfxMedium* pMedium, SfxObjectShell* pDo pFilterData, SfxUnoAnyItem, SID_FILTER_DATA, - sal_False ); + false ); if ( pFilterData ) pSet->Put( *pFilterData ); } @@ -1195,7 +1195,7 @@ sal_Bool SfxObjectShell::SaveTo_Impl SfxItemSet *pMedSet = rMedium.GetItemSet(); if( pMedSet ) { - SFX_ITEMSET_ARG( pMedSet, pSaveToItem, SfxBoolItem, SID_SAVETO, sal_False ); + SFX_ITEMSET_ARG( pMedSet, pSaveToItem, SfxBoolItem, SID_SAVETO, false ); bCopyTo = GetCreateMode() == SFX_CREATE_MODE_EMBEDDED || (pSaveToItem && pSaveToItem->GetValue()); } @@ -1422,7 +1422,7 @@ sal_Bool SfxObjectShell::SaveTo_Impl pFilter = rMedium.GetFilter(); const SfxStringItem *pVersionItem = ( !rMedium.IsInCheckIn( ) && pSet ) ? (const SfxStringItem*) - SfxRequest::GetItem( pSet, SID_DOCINFO_COMMENTS, sal_False, TYPE(SfxStringItem) ) : NULL; + SfxRequest::GetItem( pSet, SID_DOCINFO_COMMENTS, false, TYPE(SfxStringItem) ) : NULL; OUString aTmpVersionURL; if ( bOk ) @@ -1511,7 +1511,7 @@ sal_Bool SfxObjectShell::SaveTo_Impl { // store a version also const SfxStringItem *pAuthorItem = pSet ? (const SfxStringItem*) - SfxRequest::GetItem( pSet, SID_DOCINFO_AUTHOR, sal_False, TYPE(SfxStringItem) ) : NULL; + SfxRequest::GetItem( pSet, SID_DOCINFO_AUTHOR, false, TYPE(SfxStringItem) ) : NULL; // version comment util::RevisionTag aInfo; @@ -2308,7 +2308,7 @@ bool SfxObjectShell::ImportFrom(SfxMedium& rMedium, {} } - return sal_False; + return false; } sal_Bool SfxObjectShell::ExportTo( SfxMedium& rMedium ) @@ -2404,7 +2404,7 @@ sal_Bool SfxObjectShell::ExportTo( SfxMedium& rMedium ) { aArgs.realloc ( ++nEnd ); aArgs[nEnd-1].Name = "DocumentBaseURL"; - aArgs[nEnd-1].Value <<= rMedium.GetBaseURL( sal_True ); + aArgs[nEnd-1].Value <<= rMedium.GetBaseURL( true ); } return xFilter->filter( aArgs ); @@ -2516,7 +2516,7 @@ sal_Bool SfxObjectShell::DoSave_Impl( const SfxItemSet* pArgs ) // an interaction handler here can aquire only in case of GUI Saving // and should be removed after the saving is done com::sun::star::uno::Reference< XInteractionHandler > xInteract; - SFX_ITEMSET_ARG( pArgs, pxInteractionItem, SfxUnoAnyItem, SID_INTERACTIONHANDLER, sal_False ); + SFX_ITEMSET_ARG( pArgs, pxInteractionItem, SfxUnoAnyItem, SID_INTERACTIONHANDLER, false ); if ( pxInteractionItem && ( pxInteractionItem->GetValue() >>= xInteract ) && xInteract.is() ) pMediumTmp->GetItemSet()->Put( SfxUnoAnyItem( SID_INTERACTIONHANDLER, makeAny( xInteract ) ) ); @@ -2574,10 +2574,10 @@ sal_Bool SfxObjectShell::Save_Impl( const SfxItemSet* pSet ) pImp->bIsSaving = sal_True; sal_Bool bSaved = sal_False; - SFX_ITEMSET_ARG( GetMedium()->GetItemSet(), pSalvageItem, SfxStringItem, SID_DOC_SALVAGE, sal_False); + SFX_ITEMSET_ARG( GetMedium()->GetItemSet(), pSalvageItem, SfxStringItem, SID_DOC_SALVAGE, false); if ( pSalvageItem ) { - SFX_ITEMSET_ARG( GetMedium()->GetItemSet(), pFilterItem, SfxStringItem, SID_FILTER_NAME, sal_False); + SFX_ITEMSET_ARG( GetMedium()->GetItemSet(), pFilterItem, SfxStringItem, SID_FILTER_NAME, false); OUString aFilterName; const SfxFilter *pFilter = NULL; if ( pFilterItem ) @@ -2586,7 +2586,7 @@ sal_Bool SfxObjectShell::Save_Impl( const SfxItemSet* pSet ) SfxMedium *pMed = new SfxMedium( pSalvageItem->GetValue(), STREAM_READWRITE | STREAM_SHARE_DENYWRITE | STREAM_TRUNC, pFilter ); - SFX_ITEMSET_ARG( GetMedium()->GetItemSet(), pPasswordItem, SfxStringItem, SID_PASSWORD, sal_False ); + SFX_ITEMSET_ARG( GetMedium()->GetItemSet(), pPasswordItem, SfxStringItem, SID_PASSWORD, false ); if ( pPasswordItem ) pMed->GetItemSet()->Put( *pPasswordItem ); @@ -2642,7 +2642,7 @@ sal_Bool SfxObjectShell::CommonSaveAs_Impl DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "Illegal URL!" ); DBG_ASSERT( aParams->Count() != 0, "Incorrect Parameter"); - SFX_ITEMSET_ARG( aParams, pSaveToItem, SfxBoolItem, SID_SAVETO, sal_False ); + SFX_ITEMSET_ARG( aParams, pSaveToItem, SfxBoolItem, SID_SAVETO, false ); sal_Bool bSaveTo = pSaveToItem ? pSaveToItem->GetValue() : sal_False; const SfxFilter* pFilter = GetFactory().GetFilterContainer()->GetFilter4FilterName( aFilterName ); @@ -2654,7 +2654,7 @@ sal_Bool SfxObjectShell::CommonSaveAs_Impl return sal_False; } - SFX_ITEMSET_ARG( aParams, pCopyStreamItem, SfxBoolItem, SID_COPY_STREAM_IF_POSSIBLE, sal_False ); + SFX_ITEMSET_ARG( aParams, pCopyStreamItem, SfxBoolItem, SID_COPY_STREAM_IF_POSSIBLE, false ); if ( bSaveTo && pCopyStreamItem && pCopyStreamItem->GetValue() && !IsModified() ) { if ( pMedium->TryDirectTransfer( aURL.GetMainURL( INetURLObject::NO_DECODE ), *aParams ) ) @@ -2677,7 +2677,7 @@ sal_Bool SfxObjectShell::CommonSaveAs_Impl } if( SFX_ITEM_SET != aParams->GetItemState(SID_UNPACK) && SvtSaveOptions().IsSaveUnpacked() ) - aParams->Put( SfxBoolItem( SID_UNPACK, sal_False ) ); + aParams->Put( SfxBoolItem( SID_UNPACK, false ) ); OUString aTempFileURL; if ( IsDocShared() ) @@ -2812,7 +2812,7 @@ sal_Bool SfxObjectShell::PreDoSaveAs_Impl } // check if a "SaveTo" is wanted, no "SaveAs" - SFX_ITEMSET_ARG( pParams, pSaveToItem, SfxBoolItem, SID_SAVETO, sal_False ); + SFX_ITEMSET_ARG( pParams, pSaveToItem, SfxBoolItem, SID_SAVETO, false ); sal_Bool bCopyTo = GetCreateMode() == SFX_CREATE_MODE_EMBEDDED || (pSaveToItem && pSaveToItem->GetValue()); // distinguish between "Save" and "SaveAs" @@ -3046,7 +3046,7 @@ sal_Bool SfxObjectShell::LoadOwnFormat( SfxMedium& rMedium ) if ( xStorage.is() ) { // Password - SFX_ITEMSET_ARG( rMedium.GetItemSet(), pPasswdItem, SfxStringItem, SID_PASSWORD, sal_False ); + SFX_ITEMSET_ARG( rMedium.GetItemSet(), pPasswdItem, SfxStringItem, SID_PASSWORD, false ); if ( pPasswdItem || ERRCODE_IO_ABORT != CheckPasswd_Impl( this, SFX_APP()->GetPool(), pMedium ) ) { uno::Sequence< beans::NamedValue > aEncryptionData; diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx index a3870fe318b8..c34781a2a0f8 100644 --- a/sfx2/source/doc/objxtor.cxx +++ b/sfx2/source/doc/objxtor.cxx @@ -644,7 +644,7 @@ bool SfxObjectShell::PrepareClose } if ( !pPoolItem || pPoolItem->ISA(SfxVoidItem) || ( pPoolItem->ISA(SfxBoolItem) && !( (const SfxBoolItem*) pPoolItem )->GetValue() ) ) - return sal_False; + return false; } else if ( RET_CANCEL == nRet ) // Cancelled @@ -1076,8 +1076,8 @@ Reference<lang::XComponent> SfxObjectShell::CreateAndLoadComponent( const SfxIte { uno::Sequence < beans::PropertyValue > aProps; TransformItems( SID_OPENDOC, rSet, aProps ); - SFX_ITEMSET_ARG(&rSet, pFileNameItem, SfxStringItem, SID_FILE_NAME, sal_False); - SFX_ITEMSET_ARG(&rSet, pTargetItem, SfxStringItem, SID_TARGETNAME, sal_False); + SFX_ITEMSET_ARG(&rSet, pFileNameItem, SfxStringItem, SID_FILE_NAME, false); + SFX_ITEMSET_ARG(&rSet, pTargetItem, SfxStringItem, SID_TARGETNAME, false); OUString aURL; OUString aTarget("_blank"); if ( pFileNameItem ) @@ -1142,7 +1142,7 @@ void SfxObjectShell::SetInitialized_Impl( const bool i_fromInitNew ) bool SfxObjectShell::IsChangeRecording() const { // currently this function needs to be overwritten by Writer and Calc only - DBG_ASSERT( 0, "function not implemented" ); + DBG_ASSERT( false, "function not implemented" ); return false; } @@ -1150,7 +1150,7 @@ bool SfxObjectShell::IsChangeRecording() const bool SfxObjectShell::HasChangeRecordProtection() const { // currently this function needs to be overwritten by Writer and Calc only - DBG_ASSERT( 0, "function not implemented" ); + DBG_ASSERT( false, "function not implemented" ); return false; } @@ -1158,14 +1158,14 @@ bool SfxObjectShell::HasChangeRecordProtection() const void SfxObjectShell::SetChangeRecording( bool /*bActivate*/ ) { // currently this function needs to be overwritten by Writer and Calc only - DBG_ASSERT( 0, "function not implemented" ); + DBG_ASSERT( false, "function not implemented" ); } bool SfxObjectShell::SetProtectionPassword( const OUString & /*rPassword*/ ) { // currently this function needs to be overwritten by Writer and Calc only - DBG_ASSERT( 0, "function not implemented" ); + DBG_ASSERT( false, "function not implemented" ); return false; } @@ -1173,7 +1173,7 @@ bool SfxObjectShell::SetProtectionPassword( const OUString & /*rPassword*/ ) bool SfxObjectShell::GetProtectionHash( /*out*/ ::com::sun::star::uno::Sequence< sal_Int8 > & /*rPasswordHash*/ ) { // currently this function needs to be overwritten by Writer and Calc only - DBG_ASSERT( 0, "function not implemented" ); + DBG_ASSERT( false, "function not implemented" ); return false; } diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index dba87947be64..c65dfb3e988c 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -972,12 +972,12 @@ sal_Bool SAL_CALL SfxBaseModel::attachResource( const OUString& aSet.ClearItem( SID_FILLFRAME ); pMedium->GetItemSet()->Put( aSet ); - SFX_ITEMSET_ARG( &aSet, pItem, SfxStringItem, SID_FILTER_NAME, sal_False ); + SFX_ITEMSET_ARG( &aSet, pItem, SfxStringItem, SID_FILTER_NAME, false ); if ( pItem ) pMedium->SetFilter( pObjectShell->GetFactory().GetFilterContainer()->GetFilter4FilterName( pItem->GetValue() ) ); - SFX_ITEMSET_ARG( &aSet, pTitleItem, SfxStringItem, SID_DOCINFO_TITLE, sal_False ); + SFX_ITEMSET_ARG( &aSet, pTitleItem, SfxStringItem, SID_DOCINFO_TITLE, false ); if ( pTitleItem ) { SfxViewFrame* pFrame = SfxViewFrame::GetFirst( pObjectShell ); @@ -1703,7 +1703,7 @@ void SAL_CALL SfxBaseModel::storeAsURL( const OUString& rURL loadCmisProperties( ); #if OSL_DEBUG_LEVEL > 0 - SFX_ITEMSET_ARG( m_pData->m_pObjectShell->GetMedium()->GetItemSet(), pPasswdItem, SfxStringItem, SID_PASSWORD, sal_False); + SFX_ITEMSET_ARG( m_pData->m_pObjectShell->GetMedium()->GetItemSet(), pPasswdItem, SfxStringItem, SID_PASSWORD, false); OSL_ENSURE( !pPasswdItem, "There should be no Password property in the document MediaDescriptor!" ); #endif } @@ -1874,7 +1874,7 @@ void SAL_CALL SfxBaseModel::load( const Sequence< beans::PropertyValue >& seqA } OUString aFilterName; - SFX_ITEMSET_ARG( pMedium->GetItemSet(), pFilterNameItem, SfxStringItem, SID_FILTER_NAME, sal_False ); + SFX_ITEMSET_ARG( pMedium->GetItemSet(), pFilterNameItem, SfxStringItem, SID_FILTER_NAME, false ); if( pFilterNameItem ) aFilterName = pFilterNameItem->GetValue(); if( !m_pData->m_pObjectShell->GetFactory().GetFilterContainer()->GetFilter4FilterName( aFilterName ) ) @@ -1884,7 +1884,7 @@ void SAL_CALL SfxBaseModel::load( const Sequence< beans::PropertyValue >& seqA throw frame::IllegalArgumentIOException(); } - SFX_ITEMSET_ARG( pMedium->GetItemSet(), pSalvageItem, SfxStringItem, SID_DOC_SALVAGE, sal_False ); + SFX_ITEMSET_ARG( pMedium->GetItemSet(), pSalvageItem, SfxStringItem, SID_DOC_SALVAGE, false ); sal_Bool bSalvage = pSalvageItem ? sal_True : sal_False; // load document @@ -1899,7 +1899,7 @@ void SAL_CALL SfxBaseModel::load( const Sequence< beans::PropertyValue >& seqA if ( nError == ERRCODE_IO_BROKENPACKAGE && xHandler.is() ) { OUString aDocName = pMedium->GetURLObject().getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET ); - SFX_ITEMSET_ARG( pMedium->GetItemSet(), pRepairItem, SfxBoolItem, SID_REPAIRPACKAGE, sal_False ); + SFX_ITEMSET_ARG( pMedium->GetItemSet(), pRepairItem, SfxBoolItem, SID_REPAIRPACKAGE, false ); if ( !pRepairItem || !pRepairItem->GetValue() ) { RequestPackageReparation aRequest( aDocName ); @@ -1907,8 +1907,8 @@ void SAL_CALL SfxBaseModel::load( const Sequence< beans::PropertyValue >& seqA if( aRequest.isApproved() ) { // broken package: try second loading and allow repair - pMedium->GetItemSet()->Put( SfxBoolItem( SID_REPAIRPACKAGE, sal_True ) ); - pMedium->GetItemSet()->Put( SfxBoolItem( SID_TEMPLATE, sal_True ) ); + pMedium->GetItemSet()->Put( SfxBoolItem( SID_REPAIRPACKAGE, true ) ); + pMedium->GetItemSet()->Put( SfxBoolItem( SID_TEMPLATE, true ) ); pMedium->GetItemSet()->Put( SfxStringItem( SID_DOCINFO_TITLE, aDocName ) ); // the error must be reset and the storage must be reopened in new mode @@ -1936,7 +1936,7 @@ void SAL_CALL SfxBaseModel::load( const Sequence< beans::PropertyValue >& seqA if( bSalvage ) { // file recovery: restore original filter - SFX_ITEMSET_ARG( pMedium->GetItemSet(), pFilterItem, SfxStringItem, SID_FILTER_NAME, sal_False ); + SFX_ITEMSET_ARG( pMedium->GetItemSet(), pFilterItem, SfxStringItem, SID_FILTER_NAME, false ); SfxFilterMatcher& rMatcher = SFX_APP()->GetFilterMatcher(); const SfxFilter* pSetFilter = rMatcher.GetFilter4FilterName( pFilterItem->GetValue() ); pMedium->SetFilter( pSetFilter ); @@ -1946,7 +1946,7 @@ void SAL_CALL SfxBaseModel::load( const Sequence< beans::PropertyValue >& seqA // TODO/LATER: may be the mode should be retrieved from outside and the preused filter should not be set if ( m_pData->m_pObjectShell->GetCreateMode() == SFX_CREATE_MODE_EMBEDDED ) { - SFX_ITEMSET_ARG( pMedium->GetItemSet(), pFilterItem, SfxStringItem, SID_FILTER_NAME, sal_False ); + SFX_ITEMSET_ARG( pMedium->GetItemSet(), pFilterItem, SfxStringItem, SID_FILTER_NAME, false ); if ( pFilterItem ) m_pData->m_aPreusedFilterName = pFilterItem->GetValue(); } @@ -1961,7 +1961,7 @@ void SAL_CALL SfxBaseModel::load( const Sequence< beans::PropertyValue >& seqA setUpdatePickList(pMedium); #if OSL_DEBUG_LEVEL > 0 - SFX_ITEMSET_ARG( pMedium->GetItemSet(), pPasswdItem, SfxStringItem, SID_PASSWORD, sal_False); + SFX_ITEMSET_ARG( pMedium->GetItemSet(), pPasswdItem, SfxStringItem, SID_PASSWORD, false); OSL_ENSURE( !pPasswdItem, "There should be no Password property in the document MediaDescriptor!" ); #endif } @@ -2017,7 +2017,7 @@ Any SAL_CALL SfxBaseModel::getTransferData( const datatransfer::DataFlavor& aFla try { utl::TempFile aTmp; - aTmp.EnableKillingFile( sal_True ); + aTmp.EnableKillingFile( true ); storeToURL( aTmp.GetURL(), Sequence < beans::PropertyValue >() ); SvStream* pStream = aTmp.GetStream( STREAM_READ ); const sal_uInt32 nLen = pStream->Seek( STREAM_SEEK_TO_END ); @@ -3040,11 +3040,11 @@ void SfxBaseModel::impl_store( const OUString& sURL SfxAllItemSet *aParams = new SfxAllItemSet( SFX_APP()->GetPool() ); aParams->Put( SfxStringItem( SID_FILE_NAME, sURL ) ); if ( bSaveTo ) - aParams->Put( SfxBoolItem( SID_SAVETO, sal_True ) ); + aParams->Put( SfxBoolItem( SID_SAVETO, true ) ); TransformParameters( SID_SAVEASDOC, seqArguments, *aParams ); - SFX_ITEMSET_ARG( aParams, pCopyStreamItem, SfxBoolItem, SID_COPY_STREAM_IF_POSSIBLE, sal_False ); + SFX_ITEMSET_ARG( aParams, pCopyStreamItem, SfxBoolItem, SID_COPY_STREAM_IF_POSSIBLE, false ); if ( pCopyStreamItem && pCopyStreamItem->GetValue() && !bSaveTo ) { @@ -3058,7 +3058,7 @@ void SfxBaseModel::impl_store( const OUString& sURL sal_uInt32 nModifyPasswordHash = 0; Sequence< beans::PropertyValue > aModifyPasswordInfo; - SFX_ITEMSET_ARG( aParams, pModifyPasswordInfoItem, SfxUnoAnyItem, SID_MODIFYPASSWORDINFO, sal_False ); + SFX_ITEMSET_ARG( aParams, pModifyPasswordInfoItem, SfxUnoAnyItem, SID_MODIFYPASSWORDINFO, false ); if ( pModifyPasswordInfoItem ) { // it contains either a simple hash or a set of PropertyValues @@ -3099,7 +3099,7 @@ void SfxBaseModel::impl_store( const OUString& sURL } Reference < task::XInteractionHandler > xHandler; - SFX_ITEMSET_ARG( aParams, pItem, SfxUnoAnyItem, SID_INTERACTIONHANDLER, sal_False); + SFX_ITEMSET_ARG( aParams, pItem, SfxUnoAnyItem, SID_INTERACTIONHANDLER, false); if ( pItem ) pItem->GetValue() >>= xHandler; @@ -3774,7 +3774,7 @@ void SAL_CALL SfxBaseModel::loadFromStorage( const Reference< embed::XStorage >& // allow to use an interactionhandler (if there is one) pMedium->UseInteractionHandler( sal_True ); - SFX_ITEMSET_ARG( &aSet, pTemplateItem, SfxBoolItem, SID_TEMPLATE, sal_False); + SFX_ITEMSET_ARG( &aSet, pTemplateItem, SfxBoolItem, SID_TEMPLATE, false); sal_Bool bTemplate = pTemplateItem && pTemplateItem->GetValue(); m_pData->m_pObjectShell->SetActivateEvent_Impl( bTemplate ? SFX_EVENT_CREATEDOC : SFX_EVENT_OPENDOC ); m_pData->m_pObjectShell->Get_Impl()->bOwnsStorage = sal_False; @@ -3808,7 +3808,7 @@ void SAL_CALL SfxBaseModel::storeToStorage( const Reference< embed::XStorage >& TransformParameters( SID_SAVEASDOC, aMediaDescriptor, aSet ); // TODO/LATER: may be a special URL "private:storage" should be used - SFX_ITEMSET_ARG( &aSet, pItem, SfxStringItem, SID_FILTER_NAME, sal_False ); + SFX_ITEMSET_ARG( &aSet, pItem, SfxStringItem, SID_FILTER_NAME, false ); sal_Int32 nVersion = SOFFICE_FILEFORMAT_CURRENT; if( pItem ) { @@ -4033,7 +4033,7 @@ OUString SAL_CALL SfxBaseModel::getTitle() catch (const ucb::CommandAbortedException &) { } - SFX_ITEMSET_ARG( pMedium->GetItemSet(), pRepairedDocItem, SfxBoolItem, SID_REPAIRPACKAGE, sal_False ); + SFX_ITEMSET_ARG( pMedium->GetItemSet(), pRepairedDocItem, SfxBoolItem, SID_REPAIRPACKAGE, false ); if ( pRepairedDocItem && pRepairedDocItem->GetValue() ) aResult += SfxResId(STR_REPAIREDDOCUMENT).toString(); } @@ -4346,7 +4346,7 @@ Reference< frame::XController2 > SAL_CALL SfxBaseModel::createViewController( if ( nPluginMode == 1 ) { pViewFrame->ForceOuterResize_Impl( sal_False ); - pViewFrame->GetBindings().HidePopups( sal_True ); + pViewFrame->GetBindings().HidePopups( true ); SfxFrame& rFrame = pViewFrame->GetFrame(); // MBA: layoutmanager of inplace frame starts locked and invisible diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx index d210c6f8756d..8a71251f5762 100644 --- a/sfx2/source/menu/mnuitem.cxx +++ b/sfx2/source/menu/mnuitem.cxx @@ -359,7 +359,7 @@ IMPL_LINK( SfxAppMenuControl_Impl, Activate, Menu *, pActMenu ) if ( aImageId.getLength() > 0 ) { Reference< ::com::sun::star::frame::XFrame > xFrame; - Image aImage = GetImage( xFrame, aImageId, sal_False ); + Image aImage = GetImage( xFrame, aImageId, false ); if ( !!aImage ) { bImageSet = sal_True; diff --git a/sfx2/source/menu/thessubmenu.cxx b/sfx2/source/menu/thessubmenu.cxx index ca660af87ffa..9ee51c4a7c73 100644 --- a/sfx2/source/menu/thessubmenu.cxx +++ b/sfx2/source/menu/thessubmenu.cxx @@ -116,7 +116,7 @@ bool SfxThesSubMenuHelper::GetMeanings( } catch (const uno::Exception &) { - DBG_ASSERT( 0, "failed to get synonyms" ); + DBG_ASSERT( false, "failed to get synonyms" ); } } return bHasMoreSynonyms; diff --git a/sfx2/source/sidebar/ControllerItem.cxx b/sfx2/source/sidebar/ControllerItem.cxx index ac0614d7c10f..a1d9086d8e51 100644 --- a/sfx2/source/sidebar/ControllerItem.cxx +++ b/sfx2/source/sidebar/ControllerItem.cxx @@ -221,7 +221,7 @@ void ControllerItem::ResetFrame (void) Image ControllerItem::GetIcon (void) const { - return GetImage(mxFrame, ".uno:" + msCommandName, sal_False); + return GetImage(mxFrame, ".uno:" + msCommandName, false); } diff --git a/sfx2/source/sidebar/Tools.cxx b/sfx2/source/sidebar/Tools.cxx index b8849a5f5019..a1c63b27f723 100644 --- a/sfx2/source/sidebar/Tools.cxx +++ b/sfx2/source/sidebar/Tools.cxx @@ -65,7 +65,7 @@ Image Tools::GetImage ( if (rsURL.startsWith(sUnoCommandPrefix)) { - const Image aPanelImage (::GetImage(rxFrame, rsURL, sal_False)); + const Image aPanelImage (::GetImage(rxFrame, rsURL, false)); return aPanelImage; } else if (rsURL.startsWith(sCommandImagePrefix)) @@ -75,7 +75,7 @@ Image Tools::GetImage ( aCommandName.append(rsURL.copy(nCommandImagePrefixLength)); const ::rtl::OUString sCommandName (aCommandName.makeStringAndClear()); - const Image aPanelImage (::GetImage(rxFrame, sCommandName, sal_False)); + const Image aPanelImage (::GetImage(rxFrame, sCommandName, false)); return aPanelImage; } else diff --git a/sfx2/source/statbar/stbitem.cxx b/sfx2/source/statbar/stbitem.cxx index cadbc2234405..c03b48284fd6 100644 --- a/sfx2/source/statbar/stbitem.cxx +++ b/sfx2/source/statbar/stbitem.cxx @@ -377,7 +377,7 @@ throw (::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; ::Point aPos( rPos.X, rPos.Y ); - CommandEvent aCmdEvent( aPos, (sal_uInt16)nCommand, sal_True, NULL ); + CommandEvent aCmdEvent( aPos, (sal_uInt16)nCommand, true, NULL ); Command( aCmdEvent ); } diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index 5694db17df18..3ff970a2cc7c 100644 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -1396,7 +1396,7 @@ void SfxPopupWindow::StateChanged( } else if ( m_bFloating ) { - Show( sal_True, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE ); + Show( true, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE ); } } diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx index 569dd190f97f..357b3e102e73 100644 --- a/sfx2/source/view/frame.cxx +++ b/sfx2/source/view/frame.cxx @@ -422,7 +422,7 @@ void SfxFrame::UpdateDescriptor( SfxObjectShell *pDoc ) const SfxMedium *pMed = pDoc->GetMedium(); GetDescriptor()->SetActualURL( pMed->GetOrigURL() ); - SFX_ITEMSET_ARG( pMed->GetItemSet(), pItem, SfxBoolItem, SID_EDITDOC, sal_False ); + SFX_ITEMSET_ARG( pMed->GetItemSet(), pItem, SfxBoolItem, SID_EDITDOC, false ); sal_Bool bEditable = ( !pItem || pItem->GetValue() ); GetDescriptor()->SetEditable( bEditable ); @@ -435,9 +435,9 @@ void SfxFrame::UpdateDescriptor( SfxObjectShell *pDoc ) if ( pFilter ) aFilter = pFilter->GetFilterName(); - SFX_ITEMSET_ARG( pItemSet, pRefererItem, SfxStringItem, SID_REFERER, sal_False); - SFX_ITEMSET_ARG( pItemSet, pOptionsItem, SfxStringItem, SID_FILE_FILTEROPTIONS, sal_False); - SFX_ITEMSET_ARG( pItemSet, pTitle1Item, SfxStringItem, SID_DOCINFO_TITLE, sal_False); + SFX_ITEMSET_ARG( pItemSet, pRefererItem, SfxStringItem, SID_REFERER, false); + SFX_ITEMSET_ARG( pItemSet, pOptionsItem, SfxStringItem, SID_FILE_FILTEROPTIONS, false); + SFX_ITEMSET_ARG( pItemSet, pTitle1Item, SfxStringItem, SID_DOCINFO_TITLE, false); SfxItemSet *pSet = GetDescriptor()->GetArgs(); @@ -573,10 +573,10 @@ bool SfxFrameItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 ) const if ( wFrame ) { rVal <<= wFrame->GetFrameInterface(); - return sal_True; + return true; } - return sal_False; + return false; } bool SfxFrameItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 ) @@ -590,15 +590,15 @@ bool SfxFrameItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 ) if ( pFr->GetFrameInterface() == xFrame ) { wFrame = pFrame = pFr; - return sal_True; + return true; } pFr = SfxFrame::GetNext( *pFr ); } - return sal_True; + return true; } - return sal_False; + return false; } @@ -610,7 +610,7 @@ SfxUsrAnyItem::SfxUsrAnyItem( sal_uInt16 nWhichId, const ::com::sun::star::uno:: bool SfxUsrAnyItem::operator==( const SfxPoolItem& /*rItem*/ ) const { - return sal_False; + return false; } SfxPoolItem* SfxUsrAnyItem::Clone( SfxItemPool *) const @@ -621,13 +621,13 @@ SfxPoolItem* SfxUsrAnyItem::Clone( SfxItemPool *) const bool SfxUsrAnyItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const { rVal = aValue; - return sal_True; + return true; } bool SfxUsrAnyItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) { aValue = rVal; - return sal_True; + return true; } SfxUnoFrameItem::SfxUnoFrameItem() @@ -655,7 +655,7 @@ SfxPoolItem* SfxUnoFrameItem::Clone( SfxItemPool* ) const bool SfxUnoFrameItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const { rVal <<= m_xFrame; - return sal_True; + return true; } bool SfxUnoFrameItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) diff --git a/sfx2/source/view/frame2.cxx b/sfx2/source/view/frame2.cxx index fe8163d642d6..9e2d9f6b0043 100644 --- a/sfx2/source/view/frame2.cxx +++ b/sfx2/source/view/frame2.cxx @@ -188,7 +188,7 @@ void SfxFrameWindow_Impl::StateChanged( StateChangedType nStateChange ) { if ( nStateChange == STATE_CHANGE_INITSHOW ) { - pFrame->pImp->bHidden = sal_False; + pFrame->pImp->bHidden = false; if ( pFrame->IsInPlace() ) // TODO/MBA: workaround for bug in LayoutManager: the final resize does not get through because the // LayoutManager works asynchronously and between resize and time execution the DockingAcceptor was exchanged so that diff --git a/sfx2/source/view/frmload.cxx b/sfx2/source/view/frmload.cxx index 248ffd0e7b1f..d9be43c8622e 100644 --- a/sfx2/source/view/frmload.cxx +++ b/sfx2/source/view/frmload.cxx @@ -349,7 +349,7 @@ sal_Bool SfxFrameLoader_Impl::impl_createNewDocWithSlotParam( const sal_uInt16 _ SfxRequest aRequest( _nSlotID, SFX_CALLMODE_SYNCHRON, SFX_APP()->GetPool() ); aRequest.AppendItem( SfxUnoFrameItem( SID_FILLFRAME, i_rxFrame ) ); if ( i_bHidden ) - aRequest.AppendItem( SfxBoolItem( SID_HIDDEN, sal_True ) ); + aRequest.AppendItem( SfxBoolItem( SID_HIDDEN, true ) ); return lcl_getDispatchResult( SFX_APP()->ExecuteSlot( aRequest ) ); } diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index f084f8f125c0..e8eeb3979ff7 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -354,25 +354,25 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) SfxMedium* pMed = pSh->GetMedium(); - SFX_ITEMSET_ARG( pSh->GetMedium()->GetItemSet(), pItem, SfxBoolItem, SID_VIEWONLY, sal_False ); + SFX_ITEMSET_ARG( pSh->GetMedium()->GetItemSet(), pItem, SfxBoolItem, SID_VIEWONLY, false ); if ( pItem && pItem->GetValue() ) { SfxApplication* pApp = SFX_APP(); SfxAllItemSet aSet( pApp->GetPool() ); aSet.Put( SfxStringItem( SID_FILE_NAME, pMed->GetURLObject().GetMainURL(INetURLObject::NO_DECODE) ) ); - aSet.Put( SfxBoolItem( SID_TEMPLATE, sal_True ) ); + aSet.Put( SfxBoolItem( SID_TEMPLATE, true ) ); aSet.Put( SfxStringItem( SID_TARGETNAME, OUString("_blank") ) ); - SFX_ITEMSET_ARG( pMed->GetItemSet(), pReferer, SfxStringItem, SID_REFERER, sal_False ); + SFX_ITEMSET_ARG( pMed->GetItemSet(), pReferer, SfxStringItem, SID_REFERER, false ); if ( pReferer ) aSet.Put( *pReferer ); - SFX_ITEMSET_ARG( pSh->GetMedium()->GetItemSet(), pVersionItem, SfxInt16Item, SID_VERSION, sal_False ); + SFX_ITEMSET_ARG( pSh->GetMedium()->GetItemSet(), pVersionItem, SfxInt16Item, SID_VERSION, false ); if ( pVersionItem ) aSet.Put( *pVersionItem ); if( pMed->GetFilter() ) { aSet.Put( SfxStringItem( SID_FILTER_NAME, pMed->GetFilter()->GetFilterName() ) ); - SFX_ITEMSET_ARG( pMed->GetItemSet(), pOptions, SfxStringItem, SID_FILE_FILTEROPTIONS, sal_False ); + SFX_ITEMSET_ARG( pMed->GetItemSet(), pOptions, SfxStringItem, SID_FILE_FILTEROPTIONS, false ); if ( pOptions ) aSet.Put( *pOptions ); } @@ -396,7 +396,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) } else { - rReq.SetReturnValue( SfxBoolItem( rReq.GetSlot(), sal_False ) ); + rReq.SetReturnValue( SfxBoolItem( rReq.GetSlot(), false ) ); return; } } @@ -414,7 +414,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) { // this is a read-only document, if it has "Password to modify" // the user should enter password before he can edit the document - rReq.SetReturnValue( SfxBoolItem( rReq.GetSlot(), sal_False ) ); + rReq.SetReturnValue( SfxBoolItem( rReq.GetSlot(), false ) ); return; } @@ -440,7 +440,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) if ( rReq.IsAPI() ) { // Control through API if r/w or r/o - SFX_REQUEST_ARG(rReq, pEditItem, SfxBoolItem, SID_EDITDOC, sal_False); + SFX_REQUEST_ARG(rReq, pEditItem, SfxBoolItem, SID_EDITDOC, false); if ( pEditItem ) nOpenMode = pEditItem->GetValue() ? SFX_STREAM_READWRITE : SFX_STREAM_READONLY; } @@ -451,7 +451,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) utl::LocalFileHelper::ConvertPhysicalNameToURL( pMed->GetPhysicalName(), aTemp ); INetURLObject aPhysObj( aTemp ); SFX_ITEMSET_ARG( pSh->GetMedium()->GetItemSet(), - pVersionItem, SfxInt16Item, SID_VERSION, sal_False ); + pVersionItem, SfxInt16Item, SID_VERSION, false ); INetURLObject aMedObj( pMed->GetName() ); @@ -515,10 +515,10 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) SfxApplication* pApp = SFX_APP(); SfxAllItemSet aSet( pApp->GetPool() ); aSet.Put( SfxStringItem( SID_FILE_NAME, pMed->GetName() ) ); - SFX_ITEMSET_ARG( pMed->GetItemSet(), pReferer, SfxStringItem, SID_REFERER, sal_False ); + SFX_ITEMSET_ARG( pMed->GetItemSet(), pReferer, SfxStringItem, SID_REFERER, false ); if ( pReferer ) aSet.Put( *pReferer ); - aSet.Put( SfxBoolItem( SID_TEMPLATE, sal_True ) ); + aSet.Put( SfxBoolItem( SID_TEMPLATE, true ) ); if ( pVersionItem ) aSet.Put( *pVersionItem ); @@ -526,7 +526,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) { aSet.Put( SfxStringItem( SID_FILTER_NAME, pMed->GetFilter()->GetFilterName() ) ); SFX_ITEMSET_ARG( pMed->GetItemSet(), pOptions, - SfxStringItem, SID_FILE_FILTEROPTIONS, sal_False ); + SfxStringItem, SID_FILE_FILTEROPTIONS, false ); if ( pOptions ) aSet.Put( *pOptions ); } @@ -540,21 +540,21 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) ErrorHandler::HandleError( nErr ); rReq.SetReturnValue( - SfxBoolItem( rReq.GetSlot(), sal_False ) ); + SfxBoolItem( rReq.GetSlot(), false ) ); return; } else { pSh->DoSaveCompleted( pMed ); pSh->Broadcast( SfxSimpleHint(SFX_HINT_MODECHANGED) ); - rReq.SetReturnValue( SfxBoolItem( rReq.GetSlot(), sal_True ) ); + rReq.SetReturnValue( SfxBoolItem( rReq.GetSlot(), true ) ); rReq.Done( sal_True ); return; } } - rReq.AppendItem( SfxBoolItem( SID_FORCERELOAD, sal_True) ); - rReq.AppendItem( SfxBoolItem( SID_SILENT, sal_True )); + rReq.AppendItem( SfxBoolItem( SID_FORCERELOAD, true) ); + rReq.AppendItem( SfxBoolItem( SID_SILENT, true )); } case SID_RELOAD: @@ -566,7 +566,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) break; SfxApplication* pApp = SFX_APP(); SFX_REQUEST_ARG(rReq, pForceReloadItem, SfxBoolItem, - SID_FORCERELOAD, sal_False); + SID_FORCERELOAD, false); if( pForceReloadItem && !pForceReloadItem->GetValue() && !pSh->GetMedium()->IsExpired() ) return; @@ -574,7 +574,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) return; // AutoLoad is prohibited if possible - SFX_REQUEST_ARG(rReq, pAutoLoadItem, SfxBoolItem, SID_AUTOLOAD, sal_False); + SFX_REQUEST_ARG(rReq, pAutoLoadItem, SfxBoolItem, SID_AUTOLOAD, false); if ( pAutoLoadItem && pAutoLoadItem->GetValue() && GetFrame().IsAutoLoadLocked_Impl() ) return; @@ -582,13 +582,13 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) SfxObjectShellLock xOldObj( pSh ); pImp->bReloading = sal_True; SFX_REQUEST_ARG(rReq, pURLItem, SfxStringItem, - SID_FILE_NAME, sal_False); + SID_FILE_NAME, false); // Open as editable? sal_Bool bForEdit = !pSh->IsReadOnly(); // If possible ask the User bool bDo = GetViewShell()->PrepareClose(); - SFX_REQUEST_ARG(rReq, pSilentItem, SfxBoolItem, SID_SILENT, sal_False); + SFX_REQUEST_ARG(rReq, pSilentItem, SfxBoolItem, SID_SILENT, false); if ( bDo && GetFrame().DocIsModified_Impl() && !rReq.IsAPI() && ( !pSilentItem || !pSilentItem->GetValue() ) ) { @@ -672,7 +672,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) // If a salvaged file is present, do not enclose the OrigURL // again, since the Tempdate is invalid after reload. - SFX_ITEMSET_ARG( pNewSet, pSalvageItem, SfxStringItem, SID_DOC_SALVAGE, sal_False); + SFX_ITEMSET_ARG( pNewSet, pSalvageItem, SfxStringItem, SID_DOC_SALVAGE, false); if( pSalvageItem ) { aURL = pSalvageItem->GetValue(); @@ -698,11 +698,11 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) if ( pSilentItem && pSilentItem->GetValue() ) - pNewSet->Put( SfxBoolItem( SID_SILENT, sal_True ) ); + pNewSet->Put( SfxBoolItem( SID_SILENT, true ) ); - SFX_ITEMSET_ARG(pNewSet, pInteractionItem, SfxUnoAnyItem, SID_INTERACTIONHANDLER, sal_False); - SFX_ITEMSET_ARG(pNewSet, pMacroExecItem , SfxUInt16Item, SID_MACROEXECMODE , sal_False); - SFX_ITEMSET_ARG(pNewSet, pDocTemplateItem, SfxUInt16Item, SID_UPDATEDOCMODE , sal_False); + SFX_ITEMSET_ARG(pNewSet, pInteractionItem, SfxUnoAnyItem, SID_INTERACTIONHANDLER, false); + SFX_ITEMSET_ARG(pNewSet, pMacroExecItem , SfxUInt16Item, SID_MACROEXECMODE , false); + SFX_ITEMSET_ARG(pNewSet, pDocTemplateItem, SfxUInt16Item, SID_UPDATEDOCMODE , false); if (!pInteractionItem) { @@ -720,8 +720,8 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) // Do not chache the old Document! Is invalid when loading // another document. - SFX_ITEMSET_ARG( pMedium->GetItemSet(), pSavedOptions, SfxStringItem, SID_FILE_FILTEROPTIONS, sal_False); - SFX_ITEMSET_ARG( pMedium->GetItemSet(), pSavedReferer, SfxStringItem, SID_REFERER, sal_False); + SFX_ITEMSET_ARG( pMedium->GetItemSet(), pSavedOptions, SfxStringItem, SID_FILE_FILTEROPTIONS, false); + SFX_ITEMSET_ARG( pMedium->GetItemSet(), pSavedReferer, SfxStringItem, SID_REFERER, false); sal_Bool bHasStorage = pMedium->HasStorage_Impl(); if( bHandsOff ) @@ -781,7 +781,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) aSet.Put( *pSavedOptions ); if ( pSavedReferer ) aSet.Put( *pSavedReferer ); - aSet.Put( SfxBoolItem( SID_TEMPLATE, sal_True ) ); + aSet.Put( SfxBoolItem( SID_TEMPLATE, true ) ); if( pFilter ) aSet.Put( SfxStringItem( SID_FILTER_NAME, pFilter->GetFilterName() ) ); GetDispatcher()->Execute( SID_OPENDOC, SFX_CALLMODE_ASYNCHRON, aSet ); @@ -841,14 +841,14 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) // Record as done rReq.Done( sal_True ); - rReq.SetReturnValue(SfxBoolItem(rReq.GetSlot(), sal_True)); + rReq.SetReturnValue(SfxBoolItem(rReq.GetSlot(), true)); return; } else { // Record as not done rReq.Done(); - rReq.SetReturnValue(SfxBoolItem(rReq.GetSlot(), sal_False)); + rReq.SetReturnValue(SfxBoolItem(rReq.GetSlot(), false)); pImp->bReloading = sal_False; return; } @@ -885,7 +885,7 @@ void SfxViewFrame::StateReload_Impl( SfxItemSet& rSet ) rSet.DisableItem( SID_EDITDOC ); else { - SFX_ITEMSET_ARG( pSh->GetMedium()->GetItemSet(), pItem, SfxBoolItem, SID_EDITDOC, sal_False ); + SFX_ITEMSET_ARG( pSh->GetMedium()->GetItemSet(), pItem, SfxBoolItem, SID_EDITDOC, false ); if ( pItem && !pItem->GetValue() ) rSet.DisableItem( SID_EDITDOC ); else @@ -1119,7 +1119,7 @@ void SfxViewFrame::ReleaseObjectShell_Impl() xDyingObjSh->GetNoSet_Impl().ReleaseIndex(pImp->nDocViewNo-1); if ( pImp->bObjLocked ) { - xDyingObjSh->OwnerLock( sal_False ); + xDyingObjSh->OwnerLock( false ); pImp->bObjLocked = sal_False; } } @@ -1723,7 +1723,7 @@ void SfxViewFrame::Enable( sal_Bool bEnable ) { // hide cursor if ( pViewSh ) - pViewSh->ShowCursor(sal_False); + pViewSh->ShowCursor(false); } } } @@ -2005,8 +2005,8 @@ SfxViewFrame* SfxViewFrame::LoadDocumentIntoFrame( SfxObjectShell& i_rDoc, const //-------------------------------------------------------------------- SfxViewFrame* SfxViewFrame::DisplayNewDocument( SfxObjectShell& i_rDoc, const SfxRequest& i_rCreateDocRequest, const sal_uInt16 i_nViewId ) { - SFX_REQUEST_ARG( i_rCreateDocRequest, pFrameItem, SfxUnoFrameItem, SID_FILLFRAME, sal_False ); - SFX_REQUEST_ARG( i_rCreateDocRequest, pHiddenItem, SfxBoolItem, SID_HIDDEN, sal_False ); + SFX_REQUEST_ARG( i_rCreateDocRequest, pFrameItem, SfxUnoFrameItem, SID_FILLFRAME, false ); + SFX_REQUEST_ARG( i_rCreateDocRequest, pHiddenItem, SfxBoolItem, SID_HIDDEN, false ); return LoadViewIntoFrame_Impl_NoThrow( i_rDoc, @@ -2294,12 +2294,12 @@ void SfxViewFrame::ExecView_Impl pMed->GetItemSet()->ClearItem( SID_HIDDEN ); // the view ID (optional arg. TODO: this is currently not supported in the slot definition ...) - SFX_REQUEST_ARG( rReq, pViewIdItem, SfxUInt16Item, SID_VIEW_ID, sal_False ); + SFX_REQUEST_ARG( rReq, pViewIdItem, SfxUInt16Item, SID_VIEW_ID, false ); const sal_uInt16 nViewId = pViewIdItem ? pViewIdItem->GetValue() : GetCurViewId(); Reference < XFrame > xFrame; // the frame (optional arg. TODO: this is currently not supported in the slot definition ...) - SFX_REQUEST_ARG( rReq, pFrameItem, SfxUnoFrameItem, SID_FILLFRAME, sal_False ); + SFX_REQUEST_ARG( rReq, pFrameItem, SfxUnoFrameItem, SID_FILLFRAME, false ); if ( pFrameItem ) xFrame = pFrameItem->GetFrame(); @@ -2311,7 +2311,7 @@ void SfxViewFrame::ExecView_Impl case SID_OBJECT: { - SFX_REQUEST_ARG( rReq, pItem, SfxUInt16Item, SID_OBJECT, sal_False ); + SFX_REQUEST_ARG( rReq, pItem, SfxUInt16Item, SID_OBJECT, false ); SfxViewShell *pViewShell = GetViewShell(); if ( pViewShell && pItem ) @@ -2601,7 +2601,7 @@ void SfxViewFrame::AddDispatchMacroToBasic_Impl( const OUString& sMacro ) SfxApplication* pSfxApp = SFX_APP(); SfxRequest aReq( SID_BASICCHOOSER, SFX_CALLMODE_SYNCHRON, pSfxApp->GetPool() ); - aReq.AppendItem( SfxBoolItem(SID_RECORDMACRO,sal_True) ); + aReq.AppendItem( SfxBoolItem(SID_RECORDMACRO,true) ); const SfxPoolItem* pRet = SFX_APP()->ExecuteSlot( aReq ); OUString aScriptURL; if ( pRet ) @@ -2797,7 +2797,7 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq ) xRecorder = xSupplier->getDispatchRecorder(); bool bIsRecording = xRecorder.is(); - SFX_REQUEST_ARG( rReq, pItem, SfxBoolItem, SID_RECORDMACRO, sal_False); + SFX_REQUEST_ARG( rReq, pItem, SfxBoolItem, SID_RECORDMACRO, false); if ( pItem && pItem->GetValue() == bIsRecording ) return; @@ -2807,7 +2807,7 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq ) aProp <<= com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorderSupplier >(); xSet->setPropertyValue(sProperty,aProp); - SFX_REQUEST_ARG( rReq, pRecordItem, SfxBoolItem, FN_PARAM_1, sal_False); + SFX_REQUEST_ARG( rReq, pRecordItem, SfxBoolItem, FN_PARAM_1, false); if ( !pRecordItem || !pRecordItem->GetValue() ) // insert script into basic library container of application AddDispatchMacroToBasic_Impl(xRecorder->getRecordedMacro()); @@ -2866,7 +2866,7 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq ) { OUString aStatusbarResString( "private:resource/statusbar/statusbar" ); // Evaluate parameter. - SFX_REQUEST_ARG(rReq, pShowItem, SfxBoolItem, rReq.GetSlot(), sal_False); + SFX_REQUEST_ARG(rReq, pShowItem, SfxBoolItem, rReq.GetSlot(), false); sal_Bool bShow( sal_True ); if ( !pShowItem ) bShow = xLayoutManager->isElementVisible( aStatusbarResString ); @@ -2891,7 +2891,7 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq ) // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - case SID_WIN_FULLSCREEN: { - SFX_REQUEST_ARG(rReq, pItem, SfxBoolItem, rReq.GetSlot(), sal_False); + SFX_REQUEST_ARG(rReq, pItem, SfxBoolItem, rReq.GetSlot(), false); SfxViewFrame *pTop = GetTopViewFrame(); if ( pTop ) { @@ -3031,7 +3031,7 @@ void SfxViewFrame::MiscState_Impl(SfxItemSet &rSet) OUString( "LayoutManager" ) ); if ( !( aProp >>= xLayoutManager )) - rSet.Put( SfxBoolItem( nWhich, sal_False )); + rSet.Put( SfxBoolItem( nWhich, false )); else { OUString aStatusbarResString( "private:resource/statusbar/statusbar" ); @@ -3088,7 +3088,7 @@ void SfxViewFrame::ChildWindowExecute( SfxRequest &rReq ) // Evaluate Parameter sal_uInt16 nSID = rReq.GetSlot(); - SFX_REQUEST_ARG(rReq, pShowItem, SfxBoolItem, nSID, sal_False); + SFX_REQUEST_ARG(rReq, pShowItem, SfxBoolItem, nSID, false); if ( nSID == SID_VIEW_DATA_SOURCE_BROWSER ) { if (!SvtModuleOptions().IsModuleInstalled(SvtModuleOptions::E_SDATABASE)) diff --git a/sfx2/source/view/viewfrm2.cxx b/sfx2/source/view/viewfrm2.cxx index cba1a79b0aea..e073426e8e97 100644 --- a/sfx2/source/view/viewfrm2.cxx +++ b/sfx2/source/view/viewfrm2.cxx @@ -164,9 +164,9 @@ void SfxViewFrame::Exec_Impl(SfxRequest &rReq ) { case SID_SHOWPOPUPS : { - SFX_REQUEST_ARG(rReq, pShowItem, SfxBoolItem, SID_SHOWPOPUPS, sal_False); + SFX_REQUEST_ARG(rReq, pShowItem, SfxBoolItem, SID_SHOWPOPUPS, false); sal_Bool bShow = pShowItem ? pShowItem->GetValue() : sal_True; - SFX_REQUEST_ARG(rReq, pIdItem, SfxUInt16Item, SID_CONFIGITEMID, sal_False); + SFX_REQUEST_ARG(rReq, pIdItem, SfxUInt16Item, SID_CONFIGITEMID, false); sal_uInt16 nId = pIdItem ? pIdItem->GetValue() : 0; SfxWorkWindow *pWorkWin = GetFrame().GetWorkWindow_Impl(); @@ -207,7 +207,7 @@ void SfxViewFrame::Exec_Impl(SfxRequest &rReq ) case SID_NEWDOCDIRECT : { - SFX_REQUEST_ARG( rReq, pFactoryItem, SfxStringItem, SID_NEWDOCDIRECT, sal_False); + SFX_REQUEST_ARG( rReq, pFactoryItem, SfxStringItem, SID_NEWDOCDIRECT, false); OUString aFactName; if ( pFactoryItem ) aFactName = pFactoryItem->GetValue(); diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx index 12e5633d3272..7404ede137c6 100644 --- a/sfx2/source/view/viewprn.cxx +++ b/sfx2/source/view/viewprn.cxx @@ -645,7 +645,7 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq ) // Should it be visible on the user interface, // should it launch popup dialogue ? - SFX_REQUEST_ARG(rReq, pSilentItem, SfxBoolItem, SID_SILENT, sal_False); + SFX_REQUEST_ARG(rReq, pSilentItem, SfxBoolItem, SID_SILENT, false); bSilent = pSilentItem && pSilentItem->GetValue(); } @@ -668,7 +668,7 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq ) // derived class may decide to abort this if( pDoc == NULL || !pDoc->QuerySlotExecutable( nId ) ) { - rReq.SetReturnValue( SfxBoolItem( 0, sal_False ) ); + rReq.SetReturnValue( SfxBoolItem( 0, false ) ); return; } @@ -676,7 +676,7 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq ) return; // should we print only the selection or the whole document - SFX_REQUEST_ARG(rReq, pSelectItem, SfxBoolItem, SID_SELECTION, sal_False); + SFX_REQUEST_ARG(rReq, pSelectItem, SfxBoolItem, SID_SELECTION, false); sal_Bool bSelection = ( pSelectItem != NULL && pSelectItem->GetValue() ); // detect non api call from writer ( that adds SID_SELECTION ) and reset bIsAPI if ( pSelectItem && rReq.GetArgs()->Count() == 1 ) @@ -763,7 +763,7 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq ) SfxPrinter *pDocPrinter = GetPrinter(sal_True); // look for printer in parameters - SFX_REQUEST_ARG( rReq, pPrinterItem, SfxStringItem, SID_PRINTER_NAME, sal_False ); + SFX_REQUEST_ARG( rReq, pPrinterItem, SfxStringItem, SID_PRINTER_NAME, false ); if ( pPrinterItem ) { // use PrinterName parameter to create a printer @@ -793,7 +793,7 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq ) if ( !bSilent ) ErrorBox( NULL, WB_OK | WB_DEF_OK, SfxResId(STR_NODEFPRINTER).toString() ).Execute(); - rReq.SetReturnValue(SfxBoolItem(0,sal_False)); + rReq.SetReturnValue(SfxBoolItem(0,false)); break; } @@ -804,7 +804,7 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq ) // if printer is busy, abort configuration if ( !bSilent ) InfoBox( NULL, SfxResId(STR_ERROR_PRINTER_BUSY).toString() ).Execute(); - rReq.SetReturnValue(SfxBoolItem(0,sal_False)); + rReq.SetReturnValue(SfxBoolItem(0,false)); return; } @@ -872,7 +872,7 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq ) DELETEZ( pDlgPrinter ); rReq.Ignore(); if ( SID_PRINTDOC == nId ) - rReq.SetReturnValue(SfxBoolItem(0,sal_False)); + rReq.SetReturnValue(SfxBoolItem(0,false)); } } } diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index cdababa4893b..4cad3d252866 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -437,7 +437,7 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq ) { case SID_STYLE_FAMILY : { - SFX_REQUEST_ARG(rReq, pItem, SfxUInt16Item, nId, sal_False); + SFX_REQUEST_ARG(rReq, pItem, SfxUInt16Item, nId, false); if (pItem) { pImp->m_nFamily = pItem->GetValue(); @@ -520,11 +520,11 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq ) SfxMailModel aModel; OUString aDocType; - SFX_REQUEST_ARG(rReq, pMailSubject, SfxStringItem, SID_MAIL_SUBJECT, sal_False ); + SFX_REQUEST_ARG(rReq, pMailSubject, SfxStringItem, SID_MAIL_SUBJECT, false ); if ( pMailSubject ) aModel.SetSubject( pMailSubject->GetValue() ); - SFX_REQUEST_ARG(rReq, pMailRecipient, SfxStringItem, SID_MAIL_RECIPIENT, sal_False ); + SFX_REQUEST_ARG(rReq, pMailRecipient, SfxStringItem, SID_MAIL_RECIPIENT, false ); if ( pMailRecipient ) { OUString aRecipient( pMailRecipient->GetValue() ); @@ -534,7 +534,7 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq ) aRecipient = aRecipient.copy( aMailToStr.getLength() ); aModel.AddAddress( aRecipient, SfxMailModel::ROLE_TO ); } - SFX_REQUEST_ARG(rReq, pMailDocType, SfxStringItem, SID_TYPE_NAME, sal_False ); + SFX_REQUEST_ARG(rReq, pMailDocType, SfxStringItem, SID_TYPE_NAME, false ); if ( pMailDocType ) aDocType = pMailDocType->GetValue(); @@ -679,7 +679,7 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq ) OSL_ASSERT( !aFileName.isEmpty() ); // Creates a temporary directory to store our predefined file into it. - ::utl::TempFile aTempDir( NULL, sal_True ); + ::utl::TempFile aTempDir( NULL, true ); INetURLObject aFilePathObj( aTempDir.GetURL() ); aFilePathObj.insertName( aFileName ); @@ -715,7 +715,7 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq ) // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - case SID_PLUGINS_ACTIVE: { - SFX_REQUEST_ARG(rReq, pShowItem, SfxBoolItem, nId, sal_False); + SFX_REQUEST_ARG(rReq, pShowItem, SfxBoolItem, nId, false); bool const bActive = (pShowItem) ? pShowItem->GetValue() : !pImp->m_bPlugInsActive; @@ -901,7 +901,7 @@ void SfxViewShell::UIActivating( SfxInPlaceClient* /*pClient*/ ) if ( xParentFrame.is() ) xParentFrame->setActiveFrame( xOwnFrame ); - pFrame->GetBindings().HidePopups(sal_True); + pFrame->GetBindings().HidePopups(true); pFrame->GetDispatcher()->Update_Impl( sal_True ); } @@ -911,7 +911,7 @@ void SfxViewShell::UIDeactivated( SfxInPlaceClient* /*pClient*/ ) { if ( !pFrame->GetFrame().IsClosing_Impl() || SfxViewFrame::Current() != pFrame ) pFrame->GetDispatcher()->Update_Impl( sal_True ); - pFrame->GetBindings().HidePopups(sal_False); + pFrame->GetBindings().HidePopups(false); pFrame->GetBindings().InvalidateAll(sal_True); } @@ -1586,7 +1586,7 @@ void SfxViewShell::Notify( SfxBroadcaster& rBC, if ( frame == GetViewFrame() && &rBC == GetObjectShell() ) { SfxItemSet* pSet = GetObjectShell()->GetMedium()->GetItemSet(); - SFX_ITEMSET_ARG( pSet, pItem, SfxUnoAnyItem, SID_VIEW_DATA, sal_False ); + SFX_ITEMSET_ARG( pSet, pItem, SfxUnoAnyItem, SID_VIEW_DATA, false ); if ( pItem ) { pImp->m_pController->restoreViewData( pItem->GetValue() ); |