diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-02-21 12:53:51 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-02-21 12:53:51 +0100 |
commit | e8f8f24c8415898c787bbfb629247ed62e73a2b9 (patch) | |
tree | dae18a3acbf29c192118e7c003f80df8da8e21ae /reportdesign | |
parent | 1c8402465cfd4df862409dc310f5f099d044c4d8 (diff) |
vcl: sal_Bool -> bool
Change-Id: I2a3e3d3e3266ea0f0fafdd91362076a4aa160f0e
Diffstat (limited to 'reportdesign')
-rw-r--r-- | reportdesign/source/ui/dlg/AddField.cxx | 2 | ||||
-rw-r--r-- | reportdesign/source/ui/dlg/CondFormat.cxx | 4 | ||||
-rw-r--r-- | reportdesign/source/ui/dlg/Condition.cxx | 2 | ||||
-rw-r--r-- | reportdesign/source/ui/inc/DesignView.hxx | 2 | ||||
-rw-r--r-- | reportdesign/source/ui/inc/propbrw.hxx | 2 | ||||
-rw-r--r-- | reportdesign/source/ui/report/DesignView.cxx | 2 | ||||
-rw-r--r-- | reportdesign/source/ui/report/EndMarker.cxx | 4 | ||||
-rw-r--r-- | reportdesign/source/ui/report/ReportSection.cxx | 4 | ||||
-rw-r--r-- | reportdesign/source/ui/report/SectionWindow.cxx | 8 | ||||
-rw-r--r-- | reportdesign/source/ui/report/StartMarker.cxx | 10 | ||||
-rw-r--r-- | reportdesign/source/ui/report/ViewsWindow.cxx | 4 | ||||
-rw-r--r-- | reportdesign/source/ui/report/propbrw.cxx | 6 |
12 files changed, 25 insertions, 25 deletions
diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx index 9849b2ab2a48..2084035a1894 100644 --- a/reportdesign/source/ui/dlg/AddField.cxx +++ b/reportdesign/source/ui/dlg/AddField.cxx @@ -523,7 +523,7 @@ IMPL_LINK( OAddFieldWindow, OnSortAction, ToolBox*, /*NOTINTERESTEDIN*/ ) { const sal_uInt16 nItemId = m_aActions.GetItemId(j); if ( nCurItem != nItemId ) - m_aActions.CheckItem(nItemId,sal_False); + m_aActions.CheckItem(nItemId,false); } SvSortMode eSortMode = SortNone; if ( SID_FM_REMOVE_FILTER_SORT != nCurItem ) diff --git a/reportdesign/source/ui/dlg/CondFormat.cxx b/reportdesign/source/ui/dlg/CondFormat.cxx index 1035917934b1..70cf99736b50 100644 --- a/reportdesign/source/ui/dlg/CondFormat.cxx +++ b/reportdesign/source/ui/dlg/CondFormat.cxx @@ -72,11 +72,11 @@ namespace rptui UpdateLocker( Window& _rWindow ) :m_rWindow( _rWindow ) { - _rWindow.SetUpdateMode( sal_False ); + _rWindow.SetUpdateMode( false ); } ~UpdateLocker() { - m_rWindow.SetUpdateMode( sal_True ); + m_rWindow.SetUpdateMode( true ); } }; diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx index 873c7b50f165..2d3e23eaa270 100644 --- a/reportdesign/source/ui/dlg/Condition.cxx +++ b/reportdesign/source/ui/dlg/Condition.cxx @@ -62,7 +62,7 @@ ConditionField::ConditionField( Condition* _pParent, const ResId& _rResId ) : Ed { m_pSubEdit = new Edit(this,0); SetSubEdit(m_pSubEdit); - m_pSubEdit->EnableRTL( sal_False ); + m_pSubEdit->EnableRTL( false ); m_pSubEdit->SetPosPixel( Point() ); m_aFormula.SetText(OUString("...")); diff --git a/reportdesign/source/ui/inc/DesignView.hxx b/reportdesign/source/ui/inc/DesignView.hxx index 3ad28623e8e9..dc01dbbb5eaf 100644 --- a/reportdesign/source/ui/inc/DesignView.hxx +++ b/reportdesign/source/ui/inc/DesignView.hxx @@ -181,7 +181,7 @@ namespace rptui */ void toggleGrid(sal_Bool _bGridVisible); - void togglePropertyBrowser(sal_Bool _bToogleOn); + void togglePropertyBrowser(bool _bToogleOn); sal_Bool isAddFieldVisible() const; void toggleAddField(); diff --git a/reportdesign/source/ui/inc/propbrw.hxx b/reportdesign/source/ui/inc/propbrw.hxx index aae98d424d7e..54fb3981d26c 100644 --- a/reportdesign/source/ui/inc/propbrw.hxx +++ b/reportdesign/source/ui/inc/propbrw.hxx @@ -67,7 +67,7 @@ private: protected: virtual void Resize(); - virtual sal_Bool Close(); + virtual bool Close(); ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> > CreateCompPropSet(const SdrMarkList& rMarkList); diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx index 17bdb834151f..8a2a7260af32 100644 --- a/reportdesign/source/ui/report/DesignView.cxx +++ b/reportdesign/source/ui/report/DesignView.cxx @@ -455,7 +455,7 @@ void ODesignView::unmarkAllObjects(OSectionView* _pSectionView) m_aScrollWindow.unmarkAllObjects(_pSectionView); } //----------------------------------------------------------------------------- -void ODesignView::togglePropertyBrowser(sal_Bool _bToogleOn) +void ODesignView::togglePropertyBrowser(bool _bToogleOn) { if ( !m_pPropWin && _bToogleOn ) { diff --git a/reportdesign/source/ui/report/EndMarker.cxx b/reportdesign/source/ui/report/EndMarker.cxx index bdd0318aeecd..54b0c39b61f6 100644 --- a/reportdesign/source/ui/report/EndMarker.cxx +++ b/reportdesign/source/ui/report/EndMarker.cxx @@ -78,9 +78,9 @@ void OEndMarker::Paint( const Rectangle& /*rRect*/ ) // ----------------------------------------------------------------------- void OEndMarker::ImplInitSettings() { - EnableChildTransparentMode( sal_True ); + EnableChildTransparentMode( true ); SetParentClipMode( PARENTCLIPMODE_NOCLIP ); - SetPaintTransparent( sal_True ); + SetPaintTransparent( true ); SetBackground( Wallpaper( svtools::ColorConfig().GetColorValue(::svtools::APPBACKGROUND).nColor) ); SetFillColor( Application::GetSettings().GetStyleSettings().GetShadowColor() ); diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx index 11789631455c..905ba74f4a07 100644 --- a/reportdesign/source/ui/report/ReportSection.cxx +++ b/reportdesign/source/ui/report/ReportSection.cxx @@ -95,8 +95,8 @@ OReportSection::OReportSection(OSectionWindow* _pParent,const uno::Reference< re SetHelpId(HID_REPORTSECTION); SetMapMode( MapMode( MAP_100TH_MM ) ); SetParentClipMode( PARENTCLIPMODE_CLIP ); - EnableChildTransparentMode( sal_False ); - SetPaintTransparent( sal_False ); + EnableChildTransparentMode( false ); + SetPaintTransparent( false ); try { diff --git a/reportdesign/source/ui/report/SectionWindow.cxx b/reportdesign/source/ui/report/SectionWindow.cxx index 23c76c6c979b..87469429ab49 100644 --- a/reportdesign/source/ui/report/SectionWindow.cxx +++ b/reportdesign/source/ui/report/SectionWindow.cxx @@ -122,11 +122,11 @@ void OSectionWindow::_propertyChanged(const beans::PropertyChangeEvent& _rEvent) const uno::Reference< report::XSection> xCurrentSection = m_aReportSection.getSection(); if ( _rEvent.PropertyName.equals(PROPERTY_HEIGHT) ) { - m_pParent->getView()->SetUpdateMode(sal_False); + m_pParent->getView()->SetUpdateMode(false); //Resize(); m_pParent->getView()->notifySizeChanged(); m_pParent->resize(*this); - m_pParent->getView()->SetUpdateMode(sal_True); + m_pParent->getView()->SetUpdateMode(true); // getViewsWindow()->getView()->getReportView()->getController().resetZoomType(); } else if ( _rEvent.PropertyName.equals(PROPERTY_NAME) && !xSection->getGroup().is() ) @@ -196,9 +196,9 @@ void OSectionWindow::ImplInitSettings() static bool t = false; if ( t ) { - EnableChildTransparentMode( sal_True ); + EnableChildTransparentMode( true ); SetParentClipMode( PARENTCLIPMODE_NOCLIP ); - SetPaintTransparent( sal_True ); + SetPaintTransparent( true ); } SetBackground( ); } diff --git a/reportdesign/source/ui/report/StartMarker.cxx b/reportdesign/source/ui/report/StartMarker.cxx index 5e36a05a0be9..e13d0d984777 100644 --- a/reportdesign/source/ui/report/StartMarker.cxx +++ b/reportdesign/source/ui/report/StartMarker.cxx @@ -60,7 +60,7 @@ OStartMarker::OStartMarker(OSectionWindow* _pParent,const OUString& _sColorEntry initDefaultNodeImages(); ImplInitSettings(); m_aText.SetHelpId(HID_RPT_START_TITLE); - m_aText.SetPaintTransparent(sal_True); + m_aText.SetPaintTransparent(true); m_aImage.SetHelpId(HID_RPT_START_IMAGE); m_aText.Show(); m_aImage.Show(); @@ -73,9 +73,9 @@ OStartMarker::OStartMarker(OSectionWindow* _pParent,const OUString& _sColorEntry m_aVRuler.SetMargin2(); const MeasurementSystem eSystem = SvtSysLocale().GetLocaleData().getMeasurementSystemEnum(); m_aVRuler.SetUnit(MEASURE_METRIC == eSystem ? FUNIT_CM : FUNIT_INCH); - EnableChildTransparentMode( sal_True ); + EnableChildTransparentMode( true ); SetParentClipMode( PARENTCLIPMODE_NOCLIP ); - SetPaintTransparent( sal_True ); + SetPaintTransparent( true ); } // ----------------------------------------------------------------------------- OStartMarker::~OStartMarker() @@ -194,10 +194,10 @@ void OStartMarker::initDefaultNodeImages() Image* pImage = m_bCollapsed ? s_pDefCollapsed : s_pDefExpanded; m_aImage.SetImage(*pImage); - m_aImage.SetMouseTransparent(sal_True); + m_aImage.SetMouseTransparent(true); m_aImage.SetBackground(); m_aText.SetBackground(); - m_aText.SetMouseTransparent(sal_True); + m_aText.SetMouseTransparent(true); } // ----------------------------------------------------------------------- void OStartMarker::ImplInitSettings() diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx index 46625a3d864a..e0a4b8bc2a63 100644 --- a/reportdesign/source/ui/report/ViewsWindow.cxx +++ b/reportdesign/source/ui/report/ViewsWindow.cxx @@ -175,7 +175,7 @@ OViewsWindow::OViewsWindow( OReportWindow* _pReportWindow) ,m_pParent(_pReportWindow) ,m_bInUnmark(sal_False) { - SetPaintTransparent(sal_True); + SetPaintTransparent(true); SetUniqueId(UID_RPT_VIEWSWINDOW); SetMapMode( MapMode( MAP_100TH_MM ) ); m_aColorConfig.AddListener(this); @@ -275,7 +275,7 @@ void OViewsWindow::Paint( const Rectangle& rRect ) //------------------------------------------------------------------------------ void OViewsWindow::ImplInitSettings() { - EnableChildTransparentMode( sal_True ); + EnableChildTransparentMode( true ); SetBackground( ); SetFillColor( Application::GetSettings().GetStyleSettings().GetDialogColor() ); SetTextFillColor( Application::GetSettings().GetStyleSettings().GetDialogColor() ); diff --git a/reportdesign/source/ui/report/propbrw.cxx b/reportdesign/source/ui/report/propbrw.cxx index 2a9689529aa1..5c550a7a8294 100644 --- a/reportdesign/source/ui/report/propbrw.cxx +++ b/reportdesign/source/ui/report/propbrw.cxx @@ -249,7 +249,7 @@ OUString PropBrw::getCurrentPage() const } //---------------------------------------------------------------------------- -sal_Bool PropBrw::Close() +bool PropBrw::Close() { m_xLastSection.clear(); // suspend the controller (it is allowed to veto) @@ -259,7 +259,7 @@ sal_Bool PropBrw::Close() { Reference< XController > xController( m_xMeAsFrame->getController() ); if ( xController.is() && !xController->suspend( sal_True ) ) - return sal_False; + return false; } catch( const Exception& ) { @@ -273,7 +273,7 @@ sal_Bool PropBrw::Close() m_pDesignView->getController().executeUnChecked(SID_PROPERTYBROWSER_LAST_PAGE,uno::Sequence< beans::PropertyValue>()); - return sal_True; + return true; } //---------------------------------------------------------------------------- |