diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2016-04-20 17:19:30 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-04-20 17:27:24 +0200 |
commit | a8884ad99c491624d776a4a21f06e6453f71b25a (patch) | |
tree | 5f747acfdb24ac2faf6c0d1171ab925303bd1cfb /sfx2 | |
parent | 259ece83e9b114ccc8403bbde97e5b11d4319865 (diff) |
loplugin:salbool: Automatic rewrite of sal_False/True
Change-Id: I3cb9226ef6bebb5062abfae312dce95f0ef74385
Diffstat (limited to 'sfx2')
38 files changed, 122 insertions, 122 deletions
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index a178dc454961..4f03e86cea32 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -223,8 +223,8 @@ static void showDocument( const char* pBaseName ) try { Reference < XDesktop2 > xDesktop = Desktop::create( ::comphelper::getProcessComponentContext() ); auto args(::comphelper::InitPropertySequence({ - {"ViewOnly", makeAny(sal_True)}, - {"ReadOnly", makeAny(sal_True)} + {"ViewOnly", makeAny(true)}, + {"ReadOnly", makeAny(true)} })); OUString aURL; @@ -399,7 +399,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) aAny >>= xTask; try { - xTask->close(sal_True); + xTask->close(true); n++; } catch( CloseVetoException& ) diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx index d0c48f5393ff..ace65aad2e4d 100644 --- a/sfx2/source/appl/childwin.cxx +++ b/sfx2/source/appl/childwin.cxx @@ -180,7 +180,7 @@ void SfxChildWindow::Destroy() { css::uno::Reference < css::util::XCloseable > xClose( GetFrame(), css::uno::UNO_QUERY ); if ( xClose.is() ) - xClose->close( sal_True ); + xClose->close( true ); else GetFrame()->dispose(); } @@ -679,7 +679,7 @@ bool SfxChildWindow::QueryClose() { css::uno::Reference< css::frame::XController > xCtrl = pImp->xFrame->getController(); if ( xCtrl.is() ) - bAllow = xCtrl->suspend( sal_True ); + bAllow = xCtrl->suspend( true ); } if ( bAllow ) diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx index 895b5c9ed0b4..4b2a4960a63b 100644 --- a/sfx2/source/appl/fileobj.cxx +++ b/sfx2/source/appl/fileobj.cxx @@ -354,7 +354,7 @@ OUString impl_getFilter( const OUString& _rURL ) aDescr[ utl::MediaDescriptor::PROP_URL() ] <<= OUString( _rURL ); css::uno::Sequence< css::beans::PropertyValue > aDescrList = aDescr.getAsConstPropertyValueList(); - OUString sType = xTypeDetection->queryTypeByDescriptor( aDescrList, sal_True ); + OUString sType = xTypeDetection->queryTypeByDescriptor( aDescrList, true ); if ( !sType.isEmpty() ) { // Honor a selected/detected filter. diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index b5a6927ee00a..685824919102 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -206,7 +206,7 @@ namespace sfx2 sal_Int32 nStartPos = 0; const lang::Locale aLocale = Application::GetSettings().GetUILanguageTag().getLocale(); Boundary aBoundary = xBreak->getWordBoundary( - rSearchString, nStartPos, aLocale, WordType::ANYWORD_IGNOREWHITESPACES, sal_True ); + rSearchString, nStartPos, aLocale, WordType::ANYWORD_IGNOREWHITESPACES, true ); while ( aBoundary.startPos != aBoundary.endPos ) { @@ -1369,9 +1369,9 @@ void SfxHelpWindow_Impl::loadHelpContent(const OUString& sHelpURL, bool bAddToHi Reference< XController > xTextController ; if (xTextFrame.is()) xTextController = xTextFrame->getController (); - if ( xTextController.is() && !xTextController->suspend( sal_True ) ) + if ( xTextController.is() && !xTextController->suspend( true ) ) { - xTextController->suspend( sal_False ); + xTextController->suspend( false ); return; } @@ -2265,9 +2265,9 @@ void SfxHelpTextWindow_Impl::FindHdl(sfx2::SearchDialog* pDlg) if ( xText.is() ) { if ( pDlg->IsSearchBackwards() ) - xTVCrsr->gotoRange( xText->getEnd(), sal_False ); + xTVCrsr->gotoRange( xText->getEnd(), false ); else - xTVCrsr->gotoRange( xText->getStart(), sal_False ); + xTVCrsr->gotoRange( xText->getStart(), false ); FindHdl( nullptr ); } } @@ -2547,7 +2547,7 @@ void SfxHelpTextWindow_Impl::SetPageStyleHeaderOff() const xPropSet->setPropertyValue( "HeaderIsOn", makeAny( false ) ); Reference< XModifiable > xReset(xStyles, UNO_QUERY); - xReset->setModified(sal_False); + xReset->setModified(false); #ifdef DBG_UTIL bSetOff = true; #endif @@ -2579,7 +2579,7 @@ void SfxHelpTextWindow_Impl::CloseFrame() { css::uno::Reference< css::util::XCloseable > xCloseable ( xFrame, css::uno::UNO_QUERY ); if (xCloseable.is()) - xCloseable->close(sal_True); + xCloseable->close(true); } catch( css::util::CloseVetoException& ) { @@ -3154,7 +3154,7 @@ void SfxHelpWindow_Impl::CloseWindow() { Reference < XCloseable > xCloser( xCreator, UNO_QUERY ); if ( xCloser.is() ) - xCloser->close( sal_False ); + xCloser->close( false ); } } catch( Exception& ) diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx index 4140f8d6d05b..9b46a53c35a1 100644 --- a/sfx2/source/appl/sfxhelp.cxx +++ b/sfx2/source/appl/sfxhelp.cxx @@ -427,8 +427,8 @@ SfxHelpWindow_Impl* impl_createHelp(Reference< XFrame2 >& rHelpTask , makeAny(SfxResId(STR_HELP_WINDOW_TITLE).toString())); pHelpWindow->setContainerWindow( xParentWindow ); - xParentWindow->setVisible(sal_True); - xHelpWindow->setVisible(sal_True); + xParentWindow->setVisible(true); + xHelpWindow->setVisible(true); // This sub frame is created internally (if we called new SfxHelpWindow_Impl() ...) // It should exist :-) diff --git a/sfx2/source/appl/shutdowniconunx.cxx b/sfx2/source/appl/shutdowniconunx.cxx index 998b585c831c..8428b192d1e0 100644 --- a/sfx2/source/appl/shutdowniconunx.cxx +++ b/sfx2/source/appl/shutdowniconunx.cxx @@ -284,7 +284,7 @@ static gboolean display_menu_cb( GtkWidget *, GdkEventButton *event, GtkWidget *pMenu ) { if (event->button == 2) - return sal_False; + return false; refresh_menu( pMenu ); @@ -292,7 +292,7 @@ static gboolean display_menu_cb( GtkWidget *, gtk_status_icon_position_menu, pTrayIcon, 0, event->time ); - return sal_True; + return true; } #if ENABLE_GIO diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx index 7afdf471cfd4..adf0e4d4c368 100644 --- a/sfx2/source/bastyp/fltfnc.cxx +++ b/sfx2/source/bastyp/fltfnc.cxx @@ -451,7 +451,7 @@ sal_uInt32 SfxFilterMatcher::GuessFilterControlDefaultUI( SfxMedium& rMedium, s } uno::Sequence< beans::PropertyValue > lDescriptor = aDescriptor.getAsConstPropertyValueList(); - sTypeName = xDetection->queryTypeByDescriptor(lDescriptor, sal_True); // lDescriptor is used as In/Out param ... don't use aDescriptor.getAsConstPropertyValueList() directly! + sTypeName = xDetection->queryTypeByDescriptor(lDescriptor, true); // lDescriptor is used as In/Out param ... don't use aDescriptor.getAsConstPropertyValueList() directly! for (sal_Int32 i = 0; i < lDescriptor.getLength(); ++i) { diff --git a/sfx2/source/control/statcach.cxx b/sfx2/source/control/statcach.cxx index c610e05244fe..6b1a9e8cb949 100644 --- a/sfx2/source/control/statcach.cxx +++ b/sfx2/source/control/statcach.cxx @@ -60,7 +60,7 @@ BindDispatch_Impl::BindDispatch_Impl( const css::uno::Reference< css::frame::XDi , pSlot( pS ) { DBG_ASSERT( pCache && pSlot, "Invalid BindDispatch!"); - aStatus.IsEnabled = sal_True; + aStatus.IsEnabled = true; } void SAL_CALL BindDispatch_Impl::disposing( const css::lang::EventObject& ) throw( css::uno::RuntimeException, std::exception ) diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx index 9b906c9b96b6..95503364f612 100644 --- a/sfx2/source/control/unoctitm.cxx +++ b/sfx2/source/control/unoctitm.cxx @@ -295,8 +295,8 @@ void SAL_CALL SfxStatusDispatcher::addStatusListener(const css::uno::Reference< css::frame::FeatureStateEvent aEvent; aEvent.FeatureURL = aURL; aEvent.Source = static_cast<css::frame::XDispatch*>(this); - aEvent.IsEnabled = sal_True; - aEvent.Requery = sal_False; + aEvent.IsEnabled = true; + aEvent.Requery = false; aListener->statusChanged( aEvent ); } } @@ -962,7 +962,7 @@ void SAL_CALL SfxDispatchController_Impl::addStatusListener(const css::uno::Refe css::frame::FeatureStateEvent aEvent; aEvent.FeatureURL = aURL; aEvent.Source = static_cast<css::frame::XDispatch*>(pDispatch); - aEvent.Requery = sal_False; + aEvent.Requery = false; if ( bVisible ) { aEvent.IsEnabled = eState != SfxItemState::DISABLED; @@ -971,11 +971,11 @@ void SAL_CALL SfxDispatchController_Impl::addStatusListener(const css::uno::Refe else { css::frame::status::Visibility aVisibilityStatus; - aVisibilityStatus.bVisible = sal_False; + aVisibilityStatus.bVisible = false; // MBA: we might decide to *not* disable "invisible" slots, but this would be // a change that needs to adjust at least the testtool - aEvent.IsEnabled = sal_False; + aEvent.IsEnabled = false; aEvent.State = makeAny( aVisibilityStatus ); } @@ -1051,7 +1051,7 @@ void SfxDispatchController_Impl::StateChanged( sal_uInt16 nSID, SfxItemState eSt aEvent.FeatureURL = aDispatchURL; aEvent.Source = static_cast<css::frame::XDispatch*>(pDispatch); aEvent.IsEnabled = eState != SfxItemState::DISABLED; - aEvent.Requery = sal_False; + aEvent.Requery = false; aEvent.State = aState; if (pDispatcher && pDispatcher->GetFrame()) diff --git a/sfx2/source/dialog/backingcomp.cxx b/sfx2/source/dialog/backingcomp.cxx index 91c57b02a382..defdaa36ed12 100644 --- a/sfx2/source/dialog/backingcomp.cxx +++ b/sfx2/source/dialog/backingcomp.cxx @@ -457,7 +457,7 @@ void SAL_CALL BackingComp::attachFrame( /*IN*/ const css::uno::Reference< css::f sal_Bool SAL_CALL BackingComp::attachModel( /*IN*/ const css::uno::Reference< css::frame::XModel >& ) throw (css::uno::RuntimeException, std::exception) { - return sal_False; + return false; } @@ -535,7 +535,7 @@ sal_Bool SAL_CALL BackingComp::suspend( /*IN*/ sal_Bool ) throw (css::uno::RuntimeException, std::exception) { /* FIXME ... implemented by using default :-( */ - return sal_True; + return true; } @@ -700,7 +700,7 @@ void SAL_CALL BackingComp::initialize( /*IN*/ const css::uno::Sequence< css::uno if (xBroadcaster.is()) xBroadcaster->addEventListener(static_cast< css::lang::XEventListener* >(this)); - m_xWindow->setVisible(sal_True); + m_xWindow->setVisible(true); /* } SAFE */ } diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx index bb3ec7735b01..c3ef829332bf 100644 --- a/sfx2/source/dialog/backingwindow.cxx +++ b/sfx2/source/dialog/backingwindow.cxx @@ -641,7 +641,7 @@ IMPL_LINK_TYPED(BackingWindow, OpenTemplateHdl, ThumbnailViewItem*, pItem, void) { uno::Sequence< PropertyValue > aArgs(4); aArgs[0].Name = "AsTemplate"; - aArgs[0].Value <<= sal_True; + aArgs[0].Value <<= true; aArgs[1].Name = "MacroExecutionMode"; aArgs[1].Value <<= MacroExecMode::USE_CONFIG; aArgs[2].Name = "UpdateDocMode"; diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index 94f529949829..ef8b863a8b2b 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -2565,7 +2565,7 @@ Sequence< document::CmisProperty > CmisPropertiesWindow::GetCmisProperties() con util::DateTime aDateTime( aTmpTime.GetNanoSec(), aTmpTime.GetSec(), aTmpTime.GetMin(), aTmpTime.GetHour(), aTmpDate.GetDay(), aTmpDate.GetMonth(), - aTmpDate.GetYear(), sal_True ); + aTmpDate.GetYear(), true ); seqValue[k] = aDateTime; } aPropertiesSeq[i].Value <<= makeAny( seqValue ); diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index a5f9a04340dc..1d6fe71d8431 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -540,14 +540,14 @@ void FileDialogHelper_Impl::enablePasswordBox( bool bInit ) { uno::Reference< XFilePickerControlAccess > xCtrlAccess( mxFileDlg, UNO_QUERY ); if( mbPwdCheckBoxState ) - xCtrlAccess->setValue( ExtendedFilePickerElementIds::CHECKBOX_PASSWORD, 0, makeAny( sal_True ) ); + xCtrlAccess->setValue( ExtendedFilePickerElementIds::CHECKBOX_PASSWORD, 0, makeAny( true ) ); } } else if( !bWasEnabled && mbIsPwdEnabled ) { uno::Reference< XFilePickerControlAccess > xCtrlAccess( mxFileDlg, UNO_QUERY ); if( mbPwdCheckBoxState ) - xCtrlAccess->setValue( ExtendedFilePickerElementIds::CHECKBOX_PASSWORD, 0, makeAny( sal_True ) ); + xCtrlAccess->setValue( ExtendedFilePickerElementIds::CHECKBOX_PASSWORD, 0, makeAny( true ) ); } else if( bWasEnabled && !mbIsPwdEnabled ) { @@ -556,7 +556,7 @@ void FileDialogHelper_Impl::enablePasswordBox( bool bInit ) Any aValue = xCtrlAccess->getValue( ExtendedFilePickerElementIds::CHECKBOX_PASSWORD, 0 ); bool bPassWord = false; mbPwdCheckBoxState = ( aValue >>= bPassWord ) && bPassWord; - xCtrlAccess->setValue( ExtendedFilePickerElementIds::CHECKBOX_PASSWORD, 0, makeAny( sal_False ) ); + xCtrlAccess->setValue( ExtendedFilePickerElementIds::CHECKBOX_PASSWORD, 0, makeAny( false ) ); } } @@ -1069,7 +1069,7 @@ FileDialogHelper_Impl::FileDialogHelper_Impl( // set multiselection mode if ( nFlags & SFXWB_MULTISELECTION ) - mxFileDlg->setMultiSelectionMode( sal_True ); + mxFileDlg->setMultiSelectionMode( true ); if (mbAddGraphicFilter) // generate graphic filter only on demand { @@ -1082,7 +1082,7 @@ FileDialogHelper_Impl::FileDialogHelper_Impl( mxFileDlg->setTitle( SfxResId( STR_SFX_EXPLORERFILE_EXPORT ).toString() ); try { css::uno::Reference < XFilePickerControlAccess > xCtrlAccess( mxFileDlg, UNO_QUERY_THROW ); - xCtrlAccess->enableControl( ExtendedFilePickerElementIds::LISTBOX_FILTER_SELECTOR, sal_True ); + xCtrlAccess->enableControl( ExtendedFilePickerElementIds::LISTBOX_FILTER_SELECTOR, true ); } catch( const Exception & ) { } } diff --git a/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx index e12c05f88866..3622c9fb7014 100644 --- a/sfx2/source/dialog/mailmodel.cxx +++ b/sfx2/source/dialog/mailmodel.cxx @@ -222,7 +222,7 @@ SfxMailModel::SaveResult SfxMailModel::ShowFilterOptionsDialog( { try { - xModifiable->setModified( sal_False ); + xModifiable->setModified( false ); } catch( css::beans::PropertyVetoException& ) { @@ -612,7 +612,7 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat( { try { - xModifiable->setModified( sal_False ); + xModifiable->setModified( false ); } catch( css::beans::PropertyVetoException& ) { diff --git a/sfx2/source/dialog/partwnd.cxx b/sfx2/source/dialog/partwnd.cxx index 964981ead00d..7c5f4fa87e31 100644 --- a/sfx2/source/dialog/partwnd.cxx +++ b/sfx2/source/dialog/partwnd.cxx @@ -114,7 +114,7 @@ SfxPartDockWnd_Impl::SfxPartDockWnd_Impl css::uno::Reference< css::beans::XPropertySet > xLMPropSet( xFrame->getLayoutManager(), css::uno::UNO_QUERY_THROW ); const OUString aAutomaticToolbars( "AutomaticToolbars" ); - xLMPropSet->setPropertyValue( aAutomaticToolbars, css::uno::Any( sal_False )); + xLMPropSet->setPropertyValue( aAutomaticToolbars, css::uno::Any( false )); } catch( css::uno::RuntimeException& ) { @@ -161,7 +161,7 @@ bool SfxPartDockWnd_Impl::QueryClose() { css::uno::Reference< css::frame::XController > xCtrl = xFrame->getController(); if( xCtrl.is() ) - bClose = xCtrl->suspend( sal_True ); + bClose = xCtrl->suspend( true ); } } diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx b/sfx2/source/doc/SfxDocumentMetaData.cxx index e2ceb4db6f0d..30d53be6d431 100644 --- a/sfx2/source/doc/SfxDocumentMetaData.cxx +++ b/sfx2/source/doc/SfxDocumentMetaData.cxx @@ -2253,7 +2253,7 @@ void SfxDocumentMetaData::createUserDefined() types[12] = ::cppu::UnoType<css::util::Time>::get(); // #i94175#: ODF allows empty user-defined property names! m_xUserDefined.set( - css::beans::PropertyBag::createWithTypes( m_xContext, types, sal_True/*AllowEmptyPropertyName*/, sal_False/*AutomaticAddition*/ ), + css::beans::PropertyBag::createWithTypes( m_xContext, types, true/*AllowEmptyPropertyName*/, false/*AutomaticAddition*/ ), css::uno::UNO_QUERY_THROW); const css::uno::Reference<css::util::XModifyBroadcaster> xMB( diff --git a/sfx2/source/doc/docfac.cxx b/sfx2/source/doc/docfac.cxx index 14031e725345..1f0b3dc41720 100644 --- a/sfx2/source/doc/docfac.cxx +++ b/sfx2/source/doc/docfac.cxx @@ -251,7 +251,7 @@ void SfxObjectFactory::SetSystemTemplate( const OUString& rServiceName, const OU aArgs[0].Name = "FilterName"; aArgs[0].Value <<= aFilterName; aArgs[1].Name = "AsTemplate"; - aArgs[1].Value <<= sal_True; + aArgs[1].Value <<= true; aArgs[2].Name = "URL"; aArgs[2].Value <<= OUString( rTemplateName ); @@ -260,11 +260,11 @@ void SfxObjectFactory::SetSystemTemplate( const OUString& rServiceName, const OU aArgs.realloc( 2 ); aArgs[1].Name = "Overwrite"; - aArgs[1].Value <<= sal_True; + aArgs[1].Value <<= true; uno::Reference< frame::XStorable > xStorable( xLoadable, uno::UNO_QUERY ); xStorable->storeToURL( aUserTemplateURL, aArgs ); - ::comphelper::ConfigurationHelper::writeRelativeKey( xConfig, CONF_PATH, PROP_DEF_TEMPL_CHANGED, uno::makeAny( sal_True )); + ::comphelper::ConfigurationHelper::writeRelativeKey( xConfig, CONF_PATH, PROP_DEF_TEMPL_CHANGED, uno::makeAny( true )); ::comphelper::ConfigurationHelper::flush( xConfig ); } else @@ -273,7 +273,7 @@ void SfxObjectFactory::SetSystemTemplate( const OUString& rServiceName, const OU xSimpleFileAccess->copy( aBackupURL, aUserTemplateURL ); xSimpleFileAccess->kill( aBackupURL ); - ::comphelper::ConfigurationHelper::writeRelativeKey( xConfig, CONF_PATH, PROP_DEF_TEMPL_CHANGED, uno::makeAny( sal_False )); + ::comphelper::ConfigurationHelper::writeRelativeKey( xConfig, CONF_PATH, PROP_DEF_TEMPL_CHANGED, uno::makeAny( false )); ::comphelper::ConfigurationHelper::flush( xConfig ); } } diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx index 07a852a298ba..50cdd58003a0 100644 --- a/sfx2/source/doc/doctempl.cxx +++ b/sfx2/source/doc/doctempl.cxx @@ -726,7 +726,7 @@ bool SfxDocumentTemplates::CopyTo aTarget = Content( aParentURL, aCmdEnv, comphelper::getProcessComponentContext() ); TransferInfo aTransferInfo; - aTransferInfo.MoveData = sal_False; + aTransferInfo.MoveData = false; aTransferInfo.SourceURL = pSource->GetTargetURL(); aTransferInfo.NewTitle = aTitle; aTransferInfo.NameClash = NameClash::OVERWRITE; @@ -798,7 +798,7 @@ bool SfxDocumentTemplates::CopyFrom Sequence< PropertyValue > aArgs( 1 ); aArgs[0].Name = "Hidden"; - aArgs[0].Value <<= sal_True; + aArgs[0].Value <<= true; INetURLObject aTemplURL( rName ); uno::Reference< XDocumentPropertiesSupplier > xDocPropsSupplier; @@ -1553,7 +1553,7 @@ void SfxDocTemplate_Impl::AddRegion( const OUString& rTitle, ResultSetInclude eInclude = INCLUDE_DOCUMENTS_ONLY; Sequence< NumberedSortingInfo > aSortingInfo(1); aSortingInfo.getArray()->ColumnIndex = 1; - aSortingInfo.getArray()->Ascending = sal_True; + aSortingInfo.getArray()->Ascending = true; xResultSet = rContent.createSortedCursor( aProps, aSortingInfo, m_rCompareFactory, eInclude ); } catch ( Exception& ) {} @@ -1588,7 +1588,7 @@ void SfxDocTemplate_Impl::CreateFromHierarchy( Content &rTemplRoot ) ResultSetInclude eInclude = INCLUDE_FOLDERS_ONLY; Sequence< NumberedSortingInfo > aSortingInfo(1); aSortingInfo.getArray()->ColumnIndex = 1; - aSortingInfo.getArray()->Ascending = sal_True; + aSortingInfo.getArray()->Ascending = true; xResultSet = rTemplRoot.createSortedCursor( aProps, aSortingInfo, m_rCompareFactory, eInclude ); } catch ( Exception& ) {} diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx index 14b427b8e4d6..72162892ceb0 100644 --- a/sfx2/source/doc/doctemplates.cxx +++ b/sfx2/source/doc/doctemplates.cxx @@ -1136,7 +1136,7 @@ void SfxDocTplService_Impl::doUpdate() OUString aPropName( PROPERTY_NEEDSUPDATE ); Any aValue; - aValue <<= sal_True; + aValue <<= true; setProperty( maRootContent, aPropName, aValue ); GroupList_Impl aGroupList; @@ -1210,7 +1210,7 @@ void SfxDocTplService_Impl::doUpdate() } aGroupList.clear(); - aValue <<= sal_False; + aValue <<= false; setProperty( maRootContent, aPropName, aValue ); } @@ -2267,7 +2267,7 @@ sal_Bool SAL_CALL SfxDocTplService::storeTemplate( const OUString& GroupName, if ( pImp->init() ) return pImp->storeTemplate( GroupName, TemplateName, Storable ); else - return sal_False; + return false; } @@ -2279,7 +2279,7 @@ sal_Bool SAL_CALL SfxDocTplService::addTemplate( const OUString& rGroupName, if ( pImp->init() ) return pImp->addTemplate( rGroupName, rTemplateName, rSourceURL ); else - return sal_False; + return false; } @@ -2290,7 +2290,7 @@ sal_Bool SAL_CALL SfxDocTplService::removeTemplate( const OUString& rGroupName, if ( pImp->init() ) return pImp->removeTemplate( rGroupName, rTemplateName ); else - return sal_False; + return false; } @@ -2300,12 +2300,12 @@ sal_Bool SAL_CALL SfxDocTplService::renameTemplate( const OUString& rGroupName, throw( uno::RuntimeException, std::exception ) { if ( rOldName == rNewName ) - return sal_True; + return true; if ( pImp->init() ) return pImp->renameTemplate( rGroupName, rOldName, rNewName ); else - return sal_False; + return false; } @@ -2315,7 +2315,7 @@ sal_Bool SAL_CALL SfxDocTplService::addGroup( const OUString& rGroupName ) if ( pImp->init() ) return pImp->addGroup( rGroupName ); else - return sal_False; + return false; } @@ -2325,7 +2325,7 @@ sal_Bool SAL_CALL SfxDocTplService::removeGroup( const OUString& rGroupName ) if ( pImp->init() ) return pImp->removeGroup( rGroupName ); else - return sal_False; + return false; } @@ -2334,12 +2334,12 @@ sal_Bool SAL_CALL SfxDocTplService::renameGroup( const OUString& rOldName, throw( uno::RuntimeException, std::exception ) { if ( rOldName == rNewName ) - return sal_True; + return true; if ( pImp->init() ) return pImp->renameGroup( rOldName, rNewName ); else - return sal_False; + return false; } diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx index fc63a1bf9820..6347ae962613 100644 --- a/sfx2/source/doc/guisaveas.cxx +++ b/sfx2/source/doc/guisaveas.cxx @@ -971,7 +971,7 @@ bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode, uno::Reference < view::XSelectionSupplier > xSel( GetModel()->getCurrentController(), uno::UNO_QUERY ); if ( xSel.is() && xSel->getSelection().hasValue() ) - GetMediaDescr()[OUString("SelectionOnly")] <<= sal_True; + GetMediaDescr()[OUString("SelectionOnly")] <<= true; // This is a temporary hardcoded solution must be removed when // dialogs do not need parameters in SidSet representation any more diff --git a/sfx2/source/doc/iframe.cxx b/sfx2/source/doc/iframe.cxx index 32c312e7e94f..1094114d34e0 100644 --- a/sfx2/source/doc/iframe.cxx +++ b/sfx2/source/doc/iframe.cxx @@ -203,10 +203,10 @@ throw( uno::RuntimeException, std::exception ) if ( xDisp.is() ) xDisp->dispatch( aTargetURL, aProps ); - return sal_True; + return true; } - return sal_False; + return false; } void SAL_CALL IFrameObject::cancel() throw( css::uno::RuntimeException, std::exception ) @@ -215,7 +215,7 @@ void SAL_CALL IFrameObject::cancel() throw( css::uno::RuntimeException, std::exc { uno::Reference < util::XCloseable > xClose( mxFrame, uno::UNO_QUERY ); if ( xClose.is() ) - xClose->close( sal_True ); + xClose->close( true ); mxFrame = nullptr; } catch (const uno::Exception&) diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx index 87769d5e551e..545165c37909 100644 --- a/sfx2/source/doc/objcont.cxx +++ b/sfx2/source/doc/objcont.cxx @@ -227,7 +227,7 @@ void SfxObjectShell::UpdateTime_Impl( { // Get old time from documentinfo const sal_Int32 secs = i_xDocProps->getEditingDuration(); - util::Duration editDuration(sal_False, 0, 0, 0, + util::Duration editDuration(false, 0, 0, 0, secs/3600, (secs%3600)/60, secs%60, 0); // Initialize some local member! Its necessary for follow operations! diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx index de663cfb0b11..c47141433357 100644 --- a/sfx2/source/doc/objserv.cxx +++ b/sfx2/source/doc/objserv.cxx @@ -227,7 +227,7 @@ SfxInstanceCloseGuard_Impl::~SfxInstanceCloseGuard_Impl() m_pPreventer->SetPreventClose( false ); if ( m_pPreventer->HasOwnership() ) - m_xCloseable->close( sal_True ); // TODO: do it asynchronously + m_xCloseable->close( true ); // TODO: do it asynchronously } } catch( uno::Exception& ) @@ -339,7 +339,7 @@ void SfxObjectShell::CancelCheckOut( ) uno::Reference< util::XModifiable > xModifiable( GetModel( ), uno::UNO_QUERY ); if ( xModifiable.is( ) ) - xModifiable->setModified( sal_False ); + xModifiable->setModified( false ); } catch ( const uno::RuntimeException& e ) { @@ -362,7 +362,7 @@ void SfxObjectShell::CheckIn( ) xCmisDoc->checkIn( bMajor, sComment ); uno::Reference< util::XModifiable > xModifiable( GetModel( ), uno::UNO_QUERY ); if ( xModifiable.is( ) ) - xModifiable->setModified( sal_False ); + xModifiable->setModified( false ); } } catch ( const uno::RuntimeException& e ) diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index 62edc749a5de..9c198b31b186 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -1785,7 +1785,7 @@ bool SfxObjectShell::DisconnectStorage_Impl( SfxMedium& rSrcMedium, SfxMedium& r // the following call will only compare stream sizes // TODO/LATER: this is a very risky part, since if the URL contents are different from the storage // contents, the storage will be broken - xOptStorage->attachToURL( aBackupURL, sal_True ); + xOptStorage->attachToURL( aBackupURL, true ); // the storage is successfully attached to backup, thus it is owned by the document not by the medium rSrcMedium.CanDisposeStorage_Impl( false ); @@ -2282,7 +2282,7 @@ bool SfxObjectShell::ImportFrom(SfxMedium& rMedium, assert(xPers.is() && "Modified object without persistence!"); // store it before resetting modified! xPers->storeOwn(); - xModifiable->setModified(sal_False); + xModifiable->setModified(false); } } } diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx index eddcb68f0057..8d043335e6fd 100644 --- a/sfx2/source/doc/objxtor.cxx +++ b/sfx2/source/doc/objxtor.cxx @@ -413,7 +413,7 @@ bool SfxObjectShell::CloseInternal() { try { - xCloseable->close( sal_True ); + xCloseable->close( true ); } catch (const Exception&) { diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index a682f42a14d4..1772034bcf46 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -487,7 +487,7 @@ SfxSaveGuard::~SfxSaveGuard() { Reference< util::XCloseable > xClose(m_xModel, UNO_QUERY); if (xClose.is()) - xClose->close(sal_True); + xClose->close(true); } catch(const util::CloseVetoException&) {} @@ -736,7 +736,7 @@ void SAL_CALL SfxBaseModel::dispose() throw(RuntimeException, std::exception) // and try to make it work (may be really disposed later!) try { - close( sal_True ); + close( true ); } catch ( util::CloseVetoException& ) { @@ -874,7 +874,7 @@ sal_Bool SAL_CALL SfxBaseModel::attachResource( const OUString& m_pData->m_pObjectShell->SetCreateMode_Impl( SfxObjectCreateMode::EMBEDDED ); } - return sal_True; + return true; } if ( m_pData->m_pObjectShell.Is() ) @@ -938,7 +938,7 @@ sal_Bool SAL_CALL SfxBaseModel::attachResource( const OUString& } } - return sal_True ; + return true ; } @@ -2233,51 +2233,51 @@ sal_Bool SAL_CALL SfxBaseModel::isDataFlavorSupported( const datatransfer::DataF if ( aFlavor.MimeType == "application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"" ) { if ( aFlavor.DataType == cppu::UnoType<Sequence< sal_Int8 >>::get() ) - return sal_True; + return true; } else if ( aFlavor.MimeType == "application/x-openoffice-highcontrast-gdimetafile;windows_formatname=\"GDIMetaFile\"" ) { if ( aFlavor.DataType == cppu::UnoType<Sequence< sal_Int8 >>::get() ) - return sal_True; + return true; } else if ( aFlavor.MimeType == "application/x-openoffice-emf;windows_formatname=\"Image EMF\"" ) { if ( aFlavor.DataType == cppu::UnoType<Sequence< sal_Int8 >>::get() ) - return sal_True; + return true; else if ( GraphicHelper::supportsMetaFileHandle_Impl() && aFlavor.DataType == cppu::UnoType<sal_uInt64>::get()) - return sal_True; + return true; } else if ( aFlavor.MimeType == "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" ) { if ( aFlavor.DataType == cppu::UnoType<Sequence< sal_Int8 >>::get() ) - return sal_True; + return true; else if ( GraphicHelper::supportsMetaFileHandle_Impl() && aFlavor.DataType == cppu::UnoType<sal_uInt64>::get()) - return sal_True; + return true; } else if ( aFlavor.MimeType == "application/x-openoffice-objectdescriptor-xml;windows_formatname=\"Star Object Descriptor (XML)\"" ) { if ( aFlavor.DataType == cppu::UnoType<Sequence< sal_Int8 >>::get() ) - return sal_True; + return true; } else if ( aFlavor.MimeType == "application/x-openoffice-embed-source;windows_formatname=\"Star EMBS\"" ) { if ( aFlavor.DataType == cppu::UnoType<Sequence< sal_Int8 >>::get() ) - return sal_True; + return true; } else if ( aFlavor.MimeType == "application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"" ) { if ( aFlavor.DataType == cppu::UnoType<Sequence< sal_Int8 >>::get() ) - return sal_True; + return true; } else if ( aFlavor.MimeType == "image/png" ) { if ( aFlavor.DataType == cppu::UnoType<Sequence< sal_Int8 >>::get() ) - return sal_True; + return true; } - return sal_False; + return false; } @@ -2326,7 +2326,7 @@ sal_Bool SAL_CALL SfxBaseModel::getAllowMacroExecution() throw (RuntimeException if ( m_pData->m_pObjectShell ) return m_pData->m_pObjectShell->AdjustMacroMode(); - return sal_False; + return false; } @@ -2517,7 +2517,7 @@ void SAL_CALL SfxBaseModel::checkIn( sal_Bool bIsMajor, const OUString& rMessage aProps[1].Name = "VersionComment"; aProps[1].Value = makeAny( rMessage ); aProps[2].Name = "CheckIn"; - aProps[2].Value = makeAny( sal_True ); + aProps[2].Value = makeAny( true ); OUString sName( pMedium->GetName( ) ); storeSelf( aProps ); diff --git a/sfx2/source/doc/sfxmodelfactory.cxx b/sfx2/source/doc/sfxmodelfactory.cxx index 8d3212a49740..5a03d07880d4 100644 --- a/sfx2/source/doc/sfxmodelfactory.cxx +++ b/sfx2/source/doc/sfxmodelfactory.cxx @@ -154,9 +154,9 @@ namespace sfx2 Reference< XInterface > SAL_CALL SfxModelFactory::createInstanceWithArguments( const Sequence< Any >& _rArguments ) throw (Exception, RuntimeException, std::exception) { ::comphelper::NamedValueCollection aArgs( _rArguments ); - const bool bEmbeddedObject = aArgs.getOrDefault( "EmbeddedObject", sal_False ); - const bool bScriptSupport = aArgs.getOrDefault( "EmbeddedScriptSupport", sal_True ); - const bool bDocRecoverySupport = aArgs.getOrDefault( "DocumentRecoverySupport", sal_True ); + const bool bEmbeddedObject = aArgs.getOrDefault( "EmbeddedObject", false ); + const bool bScriptSupport = aArgs.getOrDefault( "EmbeddedScriptSupport", true ); + const bool bDocRecoverySupport = aArgs.getOrDefault( "DocumentRecoverySupport", true ); SfxModelFlags nCreationFlags = ( bEmbeddedObject ? SfxModelFlags::EMBEDDED_OBJECT : SfxModelFlags::NONE ) diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx index c959c029d9eb..62c49ed44ee4 100644 --- a/sfx2/source/doc/templatedlg.cxx +++ b/sfx2/source/doc/templatedlg.cxx @@ -710,7 +710,7 @@ IMPL_LINK_TYPED(SfxTemplateManagerDlg, OpenTemplateHdl, ThumbnailViewItem*, pIte { uno::Sequence< PropertyValue > aArgs(4); aArgs[0].Name = "AsTemplate"; - aArgs[0].Value <<= sal_True; + aArgs[0].Value <<= true; aArgs[1].Name = "MacroExecutionMode"; aArgs[1].Value <<= MacroExecMode::USE_CONFIG; aArgs[2].Name = "UpdateDocMode"; @@ -1151,7 +1151,7 @@ void SfxTemplateManagerDlg::OnTemplateEdit () { uno::Sequence< PropertyValue > aArgs(3); aArgs[0].Name = "AsTemplate"; - aArgs[0].Value <<= sal_False; + aArgs[0].Value <<= false; aArgs[1].Name = "MacroExecutionMode"; aArgs[1].Value <<= MacroExecMode::USE_CONFIG; aArgs[2].Name = "UpdateDocMode"; diff --git a/sfx2/source/notify/eventsupplier.cxx b/sfx2/source/notify/eventsupplier.cxx index b232644c2fbd..a2796becd1f8 100644 --- a/sfx2/source/notify/eventsupplier.cxx +++ b/sfx2/source/notify/eventsupplier.cxx @@ -147,10 +147,10 @@ sal_Bool SAL_CALL SfxEvents_Impl::hasByName( const OUString& aName ) throw ( uno for ( long i=0; i<nCount; i++ ) { if ( maEventNames[i] == aName ) - return sal_True; + return true; } - return sal_False; + return false; } @@ -168,9 +168,9 @@ sal_Bool SAL_CALL SfxEvents_Impl::hasElements() throw ( uno::RuntimeException, s ::osl::MutexGuard aGuard( maMutex ); if ( maEventNames.getLength() ) - return sal_True; + return true; else - return sal_False; + return false; } void SfxEvents_Impl::Execute( uno::Any& aEventData, const document::DocumentEvent& aTrigger, SfxObjectShell* pDoc ) diff --git a/sfx2/source/sidebar/Theme.cxx b/sfx2/source/sidebar/Theme.cxx index 5ed7443f0707..0d760796dc3c 100644 --- a/sfx2/source/sidebar/Theme.cxx +++ b/sfx2/source/sidebar/Theme.cxx @@ -443,7 +443,7 @@ void SAL_CALL Theme::setPropertyValue ( const beans::PropertyChangeEvent aEvent( static_cast<XWeak*>(this), rsPropertyName, - sal_False, + false, eItem, aOldValue, rValue); @@ -649,13 +649,13 @@ sal_Bool SAL_CALL Theme::hasPropertyByName (const ::rtl::OUString& rsPropertyNam { PropertyNameToIdMap::const_iterator iId (maPropertyNameToIdMap.find(rsPropertyName)); if (iId == maPropertyNameToIdMap.end()) - return sal_False; + return false; const PropertyType eType (GetPropertyType(iId->second)); if (eType == PT_Invalid) - return sal_False; + return false; - return sal_True; + return true; } void Theme::SetupPropertyMaps() diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index 93302a84d029..3e2855b7d94f 100644 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -550,7 +550,7 @@ throw ( css::uno::RuntimeException, std::exception ) // XSubToolbarController sal_Bool SAL_CALL SfxToolBoxControl::opensSubToolbar() throw (css::uno::RuntimeException, std::exception) { - return sal_False; + return false; } OUString SAL_CALL SfxToolBoxControl::getSubToolbarName() throw (css::uno::RuntimeException, std::exception) diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx index 6850a4ef0afd..7d78539a3235 100644 --- a/sfx2/source/view/frame.cxx +++ b/sfx2/source/view/frame.cxx @@ -132,7 +132,7 @@ bool SfxFrame::DoClose() { Reference< XCloseable > xCloseable ( pImp->xFrame, UNO_QUERY ); if ( (!GetCurrentDocument() || !GetCurrentDocument()->Get_Impl()->bDisposing ) && xCloseable.is()) - xCloseable->close(sal_True); + xCloseable->close(true); else if ( pImp->xFrame.is() ) { Reference < XFrame > xFrame = pImp->xFrame; @@ -721,7 +721,7 @@ void SfxFrame::Appear() { GetCurrentViewFrame()->Show(); GetWindow().Show(); - pImp->xFrame->getContainerWindow()->setVisible( sal_True ); + pImp->xFrame->getContainerWindow()->setVisible( true ); if ( pParentFrame ) pParentFrame->Appear(); Reference < css::awt::XTopWindow > xTopWindow( pImp->xFrame->getContainerWindow(), UNO_QUERY ); diff --git a/sfx2/source/view/frmload.cxx b/sfx2/source/view/frmload.cxx index 56deaedc0e73..1c4e2756a1f9 100644 --- a/sfx2/source/view/frmload.cxx +++ b/sfx2/source/view/frmload.cxx @@ -219,7 +219,7 @@ std::shared_ptr<const SfxFilter> SfxFrameLoader_Impl::impl_detectFilterForURL( c aNewArgs.put( "StatusIndicator", i_rDescriptor.get( "StatusIndicator" ) ); Sequence< PropertyValue > aQueryArgs( aNewArgs.getPropertyValues() ); - OUString sType = xDetect->queryTypeByDescriptor( aQueryArgs, sal_True ); + OUString sType = xDetect->queryTypeByDescriptor( aQueryArgs, true ); if ( !sType.isEmpty() ) { std::shared_ptr<const SfxFilter> pFilter = rMatcher.GetFilter4EA( sType ); @@ -443,7 +443,7 @@ bool SfxFrameLoader_Impl::impl_determineTemplateDocument( ::comphelper::NamedVal // load the template document, but, well, "as template" io_rDescriptor.put( "FilterName", OUString( pTemplateFilter->GetName() ) ); io_rDescriptor.put( "FileName", OUString( sTemplateURL ) ); - io_rDescriptor.put( "AsTemplate", sal_True ); + io_rDescriptor.put( "AsTemplate", true ); // #i21583# // the DocumentService property will finally be used to create the document. Thus, override any possibly @@ -732,7 +732,7 @@ sal_Bool SAL_CALL SfxFrameLoader_Impl::load( const Sequence< PropertyValue >& rA catch ( Exception& ) { const Any aError( ::cppu::getCaughtException() ); - if ( !aDescriptor.getOrDefault( "Silent", sal_False ) ) + if ( !aDescriptor.getOrDefault( "Silent", false ) ) impl_handleCaughtError_nothrow( aError, aDescriptor ); } @@ -742,7 +742,7 @@ sal_Bool SAL_CALL SfxFrameLoader_Impl::load( const Sequence< PropertyValue >& rA try { const Reference< XCloseable > xCloseable( xModel, UNO_QUERY_THROW ); - xCloseable->close( sal_True ); + xCloseable->close( true ); } catch ( Exception& ) { diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx index a586a26f3187..de5043e8cfd0 100644 --- a/sfx2/source/view/ipclient.cxx +++ b/sfx2/source/view/ipclient.cxx @@ -245,7 +245,7 @@ void SAL_CALL SfxInPlaceClient_Impl::saveObject() // set non-reschedule progress to prevent problems when asynchronous calls are made // during storing of the embedded object uno::Reference< task::XStatusIndicatorFactory > xStatusIndicatorFactory = - task::StatusIndicatorFactory::createWithFrame( xContext, xFrame, sal_True/*DisableReschedule*/, sal_False/*AllowParentShow*/ ); + task::StatusIndicatorFactory::createWithFrame( xContext, xFrame, true/*DisableReschedule*/, false/*AllowParentShow*/ ); uno::Reference< beans::XPropertySet > xPropSet( xFrame, uno::UNO_QUERY ); if ( xPropSet.is() ) @@ -333,9 +333,9 @@ sal_Bool SAL_CALL SfxInPlaceClient_Impl::canInplaceActivate() // we don't want to switch directly from outplace to inplace mode if ( m_xObject->getCurrentState() == embed::EmbedStates::ACTIVE || m_nAspect == embed::Aspects::MSOLE_ICON ) - return sal_False; + return false; - return sal_True; + return true; } diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx index 1fb2be34c5e7..2c8992b53f5c 100644 --- a/sfx2/source/view/sfxbasecontroller.cxx +++ b/sfx2/source/view/sfxbasecontroller.cxx @@ -600,13 +600,13 @@ sal_Bool SAL_CALL SfxBaseController::attachModel( const Reference< frame::XModel { // don't allow to reattach a model! OSL_FAIL("Can't reattach model!"); - return sal_False; + return false; } Reference < util::XCloseBroadcaster > xCloseable( xModel, uno::UNO_QUERY ); if ( xCloseable.is() ) xCloseable->addCloseListener( m_pData->m_xCloseListener ); - return sal_True; + return true; } @@ -619,18 +619,18 @@ sal_Bool SAL_CALL SfxBaseController::suspend( sal_Bool bSuspend ) throw( Runtime // ignore duplicate calls, which doesn't change anything real if (bool(bSuspend) == m_pData->m_bSuspendState) - return sal_True; + return true; if ( bSuspend ) { if ( !m_pData->m_pViewShell ) { m_pData->m_bSuspendState = true; - return sal_True; + return true; } if ( !m_pData->m_pViewShell->PrepareClose() ) - return sal_False; + return false; if ( getFrame().is() ) getFrame()->removeFrameActionListener( m_pData->m_xListener ) ; @@ -663,7 +663,7 @@ sal_Bool SAL_CALL SfxBaseController::suspend( sal_Bool bSuspend ) throw( Runtime } m_pData->m_bSuspendState = false; - return sal_True ; + return true ; } } @@ -1267,7 +1267,7 @@ void SfxBaseController::ConnectSfxFrame_Impl( const ConnectSfxFrame i_eConnect ) Reference< beans::XPropertySet > xFrameProps( m_pData->m_xFrame, uno::UNO_QUERY_THROW ); Reference< beans::XPropertySet > xLayouterProps( xFrameProps->getPropertyValue("LayoutManager"), uno::UNO_QUERY_THROW ); - xLayouterProps->setPropertyValue("PreserveContentSize", uno::makeAny( sal_True ) ); + xLayouterProps->setPropertyValue("PreserveContentSize", uno::makeAny( true ) ); } catch (const uno::Exception&) { diff --git a/sfx2/source/view/userinputinterception.cxx b/sfx2/source/view/userinputinterception.cxx index 9017b0317397..54062262b4bb 100644 --- a/sfx2/source/view/userinputinterception.cxx +++ b/sfx2/source/view/userinputinterception.cxx @@ -104,7 +104,7 @@ namespace sfx2 rEvent.X = rEvt.GetPosPixel().X(); rEvent.Y = rEvt.GetPosPixel().Y(); rEvent.ClickCount = rEvt.GetClicks(); - rEvent.PopupTrigger = sal_False; + rEvent.PopupTrigger = false; } } diff --git a/sfx2/source/view/viewfrm2.cxx b/sfx2/source/view/viewfrm2.cxx index 3038b3bad1bc..81ada85c2420 100644 --- a/sfx2/source/view/viewfrm2.cxx +++ b/sfx2/source/view/viewfrm2.cxx @@ -255,7 +255,7 @@ void SfxViewFrame::Exec_Impl(SfxRequest &rReq ) bClosed = false; try { - xTask->close(sal_True); + xTask->close(true); bClosed = true; } catch (css::lang::DisposedException &) { diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx index 12018db5cb5c..a806be450daa 100644 --- a/sfx2/source/view/viewprn.cxx +++ b/sfx2/source/view/viewprn.cxx @@ -134,7 +134,7 @@ SfxPrinterController::SfxPrinterController( const VclPtr<Printer>& i_rPrinter, aRenderOptions[1].Name = "View" ; aRenderOptions[1].Value = i_rViewProp; aRenderOptions[2].Name = "IsPrinter"; - aRenderOptions[2].Value <<= sal_True; + aRenderOptions[2].Value <<= true; try { Sequence< beans::PropertyValue > aRenderParms( mxRenderable->getRenderer( 0 , getSelectionObject(), aRenderOptions ) ); @@ -163,7 +163,7 @@ SfxPrinterController::SfxPrinterController( const VclPtr<Printer>& i_rPrinter, // set some job parameters setValue( "IsApi", makeAny( i_bApi ) ); setValue( "IsDirect", makeAny( i_bDirect ) ); - setValue( "IsPrinter", makeAny( sal_True ) ); + setValue( "IsPrinter", makeAny( true ) ); setValue( "View", i_rViewProp ); } |