diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2016-04-20 17:19:22 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-04-20 17:25:50 +0200 |
commit | 259ece83e9b114ccc8403bbde97e5b11d4319865 (patch) | |
tree | 31853733c2027b58e2b9db23c0d5943e16dadb3c /sdext | |
parent | 0003e99b393e817ff3cd753f3798012d0ab2f8fb (diff) |
loplugin:salbool: Automatic rewrite of sal_False/True
Change-Id: I0a24f0d6fa58407f9e365a5c812743151b88513b
Diffstat (limited to 'sdext')
27 files changed, 92 insertions, 92 deletions
diff --git a/sdext/source/minimizer/fileopendialog.cxx b/sdext/source/minimizer/fileopendialog.cxx index 076cff597b90..13728bc5cba9 100644 --- a/sdext/source/minimizer/fileopendialog.cxx +++ b/sdext/source/minimizer/fileopendialog.cxx @@ -56,7 +56,7 @@ using namespace ::com::sun::star::ui::dialogs; FileOpenDialog::FileOpenDialog( const Reference< XComponentContext >& rxContext ) { mxFilePicker = FilePicker::createWithMode( rxContext, TemplateDescription::FILESAVE_AUTOEXTENSION); - mxFilePicker->setMultiSelectionMode( sal_False ); + mxFilePicker->setMultiSelectionMode( false ); Reference< XFilePickerControlAccess > xAccess( mxFilePicker, UNO_QUERY ); if ( xAccess.is() ) diff --git a/sdext/source/minimizer/impoptimizer.cxx b/sdext/source/minimizer/impoptimizer.cxx index 4f5bcbd901d5..54580c2f52ac 100644 --- a/sdext/source/minimizer/impoptimizer.cxx +++ b/sdext/source/minimizer/impoptimizer.cxx @@ -454,7 +454,7 @@ void CompressGraphics( ImpOptimizer& rOptimizer, const Reference< XComponentCont { if ( !aSize.Width || !aSize.Height ) { - rxPropertySet->setPropertyValue( "FillBitmapLogicalSize", Any( sal_True ) ); + rxPropertySet->setPropertyValue( "FillBitmapLogicalSize", Any( true ) ); rxPropertySet->setPropertyValue( "FillBitmapSizeX", Any( aGraphicUserIter->maLogicalSize.Width ) ); rxPropertySet->setPropertyValue( "FillBitmapSizeY", Any( aGraphicUserIter->maLogicalSize.Height ) ); } @@ -717,7 +717,7 @@ void ImpOptimizer::Optimize( const Sequence< PropertyValue >& rArguments ) if ( mbOpenNewDocument && xSelf.is() ) { Reference< awt::XWindow > xContainerWindow( xSelf->getContainerWindow() ); - xContainerWindow->setVisible( sal_True ); + xContainerWindow->setVisible( true ); } else { diff --git a/sdext/source/minimizer/informationdialog.cxx b/sdext/source/minimizer/informationdialog.cxx index 4409c78f89f9..3f640611cdca 100644 --- a/sdext/source/minimizer/informationdialog.cxx +++ b/sdext/source/minimizer/informationdialog.cxx @@ -133,7 +133,7 @@ OUString InsertCheckBox( InformationDialog& rInformationDialog, const OUString& OUString("Width") }; Any pValues[] = { - Any( sal_True ), + Any( true ), Any( nHeight ), Any( rLabel ), Any( nXPos ), @@ -168,7 +168,7 @@ OUString InsertButton( InformationDialog& rInformationDialog, const OUString& rC OUString("Width") }; Any pValues[] = { - Any( sal_True ), + Any( true ), Any( nHeight ), Any( rInformationDialog.getString( nResID ) ), Any( nXPos ), @@ -218,9 +218,9 @@ void InformationDialog::InitDialog() OUString("Width") }; Any pValues[] = { - Any( sal_True ), + Any( true ), Any( nDialogHeight ), - Any( sal_True ), + Any( true ), Any( sal_Int32( 245 ) ), Any( sal_Int32( 115 ) ), Any( getString( STR_SUN_OPTIMIZATION_WIZARD2 ) ), @@ -265,7 +265,7 @@ void InformationDialog::InitDialog() const OUString sFileProtocol( "file:///" ); aPresentationURL.Complete = sFileProtocol.concat( aURL.Name ); - aTitle = xURLTransformer->getPresentation( aPresentationURL, sal_False ); + aTitle = xURLTransformer->getPresentation( aPresentationURL, false ); if ( aTitle.match( sFileProtocol ) ) aTitle = aTitle.replaceAt( 0, sFileProtocol.getLength(), OUString() ); diff --git a/sdext/source/minimizer/optimizerdialog.cxx b/sdext/source/minimizer/optimizerdialog.cxx index 95e65fd11d56..7a39b89ba388 100644 --- a/sdext/source/minimizer/optimizerdialog.cxx +++ b/sdext/source/minimizer/optimizerdialog.cxx @@ -57,9 +57,9 @@ void OptimizerDialog::InitDialog() OUString("Width") }; Any pValues[] = { - Any( sal_True ), + Any( true ), Any( sal_Int32( DIALOG_HEIGHT ) ), - Any( sal_True ), + Any( true ), Any( sal_Int32( 200 ) ), Any( sal_Int32( 52 ) ), Any( getString( STR_SUN_OPTIMIZATION_WIZARD2 ) ), @@ -325,7 +325,7 @@ void OptimizerDialog::UpdateStatus( const css::uno::Sequence< css::beans::Proper OUString sStatus; if ( *pVal >>= sStatus ) { - setControlProperty( "FixedText1Pg4", "Enabled", Any( sal_True ) ); + setControlProperty( "FixedText1Pg4", "Enabled", Any( true ) ); setControlProperty( "FixedText1Pg4", "Label", Any( getString( TKGet( sStatus ) ) ) ); } } @@ -492,11 +492,11 @@ void ActionListener::actionPerformed( const ActionEvent& rEvent ) mrOptimizerDialog.SwitchPage( ITEM_ID_SUMMARY ); mrOptimizerDialog.DisablePage( ITEM_ID_SUMMARY ); - mrOptimizerDialog.setControlProperty( "btnNavBack", "Enabled", Any( sal_False ) ); - mrOptimizerDialog.setControlProperty( "btnNavNext", "Enabled", Any( sal_False ) ); - mrOptimizerDialog.setControlProperty( "btnNavFinish", "Enabled", Any( sal_False ) ); - mrOptimizerDialog.setControlProperty( "btnNavCancel", "Enabled", Any( sal_False ) ); - mrOptimizerDialog.setControlProperty( "FixedText0Pg4", "Enabled", Any( sal_True ) ); + mrOptimizerDialog.setControlProperty( "btnNavBack", "Enabled", Any( false ) ); + mrOptimizerDialog.setControlProperty( "btnNavNext", "Enabled", Any( false ) ); + mrOptimizerDialog.setControlProperty( "btnNavFinish", "Enabled", Any( false ) ); + mrOptimizerDialog.setControlProperty( "btnNavCancel", "Enabled", Any( false ) ); + mrOptimizerDialog.setControlProperty( "FixedText0Pg4", "Enabled", Any( true ) ); // check if we have to open the FileDialog bool bSuccessfullyExecuted = true; @@ -595,10 +595,10 @@ void ActionListener::actionPerformed( const ActionEvent& rEvent ) } else { - mrOptimizerDialog.setControlProperty( "btnNavBack", "Enabled", Any( sal_True ) ); - mrOptimizerDialog.setControlProperty( "btnNavNext", "Enabled", Any( sal_False ) ); - mrOptimizerDialog.setControlProperty( "btnNavFinish", "Enabled", Any( sal_True ) ); - mrOptimizerDialog.setControlProperty( "btnNavCancel", "Enabled", Any( sal_True ) ); + mrOptimizerDialog.setControlProperty( "btnNavBack", "Enabled", Any( true ) ); + mrOptimizerDialog.setControlProperty( "btnNavNext", "Enabled", Any( false ) ); + mrOptimizerDialog.setControlProperty( "btnNavFinish", "Enabled", Any( true ) ); + mrOptimizerDialog.setControlProperty( "btnNavCancel", "Enabled", Any( true ) ); mrOptimizerDialog.EnablePage( ITEM_ID_SUMMARY ); } } diff --git a/sdext/source/minimizer/optimizerdialogcontrols.cxx b/sdext/source/minimizer/optimizerdialogcontrols.cxx index 6c266f69e7c9..65a86fed806d 100644 --- a/sdext/source/minimizer/optimizerdialogcontrols.cxx +++ b/sdext/source/minimizer/optimizerdialogcontrols.cxx @@ -588,8 +588,8 @@ void OptimizerDialog::UpdateControlStatesPage4() bool bSaveAs( GetConfigProperty( TK_SaveAs, true ) ); if ( mbIsReadonly ) { - setControlProperty( "RadioButton0Pg4", "State", Any( (sal_Int16)( sal_False ) ) ); - setControlProperty( "RadioButton1Pg4", "State", Any( (sal_Int16)( sal_True ) ) ); + setControlProperty( "RadioButton0Pg4", "State", Any( (sal_Int16)( false ) ) ); + setControlProperty( "RadioButton1Pg4", "State", Any( (sal_Int16)( true ) ) ); } else { diff --git a/sdext/source/minimizer/unodialog.cxx b/sdext/source/minimizer/unodialog.cxx index 325a1966d797..d01bce9e3e05 100644 --- a/sdext/source/minimizer/unodialog.cxx +++ b/sdext/source/minimizer/unodialog.cxx @@ -71,8 +71,8 @@ UnoDialog::~UnoDialog() void UnoDialog::execute() { - mxDialog->setEnable( sal_True ); - mxDialog->setVisible( sal_True ); + mxDialog->setEnable( true ); + mxDialog->setVisible( true ); mxDialog->execute(); } @@ -86,7 +86,7 @@ void UnoDialog::endExecute( bool bStatus ) Reference< XWindowPeer > UnoDialog::createWindowPeer( Reference< XWindowPeer > xParentPeer ) throw ( Exception ) { - mxDialog->setVisible( sal_False ); + mxDialog->setVisible( false ); Reference< XToolkit > xToolkit( Toolkit::create( mxContext ), UNO_QUERY_THROW ); if ( !xParentPeer.is() ) xParentPeer = xToolkit->getDesktopWindow(); @@ -311,14 +311,14 @@ Any UnoDialog::getControlProperty( const OUString& rControlName, const OUString& void UnoDialog::enableControl( const OUString& rControlName ) { const OUString sEnabled( "Enabled" ); - setControlProperty( rControlName, sEnabled, Any( sal_True ) ); + setControlProperty( rControlName, sEnabled, Any( true ) ); } void UnoDialog::disableControl( const OUString& rControlName ) { const OUString sEnabled( "Enabled" ); - setControlProperty( rControlName, sEnabled, Any( sal_False ) ); + setControlProperty( rControlName, sEnabled, Any( false ) ); } diff --git a/sdext/source/pdfimport/pdfiadaptor.cxx b/sdext/source/pdfimport/pdfiadaptor.cxx index 98123d525d76..0ac7b9b58f42 100644 --- a/sdext/source/pdfimport/pdfiadaptor.cxx +++ b/sdext/source/pdfimport/pdfiadaptor.cxx @@ -311,7 +311,7 @@ sal_Bool SAL_CALL PDFIRawAdaptor::importer( const uno::Sequence< beans::Property pAttribs->Value >>= aFilterOptions; } if( !xInput.is() ) - return sal_False; + return false; XmlEmitterSharedPtr pEmitter = createSaxEmitter(rHdl); const bool bSuccess = parse(xInput, xInteractionHandler, diff --git a/sdext/source/presenter/PresenterAccessibility.cxx b/sdext/source/presenter/PresenterAccessibility.cxx index 0db850827f28..2ef842a8f3e0 100644 --- a/sdext/source/presenter/PresenterAccessibility.cxx +++ b/sdext/source/presenter/PresenterAccessibility.cxx @@ -1393,9 +1393,9 @@ sal_Bool SAL_CALL AccessibleStateSet::containsAll (const css::uno::Sequence<sal_ for (sal_Int32 nIndex=0,nCount=rStateSet.getLength(); nIndex<nCount; ++nIndex) { if ((mnStateSet & GetStateMask(rStateSet[nIndex])) == 0) - return sal_False; + return false; } - return sal_True; + return true; } css::uno::Sequence<sal_Int16> SAL_CALL AccessibleStateSet::getStates() @@ -1456,9 +1456,9 @@ sal_Bool SAL_CALL AccessibleRelationSet::containsRelation (sal_Int16 nRelationTy ++iRelation) { if (iRelation->RelationType == nRelationType) - return sal_True; + return true; } - return sal_False; + return false; } AccessibleRelation SAL_CALL AccessibleRelationSet::getRelationByType (sal_Int16 nRelationType) @@ -1544,10 +1544,10 @@ sal_Bool SAL_CALL PresenterAccessible::AccessibleParagraph::setCaretPosition (sa if (mpParagraph) { mpParagraph->SetCaretPosition(nIndex); - return sal_True; + return true; } else - return sal_False; + return false; } sal_Unicode SAL_CALL PresenterAccessible::AccessibleParagraph::getCharacter (sal_Int32 nIndex) @@ -1759,7 +1759,7 @@ sal_Bool SAL_CALL PresenterAccessible::AccessibleParagraph::copyText ( // this here. (void)nStartIndex; (void)nEndIndex; - return sal_False; + return false; } //----- protected ------------------------------------------------------------- diff --git a/sdext/source/presenter/PresenterButton.cxx b/sdext/source/presenter/PresenterButton.cxx index 5193ad3162e5..454083ac57aa 100644 --- a/sdext/source/presenter/PresenterButton.cxx +++ b/sdext/source/presenter/PresenterButton.cxx @@ -121,10 +121,10 @@ PresenterButton::PresenterButton ( if (mxPresenterHelper.is()) mxWindow = mxPresenterHelper->createWindow(rxParentWindow, - sal_False, - sal_False, - sal_False, - sal_False); + false, + false, + false, + false); // Make the background transparent. Reference<awt::XWindowPeer> xPeer (mxWindow, UNO_QUERY_THROW); @@ -133,7 +133,7 @@ PresenterButton::PresenterButton ( xPeer->setBackground(0xff000000); } - mxWindow->setVisible(sal_True); + mxWindow->setVisible(true); mxWindow->addWindowListener(this); mxWindow->addPaintListener(this); mxWindow->addMouseListener(this); @@ -288,7 +288,7 @@ void SAL_CALL PresenterButton::windowPaint (const css::awt::PaintEvent& rEvent) Reference<rendering::XSpriteCanvas> xSpriteCanvas (mxCanvas, UNO_QUERY); if (xSpriteCanvas.is()) - xSpriteCanvas->updateScreen(sal_False); + xSpriteCanvas->updateScreen(false); } } diff --git a/sdext/source/presenter/PresenterController.cxx b/sdext/source/presenter/PresenterController.cxx index 95880baaed40..133901eca70c 100644 --- a/sdext/source/presenter/PresenterController.cxx +++ b/sdext/source/presenter/PresenterController.cxx @@ -1133,7 +1133,7 @@ void PresenterController::InitializeMainPane (const Reference<XPane>& rxPane) } Reference<XPane2> xPane2 (rxPane, UNO_QUERY); if (xPane2.is()) - xPane2->setVisible(sal_True); + xPane2->setVisible(true); mpPaintManager.reset(new PresenterPaintManager(mxMainWindow, mxPresenterHelper, mpPaneContainer)); diff --git a/sdext/source/presenter/PresenterGeometryHelper.cxx b/sdext/source/presenter/PresenterGeometryHelper.cxx index fac8b37b6622..8126e5c9639d 100644 --- a/sdext/source/presenter/PresenterGeometryHelper.cxx +++ b/sdext/source/presenter/PresenterGeometryHelper.cxx @@ -193,7 +193,7 @@ Reference<rendering::XPolyPolygon2D> PresenterGeometryHelper::CreatePolygon( rxDevice->createCompatibleLinePolyPolygon(aPoints)); Reference<rendering::XPolyPolygon2D> xRectangle (xPolygon, UNO_QUERY); if (xRectangle.is()) - xRectangle->setClosed(0, sal_True); + xRectangle->setClosed(0, true); return xRectangle; } @@ -215,7 +215,7 @@ Reference<rendering::XPolyPolygon2D> PresenterGeometryHelper::CreatePolygon( rxDevice->createCompatibleLinePolyPolygon(aPoints)); Reference<rendering::XPolyPolygon2D> xRectangle (xPolygon, UNO_QUERY); if (xRectangle.is()) - xRectangle->setClosed(0, sal_True); + xRectangle->setClosed(0, true); return xRectangle; } @@ -244,7 +244,7 @@ Reference<rendering::XPolyPolygon2D> PresenterGeometryHelper::CreatePolygon( Reference<rendering::XPolyPolygon2D> xRectangle (xPolygon, UNO_QUERY); if (xRectangle.is()) for (sal_Int32 nIndex=0; nIndex<nCount; ++nIndex) - xRectangle->setClosed(nIndex, sal_True); + xRectangle->setClosed(nIndex, true); return xRectangle; } diff --git a/sdext/source/presenter/PresenterHelpView.cxx b/sdext/source/presenter/PresenterHelpView.cxx index 77ab818bf5bc..9882ce89becc 100644 --- a/sdext/source/presenter/PresenterHelpView.cxx +++ b/sdext/source/presenter/PresenterHelpView.cxx @@ -152,7 +152,7 @@ PresenterHelpView::PresenterHelpView ( Reference<awt::XWindowPeer> xPeer (mxWindow, UNO_QUERY); if (xPeer.is()) xPeer->setBackground(util::Color(0xff000000)); - mxWindow->setVisible(sal_True); + mxWindow->setVisible(true); if (mpPresenterController.is()) { @@ -351,7 +351,7 @@ void PresenterHelpView::Paint (const awt::Rectangle& rUpdateBox) Reference<rendering::XSpriteCanvas> xSpriteCanvas (mxCanvas, UNO_QUERY); if (xSpriteCanvas.is()) - xSpriteCanvas->updateScreen(sal_False); + xSpriteCanvas->updateScreen(false); } void PresenterHelpView::ReadHelpStrings() diff --git a/sdext/source/presenter/PresenterNotesView.cxx b/sdext/source/presenter/PresenterNotesView.cxx index b8ea26637545..0c37ee4dd4f0 100644 --- a/sdext/source/presenter/PresenterNotesView.cxx +++ b/sdext/source/presenter/PresenterNotesView.cxx @@ -111,7 +111,7 @@ PresenterNotesView::PresenterNotesView ( mxParentWindow->addWindowListener(this); mxParentWindow->addPaintListener(this); mxParentWindow->addKeyListener(this); - mxParentWindow->setVisible(sal_True); + mxParentWindow->setVisible(true); } mpScrollBar = new PresenterVerticalScrollBar( @@ -197,10 +197,10 @@ void PresenterNotesView::CreateToolBar ( // Create a new window as container of the tool bar. mxToolBarWindow = xPresenterHelper->createWindow( mxParentWindow, - sal_False, - sal_True, - sal_False, - sal_False); + false, + true, + false, + false); mxToolBarCanvas = xPresenterHelper->createSharedCanvas ( Reference<rendering::XSpriteCanvas>(mxCanvas, UNO_QUERY), mxParentWindow, @@ -600,7 +600,7 @@ void PresenterNotesView::PaintText (const awt::Rectangle& rUpdateBox) Reference<rendering::XSpriteCanvas> xSpriteCanvas (mxCanvas, UNO_QUERY); if (xSpriteCanvas.is()) - xSpriteCanvas->updateScreen(sal_False); + xSpriteCanvas->updateScreen(false); } void PresenterNotesView::Invalidate() diff --git a/sdext/source/presenter/PresenterPane.cxx b/sdext/source/presenter/PresenterPane.cxx index de2dfce53b55..8efbb05e1ee7 100644 --- a/sdext/source/presenter/PresenterPane.cxx +++ b/sdext/source/presenter/PresenterPane.cxx @@ -111,7 +111,7 @@ void SAL_CALL PresenterPane::windowShown (const lang::EventObject& rEvent) if (mxContentWindow.is()) { LayoutContextWindow(); - mxContentWindow->setVisible(sal_True); + mxContentWindow->setVisible(true); } UpdateBoundingBox(); @@ -125,7 +125,7 @@ void SAL_CALL PresenterPane::windowHidden (const lang::EventObject& rEvent) PresenterPaneBase::windowHidden(rEvent); if (mxContentWindow.is()) - mxContentWindow->setVisible(sal_False); + mxContentWindow->setVisible(false); } //----- XPaintListener -------------------------------------------------------- diff --git a/sdext/source/presenter/PresenterPaneBase.cxx b/sdext/source/presenter/PresenterPaneBase.cxx index d05e841d50dd..6b4e5f92a6fa 100644 --- a/sdext/source/presenter/PresenterPaneBase.cxx +++ b/sdext/source/presenter/PresenterPaneBase.cxx @@ -324,16 +324,16 @@ void PresenterPaneBase::CreateWindows ( mxBorderWindow = mxPresenterHelper->createWindow( rxParentWindow, - sal_False, + false, bIsWindowVisibleOnCreation, - sal_False, - sal_False); + false, + false); mxContentWindow = mxPresenterHelper->createWindow( mxBorderWindow, - sal_False, + false, bIsWindowVisibleOnCreation, - sal_False, - sal_False); + false, + false); } } diff --git a/sdext/source/presenter/PresenterPaneBorderPainter.cxx b/sdext/source/presenter/PresenterPaneBorderPainter.cxx index 5cd432f968db..70b9ffef1970 100644 --- a/sdext/source/presenter/PresenterPaneBorderPainter.cxx +++ b/sdext/source/presenter/PresenterPaneBorderPainter.cxx @@ -495,7 +495,7 @@ void PresenterPaneBorderPainter::Renderer::PaintBorder ( // In a double buffering environment request to make the changes visible. Reference<rendering::XSpriteCanvas> xSpriteCanvas (mxCanvas, UNO_QUERY); if (xSpriteCanvas.is()) - xSpriteCanvas->updateScreen(sal_False); + xSpriteCanvas->updateScreen(false); } void PresenterPaneBorderPainter::Renderer::PaintTitle ( diff --git a/sdext/source/presenter/PresenterPaneFactory.cxx b/sdext/source/presenter/PresenterPaneFactory.cxx index 5167a9d748c4..551e0eada5ad 100644 --- a/sdext/source/presenter/PresenterPaneFactory.cxx +++ b/sdext/source/presenter/PresenterPaneFactory.cxx @@ -168,7 +168,7 @@ Reference<XResource> SAL_CALL PresenterPaneFactory::createResource ( { pDescriptor->SetActivationState(true); if (pDescriptor->mxBorderWindow.is()) - pDescriptor->mxBorderWindow->setVisible(sal_True); + pDescriptor->mxBorderWindow->setVisible(true); pPaneContainer->StorePane(pDescriptor->mxPane); } @@ -199,7 +199,7 @@ void SAL_CALL PresenterPaneFactory::releaseResource (const Reference<XResource>& { pDescriptor->SetActivationState(false); if (pDescriptor->mxBorderWindow.is()) - pDescriptor->mxBorderWindow->setVisible(sal_False); + pDescriptor->mxBorderWindow->setVisible(false); if (mpResourceCache.get() != nullptr) { @@ -312,7 +312,7 @@ Reference<XResource> PresenterPaneFactory::CreatePane ( // Get the window of the frame and make that visible. Reference<awt::XWindow> xWindow (pDescriptor->mxBorderWindow, UNO_QUERY_THROW); - xWindow->setVisible(sal_True); + xWindow->setVisible(true); } return Reference<XResource>(static_cast<XWeak*>(xPane.get()), UNO_QUERY_THROW); diff --git a/sdext/source/presenter/PresenterProtocolHandler.cxx b/sdext/source/presenter/PresenterProtocolHandler.cxx index 4e273a4491e0..441ecd94d085 100644 --- a/sdext/source/presenter/PresenterProtocolHandler.cxx +++ b/sdext/source/presenter/PresenterProtocolHandler.cxx @@ -52,7 +52,7 @@ namespace { virtual ~Command() {} virtual void Execute() = 0; virtual bool IsEnabled() const { return true; } - virtual Any GetState() const { return Any(sal_False); } + virtual Any GetState() const { return Any(false); } }; class GotoPreviousSlideCommand : public Command @@ -484,7 +484,7 @@ void SAL_CALL PresenterProtocolHandler::Dispatch::addStatusListener( frame::FeatureStateEvent aEvent; aEvent.FeatureURL = rURL; aEvent.IsEnabled = mpCommand->IsEnabled(); - aEvent.Requery = sal_False; + aEvent.Requery = false; aEvent.State = mpCommand->GetState(); rxListener->statusChanged(aEvent); } diff --git a/sdext/source/presenter/PresenterScrollBar.cxx b/sdext/source/presenter/PresenterScrollBar.cxx index 56e5cc970790..3d7de3b9ca82 100644 --- a/sdext/source/presenter/PresenterScrollBar.cxx +++ b/sdext/source/presenter/PresenterScrollBar.cxx @@ -115,10 +115,10 @@ PresenterScrollBar::PresenterScrollBar ( if (mxPresenterHelper.is()) mxWindow = mxPresenterHelper->createWindow(rxParentWindow, - sal_False, - sal_False, - sal_False, - sal_False); + false, + false, + false, + false); // Make the background transparent. The slide show paints its own background. Reference<awt::XWindowPeer> xPeer (mxWindow, UNO_QUERY_THROW); @@ -127,7 +127,7 @@ PresenterScrollBar::PresenterScrollBar ( xPeer->setBackground(0xff000000); } - mxWindow->setVisible(sal_True); + mxWindow->setVisible(true); mxWindow->addWindowListener(this); mxWindow->addPaintListener(this); mxWindow->addMouseListener(this); @@ -307,7 +307,7 @@ void PresenterScrollBar::Paint ( Reference<rendering::XSpriteCanvas> xSpriteCanvas (mxCanvas, UNO_QUERY); if (xSpriteCanvas.is()) - xSpriteCanvas->updateScreen(sal_False); + xSpriteCanvas->updateScreen(false); } //----- XWindowListener ------------------------------------------------------- @@ -351,7 +351,7 @@ void SAL_CALL PresenterScrollBar::windowPaint (const css::awt::PaintEvent& rEven Reference<rendering::XSpriteCanvas> xSpriteCanvas (mxCanvas, UNO_QUERY); if (xSpriteCanvas.is()) - xSpriteCanvas->updateScreen(sal_False); + xSpriteCanvas->updateScreen(false); } } diff --git a/sdext/source/presenter/PresenterSlidePreview.cxx b/sdext/source/presenter/PresenterSlidePreview.cxx index be164061fba3..75a5a64b1ba7 100644 --- a/sdext/source/presenter/PresenterSlidePreview.cxx +++ b/sdext/source/presenter/PresenterSlidePreview.cxx @@ -83,7 +83,7 @@ PresenterSlidePreview::PresenterSlidePreview ( if (xPeer.is()) xPeer->setBackground(util::Color(0xff000000)); - mxWindow->setVisible(sal_True); + mxWindow->setVisible(true); } if (mpPresenterController.get() != nullptr) @@ -358,7 +358,7 @@ void PresenterSlidePreview::Paint (const awt::Rectangle& rBoundingBox) Reference<rendering::XSpriteCanvas> xSpriteCanvas (mxCanvas, UNO_QUERY); if (xSpriteCanvas.is()) - xSpriteCanvas->updateScreen(sal_False); + xSpriteCanvas->updateScreen(false); } void PresenterSlidePreview::Resize() diff --git a/sdext/source/presenter/PresenterSlideShowView.cxx b/sdext/source/presenter/PresenterSlideShowView.cxx index bad972f93f91..f14836e0a9d7 100644 --- a/sdext/source/presenter/PresenterSlideShowView.cxx +++ b/sdext/source/presenter/PresenterSlideShowView.cxx @@ -150,7 +150,7 @@ void PresenterSlideShowView::LateInit() Resize(); if (mxWindow.is()) - mxWindow->setVisible(sal_True); + mxWindow->setVisible(true); // Add the new slide show view to the slide show. if (mxSlideShow.is() && ! mbIsViewAdded) @@ -800,7 +800,7 @@ void PresenterSlideShowView::PaintEndSlide (const awt::Rectangle& rRepaintBox) // made visible. Reference<rendering::XSpriteCanvas> mxSpriteCanvas (mxCanvas, UNO_QUERY); if (mxSpriteCanvas.is()) - mxSpriteCanvas->updateScreen(sal_True); + mxSpriteCanvas->updateScreen(true); } void PresenterSlideShowView::PaintInnerWindow (const awt::PaintEvent& rEvent) @@ -822,7 +822,7 @@ void PresenterSlideShowView::PaintInnerWindow (const awt::PaintEvent& rEvent) // made visible. Reference<rendering::XSpriteCanvas> mxSpriteCanvas (mxCanvas, UNO_QUERY); if (mxSpriteCanvas.is()) - mxSpriteCanvas->updateScreen(sal_True); + mxSpriteCanvas->updateScreen(true); } Reference<awt::XWindow> PresenterSlideShowView::CreateViewWindow ( @@ -854,7 +854,7 @@ Reference<awt::XWindow> PresenterSlideShowView::CreateViewWindow ( xPeer->setBackground(0xff000000); } - xViewWindow->setVisible(sal_True); + xViewWindow->setVisible(true); } catch (RuntimeException&) { @@ -1007,7 +1007,7 @@ void PresenterSlideShowView::impl_addAndConfigureView() aProperty.Name = "IsSoundEnabled"; Sequence<Any> aValues (2); aValues[0] <<= xView; - aValues[1] <<= sal_False; + aValues[1] <<= false; aProperty.Value <<= aValues; mxSlideShow->setProperty(aProperty); } diff --git a/sdext/source/presenter/PresenterSlideSorter.cxx b/sdext/source/presenter/PresenterSlideSorter.cxx index d3d5ecf13784..84c442d2d6f6 100644 --- a/sdext/source/presenter/PresenterSlideSorter.cxx +++ b/sdext/source/presenter/PresenterSlideSorter.cxx @@ -292,7 +292,7 @@ PresenterSlideSorter::PresenterSlideSorter ( mxWindow->addPaintListener(this); mxWindow->addMouseListener(this); mxWindow->addMouseMotionListener(this); - mxWindow->setVisible(sal_True); + mxWindow->setVisible(true); // Remember the current slide. mnCurrentSlideIndex = mxSlideShowController->getCurrentSlideIndex(); @@ -500,7 +500,7 @@ void SAL_CALL PresenterSlideSorter::windowPaint (const css::awt::PaintEvent& rEv Reference<rendering::XSpriteCanvas> xSpriteCanvas (mxCanvas, UNO_QUERY); if (xSpriteCanvas.is()) - xSpriteCanvas->updateScreen(sal_False); + xSpriteCanvas->updateScreen(false); } //----- XMouseListener -------------------------------------------------------- @@ -1057,7 +1057,7 @@ void PresenterSlideSorter::Paint (const awt::Rectangle& rUpdateBox) Reference<rendering::XSpriteCanvas> xSpriteCanvas (mxCanvas, UNO_QUERY); if (xSpriteCanvas.is()) - xSpriteCanvas->updateScreen(sal_False); + xSpriteCanvas->updateScreen(false); } void PresenterSlideSorter::SetHorizontalOffset (const double nXOffset) diff --git a/sdext/source/presenter/PresenterSprite.cxx b/sdext/source/presenter/PresenterSprite.cxx index 6331e25bf55b..4d3c03ea8f8a 100644 --- a/sdext/source/presenter/PresenterSprite.cxx +++ b/sdext/source/presenter/PresenterSprite.cxx @@ -119,7 +119,7 @@ void PresenterSprite::MoveTo (const css::geometry::RealPoint2D& rLocation) void PresenterSprite::Update() { if (mxSpriteFactory.is()) - mxSpriteFactory->updateScreen(sal_False); + mxSpriteFactory->updateScreen(false); } void PresenterSprite::ProvideSprite() diff --git a/sdext/source/presenter/PresenterSpritePane.cxx b/sdext/source/presenter/PresenterSpritePane.cxx index 36c3ad4af3a1..f873af85fa71 100644 --- a/sdext/source/presenter/PresenterSpritePane.cxx +++ b/sdext/source/presenter/PresenterSpritePane.cxx @@ -116,7 +116,7 @@ void SAL_CALL PresenterSpritePane::windowShown (const lang::EventObject& rEvent) if (mxContentWindow.is()) { LayoutContextWindow(); - mxContentWindow->setVisible(sal_True); + mxContentWindow->setVisible(true); } } @@ -128,7 +128,7 @@ void SAL_CALL PresenterSpritePane::windowHidden (const lang::EventObject& rEvent mpSprite->Hide(); if (mxContentWindow.is()) - mxContentWindow->setVisible(sal_False); + mxContentWindow->setVisible(false); } //----- XPaintListener -------------------------------------------------------- diff --git a/sdext/source/presenter/PresenterTextView.cxx b/sdext/source/presenter/PresenterTextView.cxx index dd3132d2fb6e..11661a07c92a 100644 --- a/sdext/source/presenter/PresenterTextView.cxx +++ b/sdext/source/presenter/PresenterTextView.cxx @@ -876,7 +876,7 @@ TextSegment PresenterTextParagraph::GetWordTextSegment ( nIndex, lang::Locale(), i18n::WordType::ANYWORD_IGNOREWHITESPACES, - sal_True); + true); else if (nCurrentOffset < 0) { while (nCurrentOffset<0 && nCurrentIndex>0) diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sdext/source/presenter/PresenterToolBar.cxx index 203f76ffa5bf..99a6642c9a13 100644 --- a/sdext/source/presenter/PresenterToolBar.cxx +++ b/sdext/source/presenter/PresenterToolBar.cxx @@ -403,7 +403,7 @@ void PresenterToolBar::Initialize ( if (xPeer.is()) xPeer->setBackground(util::Color(0xff000000)); - mxWindow->setVisible(sal_True); + mxWindow->setVisible(true); } mxSlideShowController = mpPresenterController->GetSlideShowController(); @@ -558,7 +558,7 @@ void SAL_CALL PresenterToolBar::windowPaint (const css::awt::PaintEvent& rEvent) // Make the back buffer visible. Reference<rendering::XSpriteCanvas> xSpriteCanvas (mxCanvas, UNO_QUERY); if (xSpriteCanvas.is()) - xSpriteCanvas->updateScreen(sal_False); + xSpriteCanvas->updateScreen(false); } //----- XMouseListener -------------------------------------------------------- @@ -1109,7 +1109,7 @@ PresenterToolBarView::PresenterToolBarView ( if (xPeer.is()) xPeer->setBackground(util::Color(0xff000000)); - mxWindow->setVisible(sal_True); + mxWindow->setVisible(true); } } catch (RuntimeException&) diff --git a/sdext/source/presenter/PresenterWindowManager.cxx b/sdext/source/presenter/PresenterWindowManager.cxx index 3c93ae69eb75..1522a097f032 100644 --- a/sdext/source/presenter/PresenterWindowManager.cxx +++ b/sdext/source/presenter/PresenterWindowManager.cxx @@ -1073,7 +1073,7 @@ void PresenterWindowManager::ProvideBackgroundBitmap() aSize.Width = mxParentWindow->getPosSize().Width; else aSize.Width = xBitmap->getSize().Width; - mxScaledBackgroundBitmap = xBitmap->getScaledBitmap(aSize, sal_False); + mxScaledBackgroundBitmap = xBitmap->getScaledBitmap(aSize, false); } else { |