diff options
Diffstat (limited to 'sc')
36 files changed, 171 insertions, 171 deletions
diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx index 28e40ba85212..53492a309565 100644 --- a/sc/source/core/data/docpool.cxx +++ b/sc/source/core/data/docpool.cxx @@ -690,7 +690,7 @@ void ScDocumentPool::CellStyleCreated( const OUString& rName ) SfxItemPool* ScDocumentPool::Clone() const { - return new SfxItemPool (*this, sal_True); + return new SfxItemPool (*this, true); } static SfxItemPresentation lcl_HFPresentation diff --git a/sc/source/core/tool/progress.cxx b/sc/source/core/tool/progress.cxx index e066dfa698d4..dcbc3c6f1258 100644 --- a/sc/source/core/tool/progress.cxx +++ b/sc/source/core/tool/progress.cxx @@ -56,7 +56,7 @@ static sal_Bool lcl_IsHiddenDocument( SfxObjectShell* pObjSh ) { SfxItemSet* pSet = pMed->GetItemSet(); const SfxPoolItem* pItem; - if ( pSet && SFX_ITEM_SET == pSet->GetItemState( SID_HIDDEN, sal_True, &pItem ) && + if ( pSet && SFX_ITEM_SET == pSet->GetItemState( SID_HIDDEN, true, &pItem ) && ((const SfxBoolItem*)pItem)->GetValue() ) return sal_True; } diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx index f5c45d539e2d..f4f8ffce6792 100644 --- a/sc/source/filter/excel/xestyle.cxx +++ b/sc/source/filter/excel/xestyle.cxx @@ -2955,7 +2955,7 @@ XclExpDxfs::XclExpDxfs( const XclExpRoot& rRoot ) XclExpNumFmt* pNumFormat = NULL; const SfxPoolItem *pPoolItem = NULL; - if( rSet.GetItemState( ATTR_VALUE_FORMAT, sal_True, &pPoolItem ) == SFX_ITEM_SET ) + if( rSet.GetItemState( ATTR_VALUE_FORMAT, true, &pPoolItem ) == SFX_ITEM_SET ) { sal_uLong nScNumFmt = static_cast< sal_uInt32 >( static_cast< const SfxInt32Item* >(pPoolItem)->GetValue()); sal_Int32 nXclNumFmt = GetRoot().GetNumFmtBuffer().Insert(nScNumFmt); diff --git a/sc/source/filter/rtf/eeimpars.cxx b/sc/source/filter/rtf/eeimpars.cxx index 70ab96c7d030..20595e6dc1f9 100644 --- a/sc/source/filter/rtf/eeimpars.cxx +++ b/sc/source/filter/rtf/eeimpars.cxx @@ -181,7 +181,7 @@ void ScEEImport::WriteToDocument( bool bSizeColsRows, double nOutputFactor, SvNu for (sal_uInt16 nId = EE_CHAR_START; nId <= EE_CHAR_END && bSimple; nId++) { const SfxPoolItem* pItem = 0; - SfxItemState eState = aSet.GetItemState( nId, sal_True, &pItem ); + SfxItemState eState = aSet.GetItemState( nId, true, &pItem ); if (eState == SFX_ITEM_DONTCARE) bSimple = false; else if (eState == SFX_ITEM_SET) diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx index 002c4516369c..87600c6f9aaf 100644 --- a/sc/source/filter/xcl97/xcl97rec.cxx +++ b/sc/source/filter/xcl97/xcl97rec.cxx @@ -752,7 +752,7 @@ XclTxo::XclTxo( const XclExpRoot& rRoot, const EditTextObject& rEditObj, SdrObje { SfxItemSet aSet( rEditObj.GetParaAttribs( 0)); const SfxPoolItem* pItem = NULL; - if( aSet.GetItemState( EE_PARA_JUST, sal_True, &pItem ) == SFX_ITEM_SET ) + if( aSet.GetItemState( EE_PARA_JUST, true, &pItem ) == SFX_ITEM_SET ) { SvxAdjust eEEAlign = static_cast< const SvxAdjustItem& >( *pItem ).GetAdjust(); pCaption->SetMergedItem( SvxAdjustItem( eEEAlign, EE_PARA_JUST ) ); diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx index eaaf6f7bebf5..0c0ec2583b5a 100644 --- a/sc/source/ui/Accessibility/AccessibleDocument.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx @@ -390,7 +390,7 @@ void ScChildrenShapes::SetDrawBroadcaster() SfxBroadcaster* pDrawBC = mpViewShell->GetViewData()->GetDocument()->GetDrawBroadcaster(); if (pDrawBC) { - StartListening(*pDrawBC, sal_True); + StartListening(*pDrawBC, true); maShapeTreeInfo.SetModelBroadcaster( new ScDrawModelBroadcaster(mpViewShell->GetViewData()->GetDocument()->GetDrawLayer()) ); maShapeTreeInfo.SetSdrView(mpViewShell->GetViewData()->GetScDrawView()); diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx index 6145fcf98b44..daa8605addc9 100644 --- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx @@ -753,7 +753,7 @@ void ScShapeChildren::SetDrawBroadcaster() { SfxBroadcaster* pDrawBC = mpViewShell->GetDocument()->GetDrawBroadcaster(); if (pDrawBC) - StartListening(*pDrawBC, sal_True); + StartListening(*pDrawBC, true); } } diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index 3ddc2a7f281b..01ebacbbb545 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -402,7 +402,7 @@ void ScModule::Execute( SfxRequest& rReq ) { sal_Bool bSet; const SfxPoolItem* pItem; - if ( pReqArgs && SFX_ITEM_SET == pReqArgs->GetItemState( nSlot, sal_True, &pItem ) ) + if ( pReqArgs && SFX_ITEM_SET == pReqArgs->GetItemState( nSlot, true, &pItem ) ) bSet = ((const SfxBoolItem*)pItem)->GetValue(); else { // Toggle @@ -423,7 +423,7 @@ void ScModule::Execute( SfxRequest& rReq ) case SID_ATTR_METRIC: { const SfxPoolItem* pItem; - if ( pReqArgs && SFX_ITEM_SET == pReqArgs->GetItemState( nSlot, sal_True, &pItem ) ) + if ( pReqArgs && SFX_ITEM_SET == pReqArgs->GetItemState( nSlot, true, &pItem ) ) { FieldUnit eUnit = (FieldUnit)((const SfxUInt16Item*)pItem)->GetValue(); switch( eUnit ) @@ -507,7 +507,7 @@ void ScModule::Execute( SfxRequest& rReq ) case SID_ATTR_CHAR_CTL_LANGUAGE: { const SfxPoolItem* pItem; - if ( pReqArgs && SFX_ITEM_SET == pReqArgs->GetItemState( GetPool().GetWhich(nSlot), sal_True, &pItem ) ) + if ( pReqArgs && SFX_ITEM_SET == pReqArgs->GetItemState( GetPool().GetWhich(nSlot), true, &pItem ) ) { ScDocShell* pDocSh = PTR_CAST(ScDocShell, SfxObjectShell::Current()); ScDocument* pDoc = pDocSh ? pDocSh->GetDocument() : NULL; diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx index 1d944cab910c..eb595148de37 100644 --- a/sc/source/ui/condformat/condformatdlgentry.cxx +++ b/sc/source/ui/condformat/condformatdlgentry.cxx @@ -1238,7 +1238,7 @@ ScDateFrmtEntry::ScDateFrmtEntry( Window* pParent, ScDocument* pDoc, const ScCon Init(); FreeResource(); - StartListening(*pDoc->GetStyleSheetPool(), sal_True); + StartListening(*pDoc->GetStyleSheetPool(), true); if(pFormat) { diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx index 1a15e6e44346..93359481c577 100644 --- a/sc/source/ui/dbgui/tpsort.cxx +++ b/sc/source/ui/dbgui/tpsort.cxx @@ -246,7 +246,7 @@ sal_Bool ScTabPageSortFields::FillItemSet( SfxItemSet& rArgSet ) { const SfxItemSet* pExample = pDlg->GetExampleSet(); const SfxPoolItem* pItem; - if ( pExample && pExample->GetItemState( nWhichSort, sal_True, &pItem ) == SFX_ITEM_SET ) + if ( pExample && pExample->GetItemState( nWhichSort, true, &pItem ) == SFX_ITEM_SET ) { ScSortParam aTempData = static_cast<const ScSortItem*>(pItem)->GetSortData(); aTempData.maKeyState = aNewSortData.maKeyState; @@ -729,7 +729,7 @@ sal_Bool ScTabPageSortOptions::FillItemSet( SfxItemSet& rArgSet ) { const SfxItemSet* pExample = pDlg->GetExampleSet(); const SfxPoolItem* pItem; - if ( pExample && pExample->GetItemState( nWhichSort, sal_True, &pItem ) == SFX_ITEM_SET ) + if ( pExample && pExample->GetItemState( nWhichSort, true, &pItem ) == SFX_ITEM_SET ) aNewSortData = static_cast<const ScSortItem*>(pItem)->GetSortData(); } aNewSortData.bByRow = m_pBtnTopDown->IsChecked(); diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx index ce1f6f73d4a9..d7d5abcaa19f 100644 --- a/sc/source/ui/dbgui/validate.cxx +++ b/sc/source/ui/dbgui/validate.cxx @@ -374,37 +374,37 @@ void ScTPValidationValue::Reset( const SfxItemSet& rArgSet ) const SfxPoolItem* pItem; sal_uInt16 nLbPos = SC_VALIDDLG_ALLOW_ANY; - if( rArgSet.GetItemState( FID_VALID_MODE, sal_True, &pItem ) == SFX_ITEM_SET ) + if( rArgSet.GetItemState( FID_VALID_MODE, true, &pItem ) == SFX_ITEM_SET ) nLbPos = lclGetPosFromValMode( static_cast< ScValidationMode >( static_cast< const SfxAllEnumItem* >( pItem )->GetValue() ) ); maLbAllow.SelectEntryPos( nLbPos ); nLbPos = SC_VALIDDLG_DATA_EQUAL; - if( rArgSet.GetItemState( FID_VALID_CONDMODE, sal_True, &pItem ) == SFX_ITEM_SET ) + if( rArgSet.GetItemState( FID_VALID_CONDMODE, true, &pItem ) == SFX_ITEM_SET ) nLbPos = lclGetPosFromCondMode( static_cast< ScConditionMode >( static_cast< const SfxAllEnumItem* >( pItem )->GetValue() ) ); maLbValue.SelectEntryPos( nLbPos ); // *** check boxes *** sal_Bool bCheck = sal_True; - if( rArgSet.GetItemState( FID_VALID_BLANK, sal_True, &pItem ) == SFX_ITEM_SET ) + if( rArgSet.GetItemState( FID_VALID_BLANK, true, &pItem ) == SFX_ITEM_SET ) bCheck = static_cast< const SfxBoolItem* >( pItem )->GetValue(); maCbAllow.Check( bCheck ); sal_Int32 nListType = ValidListType::UNSORTED; - if( rArgSet.GetItemState( FID_VALID_LISTTYPE, sal_True, &pItem ) == SFX_ITEM_SET ) + if( rArgSet.GetItemState( FID_VALID_LISTTYPE, true, &pItem ) == SFX_ITEM_SET ) nListType = static_cast< const SfxInt16Item* >( pItem )->GetValue(); maCbShow.Check( nListType != ValidListType::INVISIBLE ); maCbSort.Check( nListType == ValidListType::SORTEDASCENDING ); // *** formulas *** OUString aFmlaStr; - if ( rArgSet.GetItemState( FID_VALID_VALUE1, sal_True, &pItem ) == SFX_ITEM_SET ) + if ( rArgSet.GetItemState( FID_VALID_VALUE1, true, &pItem ) == SFX_ITEM_SET ) aFmlaStr = static_cast< const SfxStringItem* >( pItem )->GetValue(); SetFirstFormula( aFmlaStr ); aFmlaStr= ""; - if ( rArgSet.GetItemState( FID_VALID_VALUE2, sal_True, &pItem ) == SFX_ITEM_SET ) + if ( rArgSet.GetItemState( FID_VALID_VALUE2, true, &pItem ) == SFX_ITEM_SET ) aFmlaStr = static_cast< const SfxStringItem* >( pItem )->GetValue(); SetSecondFormula( aFmlaStr ); @@ -727,17 +727,17 @@ void ScTPValidationHelp::Reset( const SfxItemSet& rArgSet ) { const SfxPoolItem* pItem; - if ( rArgSet.GetItemState( FID_VALID_SHOWHELP, sal_True, &pItem ) == SFX_ITEM_SET ) + if ( rArgSet.GetItemState( FID_VALID_SHOWHELP, true, &pItem ) == SFX_ITEM_SET ) pTsbHelp->SetState( ((const SfxBoolItem*)pItem)->GetValue() ? STATE_CHECK : STATE_NOCHECK ); else pTsbHelp->SetState( STATE_NOCHECK ); - if ( rArgSet.GetItemState( FID_VALID_HELPTITLE, sal_True, &pItem ) == SFX_ITEM_SET ) + if ( rArgSet.GetItemState( FID_VALID_HELPTITLE, true, &pItem ) == SFX_ITEM_SET ) pEdtTitle->SetText( ((const SfxStringItem*)pItem)->GetValue() ); else pEdtTitle->SetText( EMPTY_OUSTRING ); - if ( rArgSet.GetItemState( FID_VALID_HELPTEXT, sal_True, &pItem ) == SFX_ITEM_SET ) + if ( rArgSet.GetItemState( FID_VALID_HELPTEXT, true, &pItem ) == SFX_ITEM_SET ) pEdInputHelp->SetText( ((const SfxStringItem*)pItem)->GetValue() ); else pEdInputHelp->SetText( EMPTY_OUSTRING ); @@ -816,22 +816,22 @@ void ScTPValidationError::Reset( const SfxItemSet& rArgSet ) { const SfxPoolItem* pItem; - if ( rArgSet.GetItemState( FID_VALID_SHOWERR, sal_True, &pItem ) == SFX_ITEM_SET ) + if ( rArgSet.GetItemState( FID_VALID_SHOWERR, true, &pItem ) == SFX_ITEM_SET ) m_pTsbShow->SetState( ((const SfxBoolItem*)pItem)->GetValue() ? STATE_CHECK : STATE_NOCHECK ); else m_pTsbShow->SetState( STATE_CHECK ); // check by default - if ( rArgSet.GetItemState( FID_VALID_ERRSTYLE, sal_True, &pItem ) == SFX_ITEM_SET ) + if ( rArgSet.GetItemState( FID_VALID_ERRSTYLE, true, &pItem ) == SFX_ITEM_SET ) m_pLbAction->SelectEntryPos( ((const SfxAllEnumItem*)pItem)->GetValue() ); else m_pLbAction->SelectEntryPos( 0 ); - if ( rArgSet.GetItemState( FID_VALID_ERRTITLE, sal_True, &pItem ) == SFX_ITEM_SET ) + if ( rArgSet.GetItemState( FID_VALID_ERRTITLE, true, &pItem ) == SFX_ITEM_SET ) m_pEdtTitle->SetText( ((const SfxStringItem*)pItem)->GetValue() ); else m_pEdtTitle->SetText( EMPTY_OUSTRING ); - if ( rArgSet.GetItemState( FID_VALID_ERRTEXT, sal_True, &pItem ) == SFX_ITEM_SET ) + if ( rArgSet.GetItemState( FID_VALID_ERRTEXT, true, &pItem ) == SFX_ITEM_SET ) m_pEdError->SetText( ((const SfxStringItem*)pItem)->GetValue() ); else m_pEdError->SetText( EMPTY_OUSTRING ); diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index d933baec8775..e3a9f4f5dac0 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -1098,7 +1098,7 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) SfxItemSet* pSet = rMedium.GetItemSet(); const SfxPoolItem* pItem; if ( pSet && SFX_ITEM_SET == - pSet->GetItemState( SID_FILE_FILTEROPTIONS, sal_True, &pItem ) ) + pSet->GetItemState( SID_FILE_FILTEROPTIONS, true, &pItem ) ) { sItStr = ((const SfxStringItem*)pItem)->GetValue(); } @@ -1171,7 +1171,7 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) sal_Bool bOptInit = false; if ( pSet && SFX_ITEM_SET == - pSet->GetItemState( SID_FILE_FILTEROPTIONS, sal_True, &pItem ) ) + pSet->GetItemState( SID_FILE_FILTEROPTIONS, true, &pItem ) ) { aOptions.ReadFromString( ((const SfxStringItem*)pItem)->GetValue() ); bOptInit = sal_True; @@ -1237,7 +1237,7 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) SfxItemSet* pSet = rMedium.GetItemSet(); const SfxPoolItem* pItem; if ( pSet && SFX_ITEM_SET == - pSet->GetItemState( SID_FILE_FILTEROPTIONS, sal_True, &pItem ) ) + pSet->GetItemState( SID_FILE_FILTEROPTIONS, true, &pItem ) ) { sItStr = ((const SfxStringItem*)pItem)->GetValue(); } @@ -1278,7 +1278,7 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) SfxItemSet* pSet = rMedium.GetItemSet(); const SfxPoolItem* pItem; if ( pSet && SFX_ITEM_SET == - pSet->GetItemState( SID_FILE_FILTEROPTIONS, sal_True, &pItem ) ) + pSet->GetItemState( SID_FILE_FILTEROPTIONS, true, &pItem ) ) { sItStr = ((const SfxStringItem*)pItem)->GetValue(); } @@ -1403,7 +1403,7 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) SfxItemSet* pSet = rMedium.GetItemSet(); const SfxPoolItem* pItem; if ( pSet && SFX_ITEM_SET == - pSet->GetItemState( SID_FILE_FILTEROPTIONS, sal_True, &pItem ) ) + pSet->GetItemState( SID_FILE_FILTEROPTIONS, true, &pItem ) ) { OUString aFilterOption = (static_cast<const SfxStringItem*>(pItem))->GetValue(); lcl_parseHtmlFilterOption(aFilterOption, eLang, bDateConvert); @@ -2235,7 +2235,7 @@ sal_Bool ScDocShell::ConvertTo( SfxMedium &rMed ) { SfxItemSet* pItemSet = rMed.GetItemSet(); const SfxPoolItem* pItem = 0; - if( pItemSet && pItemSet->GetItemState( SID_PASSWORD, sal_True, &pItem ) == SFX_ITEM_SET ) + if( pItemSet && pItemSet->GetItemState( SID_PASSWORD, true, &pItem ) == SFX_ITEM_SET ) { bDoSave = ScWarnPassword::WarningOnPassword( rMed ); // #i42858# remove password from medium (warn only one time) @@ -2279,7 +2279,7 @@ sal_Bool ScDocShell::ConvertTo( SfxMedium &rMed ) SfxItemSet* pSet = rMed.GetItemSet(); const SfxPoolItem* pItem; if ( pSet && SFX_ITEM_SET == - pSet->GetItemState( SID_FILE_FILTEROPTIONS, sal_True, &pItem ) ) + pSet->GetItemState( SID_FILE_FILTEROPTIONS, true, &pItem ) ) { sItStr = ((const SfxStringItem*)pItem)->GetValue(); } @@ -2309,7 +2309,7 @@ sal_Bool ScDocShell::ConvertTo( SfxMedium &rMed ) SfxItemSet* pSet = rMed.GetItemSet(); const SfxPoolItem* pItem; if ( pSet && SFX_ITEM_SET == - pSet->GetItemState( SID_FILE_FILTEROPTIONS, sal_True, &pItem ) ) + pSet->GetItemState( SID_FILE_FILTEROPTIONS, true, &pItem ) ) { sCharSet = ((const SfxStringItem*)pItem)->GetValue(); } @@ -2376,7 +2376,7 @@ sal_Bool ScDocShell::ConvertTo( SfxMedium &rMed ) SfxItemSet* pSet = rMed.GetItemSet(); const SfxPoolItem* pItem; if ( pSet && SFX_ITEM_SET == - pSet->GetItemState( SID_FILE_FILTEROPTIONS, sal_True, &pItem ) ) + pSet->GetItemState( SID_FILE_FILTEROPTIONS, true, &pItem ) ) { sItStr = ((const SfxStringItem*)pItem)->GetValue(); } diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index 6072373ff484..eea84048a862 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -189,11 +189,11 @@ void ScDocShell::Execute( SfxRequest& rReq ) } OUString sTarget; - if ( pReqArgs->GetItemState( FN_PARAM_1, sal_True, &pItem ) == SFX_ITEM_SET ) + if ( pReqArgs->GetItemState( FN_PARAM_1, true, &pItem ) == SFX_ITEM_SET ) sTarget = ((const SfxStringItem*)pItem)->GetValue(); sal_Bool bIsNewArea = sal_True; // Default sal_True (keine Nachfrage) - if ( pReqArgs->GetItemState( FN_PARAM_2, sal_True, &pItem ) == SFX_ITEM_SET ) + if ( pReqArgs->GetItemState( FN_PARAM_2, true, &pItem ) == SFX_ITEM_SET ) bIsNewArea = ((const SfxBoolItem*)pItem)->GetValue(); // bei Bedarf neuen Datenbankbereich anlegen @@ -390,7 +390,7 @@ void ScDocShell::Execute( SfxRequest& rReq ) { sal_Bool bNewVal; const SfxPoolItem* pItem; - if ( pReqArgs && SFX_ITEM_SET == pReqArgs->GetItemState( nSlot, sal_True, &pItem ) ) + if ( pReqArgs && SFX_ITEM_SET == pReqArgs->GetItemState( nSlot, true, &pItem ) ) bNewVal = ((const SfxBoolItem*)pItem)->GetValue(); else bNewVal = !aDocument.GetAutoCalc(); // Toggle fuer Menue @@ -673,26 +673,26 @@ void ScDocShell::Execute( SfxRequest& rReq ) const SfxPoolItem* pItem; SfxMedium* pMed = NULL; if ( pReqArgs && - pReqArgs->GetItemState( SID_FILE_NAME, sal_True, &pItem ) == SFX_ITEM_SET && + pReqArgs->GetItemState( SID_FILE_NAME, true, &pItem ) == SFX_ITEM_SET && pItem->ISA(SfxStringItem) ) { OUString aFileName = static_cast<const SfxStringItem*>(pItem)->GetValue(); OUString aFilterName; - if ( pReqArgs->GetItemState( SID_FILTER_NAME, sal_True, &pItem ) == SFX_ITEM_SET && + if ( pReqArgs->GetItemState( SID_FILTER_NAME, true, &pItem ) == SFX_ITEM_SET && pItem->ISA(SfxStringItem) ) { aFilterName = static_cast<const SfxStringItem*>(pItem)->GetValue(); } OUString aOptions; - if ( pReqArgs->GetItemState( SID_FILE_FILTEROPTIONS, sal_True, &pItem ) == SFX_ITEM_SET && + if ( pReqArgs->GetItemState( SID_FILE_FILTEROPTIONS, true, &pItem ) == SFX_ITEM_SET && pItem->ISA(SfxStringItem) ) { aOptions = static_cast<const SfxStringItem*>(pItem)->GetValue(); } short nVersion = 0; - if ( pReqArgs->GetItemState( SID_VERSION, sal_True, &pItem ) == SFX_ITEM_SET && + if ( pReqArgs->GetItemState( SID_VERSION, true, &pItem ) == SFX_ITEM_SET && pItem->ISA(SfxInt16Item) ) { nVersion = static_cast<const SfxInt16Item*>(pItem)->GetValue(); @@ -812,7 +812,7 @@ void ScDocShell::Execute( SfxRequest& rReq ) if (pReqArgs) { const SfxPoolItem* pItem; - if ( pReqArgs->GetItemState( nSlot, sal_True, &pItem ) == SFX_ITEM_SET ) + if ( pReqArgs->GetItemState( nSlot, true, &pItem ) == SFX_ITEM_SET ) { if ( pItem->ISA(SfxStringItem) ) { @@ -840,7 +840,7 @@ void ScDocShell::Execute( SfxRequest& rReq ) case SID_EDIT_SCENARIO: { const SfxPoolItem* pItem; - if ( pReqArgs->GetItemState( nSlot, sal_True, &pItem ) == SFX_ITEM_SET ) + if ( pReqArgs->GetItemState( nSlot, true, &pItem ) == SFX_ITEM_SET ) { if ( pItem->ISA(SfxStringItem) ) { @@ -889,7 +889,7 @@ void ScDocShell::Execute( SfxRequest& rReq ) case SID_ATTR_YEAR2000 : { const SfxPoolItem* pItem; - if ( pReqArgs->GetItemState( nSlot, sal_True, &pItem ) == SFX_ITEM_SET ) + if ( pReqArgs->GetItemState( nSlot, true, &pItem ) == SFX_ITEM_SET ) { if ( pItem->ISA(SfxUInt16Item) ) { @@ -2298,7 +2298,7 @@ IMPL_LINK( ScDocShell, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg ) const SfxPoolItem* pItem = NULL; SfxItemSet* pSet = pMed->GetItemSet(); if ( pSet && - pSet->GetItemState( SID_VERSION, sal_True, &pItem ) == SFX_ITEM_SET && + pSet->GetItemState( SID_VERSION, true, &pItem ) == SFX_ITEM_SET && pItem->ISA( SfxInt16Item ) ) { pImpl->pRequest->AppendItem( *pItem ); diff --git a/sc/source/ui/drawfunc/drawsh5.cxx b/sc/source/ui/drawfunc/drawsh5.cxx index bec4d5c77af5..13dff40c40c0 100644 --- a/sc/source/ui/drawfunc/drawsh5.cxx +++ b/sc/source/ui/drawfunc/drawsh5.cxx @@ -151,7 +151,7 @@ void ScDrawShell::ExecuteHLink( SfxRequest& rReq ) if( pReqArgs ) { const SfxPoolItem* pItem; - if ( pReqArgs->GetItemState( SID_HYPERLINK_SETLINK, sal_True, &pItem ) == SFX_ITEM_SET ) + if ( pReqArgs->GetItemState( SID_HYPERLINK_SETLINK, true, &pItem ) == SFX_ITEM_SET ) { const SvxHyperlinkItem* pHyper = (const SvxHyperlinkItem*) pItem; const OUString& rName = pHyper->GetName(); diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx index 5f71ce66fa7f..8b46befb671d 100644 --- a/sc/source/ui/drawfunc/drtxtob.cxx +++ b/sc/source/ui/drawfunc/drtxtob.cxx @@ -180,7 +180,7 @@ void ScDrawTextObjectBar::Execute( SfxRequest &rReq ) sal_uLong nFormat = 0; const SfxPoolItem* pItem; if ( pReqArgs && - pReqArgs->GetItemState(nSlot, sal_True, &pItem) == SFX_ITEM_SET && + pReqArgs->GetItemState(nSlot, true, &pItem) == SFX_ITEM_SET && pItem->ISA(SfxUInt32Item) ) { nFormat = ((const SfxUInt32Item*)pItem)->GetValue(); @@ -258,7 +258,7 @@ void ScDrawTextObjectBar::Execute( SfxRequest &rReq ) if( pReqArgs ) { const SfxPoolItem* pItem; - if ( pReqArgs->GetItemState( SID_HYPERLINK_SETLINK, sal_True, &pItem ) == SFX_ITEM_SET ) + if ( pReqArgs->GetItemState( SID_HYPERLINK_SETLINK, true, &pItem ) == SFX_ITEM_SET ) { const SvxHyperlinkItem* pHyper = (const SvxHyperlinkItem*) pItem; const OUString& rName = pHyper->GetName(); @@ -1061,7 +1061,7 @@ void ScDrawTextObjectBar::GetAttrState( SfxItemSet& rDestSet ) // Unterstreichung - eState = aAttrSet.GetItemState( EE_CHAR_UNDERLINE, sal_True ); + eState = aAttrSet.GetItemState( EE_CHAR_UNDERLINE, true ); if ( eState == SFX_ITEM_DONTCARE ) { rDestSet.InvalidateItem( SID_ULINE_VAL_NONE ); diff --git a/sc/source/ui/drawfunc/fuins1.cxx b/sc/source/ui/drawfunc/fuins1.cxx index a7c135789dea..61cd7882623d 100644 --- a/sc/source/ui/drawfunc/fuins1.cxx +++ b/sc/source/ui/drawfunc/fuins1.cxx @@ -243,16 +243,16 @@ FuInsertGraphic::FuInsertGraphic( ScTabViewShell* pViewSh, const SfxItemSet* pReqArgs = rReq.GetArgs(); const SfxPoolItem* pItem; if ( pReqArgs && - pReqArgs->GetItemState( SID_INSERT_GRAPHIC, sal_True, &pItem ) == SFX_ITEM_SET ) + pReqArgs->GetItemState( SID_INSERT_GRAPHIC, true, &pItem ) == SFX_ITEM_SET ) { OUString aFileName = ((const SfxStringItem*)pItem)->GetValue(); OUString aFilterName; - if ( pReqArgs->GetItemState( FN_PARAM_FILTER, sal_True, &pItem ) == SFX_ITEM_SET ) + if ( pReqArgs->GetItemState( FN_PARAM_FILTER, true, &pItem ) == SFX_ITEM_SET ) aFilterName = ((const SfxStringItem*)pItem)->GetValue(); sal_Bool bAsLink = false; - if ( pReqArgs->GetItemState( FN_PARAM_1, sal_True, &pItem ) == SFX_ITEM_SET ) + if ( pReqArgs->GetItemState( FN_PARAM_1, true, &pItem ) == SFX_ITEM_SET ) bAsLink = ((const SfxBoolItem*)pItem)->GetValue(); Graphic aGraphic; diff --git a/sc/source/ui/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxx index 82cb1c9e8a1d..10089b370031 100644 --- a/sc/source/ui/formdlg/dwfunctr.cxx +++ b/sc/source/ui/formdlg/dwfunctr.cxx @@ -138,7 +138,7 @@ ScFunctionDockWin::ScFunctionDockWin( SfxBindings* pBindingsP, Link a3Link=LINK( this, ScFunctionDockWin, SetSplitHdl); aPrivatSplit.SetCtrModifiedHdl(a3Link); - StartListening( *pBindingsP, sal_True ); + StartListening( *pBindingsP, true ); Point aTopLeft=aCatBox.GetPosPixel(); OUString aString("ww"); diff --git a/sc/source/ui/pagedlg/tptable.cxx b/sc/source/ui/pagedlg/tptable.cxx index fd93283eaa89..b204b7259976 100644 --- a/sc/source/ui/pagedlg/tptable.cxx +++ b/sc/source/ui/pagedlg/tptable.cxx @@ -69,7 +69,7 @@ static sal_Bool lcl_PutBoolItem( sal_uInt16 nWhich, #define PAGEDIR_HDL LINK(this,ScTablePage,PageDirHdl) #define SCALE_HDL LINK(this,ScTablePage,ScaleHdl) -#define WAS_DEFAULT(w,s) (SFX_ITEM_DEFAULT==(s).GetItemState((w),sal_True)) +#define WAS_DEFAULT(w,s) (SFX_ITEM_DEFAULT==(s).GetItemState((w),true)) #define GET_BOOL(sid,set) ((const SfxBoolItem&)((set).Get(GetWhich((sid))))).GetValue() #define GET_USHORT(sid,set) (sal_uInt16)((const SfxUInt16Item&)((set).Get(GetWhich((sid))))).GetValue() #define GET_SHOW(sid,set) ( ScVObjMode( ((const ScViewObjectModeItem&)((set).Get(GetWhich((sid))))).GetValue() ) \ @@ -165,7 +165,7 @@ void ScTablePage::Reset( const SfxItemSet& rCoreSet ) // scaling: nWhich = GetWhich(SID_SCATTR_PAGE_SCALE); - if ( rCoreSet.GetItemState( nWhich, sal_True ) >= SFX_ITEM_AVAILABLE ) + if ( rCoreSet.GetItemState( nWhich, true ) >= SFX_ITEM_AVAILABLE ) { sal_uInt16 nScale = ((const SfxUInt16Item&)rCoreSet.Get(nWhich)).GetValue(); if( nScale > 0 ) @@ -174,7 +174,7 @@ void ScTablePage::Reset( const SfxItemSet& rCoreSet ) } nWhich = GetWhich(SID_SCATTR_PAGE_SCALETO); - if ( rCoreSet.GetItemState( nWhich, sal_True ) >= SFX_ITEM_AVAILABLE ) + if ( rCoreSet.GetItemState( nWhich, true ) >= SFX_ITEM_AVAILABLE ) { const ScPageScaleToItem& rItem = static_cast< const ScPageScaleToItem& >( rCoreSet.Get( nWhich ) ); sal_uInt16 nWidth = rItem.GetWidth(); @@ -190,7 +190,7 @@ void ScTablePage::Reset( const SfxItemSet& rCoreSet ) } nWhich = GetWhich(SID_SCATTR_PAGE_SCALETOPAGES); - if ( rCoreSet.GetItemState( nWhich, sal_True ) >= SFX_ITEM_AVAILABLE ) + if ( rCoreSet.GetItemState( nWhich, true ) >= SFX_ITEM_AVAILABLE ) { sal_uInt16 nPages = ((const SfxUInt16Item&)rCoreSet.Get(nWhich)).GetValue(); if( nPages > 0 ) diff --git a/sc/source/ui/undo/undocell.cxx b/sc/source/ui/undo/undocell.cxx index 9f60f460f087..7a6f4e1b9445 100644 --- a/sc/source/ui/undo/undocell.cxx +++ b/sc/source/ui/undo/undocell.cxx @@ -136,9 +136,9 @@ void ScUndoCursorAttr::DoChange( const ScPatternAttr* pWhichPattern, const share } const SfxItemSet& rApplySet = pApplyPattern->GetItemSet(); - bool bPaintExt = ( rApplySet.GetItemState( ATTR_SHADOW, sal_True ) != SFX_ITEM_DEFAULT || - rApplySet.GetItemState( ATTR_CONDITIONAL, sal_True ) != SFX_ITEM_DEFAULT ); - bool bPaintRows = ( rApplySet.GetItemState( ATTR_HOR_JUSTIFY, sal_True ) != SFX_ITEM_DEFAULT ); + bool bPaintExt = ( rApplySet.GetItemState( ATTR_SHADOW, true ) != SFX_ITEM_DEFAULT || + rApplySet.GetItemState( ATTR_CONDITIONAL, true ) != SFX_ITEM_DEFAULT ); + bool bPaintRows = ( rApplySet.GetItemState( ATTR_HOR_JUSTIFY, true ) != SFX_ITEM_DEFAULT ); sal_uInt16 nFlags = SC_PF_TESTMERGE; if (bPaintExt) diff --git a/sc/source/ui/vba/vbafont.cxx b/sc/source/ui/vba/vbafont.cxx index 1f8ddc8e86a1..69664b51d458 100644 --- a/sc/source/ui/vba/vbafont.cxx +++ b/sc/source/ui/vba/vbafont.cxx @@ -221,7 +221,7 @@ uno::Any SAL_CALL ScVbaFont::getSize() throw ( uno::RuntimeException ) { if ( GetDataSet() ) - if ( GetDataSet()->GetItemState( ATTR_FONT_HEIGHT, sal_True, NULL) == SFX_ITEM_DONTCARE ) + if ( GetDataSet()->GetItemState( ATTR_FONT_HEIGHT, true, NULL) == SFX_ITEM_DONTCARE ) return aNULL(); return ScVbaFont_BASE::getSize(); } @@ -248,7 +248,7 @@ uno::Any SAL_CALL ScVbaFont::getColorIndex() throw ( uno::RuntimeException ) { if ( GetDataSet() ) - if ( GetDataSet()->GetItemState( ATTR_FONT_COLOR, sal_True, NULL) == SFX_ITEM_DONTCARE ) + if ( GetDataSet()->GetItemState( ATTR_FONT_COLOR, true, NULL) == SFX_ITEM_DONTCARE ) return aNULL(); return ScVbaFont_BASE::getColorIndex(); } @@ -347,7 +347,7 @@ uno::Any SAL_CALL ScVbaFont::getBold() throw ( uno::RuntimeException ) { if ( GetDataSet() ) - if ( GetDataSet()->GetItemState( ATTR_FONT_WEIGHT, sal_True, NULL) == SFX_ITEM_DONTCARE ) + if ( GetDataSet()->GetItemState( ATTR_FONT_WEIGHT, true, NULL) == SFX_ITEM_DONTCARE ) return aNULL(); return ScVbaFont_BASE::getBold(); } @@ -390,7 +390,7 @@ uno::Any SAL_CALL ScVbaFont::getUnderline() throw ( uno::RuntimeException ) { if ( GetDataSet() ) - if ( GetDataSet()->GetItemState( ATTR_FONT_UNDERLINE, sal_True, NULL) == SFX_ITEM_DONTCARE ) + if ( GetDataSet()->GetItemState( ATTR_FONT_UNDERLINE, true, NULL) == SFX_ITEM_DONTCARE ) return aNULL(); sal_Int32 nValue = awt::FontUnderline::NONE; @@ -417,7 +417,7 @@ uno::Any SAL_CALL ScVbaFont::getStrikethrough() throw ( uno::RuntimeException ) { if ( GetDataSet() ) - if ( GetDataSet()->GetItemState( ATTR_FONT_CROSSEDOUT, sal_True, NULL) == SFX_ITEM_DONTCARE ) + if ( GetDataSet()->GetItemState( ATTR_FONT_CROSSEDOUT, true, NULL) == SFX_ITEM_DONTCARE ) return aNULL(); return ScVbaFont_BASE::getStrikethrough(); } @@ -426,7 +426,7 @@ uno::Any SAL_CALL ScVbaFont::getShadow() throw (uno::RuntimeException) { if ( GetDataSet() ) - if ( GetDataSet()->GetItemState( ATTR_FONT_SHADOWED, sal_True, NULL) == SFX_ITEM_DONTCARE ) + if ( GetDataSet()->GetItemState( ATTR_FONT_SHADOWED, true, NULL) == SFX_ITEM_DONTCARE ) return aNULL(); return ScVbaFont_BASE::getShadow(); } @@ -435,7 +435,7 @@ uno::Any SAL_CALL ScVbaFont::getItalic() throw ( uno::RuntimeException ) { if ( GetDataSet() ) - if ( GetDataSet()->GetItemState( ATTR_FONT_POSTURE, sal_True, NULL) == SFX_ITEM_DONTCARE ) + if ( GetDataSet()->GetItemState( ATTR_FONT_POSTURE, true, NULL) == SFX_ITEM_DONTCARE ) return aNULL(); return ScVbaFont_BASE::getItalic(); @@ -445,7 +445,7 @@ uno::Any SAL_CALL ScVbaFont::getName() throw ( uno::RuntimeException ) { if ( GetDataSet() ) - if ( GetDataSet()->GetItemState( ATTR_FONT, sal_True, NULL) == SFX_ITEM_DONTCARE ) + if ( GetDataSet()->GetItemState( ATTR_FONT, true, NULL) == SFX_ITEM_DONTCARE ) return aNULL(); return ScVbaFont_BASE::getName(); } @@ -468,7 +468,7 @@ uno::Any SAL_CALL ScVbaFont::getOutlineFont() throw (uno::RuntimeException) { if ( GetDataSet() ) - if ( GetDataSet()->GetItemState( ATTR_FONT_CONTOUR, sal_True, NULL) == SFX_ITEM_DONTCARE ) + if ( GetDataSet()->GetItemState( ATTR_FONT_CONTOUR, true, NULL) == SFX_ITEM_DONTCARE ) return aNULL(); return mxFont->getPropertyValue("CharContoured"); } diff --git a/sc/source/ui/vba/vbaformat.cxx b/sc/source/ui/vba/vbaformat.cxx index a026bfd4be3f..b57009b0cc4e 100644 --- a/sc/source/ui/vba/vbaformat.cxx +++ b/sc/source/ui/vba/vbaformat.cxx @@ -555,7 +555,7 @@ ScVbaFormat<Ifc1>::getLocked( ) throw (script::BasicErrorException, uno::Runtim if ( pDataSet ) { const ScProtectionAttr& rProtAttr = (const ScProtectionAttr &) pDataSet->Get(ATTR_PROTECTION, sal_True); - SfxItemState eState = pDataSet->GetItemState(ATTR_PROTECTION, sal_True, NULL); + SfxItemState eState = pDataSet->GetItemState(ATTR_PROTECTION, true, NULL); if(eState != SFX_ITEM_DONTCARE) aCellProtection = uno::makeAny(rProtAttr.GetProtection()); } @@ -588,7 +588,7 @@ ScVbaFormat<Ifc1>::getFormulaHidden( ) throw (script::BasicErrorException, uno: if ( pDataSet ) { const ScProtectionAttr& rProtAttr = (const ScProtectionAttr &) pDataSet->Get(ATTR_PROTECTION, sal_True); - SfxItemState eState = pDataSet->GetItemState(ATTR_PROTECTION, sal_True, NULL); + SfxItemState eState = pDataSet->GetItemState(ATTR_PROTECTION, true, NULL); if(eState != SFX_ITEM_DONTCARE) aBoolRet = uno::makeAny(rProtAttr.GetHideFormula()); } diff --git a/sc/source/ui/view/auditsh.cxx b/sc/source/ui/view/auditsh.cxx index 52d31fa6569b..9a4bbc3cc9a1 100644 --- a/sc/source/ui/view/auditsh.cxx +++ b/sc/source/ui/view/auditsh.cxx @@ -101,8 +101,8 @@ void ScAuditingShell::Execute( SfxRequest& rReq ) { const SfxPoolItem* pXItem; const SfxPoolItem* pYItem; - if ( pReqArgs->GetItemState( SID_RANGE_COL, sal_True, &pXItem ) == SFX_ITEM_SET - && pReqArgs->GetItemState( SID_RANGE_ROW, sal_True, &pYItem ) == SFX_ITEM_SET ) + if ( pReqArgs->GetItemState( SID_RANGE_COL, true, &pXItem ) == SFX_ITEM_SET + && pReqArgs->GetItemState( SID_RANGE_ROW, true, &pYItem ) == SFX_ITEM_SET ) { OSL_ENSURE( pXItem->ISA(SfxInt16Item) && pYItem->ISA(SfxInt32Item), "wrong items" ); diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx index 6a7932ec5e06..e4cc9bc8c8ff 100644 --- a/sc/source/ui/view/cellsh1.cxx +++ b/sc/source/ui/view/cellsh1.cxx @@ -1236,7 +1236,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) sal_uLong nFormat = 0; const SfxPoolItem* pItem; if ( pReqArgs && - pReqArgs->GetItemState(nSlot, sal_True, &pItem) == SFX_ITEM_SET && + pReqArgs->GetItemState(nSlot, true, &pItem) == SFX_ITEM_SET && pItem->ISA(SfxUInt32Item) ) { nFormat = ((const SfxUInt32Item*)pItem)->GetValue(); @@ -1491,7 +1491,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) // Clipboard-ID given as parameter? Basic "PasteSpecial(Format)" const SfxPoolItem* pItem=NULL; if ( pReqArgs && - pReqArgs->GetItemState(nSlot, sal_True, &pItem) == SFX_ITEM_SET && + pReqArgs->GetItemState(nSlot, true, &pItem) == SFX_ITEM_SET && pItem->ISA(SfxUInt32Item) ) { sal_uLong nFormat = ((const SfxUInt32Item*)pItem)->GetValue(); @@ -1784,7 +1784,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) { const SfxPoolItem* pItem; if ( pReqArgs && SFX_ITEM_SET == - pReqArgs->GetItemState( SCITEM_CONSOLIDATEDATA, sal_True, &pItem ) ) + pReqArgs->GetItemState( SCITEM_CONSOLIDATEDATA, true, &pItem ) ) { const ScConsolidateParam& rParam = ((const ScConsolidateItem*)pItem)->GetData(); @@ -2145,7 +2145,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) { bool bShow; const SfxPoolItem* pItem; - if ( pReqArgs && (pReqArgs->GetItemState( FID_NOTE_VISIBLE, sal_True, &pItem ) == SFX_ITEM_SET) ) + if ( pReqArgs && (pReqArgs->GetItemState( FID_NOTE_VISIBLE, true, &pItem ) == SFX_ITEM_SET) ) bShow = ((const SfxBoolItem*) pItem)->GetValue(); else bShow = !pNote->IsCaptionShown(); diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx index 28feb3404507..c2eb5b1fd9a2 100644 --- a/sc/source/ui/view/cellsh2.cxx +++ b/sc/source/ui/view/cellsh2.cxx @@ -413,17 +413,17 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) aSortParam.bInplace = true; // from Basic always const SfxPoolItem* pItem; - if ( pArgs->GetItemState( SID_SORT_BYROW, sal_True, &pItem ) == SFX_ITEM_SET ) + if ( pArgs->GetItemState( SID_SORT_BYROW, true, &pItem ) == SFX_ITEM_SET ) aSortParam.bByRow = static_cast<const SfxBoolItem*>(pItem)->GetValue(); - if ( pArgs->GetItemState( SID_SORT_HASHEADER, sal_True, &pItem ) == SFX_ITEM_SET ) + if ( pArgs->GetItemState( SID_SORT_HASHEADER, true, &pItem ) == SFX_ITEM_SET ) aSortParam.bHasHeader = static_cast<const SfxBoolItem*>(pItem)->GetValue(); - if ( pArgs->GetItemState( SID_SORT_CASESENS, sal_True, &pItem ) == SFX_ITEM_SET ) + if ( pArgs->GetItemState( SID_SORT_CASESENS, true, &pItem ) == SFX_ITEM_SET ) aSortParam.bCaseSens = static_cast<const SfxBoolItem*>(pItem)->GetValue(); if ( pArgs->GetItemState( SID_SORT_NATURALSORT, true, &pItem ) == SFX_ITEM_SET ) aSortParam.bNaturalSort = static_cast<const SfxBoolItem*>(pItem)->GetValue(); if ( pArgs->GetItemState( SID_SORT_ATTRIBS, true, &pItem ) == SFX_ITEM_SET ) aSortParam.bIncludePattern = static_cast<const SfxBoolItem*>(pItem)->GetValue(); - if ( pArgs->GetItemState( SID_SORT_USERDEF, sal_True, &pItem ) == SFX_ITEM_SET ) + if ( pArgs->GetItemState( SID_SORT_USERDEF, true, &pItem ) == SFX_ITEM_SET ) { sal_uInt16 nUserIndex = static_cast<const SfxUInt16Item*>(pItem)->GetValue(); aSortParam.bUserDef = ( nUserIndex != 0 ); @@ -432,25 +432,25 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) } SCCOLROW nField0 = 0; - if ( pArgs->GetItemState( FN_PARAM_1, sal_True, &pItem ) == SFX_ITEM_SET ) + if ( pArgs->GetItemState( FN_PARAM_1, true, &pItem ) == SFX_ITEM_SET ) nField0 = static_cast<const SfxInt32Item*>(pItem)->GetValue(); aSortParam.maKeyState[0].bDoSort = ( nField0 != 0 ); aSortParam.maKeyState[0].nField = nField0 > 0 ? (nField0-1) : 0; - if ( pArgs->GetItemState( FN_PARAM_2, sal_True, &pItem ) == SFX_ITEM_SET ) + if ( pArgs->GetItemState( FN_PARAM_2, true, &pItem ) == SFX_ITEM_SET ) aSortParam.maKeyState[0].bAscending = static_cast<const SfxBoolItem*>(pItem)->GetValue(); SCCOLROW nField1 = 0; - if ( pArgs->GetItemState( FN_PARAM_3, sal_True, &pItem ) == SFX_ITEM_SET ) + if ( pArgs->GetItemState( FN_PARAM_3, true, &pItem ) == SFX_ITEM_SET ) nField1 = static_cast<const SfxInt32Item*>(pItem)->GetValue(); aSortParam.maKeyState[1].bDoSort = ( nField1 != 0 ); aSortParam.maKeyState[1].nField = nField1 > 0 ? (nField1-1) : 0; - if ( pArgs->GetItemState( FN_PARAM_4, sal_True, &pItem ) == SFX_ITEM_SET ) + if ( pArgs->GetItemState( FN_PARAM_4, true, &pItem ) == SFX_ITEM_SET ) aSortParam.maKeyState[1].bAscending = static_cast<const SfxBoolItem*>(pItem)->GetValue(); SCCOLROW nField2 = 0; - if ( pArgs->GetItemState( FN_PARAM_5, sal_True, &pItem ) == SFX_ITEM_SET ) + if ( pArgs->GetItemState( FN_PARAM_5, true, &pItem ) == SFX_ITEM_SET ) nField2 = static_cast<const SfxInt32Item*>(pItem)->GetValue(); aSortParam.maKeyState[2].bDoSort = ( nField2 != 0 ); aSortParam.maKeyState[2].nField = nField2 > 0 ? (nField2-1) : 0; - if ( pArgs->GetItemState( FN_PARAM_6, sal_True, &pItem ) == SFX_ITEM_SET ) + if ( pArgs->GetItemState( FN_PARAM_6, true, &pItem ) == SFX_ITEM_SET ) aSortParam.maKeyState[2].bAscending = static_cast<const SfxBoolItem*>(pItem)->GetValue(); // subtotal when needed new @@ -590,7 +590,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) { const SfxPoolItem* pItem; if ( pReqArgs && SFX_ITEM_SET == - pReqArgs->GetItemState( SCITEM_QUERYDATA, sal_True, &pItem ) ) + pReqArgs->GetItemState( SCITEM_QUERYDATA, true, &pItem ) ) { const ScQueryItem& rQueryItem = static_cast<const ScQueryItem&>(*pItem); @@ -645,7 +645,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) { const SfxPoolItem* pItem; if ( pReqArgs && SFX_ITEM_SET == - pReqArgs->GetItemState( SCITEM_PIVOTDATA, sal_True, &pItem ) ) + pReqArgs->GetItemState( SCITEM_PIVOTDATA, true, &pItem ) ) { SCTAB nCurTab = GetViewData()->GetTabNo(); SCTAB nRefTab = GetViewData()->GetRefTabNo(); @@ -858,11 +858,11 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) { const SfxItemSet* pOutSet = pDlg->GetOutputItemSet(); - if ( pOutSet->GetItemState( FID_VALID_MODE, sal_True, &pItem ) == SFX_ITEM_SET ) + if ( pOutSet->GetItemState( FID_VALID_MODE, true, &pItem ) == SFX_ITEM_SET ) eMode = (ScValidationMode) ((const SfxAllEnumItem*)pItem)->GetValue(); - if ( pOutSet->GetItemState( FID_VALID_CONDMODE, sal_True, &pItem ) == SFX_ITEM_SET ) + if ( pOutSet->GetItemState( FID_VALID_CONDMODE, true, &pItem ) == SFX_ITEM_SET ) eOper = (ScConditionMode) ((const SfxAllEnumItem*)pItem)->GetValue(); - if ( pOutSet->GetItemState( FID_VALID_VALUE1, sal_True, &pItem ) == SFX_ITEM_SET ) + if ( pOutSet->GetItemState( FID_VALID_VALUE1, true, &pItem ) == SFX_ITEM_SET ) { OUString aTemp1 = ((const SfxStringItem*)pItem)->GetValue(); if (eMode == SC_VALID_DATE || eMode == SC_VALID_TIME) @@ -879,7 +879,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) else aExpr1 = aTemp1; } - if ( pOutSet->GetItemState( FID_VALID_VALUE2, sal_True, &pItem ) == SFX_ITEM_SET ) + if ( pOutSet->GetItemState( FID_VALID_VALUE2, true, &pItem ) == SFX_ITEM_SET ) { OUString aTemp2 = ((const SfxStringItem*)pItem)->GetValue(); if (eMode == SC_VALID_DATE || eMode == SC_VALID_TIME) @@ -897,25 +897,25 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) aExpr2 = aTemp2; } - if ( pOutSet->GetItemState( FID_VALID_BLANK, sal_True, &pItem ) == SFX_ITEM_SET ) + if ( pOutSet->GetItemState( FID_VALID_BLANK, true, &pItem ) == SFX_ITEM_SET ) bBlank = ((const SfxBoolItem*)pItem)->GetValue(); - if ( pOutSet->GetItemState( FID_VALID_LISTTYPE, sal_True, &pItem ) == SFX_ITEM_SET ) + if ( pOutSet->GetItemState( FID_VALID_LISTTYPE, true, &pItem ) == SFX_ITEM_SET ) nListType = ((const SfxInt16Item*)pItem)->GetValue(); - if ( pOutSet->GetItemState( FID_VALID_SHOWHELP, sal_True, &pItem ) == SFX_ITEM_SET ) + if ( pOutSet->GetItemState( FID_VALID_SHOWHELP, true, &pItem ) == SFX_ITEM_SET ) bShowHelp = ((const SfxBoolItem*)pItem)->GetValue(); - if ( pOutSet->GetItemState( FID_VALID_HELPTITLE, sal_True, &pItem ) == SFX_ITEM_SET ) + if ( pOutSet->GetItemState( FID_VALID_HELPTITLE, true, &pItem ) == SFX_ITEM_SET ) aHelpTitle = ((const SfxStringItem*)pItem)->GetValue(); - if ( pOutSet->GetItemState( FID_VALID_HELPTEXT, sal_True, &pItem ) == SFX_ITEM_SET ) + if ( pOutSet->GetItemState( FID_VALID_HELPTEXT, true, &pItem ) == SFX_ITEM_SET ) aHelpText = ((const SfxStringItem*)pItem)->GetValue(); - if ( pOutSet->GetItemState( FID_VALID_SHOWERR, sal_True, &pItem ) == SFX_ITEM_SET ) + if ( pOutSet->GetItemState( FID_VALID_SHOWERR, true, &pItem ) == SFX_ITEM_SET ) bShowError = ((const SfxBoolItem*)pItem)->GetValue(); - if ( pOutSet->GetItemState( FID_VALID_ERRSTYLE, sal_True, &pItem ) == SFX_ITEM_SET ) + if ( pOutSet->GetItemState( FID_VALID_ERRSTYLE, true, &pItem ) == SFX_ITEM_SET ) eErrStyle = (ScValidErrorStyle) ((const SfxAllEnumItem*)pItem)->GetValue(); - if ( pOutSet->GetItemState( FID_VALID_ERRTITLE, sal_True, &pItem ) == SFX_ITEM_SET ) + if ( pOutSet->GetItemState( FID_VALID_ERRTITLE, true, &pItem ) == SFX_ITEM_SET ) aErrTitle = ((const SfxStringItem*)pItem)->GetValue(); - if ( pOutSet->GetItemState( FID_VALID_ERRTEXT, sal_True, &pItem ) == SFX_ITEM_SET ) + if ( pOutSet->GetItemState( FID_VALID_ERRTEXT, true, &pItem ) == SFX_ITEM_SET ) aErrText = ((const SfxStringItem*)pItem)->GetValue(); ScValidationData aData( eMode, eOper, aExpr1, aExpr2, pDoc, aCursorPos ); diff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxx index d9acade2cf69..0553dde76833 100644 --- a/sc/source/ui/view/cellsh3.cxx +++ b/sc/source/ui/view/cellsh3.cxx @@ -339,7 +339,7 @@ void ScCellShell::Execute( SfxRequest& rReq ) sal_uInt16 nWhich = 0; for ( nWhich=ATTR_PATTERN_START; nWhich<=ATTR_PATTERN_END; nWhich++ ) - if ( pReqArgs->GetItemState( nWhich, sal_True, &pAttr ) == SFX_ITEM_SET ) + if ( pReqArgs->GetItemState( nWhich, true, &pAttr ) == SFX_ITEM_SET ) pNewSet->Put( *pAttr ); pTabViewShell->ApplyAttributes( pNewSet, pEmptySet ); @@ -475,9 +475,9 @@ void ScCellShell::Execute( SfxRequest& rReq ) OUString aArgName; OUString aArgComment; const SfxPoolItem* pItem; - if ( pReqArgs->GetItemState( SID_SCENARIOS, sal_True, &pItem ) == SFX_ITEM_SET ) + if ( pReqArgs->GetItemState( SID_SCENARIOS, true, &pItem ) == SFX_ITEM_SET ) aArgName = ((const SfxStringItem*)pItem)->GetValue(); - if ( pReqArgs->GetItemState( SID_NEW_TABLENAME, sal_True, &pItem ) == SFX_ITEM_SET ) + if ( pReqArgs->GetItemState( SID_NEW_TABLENAME, true, &pItem ) == SFX_ITEM_SET ) aArgComment = ((const SfxStringItem*)pItem)->GetValue(); aColor = Color( COL_LIGHTGRAY ); // Default @@ -760,7 +760,7 @@ void ScCellShell::Execute( SfxRequest& rReq ) sal_Bool bApi = rReq.IsAPI(); const SfxPoolItem* pItem; if ( pReqArgs && - pReqArgs->GetItemState(nSlot, sal_True, &pItem) == SFX_ITEM_SET ) + pReqArgs->GetItemState(nSlot, true, &pItem) == SFX_ITEM_SET ) { OSL_ENSURE(pItem && pItem->ISA(SfxBoolItem), "falsches Item"); bMoveContents = ((const SfxBoolItem*)pItem)->GetValue(); diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx index f497fb42adbb..542b35990af5 100644 --- a/sc/source/ui/view/editsh.cxx +++ b/sc/source/ui/view/editsh.cxx @@ -248,7 +248,7 @@ void ScEditShell::Execute( SfxRequest& rReq ) sal_uLong nFormat = 0; const SfxPoolItem* pItem; if ( pReqArgs && - pReqArgs->GetItemState(nSlot, sal_True, &pItem) == SFX_ITEM_SET && + pReqArgs->GetItemState(nSlot, true, &pItem) == SFX_ITEM_SET && pItem->ISA(SfxUInt32Item) ) { nFormat = ((const SfxUInt32Item*)pItem)->GetValue(); @@ -516,7 +516,7 @@ void ScEditShell::Execute( SfxRequest& rReq ) if( pReqArgs ) { const SfxPoolItem* pItem; - if ( pReqArgs->GetItemState( SID_HYPERLINK_SETLINK, sal_True, &pItem ) == SFX_ITEM_SET ) + if ( pReqArgs->GetItemState( SID_HYPERLINK_SETLINK, true, &pItem ) == SFX_ITEM_SET ) { const SvxHyperlinkItem* pHyper = (const SvxHyperlinkItem*) pItem; const OUString& rName = pHyper->GetName(); @@ -1090,7 +1090,7 @@ void ScEditShell::GetAttrState(SfxItemSet &rSet) // Unterstreichung - SfxItemState eState = aAttribs.GetItemState( EE_CHAR_UNDERLINE, sal_True ); + SfxItemState eState = aAttribs.GetItemState( EE_CHAR_UNDERLINE, true ); if ( eState == SFX_ITEM_DONTCARE ) { rSet.InvalidateItem( SID_ULINE_VAL_NONE ); @@ -1132,7 +1132,7 @@ void ScEditShell::GetAttrState(SfxItemSet &rSet) pViewData->GetBindings().Invalidate( SID_SET_SUPER_SCRIPT ); pViewData->GetBindings().Invalidate( SID_SET_SUB_SCRIPT ); - eState = aAttribs.GetItemState( EE_CHAR_KERNING, sal_True ); + eState = aAttribs.GetItemState( EE_CHAR_KERNING, true ); pViewData->GetBindings().Invalidate( SID_ATTR_CHAR_KERNING ); if ( eState == SFX_ITEM_DONTCARE ) { @@ -1189,7 +1189,7 @@ void ScEditShell::ExecuteUndo(SfxRequest& rReq) sal_uInt16 nCount = 1; const SfxPoolItem* pItem; - if ( pReqArgs && pReqArgs->GetItemState( nSlot, sal_True, &pItem ) == SFX_ITEM_SET ) + if ( pReqArgs && pReqArgs->GetItemState( nSlot, true, &pItem ) == SFX_ITEM_SET ) nCount = ((const SfxUInt16Item*)pItem)->GetValue(); for (sal_uInt16 i=0; i<nCount; i++) diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx index 8f371fb97658..22293589bccf 100644 --- a/sc/source/ui/view/formatsh.cxx +++ b/sc/source/ui/view/formatsh.cxx @@ -278,11 +278,11 @@ void ScFormatShell::ExecuteStyle( SfxRequest& rReq ) { SfxStyleFamily eFamily = SFX_STYLE_FAMILY_PARA; const SfxPoolItem* pFamItem; - if ( pArgs && SFX_ITEM_SET == pArgs->GetItemState( SID_STYLE_FAMILY, sal_True, &pFamItem ) ) + if ( pArgs && SFX_ITEM_SET == pArgs->GetItemState( SID_STYLE_FAMILY, true, &pFamItem ) ) eFamily = (SfxStyleFamily)((const SfxUInt16Item*)pFamItem)->GetValue(); const SfxPoolItem* pNameItem; OUString aStyleName; - if (pArgs && SFX_ITEM_SET == pArgs->GetItemState( nSlotId, sal_True, &pNameItem )) + if (pArgs && SFX_ITEM_SET == pArgs->GetItemState( nSlotId, true, &pNameItem )) aStyleName = ((const SfxStringItem*)pNameItem)->GetValue(); if ( eFamily == SFX_STYLE_FAMILY_PARA ) // CellStyles { @@ -358,9 +358,9 @@ void ScFormatShell::ExecuteStyle( SfxRequest& rReq ) SfxStyleFamily eFamily = SFX_STYLE_FAMILY_PARA; const SfxPoolItem* pFamItem; - if ( pArgs && SFX_ITEM_SET == pArgs->GetItemState( SID_STYLE_FAMILY, sal_True, &pFamItem ) ) + if ( pArgs && SFX_ITEM_SET == pArgs->GetItemState( SID_STYLE_FAMILY, true, &pFamItem ) ) eFamily = (SfxStyleFamily)((const SfxUInt16Item*)pFamItem)->GetValue(); - else if ( pArgs && SFX_ITEM_SET == pArgs->GetItemState( SID_STYLE_FAMILYNAME, sal_True, &pFamItem ) ) + else if ( pArgs && SFX_ITEM_SET == pArgs->GetItemState( SID_STYLE_FAMILYNAME, true, &pFamItem ) ) { OUString sFamily = ((const SfxStringItem*)pFamItem)->GetValue(); if (sFamily.equalsAscii("CellStyles")) @@ -379,11 +379,11 @@ void ScFormatShell::ExecuteStyle( SfxRequest& rReq ) case SID_STYLE_NEW: { const SfxPoolItem* pNameItem; - if (pArgs && SFX_ITEM_SET == pArgs->GetItemState( nSlotId, sal_True, &pNameItem )) + if (pArgs && SFX_ITEM_SET == pArgs->GetItemState( nSlotId, true, &pNameItem )) aStyleName = ((const SfxStringItem*)pNameItem)->GetValue(); const SfxPoolItem* pRefItem=NULL; - if (pArgs && SFX_ITEM_SET == pArgs->GetItemState( SID_STYLE_REFERENCE, sal_True, &pRefItem )) + if (pArgs && SFX_ITEM_SET == pArgs->GetItemState( SID_STYLE_REFERENCE, true, &pRefItem )) { if(pRefItem!=NULL) aRefName = ((const SfxStringItem*)pRefItem)->GetValue(); @@ -428,7 +428,7 @@ void ScFormatShell::ExecuteStyle( SfxRequest& rReq ) case SID_STYLE_NEW_BY_EXAMPLE: { const SfxPoolItem* pNameItem; - if (pArgs && SFX_ITEM_SET == pArgs->GetItemState( nSlotId, sal_True, &pNameItem )) + if (pArgs && SFX_ITEM_SET == pArgs->GetItemState( nSlotId, true, &pNameItem )) aStyleName = ((const SfxStringItem*)pNameItem)->GetValue(); pStyleSheet = pStylePool->Find( aStyleName, eFamily ); @@ -445,7 +445,7 @@ void ScFormatShell::ExecuteStyle( SfxRequest& rReq ) const SfxPoolItem* pItem; if ( SFX_ITEM_SET == - pArgs->GetItemState( nSlotId, sal_True, &pItem ) ) + pArgs->GetItemState( nSlotId, true, &pItem ) ) { const SfxStringItem* pStrItem = PTR_CAST(SfxStringItem,pItem); if ( pStrItem ) @@ -1183,7 +1183,7 @@ void ScFormatShell::ExecuteNumFormat( SfxRequest& rReq ) if ( pReqArgs ) { const SfxPoolItem* pItem; - if ( pReqArgs->GetItemState( ATTR_VALUE_FORMAT, sal_True, &pItem ) == SFX_ITEM_SET ) + if ( pReqArgs->GetItemState( ATTR_VALUE_FORMAT, true, &pItem ) == SFX_ITEM_SET ) { // We have to accomplish this using ApplyAttributes() // because we also need the language information to be @@ -1202,7 +1202,7 @@ void ScFormatShell::ExecuteNumFormat( SfxRequest& rReq ) if ( pReqArgs ) { const SfxPoolItem* pItem; - if ( pReqArgs->GetItemState( nSlot, sal_True, &pItem ) == SFX_ITEM_SET ) + if ( pReqArgs->GetItemState( nSlot, true, &pItem ) == SFX_ITEM_SET ) { sal_uInt16 nFormat = ((SfxInt16Item *)pItem)->GetValue(); switch(nFormat) @@ -1284,7 +1284,7 @@ void ScFormatShell::ExecuteAlignment( SfxRequest& rReq ) if( pSet ) { const SfxPoolItem* pItem = NULL; - if( pSet->GetItemState(GetPool().GetWhich(nSlot), sal_True, &pItem ) == SFX_ITEM_SET ) + if( pSet->GetItemState(GetPool().GetWhich(nSlot), true, &pItem ) == SFX_ITEM_SET ) { switch ( nSlot ) @@ -1508,12 +1508,12 @@ void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq ) SvxCellHorJustify eHorJustify = SVX_HOR_JUSTIFY_STANDARD; SvxCellVerJustify eVerJustify = SVX_VER_JUSTIFY_STANDARD; - if (rAttrSet.GetItemState(ATTR_HOR_JUSTIFY, sal_True,&pItem ) == SFX_ITEM_SET) + if (rAttrSet.GetItemState(ATTR_HOR_JUSTIFY, true,&pItem ) == SFX_ITEM_SET) { pHorJustify = (const SvxHorJustifyItem*)pItem; eHorJustify = SvxCellHorJustify( pHorJustify->GetValue() ); } - if (rAttrSet.GetItemState(ATTR_VER_JUSTIFY, sal_True,&pItem ) == SFX_ITEM_SET) + if (rAttrSet.GetItemState(ATTR_VER_JUSTIFY, true,&pItem ) == SFX_ITEM_SET) { pVerJustify = (const SvxVerJustifyItem*)pItem; eVerJustify = SvxCellVerJustify( pVerJustify->GetValue() ); @@ -1801,7 +1801,7 @@ void ScFormatShell::ExecuteAttr( SfxRequest& rReq ) // Border-Items vom Controller auswerten: const SfxPoolItem* pItem = 0; - if ( pNewAttrs->GetItemState( ATTR_BORDER, sal_True, &pItem ) + if ( pNewAttrs->GetItemState( ATTR_BORDER, true, &pItem ) == SFX_ITEM_SET ) { // The SvxFrameToolBoxControl toolbox controller uses a default @@ -1822,7 +1822,7 @@ void ScFormatShell::ExecuteAttr( SfxRequest& rReq ) rReq.AppendItem( aBoxItem ); } - if ( pNewAttrs->GetItemState( ATTR_BORDER_INNER, sal_True, &pItem ) + if ( pNewAttrs->GetItemState( ATTR_BORDER_INNER, true, &pItem ) == SFX_ITEM_SET ) { SvxBoxInfoItem aBoxInfoItem( *(const SvxBoxInfoItem*)pItem ); @@ -2179,7 +2179,7 @@ void ScFormatShell::GetTextAttrState( SfxItemSet& rSet ) // Unterstreichung //------------------------ - eState = rAttrSet.GetItemState( ATTR_FONT_UNDERLINE, sal_True ); + eState = rAttrSet.GetItemState( ATTR_FONT_UNDERLINE, true ); if ( eState == SFX_ITEM_DONTCARE ) { rSet.InvalidateItem( SID_ULINE_VAL_NONE ); @@ -2214,7 +2214,7 @@ void ScFormatShell::GetTextAttrState( SfxItemSet& rSet ) bool bJustifyStd = false; SfxBoolItem aBoolItem ( 0, true ); - eState = rAttrSet.GetItemState( ATTR_HOR_JUSTIFY, sal_True, + eState = rAttrSet.GetItemState( ATTR_HOR_JUSTIFY, true, (const SfxPoolItem**)&pHorJustify ); switch ( eState ) { @@ -2283,7 +2283,7 @@ void ScFormatShell::GetTextAttrState( SfxItemSet& rSet ) nWhich = 0; aBoolItem.SetValue( true ); - eState = rAttrSet.GetItemState( ATTR_VER_JUSTIFY, sal_True, + eState = rAttrSet.GetItemState( ATTR_VER_JUSTIFY, true, (const SfxPoolItem**)&pVerJustify ); switch ( eState ) diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx index e2a6997171b2..ede02cc0e365 100644 --- a/sc/source/ui/view/output2.cxx +++ b/sc/source/ui/view/output2.cxx @@ -170,7 +170,7 @@ public: void SetShrinkScale( long nScale, sal_uInt8 nScript ); bool HasCondHeight() const { return pCondSet && SFX_ITEM_SET == - pCondSet->GetItemState( ATTR_FONT_HEIGHT, sal_True ); } + pCondSet->GetItemState( ATTR_FONT_HEIGHT, true ); } bool HasEditCharacters() const; @@ -454,10 +454,10 @@ void ScDrawStringsVars::SetPatternSimple( const ScPatternAttr* pNew, const SfxIt sal_uLong nOld = nValueFormat; const SfxPoolItem* pFormItem; - if ( !pCondSet || pCondSet->GetItemState(ATTR_VALUE_FORMAT,sal_True,&pFormItem) != SFX_ITEM_SET ) + if ( !pCondSet || pCondSet->GetItemState(ATTR_VALUE_FORMAT,true,&pFormItem) != SFX_ITEM_SET ) pFormItem = &pPattern->GetItem(ATTR_VALUE_FORMAT); const SfxPoolItem* pLangItem; - if ( !pCondSet || pCondSet->GetItemState(ATTR_LANGUAGE_FORMAT,sal_True,&pLangItem) != SFX_ITEM_SET ) + if ( !pCondSet || pCondSet->GetItemState(ATTR_LANGUAGE_FORMAT,true,&pLangItem) != SFX_ITEM_SET ) pLangItem = &pPattern->GetItem(ATTR_LANGUAGE_FORMAT); nValueFormat = pOutput->mpDoc->GetFormatTable()->GetFormatForLanguageIfBuiltIn( ((SfxUInt32Item*)pFormItem)->GetValue(), diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx index 490058e4bb79..879bfa80de1b 100644 --- a/sc/source/ui/view/prevwsh.cxx +++ b/sc/source/ui/view/prevwsh.cxx @@ -129,8 +129,8 @@ void ScPreviewShell::Construct( Window* pParent ) SetPool( &SC_MOD()->GetPool() ); SetWindow( pPreview ); - StartListening(*pDocShell,sal_True); - StartListening(*SFX_APP(),sal_True); // #i62045# #i62046# application is needed for Calc's own hints + StartListening(*pDocShell,true); + StartListening(*SFX_APP(),true); // #i62045# #i62046# application is needed for Calc's own hints SfxBroadcaster* pDrawBC = pDocShell->GetDocument()->GetDrawBroadcaster(); if (pDrawBC) StartListening(*pDrawBC); @@ -723,7 +723,7 @@ void ScPreviewShell::Execute( SfxRequest& rReq ) { const SfxPoolItem* pItem; eZoom = SVX_ZOOM_PERCENT; - if( pReqArgs && SFX_ITEM_SET == pReqArgs->GetItemState( SID_ATTR_ZOOMSLIDER, sal_True, &pItem ) ) + if( pReqArgs && SFX_ITEM_SET == pReqArgs->GetItemState( SID_ATTR_ZOOMSLIDER, true, &pItem ) ) { const sal_uInt16 nCurrentZoom = ((const SvxZoomSliderItem*)pItem)->GetValue(); if( nCurrentZoom ) @@ -743,7 +743,7 @@ void ScPreviewShell::Execute( SfxRequest& rReq ) SfxStyleSheetBase* pStyleSheet = pStylePool->Find( aOldName, SFX_STYLE_FAMILY_PAGE ); OSL_ENSURE( pStyleSheet, "PageStyle not found! :-/" ); - if ( pReqArgs && pStyleSheet && SFX_ITEM_SET == pReqArgs->GetItemState( SID_PREVIEW_SCALINGFACTOR, sal_True, &pItem ) ) + if ( pReqArgs && pStyleSheet && SFX_ITEM_SET == pReqArgs->GetItemState( SID_PREVIEW_SCALINGFACTOR, true, &pItem ) ) { const sal_uInt16 nCurrentZoom = ((const SvxZoomSliderItem *)pItem)->GetValue(); SfxItemSet& rSet = pStyleSheet->GetItemSet(); diff --git a/sc/source/ui/view/tabvwsh2.cxx b/sc/source/ui/view/tabvwsh2.cxx index a5f627d1bd80..50cb51ffbcff 100644 --- a/sc/source/ui/view/tabvwsh2.cxx +++ b/sc/source/ui/view/tabvwsh2.cxx @@ -105,7 +105,7 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq) if (nNewId == SID_INSERT_DRAW && pArgs) { const SfxPoolItem* pItem; - if ( pArgs->GetItemState( SID_INSERT_DRAW, sal_True, &pItem ) == SFX_ITEM_SET && + if ( pArgs->GetItemState( SID_INSERT_DRAW, true, &pItem ) == SFX_ITEM_SET && pItem->ISA( SvxDrawToolItem ) ) { SvxDrawToolEnum eSel = (SvxDrawToolEnum)((const SvxDrawToolItem*)pItem)->GetValue(); @@ -142,7 +142,7 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq) if ( nNewId == SID_FM_CREATE_CONTROL && pArgs ) { const SfxPoolItem* pItem; - if ( pArgs->GetItemState( SID_FM_CONTROL_IDENTIFIER, sal_True, &pItem ) == SFX_ITEM_SET && + if ( pArgs->GetItemState( SID_FM_CONTROL_IDENTIFIER, true, &pItem ) == SFX_ITEM_SET && pItem->ISA( SfxUInt16Item ) ) nNewFormId = ((const SfxUInt16Item*)pItem)->GetValue(); } @@ -151,7 +151,7 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq) if ( pArgs ) { const SfxPoolItem* pItem; - if ( pArgs->GetItemState( nNewId, sal_True, &pItem ) == SFX_ITEM_SET && pItem->ISA( SfxStringItem ) ) + if ( pArgs->GetItemState( nNewId, true, &pItem ) == SFX_ITEM_SET && pItem->ISA( SfxStringItem ) ) sStringItemValue = static_cast<const SfxStringItem*>(pItem)->GetValue(); } bool bSwitchCustom = ( !sStringItemValue.isEmpty() && !sDrawCustom.isEmpty() && sStringItemValue != sDrawCustom ); diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx index c84b95e3227c..bd7ef6fe2fa6 100644 --- a/sc/source/ui/view/tabvwsh3.cxx +++ b/sc/source/ui/view/tabvwsh3.cxx @@ -111,14 +111,14 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) { const SfxPoolItem* pItem; if ( pReqArgs && - pReqArgs->GetItemState(FID_INSERT_FILE,sal_True,&pItem) == SFX_ITEM_SET ) + pReqArgs->GetItemState(FID_INSERT_FILE,true,&pItem) == SFX_ITEM_SET ) { OUString aFileName = ((const SfxStringItem*)pItem)->GetValue(); // Einfuege-Position Point aInsertPos; - if ( pReqArgs->GetItemState(FN_PARAM_1,sal_True,&pItem) == SFX_ITEM_SET ) + if ( pReqArgs->GetItemState(FN_PARAM_1,true,&pItem) == SFX_ITEM_SET ) aInsertPos = ((const SfxPointItem*)pItem)->GetValue(); else aInsertPos = GetInsertPos(); @@ -126,7 +126,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) // als Link? bool bAsLink = false; - if ( pReqArgs->GetItemState(FN_PARAM_2,sal_True,&pItem) == SFX_ITEM_SET ) + if ( pReqArgs->GetItemState(FN_PARAM_2,true,&pItem) == SFX_ITEM_SET ) bAsLink = ((const SfxBoolItem*)pItem)->GetValue(); // ausfuehren @@ -154,13 +154,13 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) OUString aColStr; bool bEntire = false; const SfxPoolItem* pItem; - if ( pReqArgs->GetItemState( SID_CHANGE_PRINTAREA, sal_True, &pItem ) == SFX_ITEM_SET ) + if ( pReqArgs->GetItemState( SID_CHANGE_PRINTAREA, true, &pItem ) == SFX_ITEM_SET ) aPrintStr = static_cast<const SfxStringItem*>(pItem)->GetValue(); - if ( pReqArgs->GetItemState( FN_PARAM_2, sal_True, &pItem ) == SFX_ITEM_SET ) + if ( pReqArgs->GetItemState( FN_PARAM_2, true, &pItem ) == SFX_ITEM_SET ) aRowStr = static_cast<const SfxStringItem*>(pItem)->GetValue(); - if ( pReqArgs->GetItemState( FN_PARAM_3, sal_True, &pItem ) == SFX_ITEM_SET ) + if ( pReqArgs->GetItemState( FN_PARAM_3, true, &pItem ) == SFX_ITEM_SET ) aColStr = static_cast<const SfxStringItem*>(pItem)->GetValue(); - if ( pReqArgs->GetItemState( FN_PARAM_4, sal_True, &pItem ) == SFX_ITEM_SET ) + if ( pReqArgs->GetItemState( FN_PARAM_4, true, &pItem ) == SFX_ITEM_SET ) bEntire = static_cast<const SfxBoolItem*>(pItem)->GetValue(); SetPrintRanges( bEntire, &aPrintStr, &aColStr, &aRowStr, false ); @@ -178,7 +178,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) { OUString aPrintStr; const SfxPoolItem* pItem; - if ( pReqArgs->GetItemState( SID_DEFINE_PRINTAREA, sal_True, &pItem ) == SFX_ITEM_SET ) + if ( pReqArgs->GetItemState( SID_DEFINE_PRINTAREA, true, &pItem ) == SFX_ITEM_SET ) aPrintStr = static_cast<const SfxStringItem*>(pItem)->GetValue(); SetPrintRanges( false, &aPrintStr, NULL, NULL, bAdd ); } @@ -226,10 +226,10 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) { OUString aAddress; const SfxPoolItem* pItem; - if ( pReqArgs->GetItemState( nSlot, sal_True, &pItem ) == SFX_ITEM_SET ) + if ( pReqArgs->GetItemState( nSlot, true, &pItem ) == SFX_ITEM_SET ) aAddress = ((const SfxStringItem*)pItem)->GetValue(); else if ( nSlot == SID_JUMPTOMARK && pReqArgs->GetItemState( - SID_JUMPTOMARK, sal_True, &pItem ) == SFX_ITEM_SET ) + SID_JUMPTOMARK, true, &pItem ) == SFX_ITEM_SET ) aAddress = ((const SfxStringItem*)pItem)->GetValue(); // #i14927# SID_CURRENTCELL with a single cell must unmark if FN_PARAM_1 @@ -237,7 +237,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) // ScGridWindow::MouseButtonUp no longer executes the slot for a single // cell if there is a multi selection. bool bUnmark = ( nSlot == SID_CURRENTCELL ); - if ( pReqArgs->GetItemState( FN_PARAM_1, sal_True, &pItem ) == SFX_ITEM_SET ) + if ( pReqArgs->GetItemState( FN_PARAM_1, true, &pItem ) == SFX_ITEM_SET ) bUnmark = ((const SfxBoolItem*)pItem)->GetValue(); bool bAlignToCursor = true; @@ -523,7 +523,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) // check whether there is an explicit argument, use it const SfxPoolItem* pItem; - if ( pReqArgs && pReqArgs->GetItemState(nSlot, sal_True, &pItem) == SFX_ITEM_SET ) + if ( pReqArgs && pReqArgs->GetItemState(nSlot, true, &pItem) == SFX_ITEM_SET ) { bool bItemValue = ((const SfxBoolItem*)pItem)->GetValue(); bWantPageBreak = (nSlot == FID_PAGEBREAKMODE) == bItemValue; @@ -565,7 +565,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) { bool bSet = !GetViewData()->IsSyntaxMode(); const SfxPoolItem* pItem; - if ( pReqArgs && pReqArgs->GetItemState(nSlot, sal_True, &pItem) == SFX_ITEM_SET ) + if ( pReqArgs && pReqArgs->GetItemState(nSlot, true, &pItem) == SFX_ITEM_SET ) bSet = ((const SfxBoolItem*)pItem)->GetValue(); GetViewData()->SetSyntaxMode( bSet ); PaintGrid(); @@ -578,7 +578,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) { bool bSet = !GetViewData()->IsHeaderMode(); const SfxPoolItem* pItem; - if ( pReqArgs && pReqArgs->GetItemState(nSlot, sal_True, &pItem) == SFX_ITEM_SET ) + if ( pReqArgs && pReqArgs->GetItemState(nSlot, true, &pItem) == SFX_ITEM_SET ) bSet = ((const SfxBoolItem*)pItem)->GetValue(); GetViewData()->SetHeaderMode( bSet ); RepeatResize(); @@ -594,7 +594,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) const ScViewOptions& rOpts = pViewData->GetOptions(); bool bFormulaMode = !rOpts.GetOption( VOPT_FORMULAS ); const SfxPoolItem *pItem; - if( pReqArgs && pReqArgs->GetItemState(nSlot, sal_True, &pItem) == SFX_ITEM_SET ) + if( pReqArgs && pReqArgs->GetItemState(nSlot, true, &pItem) == SFX_ITEM_SET ) bFormulaMode = ((const SfxBoolItem *)pItem)->GetValue(); ScViewOptions rSetOpts = ScViewOptions( rOpts ); @@ -615,7 +615,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) SfxChildWindow* pWnd = pThisFrame->GetChildWindow( nId ); bool bSet = ( pWnd == NULL ); const SfxPoolItem* pItem; - if ( pReqArgs && pReqArgs->GetItemState(nSlot, sal_True, &pItem) == SFX_ITEM_SET ) + if ( pReqArgs && pReqArgs->GetItemState(nSlot, true, &pItem) == SFX_ITEM_SET ) bSet = ((const SfxBoolItem*)pItem)->GetValue(); pThisFrame->SetChildWindow( nId, bSet ); @@ -741,7 +741,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) { const SfxPoolItem* pItem = NULL; bool bSyncZoom = SC_MOD()->GetAppOptions().GetSynchronizeZoom(); - if ( pReqArgs && pReqArgs->GetItemState(SID_ATTR_ZOOMSLIDER, sal_True, &pItem) == SFX_ITEM_SET ) + if ( pReqArgs && pReqArgs->GetItemState(SID_ATTR_ZOOMSLIDER, true, &pItem) == SFX_ITEM_SET ) { const sal_uInt16 nCurrentZoom = ((const SvxZoomSliderItem *)pItem)->GetValue(); if( nCurrentZoom ) @@ -942,7 +942,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) { const SfxPoolItem* pItem; if ( pReqArgs && - pReqArgs->GetItemState( nSlot, sal_True, &pItem ) == SFX_ITEM_SET && + pReqArgs->GetItemState( nSlot, true, &pItem ) == SFX_ITEM_SET && pItem->ISA( SfxStringItem ) ) { OUString aComment = ((const SfxStringItem*)pItem)->GetValue(); diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx index 8f8331bf25cd..e9da7c7719c3 100644 --- a/sc/source/ui/view/tabvwsh4.cxx +++ b/sc/source/ui/view/tabvwsh4.cxx @@ -1536,9 +1536,9 @@ void ScTabViewShell::Construct( sal_uInt8 nForceDesignMode ) pCurFrameLine = new ::editeng::SvxBorderLine(&aColBlack, 20, table::BorderLineStyle::SOLID); pPivotSource = new ScArea; - StartListening(*GetViewData()->GetDocShell(),sal_True); - StartListening(*GetViewFrame(),sal_True); - StartListening(*pSfxApp,sal_True); // #i62045# #i62046# application is needed for Calc's own hints + StartListening(*GetViewData()->GetDocShell(),true); + StartListening(*GetViewFrame(),true); + StartListening(*pSfxApp,true); // #i62045# #i62046# application is needed for Calc's own hints SfxViewFrame* pFirst = SfxViewFrame::GetFirst(pDocSh); bool bFirstView = !pFirst @@ -1890,7 +1890,7 @@ void ScTabViewShell::ExecTbx( SfxRequest& rReq ) sal_uInt16 nSlot = rReq.GetSlot(); const SfxPoolItem* pItem = NULL; if ( pReqArgs ) - pReqArgs->GetItemState( nSlot, sal_True, &pItem ); + pReqArgs->GetItemState( nSlot, true, &pItem ); switch ( nSlot ) { diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx index 9720363de200..a9d2767bf4a6 100644 --- a/sc/source/ui/view/tabvwsha.cxx +++ b/sc/source/ui/view/tabvwsha.cxx @@ -541,7 +541,7 @@ void ScTabViewShell::ExecuteCellFormatDlg(SfxRequest& rReq, const OString &rName const SfxItemSet* pOutSet = pDlg->GetOutputItemSet(); const SfxPoolItem* pItem=NULL; - if(pOutSet->GetItemState(SID_ATTR_NUMBERFORMAT_INFO,sal_True,&pItem)==SFX_ITEM_SET) + if(pOutSet->GetItemState(SID_ATTR_NUMBERFORMAT_INFO,true,&pItem)==SFX_ITEM_SET) { UpdateNumberFormatter((const SvxNumberInfoItem&)*pItem); @@ -761,7 +761,7 @@ void ScTabViewShell::ExecDrawOpt( SfxRequest& rReq ) switch (nSlotId) { case SID_GRID_VISIBLE: - if ( pArgs && pArgs->GetItemState(nSlotId,sal_True,&pItem) == SFX_ITEM_SET ) + if ( pArgs && pArgs->GetItemState(nSlotId,true,&pItem) == SFX_ITEM_SET ) { aGridOptions.SetGridVisible( ((const SfxBoolItem*)pItem)->GetValue() ); aViewOptions.SetGridOptions(aGridOptions); @@ -770,7 +770,7 @@ void ScTabViewShell::ExecDrawOpt( SfxRequest& rReq ) break; case SID_GRID_USE: - if ( pArgs && pArgs->GetItemState(nSlotId,sal_True,&pItem) == SFX_ITEM_SET ) + if ( pArgs && pArgs->GetItemState(nSlotId,true,&pItem) == SFX_ITEM_SET ) { aGridOptions.SetUseGridSnap( ((const SfxBoolItem*)pItem)->GetValue() ); aViewOptions.SetGridOptions(aGridOptions); @@ -779,7 +779,7 @@ void ScTabViewShell::ExecDrawOpt( SfxRequest& rReq ) break; case SID_HELPLINES_MOVE: - if ( pArgs && pArgs->GetItemState(nSlotId,sal_True,&pItem) == SFX_ITEM_SET ) + if ( pArgs && pArgs->GetItemState(nSlotId,true,&pItem) == SFX_ITEM_SET ) { aViewOptions.SetOption( VOPT_HELPLINES, ((const SfxBoolItem*)pItem)->GetValue() ); rBindings.Invalidate(SID_HELPLINES_MOVE); diff --git a/sc/source/ui/view/tabvwshb.cxx b/sc/source/ui/view/tabvwshb.cxx index d95ddaa3f5ae..86f8c66d222d 100644 --- a/sc/source/ui/view/tabvwshb.cxx +++ b/sc/source/ui/view/tabvwshb.cxx @@ -508,7 +508,7 @@ void ScTabViewShell::ExecuteUndo(SfxRequest& rReq) sal_uInt16 nCount = 1; const SfxPoolItem* pItem; - if ( pReqArgs && pReqArgs->GetItemState( nSlot, sal_True, &pItem ) == SFX_ITEM_SET ) + if ( pReqArgs && pReqArgs->GetItemState( nSlot, true, &pItem ) == SFX_ITEM_SET ) nCount = ((const SfxUInt16Item*)pItem)->GetValue(); // lock paint for more than one cell undo action (not for editing within a cell) diff --git a/sc/source/ui/view/tabvwshh.cxx b/sc/source/ui/view/tabvwshh.cxx index faa7e91fc417..f99c60617fc6 100644 --- a/sc/source/ui/view/tabvwshh.cxx +++ b/sc/source/ui/view/tabvwshh.cxx @@ -102,7 +102,7 @@ void ScTabViewShell::ExecuteObject( SfxRequest& rReq ) { bool bDone = false; const SfxPoolItem* pItem; - if ( pReqArgs && pReqArgs->GetItemState( nSlotId, sal_True, &pItem ) == SFX_ITEM_SET ) + if ( pReqArgs && pReqArgs->GetItemState( nSlotId, true, &pItem ) == SFX_ITEM_SET ) { long nNewVal = ((const SfxInt32Item*)pItem)->GetValue(); if ( nNewVal < 0 ) diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx index f6c2021fd253..2364c1bf8aa1 100644 --- a/sc/source/ui/view/viewfun2.cxx +++ b/sc/source/ui/view/viewfun2.cxx @@ -2964,13 +2964,13 @@ void ScViewFunc::SetSelectionFrameLines( const SvxBorderLine* pLine, const SfxItemSet& rSelItemSet = pSelAttrs->GetItemSet(); const SfxPoolItem* pBorderAttr = NULL; - SfxItemState eItemState = rSelItemSet.GetItemState( ATTR_BORDER, sal_True, &pBorderAttr ); + SfxItemState eItemState = rSelItemSet.GetItemState( ATTR_BORDER, true, &pBorderAttr ); const SfxPoolItem* pTLBRItem = 0; - SfxItemState eTLBRState = rSelItemSet.GetItemState( ATTR_BORDER_TLBR, sal_True, &pTLBRItem ); + SfxItemState eTLBRState = rSelItemSet.GetItemState( ATTR_BORDER_TLBR, true, &pTLBRItem ); const SfxPoolItem* pBLTRItem = 0; - SfxItemState eBLTRState = rSelItemSet.GetItemState( ATTR_BORDER_BLTR, sal_True, &pBLTRItem ); + SfxItemState eBLTRState = rSelItemSet.GetItemState( ATTR_BORDER_BLTR, true, &pBLTRItem ); // any of the lines visible? if( (eItemState != SFX_ITEM_DEFAULT) || (eTLBRState != SFX_ITEM_DEFAULT) || (eBLTRState != SFX_ITEM_DEFAULT) ) |