diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2016-04-20 17:19:05 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-04-20 17:25:49 +0200 |
commit | 67187c14175778b7939692d6be6e8bab2930be1b (patch) | |
tree | 4de0a861cf58fe5ce82fa9c915b0b73ff73aad89 /sc | |
parent | 607b6ced16e840dc860bbd3ea934816b6e1c6680 (diff) |
loplugin:salbool: Automatic rewrite of sal_False/True
Change-Id: I9b99327d58a63dfa5c292784cefb4894ee6d7fa8
Diffstat (limited to 'sc')
58 files changed, 174 insertions, 174 deletions
diff --git a/sc/qa/extras/sceditfieldobj-cell.cxx b/sc/qa/extras/sceditfieldobj-cell.cxx index a0533e34bf86..6258b8a95173 100644 --- a/sc/qa/extras/sceditfieldobj-cell.cxx +++ b/sc/qa/extras/sceditfieldobj-cell.cxx @@ -132,7 +132,7 @@ uno::Reference<uno::XInterface> ScEditFieldObj_Cell::init() uno::Reference<text::XTextCursor> xCursor = xText->createTextCursor(); uno::Reference<text::XTextRange> xRange(xCursor, UNO_QUERY_THROW); uno::Reference<text::XTextContent> xContent(mxField, UNO_QUERY_THROW); - xText->insertTextContent(xRange, xContent, sal_False); + xText->insertTextContent(xRange, xContent, false); } return mxField; } diff --git a/sc/qa/extras/sceditfieldobj-header.cxx b/sc/qa/extras/sceditfieldobj-header.cxx index d4e87bda0f96..4a5cb25fb1e1 100644 --- a/sc/qa/extras/sceditfieldobj-header.cxx +++ b/sc/qa/extras/sceditfieldobj-header.cxx @@ -118,7 +118,7 @@ uno::Reference<uno::XInterface> ScEditFieldObj_Header::init() uno::Reference<text::XTextCursor> xCursor = xText->createTextCursor(); uno::Reference<text::XTextRange> xRange(xCursor, UNO_QUERY_THROW); uno::Reference<text::XTextContent> xContent(mxField, UNO_QUERY_THROW); - xText->insertTextContent(xRange, xContent, sal_False); + xText->insertTextContent(xRange, xContent, false); xPropSet->setPropertyValue("RightPageHeaderContent", uno::makeAny(xHeaderContent)); diff --git a/sc/qa/unit/bugfix-test.cxx b/sc/qa/unit/bugfix-test.cxx index 02969755d823..9a22d48abef2 100644 --- a/sc/qa/unit/bugfix-test.cxx +++ b/sc/qa/unit/bugfix-test.cxx @@ -180,7 +180,7 @@ void ScFiltersTest::testTdf91979() Sequence < beans::PropertyValue > args(1); args[0].Name = "Hidden"; - args[0].Value <<= sal_True; + args[0].Value <<= true; uno::Reference< lang::XComponent > xComponent = xDesktop->loadComponentFromURL( "private:factory/scalc", diff --git a/sc/qa/unit/copy_paste_test.cxx b/sc/qa/unit/copy_paste_test.cxx index 575fbaeb4c98..cf1ea0e36843 100644 --- a/sc/qa/unit/copy_paste_test.cxx +++ b/sc/qa/unit/copy_paste_test.cxx @@ -95,7 +95,7 @@ void ScCopyPasteTest::testCopyPasteXLS() // 5. Create a new Spreadsheet Sequence < beans::PropertyValue > args(1); args[0].Name = "Hidden"; - args[0].Value <<= sal_True; + args[0].Value <<= true; uno::Reference< lang::XComponent > xComponent = xDesktop->loadComponentFromURL( "private:factory/scalc", diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx index 72cc4d26031c..0217fe5b4154 100644 --- a/sc/source/core/data/dptabsrc.cxx +++ b/sc/source/core/data/dptabsrc.cxx @@ -1290,7 +1290,7 @@ sal_Bool SAL_CALL ScDPDimensions::hasByName( const OUString& aName ) throw(uno:: long nCount = getCount(); for (long i=0; i<nCount; i++) if ( getByIndex(i)->getName() == aName ) - return sal_True; + return true; return false; } @@ -1746,7 +1746,7 @@ sal_Bool SAL_CALL ScDPHierarchies::hasByName( const OUString& aName ) throw(uno: long nCount = getCount(); for (long i=0; i<nCount; i++) if ( getByIndex(i)->getName() == aName ) - return sal_True; + return true; return false; } @@ -1925,7 +1925,7 @@ sal_Bool SAL_CALL ScDPLevels::hasByName( const OUString& aName ) throw(uno::Runt long nCount = getCount(); for (long i=0; i<nCount; i++) if ( getByIndex(i)->getName() == aName ) - return sal_True; + return true; return false; } @@ -2003,7 +2003,7 @@ ScDPLevel::ScDPLevel( ScDPSource* pSrc, long nD, long nH, long nL ) : nHier( nH ), nLev( nL ), pMembers( nullptr ), - aSortInfo( EMPTY_OUSTRING, sal_True, sheet::DataPilotFieldSortMode::NAME ), // default: sort by name + aSortInfo( EMPTY_OUSTRING, true, sheet::DataPilotFieldSortMode::NAME ), // default: sort by name nSortMeasure( 0 ), nAutoMeasure( 0 ), bShowEmpty( false ), diff --git a/sc/source/core/tool/charthelper.cxx b/sc/source/core/tool/charthelper.cxx index e814de811157..e75677cb50a5 100644 --- a/sc/source/core/tool/charthelper.cxx +++ b/sc/source/core/tool/charthelper.cxx @@ -179,7 +179,7 @@ void ScChartHelper::UpdateChartsOnDestinationPage( ScDocument* pDestDoc, const S OUString aChartName = static_cast<SdrOle2Obj*>(pObject)->GetPersistName(); Reference< chart2::XChartDocument > xChartDoc( pDestDoc->GetChartByName( aChartName ) ); Reference< util::XModifiable > xModif(xChartDoc, uno::UNO_QUERY_THROW); - xModif->setModified( sal_True); + xModif->setModified( true); } pObject = aIter.Next(); } @@ -422,9 +422,9 @@ void ScChartHelper::CreateProtectedChartListenersAndNotify( ScDocument* pDoc, Sd else { xProps->setPropertyValue("DisableDataTableDialog", - uno::makeAny( sal_False ) ); + uno::makeAny( false ) ); xProps->setPropertyValue("DisableComplexChartTypes", - uno::makeAny( sal_False ) ); + uno::makeAny( false ) ); } } } diff --git a/sc/source/filter/oox/defnamesbuffer.cxx b/sc/source/filter/oox/defnamesbuffer.cxx index acb6931c3d12..6c22d33e7ca0 100644 --- a/sc/source/filter/oox/defnamesbuffer.cxx +++ b/sc/source/filter/oox/defnamesbuffer.cxx @@ -446,13 +446,13 @@ void DefinedName::convertFormula() if( !bHasRowTitles && bFullRow && !bFullCol ) { xPrintAreas->setTitleRows( *aIt ); - xPrintAreas->setPrintTitleRows( sal_True ); + xPrintAreas->setPrintTitleRows( true ); bHasRowTitles = true; } else if( !bHasColTitles && bFullCol && !bFullRow ) { xPrintAreas->setTitleColumns( *aIt ); - xPrintAreas->setPrintTitleColumns( sal_True ); + xPrintAreas->setPrintTitleColumns( true ); bHasColTitles = true; } } diff --git a/sc/source/filter/oox/pagesettings.cxx b/sc/source/filter/oox/pagesettings.cxx index 7d33ba13d3fa..c45abf7a2b45 100644 --- a/sc/source/filter/oox/pagesettings.cxx +++ b/sc/source/filter/oox/pagesettings.cxx @@ -753,16 +753,16 @@ void HeaderFooterParser::updateCurrHeight() void HeaderFooterParser::setAttributes() { Reference<text::XTextRange> xRange( getStartPos(), UNO_QUERY ); - getEndPos()->gotoRange( xRange, sal_False ); - getEndPos()->gotoEnd( sal_True ); + getEndPos()->gotoRange( xRange, false ); + getEndPos()->gotoEnd( true ); if( !getEndPos()->isCollapsed() ) { Font aFont( *this, maFontModel ); aFont.finalizeImport(); PropertySet aPropSet( getEndPos() ); aFont.writeToPropertySet( aPropSet, FONT_PROPTYPE_TEXT ); - getStartPos()->gotoEnd( sal_False ); - getEndPos()->gotoEnd( sal_False ); + getStartPos()->gotoEnd( false ); + getEndPos()->gotoEnd( false ); } } @@ -770,7 +770,7 @@ void HeaderFooterParser::appendText() { if( !maBuffer.isEmpty() ) { - getEndPos()->gotoEnd( sal_False ); + getEndPos()->gotoEnd( false ); getEndPos()->setString( maBuffer.makeStringAndClear() ); updateCurrHeight(); } @@ -778,7 +778,7 @@ void HeaderFooterParser::appendText() void HeaderFooterParser::appendLineBreak() { - getEndPos()->gotoEnd( sal_False ); + getEndPos()->gotoEnd( false ); getEndPos()->setString( OUString( '\n' ) ); getPortion().mfTotalHeight += getCurrHeight(); getPortion().mfCurrHeight = 0; @@ -802,11 +802,11 @@ Reference<text::XTextContent> HeaderFooterParser::createField( const OUString& r void HeaderFooterParser::appendField( const Reference<text::XTextContent>& rxContent ) { - getEndPos()->gotoEnd( sal_False ); + getEndPos()->gotoEnd( false ); try { Reference<text::XTextRange> xRange( getEndPos(), UNO_QUERY_THROW ); - getPortion().mxText->insertTextContent( xRange, rxContent, sal_False ); + getPortion().mxText->insertTextContent( xRange, rxContent, false ); updateCurrHeight(); } catch( Exception& ) diff --git a/sc/source/filter/oox/pivotcachebuffer.cxx b/sc/source/filter/oox/pivotcachebuffer.cxx index b13fadd3ec75..8953be692e14 100644 --- a/sc/source/filter/oox/pivotcachebuffer.cxx +++ b/sc/source/filter/oox/pivotcachebuffer.cxx @@ -775,7 +775,7 @@ void PivotCacheField::convertNumericGrouping( const Reference< XDataPilotField > DataPilotFieldGroupInfo aGroupInfo; aGroupInfo.HasAutoStart = maFieldGroupModel.mbAutoStart; aGroupInfo.HasAutoEnd = maFieldGroupModel.mbAutoEnd; - aGroupInfo.HasDateValues = sal_False; + aGroupInfo.HasDateValues = false; aGroupInfo.Start = maFieldGroupModel.mfStartValue; aGroupInfo.End = maFieldGroupModel.mfEndValue; aGroupInfo.Step = maFieldGroupModel.mfInterval; @@ -796,7 +796,7 @@ OUString PivotCacheField::createDateGroupField( const Reference< XDataPilotField DataPilotFieldGroupInfo aGroupInfo; aGroupInfo.HasAutoStart = maFieldGroupModel.mbAutoStart; aGroupInfo.HasAutoEnd = maFieldGroupModel.mbAutoEnd; - aGroupInfo.HasDateValues = sal_True; + aGroupInfo.HasDateValues = true; aGroupInfo.Start = getUnitConverter().calcSerialFromDateTime( maFieldGroupModel.maStartDate ); aGroupInfo.End = getUnitConverter().calcSerialFromDateTime( maFieldGroupModel.maEndDate ); aGroupInfo.Step = bDayRanges ? maFieldGroupModel.mfInterval : 0.0; diff --git a/sc/source/filter/oox/pivottablebuffer.cxx b/sc/source/filter/oox/pivottablebuffer.cxx index 35a5ad402a39..7aa21b4d06ba 100644 --- a/sc/source/filter/oox/pivottablebuffer.cxx +++ b/sc/source/filter/oox/pivottablebuffer.cxx @@ -669,7 +669,7 @@ Reference< XDataPilotField > PivotTableField::convertRowColPageField( sal_Int32 if( maModel.mbAutoShow ) { DataPilotFieldAutoShowInfo aAutoShowInfo; - aAutoShowInfo.IsEnabled = sal_True; + aAutoShowInfo.IsEnabled = true; aAutoShowInfo.ShowItemsMode = maModel.mbTopAutoShow ? DataPilotFieldShowItemsMode::FROM_TOP : DataPilotFieldShowItemsMode::FROM_BOTTOM; aAutoShowInfo.ItemCount = maModel.mnAutoShowItems; if( const PivotCacheField* pCacheField = mrPivotTable.getCacheFieldOfDataField( maModel.mnAutoShowRankBy ) ) @@ -846,7 +846,7 @@ void PivotTableFilter::finalizeImport() { using namespace ::com::sun::star::sheet; DataPilotFieldAutoShowInfo aAutoShowInfo; - aAutoShowInfo.IsEnabled = sal_True; + aAutoShowInfo.IsEnabled = true; aAutoShowInfo.ShowItemsMode = maModel.mbTopFilter ? DataPilotFieldShowItemsMode::FROM_TOP : DataPilotFieldShowItemsMode::FROM_BOTTOM; aAutoShowInfo.ItemCount = getLimitedValue< sal_Int32, double >( maModel.mfValue, 0, SAL_MAX_INT32 ); if( const PivotCacheField* pCacheField = mrPivotTable.getCacheFieldOfDataField( maModel.mnMeasureField ) ) diff --git a/sc/source/filter/oox/stylesbuffer.cxx b/sc/source/filter/oox/stylesbuffer.cxx index 4ebe396319c7..b1d40dcaab93 100644 --- a/sc/source/filter/oox/stylesbuffer.cxx +++ b/sc/source/filter/oox/stylesbuffer.cxx @@ -568,8 +568,8 @@ ApiFontData::ApiFontData() : css::awt::FontUnderline::NONE, css::awt::FontStrikeout::NONE, 0.0, - sal_False, - sal_False, + false, + false, css::awt::FontType::DONTKNOW ), mnColor( API_RGB_TRANSPARENT ), mnEscapement( API_ESCAPE_NONE ), @@ -1364,7 +1364,7 @@ ProtectionModel::ProtectionModel() : } ApiProtectionData::ApiProtectionData() : - maCellProt( sal_True, sal_False, sal_False, sal_False ) + maCellProt( true, false, false, false ) { } diff --git a/sc/source/filter/oox/viewsettings.cxx b/sc/source/filter/oox/viewsettings.cxx index 508f9014b1c6..8aad4362501e 100644 --- a/sc/source/filter/oox/viewsettings.cxx +++ b/sc/source/filter/oox/viewsettings.cxx @@ -355,7 +355,7 @@ void SheetViewSettings::finalizeImport() // active tab/sheet cannot be hidden // always force it to be displayed PropertySet aPropSet( getSheet() ); - aPropSet.setProperty( PROP_IsVisible, sal_True ); + aPropSet.setProperty( PROP_IsVisible, true ); } // visible area and current cursor position (selection not supported via API) ScAddress aFirstPos = xModel->maFirstPos; diff --git a/sc/source/filter/oox/worksheethelper.cxx b/sc/source/filter/oox/worksheethelper.cxx index 0f1c42035b7b..fec613786ce7 100644 --- a/sc/source/filter/oox/worksheethelper.cxx +++ b/sc/source/filter/oox/worksheethelper.cxx @@ -516,7 +516,7 @@ Reference< XSheetCellRanges > WorksheetGlobals::getCellRangeList( const ApiCellR { xRanges.set( getBaseFilter().getModelFactory()->createInstance( maSheetCellRanges ), UNO_QUERY_THROW ); Reference< XSheetCellRangeContainer > xRangeCont( xRanges, UNO_QUERY_THROW ); - xRangeCont->addRangeAddresses( rRanges.toSequence(), sal_False ); + xRangeCont->addRangeAddresses( rRanges.toSequence(), false ); } catch( Exception& ) { diff --git a/sc/source/filter/xml/XMLCodeNameProvider.cxx b/sc/source/filter/xml/XMLCodeNameProvider.cxx index 0f053ee25141..db4c1ea25ec6 100644 --- a/sc/source/filter/xml/XMLCodeNameProvider.cxx +++ b/sc/source/filter/xml/XMLCodeNameProvider.cxx @@ -143,7 +143,7 @@ sal_Bool SAL_CALL XMLCodeNameProvider::hasElements() throw (uno::RuntimeException, std::exception ) { if( !mpDoc->GetCodeName().isEmpty() ) - return sal_True; + return true; SCTAB nCount = mpDoc->GetTableCount(); OUString sSheetName, sCodeName; @@ -151,7 +151,7 @@ sal_Bool SAL_CALL XMLCodeNameProvider::hasElements() { mpDoc->GetCodeName( i, sCodeName ); if (!sCodeName.isEmpty() && mpDoc->GetName(i, sSheetName)) - return sal_True; + return true; } return false; diff --git a/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx b/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx index 2ba8ed048153..e6aea5b32c82 100644 --- a/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx +++ b/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx @@ -82,7 +82,7 @@ XMLTableHeaderFooterContext::XMLTableHeaderFooterContext( SvXMLImport& rImport, { if( !::cppu::any2bool(xPropSet->getPropertyValue( sShareContent )) ) // share headers - xPropSet->setPropertyValue( sShareContent, uno::makeAny(sal_True) ); + xPropSet->setPropertyValue( sShareContent, uno::makeAny(true) ); } } else diff --git a/sc/source/filter/xml/XMLTrackedChangesContext.cxx b/sc/source/filter/xml/XMLTrackedChangesContext.cxx index 172dd658c327..ac36be357e38 100644 --- a/sc/source/filter/xml/XMLTrackedChangesContext.cxx +++ b/sc/source/filter/xml/XMLTrackedChangesContext.cxx @@ -1169,11 +1169,11 @@ void ScXMLChangeCellContext::EndElement() if (GetImport().GetTextImport()->GetCursor().is()) { //GetImport().GetTextImport()->GetCursor()->gotoEnd(sal_False); - if( GetImport().GetTextImport()->GetCursor()->goLeft( 1, sal_True ) ) + if( GetImport().GetTextImport()->GetCursor()->goLeft( 1, true ) ) { GetImport().GetTextImport()->GetText()->insertString( GetImport().GetTextImport()->GetCursorAsRange(), "", - sal_True ); + true ); } } diff --git a/sc/source/filter/xml/xmldpimp.cxx b/sc/source/filter/xml/xmldpimp.cxx index 56d7340403e7..de1ec719d3fa 100644 --- a/sc/source/filter/xml/xmldpimp.cxx +++ b/sc/source/filter/xml/xmldpimp.cxx @@ -1315,7 +1315,7 @@ ScXMLDataPilotDisplayInfoContext::ScXMLDataPilotDisplayInfoContext( ScXMLImport& if (IsXMLToken(aLocalName, XML_ENABLED)) { if (IsXMLToken(sValue, XML_TRUE)) - aInfo.IsEnabled = sal_True; + aInfo.IsEnabled = true; else aInfo.IsEnabled = false; } @@ -1365,7 +1365,7 @@ ScXMLDataPilotSortInfoContext::ScXMLDataPilotSortInfoContext( ScXMLImport& rImpo if (IsXMLToken(aLocalName, XML_ORDER)) { if (IsXMLToken(sValue, XML_ASCENDING)) - aInfo.IsAscending = sal_True; + aInfo.IsAscending = true; else if (IsXMLToken(sValue, XML_DESCENDING)) aInfo.IsAscending = false; } @@ -1413,7 +1413,7 @@ ScXMLDataPilotLayoutInfoContext::ScXMLDataPilotLayoutInfoContext( ScXMLImport& r if (IsXMLToken(aLocalName, XML_ADD_EMPTY_LINES)) { if (IsXMLToken(sValue, XML_TRUE)) - aInfo.AddEmptyLines = sal_True; + aInfo.AddEmptyLines = true; else aInfo.AddEmptyLines = false; } diff --git a/sc/source/filter/xml/xmlstyle.cxx b/sc/source/filter/xml/xmlstyle.cxx index 613787e4f1a1..9c99c86067d4 100644 --- a/sc/source/filter/xml/xmlstyle.cxx +++ b/sc/source/filter/xml/xmlstyle.cxx @@ -972,7 +972,7 @@ bool XmlScPropHdl_CellProtection::importXML( if (!rValue.hasValue()) { aCellProtection.IsHidden = false; - aCellProtection.IsLocked = sal_True; + aCellProtection.IsLocked = true; aCellProtection.IsFormulaHidden = false; aCellProtection.IsPrintHidden = false; bDefault = true; @@ -989,9 +989,9 @@ bool XmlScPropHdl_CellProtection::importXML( } else if (IsXMLToken(rStrImpValue, XML_HIDDEN_AND_PROTECTED)) { - aCellProtection.IsFormulaHidden = sal_True; - aCellProtection.IsHidden = sal_True; - aCellProtection.IsLocked = sal_True; + aCellProtection.IsFormulaHidden = true; + aCellProtection.IsHidden = true; + aCellProtection.IsLocked = true; rValue <<= aCellProtection; bRetval = true; } @@ -999,13 +999,13 @@ bool XmlScPropHdl_CellProtection::importXML( { aCellProtection.IsFormulaHidden = false; aCellProtection.IsHidden = false; - aCellProtection.IsLocked = sal_True; + aCellProtection.IsLocked = true; rValue <<= aCellProtection; bRetval = true; } else if (IsXMLToken(rStrImpValue, XML_FORMULA_HIDDEN)) { - aCellProtection.IsFormulaHidden = sal_True; + aCellProtection.IsFormulaHidden = true; aCellProtection.IsHidden = false; aCellProtection.IsLocked = false; rValue <<= aCellProtection; @@ -1022,9 +1022,9 @@ bool XmlScPropHdl_CellProtection::importXML( aCellProtection.IsHidden = false; aCellProtection.IsLocked = false; if ((IsXMLToken(sFirst, XML_PROTECTED)) || (IsXMLToken(sSecond, XML_PROTECTED))) - aCellProtection.IsLocked = sal_True; + aCellProtection.IsLocked = true; if ((IsXMLToken(sFirst, XML_FORMULA_HIDDEN)) || (IsXMLToken(sSecond, XML_FORMULA_HIDDEN))) - aCellProtection.IsFormulaHidden = sal_True; + aCellProtection.IsFormulaHidden = true; rValue <<= aCellProtection; bRetval = true; } @@ -1105,7 +1105,7 @@ bool XmlScPropHdl_PrintContent::importXML( if (!rValue.hasValue()) { aCellProtection.IsHidden = false; - aCellProtection.IsLocked = sal_True; + aCellProtection.IsLocked = true; aCellProtection.IsFormulaHidden = false; aCellProtection.IsPrintHidden = false; bDefault = true; diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx index f6dde8d02c3c..239e6439b959 100644 --- a/sc/source/filter/xml/xmlwrap.cxx +++ b/sc/source/filter/xml/xmlwrap.cxx @@ -572,7 +572,7 @@ bool ScXMLImportWrapper::Import( sal_uInt8 nMode, ErrCode& rError ) { uno::Reference< script::vba::XVBACompatibility > xVBACompat( xModelSet->getPropertyValue( "BasicLibraries" ), uno::UNO_QUERY_THROW ); - xVBACompat->setVBACompatibilityMode( sal_True ); + xVBACompat->setVBACompatibilityMode( true ); } catch( const uno::Exception& ) { @@ -630,7 +630,7 @@ bool ScXMLImportWrapper::ExportToComponent(const uno::Reference<uno::XComponentC OUString aUseCommonPassPropName("UseCommonStoragePasswordEncryption"); // advise storage impl to use common encryption - xSet->setPropertyValue( aUseCommonPassPropName, uno::makeAny(sal_True) ); + xSet->setPropertyValue( aUseCommonPassPropName, uno::makeAny(true) ); } xOut = xStream->getOutputStream(); diff --git a/sc/source/ui/Accessibility/AccessibleEditObject.cxx b/sc/source/ui/Accessibility/AccessibleEditObject.cxx index df9c3e272557..0aa7255f41a3 100644 --- a/sc/source/ui/Accessibility/AccessibleEditObject.cxx +++ b/sc/source/ui/Accessibility/AccessibleEditObject.cxx @@ -466,11 +466,11 @@ throw ( IndexOutOfBoundsException, xText(xAcc, uno::UNO_QUERY); if( xText.is() ) { - if( xText->getSelectionStart() >= 0 ) return sal_True; + if( xText->getSelectionStart() >= 0 ) return true; } } } - return sal_False; + return false; } void SAL_CALL ScAccessibleEditObject::clearAccessibleSelection( ) diff --git a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx index dba78b6b3794..e7030b4e7e84 100644 --- a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx +++ b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx @@ -875,7 +875,7 @@ sal_Bool SAL_CALL ScAccessibleSpreadsheet::isAccessibleRowSelected( sal_Int32 nR IsObjectValid(); if (IsFormulaMode()) { - return sal_False; + return false; } if ((nRow > (maRange.aEnd.Row() - maRange.aStart.Row())) || (nRow < 0)) @@ -898,7 +898,7 @@ sal_Bool SAL_CALL ScAccessibleSpreadsheet::isAccessibleColumnSelected( sal_Int32 if (IsFormulaMode()) { - return sal_False; + return false; } if ((nColumn > (maRange.aEnd.Col() - maRange.aStart.Col())) || (nColumn < 0)) throw lang::IndexOutOfBoundsException(); @@ -1465,7 +1465,7 @@ sal_Bool SAL_CALL ScAccessibleSpreadsheet::selectRow( sal_Int32 row ) if (IsFormulaMode()) { - return sal_False; + return false; } mpViewShell->SetTabNo( maRange.aStart.Tab() ); @@ -1473,7 +1473,7 @@ sal_Bool SAL_CALL ScAccessibleSpreadsheet::selectRow( sal_Int32 row ) mpViewShell->InitBlockMode( 0, row, maRange.aStart.Tab(), false, false, true ); mpViewShell->MarkCursor( MAXCOL, row, maRange.aStart.Tab(), false, true ); mpViewShell->SelectionChanged(); - return sal_True; + return true; } sal_Bool SAL_CALL ScAccessibleSpreadsheet::selectColumn( sal_Int32 column ) @@ -1483,7 +1483,7 @@ sal_Bool SAL_CALL ScAccessibleSpreadsheet::selectColumn( sal_Int32 column ) if (IsFormulaMode()) { - return sal_False; + return false; } mpViewShell->SetTabNo( maRange.aStart.Tab() ); @@ -1491,7 +1491,7 @@ sal_Bool SAL_CALL ScAccessibleSpreadsheet::selectColumn( sal_Int32 column ) mpViewShell->InitBlockMode( static_cast<SCCOL>(column), 0, maRange.aStart.Tab(), false, true ); mpViewShell->MarkCursor( static_cast<SCCOL>(column), MAXROW, maRange.aStart.Tab(), true ); mpViewShell->SelectionChanged(); - return sal_True; + return true; } sal_Bool SAL_CALL ScAccessibleSpreadsheet::unselectRow( sal_Int32 row ) @@ -1501,7 +1501,7 @@ sal_Bool SAL_CALL ScAccessibleSpreadsheet::unselectRow( sal_Int32 row ) if (IsFormulaMode()) { - return sal_False; + return false; } mpViewShell->SetTabNo( maRange.aStart.Tab() ); @@ -1510,7 +1510,7 @@ sal_Bool SAL_CALL ScAccessibleSpreadsheet::unselectRow( sal_Int32 row ) mpViewShell->MarkCursor( MAXCOL, row, maRange.aStart.Tab(), false, true ); mpViewShell->SelectionChanged(); mpViewShell->DoneBlockMode( true ); - return sal_True; + return true; } sal_Bool SAL_CALL ScAccessibleSpreadsheet::unselectColumn( sal_Int32 column ) @@ -1520,7 +1520,7 @@ sal_Bool SAL_CALL ScAccessibleSpreadsheet::unselectColumn( sal_Int32 column ) if (IsFormulaMode()) { - return sal_False; + return false; } mpViewShell->SetTabNo( maRange.aStart.Tab() ); @@ -1529,7 +1529,7 @@ sal_Bool SAL_CALL ScAccessibleSpreadsheet::unselectColumn( sal_Int32 column ) mpViewShell->MarkCursor( static_cast<SCCOL>(column), MAXROW, maRange.aStart.Tab(), true ); mpViewShell->SelectionChanged(); mpViewShell->DoneBlockMode( true ); - return sal_True; + return true; } void ScAccessibleSpreadsheet::FireFirstCellFocus() diff --git a/sc/source/ui/Accessibility/AccessibleTableBase.cxx b/sc/source/ui/Accessibility/AccessibleTableBase.cxx index c9e7e140eeda..c3c557d7707b 100644 --- a/sc/source/ui/Accessibility/AccessibleTableBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleTableBase.cxx @@ -491,28 +491,28 @@ sal_Bool SAL_CALL ScAccessibleTableBase::selectRow( sal_Int32 ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { - return sal_True; + return true; } sal_Bool SAL_CALL ScAccessibleTableBase::selectColumn( sal_Int32 ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { - return sal_True; + return true; } sal_Bool SAL_CALL ScAccessibleTableBase::unselectRow( sal_Int32 ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { - return sal_True; + return true; } sal_Bool SAL_CALL ScAccessibleTableBase::unselectColumn( sal_Int32 ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { - return sal_True; + return true; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index c3bb306c66da..e09ca84a941d 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -781,7 +781,7 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) if ( xStorable->isReadonly() ) { - xCloseable->close( sal_True ); + xCloseable->close( true ); OUString aUserName( ScGlobal::GetRscString( STR_UNKNOWN_USER ) ); bool bNoLockAccess = false; @@ -830,7 +830,7 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) } // close shared file - xCloseable->close( sal_True ); + xCloseable->close( true ); // TODO: keep file lock on shared file @@ -879,7 +879,7 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) } else { - xCloseable->close( sal_True ); + xCloseable->close( true ); if ( bEntriesNotAccessible ) { @@ -908,7 +908,7 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) try { uno::Reference< util::XCloseable > xClose( xModel, uno::UNO_QUERY_THROW ); - xClose->close( sal_True ); + xClose->close( true ); } catch ( uno::Exception& ) { diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index 44983e8ba3df..b667891759fc 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -1005,7 +1005,7 @@ void ScDocShell::Execute( SfxRequest& rReq ) uno::Reference< frame::XStorable > xStorable( xModel, uno::UNO_QUERY_THROW ); if ( xStorable->isReadonly() ) { - xCloseable->close( sal_True ); + xCloseable->close( true ); OUString aUserName( ScGlobal::GetRscString( STR_UNKNOWN_USER ) ); try @@ -1038,7 +1038,7 @@ void ScDocShell::Execute( SfxRequest& rReq ) ScGlobal::GetRscString( STR_DOC_DISABLESHARED ) ); if ( aBox->Execute() == RET_YES ) { - xCloseable->close( sal_True ); + xCloseable->close( true ); if ( !SwitchToShared( false, true ) ) { @@ -1061,13 +1061,13 @@ void ScDocShell::Execute( SfxRequest& rReq ) } else { - xCloseable->close( sal_True ); + xCloseable->close( true ); } } } else { - xCloseable->close( sal_True ); + xCloseable->close( true ); ScopedVclPtrInstance<WarningBox> aBox( GetActiveDialogParent(), WinBits( WB_OK ), ScGlobal::GetRscString( STR_DOC_NOLONGERSHARED ) ); aBox->Execute(); @@ -1081,7 +1081,7 @@ void ScDocShell::Execute( SfxRequest& rReq ) try { uno::Reference< util::XCloseable > xClose( xModel, uno::UNO_QUERY_THROW ); - xClose->close( sal_True ); + xClose->close( true ); } catch ( uno::Exception& ) { @@ -2368,7 +2368,7 @@ uno::Reference< frame::XModel > ScDocShell::LoadSharedDocument() uno::Reference< frame::XDesktop2 > xLoader = frame::Desktop::create( ::comphelper::getProcessComponentContext() ); uno::Sequence < beans::PropertyValue > aArgs( 1 ); aArgs[0].Name = "Hidden"; - aArgs[0].Value <<= sal_True; + aArgs[0].Value <<= true; if ( GetMedium() ) { @@ -2393,7 +2393,7 @@ uno::Reference< frame::XModel > ScDocShell::LoadSharedDocument() try { uno::Reference< util::XCloseable > xClose( xModel, uno::UNO_QUERY_THROW ); - xClose->close( sal_True ); + xClose->close( true ); return uno::Reference< frame::XModel >(); } catch ( uno::Exception& ) diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx index 156c50301468..200d5a9b8a47 100644 --- a/sc/source/ui/drawfunc/drawsh.cxx +++ b/sc/source/ui/drawfunc/drawsh.cxx @@ -93,7 +93,7 @@ static void lcl_setModified( SfxObjectShell* pShell ) { css::uno::Reference< css::util::XModifiable > xModif( pShell->GetModel(), css::uno::UNO_QUERY ); if ( xModif.is() ) - xModif->setModified( sal_True ); + xModif->setModified( true ); } } diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx index 45562b8ce1ae..0c596e7db598 100644 --- a/sc/source/ui/drawfunc/fuins2.cxx +++ b/sc/source/ui/drawfunc/fuins2.cxx @@ -659,7 +659,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawV } //tell the dialog to unlock controller xDialogProps->setPropertyValue("UnlockControllersOnExecute", - uno::makeAny( sal_True ) ); + uno::makeAny( true ) ); } catch( uno::Exception& ) diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx index d22425905d0c..177a0bbce184 100644 --- a/sc/source/ui/formdlg/formula.cxx +++ b/sc/source/ui/formdlg/formula.cxx @@ -92,7 +92,7 @@ ScFormulaDlg::ScFormulaDlg( SfxBindings* pB, SfxChildWindow* pCW, m_xParser.set(ScServiceProvider::MakeInstance(ScServiceProvider::Type::FORMULAPARS, static_cast<ScDocShell*>(m_pDoc->GetDocumentShell())),uno::UNO_QUERY); uno::Reference< beans::XPropertySet> xSet(m_xParser,uno::UNO_QUERY); - xSet->setPropertyValue(SC_UNO_COMPILEFAP, uno::makeAny(sal_True)); + xSet->setPropertyValue(SC_UNO_COMPILEFAP, uno::makeAny(true)); m_xOpCodeMapper.set(ScServiceProvider::MakeInstance(ScServiceProvider::Type::OPCODEMAPPER, static_cast<ScDocShell*>(m_pDoc->GetDocumentShell())),uno::UNO_QUERY); diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx index 2c632b58243e..7987b3fe050a 100644 --- a/sc/source/ui/unoobj/appluno.cxx +++ b/sc/source/ui/unoobj/appluno.cxx @@ -733,7 +733,7 @@ sal_Bool SAL_CALL ScFunctionListObj::hasByName( const OUString& aName ) const ScFuncDesc* pDesc = pFuncList->GetFunction(nIndex); //! Case-insensitiv ??? if ( pDesc && pDesc->pFuncName && aName == *pDesc->pFuncName ) - return sal_True; + return true; } } return false; diff --git a/sc/source/ui/unoobj/cellvaluebinding.cxx b/sc/source/ui/unoobj/cellvaluebinding.cxx index 8b73ac68cd93..a03941394566 100644 --- a/sc/source/ui/unoobj/cellvaluebinding.cxx +++ b/sc/source/ui/unoobj/cellvaluebinding.cxx @@ -166,7 +166,7 @@ namespace calc const Type* pTypesEnd = aSupportedTypes.getConstArray() + aSupportedTypes.getLength(); while ( pTypes != pTypesEnd ) if ( aType.equals( *pTypes++ ) ) - return sal_True; + return true; return false; } diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx index 84bbe704c612..529fda20587b 100644 --- a/sc/source/ui/unoobj/chart2uno.cxx +++ b/sc/source/ui/unoobj/chart2uno.cxx @@ -3513,7 +3513,7 @@ sal_Bool ScChart2DataSequence::switchToNext(sal_Bool bWrap) throw (uno::RuntimeException, std::exception) { if(!mbTimeBased) - return sal_True; + return true; if(mnCurrentTab >= mnTimeBasedEnd) { @@ -3540,7 +3540,7 @@ sal_Bool ScChart2DataSequence::switchToNext(sal_Bool bWrap) RebuildDataCache(); - return sal_True; + return true; } void ScChart2DataSequence::setRange(sal_Int32 nStart, sal_Int32 nEnd) @@ -3576,7 +3576,7 @@ sal_Bool ScChart2DataSequence::setToPointInTime(sal_Int32 nPoint) RebuildDataCache(); - return sal_True; + return true; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/dispuno.cxx b/sc/source/ui/unoobj/dispuno.cxx index f04281e47c26..278507820d10 100644 --- a/sc/source/ui/unoobj/dispuno.cxx +++ b/sc/source/ui/unoobj/dispuno.cxx @@ -275,7 +275,7 @@ void SAL_CALL ScDispatch::addStatusListener( // initial state frame::FeatureStateEvent aEvent; - aEvent.IsEnabled = sal_True; + aEvent.IsEnabled = true; aEvent.Source.set(static_cast<cppu::OWeakObject*>(this)); aEvent.FeatureURL = aURL; diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index ffab4b206629..7449898b757c 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -1575,7 +1575,7 @@ uno::Sequence<beans::PropertyValue> SAL_CALL ScModelObj::getRenderer( sal_Int32 pArray[0].Value <<= aPageSize; // #i111158# all positions are relative to the whole page, including non-printable area pArray[1].Name = SC_UNONAME_INC_NP_AREA; - pArray[1].Value = uno::makeAny( sal_True ); + pArray[1].Value = uno::makeAny( true ); if ( bWasCellRange ) { table::CellRangeAddress aRangeAddress( nTab, @@ -3483,7 +3483,7 @@ sal_Bool SAL_CALL ScTableSheetsObj::hasByName( const OUString& aName ) { SCTAB nIndex; if ( pDocShell->GetDocument().GetTable( aName, nIndex ) ) - return sal_True; + return true; } return false; } @@ -3644,7 +3644,7 @@ sal_Bool SAL_CALL ScTableColumnsObj::hasByName( const OUString& aName ) SCCOL nCol = 0; if ( ::AlphaToCol( nCol, aName) ) if ( pDocShell && nCol >= nStartCol && nCol <= nEndCol ) - return sal_True; + return true; return false; // nicht gefunden } diff --git a/sc/source/ui/unoobj/eventuno.cxx b/sc/source/ui/unoobj/eventuno.cxx index 4edcceb92672..aef1d663b81e 100644 --- a/sc/source/ui/unoobj/eventuno.cxx +++ b/sc/source/ui/unoobj/eventuno.cxx @@ -177,7 +177,7 @@ sal_Bool SAL_CALL ScSheetEventsObj::hasElements() throw(uno::RuntimeException, s { SolarMutexGuard aGuard; if (mpDocShell) - return sal_True; + return true; return false; } diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx index 5f64bfd3f584..08b02223b497 100644 --- a/sc/source/ui/unoobj/fielduno.cxx +++ b/sc/source/ui/unoobj/fielduno.cxx @@ -946,7 +946,7 @@ uno::Any ScEditFieldObj::getPropertyValueDateTime(const OUString& rName) { SvxDateField* p = static_cast<SvxDateField*>(pField); if (rName == SC_UNONAME_ISDATE) - return uno::makeAny(sal_True); + return uno::makeAny(true); if (rName == SC_UNONAME_ISFIXED) return uno::makeAny<sal_Bool>(p->GetType() == SVXDATETYPE_FIX); @@ -972,10 +972,10 @@ uno::Any ScEditFieldObj::getPropertyValueDateTime(const OUString& rName) { // SvxTimeField doesn't have any attributes. if (rName == SC_UNONAME_ISDATE) - return uno::makeAny(sal_False); + return uno::makeAny(false); if (rName == SC_UNONAME_ISFIXED) - return uno::makeAny(sal_False); + return uno::makeAny(false); if (rName == SC_UNONAME_DATETIME) // This is the best we can do. @@ -990,7 +990,7 @@ uno::Any ScEditFieldObj::getPropertyValueDateTime(const OUString& rName) { SvxExtTimeField* p = static_cast<SvxExtTimeField*>(pField); if (rName == SC_UNONAME_ISDATE) - return uno::makeAny(sal_False); + return uno::makeAny(false); if (rName == SC_UNONAME_ISFIXED) return uno::makeAny<sal_Bool>(p->GetType() == SVXTIMETYPE_FIX); @@ -1212,7 +1212,7 @@ void SAL_CALL ScEditFieldObj::attach( const uno::Reference<text::XTextRange>& xT uno::Reference<text::XText> xText(xTextRange->getText()); if (xText.is()) { - xText->insertTextContent( xTextRange, this, sal_True ); + xText->insertTextContent( xTextRange, this, true ); } } } diff --git a/sc/source/ui/unoobj/fmtuno.cxx b/sc/source/ui/unoobj/fmtuno.cxx index f626ba271a5c..99ad13521269 100644 --- a/sc/source/ui/unoobj/fmtuno.cxx +++ b/sc/source/ui/unoobj/fmtuno.cxx @@ -461,7 +461,7 @@ sal_Bool SAL_CALL ScTableConditionalFormat::hasByName( const OUString& aName ) long nCount = aEntries.size(); for (long i=0; i<nCount; i++) if ( aName == lcl_GetEntryNameFromIndex(i) ) - return sal_True; + return true; return false; } diff --git a/sc/source/ui/unoobj/linkuno.cxx b/sc/source/ui/unoobj/linkuno.cxx index 1f19686d0720..301f36b8e379 100644 --- a/sc/source/ui/unoobj/linkuno.cxx +++ b/sc/source/ui/unoobj/linkuno.cxx @@ -529,7 +529,7 @@ sal_Bool SAL_CALL ScSheetLinksObj::hasByName( const OUString& aName ) //! case-insensitiv ??? OUString aLinkDoc(rDoc.GetLinkDoc( nTab )); if ( aLinkDoc == aName ) - return sal_True; + return true; } } return false; @@ -1373,7 +1373,7 @@ sal_Bool SAL_CALL ScDDELinksObj::hasByName( const OUString& aName ) { rDoc.GetDdeLinkData( i, aAppl, aTopic, aItem ); if ( lcl_BuildDDEName(aAppl, aTopic, aItem) == aName ) - return sal_True; + return true; } } return false; diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx index 598604314805..5c60a5b2d496 100644 --- a/sc/source/ui/unoobj/nameuno.cxx +++ b/sc/source/ui/unoobj/nameuno.cxx @@ -729,7 +729,7 @@ sal_Bool SAL_CALL ScNamedRangesObj::hasByName( const OUString& aName ) { const ScRangeData* pData = pNames->findByUpperName(ScGlobal::pCharClass->uppercase(aName)); if (pData && lcl_UserVisibleName(*pData)) - return sal_True; + return true; } } return false; diff --git a/sc/source/ui/unoobj/servuno.cxx b/sc/source/ui/unoobj/servuno.cxx index c87d296c00cb..6d9a1db57f9c 100644 --- a/sc/source/ui/unoobj/servuno.cxx +++ b/sc/source/ui/unoobj/servuno.cxx @@ -162,7 +162,7 @@ public: } // XElemenAccess virtual css::uno::Type SAL_CALL getElementType( ) throw (css::uno::RuntimeException, std::exception) override { return uno::Type(); } - virtual sal_Bool SAL_CALL hasElements( ) throw (css::uno::RuntimeException, std::exception ) override { return sal_True; } + virtual sal_Bool SAL_CALL hasElements( ) throw (css::uno::RuntimeException, std::exception ) override { return true; } }; diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx index 14d399db2015..3a363a557c04 100644 --- a/sc/source/ui/unoobj/shapeuno.cxx +++ b/sc/source/ui/unoobj/shapeuno.cxx @@ -1457,7 +1457,7 @@ public: virtual sal_Bool SAL_CALL hasElements() throw(uno::RuntimeException, std::exception) override { // elements are always present (but contained property sequences may be empty) - return sal_True; + return true; } }; diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx index cbe5f23dd7f1..bde202b44554 100644 --- a/sc/source/ui/unoobj/styleuno.cxx +++ b/sc/source/ui/unoobj/styleuno.cxx @@ -879,7 +879,7 @@ sal_Bool SAL_CALL ScStyleFamilyObj::hasByName( const OUString& aName ) ScDocument& rDoc = pDocShell->GetDocument(); ScStyleSheetPool* pStylePool = rDoc.GetStyleSheetPool(); if ( pStylePool->Find( aString, eFamily ) ) - return sal_True; + return true; } return false; } diff --git a/sc/source/ui/unoobj/targuno.cxx b/sc/source/ui/unoobj/targuno.cxx index ead87f8fecd5..8512c8603e8b 100644 --- a/sc/source/ui/unoobj/targuno.cxx +++ b/sc/source/ui/unoobj/targuno.cxx @@ -116,7 +116,7 @@ sal_Bool SAL_CALL ScLinkTargetTypesObj::hasByName(const OUString& aName) throw( { for (sal_uInt16 i=0; i<SC_LINKTARGETTYPE_COUNT; i++) if ( aNames[i] == aName ) - return sal_True; + return true; return false; } @@ -129,7 +129,7 @@ uno::Type SAL_CALL ScLinkTargetTypesObj::getElementType() throw( uno::RuntimeExc sal_Bool SAL_CALL ScLinkTargetTypesObj::hasElements() throw( uno::RuntimeException, std::exception ) { - return sal_True; + return true; } ScLinkTargetTypeObj::ScLinkTargetTypeObj(ScDocShell* pDocSh, sal_uInt16 nT) : diff --git a/sc/source/ui/vba/excelvbahelper.cxx b/sc/source/ui/vba/excelvbahelper.cxx index 99467b7b86cf..044668e7948e 100644 --- a/sc/source/ui/vba/excelvbahelper.cxx +++ b/sc/source/ui/vba/excelvbahelper.cxx @@ -302,7 +302,7 @@ void setUpDocumentModules( const uno::Reference< sheet::XSpreadsheetDocument >& document. */ uno::Reference<script::XLibraryContainer> xLibContainer = pShell->GetBasicContainer(); uno::Reference<script::vba::XVBACompatibility> xVBACompat( xLibContainer, uno::UNO_QUERY_THROW ); - xVBACompat->setVBACompatibilityMode( sal_True ); + xVBACompat->setVBACompatibilityMode( true ); if( xLibContainer.is() ) { diff --git a/sc/source/ui/vba/vbaapplication.cxx b/sc/source/ui/vba/vbaapplication.cxx index 3a984d1cb6e5..24b37ee2c2b9 100644 --- a/sc/source/ui/vba/vbaapplication.cxx +++ b/sc/source/ui/vba/vbaapplication.cxx @@ -371,7 +371,7 @@ ScVbaApplication::getCutCopyMode() throw (uno::RuntimeException, std::exception) { //# FIXME TODO, implementation uno::Any result; - result <<= sal_False; + result <<= false; return result; } @@ -397,7 +397,7 @@ ScVbaApplication::setStatusBar( const uno::Any& _statusbar ) throw (uno::Runtime uno::Reference< task::XStatusIndicator > xStatusIndicator( xStatusIndicatorSupplier->getStatusIndicator(), uno::UNO_QUERY_THROW ); if( _statusbar >>= sText ) { - setDisplayStatusBar( sal_True ); + setDisplayStatusBar( true ); if ( !sText.isEmpty() ) xStatusIndicator->start( sText, 100 ); else @@ -408,7 +408,7 @@ ScVbaApplication::setStatusBar( const uno::Any& _statusbar ) throw (uno::Runtime if( !bDefault ) { xStatusIndicator->end(); - setDisplayStatusBar( sal_True ); + setDisplayStatusBar( true ); } } else @@ -438,7 +438,7 @@ ScVbaApplication::setCalculation( ::sal_Int32 _calculation ) throw (uno::Runtime break; case excel::XlCalculation::xlCalculationAutomatic: case excel::XlCalculation::xlCalculationSemiautomatic: - xCalc->enableAutomaticCalculation(sal_True); + xCalc->enableAutomaticCalculation(true); break; } } @@ -741,7 +741,7 @@ ScVbaApplication::getDisplayFullScreen() throw (uno::RuntimeException, std::exc SfxViewShell* pShell = excel::getCurrentBestViewShell( mxContext ); if ( pShell ) return ScViewUtil::IsFullScreen( *pShell ); - return sal_False; + return false; } void SAL_CALL diff --git a/sc/source/ui/vba/vbaaxis.cxx b/sc/source/ui/vba/vbaaxis.cxx index 41ef215656dc..1f1349b05f3b 100644 --- a/sc/source/ui/vba/vbaaxis.cxx +++ b/sc/source/ui/vba/vbaaxis.cxx @@ -122,7 +122,7 @@ ScVbaAxis::setCrosses( ::sal_Int32 _nCrosses ) throw (script::BasicErrorExceptio switch (_nCrosses) { case xlAxisCrossesAutomatic: //Microsoft Excel sets the axis crossing point. - mxPropertySet->setPropertyValue(AUTOORIGIN, uno::makeAny( sal_True ) ); + mxPropertySet->setPropertyValue(AUTOORIGIN, uno::makeAny( true ) ); bCrossesAreCustomized = false; return; case xlAxisCrossesMinimum: // The axis crosses at the minimum value. @@ -562,10 +562,10 @@ ScVbaAxis::setScaleType( ::sal_Int32 _nScaleType ) throw (script::BasicErrorExce switch (_nScaleType) { case xlScaleLinear: - mxPropertySet->setPropertyValue("Logarithmic", uno::makeAny( sal_False ) ); + mxPropertySet->setPropertyValue("Logarithmic", uno::makeAny( false ) ); break; case xlScaleLogarithmic: - mxPropertySet->setPropertyValue("Logarithmic", uno::makeAny( sal_True ) ); + mxPropertySet->setPropertyValue("Logarithmic", uno::makeAny( true ) ); break; default: // According to MS the paramenter is ignored and no Error is thrown diff --git a/sc/source/ui/vba/vbaborders.cxx b/sc/source/ui/vba/vbaborders.cxx index 86e8ddcd29c1..ab6c80f83ec1 100644 --- a/sc/source/ui/vba/vbaborders.cxx +++ b/sc/source/ui/vba/vbaborders.cxx @@ -63,28 +63,28 @@ private: switch ( m_LineType ) { case XlBordersIndex::xlEdgeLeft: - aTableBorder.IsLeftLineValid = sal_True; + aTableBorder.IsLeftLineValid = true; aTableBorder.LeftLine= rBorderLine; break; case XlBordersIndex::xlEdgeTop: - aTableBorder.IsTopLineValid = sal_True; + aTableBorder.IsTopLineValid = true; aTableBorder.TopLine = rBorderLine; break; case XlBordersIndex::xlEdgeBottom: - aTableBorder.IsBottomLineValid = sal_True; + aTableBorder.IsBottomLineValid = true; aTableBorder.BottomLine = rBorderLine; break; case XlBordersIndex::xlEdgeRight: - aTableBorder.IsRightLineValid = sal_True; + aTableBorder.IsRightLineValid = true; aTableBorder.RightLine = rBorderLine; break; case XlBordersIndex::xlInsideVertical: - aTableBorder.IsVerticalLineValid = sal_True; + aTableBorder.IsVerticalLineValid = true; aTableBorder.VerticalLine = rBorderLine; break; case XlBordersIndex::xlInsideHorizontal: - aTableBorder.IsHorizontalLineValid = sal_True; + aTableBorder.IsHorizontalLineValid = true; aTableBorder.HorizontalLine = rBorderLine; break; case XlBordersIndex::xlDiagonalDown: @@ -341,7 +341,7 @@ public: } virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) override { - return sal_True; + return true; } }; diff --git a/sc/source/ui/vba/vbacharacters.cxx b/sc/source/ui/vba/vbacharacters.cxx index 0a0ad615135e..747878e082d6 100644 --- a/sc/source/ui/vba/vbacharacters.cxx +++ b/sc/source/ui/vba/vbacharacters.cxx @@ -41,9 +41,9 @@ ScVbaCharacters::ScVbaCharacters( const uno::Reference< XHelperInterface >& xPar xTextCursor->goRight( nStart, false ); } if ( nLength < 0 ) // expand to end - xTextCursor->gotoEnd( sal_True ); + xTextCursor->gotoEnd( true ); else - xTextCursor->goRight( nLength, sal_True ); + xTextCursor->goRight( nLength, true ); m_xTextRange.set( xTextCursor, uno::UNO_QUERY_THROW ); } diff --git a/sc/source/ui/vba/vbachart.cxx b/sc/source/ui/vba/vbachart.cxx index d90af26d212a..4e2ef575aaa2 100644 --- a/sc/source/ui/vba/vbachart.cxx +++ b/sc/source/ui/vba/vbachart.cxx @@ -321,11 +321,11 @@ try case xlXYScatter: case xlBubble: // not possible case xlBubble3DEffect: // not possible - mxDiagramPropertySet->setPropertyValue(LINES, uno::makeAny( sal_False )); + mxDiagramPropertySet->setPropertyValue(LINES, uno::makeAny( false )); break; case xlXYScatterLines: case xlXYScatterLinesNoMarkers: - mxDiagramPropertySet->setPropertyValue(LINES, uno::makeAny( sal_True )); + mxDiagramPropertySet->setPropertyValue(LINES, uno::makeAny( true )); break; case xlXYScatterSmooth: case xlXYScatterSmoothNoMarkers: @@ -370,12 +370,12 @@ try case xlSurfaceWireframe: case xlSurfaceTopView: case xlSurfaceTopViewWireframe: - mxDiagramPropertySet->setPropertyValue(DEEP,uno::makeAny( sal_True )); + mxDiagramPropertySet->setPropertyValue(DEEP,uno::makeAny( true )); break; default: if (mxDiagramPropertySet->getPropertySetInfo()->hasPropertyByName(DEEP)) { - mxDiagramPropertySet->setPropertyValue(DEEP, uno::makeAny( sal_False)); + mxDiagramPropertySet->setPropertyValue(DEEP, uno::makeAny( false)); } break; } @@ -439,12 +439,12 @@ try case xlSurfaceWireframe: case xlSurfaceTopView: case xlSurfaceTopViewWireframe: - mxDiagramPropertySet->setPropertyValue(VERTICAL, uno::makeAny( sal_True)); + mxDiagramPropertySet->setPropertyValue(VERTICAL, uno::makeAny( true)); break; default: if (mxDiagramPropertySet->getPropertySetInfo()->hasPropertyByName(VERTICAL)) { - mxDiagramPropertySet->setPropertyValue(VERTICAL, uno::makeAny(sal_False)); + mxDiagramPropertySet->setPropertyValue(VERTICAL, uno::makeAny(false)); } break; } @@ -465,8 +465,8 @@ try case xlConeBarStacked: case xlPyramidColStacked: case xlPyramidBarStacked: - mxDiagramPropertySet->setPropertyValue(PERCENT, uno::makeAny( sal_False )); - mxDiagramPropertySet->setPropertyValue(STACKED, uno::makeAny( sal_True )); + mxDiagramPropertySet->setPropertyValue(PERCENT, uno::makeAny( false )); + mxDiagramPropertySet->setPropertyValue(STACKED, uno::makeAny( true )); break; case xlPyramidColStacked100: case xlPyramidBarStacked100: @@ -482,12 +482,12 @@ try case xlBarStacked100: case xl3DColumnStacked100: case xlColumnStacked100: - mxDiagramPropertySet->setPropertyValue(STACKED, uno::makeAny( sal_True)); - mxDiagramPropertySet->setPropertyValue(PERCENT, uno::makeAny( sal_True )); + mxDiagramPropertySet->setPropertyValue(STACKED, uno::makeAny( true)); + mxDiagramPropertySet->setPropertyValue(PERCENT, uno::makeAny( true )); break; default: - mxDiagramPropertySet->setPropertyValue(PERCENT, uno::makeAny( sal_False)); - mxDiagramPropertySet->setPropertyValue(STACKED, uno::makeAny( sal_False)); + mxDiagramPropertySet->setPropertyValue(PERCENT, uno::makeAny( false)); + mxDiagramPropertySet->setPropertyValue(STACKED, uno::makeAny( false)); break; } switch (_nChartType) @@ -526,12 +526,12 @@ try case xlCylinderBarStacked: case xlCylinderBarStacked100: case xlCylinderCol: - mxDiagramPropertySet->setPropertyValue(DIM3D, uno::makeAny( sal_True)); + mxDiagramPropertySet->setPropertyValue(DIM3D, uno::makeAny( true)); break; default: if (mxDiagramPropertySet->getPropertySetInfo()->hasPropertyByName(DIM3D)) { - mxDiagramPropertySet->setPropertyValue(DIM3D, uno::makeAny( sal_False)); + mxDiagramPropertySet->setPropertyValue(DIM3D, uno::makeAny( false)); } break; } diff --git a/sc/source/ui/vba/vbacomment.cxx b/sc/source/ui/vba/vbacomment.cxx index 30ba9eb60365..cd9ccdd512d1 100644 --- a/sc/source/ui/vba/vbacomment.cxx +++ b/sc/source/ui/vba/vbacomment.cxx @@ -187,13 +187,13 @@ ScVbaComment::Text( const uno::Any& aText, const uno::Any& aStart, const uno::An xTextCursor->collapseToStart(); xTextCursor->gotoStart( false ); xTextCursor->goRight( nStart - 1, false ); - xTextCursor->gotoEnd( sal_True ); + xTextCursor->gotoEnd( true ); } else { xTextCursor->collapseToStart(); xTextCursor->gotoStart( false ); - xTextCursor->goRight( nStart - 1 , sal_True ); + xTextCursor->goRight( nStart - 1 , true ); } uno::Reference< text::XTextRange > xRange( xTextCursor, uno::UNO_QUERY_THROW ); diff --git a/sc/source/ui/vba/vbaformat.cxx b/sc/source/ui/vba/vbaformat.cxx index 03533543f56b..88c29ba01d92 100644 --- a/sc/source/ui/vba/vbaformat.cxx +++ b/sc/source/ui/vba/vbaformat.cxx @@ -418,7 +418,7 @@ ScVbaFormat< Ifc... >::setNumberFormatLocal( const uno::Any& _oLocalFormatString initializeNumberFormats(); lang::Locale aRangeLocale; xNumberFormats->getByKey(nFormat)->getPropertyValue( LOCALE ) >>= aRangeLocale; - sal_Int32 nNewFormat = xNumberFormats->queryKey(sLocalFormatString, aRangeLocale, sal_True); + sal_Int32 nNewFormat = xNumberFormats->queryKey(sLocalFormatString, aRangeLocale, true); if (nNewFormat == -1) nNewFormat = xNumberFormats->addNew(sLocalFormatString, aRangeLocale); @@ -444,7 +444,7 @@ ScVbaFormat< Ifc... >::setNumberFormat( const uno::Any& _oFormatString ) throw ( lang::Locale aDefaultLocale = m_aDefaultLocale; initializeNumberFormats(); - sal_Int32 nFormat = xNumberFormats->queryKey(sFormatString, aDefaultLocale, sal_True); + sal_Int32 nFormat = xNumberFormats->queryKey(sFormatString, aDefaultLocale, true); if (nFormat == -1) nFormat = xNumberFormats->addNew(sFormatString, aDefaultLocale); diff --git a/sc/source/ui/vba/vbapagebreak.cxx b/sc/source/ui/vba/vbapagebreak.cxx index 34584e44bd0b..bc7942c25a6e 100644 --- a/sc/source/ui/vba/vbapagebreak.cxx +++ b/sc/source/ui/vba/vbapagebreak.cxx @@ -61,13 +61,13 @@ void ScVbaPageBreak< Ifc... >::setType(sal_Int32 type) throw (uno::RuntimeExcept if( type == excel::XlPageBreak::xlPageBreakNone ) { - mxRowColPropertySet->setPropertyValue("IsStartOfNewPage", uno::makeAny(sal_False)); + mxRowColPropertySet->setPropertyValue("IsStartOfNewPage", uno::makeAny(false)); return; } - mxRowColPropertySet->setPropertyValue("IsStartOfNewPage", uno::makeAny(sal_True)); + mxRowColPropertySet->setPropertyValue("IsStartOfNewPage", uno::makeAny(true)); if( type == excel::XlPageBreak::xlPageBreakManual ) - maTablePageBreakData.ManualBreak = sal_True; + maTablePageBreakData.ManualBreak = true; else maTablePageBreakData.ManualBreak = false; } @@ -75,7 +75,7 @@ void ScVbaPageBreak< Ifc... >::setType(sal_Int32 type) throw (uno::RuntimeExcept template< typename... Ifc > void ScVbaPageBreak< Ifc... >::Delete() throw ( script::BasicErrorException, uno::RuntimeException) { - mxRowColPropertySet->setPropertyValue("IsStartOfNewPage", uno::makeAny(sal_False)); + mxRowColPropertySet->setPropertyValue("IsStartOfNewPage", uno::makeAny(false)); } template< typename... Ifc > diff --git a/sc/source/ui/vba/vbapagebreaks.cxx b/sc/source/ui/vba/vbapagebreaks.cxx index 3bf7e9a4903f..047e7cac9d5e 100644 --- a/sc/source/ui/vba/vbapagebreaks.cxx +++ b/sc/source/ui/vba/vbapagebreaks.cxx @@ -85,7 +85,7 @@ public: } virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) override { - return sal_True; + return true; } }; @@ -170,9 +170,9 @@ uno::Any RangePageBreaks::Add( const css::uno::Any& Before ) throw ( css::script sal_Int32 nAPIRowColIndex = getAPIStartofRange( xRange ); uno::Reference< container::XIndexAccess > xIndexAccess = getRowColContainer(); uno::Reference< beans::XPropertySet > xRowColPropertySet( xIndexAccess->getByIndex(nAPIRowColIndex), uno::UNO_QUERY_THROW ); - xRowColPropertySet->setPropertyValue("IsStartOfNewPage", uno::makeAny(sal_True)); + xRowColPropertySet->setPropertyValue("IsStartOfNewPage", uno::makeAny(true)); sheet::TablePageBreakData aTablePageBreakData; - aTablePageBreakData.ManualBreak = sal_True; + aTablePageBreakData.ManualBreak = true; aTablePageBreakData.Position = nAPIRowColIndex; if( m_bColumn ) return uno::makeAny( uno::Reference< excel::XVPageBreak >( new ScVbaVPageBreak( mxParent, mxContext, xRowColPropertySet, aTablePageBreakData) )); diff --git a/sc/source/ui/vba/vbapalette.cxx b/sc/source/ui/vba/vbapalette.cxx index 4c75a37923df..f59727ebdbe2 100644 --- a/sc/source/ui/vba/vbapalette.cxx +++ b/sc/source/ui/vba/vbapalette.cxx @@ -73,7 +73,7 @@ public: } virtual sal_Bool SAL_CALL hasElements() throw (uno::RuntimeException, std::exception) override { - return sal_True; + return true; } }; diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx index 42029fa47d5c..f13449c5ffdb 100644 --- a/sc/source/ui/vba/vbarange.cxx +++ b/sc/source/ui/vba/vbarange.cxx @@ -327,7 +327,7 @@ public: } // XElementAccess virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException, std::exception) override { return cppu::UnoType<table::XCellRange>::get(); } - virtual sal_Bool SAL_CALL hasElements() throw (uno::RuntimeException, std::exception) override { return sal_True; } + virtual sal_Bool SAL_CALL hasElements() throw (uno::RuntimeException, std::exception) override { return true; } // XEnumerationAccess virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration() throw (uno::RuntimeException, std::exception) override { return new SingleRangeEnumeration( m_xRange ); } @@ -818,7 +818,7 @@ void CellValueGetter::visitNode( sal_Int32 x, sal_Int32 y, const uno::Reference< OUString sFormula = xCell->getFormula(); if ( sFormula == "=TRUE()" ) - aValue <<= sal_True; + aValue <<= true; else if ( sFormula == "=FALSE()" ) aValue <<= false; else @@ -1320,7 +1320,7 @@ void lclExpandAndMerge( const uno::Reference< table::XCellRange >& rxCellRange, if( nLastRowIdx > 0 ) lclClearRange( rxCellRange->getCellRangeByPosition( 0, 1, nLastColIdx, nLastRowIdx ) ); // merge the range - xMerge->merge( sal_True ); + xMerge->merge( true ); } } @@ -1772,7 +1772,7 @@ ScVbaRange::HasFormula() throw (uno::RuntimeException, std::exception) ScCellRangesBase* pFormulaRanges = dynamic_cast< ScCellRangesBase * > ( xRanges.get() ); // check if there are no formula cell, return false if ( pFormulaRanges->GetRangeList().empty() ) - return uno::makeAny(sal_False); + return uno::makeAny(false); // check if there are holes (where some cells are not formulas) // or returned range is not equal to this range @@ -1782,7 +1782,7 @@ ScVbaRange::HasFormula() throw (uno::RuntimeException, std::exception) ) return aNULL(); // should return aNULL; } - return uno::makeAny( sal_True ); + return uno::makeAny( true ); } void ScVbaRange::fillSeries( sheet::FillDirection nFillDirection, sheet::FillMode nFillMode, sheet::FillDateMode nFillDateMode, double fStep, double fEndValue ) throw( uno::RuntimeException ) @@ -2045,7 +2045,7 @@ ScVbaRange::Address( const uno::Any& RowAbsolute, const uno::Any& ColumnAbsolut // force external to be false // only first address should have the // document and sheet specifications - aExternalCopy = uno::makeAny(sal_False); + aExternalCopy = uno::makeAny(false); } sAddress += xRange->Address( RowAbsolute, ColumnAbsolute, ReferenceStyle, aExternalCopy, RelativeTo ); } @@ -3018,7 +3018,7 @@ ScVbaRange::Replace( const OUString& What, const OUString& Replacement, const un uno::Reference< excel::XRange > xRange( m_Areas->Item( uno::makeAny( index ), uno::Any() ), uno::UNO_QUERY_THROW ); xRange->Replace( What, Replacement, LookAt, SearchOrder, MatchCase, MatchByte, SearchFormat, ReplaceFormat ); } - return sal_True; // seems to return true always ( or at least I haven't found the trick of + return true; // seems to return true always ( or at least I haven't found the trick of } // sanity check required params @@ -3037,7 +3037,7 @@ ScVbaRange::Replace( const OUString& What, const OUString& Replacement, const un xReplace->createReplaceDescriptor(); xDescriptor->setSearchString( sWhat); - xDescriptor->setPropertyValue( SC_UNO_SRCHREGEXP, uno::makeAny( sal_True ) ); + xDescriptor->setPropertyValue( SC_UNO_SRCHREGEXP, uno::makeAny( true ) ); xDescriptor->setReplaceString( Replacement); if ( LookAt.hasValue() ) { @@ -3107,7 +3107,7 @@ ScVbaRange::Replace( const OUString& What, const OUString& Replacement, const un } } } - return sal_True; // always + return true; // always } uno::Reference< excel::XRange > SAL_CALL @@ -3340,7 +3340,7 @@ void updateTableSortField( const uno::Reference< table::XCellRange >& xParentRan aTableField.IsCaseSensitive = bMatchCase; if ( nOrder == excel::XlSortOrder::xlAscending ) - aTableField.IsAscending = sal_True; + aTableField.IsAscending = true; else aTableField.IsAscending = false; } @@ -3683,7 +3683,7 @@ ScVbaRange::hasElements() throw (uno::RuntimeException, std::exception) if ( xColumnRowRange.is() ) if ( xColumnRowRange->getRows()->getCount() || xColumnRowRange->getColumns()->getCount() ) - return sal_True; + return true; return false; } @@ -3907,7 +3907,7 @@ ScVbaRange::BorderAround( const css::uno::Any& LineStyle, const css::uno::Any& W return uno::makeAny( false ); } } - return uno::makeAny( sal_True ); + return uno::makeAny( true ); } uno::Any SAL_CALL @@ -4294,7 +4294,7 @@ static void lcl_setTableFieldsFromCriteria( OUString& sCriteria1, uno::Reference sCriteria1 = VBAToRegexp( sCriteria1 ); // UseRegularExpressions if ( xDescProps.is() ) - xDescProps->setPropertyValue( "UseRegularExpressions", uno::Any( sal_True ) ); + xDescProps->setPropertyValue( "UseRegularExpressions", uno::Any( true ) ); } } @@ -4309,7 +4309,7 @@ static void lcl_setTableFieldsFromCriteria( OUString& sCriteria1, uno::Reference sCriteria1 = VBAToRegexp( sCriteria1 ); // UseRegularExpressions if ( xDescProps.is() ) - xDescProps->setPropertyValue( "UseRegularExpressions", uno::Any( sal_True ) ); + xDescProps->setPropertyValue( "UseRegularExpressions", uno::Any( true ) ); } } else if ( sCriteria1.startsWith( GREATERTHAN ) ) @@ -4347,7 +4347,7 @@ static void lcl_setTableFieldsFromCriteria( OUString& sCriteria1, uno::Reference if ( bIsNumeric ) { - rFilterField.IsNumeric= sal_True; + rFilterField.IsNumeric= true; rFilterField.NumericValue = sCriteria1.toDouble(); } rFilterField.StringValue = sCriteria1; @@ -4423,7 +4423,7 @@ ScVbaRange::AutoFilter( const uno::Any& aField, const uno::Any& Criteria1, const uno::Reference< beans::XPropertySet > xDBRangeProps( xDataBaseRange, uno::UNO_QUERY_THROW ); // set autofilter - xDBRangeProps->setPropertyValue( "AutoFilter", uno::Any(sal_True) ); + xDBRangeProps->setPropertyValue( "AutoFilter", uno::Any(true) ); // set header (autofilter always need column headers) uno::Reference< beans::XPropertySet > xFiltProps( xDataBaseRange->getFilterDescriptor(), uno::UNO_QUERY_THROW ); bool bHasColHeader = false; @@ -4489,7 +4489,7 @@ ScVbaRange::AutoFilter( const uno::Any& aField, const uno::Any& Criteria1, const } else // numeric { - sTabFilts[0].IsNumeric = sal_True; + sTabFilts[0].IsNumeric = true; sTabFilts[0].NumericValue = nCriteria1; } } @@ -4503,7 +4503,7 @@ ScVbaRange::AutoFilter( const uno::Any& aField, const uno::Any& Criteria1, const // is no value specified for criteria1 set it to 10 if ( !bCritHasNumericValue && sCriteria1.isEmpty() && ( nOperator != excel::XlAutoFilterOperator::xlOr ) && ( nOperator != excel::XlAutoFilterOperator::xlAnd ) ) { - sTabFilts[0].IsNumeric = sal_True; + sTabFilts[0].IsNumeric = true; sTabFilts[0].NumericValue = 10; bAll = false; } @@ -4557,7 +4557,7 @@ ScVbaRange::AutoFilter( const uno::Any& aField, const uno::Any& Criteria1, const else // numeric { Criteria2 >>= sTabFilts[1].NumericValue; - sTabFilts[1].IsNumeric = sal_True; + sTabFilts[1].IsNumeric = true; sTabFilts[1].Operator = sheet::FilterOperator2::EQUAL; } } @@ -5497,7 +5497,7 @@ ScVbaRange::Subtotal( ::sal_Int32 _nGroupBy, ::sal_Int32 _nFunction, const uno:: PageBreaks >>= bAddPageBreaks; uno::Reference< sheet::XSubTotalCalculatable> xSub(mxRange, uno::UNO_QUERY_THROW ); - uno::Reference< sheet::XSubTotalDescriptor > xSubDesc = xSub->createSubTotalDescriptor(sal_True); + uno::Reference< sheet::XSubTotalDescriptor > xSubDesc = xSub->createSubTotalDescriptor(true); uno::Reference< beans::XPropertySet > xSubDescPropertySet( xSubDesc, uno::UNO_QUERY_THROW ); xSubDescPropertySet->setPropertyValue(INSERTPAGEBREAKS, uno::makeAny( bAddPageBreaks)); sal_Int32 nLen = _nTotalList.getLength(); diff --git a/sc/source/ui/vba/vbasheetobject.cxx b/sc/source/ui/vba/vbasheetobject.cxx index 27e11885f920..aaca3826caab 100644 --- a/sc/source/ui/vba/vbasheetobject.cxx +++ b/sc/source/ui/vba/vbasheetobject.cxx @@ -266,7 +266,7 @@ void SAL_CALL ScVbaSheetObjectBase::setPlacement( sal_Int32 /*nPlacement*/ ) thr sal_Bool SAL_CALL ScVbaSheetObjectBase::getPrintObject() throw (uno::RuntimeException, std::exception) { // not supported - return sal_True; + return true; } void SAL_CALL ScVbaSheetObjectBase::setPrintObject( sal_Bool /*bPrintObject*/ ) throw (uno::RuntimeException, std::exception) diff --git a/sc/source/ui/vba/vbavalidation.cxx b/sc/source/ui/vba/vbavalidation.cxx index fa03dfe2cf76..2d1df5f7bdfd 100644 --- a/sc/source/ui/vba/vbavalidation.cxx +++ b/sc/source/ui/vba/vbavalidation.cxx @@ -196,9 +196,9 @@ ScVbaValidation::Delete( ) throw (uno::RuntimeException, std::exception) OUString sBlank; uno::Reference< beans::XPropertySet > xProps( lcl_getValidationProps( m_xRange ) ); uno::Reference< sheet::XSheetCondition > xCond( xProps, uno::UNO_QUERY_THROW ); - xProps->setPropertyValue( SC_UNONAME_IGNOREBL, uno::makeAny( sal_True ) ); - xProps->setPropertyValue( SC_UNONAME_SHOWINP, uno::makeAny( sal_True ) ); - xProps->setPropertyValue( SC_UNONAME_SHOWERR, uno::makeAny( sal_True ) ); + xProps->setPropertyValue( SC_UNONAME_IGNOREBL, uno::makeAny( true ) ); + xProps->setPropertyValue( SC_UNONAME_SHOWINP, uno::makeAny( true ) ); + xProps->setPropertyValue( SC_UNONAME_SHOWERR, uno::makeAny( true ) ); xProps->setPropertyValue( SC_UNONAME_ERRTITLE, uno::makeAny( sBlank ) ); xProps->setPropertyValue( SC_UNONAME_INPMESS, uno::makeAny( sBlank) ); xProps->setPropertyValue( SC_UNONAME_ERRALSTY, uno::makeAny( sheet::ValidationAlertStyle_STOP) ); diff --git a/sc/source/ui/vba/vbawindow.cxx b/sc/source/ui/vba/vbawindow.cxx index bda7d5daa87f..edd48dc1c4d7 100644 --- a/sc/source/ui/vba/vbawindow.cxx +++ b/sc/source/ui/vba/vbawindow.cxx @@ -740,7 +740,7 @@ ScVbaWindow::getZoom() throw (uno::RuntimeException, std::exception) xProps->getPropertyValue( sName ) >>= nZoomType; if( nZoomType == view::DocumentZoomType::PAGE_WIDTH ) { - return uno::makeAny( sal_True ); + return uno::makeAny( true ); } else if( nZoomType == view::DocumentZoomType::BY_VALUE ) { diff --git a/sc/source/ui/vba/vbaworkbooks.cxx b/sc/source/ui/vba/vbaworkbooks.cxx index c4f514ea3251..57215fd78bbd 100644 --- a/sc/source/ui/vba/vbaworkbooks.cxx +++ b/sc/source/ui/vba/vbaworkbooks.cxx @@ -194,7 +194,7 @@ ScVbaWorkbooks::getFileFilterType( const OUString& rFileName ) uno::Sequence< beans::PropertyValue > aMediaDesc(1); aMediaDesc[ 0 ].Name = "URL"; aMediaDesc[ 0 ].Value <<= rFileName; - OUString sType = xTypeDetect->queryTypeByDescriptor( aMediaDesc, sal_True ); + OUString sType = xTypeDetect->queryTypeByDescriptor( aMediaDesc, true ); return sType; } diff --git a/sc/source/ui/view/tabvwshg.cxx b/sc/source/ui/view/tabvwshg.cxx index b9e5ed326bc1..54b7ba43a6d2 100644 --- a/sc/source/ui/view/tabvwshg.cxx +++ b/sc/source/ui/view/tabvwshg.cxx @@ -92,7 +92,7 @@ void ScTabViewShell::InsertURLButton( const OUString& rName, const OUString& rUR if ( ::avmedia::MediaWindow::isMediaURL( rURL, ""/*TODO?*/ ) ) { - aAny <<= sal_True; + aAny <<= true; xPropSet->setPropertyValue("DispatchURLInternal", aAny ); } |