diff options
author | Noel Grandin <noel@peralex.com> | 2014-05-08 11:42:32 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-05-08 11:48:12 +0200 |
commit | 2d54aa1d22f404a1a36aaa97d3e3bf5024e89aed (patch) | |
tree | 8a7c539a82988c4ca5288e18f95543fff7c4185e /reportdesign/source/ui | |
parent | f0268c9c1be546aa0b5fc9c359f514e5d8af5bbb (diff) |
reportdesign: sal_Bool->bool
Change-Id: Ib3e7a51a8b01165d4706857f7b347d622c2e624a
Diffstat (limited to 'reportdesign/source/ui')
-rw-r--r-- | reportdesign/source/ui/dlg/Navigator.cxx | 10 | ||||
-rw-r--r-- | reportdesign/source/ui/report/ReportController.cxx | 30 | ||||
-rw-r--r-- | reportdesign/source/ui/report/ReportControllerObserver.cxx | 4 | ||||
-rw-r--r-- | reportdesign/source/ui/report/ReportSection.cxx | 4 | ||||
-rw-r--r-- | reportdesign/source/ui/report/SectionWindow.cxx | 2 |
5 files changed, 25 insertions, 25 deletions
diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx index fd2fbbf03152..68625d9d3782 100644 --- a/reportdesign/source/ui/dlg/Navigator.cxx +++ b/reportdesign/source/ui/dlg/Navigator.cxx @@ -262,7 +262,7 @@ NavigatorTree::~NavigatorTree() void NavigatorTree::Command( const CommandEvent& rEvt ) { - sal_Bool bHandled = sal_False; + bool bHandled = false; switch( rEvt.GetCommand() ) { case COMMAND_CONTEXTMENU: @@ -294,7 +294,7 @@ void NavigatorTree::Command( const CommandEvent& rEvt ) uno::Reference< report::XFunctionsSupplier> xSupplier(pData->getContent(),uno::UNO_QUERY); uno::Reference< report::XFunctions> xFunctions(pData->getContent(),uno::UNO_QUERY); uno::Reference< report::XGroup> xGroup(pData->getContent(),uno::UNO_QUERY); - sal_Bool bDeleteAllowed = m_rController.isEditable() && (xGroup.is() || + bool bDeleteAllowed = m_rController.isEditable() && (xGroup.is() || uno::Reference< report::XFunction>(pData->getContent(),uno::UNO_QUERY).is()); PopupMenu aContextMenu( ModuleRes( RID_MENU_NAVIGATOR ) ); @@ -306,7 +306,7 @@ void NavigatorTree::Command( const CommandEvent& rEvt ) sal_uInt16 nId = aContextMenu.GetItemId(i); aContextMenu.CheckItem(nId,m_rController.isCommandChecked(nId)); - sal_Bool bEnabled = m_rController.isCommandEnabled(nId); + bool bEnabled = m_rController.isCommandEnabled(nId); if ( nId == SID_RPT_NEW_FUNCTION ) aContextMenu.EnableItem(nId,m_rController.isEditable() && (xSupplier.is() || xFunctions.is()) ); // special condition, check for function and group @@ -336,7 +336,7 @@ void NavigatorTree::Command( const CommandEvent& rEvt ) m_rController.executeUnChecked(nId,aArgs); } - bHandled = sal_True; + bHandled = true; } break; } @@ -647,7 +647,7 @@ void NavigatorTree::_propertyChanged(const beans::PropertyChangeEvent& _rEvent) uno::Reference< report::XReportDefinition> xReport(_rEvent.Source,uno::UNO_QUERY); if ( xReport.is() ) { - sal_Bool bEnabled = sal_False; + bool bEnabled = false; _rEvent.NewValue >>= bEnabled; if ( bEnabled ) { diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index d96652fd9777..e4fd4e0fe502 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -985,7 +985,7 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue > SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); - sal_Bool bForceBroadcast = sal_False; + bool bForceBroadcast = false; switch(_nId) { case SID_RPT_TEXTDOCUMENT: @@ -1420,7 +1420,7 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue > if (aArgs.getLength() == 1 ) aArgs[0].Value >>= xSection; openPageDialog(xSection); - bForceBroadcast = sal_True; + bForceBroadcast = true; } break; case SID_SORTINGANDGROUPING: @@ -1438,7 +1438,7 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue > xSection->setBackColor( aColor ); } } - bForceBroadcast = sal_True; + bForceBroadcast = true; } break; case SID_ATTR_CHAR_WEIGHT: @@ -1466,7 +1466,7 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue > const SequenceAsHashMap aMap(aArgs); const util::Color aColor = aMap.getUnpackedValueOrDefault(PROPERTY_FONTCOLOR,util::Color()); impl_setPropertyAtControls_throw(RID_STR_UNDO_CHANGEFONT,PROPERTY_CHARCOLOR,uno::makeAny(aColor),aArgs); - bForceBroadcast = sal_True; + bForceBroadcast = true; } break; case SID_ATTR_CHAR_FONT: @@ -2191,7 +2191,7 @@ void SAL_CALL OReportController::propertyChange( const beans::PropertyChangeEven ::osl::MutexGuard aGuard( getMutex() ); try { - sal_Bool bShow = sal_False; + bool bShow = false; evt.NewValue >>= bShow; if ( evt.Source == m_xReportDefinition ) { @@ -2484,7 +2484,7 @@ void OReportController::openPageDialog(const uno::Reference<report::XSection>& _ if ( SFX_ITEM_SET == pSet->GetItemState( RPTUI_ID_PAGE,true,&pItem)) { const SvxPageItem* pPageItem = static_cast<const SvxPageItem*>(pItem); - xProp->setPropertyValue(PROPERTY_ISLANDSCAPE,uno::makeAny(static_cast<sal_Bool>(pPageItem->IsLandscape()))); + xProp->setPropertyValue(PROPERTY_ISLANDSCAPE,uno::makeAny(pPageItem->IsLandscape())); xProp->setPropertyValue(PROPERTY_NUMBERINGTYPE,uno::makeAny(static_cast<sal_Int16>(pPageItem->GetNumType()))); uno::Any aValue; pPageItem->QueryValue(aValue,MID_PAGE_LAYOUT); @@ -3018,7 +3018,7 @@ void OReportController::insertGraphic() if ( ERRCODE_NONE == aDialog.Execute() ) { - sal_Bool bLink = sal_True; + bool bLink = true; xController->getValue( ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_LINK, 0) >>= bLink; uno::Sequence<beans::PropertyValue> aArgs(2); aArgs[0].Name = PROPERTY_IMAGEURL; @@ -3042,7 +3042,7 @@ void OReportController::insertGraphic() sal_Bool SAL_CALL OReportController::select( const Any& aSelection ) throw (IllegalArgumentException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( getMutex() ); - sal_Bool bRet = sal_True; + bool bRet = true; if ( getDesignView() ) { getDesignView()->unmarkAllObjects(NULL); @@ -3250,13 +3250,13 @@ void OReportController::createDateTime(const Sequence< PropertyValue >& _aArgs) uno::Reference< report::XSection> xSection = aMap.getUnpackedValueOrDefault(PROPERTY_SECTION,uno::Reference< report::XSection>()); OUString sFunction; - sal_Bool bDate = aMap.getUnpackedValueOrDefault(PROPERTY_DATE_STATE,sal_False); + bool bDate = aMap.getUnpackedValueOrDefault(PROPERTY_DATE_STATE,sal_False); if ( bDate ) { sFunction = "TODAY()"; createControl(aMap.getAsConstPropertyValueList(),xSection,sFunction); } - sal_Bool bTime = aMap.getUnpackedValueOrDefault(PROPERTY_TIME_STATE,sal_False); + bool bTime = aMap.getUnpackedValueOrDefault(PROPERTY_TIME_STATE,sal_False); if ( bTime ) { sFunction = "TIMEVALUE(NOW())"; @@ -3279,7 +3279,7 @@ void OReportController::createPageNumber(const Sequence< PropertyValue >& _aArgs } SequenceAsHashMap aMap(_aArgs); - sal_Bool bStateOfPage = aMap.getUnpackedValueOrDefault(PROPERTY_STATE,sal_False); + bool bStateOfPage = aMap.getUnpackedValueOrDefault(PROPERTY_STATE,sal_False); OUString sFunction( ModuleRes(STR_RPT_PN_PAGE).toString() ); sFunction = sFunction.replaceFirst("#PAGENUMBER#", "PageNumber()"); @@ -3290,7 +3290,7 @@ void OReportController::createPageNumber(const Sequence< PropertyValue >& _aArgs sFunction = sFunction.replaceFirst("#PAGECOUNT#", "PageCount()"); } - sal_Bool bInPageHeader = aMap.getUnpackedValueOrDefault(PROPERTY_PAGEHEADERON,sal_True); + bool bInPageHeader = aMap.getUnpackedValueOrDefault(PROPERTY_PAGEHEADERON,sal_True); createControl(_aArgs,bInPageHeader ? m_xReportDefinition->getPageHeader() : m_xReportDefinition->getPageFooter(),sFunction); } @@ -3343,7 +3343,7 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs) // LLA: new feature, add the Label in dependency of the given DND_ACTION one section up, normal or one section down sal_Int8 nDNDAction = aMap.getUnpackedValueOrDefault("DNDAction", sal_Int8(0)); pSectionWindow[1] = pSectionWindow[0]; - sal_Bool bLabelAboveTextField = nDNDAction == DND_ACTION_COPY; + bool bLabelAboveTextField = nDNDAction == DND_ACTION_COPY; if ( bLabelAboveTextField || nDNDAction == DND_ACTION_LINK ) { // Add the Label one Section up @@ -3902,7 +3902,7 @@ void OReportController::createGroupSection(const bool _bUndo,const bool _bHeader if ( m_xReportDefinition.is() ) { const SequenceAsHashMap aMap(_aArgs); - const sal_Bool bSwitchOn = aMap.getUnpackedValueOrDefault(_bHeader ? OUString(PROPERTY_HEADERON) : OUString(PROPERTY_FOOTERON), sal_False); + const bool bSwitchOn = aMap.getUnpackedValueOrDefault(_bHeader ? OUString(PROPERTY_HEADERON) : OUString(PROPERTY_FOOTERON), sal_False); uno::Reference< report::XGroup> xGroup = aMap.getUnpackedValueOrDefault(PROPERTY_GROUP,uno::Reference< report::XGroup>()); if ( xGroup.is() ) { @@ -3996,7 +3996,7 @@ void OReportController::checkChartEnabled() ::utl::OConfigurationTreeRoot aConfiguration( ::utl::OConfigurationTreeRoot::createWithComponentContext( m_xContext, sConfigName ) ); - sal_Bool bChartEnabled = sal_False; + bool bChartEnabled = false; if ( aConfiguration.hasByHierarchicalName(sPropertyName) ) aConfiguration.getNodeValue( sPropertyName ) >>= bChartEnabled; m_bChartEnabled = bChartEnabled; diff --git a/reportdesign/source/ui/report/ReportControllerObserver.cxx b/reportdesign/source/ui/report/ReportControllerObserver.cxx index 58abafba5c06..13cd591e3097 100644 --- a/reportdesign/source/ui/report/ReportControllerObserver.cxx +++ b/reportdesign/source/ui/report/ReportControllerObserver.cxx @@ -55,7 +55,7 @@ public: ::std::vector< uno::Reference< container::XChild> > m_aSections; ::osl::Mutex m_aMutex; oslInterlockedCount m_nLocks; - sal_Bool m_bReadOnly; + bool m_bReadOnly; OXReportControllerObserverImpl(const OReportController& _rController); ~OXReportControllerObserverImpl(); @@ -66,7 +66,7 @@ public: OXReportControllerObserverImpl::OXReportControllerObserverImpl(const OReportController& _rController) :m_rReportController(_rController) ,m_nLocks(0) - ,m_bReadOnly(sal_False) + ,m_bReadOnly(false) { } diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx index 5eb799853347..6ea7f946ecb5 100644 --- a/reportdesign/source/ui/report/ReportSection.cxx +++ b/reportdesign/source/ui/report/ReportSection.cxx @@ -622,7 +622,7 @@ void OReportSection::createDefault(const OUString& _sType) void OReportSection::createDefault(const OUString& _sType,SdrObject* _pObj) { - sal_Bool bAttributesAppliedFromGallery = sal_False; + bool bAttributesAppliedFromGallery = false; if ( GalleryExplorer::GetSdrObjCount( GALLERY_THEME_POWERPOINT ) ) { @@ -666,7 +666,7 @@ void OReportSection::createDefault(const OUString& _sType,SdrObject* _pObj) double a = nAngle * F_PI18000; _pObj->NbcRotate( _pObj->GetSnapRect().Center(), nAngle, sin( a ), cos( a ) ); } - bAttributesAppliedFromGallery = sal_True; + bAttributesAppliedFromGallery = true; } } break; diff --git a/reportdesign/source/ui/report/SectionWindow.cxx b/reportdesign/source/ui/report/SectionWindow.cxx index 779a410d69cc..c0b6c53ce9c8 100644 --- a/reportdesign/source/ui/report/SectionWindow.cxx +++ b/reportdesign/source/ui/report/SectionWindow.cxx @@ -288,7 +288,7 @@ IMPL_LINK( OSectionWindow, Collapsed, OColorListener *, _pMarker ) { if ( _pMarker ) { - sal_Bool bShow = !_pMarker->isCollapsed(); + bool bShow = !_pMarker->isCollapsed(); m_aReportSection.Show(bShow); m_aEndMarker.Show(bShow); m_aSplitter.Show(bShow); |