diff options
79 files changed, 248 insertions, 248 deletions
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index bbfa1ec12656..458da1388436 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -117,7 +117,7 @@ protected: uno::Sequence<beans::PropertyValue> aDescriptor(comphelper::InitPropertySequence( { {"InputStream", uno::makeAny(xStream)}, - {"InputMode", uno::makeAny(sal_True)}, + {"InputMode", uno::makeAny(true)}, {"TextInsertModeRange", uno::makeAny(xTextRange)}, })); return xFilter->filter(aDescriptor); diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx index a8c8f79a3606..5fc69e6bf733 100644 --- a/sw/qa/extras/rtfimport/rtfimport.cxx +++ b/sw/qa/extras/rtfimport/rtfimport.cxx @@ -109,7 +109,7 @@ protected: uno::Reference<io::XStream> xStream(new utl::OStreamWrapper(*pStream)); aDescriptor[0].Value <<= xStream; aDescriptor[1].Name = "InsertMode"; - aDescriptor[1].Value <<= sal_True; + aDescriptor[1].Value <<= true; if (xTextRange.is()) { aDescriptor[2].Name = "TextInsertModeRange"; diff --git a/sw/source/core/access/acchyperlink.cxx b/sw/source/core/access/acchyperlink.cxx index 668cfc9c00aa..a0e180477672 100644 --- a/sw/source/core/access/acchyperlink.cxx +++ b/sw/source/core/access/acchyperlink.cxx @@ -211,18 +211,18 @@ sal_Bool SAL_CALL SwAccessibleHyperlink::isValid( ) { uno::Reference< lang::XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() ); if( ! xFactory.is() ) - return sal_False; + return false; uno::Reference< css::frame::XDesktop > xDesktop( xFactory->createInstance( "com.sun.star.frame.Desktop" ), uno::UNO_QUERY ); if( !xDesktop.is() ) - return sal_False; + return false; uno::Reference< lang::XComponent > xComp; xComp = xDesktop->getCurrentComponent(); if( !xComp.is() ) - return sal_False; + return false; uno::Reference< css::document::XLinkTargetSupplier > xLTS(xComp, uno::UNO_QUERY); if ( !xLTS.is()) - return sal_False; + return false; uno::Reference< css::container::XNameAccess > xLinks = xLTS->getLinks(); uno::Reference< css::container::XNameAccess > xSubLinks; @@ -237,14 +237,14 @@ sal_Bool SAL_CALL SwAccessibleHyperlink::isValid( ) aAny = xLinks->getByName( aLink ); aAny >>= xSubLinks; if (xSubLinks->hasByName(sText.copy(1)) ) - return sal_True; + return true; } } else//internet - return sal_True; + return true; } }//xpara valid - return sal_False; + return false; } void SwAccessibleHyperlink::Invalidate() diff --git a/sw/source/core/access/accnotextframe.cxx b/sw/source/core/access/accnotextframe.cxx index 9b7a1bfdd7ee..1fd4bc7be5f8 100644 --- a/sw/source/core/access/accnotextframe.cxx +++ b/sw/source/core/access/accnotextframe.cxx @@ -280,7 +280,7 @@ sal_Int32 SAL_CALL SwAccessibleNoTextFrame::getIndexAtPoint( const css::awt::Poi OUString SAL_CALL SwAccessibleNoTextFrame::getSelectedText( ) throw (css::uno::RuntimeException, std::exception){return OUString();} sal_Int32 SAL_CALL SwAccessibleNoTextFrame::getSelectionStart( ) throw (css::uno::RuntimeException, std::exception){return 0;} sal_Int32 SAL_CALL SwAccessibleNoTextFrame::getSelectionEnd( ) throw (css::uno::RuntimeException, std::exception){return 0;} -sal_Bool SAL_CALL SwAccessibleNoTextFrame::setSelection( sal_Int32 , sal_Int32 ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception){return sal_True;} +sal_Bool SAL_CALL SwAccessibleNoTextFrame::setSelection( sal_Int32 , sal_Int32 ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception){return true;} OUString SAL_CALL SwAccessibleNoTextFrame::getText( ) throw (css::uno::RuntimeException, std::exception){return OUString();} OUString SAL_CALL SwAccessibleNoTextFrame::getTextRange( sal_Int32 , sal_Int32 ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception){return OUString();} css::accessibility::TextSegment SAL_CALL SwAccessibleNoTextFrame::getTextAtIndex( sal_Int32 , sal_Int16 ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) @@ -299,7 +299,7 @@ css::accessibility::TextSegment SAL_CALL SwAccessibleNoTextFrame::getTextBehindI return aResult; } -sal_Bool SAL_CALL SwAccessibleNoTextFrame::copyText( sal_Int32, sal_Int32 ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception){return sal_True;} +sal_Bool SAL_CALL SwAccessibleNoTextFrame::copyText( sal_Int32, sal_Int32 ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception){return true;} // XAccessibleHyperText diff --git a/sw/source/core/access/accnotexthyperlink.cxx b/sw/source/core/access/accnotexthyperlink.cxx index b8dbbbf42bc6..161fac1af043 100644 --- a/sw/source/core/access/accnotexthyperlink.cxx +++ b/sw/source/core/access/accnotexthyperlink.cxx @@ -234,8 +234,8 @@ sal_Bool SAL_CALL SwAccessibleNoTextHyperlink::isValid( ) SwFormatURL aURL( GetFormat()->GetURL() ); if( aURL.GetMap() || !aURL.GetURL().isEmpty() ) - return sal_True; - return sal_False; + return true; + return false; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx index b30442fe73d1..7a5962071215 100644 --- a/sw/source/core/access/accpara.cxx +++ b/sw/source/core/access/accpara.cxx @@ -765,7 +765,7 @@ bool SwAccessibleParagraph::GetWordBoundary( // get word boundary, as the Break-Iterator sees fit. rBound = g_pBreakIt->GetBreakIter()->getWordBoundary( - rText, nPos, aLocale, nWordType, sal_True ); + rText, nPos, aLocale, nWordType, true ); // If we have a break-iterator let's trust that it // does the right thing. @@ -2810,7 +2810,7 @@ sal_Bool SwAccessibleParagraph::copyText( sal_Int32 nStartIndex, sal_Int32 nEndI // select and copy (through dispatch mechanism) setSelection( nStartIndex, nEndIndex ); ExecuteAtViewShell( SID_COPY ); - return sal_True; + return true; } // XAccesibleEditableText @@ -2822,12 +2822,12 @@ sal_Bool SwAccessibleParagraph::cutText( sal_Int32 nStartIndex, sal_Int32 nEndIn SolarMutexGuard aGuard; if( !IsEditableState() ) - return sal_False; + return false; // select and cut (through dispatch mechanism) setSelection( nStartIndex, nEndIndex ); ExecuteAtViewShell( SID_CUT ); - return sal_True; + return true; } sal_Bool SwAccessibleParagraph::pasteText( sal_Int32 nIndex ) @@ -2837,12 +2837,12 @@ sal_Bool SwAccessibleParagraph::pasteText( sal_Int32 nIndex ) SolarMutexGuard aGuard; if( !IsEditableState() ) - return sal_False; + return false; // select and paste (through dispatch mechanism) setSelection( nIndex, nIndex ); ExecuteAtViewShell( SID_PASTE ); - return sal_True; + return true; } sal_Bool SwAccessibleParagraph::deleteText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) @@ -2871,7 +2871,7 @@ sal_Bool SwAccessibleParagraph::replaceText( if( IsValidRange( nStartIndex, nEndIndex, rText.getLength() ) ) { if( !IsEditableState() ) - return sal_False; + return false; SwTextNode* pNode = const_cast<SwTextNode*>( GetTextNode() ); @@ -2923,7 +2923,7 @@ sal_Bool SwAccessibleParagraph::setAttributes( throw lang::IndexOutOfBoundsException(); if( !IsEditableState() ) - return sal_False; + return false; // create a (dummy) text portion for the sole purpose of calling // setPropertyValue on it @@ -3270,7 +3270,7 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::getTextMarkupCount( sal_Int32 nTextMar sal_Bool SAL_CALL SwAccessibleParagraph::scrollToPosition( const css::awt::Point&, sal_Bool ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { - return sal_False; + return false; } sal_Int32 SAL_CALL SwAccessibleParagraph::getSelectedPortionCount( ) @@ -3347,7 +3347,7 @@ sal_Bool SAL_CALL SwAccessibleParagraph::removeSelection( sal_Int32 selectionInd { SolarMutexGuard g; - if(selectionIndex < 0) return sal_False; + if(selectionIndex < 0) return false; sal_Int32 nSelected = selectionIndex; @@ -3395,7 +3395,7 @@ sal_Bool SAL_CALL SwAccessibleParagraph::removeSelection( sal_Int32 selectionInd } while( !bRet && (pCursor != pRingStart) ); } - return sal_True; + return true; } sal_Int32 SAL_CALL SwAccessibleParagraph::addSelection( sal_Int32, sal_Int32 startOffset, sal_Int32 endOffset) diff --git a/sw/source/core/access/acctable.cxx b/sw/source/core/access/acctable.cxx index 5d5ee5fff8ca..80b61a416191 100644 --- a/sw/source/core/access/acctable.cxx +++ b/sw/source/core/access/acctable.cxx @@ -1780,7 +1780,7 @@ sal_Bool SAL_CALL SwAccessibleTable::selectRow( sal_Int32 row ) SolarMutexGuard g; if( isAccessibleColumnSelected( row ) ) - return sal_True; + return true; long lColumnCount = getAccessibleColumnCount(); for(long lCol = 0; lCol < lColumnCount; lCol ++) @@ -1789,7 +1789,7 @@ sal_Bool SAL_CALL SwAccessibleTable::selectRow( sal_Int32 row ) selectAccessibleChild(lChildIndex); } - return sal_True; + return true; } sal_Bool SAL_CALL SwAccessibleTable::selectColumn( sal_Int32 column ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) @@ -1797,7 +1797,7 @@ sal_Bool SAL_CALL SwAccessibleTable::selectColumn( sal_Int32 column ) SolarMutexGuard g; if( isAccessibleColumnSelected( column ) ) - return sal_True; + return true; long lRowCount = getAccessibleRowCount(); @@ -1806,7 +1806,7 @@ sal_Bool SAL_CALL SwAccessibleTable::selectColumn( sal_Int32 column ) long lChildIndex = getAccessibleIndex(lRow, column); selectAccessibleChild(lChildIndex); } - return sal_True; + return true; } sal_Bool SAL_CALL SwAccessibleTable::unselectRow( sal_Int32 row ) @@ -1824,10 +1824,10 @@ sal_Bool SAL_CALL SwAccessibleTable::unselectRow( sal_Int32 row ) pCursorShell->StartAction(); pCursorShell->ClearMark(); pCursorShell->EndAction(); - return sal_True; + return true; } } - return sal_True; + return true; } sal_Bool SAL_CALL SwAccessibleTable::unselectColumn( sal_Int32 column ) @@ -1845,10 +1845,10 @@ sal_Bool SAL_CALL SwAccessibleTable::unselectColumn( sal_Int32 column ) pCursorShell->StartAction(); pCursorShell->ClearMark(); pCursorShell->EndAction(); - return sal_True; + return true; } } - return sal_True; + return true; } // #i77106# - implementation of class <SwAccessibleTableColHeaders> diff --git a/sw/source/core/access/acctextframe.cxx b/sw/source/core/access/acctextframe.cxx index aa78c4f6333b..55a7ae101e4f 100644 --- a/sw/source/core/access/acctextframe.cxx +++ b/sw/source/core/access/acctextframe.cxx @@ -193,12 +193,12 @@ sal_Bool SAL_CALL SwAccessibleTextFrame::isAccessibleChildSelected( sal_Int32 nC 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 SwAccessibleTextFrame::clearAccessibleSelection( ) diff --git a/sw/source/core/doc/DocumentChartDataProviderManager.cxx b/sw/source/core/doc/DocumentChartDataProviderManager.cxx index 69f7c6fc9fb6..7f11c2c3e1d0 100644 --- a/sw/source/core/doc/DocumentChartDataProviderManager.cxx +++ b/sw/source/core/doc/DocumentChartDataProviderManager.cxx @@ -74,7 +74,7 @@ void DocumentChartDataProviderManager::CreateChartInternalDataProviders( const S { uno::Reference< chart2::XChartDocument > xChart( xIP->getComponent(), UNO_QUERY ); if (xChart.is()) - xChart->createInternalDataProvider( sal_True ); + xChart->createInternalDataProvider( true ); // there may be more than one chart for each table thus we need to continue the loop... } diff --git a/sw/source/core/doc/docxforms.cxx b/sw/source/core/doc/docxforms.cxx index c7011a9d1323..385d1355d7b9 100644 --- a/sw/source/core/doc/docxforms.cxx +++ b/sw/source/core/doc/docxforms.cxx @@ -73,7 +73,7 @@ void SwDoc::initXForms( bool bCreateDefaultModel ) xModel->setID( sName ); Reference<XFormsUIHelper1>( xModel, uno::UNO_QUERY_THROW )->newInstance( "Instance 1", - OUString(), sal_True ); + OUString(), true ); xModel->initialize(); mxXForms->insertByName( sName, makeAny( xModel ) ); OSL_ENSURE( mxXForms->hasElements(), "can't create XForms model" ); diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx index a69cb4a19545..d8ad7ffd018f 100644 --- a/sw/source/core/layout/calcmove.cxx +++ b/sw/source/core/layout/calcmove.cxx @@ -1135,7 +1135,7 @@ void SwContentFrame::MakeAll(vcl::RenderContext* /*pRenderContext*/) // as long as bMovedFwd is false, the Frame may flow backwards (until // it has been moved forward once) bool bMovedFwd = false; - sal_Bool bFormatted = sal_False; // For the widow/orphan rules, we encourage the + sal_Bool bFormatted = false; // For the widow/orphan rules, we encourage the // last ContentFrame of a chain to format. This only // needs to happen once. Every time the Frame is // moved, the flag will have to be reset. @@ -1380,7 +1380,7 @@ void SwContentFrame::MakeAll(vcl::RenderContext* /*pRenderContext*/) if ( !mbValidSize ) { mbValidSize = true; - bFormatted = sal_True; + bFormatted = true; ++nFormatCount; if( nFormatCount > STOP_FLY_FORMAT ) SetFlyLock( true ); @@ -1412,7 +1412,7 @@ void SwContentFrame::MakeAll(vcl::RenderContext* /*pRenderContext*/) { SWREFRESHFN( this ) bMovedBwd = true; - bFormatted = sal_False; + bFormatted = false; if ( bKeep && bMoveable ) { if( CheckMoveFwd( bMakePage, false, bMovedBwd ) ) @@ -1440,7 +1440,7 @@ void SwContentFrame::MakeAll(vcl::RenderContext* /*pRenderContext*/) if( GetFollow() ) Prepare( PREP_WIDOWS_ORPHANS, nullptr, false ); mbValidSize = true; - bFormatted = sal_True; + bFormatted = true; Format(getRootFrame()->GetCurrShell()->GetOut()); } } @@ -1699,7 +1699,7 @@ void SwContentFrame::MakeAll(vcl::RenderContext* /*pRenderContext*/) bMovedFwd = true; } - bFormatted = sal_False; + bFormatted = false; if ( bMoveOrFit && GetUpper() == pOldUp ) { // FME 2007-08-30 #i81146# new loop control diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx index bb132399609f..c180ebb7a8d8 100644 --- a/sw/source/core/unocore/unochart.cxx +++ b/sw/source/core/unocore/unochart.cxx @@ -73,7 +73,7 @@ void SwChartHelper::DoUpdateAllCharts( SwDoc* pDoc ) try { uno::Reference< util::XModifiable > xModif( xIP->getComponent(), uno::UNO_QUERY_THROW ); - xModif->setModified( sal_True ); + xModif->setModified( true ); } catch ( uno::Exception& ) { @@ -1527,7 +1527,7 @@ void SwChartDataProvider::InvalidateTable( const SwTable *pTable ) if (xRef.is()) { // mark the sequence as 'dirty' and notify listeners - xRef->setModified( sal_True ); + xRef->setModified( true ); } ++aIt; } @@ -2308,7 +2308,7 @@ void SwChartDataSequence::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pN } else { - setModified( sal_True ); + setModified( true ); } } @@ -2319,7 +2319,7 @@ sal_Bool SAL_CALL SwChartDataSequence::isModified( ) if (m_bDisposed) throw lang::DisposedException(); - return sal_True; + return true; } void SAL_CALL SwChartDataSequence::setModified( diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx index ae9a0a7ffd46..a040e992d9f8 100644 --- a/sw/source/core/unocore/unocoll.cxx +++ b/sw/source/core/unocore/unocoll.cxx @@ -246,8 +246,8 @@ public: // #FIXME #TODO we really need to be checking against the codename for // ThisDocument if ( aName == "ThisDocument" ) - return sal_True; - return sal_False; + return true; + return false; } css::uno::Any SAL_CALL getByName( const OUString& aName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override @@ -269,7 +269,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/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx index 6c83023b4a9c..6589a4a8fa07 100644 --- a/sw/source/core/unocore/unodraw.cxx +++ b/sw/source/core/unocore/unodraw.cxx @@ -577,7 +577,7 @@ sal_Bool SwXDrawPage::hasElements() throw( uno::RuntimeException, std::exception if(!pDoc) throw uno::RuntimeException(); if(!pDoc->getIDocumentDrawModelAccess().GetDrawModel()) - return sal_False; + return false; else return static_cast<SwXDrawPage*>(this)->GetSvxPage()->hasElements(); } diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx index b77704599dbe..69ded111f711 100644 --- a/sw/source/core/unocore/unofield.cxx +++ b/sw/source/core/unocore/unofield.cxx @@ -2852,7 +2852,7 @@ sal_Bool SwXTextFieldMasters::hasElements() throw( uno::RuntimeException, std::e SolarMutexGuard aGuard; if(!IsValid()) throw uno::RuntimeException(); - return sal_True; + return true; } class SwXTextFieldTypes::Impl @@ -2918,7 +2918,7 @@ sal_Bool SwXTextFieldTypes::hasElements() throw( uno::RuntimeException, std::exc SolarMutexGuard aGuard; if(!IsValid()) throw uno::RuntimeException(); - return sal_True; // they always exist + return true; // they always exist } void SAL_CALL SwXTextFieldTypes::refresh() throw (uno::RuntimeException, std::exception) diff --git a/sw/source/core/unocore/unoflatpara.cxx b/sw/source/core/unocore/unoflatpara.cxx index a40c10302bbc..f937c91ba250 100644 --- a/sw/source/core/unocore/unoflatpara.cxx +++ b/sw/source/core/unocore/unoflatpara.cxx @@ -223,7 +223,7 @@ sal_Bool SAL_CALL SwXFlatParagraph::isChecked( ::sal_Int32 nType ) throw (uno::R return !GetTextNode()->IsSmartTagDirty(); } - return sal_True; + return true; } // text::XFlatParagraph: diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx index 20a26542c66c..fce4122607db 100644 --- a/sw/source/core/unocore/unoframe.cxx +++ b/sw/source/core/unocore/unoframe.cxx @@ -3305,7 +3305,7 @@ uno::Type SwXTextFrame::getElementType() throw( uno::RuntimeException, std::exc sal_Bool SwXTextFrame::hasElements() throw( uno::RuntimeException, std::exception ) { - return sal_True; + return true; } void SwXTextFrame::attach(const uno::Reference< text::XTextRange > & xTextRange) diff --git a/sw/source/core/unocore/unoftn.cxx b/sw/source/core/unocore/unoftn.cxx index 790a1379a225..fe5e28b09b06 100644 --- a/sw/source/core/unocore/unoftn.cxx +++ b/sw/source/core/unocore/unoftn.cxx @@ -495,7 +495,7 @@ uno::Type SAL_CALL SwXFootnote::getElementType() throw (uno::RuntimeException, s sal_Bool SAL_CALL SwXFootnote::hasElements() throw (uno::RuntimeException, std::exception) { - return sal_True; + return true; } uno::Reference< beans::XPropertySetInfo > SAL_CALL diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx index 1d67b51125a2..61812a615018 100644 --- a/sw/source/core/unocore/unoidx.cxx +++ b/sw/source/core/unocore/unoidx.cxx @@ -2605,11 +2605,11 @@ throw (uno::RuntimeException, std::exception) if (static_cast<SwTOXBaseSection const*>(pSect)->GetTOXName() == rName) { - return sal_True; + return true; } } } - return sal_False; + return false; } uno::Type SAL_CALL @@ -2750,7 +2750,7 @@ throw (uno::RuntimeException, std::exception) sal_Bool SAL_CALL SwXDocumentIndex::StyleAccess_Impl::hasElements() throw (uno::RuntimeException, std::exception) { - return sal_True; + return true; } SwXDocumentIndex::TokenAccess_Impl::TokenAccess_Impl( @@ -3263,7 +3263,7 @@ sal_Bool SAL_CALL SwXDocumentIndex::TokenAccess_Impl::hasElements() throw (uno::RuntimeException, std::exception) { - return sal_True; + return true; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx index f97508891e88..3436361c3564 100644 --- a/sw/source/core/unocore/unoobj.cxx +++ b/sw/source/core/unocore/unoobj.cxx @@ -1567,7 +1567,7 @@ throw (uno::RuntimeException, std::exception) if (CURSOR_META == m_pImpl->m_eType) { - return sal_False; + return false; } SwUnoCursorHelper::SelectPam(rUnoCursor, Expand); bool bRet = SwUnoCursorHelper::IsStartOfPara(rUnoCursor); @@ -1592,7 +1592,7 @@ SwXTextCursor::gotoEndOfParagraph(sal_Bool Expand) throw (uno::RuntimeException, if (CURSOR_META == m_pImpl->m_eType) { - return sal_False; + return false; } SwUnoCursorHelper::SelectPam(rUnoCursor, Expand); bool bRet = SwUnoCursorHelper::IsEndOfPara(rUnoCursor); @@ -1617,7 +1617,7 @@ SwXTextCursor::gotoNextParagraph(sal_Bool Expand) throw (uno::RuntimeException, if (CURSOR_META == m_pImpl->m_eType) { - return sal_False; + return false; } SwUnoCursorHelper::SelectPam(rUnoCursor, Expand); const bool bRet = rUnoCursor.MovePara(fnParaNext, fnParaStart); @@ -1634,7 +1634,7 @@ throw (uno::RuntimeException, std::exception) if (CURSOR_META == m_pImpl->m_eType) { - return sal_False; + return false; } SwUnoCursorHelper::SelectPam(rUnoCursor, Expand); const bool bRet = rUnoCursor.MovePara(fnParaPrev, fnParaStart); @@ -1665,7 +1665,7 @@ SwXTextCursor::getStart() throw (uno::RuntimeException, std::exception) SwXTextCursor * const pXCursor( new SwXTextCursor(*rUnoCursor.GetDoc(), xParent, CURSOR_META, *rUnoCursor.GetPoint()) ); - pXCursor->gotoStart(sal_False); + pXCursor->gotoStart(false); xRet = static_cast<text::XWordCursor*>(pXCursor); } else @@ -1691,7 +1691,7 @@ SwXTextCursor::getEnd() throw (uno::RuntimeException, std::exception) SwXTextCursor * const pXCursor( new SwXTextCursor(*rUnoCursor.GetDoc(), xParent, CURSOR_META, *rUnoCursor.GetPoint()) ); - pXCursor->gotoEnd(sal_False); + pXCursor->gotoEnd(false); xRet = static_cast<text::XWordCursor*>(pXCursor); } else @@ -2602,22 +2602,22 @@ SwUnoCursorHelper::CreateSortDescriptor(const bool bFromTable) #endif pFields[0].Field = 1; - pFields[0].IsAscending = sal_True; - pFields[0].IsCaseSensitive = sal_False; + pFields[0].IsAscending = true; + pFields[0].IsCaseSensitive = false; pFields[0].FieldType = table::TableSortFieldType_ALPHANUMERIC; pFields[0].CollatorLocale = aLang; pFields[0].CollatorAlgorithm = aCollAlg; pFields[1].Field = 1; - pFields[1].IsAscending = sal_True; - pFields[1].IsCaseSensitive = sal_False; + pFields[1].IsAscending = true; + pFields[1].IsCaseSensitive = false; pFields[1].FieldType = table::TableSortFieldType_ALPHANUMERIC; pFields[1].CollatorLocale = aLang; pFields[1].CollatorAlgorithm = aCollAlg; pFields[2].Field = 1; - pFields[2].IsAscending = sal_True; - pFields[2].IsCaseSensitive = sal_False; + pFields[2].IsAscending = true; + pFields[2].IsCaseSensitive = false; pFields[2].FieldType = table::TableSortFieldType_ALPHANUMERIC; pFields[2].CollatorLocale = aLang; pFields[2].CollatorAlgorithm = aCollAlg; @@ -2982,7 +2982,7 @@ SwXTextCursor::getElementType() throw (uno::RuntimeException, std::exception) sal_Bool SAL_CALL SwXTextCursor::hasElements() throw (uno::RuntimeException, std::exception) { - return sal_True; + return true; } uno::Sequence< OUString > SAL_CALL diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx index b60e23e34203..60c3a29497cf 100644 --- a/sw/source/core/unocore/unoobj2.cxx +++ b/sw/source/core/unocore/unoobj2.cxx @@ -1036,7 +1036,7 @@ bool XTextRangeToSwPaM( SwUnoInternalPaM & rToFill, if (pText) { xTextCursor.set( pText->CreateCursor() ); - xTextCursor->gotoEnd(sal_True); + xTextCursor->gotoEnd(true); const uno::Reference<lang::XUnoTunnel> xCursorTunnel( xTextCursor, uno::UNO_QUERY); pCursor = @@ -1291,7 +1291,7 @@ uno::Type SAL_CALL SwXTextRange::getElementType() throw (uno::RuntimeException, sal_Bool SAL_CALL SwXTextRange::hasElements() throw (uno::RuntimeException, std::exception) { - return sal_True; + return true; } uno::Sequence< OUString > SAL_CALL diff --git a/sw/source/core/unocore/unoredline.cxx b/sw/source/core/unocore/unoredline.cxx index bd4d51bae2a2..20b9f4cfd470 100644 --- a/sw/source/core/unocore/unoredline.cxx +++ b/sw/source/core/unocore/unoredline.cxx @@ -150,8 +150,8 @@ uno::Reference<text::XTextCursor> SwXRedlineText::createTextCursorByRange( throw( uno::RuntimeException, std::exception ) { uno::Reference<text::XTextCursor> xCursor = createTextCursor(); - xCursor->gotoRange(aTextRange->getStart(), sal_False); - xCursor->gotoRange(aTextRange->getEnd(), sal_True); + xCursor->gotoRange(aTextRange->getStart(), false); + xCursor->gotoRange(aTextRange->getEnd(), true); return xCursor; } @@ -172,7 +172,7 @@ uno::Type SwXRedlineText::getElementType( ) throw(uno::RuntimeException, std::e sal_Bool SwXRedlineText::hasElements( ) throw(uno::RuntimeException, std::exception) { - return sal_True; // we always have a content index + return true; // we always have a content index } SwXRedlinePortion::SwXRedlinePortion(SwRangeRedline const& rRedline, diff --git a/sw/source/core/unocore/unorefmk.cxx b/sw/source/core/unocore/unorefmk.cxx index 2baff9752f66..0d538d2cd95f 100644 --- a/sw/source/core/unocore/unorefmk.cxx +++ b/sw/source/core/unocore/unorefmk.cxx @@ -625,7 +625,7 @@ SwXMetaText::createTextCursorByRange( throw (uno::RuntimeException, std::exception) { const uno::Reference<text::XTextCursor> xCursor( CreateCursor() ); - xCursor->gotoRange(xTextPosition, sal_False); + xCursor->gotoRange(xTextPosition, false); return xCursor; } @@ -1445,7 +1445,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, if ( rPropertyName == "NumberFormat" ) { - const OUString text( getPresentation(sal_False) ); + const OUString text( getPresentation(false) ); any <<= static_cast<sal_Int32>(pMeta->GetNumberFormat(text)); } else if ( rPropertyName == "IsFixedLanguage" ) diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx index d21d7813eb93..32ea26f32160 100644 --- a/sw/source/core/unocore/unosett.cxx +++ b/sw/source/core/unocore/unosett.cxx @@ -1287,7 +1287,7 @@ uno::Type SwXNumberingRules::getElementType() sal_Bool SwXNumberingRules::hasElements() throw( uno::RuntimeException, std::exception ) { - return sal_True; + return true; } uno::Sequence<beans::PropertyValue> SwXNumberingRules::GetNumberingRuleByIndex( diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx index 4682d407616e..c0cd23d7308f 100644 --- a/sw/source/core/unocore/unostyle.cxx +++ b/sw/source/core/unocore/unostyle.cxx @@ -3316,7 +3316,7 @@ uno::Type SwXAutoStyles::getElementType( ) throw(uno::RuntimeException, std::ex sal_Bool SwXAutoStyles::hasElements( ) throw(uno::RuntimeException, std::exception) { - return sal_True; + return true; } uno::Any SwXAutoStyles::getByName(const OUString& Name) @@ -3351,9 +3351,9 @@ sal_Bool SwXAutoStyles::hasByName(const OUString& Name) if( Name == "CharacterStyles" || Name == "RubyStyles" || Name == "ParagraphStyles" ) - return sal_True; + return true; else - return sal_False; + return false; } SwXAutoStyleFamily::SwXAutoStyleFamily(SwDocShell* pDocSh, IStyleAccess::SwAutoStyleFamily nFamily) : @@ -3622,7 +3622,7 @@ uno::Type SwXAutoStyleFamily::getElementType( ) throw(uno::RuntimeException, st sal_Bool SwXAutoStyleFamily::hasElements( ) throw(uno::RuntimeException, std::exception) { - return sal_False; + return false; } SwAutoStylesEnumImpl::SwAutoStylesEnumImpl( SwDoc* pInitDoc, IStyleAccess::SwAutoStyleFamily eFam ) diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx index 24b1222b95c6..aa4057441de4 100644 --- a/sw/source/core/unocore/unotbl.cxx +++ b/sw/source/core/unocore/unotbl.cxx @@ -1137,7 +1137,7 @@ uno::Type SAL_CALL SwXCell::getElementType() throw( uno::RuntimeException, std:: sal_Bool SwXCell::hasElements() throw( uno::RuntimeException, std::exception ) { - return sal_True; + return true; } void SwXCell::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) @@ -2926,7 +2926,7 @@ uno::Any SwXTextTable::getPropertyValue(const OUString& rPropertyName) case FN_UNO_TABLE_BORDER_DISTANCES : { - table::TableBorderDistances aTableBorderDistances( 0, sal_True, 0, sal_True, 0, sal_True, 0, sal_True ) ; + table::TableBorderDistances aTableBorderDistances( 0, true, 0, true, 0, true, 0, true ) ; SwTable* pTable = SwTable::FindTable( pFormat ); const SwTableLines &rLines = pTable->GetTabLines(); bool bFirst = true; @@ -2956,16 +2956,16 @@ uno::Any SwXTextTable::getPropertyValue(const OUString& rPropertyName) { if( aTableBorderDistances.IsLeftDistanceValid && nLeftDistance != convertTwipToMm100( rBox.GetDistance( SvxBoxItemLine::LEFT ))) - aTableBorderDistances.IsLeftDistanceValid = sal_False; + aTableBorderDistances.IsLeftDistanceValid = false; if( aTableBorderDistances.IsRightDistanceValid && nRightDistance != convertTwipToMm100( rBox.GetDistance( SvxBoxItemLine::RIGHT ))) - aTableBorderDistances.IsRightDistanceValid = sal_False; + aTableBorderDistances.IsRightDistanceValid = false; if( aTableBorderDistances.IsTopDistanceValid && nTopDistance != convertTwipToMm100( rBox.GetDistance( SvxBoxItemLine::TOP ))) - aTableBorderDistances.IsTopDistanceValid = sal_False; + aTableBorderDistances.IsTopDistanceValid = false; if( aTableBorderDistances.IsBottomDistanceValid && nBottomDistance != convertTwipToMm100( rBox.GetDistance( SvxBoxItemLine::BOTTOM ))) - aTableBorderDistances.IsBottomDistanceValid = sal_False; + aTableBorderDistances.IsBottomDistanceValid = false; } } @@ -4021,7 +4021,7 @@ sal_Bool SwXTableRows::hasElements() throw( uno::RuntimeException, std::exceptio if(!pFrameFormat) throw uno::RuntimeException(); // a table always has rows - return sal_True; + return true; } void SwXTableRows::insertByIndex(sal_Int32 nIndex, sal_Int32 nCount) @@ -4174,7 +4174,7 @@ sal_Bool SwXTableColumns::hasElements() throw( uno::RuntimeException, std::excep { SolarMutexGuard aGuard; lcl_EnsureCoreConnected(GetFrameFormat(), static_cast<cppu::OWeakObject*>(this)); - return sal_True; + return true; } ///@see SwXTableRows::insertByIndex (TODO: seems to be copy and paste programming here) diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx index 61692e972831..add72dba4218 100644 --- a/sw/source/core/unocore/unotext.cxx +++ b/sw/source/core/unocore/unotext.cxx @@ -178,7 +178,7 @@ SwXText::CreateCursor() throw (uno::RuntimeException) SwPosition aPos(rNode); xRet = static_cast<text::XWordCursor*>( new SwXTextCursor(*GetDoc(), this, m_pImpl->m_eType, aPos)); - xRet->gotoStart(sal_False); + xRet->gotoStart(false); } return xRet; } @@ -871,7 +871,7 @@ SwXText::getStart() throw (uno::RuntimeException, std::exception) aRuntime.Message = cInvalidObject; throw aRuntime; } - xRef->gotoStart(sal_False); + xRef->gotoStart(false); const uno::Reference< text::XTextRange > xRet(xRef, uno::UNO_QUERY); return xRet; } @@ -888,7 +888,7 @@ SwXText::getEnd() throw (uno::RuntimeException, std::exception) aRuntime.Message = cInvalidObject; throw aRuntime; } - xRef->gotoEnd(sal_False); + xRef->gotoEnd(false); const uno::Reference< text::XTextRange > xRet(xRef, uno::UNO_QUERY); return xRet; } @@ -904,7 +904,7 @@ OUString SAL_CALL SwXText::getString() throw (uno::RuntimeException, std::except aRuntime.Message = cInvalidObject; throw aRuntime; } - xRet->gotoEnd(sal_True); + xRet->gotoEnd(true); return xRet->getString(); } @@ -969,7 +969,7 @@ SwXText::setString(const OUString& rString) throw (uno::RuntimeException, std::e aRuntime.Message = cInvalidObject; throw aRuntime; } - xRet->gotoEnd(sal_True); + xRet->gotoEnd(true); xRet->setString(rString); GetDoc()->GetIDocumentUndoRedo().EndUndo(UNDO_END, nullptr); } @@ -1364,7 +1364,7 @@ SwXText::insertTextPortion( } uno::Reference< text::XTextRange > xRet; const uno::Reference< text::XTextCursor > xTextCursor = CreateCursor(); - xTextCursor->gotoRange(xInsertPosition, sal_False); + xTextCursor->gotoRange(xInsertPosition, false); const uno::Reference< lang::XUnoTunnel > xRangeTunnel( xTextCursor, uno::UNO_QUERY_THROW ); @@ -1751,7 +1751,7 @@ SwXText::convertToTextFrame( } if (bParaAfterInserted) { - xFrameTextCursor->gotoEnd(sal_False); + xFrameTextCursor->gotoEnd(false); if (!bParaBeforeInserted) m_pImpl->m_pDoc->getIDocumentContentOperations().DelFullPara(*pFrameCursor->GetPaM()); else @@ -2133,8 +2133,8 @@ lcl_ApplyCellProperties( uno::UNO_QUERY); const uno::Reference< text::XTextCursor > xCellCurs = xCellText->createTextCursor(); - xCellCurs->gotoStart( sal_False ); - xCellCurs->gotoEnd( sal_True ); + xCellCurs->gotoStart( false ); + xCellCurs->gotoEnd( true ); const uno::Reference< beans::XPropertyState > xCellTextPropState(xCellCurs, uno::UNO_QUERY); try @@ -2348,7 +2348,7 @@ throw (uno::RuntimeException, std::exception) uno::Reference< text::XText > const xText(xSource, uno::UNO_QUERY_THROW); uno::Reference< text::XTextCursor > const xCursor = xText->createTextCursor(); - xCursor->gotoEnd( sal_True ); + xCursor->gotoEnd( true ); uno::Reference< lang::XUnoTunnel > const xCursorTunnel(xCursor, uno::UNO_QUERY_THROW); @@ -2580,7 +2580,7 @@ SwXBodyText::hasElements() throw (uno::RuntimeException, std::exception) throw aRuntime; } - return sal_True; + return true; } class SwXHeadFootText::Impl @@ -2832,7 +2832,7 @@ SwXHeadFootText::getElementType() throw (uno::RuntimeException, std::exception) sal_Bool SAL_CALL SwXHeadFootText::hasElements() throw (uno::RuntimeException, std::exception) { - return sal_True; + return true; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/view/printdata.cxx b/sw/source/core/view/printdata.cxx index 7ed8ae31d016..db73f19c8437 100644 --- a/sw/source/core/view/printdata.cxx +++ b/sw/source/core/view/printdata.cxx @@ -276,11 +276,11 @@ SwPrintUIOptions::SwPrintUIOptions( uno::Sequence< OUString > aHelpIds( 3 ); uno::Sequence< OUString > aWidgetIds( 3 ); aChoices[0] = SW_RES( STR_PRINTOPTUI_ALLPAGES); - aChoicesDisabled[0] = sal_False; + aChoicesDisabled[0] = false; aHelpIds[0] = ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:0"; aWidgetIds[0] = "printallpages"; aChoices[1] = SW_RES( STR_PRINTOPTUI_SOMEPAGES); - aChoicesDisabled[1] = sal_False; + aChoicesDisabled[1] = false; aHelpIds[1] = ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:1"; aWidgetIds[1] = "printpages"; aChoices[2] = SW_RES( STR_PRINTOPTUI_SELECTION); diff --git a/sw/source/filter/rtf/swparrtf.cxx b/sw/source/filter/rtf/swparrtf.cxx index 7e2ef5ebcfec..bd76719ed8f4 100644 --- a/sw/source/filter/rtf/swparrtf.cxx +++ b/sw/source/filter/rtf/swparrtf.cxx @@ -83,7 +83,7 @@ sal_uLong SwRTFReader::Read(SwDoc& rDoc, const OUString& /*rBaseURL*/, SwPaM& rP uno::Reference<io::XStream> xStream(new utl::OStreamWrapper(*pStrm)); aDescriptor[0].Value <<= xStream; aDescriptor[1].Name = "InsertMode"; - aDescriptor[1].Value <<= sal_True; + aDescriptor[1].Value <<= true; aDescriptor[2].Name = "TextInsertModeRange"; aDescriptor[2].Value <<= xInsertTextRange; sal_uLong ret(0); diff --git a/sw/source/filter/ww8/rtfexportfilter.cxx b/sw/source/filter/ww8/rtfexportfilter.cxx index 70a514318c0e..fa2134c1f6ea 100644 --- a/sw/source/filter/ww8/rtfexportfilter.cxx +++ b/sw/source/filter/ww8/rtfexportfilter.cxx @@ -51,13 +51,13 @@ sal_Bool RtfExportFilter::filter(const uno::Sequence< beans::PropertyValue >& aD SwXTextDocument* pTextDoc = dynamic_cast< SwXTextDocument* >(xIfc.get()); if (!pTextDoc) { - return sal_False; + return false; } SwDoc* pDoc = pTextDoc->GetDocShell()->GetDoc(); if (!pDoc) { - return sal_False; + return false; } // fdo#37161 - update layout (if present), for SwWriteTable @@ -86,7 +86,7 @@ sal_Bool RtfExportFilter::filter(const uno::Sequence< beans::PropertyValue >& aD delete pCurPam; delete pStream; - return sal_True; + return true; } void RtfExportFilter::cancel() throw(uno::RuntimeException, std::exception) diff --git a/sw/source/filter/ww8/writerhelper.cxx b/sw/source/filter/ww8/writerhelper.cxx index 9281a257f885..a4952363cd1d 100644 --- a/sw/source/filter/ww8/writerhelper.cxx +++ b/sw/source/filter/ww8/writerhelper.cxx @@ -339,7 +339,7 @@ namespace sw { uno::Reference < css::util::XCloseable > xClose( mxIPRef, uno::UNO_QUERY ); if ( xClose.is() ) - xClose->close(sal_True); + xClose->close(true); } catch ( const css::util::CloseVetoException& ) { diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index d45992f04145..720c83c943ed 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -4872,7 +4872,7 @@ void SwWW8ImplReader::ReadGlobalTemplateSettings( const OUString& sCreatedFrom, uno::Reference<ucb::XSimpleFileAccess3> xSFA(ucb::SimpleFileAccess::create(::comphelper::getProcessComponentContext())); if( xSFA->isFolder( aAddinPath ) ) - sGlobalTemplates = xSFA->getFolderContents( aAddinPath, sal_False ); + sGlobalTemplates = xSFA->getFolderContents( aAddinPath, false ); sal_Int32 nEntries = sGlobalTemplates.getLength(); for ( sal_Int32 i=0; i<nEntries; ++i ) diff --git a/sw/source/filter/ww8/ww8toolbar.cxx b/sw/source/filter/ww8/ww8toolbar.cxx index e1180b3c6a64..056839aae6e9 100644 --- a/sw/source/filter/ww8/ww8toolbar.cxx +++ b/sw/source/filter/ww8/ww8toolbar.cxx @@ -356,13 +356,13 @@ bool Customization::ImportMenu( SwCTBWrapper& rWrapper, CustomToolBarImportHelpe bool bHasSettings = false; if ( helper.getCfgManager()->hasSettings( sMenuBar ) ) { - xIndexContainer.set( helper.getCfgManager()->getSettings( sMenuBar, sal_True ), uno::UNO_QUERY_THROW ); + xIndexContainer.set( helper.getCfgManager()->getSettings( sMenuBar, true ), uno::UNO_QUERY_THROW ); bHasSettings = true; } else { if ( helper.getAppCfgManager()->hasSettings( sMenuBar ) ) - xIndexContainer.set( helper.getAppCfgManager()->getSettings( sMenuBar, sal_True ), uno::UNO_QUERY_THROW ); + xIndexContainer.set( helper.getAppCfgManager()->getSettings( sMenuBar, true ), uno::UNO_QUERY_THROW ); else xIndexContainer.set( helper.getAppCfgManager()->createSettings(), uno::UNO_QUERY_THROW ); } diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx index fcf472f2c6da..130422ac674a 100644 --- a/sw/source/filter/xml/xmltbli.cxx +++ b/sw/source/filter/xml/xmltbli.cxx @@ -688,7 +688,7 @@ void SwXMLTableCellContext_Impl::EndElement() // paragraph Reference < XTextCursor > xSrcTextCursor = GetImport().GetTextImport()->GetText()->createTextCursor(); - xSrcTextCursor->gotoEnd( sal_True ); + xSrcTextCursor->gotoEnd( true ); // Until we have an API for copying we have to use the core. Reference<XUnoTunnel> xSrcCursorTunnel( xSrcTextCursor, UNO_QUERY); diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx index b0153bd07a62..3fe8b9aec918 100644 --- a/sw/source/ui/dbui/dbinsdlg.cxx +++ b/sw/source/ui/dbui/dbinsdlg.cxx @@ -307,7 +307,7 @@ SwInsertDBColAutoPilot::SwInsertDBColAutoPilot( SwView& rView, aFormatVal >>= sFormat; lang::Locale aLoc; aLocale >>= aLoc; - long nKey = xDocNumberFormats->queryKey( sFormat, aLoc, sal_True); + long nKey = xDocNumberFormats->queryKey( sFormat, aLoc, true); if(nKey < 0) { nKey = xDocNumberFormats->addNew( sFormat, aLoc ); diff --git a/sw/source/ui/dbui/mmresultdialogs.cxx b/sw/source/ui/dbui/mmresultdialogs.cxx index 44b3679aa12b..feb644274d1e 100644 --- a/sw/source/ui/dbui/mmresultdialogs.cxx +++ b/sw/source/ui/dbui/mmresultdialogs.cxx @@ -831,7 +831,7 @@ IMPL_LINK_TYPED(SwMMResultPrintDialog, PrintHdl_Impl, Button*, pButton, void) uno::Sequence < beans::PropertyValue > aProps( 2 ); aProps[0]. Name = "MonitorVisible"; - aProps[0].Value <<= sal_True; + aProps[0].Value <<= true; aProps[1]. Name = "Pages"; aProps[1]. Value <<= sPages; diff --git a/sw/source/ui/dbui/selectdbtabledialog.cxx b/sw/source/ui/dbui/selectdbtabledialog.cxx index 5c02c694bcb8..4d28d76a711e 100644 --- a/sw/source/ui/dbui/selectdbtabledialog.cxx +++ b/sw/source/ui/dbui/selectdbtabledialog.cxx @@ -182,9 +182,9 @@ IMPL_LINK_TYPED(SwSelectDBTableDialog, PreviewHdl, Button*, pButton, void) pProperties[2].Name = "CommandType"; pProperties[2].Value <<= nCommandType; pProperties[3].Name = "ShowTreeView"; - pProperties[3].Value <<= sal_False; + pProperties[3].Value <<= false; pProperties[4].Name = "ShowTreeViewButton"; - pProperties[4].Value <<= sal_False; + pProperties[4].Value <<= false; VclPtrInstance< SwDBTablePreviewDialog > pDlg(pButton, aProperties); pDlg->Execute(); diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx index a3cfe85f2d97..ba47d61eada5 100644 --- a/sw/source/ui/fldui/changedb.cxx +++ b/sw/source/ui/fldui/changedb.cxx @@ -202,7 +202,7 @@ void SwChangeDBDlg::UpdateFields() pSh->StartAllAction(); OUString sTableName; OUString sColumnName; - sal_Bool bIsTable = sal_False; + sal_Bool bIsTable = false; const OUString DBName(m_pAvailDBTLB->GetDBName(sTableName, sColumnName, &bIsTable)); const OUString sTemp = DBName + OUString(DB_DELIM) @@ -220,7 +220,7 @@ IMPL_LINK_NOARG_TYPED(SwChangeDBDlg, ButtonHdl, Button*, void) OUString sTableName; OUString sColumnName; SwDBData aData; - sal_Bool bIsTable = sal_False; + sal_Bool bIsTable = false; aData.sDataSource = m_pAvailDBTLB->GetDBName(sTableName, sColumnName, &bIsTable); aData.sCommand = sTableName; aData.nCommandType = bIsTable ? 0 : 1; diff --git a/sw/source/ui/index/cntex.cxx b/sw/source/ui/index/cntex.cxx index 68ce58fd0c36..4609298b7258 100644 --- a/sw/source/ui/index/cntex.cxx +++ b/sw/source/ui/index/cntex.cxx @@ -181,7 +181,7 @@ void SwMultiTOXTabDialog::CreateOrUpdateExample( pxIndexSectionsArr[nTOXIndex]->xDocumentIndex.set(xFact->createInstance(sIndexTypeName), uno::UNO_QUERY); uno::Reference< text::XTextContent > xContent(pxIndexSectionsArr[nTOXIndex]->xDocumentIndex, uno::UNO_QUERY); uno::Reference< text::XTextRange > xRg(xCursor, uno::UNO_QUERY); - xCursor->getText()->insertTextContent(xRg, xContent, sal_False); + xCursor->getText()->insertTextContent(xRg, xContent, false); } for(sal_uInt16 i = 0 ; i <= TOX_AUTHORITIES; i++) { diff --git a/sw/source/ui/vba/vbaaddins.cxx b/sw/source/ui/vba/vbaaddins.cxx index 352f47ad3eab..9d8e45d3410e 100644 --- a/sw/source/ui/vba/vbaaddins.cxx +++ b/sw/source/ui/vba/vbaaddins.cxx @@ -38,7 +38,7 @@ static uno::Reference< container::XIndexAccess > lcl_getAddinCollection( const u OSL_TRACE("lcl_getAddinCollection: %s", OUStringToOString( aAddinPath, RTL_TEXTENCODING_UTF8 ).getStr() ); if( xSFA->isFolder( aAddinPath ) ) { - uno::Sequence< OUString > sEntries = xSFA->getFolderContents( aAddinPath, sal_False ); + uno::Sequence< OUString > sEntries = xSFA->getFolderContents( aAddinPath, false ); sal_Int32 nEntry = sEntries.getLength(); for( sal_Int32 index = 0; index < nEntry; ++index ) { diff --git a/sw/source/ui/vba/vbaautotextentry.cxx b/sw/source/ui/vba/vbaautotextentry.cxx index 31e110b75649..e846ef35a4d8 100644 --- a/sw/source/ui/vba/vbaautotextentry.cxx +++ b/sw/source/ui/vba/vbaautotextentry.cxx @@ -47,7 +47,7 @@ uno::Reference< word::XRange > SAL_CALL SwVbaAutoTextEntry::Insert( const uno::R uno::Reference< text::XText > xText = pWhere->getXText(); mxEntry->applyTo( xEndMarker->getStart() ); uno::Reference< text::XTextCursor > xTC = xText->createTextCursorByRange( xTextRange->getStart() ); - xTC->goRight( 1, sal_True ); + xTC->goRight( 1, true ); xTC->setString( "" ); // remove marker // remove the blank paragraph if it is a rich text bool bRich = false; @@ -62,10 +62,10 @@ uno::Reference< word::XRange > SAL_CALL SwVbaAutoTextEntry::Insert( const uno::R uno::Reference< frame::XModel > xModel( getCurrentWordDoc( mxContext ), uno::UNO_QUERY_THROW ); uno::Reference< text::XTextViewCursor > xTVCursor = word::getXTextViewCursor( xModel ); uno::Reference< text::XTextRange > xCurrentRange( xTC->getEnd(), uno::UNO_QUERY_THROW ); - xTVCursor->gotoRange( xCurrentRange, sal_False ); + xTVCursor->gotoRange( xCurrentRange, false ); OUString url = ".uno:Delete"; dispatchRequests( xModel,url ); - xTVCursor->gotoRange( xEndMarker->getEnd(), sal_False ); + xTVCursor->gotoRange( xEndMarker->getEnd(), false ); } } xEndMarker->setString( "" ); // remove marker diff --git a/sw/source/ui/vba/vbabookmarks.cxx b/sw/source/ui/vba/vbabookmarks.cxx index ceb5af2f2359..5394fc5dcf52 100644 --- a/sw/source/ui/vba/vbabookmarks.cxx +++ b/sw/source/ui/vba/vbabookmarks.cxx @@ -77,7 +77,7 @@ public: if( mxNameAccess->hasByName( aName ) ) { cachePos = mxNameAccess->getByName( aName ); - return sal_True; + return true; } else { @@ -88,11 +88,11 @@ public: if( aName.equalsIgnoreAsciiCase( aBookmarkName ) ) { cachePos <<= xNamed; - return sal_True; + return true; } } } - return sal_False; + return false; } // XIndexAccess virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) override @@ -143,7 +143,7 @@ void SwVbaBookmarks::addBookmarkByName( const uno::Reference< frame::XModel >& x uno::Reference< text::XTextContent > xBookmark( xDocMSF->createInstance("com.sun.star.text.Bookmark"), uno::UNO_QUERY_THROW ); uno::Reference< container::XNamed > xNamed( xBookmark, uno::UNO_QUERY_THROW ); xNamed->setName( rName ); - rTextRange->getText()->insertTextContent( rTextRange, xBookmark, sal_False ); + rTextRange->getText()->insertTextContent( rTextRange, xBookmark, false ); } uno::Any SAL_CALL @@ -187,7 +187,7 @@ SwVbaBookmarks::setDefaultSorting( sal_Int32/* _type*/ ) throw (css::uno::Runtim sal_Bool SAL_CALL SwVbaBookmarks::getShowHidden() throw (css::uno::RuntimeException, std::exception) { - return sal_True; + return true; } void SAL_CALL diff --git a/sw/source/ui/vba/vbaborders.cxx b/sw/source/ui/vba/vbaborders.cxx index ab8eee3b7f1f..b301ba244866 100644 --- a/sw/source/ui/vba/vbaborders.cxx +++ b/sw/source/ui/vba/vbaborders.cxx @@ -54,28 +54,28 @@ private: switch ( m_LineType ) { case word::WdBorderType::wdBorderLeft: - aTableBorder.IsLeftLineValid = sal_True; + aTableBorder.IsLeftLineValid = true; aTableBorder.LeftLine= rBorderLine; break; case word::WdBorderType::wdBorderTop: - aTableBorder.IsTopLineValid = sal_True; + aTableBorder.IsTopLineValid = true; aTableBorder.TopLine = rBorderLine; break; case word::WdBorderType::wdBorderBottom: - aTableBorder.IsBottomLineValid = sal_True; + aTableBorder.IsBottomLineValid = true; aTableBorder.BottomLine = rBorderLine; break; case word::WdBorderType::wdBorderRight: - aTableBorder.IsRightLineValid = sal_True; + aTableBorder.IsRightLineValid = true; aTableBorder.RightLine = rBorderLine; break; case word::WdBorderType::wdBorderVertical: - aTableBorder.IsVerticalLineValid = sal_True; + aTableBorder.IsVerticalLineValid = true; aTableBorder.VerticalLine = rBorderLine; break; case word::WdBorderType::wdBorderHorizontal: - aTableBorder.IsHorizontalLineValid = sal_True; + aTableBorder.IsHorizontalLineValid = true; aTableBorder.HorizontalLine = rBorderLine; break; case word::WdBorderType::wdBorderDiagonalDown: @@ -272,7 +272,7 @@ public: } virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) override { - return sal_True; + return true; } }; @@ -334,7 +334,7 @@ SwVbaBorders::getItemByIntIndex( const sal_Int32 nIndex ) throw (uno::RuntimeEx sal_Bool SAL_CALL SwVbaBorders::getShadow() throw (uno::RuntimeException, std::exception) { // always return False for table border in MS Word - return sal_False; + return false; } void SAL_CALL SwVbaBorders::setShadow( sal_Bool /*_shadow*/ ) throw (uno::RuntimeException, std::exception) diff --git a/sw/source/ui/vba/vbacells.cxx b/sw/source/ui/vba/vbacells.cxx index 31d2adbb8435..62c2e9575a2c 100644 --- a/sw/source/ui/vba/vbacells.cxx +++ b/sw/source/ui/vba/vbacells.cxx @@ -94,7 +94,7 @@ public: } virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) override { - return sal_True; + return true; } // XEnumerationAccess virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException, std::exception) override diff --git a/sw/source/ui/vba/vbadocument.cxx b/sw/source/ui/vba/vbadocument.cxx index f61b82c24904..cf471b0c625c 100644 --- a/sw/source/ui/vba/vbadocument.cxx +++ b/sw/source/ui/vba/vbadocument.cxx @@ -313,7 +313,7 @@ void SAL_CALL SwVbaDocument::setProtectionType( ::sal_Int32 /*_protectiontype*/ sal_Bool SAL_CALL SwVbaDocument::getUpdateStylesOnOpen() throw (css::uno::RuntimeException, std::exception) { //TODO - return sal_False; + return false; } void SAL_CALL SwVbaDocument::setUpdateStylesOnOpen( sal_Bool /*_updatestylesonopen*/ ) throw (uno::RuntimeException, std::exception) @@ -467,7 +467,7 @@ SwVbaDocument::getValue( const OUString& aPropertyName ) throw (beans::UnknownPr sal_Bool SAL_CALL SwVbaDocument::hasMethod( const OUString& /*aName*/ ) throw (uno::RuntimeException, std::exception) { - return sal_False; + return false; } sal_Bool SAL_CALL @@ -476,7 +476,7 @@ SwVbaDocument::hasProperty( const OUString& aName ) throw (uno::RuntimeException uno::Reference< container::XNameAccess > xFormControls( getFormControls() ); if ( xFormControls.is() ) return xFormControls->hasByName( aName ); - return sal_False; + return false; } uno::Reference< container::XNameAccess > diff --git a/sw/source/ui/vba/vbadocumentproperties.cxx b/sw/source/ui/vba/vbadocumentproperties.cxx index d5211e64fe66..f21d40d1379d 100644 --- a/sw/source/ui/vba/vbadocumentproperties.cxx +++ b/sw/source/ui/vba/vbadocumentproperties.cxx @@ -491,7 +491,7 @@ sal_Bool SwVbaCustomDocumentProperty::getLinkToContent( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) { // #FIXME we need to store the link content somewhere - return sal_False; + return false; } void @@ -575,7 +575,7 @@ SwVbaBuiltInDocumentProperty::setType( ::sal_Int8 /*Type*/ ) throw (script::Basi sal_Bool SAL_CALL SwVbaBuiltInDocumentProperty::getLinkToContent( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) { - return sal_False; // built-in always false + return false; // built-in always false } void SAL_CALL @@ -713,8 +713,8 @@ protected: { DocPropsByName::iterator it = mNamedDocProps.find( aName ); if ( it == mNamedDocProps.end() ) - return sal_False; - return sal_True; + return false; + return true; } // XElementAccess virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) override diff --git a/sw/source/ui/vba/vbafield.cxx b/sw/source/ui/vba/vbafield.cxx index 8bef2126c165..d5546ae1b8cf 100644 --- a/sw/source/ui/vba/vbafield.cxx +++ b/sw/source/ui/vba/vbafield.cxx @@ -44,9 +44,9 @@ sal_Bool SAL_CALL SwVbaField::Update() throw (uno::RuntimeException, std::except if( xUpdatable.is() ) { xUpdatable->update(); - return sal_True; + return true; } - return sal_False; + return false; } // XHelperInterface diff --git a/sw/source/ui/vba/vbafind.cxx b/sw/source/ui/vba/vbafind.cxx index 0f21e387f555..8c050290f8dc 100644 --- a/sw/source/ui/vba/vbafind.cxx +++ b/sw/source/ui/vba/vbafind.cxx @@ -104,12 +104,12 @@ uno::Reference< text::XTextRange > SwVbaFind::FindOneElement() throw ( uno::Runt { if( getForward() ) { - mxTVC->gotoStart(sal_False); + mxTVC->gotoStart(false); xFoundOne.set( mxReplaceable->findNext( mxTextRange->getStart(), uno::Reference< util::XSearchDescriptor >( mxPropertyReplace, uno::UNO_QUERY_THROW ) ), uno::UNO_QUERY ); } else { - mxTVC->gotoEnd( sal_False ); + mxTVC->gotoEnd( false ); xFoundOne.set( mxReplaceable->findNext( mxTextRange->getEnd(), uno::Reference< util::XSearchDescriptor >( mxPropertyReplace, uno::UNO_QUERY_THROW ) ), uno::UNO_QUERY ); } diff --git a/sw/source/ui/vba/vbaheaderfooter.cxx b/sw/source/ui/vba/vbaheaderfooter.cxx index b54a768dc1b8..7b185fed6335 100644 --- a/sw/source/ui/vba/vbaheaderfooter.cxx +++ b/sw/source/ui/vba/vbaheaderfooter.cxx @@ -41,7 +41,7 @@ sal_Bool SAL_CALL SwVbaHeaderFooter::getIsHeader() throw (uno::RuntimeException, sal_Bool SAL_CALL SwVbaHeaderFooter::getLinkToPrevious() throw (uno::RuntimeException, std::exception) { // seems always false - return sal_False; + return false; } void SAL_CALL SwVbaHeaderFooter::setLinkToPrevious( sal_Bool /*_linktoprevious*/ ) throw (uno::RuntimeException, std::exception) diff --git a/sw/source/ui/vba/vbaheadersfooters.cxx b/sw/source/ui/vba/vbaheadersfooters.cxx index 9c27b04059e9..8c585df288c7 100644 --- a/sw/source/ui/vba/vbaheadersfooters.cxx +++ b/sw/source/ui/vba/vbaheadersfooters.cxx @@ -56,7 +56,7 @@ public: } virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) override { - return sal_True; + return true; } }; diff --git a/sw/source/ui/vba/vbaoptions.cxx b/sw/source/ui/vba/vbaoptions.cxx index dc07484e16fc..5d455abe5220 100644 --- a/sw/source/ui/vba/vbaoptions.cxx +++ b/sw/source/ui/vba/vbaoptions.cxx @@ -158,7 +158,7 @@ void SAL_CALL SwVbaOptions::setDefaultBorderColorIndex( ::sal_Int32 /*_defaultbo sal_Bool SAL_CALL SwVbaOptions::getReplaceSelection() throw (uno::RuntimeException, std::exception) { - return sal_True; + return true; } void SAL_CALL SwVbaOptions::setReplaceSelection( sal_Bool /*_replaceselection*/ ) throw (uno::RuntimeException, std::exception) @@ -168,7 +168,7 @@ void SAL_CALL SwVbaOptions::setReplaceSelection( sal_Bool /*_replaceselection*/ sal_Bool SAL_CALL SwVbaOptions::getMapPaperSize() throw (uno::RuntimeException, std::exception) { - return sal_False; + return false; } void SAL_CALL SwVbaOptions::setMapPaperSize( sal_Bool /*_mappapersize*/ ) throw (uno::RuntimeException, std::exception) @@ -178,7 +178,7 @@ void SAL_CALL SwVbaOptions::setMapPaperSize( sal_Bool /*_mappapersize*/ ) throw sal_Bool SAL_CALL SwVbaOptions::getAutoFormatAsYouTypeApplyHeadings() throw (uno::RuntimeException, std::exception) { - return sal_False; + return false; } void SAL_CALL SwVbaOptions::setAutoFormatAsYouTypeApplyHeadings( sal_Bool /*_autoformatasyoutypeapplyheadings*/ ) throw (uno::RuntimeException, std::exception) @@ -188,7 +188,7 @@ void SAL_CALL SwVbaOptions::setAutoFormatAsYouTypeApplyHeadings( sal_Bool /*_aut sal_Bool SAL_CALL SwVbaOptions::getAutoFormatAsYouTypeApplyBulletedLists() throw (uno::RuntimeException, std::exception) { - return sal_False; + return false; } void SAL_CALL SwVbaOptions::setAutoFormatAsYouTypeApplyBulletedLists( sal_Bool /*_autoformatasyoutypeapplybulletedlists*/ ) throw (uno::RuntimeException, std::exception) @@ -198,7 +198,7 @@ void SAL_CALL SwVbaOptions::setAutoFormatAsYouTypeApplyBulletedLists( sal_Bool / sal_Bool SAL_CALL SwVbaOptions::getAutoFormatAsYouTypeApplyNumberedLists() throw (uno::RuntimeException, std::exception) { - return sal_False; + return false; } void SAL_CALL SwVbaOptions::setAutoFormatAsYouTypeApplyNumberedLists( sal_Bool /*_autoformatasyoutypeapplynumberedlists*/ ) throw (uno::RuntimeException, std::exception) @@ -208,7 +208,7 @@ void SAL_CALL SwVbaOptions::setAutoFormatAsYouTypeApplyNumberedLists( sal_Bool / sal_Bool SAL_CALL SwVbaOptions::getAutoFormatAsYouTypeFormatListItemBeginning() throw (uno::RuntimeException, std::exception) { - return sal_False; + return false; } void SAL_CALL SwVbaOptions::setAutoFormatAsYouTypeFormatListItemBeginning( sal_Bool /*_autoformatasyoutypeformatlistitembeginning*/ ) throw (uno::RuntimeException, std::exception) @@ -218,7 +218,7 @@ void SAL_CALL SwVbaOptions::setAutoFormatAsYouTypeFormatListItemBeginning( sal_B sal_Bool SAL_CALL SwVbaOptions::getAutoFormatAsYouTypeDefineStyles() throw (uno::RuntimeException, std::exception) { - return sal_False; + return false; } void SAL_CALL SwVbaOptions::setAutoFormatAsYouTypeDefineStyles( sal_Bool /*_autoformatasyoutypedefinestyles*/ ) throw (uno::RuntimeException, std::exception) @@ -228,7 +228,7 @@ void SAL_CALL SwVbaOptions::setAutoFormatAsYouTypeDefineStyles( sal_Bool /*_auto sal_Bool SAL_CALL SwVbaOptions::getAutoFormatApplyHeadings() throw (uno::RuntimeException, std::exception) { - return sal_False; + return false; } void SAL_CALL SwVbaOptions::setAutoFormatApplyHeadings( sal_Bool /*_autoformatapplyheadings*/ ) throw (uno::RuntimeException, std::exception) @@ -238,7 +238,7 @@ void SAL_CALL SwVbaOptions::setAutoFormatApplyHeadings( sal_Bool /*_autoformatap sal_Bool SAL_CALL SwVbaOptions::getAutoFormatApplyLists() throw (uno::RuntimeException, std::exception) { - return sal_False; + return false; } void SAL_CALL SwVbaOptions::setAutoFormatApplyLists( sal_Bool /*_autoformatapplylists*/ ) throw (uno::RuntimeException, std::exception) @@ -248,7 +248,7 @@ void SAL_CALL SwVbaOptions::setAutoFormatApplyLists( sal_Bool /*_autoformatapply sal_Bool SAL_CALL SwVbaOptions::getAutoFormatApplyBulletedLists() throw (uno::RuntimeException, std::exception) { - return sal_False; + return false; } void SAL_CALL SwVbaOptions::setAutoFormatApplyBulletedLists( sal_Bool /*_autoformatapplybulletedlists*/ ) throw (uno::RuntimeException, std::exception) diff --git a/sw/source/ui/vba/vbapagesetup.cxx b/sw/source/ui/vba/vbapagesetup.cxx index d06247302fbd..d348b7d082bd 100644 --- a/sw/source/ui/vba/vbapagesetup.cxx +++ b/sw/source/ui/vba/vbapagesetup.cxx @@ -137,9 +137,9 @@ sal_Bool SAL_CALL SwVbaPageSetup::getDifferentFirstPageHeaderFooter() throw (uno { OUString pageStyle = getStyleOfFirstPage(); if ( pageStyle == "First Page" ) - return sal_True; + return true; - return sal_False; + return false; } void SAL_CALL SwVbaPageSetup::setDifferentFirstPageHeaderFooter( sal_Bool status ) throw (uno::RuntimeException, std::exception) diff --git a/sw/source/ui/vba/vbapalette.cxx b/sw/source/ui/vba/vbapalette.cxx index 7f8659050108..212c4510afc8 100644 --- a/sw/source/ui/vba/vbapalette.cxx +++ b/sw/source/ui/vba/vbapalette.cxx @@ -76,7 +76,7 @@ public: } virtual sal_Bool SAL_CALL hasElements() throw (uno::RuntimeException, std::exception) override { - return sal_True; + return true; } }; diff --git a/sw/source/ui/vba/vbapanes.cxx b/sw/source/ui/vba/vbapanes.cxx index 8198f4858126..a21b4c6c0baa 100644 --- a/sw/source/ui/vba/vbapanes.cxx +++ b/sw/source/ui/vba/vbapanes.cxx @@ -52,7 +52,7 @@ public: } virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) override { - return sal_True; + return true; } }; diff --git a/sw/source/ui/vba/vbaparagraph.cxx b/sw/source/ui/vba/vbaparagraph.cxx index bb7967061145..7f132c4c6c78 100644 --- a/sw/source/ui/vba/vbaparagraph.cxx +++ b/sw/source/ui/vba/vbaparagraph.cxx @@ -91,7 +91,7 @@ public: } // XElementAccess virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) override { return cppu::UnoType<text::XTextRange>::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; } // XIndexAccess virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) override { diff --git a/sw/source/ui/vba/vbarange.cxx b/sw/source/ui/vba/vbarange.cxx index 88ea787016c5..78491153d226 100644 --- a/sw/source/ui/vba/vbarange.cxx +++ b/sw/source/ui/vba/vbarange.cxx @@ -76,9 +76,9 @@ void SwVbaRange::initialize( const uno::Reference< text::XTextRange >& rStart, c mxTextCursor->collapseToStart(); if( rEnd.is() ) - mxTextCursor->gotoRange( rEnd, sal_True ); + mxTextCursor->gotoRange( rEnd, true ); else - mxTextCursor->gotoEnd( sal_True ); + mxTextCursor->gotoEnd( true ); } uno::Reference< text::XTextRange > SAL_CALL @@ -104,7 +104,7 @@ SwVbaRange::getText() throw ( uno::RuntimeException, std::exception ) { if( mxTextCursor->isCollapsed() ) { - mxTextCursor->goRight( 1, sal_True ); + mxTextCursor->goRight( 1, true ); aText = mxTextCursor->getString(); mxTextCursor->collapseToStart(); } @@ -113,9 +113,9 @@ SwVbaRange::getText() throw ( uno::RuntimeException, std::exception ) uno::Reference< text::XTextRange > xStart = mxTextCursor->getStart(); uno::Reference< text::XTextRange > xEnd = mxTextCursor->getEnd(); mxTextCursor->collapseToEnd(); - mxTextCursor->goRight( 1, sal_True ); - mxTextCursor->gotoRange( xStart, sal_False ); - mxTextCursor->gotoRange( xEnd, sal_True ); + mxTextCursor->goRight( 1, true ); + mxTextCursor->gotoRange( xStart, false ); + mxTextCursor->gotoRange( xEnd, true ); } } @@ -217,8 +217,8 @@ SwVbaRange::Select() throw ( uno::RuntimeException, std::exception ) { uno::Reference< frame::XModel > xModel( mxTextDocument, uno::UNO_QUERY_THROW ); uno::Reference< text::XTextViewCursor > xTextViewCursor = word::getXTextViewCursor( xModel ); - xTextViewCursor->gotoRange( mxTextCursor->getStart(), sal_False ); - xTextViewCursor->gotoRange( mxTextCursor->getEnd(), sal_True ); + xTextViewCursor->gotoRange( mxTextCursor->getStart(), false ); + xTextViewCursor->gotoRange( mxTextCursor->getEnd(), true ); } void SAL_CALL @@ -232,15 +232,15 @@ void SAL_CALL SwVbaRange::InsertParagraphBefore() throw ( uno::RuntimeException, std::exception ) { uno::Reference< text::XTextRange > xTextRange = mxTextCursor->getStart(); - mxText->insertControlCharacter( xTextRange, text::ControlCharacter::PARAGRAPH_BREAK, sal_True ); - mxTextCursor->gotoRange( xTextRange, sal_True ); + mxText->insertControlCharacter( xTextRange, text::ControlCharacter::PARAGRAPH_BREAK, true ); + mxTextCursor->gotoRange( xTextRange, true ); } void SAL_CALL SwVbaRange::InsertParagraphAfter() throw ( uno::RuntimeException, std::exception ) { uno::Reference< text::XTextRange > xTextRange = mxTextCursor->getEnd(); - mxText->insertControlCharacter( xTextRange, text::ControlCharacter::PARAGRAPH_BREAK, sal_True ); + mxText->insertControlCharacter( xTextRange, text::ControlCharacter::PARAGRAPH_BREAK, true ); } uno::Reference< word::XParagraphFormat > SAL_CALL @@ -344,8 +344,8 @@ void SAL_CALL SwVbaRange::setStart( ::sal_Int32 _start ) throw (uno::RuntimeExce uno::Reference< text::XTextRange > xStart = SwVbaRangeHelper::getRangeByPosition( xText, _start ); uno::Reference< text::XTextRange > xEnd = mxTextCursor->getEnd(); - mxTextCursor->gotoRange( xStart, sal_False ); - mxTextCursor->gotoRange( xEnd, sal_True ); + mxTextCursor->gotoRange( xStart, false ); + mxTextCursor->gotoRange( xEnd, true ); } ::sal_Int32 SAL_CALL SwVbaRange::getEnd() throw (uno::RuntimeException, std::exception) @@ -360,7 +360,7 @@ void SAL_CALL SwVbaRange::setEnd( ::sal_Int32 _end ) throw (uno::RuntimeExceptio uno::Reference< text::XTextRange > xEnd = SwVbaRangeHelper::getRangeByPosition( xText, _end ); mxTextCursor->collapseToStart(); - mxTextCursor->gotoRange( xEnd, sal_True ); + mxTextCursor->gotoRange( xEnd, true ); } sal_Bool SAL_CALL SwVbaRange::InRange( const uno::Reference< ::ooo::vba::word::XRange >& Range ) throw (uno::RuntimeException, std::exception) @@ -371,8 +371,8 @@ sal_Bool SAL_CALL SwVbaRange::InRange( const uno::Reference< ::ooo::vba::word::X uno::Reference< text::XTextRange > xTextRange = pRange->getXTextRange(); uno::Reference< text::XTextRangeCompare > xTRC( mxTextCursor->getText(), uno::UNO_QUERY_THROW ); if( xTRC->compareRegionStarts( xTextRange, getXTextRange() ) >= 0 && xTRC->compareRegionEnds( xTextRange, getXTextRange() ) <= 0 ) - return sal_True; - return sal_False; + return true; + return false; } uno::Any SAL_CALL diff --git a/sw/source/ui/vba/vbarangehelper.cxx b/sw/source/ui/vba/vbarangehelper.cxx index d5d5b70313be..dda1bb6558f1 100644 --- a/sw/source/ui/vba/vbarangehelper.cxx +++ b/sw/source/ui/vba/vbarangehelper.cxx @@ -52,7 +52,7 @@ uno::Reference< text::XTextRange > SwVbaRangeHelper::getRangeByPosition( const u } else { - bCanGo = xCursor->goRight( 1, sal_False ); + bCanGo = xCursor->goRight( 1, false ); nPos++; } } @@ -148,7 +148,7 @@ sal_Int32 SwVbaRangeHelper::getPosition( const uno::Reference< text::XText >& rT while( nCompareValue !=0 && canGo ) { - canGo = xCursor->goRight( 1, sal_False ); + canGo = xCursor->goRight( 1, false ); nCompareValue = xCompare->compareRegionStarts( xCursor->getStart(), rTextRange ); nPosition++; } diff --git a/sw/source/ui/vba/vbasection.cxx b/sw/source/ui/vba/vbasection.cxx index 3995c5f705a0..ff034e30e0f3 100644 --- a/sw/source/ui/vba/vbasection.cxx +++ b/sw/source/ui/vba/vbasection.cxx @@ -36,7 +36,7 @@ SwVbaSection::~SwVbaSection() sal_Bool SAL_CALL SwVbaSection::getProtectedForForms() throw (uno::RuntimeException, std::exception) { - return sal_False; + return false; } void SAL_CALL SwVbaSection::setProtectedForForms( sal_Bool /*_protectedforforms*/ ) throw (uno::RuntimeException, std::exception) diff --git a/sw/source/ui/vba/vbasections.cxx b/sw/source/ui/vba/vbasections.cxx index d9bc9e4b3b6c..e6c272c4f87c 100644 --- a/sw/source/ui/vba/vbasections.cxx +++ b/sw/source/ui/vba/vbasections.cxx @@ -109,7 +109,7 @@ public: } virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) override { - return sal_True; + return true; } // XEnumerationAccess virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException, std::exception) override diff --git a/sw/source/ui/vba/vbaselection.cxx b/sw/source/ui/vba/vbaselection.cxx index 97bb3e51626d..c22c688ba14b 100644 --- a/sw/source/ui/vba/vbaselection.cxx +++ b/sw/source/ui/vba/vbaselection.cxx @@ -210,7 +210,7 @@ SwVbaSelection::Delete( const uno::Any& _unit, const uno::Any& _count ) throw ( { if( HasSelection() ) nCount--; - mxTextViewCursor->goRight( nCount, sal_True ); + mxTextViewCursor->goRight( nCount, true ); break; } default: @@ -337,8 +337,8 @@ SwVbaSelection::Move( const uno::Any& _unit, const uno::Any& _count, const uno:: break; } } - mxTextViewCursor->gotoRange( xTextCursor->getStart(), sal_False ); - mxTextViewCursor->gotoRange( xTextCursor->getEnd(), sal_True ); + mxTextViewCursor->gotoRange( xTextCursor->getStart(), false ); + mxTextViewCursor->gotoRange( xTextCursor->getEnd(), true ); break; } default: @@ -370,22 +370,22 @@ void SwVbaSelection::NextCell(sal_Int32 nCount, word::E_DIRECTION eDirection) { case word::MOVE_LEFT: { - xTextTableCursor->goLeft( nCount, sal_False ); + xTextTableCursor->goLeft( nCount, false ); break; } case word::MOVE_RIGHT: { - xTextTableCursor->goRight( nCount, sal_False ); + xTextTableCursor->goRight( nCount, false ); break; } case word::MOVE_UP: { - xTextTableCursor->goUp( nCount, sal_False ); + xTextTableCursor->goUp( nCount, false ); break; } case word::MOVE_DOWN: { - xTextTableCursor->goDown( nCount, sal_False ); + xTextTableCursor->goDown( nCount, false ); break; } default: @@ -396,7 +396,7 @@ void SwVbaSelection::NextCell(sal_Int32 nCount, word::E_DIRECTION eDirection) } // move the view cursor xCell = xTextTable->getCellByName( xTextTableCursor->getRangeName() ); - mxTextViewCursor->gotoRange( uno::Reference< text::XTextRange >( xCell, uno::UNO_QUERY_THROW ), sal_False ); + mxTextViewCursor->gotoRange( uno::Reference< text::XTextRange >( xCell, uno::UNO_QUERY_THROW ), false ); } void SAL_CALL @@ -1073,13 +1073,13 @@ void SAL_CALL SwVbaSelection::Collapse( const uno::Any& Direction ) throw (uno:: { // it is inaccurate if current seleciton is multipul cells, so it needs to go to start uno::Reference< text::XTextRange > xTextRange = mxTextViewCursor->getStart(); - xTextViewCursor->gotoRange( xTextRange, sal_False ); + xTextViewCursor->gotoRange( xTextRange, false ); xTextViewCursor->collapseToStart(); } else if( nDirection == word::WdCollapseDirection::wdCollapseEnd ) { uno::Reference< text::XTextRange > xTextRange = mxTextViewCursor->getEnd(); - xTextViewCursor->gotoRange( xTextRange, sal_False ); + xTextViewCursor->gotoRange( xTextRange, false ); xTextViewCursor->collapseToEnd(); } else @@ -1102,15 +1102,15 @@ void SAL_CALL SwVbaSelection::WholeStory( ) throw (uno::RuntimeException, std:: { // insert an empty line uno::Reference< text::XTextRange > xFirstCellRange = word::getFirstObjectPosition( xText ); - mxTextViewCursor->gotoRange( xFirstCellRange, sal_False ); + mxTextViewCursor->gotoRange( xFirstCellRange, false ); OUString url = ".uno:InsertPara"; dispatchRequests( mxModel,url ); } } uno::Reference< text::XTextRange > xStart = xText->getStart(); uno::Reference< text::XTextRange > xEnd = xText->getEnd(); - mxTextViewCursor->gotoRange( xStart, sal_False ); - mxTextViewCursor->gotoRange( xEnd, sal_True ); + mxTextViewCursor->gotoRange( xStart, false ); + mxTextViewCursor->gotoRange( xEnd, true ); } sal_Bool SAL_CALL SwVbaSelection::InRange( const uno::Reference< ::ooo::vba::word::XRange >& Range ) throw (uno::RuntimeException, std::exception) @@ -1154,8 +1154,8 @@ SwVbaSelection::Paragraphs( const uno::Any& aIndex ) throw (uno::RuntimeExceptio uno::Reference< text::XTextRange > xTextRange = mxTextViewCursor->getStart(); uno::Reference< text::XText > xText = xTextRange->getText(); uno::Reference< text::XParagraphCursor > xParaCursor( xText->createTextCursor(), uno::UNO_QUERY_THROW ); - xParaCursor->gotoStartOfParagraph( sal_False ); - xParaCursor->gotoStartOfParagraph( sal_True ); + xParaCursor->gotoStartOfParagraph( false ); + xParaCursor->gotoStartOfParagraph( true ); uno::Reference< text::XTextDocument > xTextDoc( mxModel, uno::UNO_QUERY_THROW ); uno::Reference< text::XTextRange > xParaRange( xParaCursor, uno::UNO_QUERY_THROW ); diff --git a/sw/source/ui/vba/vbastyles.cxx b/sw/source/ui/vba/vbastyles.cxx index a5340e3c656b..8d9de39f2743 100644 --- a/sw/source/ui/vba/vbastyles.cxx +++ b/sw/source/ui/vba/vbastyles.cxx @@ -197,16 +197,16 @@ public: if( mxParaStyles->hasByName( sStyleName ) ) { cachePos = mxParaStyles->getByName( sStyleName ); - return sal_True; + return true; } - return sal_False; + return false; } } if( mxParaStyles->hasByName( aName ) ) { cachePos = mxParaStyles->getByName( aName ); - return sal_True; + return true; } else { @@ -217,11 +217,11 @@ public: if( aStyleName.equalsIgnoreAsciiCase( aName ) ) { cachePos = mxParaStyles->getByName( aStyleName ); - return sal_True; + return true; } } } - return sal_False; + return false; } // XIndexAccess diff --git a/sw/source/ui/vba/vbatable.cxx b/sw/source/ui/vba/vbatable.cxx index 60783cf5139f..64fa044f7fcb 100644 --- a/sw/source/ui/vba/vbatable.cxx +++ b/sw/source/ui/vba/vbatable.cxx @@ -59,7 +59,7 @@ SwVbaTable::Select( ) throw (script::BasicErrorException, uno::RuntimeException // go to the end of the table and span the view uno::Reference< text::XTextViewCursor > xCursor = xViewCursorSupplier->getViewCursor(); - xCursor->gotoEnd(sal_True); + xCursor->gotoEnd(true); } diff --git a/sw/source/ui/vba/vbatables.cxx b/sw/source/ui/vba/vbatables.cxx index 162b169300d4..a84b1565743b 100644 --- a/sw/source/ui/vba/vbatables.cxx +++ b/sw/source/ui/vba/vbatables.cxx @@ -187,7 +187,7 @@ SwVbaTables::Add( const uno::Reference< word::XRange >& Range, const uno::Any& N // move the current cursor to the first table cell uno::Reference< table::XCellRange > xCellRange( xTable, uno::UNO_QUERY_THROW ); uno::Reference< text::XText> xFirstCellText( xCellRange->getCellByPosition(0, 0), uno::UNO_QUERY_THROW ); - word::getXTextViewCursor( mxDocument )->gotoRange( xFirstCellText->getStart(), sal_False ); + word::getXTextViewCursor( mxDocument )->gotoRange( xFirstCellText->getStart(), false ); uno::Reference< word::XTable > xVBATable( new SwVbaTable( mxParent, mxContext, pVbaRange->getDocument(), xTable ) ); return xVBATable; diff --git a/sw/source/ui/vba/vbatablesofcontents.cxx b/sw/source/ui/vba/vbatablesofcontents.cxx index 6999b04b063d..920af89574ea 100644 --- a/sw/source/ui/vba/vbatablesofcontents.cxx +++ b/sw/source/ui/vba/vbatablesofcontents.cxx @@ -94,7 +94,7 @@ public: } virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) override { - return sal_True; + return true; } // XEnumerationAccess virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException, std::exception) override @@ -139,7 +139,7 @@ SwVbaTablesOfContents::Add( const uno::Reference< word::XRange >& Range, const u uno::Reference< text::XTextRange > xTextRange = pVbaRange->getXTextRange(); uno::Reference< text::XText > xText = pVbaRange->getXText(); uno::Reference< text::XTextContent > xTextContent( xDocumentIndex, uno::UNO_QUERY_THROW ); - xText->insertTextContent( xTextRange, xTextContent, sal_False ); + xText->insertTextContent( xTextRange, xTextContent, false ); xToc->Update(); return xToc; diff --git a/sw/source/ui/vba/vbatabstops.cxx b/sw/source/ui/vba/vbatabstops.cxx index 15b088fa3a57..0590e9c38d38 100644 --- a/sw/source/ui/vba/vbatabstops.cxx +++ b/sw/source/ui/vba/vbatabstops.cxx @@ -96,7 +96,7 @@ public: } virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) override { - return sal_True; + return true; } // XEnumerationAccess virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException, std::exception) override diff --git a/sw/source/ui/vba/vbaview.cxx b/sw/source/ui/vba/vbaview.cxx index 4ab88f0e1eff..c8ab58ff007b 100644 --- a/sw/source/ui/vba/vbaview.cxx +++ b/sw/source/ui/vba/vbaview.cxx @@ -134,7 +134,7 @@ SwVbaView::setSeekView( ::sal_Int32 _seekview ) throw (css::uno::RuntimeExceptio case word::WdSeekView::wdSeekEvenPagesHeader: { // need to test - mxViewCursor->gotoRange( getHFTextRange( _seekview ), sal_False ); + mxViewCursor->gotoRange( getHFTextRange( _seekview ), false ); break; } case word::WdSeekView::wdSeekFootnotes: @@ -144,7 +144,7 @@ SwVbaView::setSeekView( ::sal_Int32 _seekview ) throw (css::uno::RuntimeExceptio if( xFootnotes->getCount() > 0 ) { uno::Reference< text::XText > xText( xFootnotes->getByIndex(0), uno::UNO_QUERY_THROW ); - mxViewCursor->gotoRange( xText->getStart(), sal_False ); + mxViewCursor->gotoRange( xText->getStart(), false ); } else { @@ -159,7 +159,7 @@ SwVbaView::setSeekView( ::sal_Int32 _seekview ) throw (css::uno::RuntimeExceptio if( xEndnotes->getCount() > 0 ) { uno::Reference< text::XText > xText( xEndnotes->getByIndex(0), uno::UNO_QUERY_THROW ); - mxViewCursor->gotoRange( xText->getStart(), sal_False ); + mxViewCursor->gotoRange( xText->getStart(), false ); } else { @@ -171,7 +171,7 @@ SwVbaView::setSeekView( ::sal_Int32 _seekview ) throw (css::uno::RuntimeExceptio { uno::Reference< text::XTextDocument > xTextDocument( mxModel, uno::UNO_QUERY_THROW ); uno::Reference< text::XText > xText = xTextDocument->getText(); - mxViewCursor->gotoRange( word::getFirstObjectPosition( xText ), sal_False ); + mxViewCursor->gotoRange( word::getFirstObjectPosition( xText ), false ); break; } } diff --git a/sw/source/uibase/config/StoredChapterNumbering.cxx b/sw/source/uibase/config/StoredChapterNumbering.cxx index e49d4d58118d..75b49a22a085 100644 --- a/sw/source/uibase/config/StoredChapterNumbering.cxx +++ b/sw/source/uibase/config/StoredChapterNumbering.cxx @@ -101,7 +101,7 @@ public: virtual ::sal_Bool SAL_CALL hasElements() throw (uno::RuntimeException, std::exception) override { - return sal_True; + return true; } // XIndexAccess diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx index 8b9d6d5341fa..0b886c616a07 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -940,11 +940,11 @@ static void lcl_PreparePrinterOptions( const sal_Int32 nOffset = !bVisibleMonitor ? 2 : 1; rOutPrintOptions.realloc( nOffset ); rOutPrintOptions[ 0 ].Name = "Wait"; - rOutPrintOptions[ 0 ].Value <<= sal_True; + rOutPrintOptions[ 0 ].Value <<= true; if( !bVisibleMonitor ) { rOutPrintOptions[ 1 ].Name = "MonitorVisible"; - rOutPrintOptions[ 1 ].Value <<= sal_False; + rOutPrintOptions[ 1 ].Value <<= false; } // copy print options @@ -1766,7 +1766,7 @@ sal_uLong SwDBManager::GetColumnFormat( uno::Reference< sdbc::XDataSource> xSour aFormatString >>= sFormat; lang::Locale aLoc; aLocaleVal >>= aLoc; - nFormat = xDocNumberFormats->queryKey( sFormat, aLoc, sal_False ); + nFormat = xDocNumberFormats->queryKey( sFormat, aLoc, false ); if(NUMBERFORMAT_ENTRY_NOT_FOUND == sal::static_int_cast< sal_uInt32, sal_Int32>(nFormat)) nFormat = xDocNumberFormats->addNew( sFormat, aLoc ); nRet = nFormat; diff --git a/sw/source/uibase/lingu/olmenu.cxx b/sw/source/uibase/lingu/olmenu.cxx index fd9128a5effc..16cf70852094 100644 --- a/sw/source/uibase/lingu/olmenu.cxx +++ b/sw/source/uibase/lingu/olmenu.cxx @@ -360,7 +360,7 @@ SwSpellPopup::SwSpellPopup( // words could be added. uno::Reference< linguistic2::XDictionary > xDic( SvxGetOrCreatePosDic( xDicList ) ); if (xDic.is()) - xDic->setActive( sal_True ); + xDic->setActive( true ); m_aDics = xDicList->getDictionaries(); const uno::Reference< linguistic2::XDictionary > *pDic = m_aDics.getConstArray(); @@ -744,8 +744,8 @@ void SwSpellPopup::Execute( sal_uInt16 nId ) if (pPaM) SwEditShell::IgnoreGrammarErrorAt( *pPaM ); // refresh the layout of all paragraphs (workaround to launch a dictionary event) - xDictionary->setActive(sal_False); - xDictionary->setActive(sal_True); + xDictionary->setActive(false); + xDictionary->setActive(true); } catch( const uno::Exception& ) { diff --git a/sw/source/uibase/shells/textdrw.cxx b/sw/source/uibase/shells/textdrw.cxx index b0b4269cd15d..64d527e685a7 100644 --- a/sw/source/uibase/shells/textdrw.cxx +++ b/sw/source/uibase/shells/textdrw.cxx @@ -112,7 +112,7 @@ void SwBaseShell::InsertURLButton(const OUString& rURL, const OUString& rTarget, if ( ::avmedia::MediaWindow::isMediaURL( rURL, ""/*TODO?*/ ) ) { // #105638# OJ - aTmp <<= sal_True; + aTmp <<= true; xPropSet->setPropertyValue("DispatchURLInternal", aTmp ); } #endif diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx index 8c61c21a2163..0de348f988dd 100644 --- a/sw/source/uibase/uiview/view2.cxx +++ b/sw/source/uibase/uiview/view2.cxx @@ -308,7 +308,7 @@ bool SwView::InsertGraphicDlg( SfxRequest& rReq ) if(nHtmlMode & HTMLMODE_ON) { xCtrlAcc->setValue( ExtendedFilePickerElementIds::CHECKBOX_LINK, 0, makeAny(true)); - xCtrlAcc->enableControl( ExtendedFilePickerElementIds::CHECKBOX_LINK, sal_False); + xCtrlAcc->enableControl( ExtendedFilePickerElementIds::CHECKBOX_LINK, false); } std::vector<OUString> aFormats; diff --git a/sw/source/uibase/uiview/viewling.cxx b/sw/source/uibase/uiview/viewling.cxx index 29072b039691..973f987c2b00 100644 --- a/sw/source/uibase/uiview/viewling.cxx +++ b/sw/source/uibase/uiview/viewling.cxx @@ -467,7 +467,7 @@ void SwView::HyphenateDocument() bOther = true; if (xProp.is()) { - xProp->setIsHyphSpecial( sal_True ); + xProp->setIsHyphSpecial( true ); } } else diff --git a/sw/source/uibase/uno/unoatxt.cxx b/sw/source/uibase/uno/unoatxt.cxx index 51511337f51a..7b6ef8688014 100644 --- a/sw/source/uibase/uno/unoatxt.cxx +++ b/sw/source/uibase/uno/unoatxt.cxx @@ -95,7 +95,7 @@ uno::Type SwXAutoTextContainer::getElementType() throw( uno::RuntimeException, s sal_Bool SwXAutoTextContainer::hasElements() throw( uno::RuntimeException, std::exception ) { // At least standard should always exists! - return sal_True; + return true; } uno::Any SwXAutoTextContainer::getByName(const OUString& GroupName) @@ -139,8 +139,8 @@ sal_Bool SwXAutoTextContainer::hasByName(const OUString& Name) SolarMutexGuard aGuard; OUString sGroupName( pGlossaries->GetCompleteGroupName( Name ) ); if(!sGroupName.isEmpty()) - return sal_True; - return sal_False; + return true; + return false; } uno::Reference< text::XAutoTextGroup > SwXAutoTextContainer::insertNewByName( diff --git a/sw/source/uibase/uno/unodispatch.cxx b/sw/source/uibase/uno/unodispatch.cxx index 6b039a2c1a53..985f28387e2b 100644 --- a/sw/source/uibase/uno/unodispatch.cxx +++ b/sw/source/uibase/uno/unodispatch.cxx @@ -241,7 +241,7 @@ void SwXDispatch::dispatch(const util::URL& aURL, else if(aURL.Complete.equalsAscii(cInternalDBChangeNotification)) { frame::FeatureStateEvent aEvent; - aEvent.IsEnabled = sal_True; + aEvent.IsEnabled = true; aEvent.Source = *static_cast<cppu::OWeakObject*>(this); const SwDBData& rData = m_pView->GetWrtShell().GetDBDesc(); diff --git a/sw/source/uibase/uno/unomailmerge.cxx b/sw/source/uibase/uno/unomailmerge.cxx index 7c8a6022d946..bdf0fbb33bf5 100644 --- a/sw/source/uibase/uno/unomailmerge.cxx +++ b/sw/source/uibase/uno/unomailmerge.cxx @@ -112,7 +112,7 @@ static CloseResult CloseModelAndDocSh( { //! 'sal_True' -> transfer ownership to vetoing object if vetoed! //! I.e. now that object is responsible for closing the model and doc shell. - xClose->close( sal_True ); + xClose->close( true ); } catch (const util::CloseVetoException&) { @@ -1026,7 +1026,7 @@ void SAL_CALL SwXMailMerge::setPropertyValue( if (bChanged) { PropertyChangeEvent aChgEvt( static_cast<XPropertySet *>(this), rPropertyName, - sal_False, pCur->nWID, aOld, rValue ); + false, pCur->nWID, aOld, rValue ); launchEvent( aChgEvt ); } } diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx index 31216c5434e3..b975697853d6 100644 --- a/sw/source/uibase/uno/unotxdoc.cxx +++ b/sw/source/uibase/uno/unotxdoc.cxx @@ -2784,7 +2784,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SwXTextDocument::getRenderer( aRenderer[0].Name = "PageSize"; aRenderer[0].Value <<= aPageSize; aRenderer[1].Name = "PageIncludesNonprintableArea"; - aRenderer[1].Value <<= sal_True; + aRenderer[1].Value <<= true; if (aPreferredPageSize.Width && aPreferredPageSize.Height) { ++nLen; @@ -3795,8 +3795,8 @@ sal_Bool SwXLinkTargetSupplier::hasByName(const OUString& rName) rName == sSections || rName == sOutlines || rName == sBookmarks ) - return sal_True; - return sal_False; + return true; + return false; } uno::Type SwXLinkTargetSupplier::getElementType() diff --git a/sw/source/uibase/uno/unotxvw.cxx b/sw/source/uibase/uno/unotxvw.cxx index 1fe0dcfe0ac8..5b5a7e4aca97 100644 --- a/sw/source/uibase/uno/unotxvw.cxx +++ b/sw/source/uibase/uno/unotxvw.cxx @@ -228,7 +228,7 @@ sal_Bool SwXTextView::select(const uno::Any& aInterface) uno::Reference< uno::XInterface > xInterface; if (!GetView() || !(aInterface >>= xInterface)) { - return sal_False; + return false; } SwWrtShell& rSh = GetView()->GetWrtShell(); @@ -262,7 +262,7 @@ sal_Bool SwXTextView::select(const uno::Any& aInterface) while (pPaM->GetNext() != pPaM) delete pPaM->GetNext(); delete pPaM; - return sal_True; + return true; } else if (!frame.first.isEmpty()) { @@ -272,26 +272,26 @@ sal_Bool SwXTextView::select(const uno::Any& aInterface) rSh.HideCursor(); rSh.EnterSelFrameMode(); } - return sal_True; + return true; } else if (!tableName.isEmpty()) { rSh.EnterStdMode(); rSh.GotoTable(tableName); - return sal_True; + return true; } else if (pTableCursor) { UnoActionRemoveContext const aContext(*pTableCursor); rSh.EnterStdMode(); rSh.SetSelection(*pTableCursor); - return sal_True; + return true; } else if (pMark) { rSh.EnterStdMode(); rSh.GotoMark(pMark); - return sal_True; + return true; } // sdrObjects handled below } @@ -895,7 +895,7 @@ sal_Bool SwXTextViewCursor::isVisible() throw( uno::RuntimeException, std::excep { SolarMutexGuard aGuard; OSL_FAIL("not implemented"); - return sal_True; + return true; } void SwXTextViewCursor::setVisible(sal_Bool /*bVisible*/) throw( uno::RuntimeException, std::exception ) diff --git a/sw/source/uibase/utlui/unotools.cxx b/sw/source/uibase/utlui/unotools.cxx index e0e3c097075a..c7ce30c7b8bb 100644 --- a/sw/source/uibase/utlui/unotools.cxx +++ b/sw/source/uibase/utlui/unotools.cxx @@ -124,7 +124,7 @@ void SwOneExampleFrame::CreateControl() _xControl->createPeer( xToolkit, xParent ); uno::Reference< awt::XWindow > xWin( _xControl, uno::UNO_QUERY ); - xWin->setVisible(sal_False); + xWin->setVisible(false); Size aWinSize(aTopWindow->GetOutputSizePixel()); xWin->setPosSize( 0, 0, aWinSize.Width(), aWinSize.Height(), awt::PosSize::SIZE ); @@ -214,7 +214,7 @@ IMPL_LINK_TYPED( SwOneExampleFrame, TimeoutHdl, Idle*, pTimer, void ) uno::Any aValue = xPropSet->getPropertyValue("LayoutManager"); aValue >>= xLayoutManager; if ( xLayoutManager.is() ) - xLayoutManager->setVisible( sal_False ); + xLayoutManager->setVisible( false ); } catch (const uno::Exception&) { @@ -377,7 +377,7 @@ IMPL_LINK_TYPED( SwOneExampleFrame, TimeoutHdl, Idle*, pTimer, void ) if(xScrCursor.is()) xScrCursor->screenUp(); - xWin->setVisible( sal_True ); + xWin->setVisible( true ); aTopWindow->Show(); if( xTunnel.is() ) @@ -428,8 +428,8 @@ void SwOneExampleFrame::ClearDocument() } else { - _xCursor->gotoStart(sal_False); - _xCursor->gotoEnd(sal_True); + _xCursor->gotoStart(false); + _xCursor->gotoEnd(true); _xCursor->setString(OUString()); } } diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx b/sw/source/uibase/wrtsh/wrtsh1.cxx index d60045bb67c6..79e18c0c72e0 100644 --- a/sw/source/uibase/wrtsh/wrtsh1.cxx +++ b/sw/source/uibase/wrtsh/wrtsh1.cxx @@ -543,7 +543,7 @@ bool SwWrtShell::InsertOleObject( const svt::EmbeddedObjectRef& xRef, SwFlyFrame uno::Reference< util::XModifiable > xModifiable( xProps, uno::UNO_QUERY ); if ( xModifiable.is() ) { - xModifiable->setModified( sal_True ); + xModifiable->setModified( true ); } } } |