diff options
| author | Noel Grandin <noel@peralex.com> | 2014-03-26 15:34:49 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-03-27 13:45:09 +0200 |
| commit | 34002c4e5cf68ac0c98c3922c653c9ea8b898207 (patch) | |
| tree | a1a87e45a968cee95e8db7d2f5704070a04b2934 | |
| parent | ffca95023020a24eaff4ece1d4c7bedd469bfb78 (diff) | |
sfx2: sal_Bool->bool
Change-Id: I1fd02cc148fd9a54d2092dad1e548f51a0813a14
277 files changed, 669 insertions, 665 deletions
diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx b/chart2/source/controller/dialogs/res_DataLabel.cxx index a6e995a51ccb..383f4920b8ff 100644 --- a/chart2/source/controller/dialogs/res_DataLabel.cxx +++ b/chart2/source/controller/dialogs/res_DataLabel.cxx @@ -273,7 +273,7 @@ void DataLabelResources::EnableControls() m_pBxOrientation->Enable( bEnableRotation ); } -sal_Bool DataLabelResources::FillItemSet( SfxItemSet& rOutAttrs ) const +bool DataLabelResources::FillItemSet( SfxItemSet& rOutAttrs ) const { if( m_pCBNumber->IsChecked() ) { @@ -318,7 +318,7 @@ sal_Bool DataLabelResources::FillItemSet( SfxItemSet& rOutAttrs ) const rOutAttrs.Put(SfxInt32Item( SCHATTR_TEXT_DEGREES, nDegrees ) ); } - return sal_True; + return true; } void DataLabelResources::Reset(const SfxItemSet& rInAttrs) diff --git a/chart2/source/controller/dialogs/res_DataLabel.hxx b/chart2/source/controller/dialogs/res_DataLabel.hxx index fa32bd565aa0..69317e857c36 100644 --- a/chart2/source/controller/dialogs/res_DataLabel.hxx +++ b/chart2/source/controller/dialogs/res_DataLabel.hxx @@ -43,7 +43,7 @@ public: DataLabelResources( VclBuilderContainer* pWindow, Window* pParent, const SfxItemSet& rInAttrs ); virtual ~DataLabelResources(); - sal_Bool FillItemSet(SfxItemSet& rOutAttrs) const; + bool FillItemSet(SfxItemSet& rOutAttrs) const; void Reset(const SfxItemSet& rInAttrs); void SetNumberFormatter( SvNumberFormatter* pFormatter ); diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx index 2803f37f0fe7..4270b5311110 100644 --- a/chart2/source/controller/dialogs/res_ErrorBar.cxx +++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx @@ -605,7 +605,7 @@ void ErrorBarResources::Reset(const SfxItemSet& rInAttrs) UpdateControlStates(); } -sal_Bool ErrorBarResources::FillItemSet(SfxItemSet& rOutAttrs) const +bool ErrorBarResources::FillItemSet(SfxItemSet& rOutAttrs) const { if( m_bErrorKindUnique ) rOutAttrs.Put( SvxChartKindErrorItem( m_eErrorKind, SCHATTR_STAT_KIND_ERROR )); @@ -660,7 +660,7 @@ sal_Bool ErrorBarResources::FillItemSet(SfxItemSet& rOutAttrs) const rOutAttrs.Put( SfxBoolItem( SCHATTR_STAT_ERRORBAR_TYPE , m_eErrorBarType == ERROR_BAR_Y )); - return sal_True; + return true; } void ErrorBarResources::FillValueSets() diff --git a/chart2/source/controller/dialogs/res_Trendline.cxx b/chart2/source/controller/dialogs/res_Trendline.cxx index 1d2307adb4e1..624330d32464 100644 --- a/chart2/source/controller/dialogs/res_Trendline.cxx +++ b/chart2/source/controller/dialogs/res_Trendline.cxx @@ -242,7 +242,7 @@ void TrendlineResources::Reset( const SfxItemSet& rInAttrs ) } } -sal_Bool TrendlineResources::FillItemSet(SfxItemSet& rOutAttrs) const +bool TrendlineResources::FillItemSet(SfxItemSet& rOutAttrs) const { if( m_bTrendLineUnique ) rOutAttrs.Put( SvxChartRegressItem( m_eTrendLineType, SCHATTR_REGRESSION_TYPE )); @@ -278,7 +278,7 @@ sal_Bool TrendlineResources::FillItemSet(SfxItemSet& rOutAttrs) const m_pNumFormatter->IsNumberFormat(m_pFmtFld_InterceptValue->GetText(),nIndex,aValue); rOutAttrs.Put(SvxDoubleItem( aValue, SCHATTR_REGRESSION_INTERCEPT_VALUE ) ); - return sal_True; + return true; } void TrendlineResources::FillValueSets() diff --git a/chart2/source/controller/dialogs/res_Trendline.hxx b/chart2/source/controller/dialogs/res_Trendline.hxx index 60575057e18c..bf26e307389f 100644 --- a/chart2/source/controller/dialogs/res_Trendline.hxx +++ b/chart2/source/controller/dialogs/res_Trendline.hxx @@ -39,7 +39,7 @@ public: virtual ~TrendlineResources(); void Reset(const SfxItemSet& rInAttrs); - sal_Bool FillItemSet(SfxItemSet& rOutAttrs) const; + bool FillItemSet(SfxItemSet& rOutAttrs) const; void FillValueSets(); diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.cxx b/chart2/source/controller/dialogs/tp_AxisLabel.cxx index f1126e5a56f8..b4f0d859cca7 100644 --- a/chart2/source/controller/dialogs/tp_AxisLabel.cxx +++ b/chart2/source/controller/dialogs/tp_AxisLabel.cxx @@ -88,7 +88,7 @@ SfxTabPage* SchAxisLabelTabPage::Create( Window* pParent, const SfxItemSet& rAtt return new SchAxisLabelTabPage( pParent, rAttrs ); } -sal_Bool SchAxisLabelTabPage::FillItemSet( SfxItemSet& rOutAttrs ) +bool SchAxisLabelTabPage::FillItemSet( SfxItemSet& rOutAttrs ) { bool bStacked = false; if( m_pOrientHlp->GetStackedState() != TRISTATE_INDET ) @@ -135,7 +135,7 @@ sal_Bool SchAxisLabelTabPage::FillItemSet( SfxItemSet& rOutAttrs ) if( m_pLbTextDirection->GetSelectEntryCount() > 0 ) rOutAttrs.Put( SfxInt32Item( EE_PARA_WRITINGDIR, m_pLbTextDirection->GetSelectEntryValue() ) ); - return sal_True; + return true; } void SchAxisLabelTabPage::Reset( const SfxItemSet& rInAttrs ) diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.hxx b/chart2/source/controller/dialogs/tp_AxisLabel.hxx index 15f4542eb5f7..0cd61c57e74f 100644 --- a/chart2/source/controller/dialogs/tp_AxisLabel.hxx +++ b/chart2/source/controller/dialogs/tp_AxisLabel.hxx @@ -75,7 +75,7 @@ public: void Construct(); static SfxTabPage* Create( Window* pParent, const SfxItemSet& rInAttrs ); - virtual sal_Bool FillItemSet( SfxItemSet& rOutAttrs ); + virtual bool FillItemSet( SfxItemSet& rOutAttrs ); virtual void Reset( const SfxItemSet& rInAttrs ); void ShowStaggeringControls( sal_Bool bShowStaggeringControls ); diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.cxx b/chart2/source/controller/dialogs/tp_AxisPositions.cxx index bee38f16e9eb..2f071381160b 100644 --- a/chart2/source/controller/dialogs/tp_AxisPositions.cxx +++ b/chart2/source/controller/dialogs/tp_AxisPositions.cxx @@ -98,7 +98,7 @@ SfxTabPage* AxisPositionsTabPage::Create(Window* pWindow,const SfxItemSet& rOutA return new AxisPositionsTabPage(pWindow, rOutAttrs); } -sal_Bool AxisPositionsTabPage::FillItemSet(SfxItemSet& rOutAttrs) +bool AxisPositionsTabPage::FillItemSet(SfxItemSet& rOutAttrs) { // axis line sal_Int32 nPos = m_pLB_CrossesAt->GetSelectEntryPos(); @@ -136,7 +136,7 @@ sal_Bool AxisPositionsTabPage::FillItemSet(SfxItemSet& rOutAttrs) if( nMarkPos != LISTBOX_ENTRY_NOTFOUND ) rOutAttrs.Put( SfxInt32Item( SCHATTR_AXIS_MARK_POSITION, nMarkPos )); - return sal_True; + return true; } void AxisPositionsTabPage::Reset(const SfxItemSet& rInAttrs) diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.hxx b/chart2/source/controller/dialogs/tp_AxisPositions.hxx index 1e24b7c9bd6d..8c40cac22f6c 100644 --- a/chart2/source/controller/dialogs/tp_AxisPositions.hxx +++ b/chart2/source/controller/dialogs/tp_AxisPositions.hxx @@ -36,7 +36,7 @@ public: AxisPositionsTabPage( Window* pParent, const SfxItemSet& rInAttrs ); static SfxTabPage* Create( Window* pParent, const SfxItemSet& rInAttrs ); - virtual sal_Bool FillItemSet( SfxItemSet& rOutAttrs ); + virtual bool FillItemSet( SfxItemSet& rOutAttrs ); virtual void Reset( const SfxItemSet& rInAttrs ); using TabPage::DeactivatePage; virtual int DeactivatePage( SfxItemSet* pItemSet = NULL ); diff --git a/chart2/source/controller/dialogs/tp_DataLabel.cxx b/chart2/source/controller/dialogs/tp_DataLabel.cxx index c8bb89d65446..f139f287415c 100644 --- a/chart2/source/controller/dialogs/tp_DataLabel.cxx +++ b/chart2/source/controller/dialogs/tp_DataLabel.cxx @@ -43,7 +43,7 @@ SfxTabPage* DataLabelsTabPage::Create(Window* pWindow, const SfxItemSet& rOutAtt return new DataLabelsTabPage(pWindow, rOutAttrs); } -sal_Bool DataLabelsTabPage::FillItemSet(SfxItemSet& rOutAttrs) +bool DataLabelsTabPage::FillItemSet(SfxItemSet& rOutAttrs) { return m_aDataLabelResources.FillItemSet(rOutAttrs); } diff --git a/chart2/source/controller/dialogs/tp_DataLabel.hxx b/chart2/source/controller/dialogs/tp_DataLabel.hxx index 9d44d9e2b2c9..6fdccb1d97b3 100644 --- a/chart2/source/controller/dialogs/tp_DataLabel.hxx +++ b/chart2/source/controller/dialogs/tp_DataLabel.hxx @@ -41,7 +41,7 @@ public: void SetNumberFormatter( SvNumberFormatter* pFormatter ); virtual void Reset(const SfxItemSet& rInAttrs); - virtual sal_Bool FillItemSet(SfxItemSet& rOutAttrs); + virtual bool FillItemSet(SfxItemSet& rOutAttrs); private: DataLabelResources m_aDataLabelResources; diff --git a/chart2/source/controller/dialogs/tp_ErrorBars.cxx b/chart2/source/controller/dialogs/tp_ErrorBars.cxx index 05b04b07fe0a..e77592177ade 100644 --- a/chart2/source/controller/dialogs/tp_ErrorBars.cxx +++ b/chart2/source/controller/dialogs/tp_ErrorBars.cxx @@ -47,7 +47,7 @@ SfxTabPage* ErrorBarsTabPage::Create( return new ErrorBarsTabPage( pParent, rOutAttrs ); } -sal_Bool ErrorBarsTabPage::FillItemSet( SfxItemSet& rOutAttrs ) +bool ErrorBarsTabPage::FillItemSet( SfxItemSet& rOutAttrs ) { return m_aErrorBarResources.FillItemSet( rOutAttrs ); } diff --git a/chart2/source/controller/dialogs/tp_ErrorBars.hxx b/chart2/source/controller/dialogs/tp_ErrorBars.hxx index a1bb2ae0085d..cc38831c2dac 100644 --- a/chart2/source/controller/dialogs/tp_ErrorBars.hxx +++ b/chart2/source/controller/dialogs/tp_ErrorBars.hxx @@ -38,7 +38,7 @@ public: ::com::sun::star::chart2::XChartDocument > & xChartDocument ); static SfxTabPage* Create( Window* pParent, const SfxItemSet& rInAttrs ); - virtual sal_Bool FillItemSet( SfxItemSet& rOutAttrs ); + virtual bool FillItemSet( SfxItemSet& rOutAttrs ); virtual void Reset( const SfxItemSet& rInAttrs ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); diff --git a/chart2/source/controller/dialogs/tp_LegendPosition.cxx b/chart2/source/controller/dialogs/tp_LegendPosition.cxx index 878eaf97cc6e..64868b505880 100644 --- a/chart2/source/controller/dialogs/tp_LegendPosition.cxx +++ b/chart2/source/controller/dialogs/tp_LegendPosition.cxx @@ -46,14 +46,14 @@ SfxTabPage* SchLegendPosTabPage::Create(Window* pWindow, const SfxItemSet& rOutA return new SchLegendPosTabPage(pWindow, rOutAttrs); } -sal_Bool SchLegendPosTabPage::FillItemSet(SfxItemSet& rOutAttrs) +bool SchLegendPosTabPage::FillItemSet(SfxItemSet& rOutAttrs) { m_aLegendPositionResources.writeToItemSet(rOutAttrs); if( m_pLbTextDirection->GetSelectEntryCount() > 0 ) rOutAttrs.Put( SfxInt32Item( EE_PARA_WRITINGDIR, m_pLbTextDirection->GetSelectEntryValue() ) ); - return sal_True; + return true; } void SchLegendPosTabPage::Reset(const SfxItemSet& rInAttrs) diff --git a/chart2/source/controller/dialogs/tp_LegendPosition.hxx b/chart2/source/controller/dialogs/tp_LegendPosition.hxx index fdadbb34772f..4c5232644339 100644 --- a/chart2/source/controller/dialogs/tp_LegendPosition.hxx +++ b/chart2/source/controller/dialogs/tp_LegendPosition.hxx @@ -39,7 +39,7 @@ public: SchLegendPosTabPage(Window* pParent, const SfxItemSet& rInAttrs); static SfxTabPage* Create(Window* pParent, const SfxItemSet& rInAttrs); - virtual sal_Bool FillItemSet(SfxItemSet& rOutAttrs); + virtual bool FillItemSet(SfxItemSet& rOutAttrs); virtual void Reset(const SfxItemSet& rInAttrs); }; diff --git a/chart2/source/controller/dialogs/tp_PointGeometry.cxx b/chart2/source/controller/dialogs/tp_PointGeometry.cxx index 16ba4039ac94..b30160cf94d8 100644 --- a/chart2/source/controller/dialogs/tp_PointGeometry.cxx +++ b/chart2/source/controller/dialogs/tp_PointGeometry.cxx @@ -50,7 +50,7 @@ SfxTabPage* SchLayoutTabPage::Create(Window* pWindow, return new SchLayoutTabPage(pWindow, rOutAttrs); } -sal_Bool SchLayoutTabPage::FillItemSet(SfxItemSet& rOutAttrs) +bool SchLayoutTabPage::FillItemSet(SfxItemSet& rOutAttrs) { if(m_pGeometryResources && m_pGeometryResources->GetSelectEntryCount()) @@ -64,7 +64,7 @@ sal_Bool SchLayoutTabPage::FillItemSet(SfxItemSet& rOutAttrs) rOutAttrs.Put(SfxInt32Item(SCHATTR_STYLE_SHAPE,nShape)); rOutAttrs.Put(Svx3DHorizontalSegmentsItem(nSegs)); } - return sal_True; + return true; } void SchLayoutTabPage::Reset(const SfxItemSet& rInAttrs) diff --git a/chart2/source/controller/dialogs/tp_PointGeometry.hxx b/chart2/source/controller/dialogs/tp_PointGeometry.hxx index b4b873a63011..965af4540fce 100644 --- a/chart2/source/controller/dialogs/tp_PointGeometry.hxx +++ b/chart2/source/controller/dialogs/tp_PointGeometry.hxx @@ -33,7 +33,7 @@ public: virtual ~SchLayoutTabPage(); static SfxTabPage* Create(Window* pParent, const SfxItemSet& rInAttrs); - virtual sal_Bool FillItemSet(SfxItemSet& rOutAttrs); + virtual bool FillItemSet(SfxItemSet& rOutAttrs); virtual void Reset(const SfxItemSet& rInAttrs); private: diff --git a/chart2/source/controller/dialogs/tp_PolarOptions.cxx b/chart2/source/controller/dialogs/tp_PolarOptions.cxx index c4f6771b02fd..c5eda1fd0b99 100644 --- a/chart2/source/controller/dialogs/tp_PolarOptions.cxx +++ b/chart2/source/controller/dialogs/tp_PolarOptions.cxx @@ -53,7 +53,7 @@ SfxTabPage* PolarOptionsTabPage::Create( Window* pWindow,const SfxItemSet& rOutA return new PolarOptionsTabPage( pWindow, rOutAttrs ); } -sal_Bool PolarOptionsTabPage::FillItemSet( SfxItemSet& rOutAttrs ) +bool PolarOptionsTabPage::FillItemSet( SfxItemSet& rOutAttrs ) { if( m_pAngleDial->IsVisible() ) { @@ -67,7 +67,7 @@ sal_Bool PolarOptionsTabPage::FillItemSet( SfxItemSet& rOutAttrs ) if (m_pCB_IncludeHiddenCells->IsVisible()) rOutAttrs.Put(SfxBoolItem(SCHATTR_INCLUDE_HIDDEN_CELLS, m_pCB_IncludeHiddenCells->IsChecked())); - return sal_True; + return true; } void PolarOptionsTabPage::Reset(const SfxItemSet& rInAttrs) diff --git a/chart2/source/controller/dialogs/tp_PolarOptions.hxx b/chart2/source/controller/dialogs/tp_PolarOptions.hxx index 4a9590375241..a30835a2330d 100644 --- a/chart2/source/controller/dialogs/tp_PolarOptions.hxx +++ b/chart2/source/controller/dialogs/tp_PolarOptions.hxx @@ -36,7 +36,7 @@ public: virtual ~PolarOptionsTabPage(); static SfxTabPage* Create(Window* pParent, const SfxItemSet& rInAttrs); - virtual sal_Bool FillItemSet(SfxItemSet& rOutAttrs); + virtual bool FillItemSet(SfxItemSet& rOutAttrs); virtual void Reset(const SfxItemSet& rInAttrs); private: diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx index 0da4722ca738..6edd87e1f2b6 100644 --- a/chart2/source/controller/dialogs/tp_Scale.cxx +++ b/chart2/source/controller/dialogs/tp_Scale.cxx @@ -246,7 +246,7 @@ SfxTabPage* ScaleTabPage::Create(Window* pWindow,const SfxItemSet& rOutAttrs) return new ScaleTabPage(pWindow, rOutAttrs); } -sal_Bool ScaleTabPage::FillItemSet(SfxItemSet& rOutAttrs) +bool ScaleTabPage::FillItemSet(SfxItemSet& rOutAttrs) { OSL_PRECOND( pNumFormatter, "No NumberFormatter available" ); @@ -278,7 +278,7 @@ sal_Bool ScaleTabPage::FillItemSet(SfxItemSet& rOutAttrs) rOutAttrs.Put(SfxInt32Item(SCHATTR_AXIS_MAIN_TIME_UNIT,m_nMainTimeUnit)); rOutAttrs.Put(SfxInt32Item(SCHATTR_AXIS_HELP_TIME_UNIT,m_nHelpTimeUnit)); - return sal_True; + return true; } void ScaleTabPage::Reset(const SfxItemSet& rInAttrs) diff --git a/chart2/source/controller/dialogs/tp_Scale.hxx b/chart2/source/controller/dialogs/tp_Scale.hxx index deaa75dd0619..bae4891596a0 100644 --- a/chart2/source/controller/dialogs/tp_Scale.hxx +++ b/chart2/source/controller/dialogs/tp_Scale.hxx @@ -41,7 +41,7 @@ public: ScaleTabPage( Window* pParent, const SfxItemSet& rInAttrs ); static SfxTabPage* Create( Window* pParent, const SfxItemSet& rInAttrs ); - virtual sal_Bool FillItemSet( SfxItemSet& rOutAttrs ); + virtual bool FillItemSet( SfxItemSet& rOutAttrs ); virtual void Reset( const SfxItemSet& rInAttrs ); using TabPage::DeactivatePage; virtual int DeactivatePage( SfxItemSet* pItemSet = NULL ); diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx index 43bdad7a2796..e0a7c42ca6d4 100644 --- a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx +++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx @@ -82,7 +82,7 @@ SfxTabPage* SchOptionTabPage::Create(Window* pWindow,const SfxItemSet& rOutAttrs return new SchOptionTabPage(pWindow, rOutAttrs); } -sal_Bool SchOptionTabPage::FillItemSet(SfxItemSet& rOutAttrs) +bool SchOptionTabPage::FillItemSet(SfxItemSet& rOutAttrs) { if(m_pRbtAxis2->IsChecked()) rOutAttrs.Put(SfxInt32Item(SCHATTR_AXIS,CHART_AXIS_SECONDARY_Y)); @@ -113,7 +113,7 @@ sal_Bool SchOptionTabPage::FillItemSet(SfxItemSet& rOutAttrs) if (m_pCBIncludeHiddenCells->IsVisible()) rOutAttrs.Put(SfxBoolItem(SCHATTR_INCLUDE_HIDDEN_CELLS, m_pCBIncludeHiddenCells->IsChecked())); - return sal_True; + return true; } void SchOptionTabPage::Reset(const SfxItemSet& rInAttrs) diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx index 53524e488d34..eb23d82b188f 100644 --- a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx +++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx @@ -38,7 +38,7 @@ public: virtual ~SchOptionTabPage(); static SfxTabPage* Create(Window* pParent, const SfxItemSet& rInAttrs); - virtual sal_Bool FillItemSet(SfxItemSet& rOutAttrs); + virtual bool FillItemSet(SfxItemSet& rOutAttrs); virtual void Reset(const SfxItemSet& rInAttrs); void Init( bool bProvidesSecondaryYAxis, bool bProvidesOverlapAndGapWidth, bool bProvidesBarConnectors ); diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.cxx b/chart2/source/controller/dialogs/tp_TitleRotation.cxx index 0bf20291f50d..ee5237c41640 100644 --- a/chart2/source/controller/dialogs/tp_TitleRotation.cxx +++ b/chart2/source/controller/dialogs/tp_TitleRotation.cxx @@ -73,7 +73,7 @@ SfxTabPage* SchAlignmentTabPage::CreateWithoutRotation(Window* pParent, return new SchAlignmentTabPage(pParent, rInAttrs, false); } -sal_Bool SchAlignmentTabPage::FillItemSet(SfxItemSet& rOutAttrs) +bool SchAlignmentTabPage::FillItemSet(SfxItemSet& rOutAttrs) { //Since 04/1998 text can be rotated by an arbitrary angle: SCHATTR_TEXT_DEGREES bool bStacked = m_pOrientHlp->GetStackedState() == TRISTATE_TRUE; @@ -85,7 +85,7 @@ sal_Bool SchAlignmentTabPage::FillItemSet(SfxItemSet& rOutAttrs) SvxFrameDirection aDirection( m_pLbTextDirection->GetSelectEntryValue() ); rOutAttrs.Put( SfxInt32Item( EE_PARA_WRITINGDIR, aDirection ) ); - return sal_True; + return true; } void SchAlignmentTabPage::Reset(const SfxItemSet& rInAttrs) diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.hxx b/chart2/source/controller/dialogs/tp_TitleRotation.hxx index 407c8320089a..8e04fe0621e1 100644 --- a/chart2/source/controller/dialogs/tp_TitleRotation.hxx +++ b/chart2/source/controller/dialogs/tp_TitleRotation.hxx @@ -48,7 +48,7 @@ public: static SfxTabPage* Create(Window* pParent, const SfxItemSet& rInAttrs); static SfxTabPage* CreateWithoutRotation(Window* pParent, const SfxItemSet& rInAttrs); - virtual sal_Bool FillItemSet(SfxItemSet& rOutAttrs); + virtual bool FillItemSet(SfxItemSet& rOutAttrs); virtual void Reset(const SfxItemSet& rInAttrs); }; diff --git a/chart2/source/controller/dialogs/tp_Trendline.cxx b/chart2/source/controller/dialogs/tp_Trendline.cxx index f8633d8462fd..2b796cc45c4f 100644 --- a/chart2/source/controller/dialogs/tp_Trendline.cxx +++ b/chart2/source/controller/dialogs/tp_Trendline.cxx @@ -41,7 +41,7 @@ SfxTabPage* TrendlineTabPage::Create( return new TrendlineTabPage( pParent, rOutAttrs ); } -sal_Bool TrendlineTabPage::FillItemSet( SfxItemSet& rOutAttrs ) +bool TrendlineTabPage::FillItemSet( SfxItemSet& rOutAttrs ) { return m_aTrendlineResources.FillItemSet( rOutAttrs ); } diff --git a/chart2/source/controller/dialogs/tp_Trendline.hxx b/chart2/source/controller/dialogs/tp_Trendline.hxx index 4e5114e87949..02d8ceb60749 100644 --- a/chart2/source/controller/dialogs/tp_Trendline.hxx +++ b/chart2/source/controller/dialogs/tp_Trendline.hxx @@ -33,7 +33,7 @@ public: virtual ~TrendlineTabPage (); static SfxTabPage* Create( Window* pParent, const SfxItemSet& rInAttrs ); - virtual sal_Bool FillItemSet( SfxItemSet& rOutAttrs ); + virtual bool FillItemSet( SfxItemSet& rOutAttrs ); virtual void Reset( const SfxItemSet& rInAttrs ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); diff --git a/chart2/source/controller/inc/res_ErrorBar.hxx b/chart2/source/controller/inc/res_ErrorBar.hxx index de97253f749f..c6b3112b00b2 100644 --- a/chart2/source/controller/inc/res_ErrorBar.hxx +++ b/chart2/source/controller/inc/res_ErrorBar.hxx @@ -58,7 +58,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > & xChartDocument ); void Reset(const SfxItemSet& rInAttrs); - sal_Bool FillItemSet(SfxItemSet& rOutAttrs) const; + bool FillItemSet(SfxItemSet& rOutAttrs) const; void FillValueSets(); diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx index f326ed90eca9..8b59ed2641c1 100644 --- a/cui/source/customize/acccfg.cxx +++ b/cui/source/customize/acccfg.cxx @@ -1420,7 +1420,7 @@ void SfxAcceleratorConfigPage::StartFileDialog( WinBits nBits, const OUString& r } -sal_Bool SfxAcceleratorConfigPage::FillItemSet( SfxItemSet& ) +bool SfxAcceleratorConfigPage::FillItemSet( SfxItemSet& ) { Apply(m_xAct); try @@ -1430,9 +1430,9 @@ sal_Bool SfxAcceleratorConfigPage::FillItemSet( SfxItemSet& ) catch(const css::uno::RuntimeException&) { throw; } catch(const css::uno::Exception&) - { return sal_False; } + { return false; } - return sal_True; + return true; } diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index cf210e082262..f4df22011df3 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -1820,7 +1820,7 @@ OUString SvxConfigPage::GetFrameWithDefaultAndIdentify( uno::Reference< frame::X return sModuleID; } -sal_Bool SvxConfigPage::FillItemSet( SfxItemSet& ) +bool SvxConfigPage::FillItemSet( SfxItemSet& ) { bool result = false; diff --git a/cui/source/customize/eventdlg.cxx b/cui/source/customize/eventdlg.cxx index 9320c2bbe90e..f3bea629f91f 100644 --- a/cui/source/customize/eventdlg.cxx +++ b/cui/source/customize/eventdlg.cxx @@ -206,7 +206,7 @@ IMPL_LINK( SvxEventConfigPage, SelectHdl_Impl, ListBox *, pBox ) return sal_True; } -sal_Bool SvxEventConfigPage::FillItemSet( SfxItemSet& rSet ) +bool SvxEventConfigPage::FillItemSet( SfxItemSet& rSet ) { return _SvxMacroTabPage::FillItemSet( rSet ); } diff --git a/cui/source/customize/eventdlg.hxx b/cui/source/customize/eventdlg.hxx index 734812b4c984..51a4aabbeab0 100644 --- a/cui/source/customize/eventdlg.hxx +++ b/cui/source/customize/eventdlg.hxx @@ -53,7 +53,7 @@ public: void LateInit( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame ); protected: - virtual sal_Bool FillItemSet( SfxItemSet& ); + virtual bool FillItemSet( SfxItemSet& ); private: void ImplInitDocument(); diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx index e9853587de44..5f5e3973d729 100644 --- a/cui/source/customize/macropg.cxx +++ b/cui/source/customize/macropg.cxx @@ -314,7 +314,7 @@ void _SvxMacroTabPage::InitResources() // the following method is called when the user clicks OK // We use the contents of the hashes to replace the settings -sal_Bool _SvxMacroTabPage::FillItemSet( SfxItemSet& /*rSet*/ ) +bool _SvxMacroTabPage::FillItemSet( SfxItemSet& /*rSet*/ ) { try { @@ -365,7 +365,7 @@ sal_Bool _SvxMacroTabPage::FillItemSet( SfxItemSet& /*rSet*/ ) { } // what is the return value about?? - return sal_False; + return false; } // the following method clears the bindings in the hashes for both doc & app diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index a2d26e074e5a..4a802e9c8943 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -679,10 +679,10 @@ void TPGalleryThemeGeneral::SetXChgData( ExchangeData* _pData ) -sal_Bool TPGalleryThemeGeneral::FillItemSet( SfxItemSet& /*rSet*/ ) +bool TPGalleryThemeGeneral::FillItemSet( SfxItemSet& /*rSet*/ ) { pData->aEditedTitle = m_pEdtMSName->GetText(); - return sal_True; + return true; } diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx index 4b6bfb486bb1..9d17318b8ec1 100644 --- a/cui/source/dialogs/hltpbase.cxx +++ b/cui/source/dialogs/hltpbase.cxx @@ -483,7 +483,7 @@ void SvxHyperlinkTabPageBase::Reset( const SfxItemSet& rItemSet) } // Fill output-ItemSet -sal_Bool SvxHyperlinkTabPageBase::FillItemSet( SfxItemSet& rOut) +bool SvxHyperlinkTabPageBase::FillItemSet( SfxItemSet& rOut) { OUString aStrURL, aStrName, aStrIntName, aStrFrame; SvxLinkInsertMode eMode; @@ -499,7 +499,7 @@ sal_Bool SvxHyperlinkTabPageBase::FillItemSet( SfxItemSet& rOut) aStrIntName, eMode, nEvents, pTable ); rOut.Put (aItem); - return sal_True; + return true; } OUString SvxHyperlinkTabPageBase::CreateUiNameFromURL( const OUString& aStrURL ) diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx index 8c901d4289b7..e1aecea7aeca 100644 --- a/cui/source/dialogs/iconcdlg.cxx +++ b/cui/source/dialogs/iconcdlg.cxx @@ -1110,7 +1110,7 @@ short IconChoiceDialog::Ok() else if ( pExampleSet ) pOutSet = new SfxItemSet( *pExampleSet ); } - sal_Bool _bModified = sal_False; + bool _bModified = false; for ( size_t i = 0, nCount = maPageList.size(); i < nCount; ++i ) { @@ -1132,7 +1132,7 @@ short IconChoiceDialog::Ok() if ( pPage->FillItemSet( aTmp ) ) { - _bModified |= sal_True; + _bModified |= true; pExampleSet->Put( aTmp ); pOutSet->Put( aTmp ); } @@ -1141,7 +1141,7 @@ short IconChoiceDialog::Ok() } if ( _bModified || ( pOutSet && pOutSet->Count() > 0 ) ) - _bModified |= sal_True; + _bModified |= true; return _bModified ? RET_OK : RET_CANCEL; } diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx index 79ed0db69dbb..a0d6ee4df4bc 100644 --- a/cui/source/inc/acccfg.hxx +++ b/cui/source/inc/acccfg.hxx @@ -173,7 +173,7 @@ public: SfxAcceleratorConfigPage( Window *pParent, const SfxItemSet& rItemSet ); virtual ~SfxAcceleratorConfigPage(); - virtual sal_Bool FillItemSet( SfxItemSet& ); + virtual bool FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet& ); void Apply(const css::uno::Reference< css::ui::XAcceleratorConfiguration >& pAccMgr); diff --git a/cui/source/inc/align.hxx b/cui/source/inc/align.hxx index 37dd2f952a8d..2889de185e21 100644 --- a/cui/source/inc/align.hxx +++ b/cui/source/inc/align.hxx @@ -62,7 +62,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); static sal_uInt16* GetRanges(); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); virtual int DeactivatePage( SfxItemSet* pSet ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx index 1a0292f50191..fcca210d24e3 100644 --- a/cui/source/inc/autocdlg.hxx +++ b/cui/source/inc/autocdlg.hxx @@ -113,7 +113,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); virtual void ActivatePage( const SfxItemSet& ); @@ -172,7 +172,7 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); virtual void ActivatePage( const SfxItemSet& ); }; @@ -265,7 +265,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); virtual void ActivatePage( const SfxItemSet& ); virtual int DeactivatePage( SfxItemSet* pSet = 0 ); @@ -324,7 +324,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); virtual void ActivatePage( const SfxItemSet& ); virtual int DeactivatePage( SfxItemSet* pSet = 0 ); @@ -390,7 +390,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); virtual void ActivatePage( const SfxItemSet& ); }; @@ -440,7 +440,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); virtual void ActivatePage( const SfxItemSet& ); @@ -507,7 +507,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); virtual void ActivatePage( const SfxItemSet& ); }; diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx index 4b83a1784708..59f6082519e1 100644 --- a/cui/source/inc/backgrnd.hxx +++ b/cui/source/inc/backgrnd.hxx @@ -51,7 +51,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); static sal_uInt16* GetRanges(); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); virtual void FillUserData(); virtual void PointChanged( Window* pWindow, RECT_POINT eRP ); @@ -149,7 +149,7 @@ private: SvxGraphicPosition GetGraphicPosition_Impl(); void FillControls_Impl(const SvxBrushItem& rBgdAttr, const OUString& rUserData); - sal_Bool FillItemSetWithWallpaperItem( SfxItemSet& rCoreSet, sal_uInt16 nSlot); + bool FillItemSetWithWallpaperItem( SfxItemSet& rCoreSet, sal_uInt16 nSlot); void ResetFromWallpaperItem( const SfxItemSet& rSet ); DECL_LINK( LoadTimerHdl_Impl, Timer* ); diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx index f0bb77b7b56a..7f1a251c5213 100644 --- a/cui/source/inc/border.hxx +++ b/cui/source/inc/border.hxx @@ -47,7 +47,7 @@ public: const SfxItemSet& rAttrSet); static sal_uInt16* GetRanges(); - virtual sal_Bool FillItemSet( SfxItemSet& rCoreAttrs ); + virtual bool FillItemSet( SfxItemSet& rCoreAttrs ); virtual void Reset( const SfxItemSet& ); void HideShadowControls(); diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx index 370c893ee1eb..33484e2c35d0 100644 --- a/cui/source/inc/cfg.hxx +++ b/cui/source/inc/cfg.hxx @@ -436,7 +436,7 @@ public: bool MoveEntryData( SvTreeListEntry* pSourceEntry, SvTreeListEntry* pTargetEntry ); - sal_Bool FillItemSet( SfxItemSet& ); + bool FillItemSet( SfxItemSet& ); void Reset( const SfxItemSet& ); virtual bool DeleteSelectedContent() = 0; diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx index fca123382142..68456aba4863 100644 --- a/cui/source/inc/chardlg.hxx +++ b/cui/source/inc/chardlg.hxx @@ -137,7 +137,7 @@ private: }; void Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp ); - sal_Bool FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp ); + bool FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp ); DECL_LINK(UpdateHdl_Impl, void *); DECL_LINK( FontModifyHdl_Impl, void* ); @@ -156,7 +156,7 @@ public: static sal_uInt16* GetRanges(); virtual void Reset( const SfxItemSet& rSet ); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); void SetFontList( const SvxFontListItem& rItem ); void EnableRelativeMode(); @@ -235,7 +235,7 @@ public: static sal_uInt16* GetRanges(); virtual void Reset( const SfxItemSet& rSet ); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); void DisableControls( sal_uInt16 nDisable ); void EnableFlash(); @@ -314,7 +314,7 @@ public: static sal_uInt16* GetRanges(); virtual void Reset( const SfxItemSet& rSet ); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); virtual void FillUserData(); /// the writer uses SID_ATTR_BRUSH as font background void SetPreviewBackgroundToCharacter(); @@ -357,7 +357,7 @@ public: static sal_uInt16* GetRanges(); virtual void Reset( const SfxItemSet& rSet ); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); /// the writer uses SID_ATTR_BRUSH as font background void SetPreviewBackgroundToCharacter(); virtual void PageCreated (SfxAllItemSet aSet); diff --git a/cui/source/inc/connect.hxx b/cui/source/inc/connect.hxx index 00933e0040f1..f4f595dcdb6c 100644 --- a/cui/source/inc/connect.hxx +++ b/cui/source/inc/connect.hxx @@ -66,7 +66,7 @@ public: static SfxTabPage* Create( Window*, const SfxItemSet& ); static sal_uInt16* GetRanges(); - virtual sal_Bool FillItemSet( SfxItemSet& ); + virtual bool FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet & ); void Construct(); diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx index e6a61561a10f..b97e32e635ec 100644 --- a/cui/source/inc/cuigaldlg.hxx +++ b/cui/source/inc/cuigaldlg.hxx @@ -214,7 +214,7 @@ private: ExchangeData* pData; virtual void Reset( const SfxItemSet& ) {} - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); public: @@ -263,7 +263,7 @@ class TPGalleryThemeProperties : public SfxTabPage ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFolderPicker2 > xFolderPicker; virtual void Reset( const SfxItemSet& /*rSet*/ ) {} - virtual sal_Bool FillItemSet( SfxItemSet& /*rSet*/ ) { return sal_True; } + virtual bool FillItemSet( SfxItemSet& /*rSet*/ ) { return true; } OUString addExtension( const OUString&, const OUString& ); void FillFilterList(); diff --git a/cui/source/inc/cuioptgenrl.hxx b/cui/source/inc/cuioptgenrl.hxx index 8f96c0955576..fe56efe3d416 100644 --- a/cui/source/inc/cuioptgenrl.hxx +++ b/cui/source/inc/cuioptgenrl.hxx @@ -54,7 +54,7 @@ private: DECL_LINK( ModifyHdl_Impl, Edit * ); - sal_Bool GetAddress_Impl(); + bool GetAddress_Impl(); void SetAddress_Impl(); void InitControls (); @@ -69,7 +69,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); }; diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx index b3d34e3d46b9..29b4b399e9b2 100644 --- a/cui/source/inc/cuitabarea.hxx +++ b/cui/source/inc/cuitabarea.hxx @@ -168,7 +168,7 @@ public: static SfxTabPage* Create(Window*, const SfxItemSet&); static sal_uInt16* GetRanges(); - virtual sal_Bool FillItemSet(SfxItemSet&); + virtual bool FillItemSet(SfxItemSet&); virtual void Reset(const SfxItemSet&); virtual void ActivatePage(const SfxItemSet& rSet); virtual int DeactivatePage(SfxItemSet* pSet); @@ -280,7 +280,7 @@ public: static SfxTabPage* Create( Window*, const SfxItemSet& ); static sal_uInt16* GetRanges(); - virtual sal_Bool FillItemSet( SfxItemSet& ); + virtual bool FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet & ); virtual void ActivatePage( const SfxItemSet& rSet ); virtual int DeactivatePage( SfxItemSet* pSet ); @@ -345,7 +345,7 @@ public: static SfxTabPage* Create( Window*, const SfxItemSet& ); static sal_uInt16* GetRanges(); - virtual sal_Bool FillItemSet( SfxItemSet& ); + virtual bool FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet & ); virtual void ActivatePage( const SfxItemSet& rSet ); virtual int DeactivatePage( SfxItemSet* pSet ); @@ -423,7 +423,7 @@ public: void Construct(); static SfxTabPage* Create( Window*, const SfxItemSet& ); - virtual sal_Bool FillItemSet( SfxItemSet& ); + virtual bool FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet & ); virtual void ActivatePage( const SfxItemSet& rSet ); @@ -499,7 +499,7 @@ public: void Construct(); static SfxTabPage* Create( Window*, const SfxItemSet& ); - virtual sal_Bool FillItemSet( SfxItemSet& ); + virtual bool FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet & ); virtual void ActivatePage( const SfxItemSet& rSet ); @@ -585,7 +585,7 @@ public: void Construct(); static SfxTabPage* Create( Window*, const SfxItemSet& ); - virtual sal_Bool FillItemSet( SfxItemSet& ); + virtual bool FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet & ); virtual void ActivatePage( const SfxItemSet& rSet ); @@ -720,7 +720,7 @@ public: void Construct(); static SfxTabPage* Create( Window*, const SfxItemSet& ); - virtual sal_Bool FillItemSet( SfxItemSet& ); + virtual bool FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet & ); virtual void ActivatePage( const SfxItemSet& rSet ); diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx index 6d5cbd7ee7f1..f75ae743bd6e 100644 --- a/cui/source/inc/cuitabline.hxx +++ b/cui/source/inc/cuitabline.hxx @@ -208,7 +208,7 @@ public: static SfxTabPage* Create( Window*, const SfxItemSet& ); static sal_uInt16* GetRanges(); - virtual sal_Bool FillItemSet( SfxItemSet& ); + virtual bool FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet& ); virtual void ActivatePage( const SfxItemSet& rSet ); @@ -304,7 +304,7 @@ public: void Construct(); static SfxTabPage* Create( Window*, const SfxItemSet& ); - virtual sal_Bool FillItemSet( SfxItemSet& ); + virtual bool FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet & ); virtual void ActivatePage( const SfxItemSet& rSet ); @@ -374,7 +374,7 @@ public: void Construct(); static SfxTabPage* Create( Window*, const SfxItemSet& ); - virtual sal_Bool FillItemSet( SfxItemSet& ); + virtual bool FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet & ); virtual void ActivatePage( const SfxItemSet& rSet ); diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx index 2b51befcaf42..5c4a590f273f 100644 --- a/cui/source/inc/dbregister.hxx +++ b/cui/source/inc/dbregister.hxx @@ -95,7 +95,7 @@ namespace svx static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); static sal_uInt16* GetRanges(); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); virtual void FillUserData(); }; diff --git a/cui/source/inc/dstribut.hxx b/cui/source/inc/dstribut.hxx index d8288ebf99fb..bf6207840b7c 100644 --- a/cui/source/inc/dstribut.hxx +++ b/cui/source/inc/dstribut.hxx @@ -47,7 +47,7 @@ public: static SfxTabPage* Create(Window*, const SfxItemSet&, SvxDistributeHorizontal eHor, SvxDistributeVertical eVer); - virtual sal_Bool FillItemSet(SfxItemSet&); + virtual bool FillItemSet(SfxItemSet&); virtual void Reset(const SfxItemSet&); virtual void PointChanged(Window* pWindow, RECT_POINT eRP); diff --git a/cui/source/inc/grfpage.hxx b/cui/source/inc/grfpage.hxx index 0b13e11b096b..bf45d41d0594 100644 --- a/cui/source/inc/grfpage.hxx +++ b/cui/source/inc/grfpage.hxx @@ -113,7 +113,7 @@ class SvxGrfCropPage : public SfxTabPage public: static SfxTabPage *Create( Window *pParent, const SfxItemSet &rSet ); - virtual sal_Bool FillItemSet( SfxItemSet &rSet ); + virtual bool FillItemSet( SfxItemSet &rSet ); virtual void Reset( const SfxItemSet &rSet ); virtual int DeactivatePage( SfxItemSet *pSet ); }; diff --git a/cui/source/inc/hltpbase.hxx b/cui/source/inc/hltpbase.hxx index 847a079acb1f..88ea7643a417 100644 --- a/cui/source/inc/hltpbase.hxx +++ b/cui/source/inc/hltpbase.hxx @@ -141,7 +141,7 @@ public: virtual void SetInitFocus(); virtual void SetMarkStr ( const OUString& aStrMark ); virtual void Reset( const SfxItemSet& ); - virtual sal_Bool FillItemSet( SfxItemSet& ); + virtual bool FillItemSet( SfxItemSet& ); virtual void ActivatePage( const SfxItemSet& rItemSet ); virtual int DeactivatePage( SfxItemSet* pSet = 0 ); diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx index 67706124bc16..9a90c9d69088 100644 --- a/cui/source/inc/iconcdlg.hxx +++ b/cui/source/inc/iconcdlg.hxx @@ -96,7 +96,7 @@ public : const SfxItemSet& GetItemSet() const { return *pSet; } - virtual sal_Bool FillItemSet( SfxItemSet& ) = 0; + virtual bool FillItemSet( SfxItemSet& ) = 0; virtual void Reset( const SfxItemSet& ) = 0; sal_Bool HasExchangeSupport() const { return bHasExchangeSupport; } diff --git a/cui/source/inc/labdlg.hxx b/cui/source/inc/labdlg.hxx index 1df123bc46b8..9d3e81334880 100644 --- a/cui/source/inc/labdlg.hxx +++ b/cui/source/inc/labdlg.hxx @@ -78,7 +78,7 @@ public: static SfxTabPage* Create( Window*, const SfxItemSet& ); static sal_uInt16* GetRanges(); - virtual sal_Bool FillItemSet( SfxItemSet& ); + virtual bool FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet & ); void Construct(); void SetView( const SdrView* pSdrView ) diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx index c495db6099a3..b64753689d98 100644 --- a/cui/source/inc/macroass.hxx +++ b/cui/source/inc/macroass.hxx @@ -70,7 +70,7 @@ public: void LaunchFillGroup(); // --------- inherit from the base ------------- - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); bool IsReadOnly() const; diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx index 00e20dbee8b3..8b12c305d8d7 100644 --- a/cui/source/inc/macropg.hxx +++ b/cui/source/inc/macropg.hxx @@ -84,9 +84,9 @@ public: void InitResources(); void InitAndSetHandler( ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > xAppEvents, ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > xDocEvents, ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifiable > xModifiable ); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& ); + virtual void Reset( const SfxItemSet& ); void DisplayAppEvents( bool appEvents); void SetReadOnly( sal_Bool bSet ); diff --git a/cui/source/inc/measure.hxx b/cui/source/inc/measure.hxx index 02273faf2b3f..e52c5ae933b5 100644 --- a/cui/source/inc/measure.hxx +++ b/cui/source/inc/measure.hxx @@ -70,7 +70,7 @@ public: static SfxTabPage* Create( Window*, const SfxItemSet& ); static sal_uInt16* GetRanges(); - virtual sal_Bool FillItemSet( SfxItemSet& ); + virtual bool FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet & ); virtual void PointChanged( Window* pWindow, RECT_POINT eRP ); diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx index 55389f140d2f..4c4fc827c6de 100644 --- a/cui/source/inc/numfmt.hxx +++ b/cui/source/inc/numfmt.hxx @@ -74,7 +74,7 @@ public: const SfxItemSet& rAttrSet ); static sal_uInt16* GetRanges(); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); virtual int DeactivatePage ( SfxItemSet* pSet = NULL ); diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx index d5d07c44ba2f..28c1f8664fb4 100644 --- a/cui/source/inc/numpages.hxx +++ b/cui/source/inc/numpages.hxx @@ -115,7 +115,7 @@ class SvxSingleNumPickTabPage : public SfxTabPage virtual void ActivatePage(const SfxItemSet& rSet); virtual int DeactivatePage(SfxItemSet *pSet); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); void SetNumCharFmtName(const OUString& rName){sNumCharFmtName = rName;} @@ -151,7 +151,7 @@ class SvxBulletPickTabPage : public SfxTabPage virtual void ActivatePage(const SfxItemSet& rSet); virtual int DeactivatePage(SfxItemSet *pSet); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); void SetCharFmtName(const OUString& rName){sBulletCharFmtName = rName;} @@ -194,7 +194,7 @@ class SvxNumPickTabPage : public SfxTabPage virtual void ActivatePage(const SfxItemSet& rSet); virtual int DeactivatePage(SfxItemSet *pSet); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); void SetCharFmtNames(const OUString& rCharName, const OUString& rBulName) @@ -239,7 +239,7 @@ class SvxBitmapPickTabPage : public SfxTabPage virtual void ActivatePage(const SfxItemSet& rSet); virtual int DeactivatePage(SfxItemSet *pSet); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); void SetNumCharFmtName(const OUString& rName){sNumCharFmtName = rName;} @@ -351,7 +351,7 @@ class SvxNumOptionsTabPage : public SfxTabPage virtual void ActivatePage(const SfxItemSet& rSet); virtual int DeactivatePage(SfxItemSet *pSet); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); void SetCharFmts(const OUString& rNumName, const OUString& rBulletName) @@ -451,7 +451,7 @@ public: virtual void ActivatePage(const SfxItemSet& rSet); virtual int DeactivatePage(SfxItemSet *pSet); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); static SfxTabPage* Create( Window* pParent, diff --git a/cui/source/inc/optasian.hxx b/cui/source/inc/optasian.hxx index 20beb246f7b7..b0e41676c9bf 100644 --- a/cui/source/inc/optasian.hxx +++ b/cui/source/inc/optasian.hxx @@ -59,7 +59,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); static sal_uInt16* GetRanges(); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); }; diff --git a/cui/source/inc/optlingu.hxx b/cui/source/inc/optlingu.hxx index 52bcac4999e6..3010389172ec 100644 --- a/cui/source/inc/optlingu.hxx +++ b/cui/source/inc/optlingu.hxx @@ -151,7 +151,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); static sal_uInt16* GetRanges(); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); void HideGroups( sal_uInt16 nGrp ); diff --git a/cui/source/inc/optpath.hxx b/cui/source/inc/optpath.hxx index e1ce74b93d31..caa21eb8d2d6 100644 --- a/cui/source/inc/optpath.hxx +++ b/cui/source/inc/optpath.hxx @@ -75,7 +75,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); static sal_uInt16* GetRanges(); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); virtual void FillUserData(); }; diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx index 49c638ec6625..a06efff172a4 100644 --- a/cui/source/inc/page.hxx +++ b/cui/source/inc/page.hxx @@ -180,7 +180,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); static sal_uInt16* GetRanges(); - virtual sal_Bool FillItemSet( SfxItemSet& rOutSet ); + virtual bool FillItemSet( SfxItemSet& rOutSet ); virtual void Reset( const SfxItemSet& rSet ); virtual void FillUserData(); diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx index 299b6e4ac9b2..911f05a18a5e 100644 --- a/cui/source/inc/paragrph.hxx +++ b/cui/source/inc/paragrph.hxx @@ -102,7 +102,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); static sal_uInt16* GetRanges(); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); @@ -163,7 +163,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); static sal_uInt16* GetRanges(); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); void EnableJustifyExt(); @@ -195,7 +195,7 @@ public: const SfxItemSet& rSet ); static sal_uInt16* GetRanges(); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); void DisablePageBreak(); @@ -275,7 +275,7 @@ public: const SfxItemSet& rSet ); static sal_uInt16* GetRanges(); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); }; diff --git a/cui/source/inc/swpossizetabpage.hxx b/cui/source/inc/swpossizetabpage.hxx index 29289ca011e9..4c4a23b8de3d 100644 --- a/cui/source/inc/swpossizetabpage.hxx +++ b/cui/source/inc/swpossizetabpage.hxx @@ -128,7 +128,7 @@ public: static SfxTabPage* Create( Window*, const SfxItemSet& ); static sal_uInt16* GetRanges(); - virtual sal_Bool FillItemSet( SfxItemSet& ); + virtual bool FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet & ); virtual int DeactivatePage( SfxItemSet* pSet ); diff --git a/cui/source/inc/tabstpge.hxx b/cui/source/inc/tabstpge.hxx index 4ca435b3e484..b6fb6c1f8ddb 100644 --- a/cui/source/inc/tabstpge.hxx +++ b/cui/source/inc/tabstpge.hxx @@ -53,7 +53,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); static sal_uInt16* GetRanges(); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); void DisableControls( const sal_uInt16 nFlag ); diff --git a/cui/source/inc/textanim.hxx b/cui/source/inc/textanim.hxx index 3d6ea3a6be04..a7fd3391e4b1 100644 --- a/cui/source/inc/textanim.hxx +++ b/cui/source/inc/textanim.hxx @@ -79,7 +79,7 @@ public: static SfxTabPage* Create( Window*, const SfxItemSet& ); static sal_uInt16* GetRanges(); - virtual sal_Bool FillItemSet( SfxItemSet& ); + virtual bool FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet & ); void Construct(); diff --git a/cui/source/inc/textattr.hxx b/cui/source/inc/textattr.hxx index adc73177c3ef..be3e1ae39e29 100644 --- a/cui/source/inc/textattr.hxx +++ b/cui/source/inc/textattr.hxx @@ -80,7 +80,7 @@ public: static SfxTabPage* Create( Window*, const SfxItemSet& ); static sal_uInt16* GetRanges(); - virtual sal_Bool FillItemSet( SfxItemSet& ); + virtual bool FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet & ); virtual void PointChanged( Window* pWindow, RECT_POINT eRP ); diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx index 79e6b8e8dbe2..6ae053d8cd01 100644 --- a/cui/source/inc/transfrm.hxx +++ b/cui/source/inc/transfrm.hxx @@ -151,7 +151,7 @@ public: static SfxTabPage* Create( Window*, const SfxItemSet& ); static sal_uInt16* GetRanges(); - virtual sal_Bool FillItemSet( SfxItemSet& ); + virtual bool FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet & ); virtual void ActivatePage( const SfxItemSet& rSet ); @@ -206,7 +206,7 @@ public: static SfxTabPage* Create( Window*, const SfxItemSet& ); static sal_uInt16* GetRanges(); - virtual sal_Bool FillItemSet( SfxItemSet& ); + virtual bool FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet & ); virtual void ActivatePage( const SfxItemSet& rSet ); @@ -250,7 +250,7 @@ public: static SfxTabPage* Create( Window*, const SfxItemSet& ); static sal_uInt16* GetRanges(); - virtual sal_Bool FillItemSet( SfxItemSet& ); + virtual bool FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet & ); virtual void ActivatePage( const SfxItemSet& rSet ); diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx index b966c033176e..b00df7aad0d6 100644 --- a/cui/source/options/connpooloptions.cxx +++ b/cui/source/options/connpooloptions.cxx @@ -382,23 +382,23 @@ namespace offapp } - sal_Bool ConnectionPoolOptionsPage::FillItemSet(SfxItemSet& _rSet) + bool ConnectionPoolOptionsPage::FillItemSet(SfxItemSet& _rSet) { commitTimeoutField(); - sal_Bool bModified = sal_False; + bool bModified = false; // the enabled flag if (m_pEnablePooling->GetSavedValue() != TriState(m_pEnablePooling->IsChecked())) { _rSet.Put(SfxBoolItem(SID_SB_POOLING_ENABLED, m_pEnablePooling->IsChecked()), SID_SB_POOLING_ENABLED); - bModified = sal_True; + bModified = true; } // the settings for the single drivers if (m_pDriverList->isModified()) { _rSet.Put(DriverPoolingSettingsItem(SID_SB_DRIVER_TIMEOUTS, m_pDriverList->getSettings()), SID_SB_DRIVER_TIMEOUTS); - bModified = sal_True; + bModified = true; } return bModified; diff --git a/cui/source/options/connpooloptions.hxx b/cui/source/options/connpooloptions.hxx index 535c8d5f6c93..27fef9a06487 100644 --- a/cui/source/options/connpooloptions.hxx +++ b/cui/source/options/connpooloptions.hxx @@ -56,7 +56,7 @@ namespace offapp protected: virtual bool Notify( NotifyEvent& _rNEvt ); - virtual sal_Bool FillItemSet(SfxItemSet& _rSet); + virtual bool FillItemSet(SfxItemSet& _rSet); virtual void Reset(const SfxItemSet& _rSet); virtual void ActivatePage( const SfxItemSet& _rSet); diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx index 4ea648141bd0..d71d7927054f 100644 --- a/cui/source/options/dbregister.cxx +++ b/cui/source/options/dbregister.cxx @@ -182,10 +182,10 @@ SfxTabPage* DbRegistrationOptionsPage::Create( Window* pParent, -sal_Bool DbRegistrationOptionsPage::FillItemSet( SfxItemSet& rCoreSet ) +bool DbRegistrationOptionsPage::FillItemSet( SfxItemSet& rCoreSet ) { // the settings for the single drivers - sal_Bool bModified = sal_False; + bool bModified = false; DatabaseRegistrations aRegistrations; sal_uLong nCount = pPathBox->GetEntryCount(); for ( sal_uLong i = 0; i < nCount; ++i ) @@ -202,7 +202,7 @@ sal_Bool DbRegistrationOptionsPage::FillItemSet( SfxItemSet& rCoreSet ) if ( m_nOldCount != aRegistrations.size() || m_bModified ) { rCoreSet.Put(DatabaseMapItem( SID_SB_DB_REGISTER, aRegistrations ), SID_SB_DB_REGISTER); - bModified = sal_True; + bModified = true; } return bModified; diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx index 84a4868c6639..86fe6b513ae3 100644 --- a/cui/source/options/fontsubs.cxx +++ b/cui/source/options/fontsubs.cxx @@ -150,7 +150,7 @@ SfxTabPage* SvxFontSubstTabPage::Create( Window* pParent, return new SvxFontSubstTabPage(pParent, rAttrSet); } -sal_Bool SvxFontSubstTabPage::FillItemSet( SfxItemSet& ) +bool SvxFontSubstTabPage::FillItemSet( SfxItemSet& ) { pConfig->ClearSubstitutions();// remove all entries @@ -189,7 +189,7 @@ sal_Bool SvxFontSubstTabPage::FillItemSet( SfxItemSet& ) boost::optional< OUString >(sFontName), batch); batch->commit(); - return sal_False; + return false; } void SvxFontSubstTabPage::Reset( const SfxItemSet& ) diff --git a/cui/source/options/fontsubs.hxx b/cui/source/options/fontsubs.hxx index 16301725b623..bbc891555c9e 100644 --- a/cui/source/options/fontsubs.hxx +++ b/cui/source/options/fontsubs.hxx @@ -96,7 +96,7 @@ class SvxFontSubstTabPage : public SfxTabPage public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); }; diff --git a/cui/source/options/optaboutconfig.cxx b/cui/source/options/optaboutconfig.cxx index df029f024529..0ac465444a23 100644 --- a/cui/source/options/optaboutconfig.cxx +++ b/cui/source/options/optaboutconfig.cxx @@ -187,9 +187,9 @@ void CuiAboutConfigTabPage::Reset(/* const SfxItemSet&*/ ) m_pPrefBox->SetUpdateMode(true); } -sal_Bool CuiAboutConfigTabPage::FillItemSet(/* SfxItemSet&*/ ) +bool CuiAboutConfigTabPage::FillItemSet(/* SfxItemSet&*/ ) { - sal_Bool bModified = sal_False; + bool bModified = false; std::vector< boost::shared_ptr< Prop_Impl > >::iterator pIter; for( pIter = m_vectorOfModified.begin() ; pIter != m_vectorOfModified.end(); ++pIter ) @@ -198,7 +198,7 @@ sal_Bool CuiAboutConfigTabPage::FillItemSet(/* SfxItemSet&*/ ) Reference< XNameReplace > xNameReplace( xUpdateAccess, UNO_QUERY_THROW ); xNameReplace->replaceByName( (*pIter)->Property, (*pIter)->Value ); - bModified = sal_True; + bModified = true; Reference< util::XChangesBatch > xChangesBatch( xUpdateAccess, UNO_QUERY_THROW ); xChangesBatch->commitChanges(); diff --git a/cui/source/options/optaboutconfig.hxx b/cui/source/options/optaboutconfig.hxx index 135fc21e39c5..e9a11d4a37b2 100644 --- a/cui/source/options/optaboutconfig.hxx +++ b/cui/source/options/optaboutconfig.hxx @@ -63,7 +63,7 @@ public: void Reset(/* const SfxItemSet&*/ ); void FillItems(const com::sun::star::uno::Reference<com::sun::star::container::XNameAccess>& xNameAccess); com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > getConfigAccess( const OUString& sNodePath, sal_Bool bUpdate ); - virtual sal_Bool FillItemSet( /* SfxItemSet& rSet*/ ); + virtual bool FillItemSet( /* SfxItemSet& rSet*/ ); virtual Size GetOptimalSize() const; }; diff --git a/cui/source/options/optaccessibility.cxx b/cui/source/options/optaccessibility.cxx index 47a2f5c14aea..88c2a2aea1cd 100644 --- a/cui/source/options/optaccessibility.cxx +++ b/cui/source/options/optaccessibility.cxx @@ -66,7 +66,7 @@ SfxTabPage* SvxAccessibilityOptionsTabPage::Create( Window* pParent, const SfxIt return new SvxAccessibilityOptionsTabPage(pParent, rAttrSet); } -sal_Bool SvxAccessibilityOptionsTabPage::FillItemSet( SfxItemSet& ) +bool SvxAccessibilityOptionsTabPage::FillItemSet( SfxItemSet& ) { //aConfig.Set... from controls @@ -91,7 +91,7 @@ sal_Bool SvxAccessibilityOptionsTabPage::FillItemSet( SfxItemSet& ) Application::MergeSystemSettings( aAllSettings ); Application::SetSettings(aAllSettings); - return sal_False; + return false; } void SvxAccessibilityOptionsTabPage::Reset( const SfxItemSet& ) diff --git a/cui/source/options/optaccessibility.hxx b/cui/source/options/optaccessibility.hxx index c004d23a6b45..400d3ebe1f74 100644 --- a/cui/source/options/optaccessibility.hxx +++ b/cui/source/options/optaccessibility.hxx @@ -46,7 +46,7 @@ public: virtual ~SvxAccessibilityOptionsTabPage(); static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); }; diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx index 2681de82301e..953e742629a8 100644 --- a/cui/source/options/optasian.cxx +++ b/cui/source/options/optasian.cxx @@ -160,7 +160,7 @@ SfxTabPage* SvxAsianLayoutPage::Create( Window* pParent, const SfxItemSet& rAttr return new SvxAsianLayoutPage(pParent, rAttrSet); } -sal_Bool SvxAsianLayoutPage::FillItemSet( SfxItemSet& ) +bool SvxAsianLayoutPage::FillItemSet( SfxItemSet& ) { if(m_pCharKerningRB->IsChecked() != m_pCharKerningRB->GetSavedValue()) { @@ -212,7 +212,7 @@ sal_Bool SvxAsianLayoutPage::FillItemSet( SfxItemSet& ) } eLastUsedLanguageTypeForForbiddenCharacters = m_pLanguageLB->GetSelectLanguage(); - return sal_False; + return false; } void SvxAsianLayoutPage::Reset( const SfxItemSet& ) diff --git a/cui/source/options/optbasic.cxx b/cui/source/options/optbasic.cxx index 366ac536d0a7..bd8c9bd3c5ab 100644 --- a/cui/source/options/optbasic.cxx +++ b/cui/source/options/optbasic.cxx @@ -66,16 +66,16 @@ void SvxBasicIDEOptionsPage::LoadConfig() pUseExtendedTypesChk->Check( bExtended ); } -sal_Bool SvxBasicIDEOptionsPage::FillItemSet( SfxItemSet& /*rCoreSet*/ ) +bool SvxBasicIDEOptionsPage::FillItemSet( SfxItemSet& /*rCoreSet*/ ) { - sal_Bool bModified = sal_False; + bool bModified = false; boost::shared_ptr< comphelper::ConfigurationChanges > batch( comphelper::ConfigurationChanges::create() ); if( TriState(pAutocloseProcChk->IsChecked()) != pAutocloseProcChk->GetSavedValue() ) { officecfg::Office::BasicIDE::Autocomplete::AutocloseProc::set( pAutocloseProcChk->IsChecked(), batch ); CodeCompleteOptions::SetProcedureAutoCompleteOn( pAutocloseProcChk->IsChecked() ); - bModified = sal_True; + bModified = true; } if( TriState(pCodeCompleteChk->IsChecked()) != pCodeCompleteChk->GetSavedValue() ) @@ -83,35 +83,35 @@ sal_Bool SvxBasicIDEOptionsPage::FillItemSet( SfxItemSet& /*rCoreSet*/ ) //boost::shared_ptr< comphelper::ConfigurationChanges > batch( comphelper::ConfigurationChanges::create() ); officecfg::Office::BasicIDE::Autocomplete::CodeComplete::set( pCodeCompleteChk->IsChecked(), batch ); CodeCompleteOptions::SetCodeCompleteOn( pCodeCompleteChk->IsChecked() ); - bModified = sal_True; + bModified = true; } if( TriState(pUseExtendedTypesChk->IsChecked()) != pUseExtendedTypesChk->GetSavedValue() ) { officecfg::Office::BasicIDE::Autocomplete::UseExtended::set( pUseExtendedTypesChk->IsChecked(), batch ); CodeCompleteOptions::SetExtendedTypeDeclaration( pUseExtendedTypesChk->IsChecked() ); - bModified = sal_True; + bModified = true; } if( TriState(pAutocloseParenChk->IsChecked()) != pAutocloseParenChk->GetSavedValue() ) { officecfg::Office::BasicIDE::Autocomplete::AutocloseParenthesis::set( pAutocloseParenChk->IsChecked(), batch ); CodeCompleteOptions::SetAutoCloseParenthesisOn( pAutocloseParenChk->IsChecked() ); - bModified = sal_True; + bModified = true; } if( TriState(pAutocloseQuotesChk->IsChecked()) != pAutocloseQuotesChk->GetSavedValue() ) { officecfg::Office::BasicIDE::Autocomplete::AutocloseDoubleQuotes::set( pAutocloseQuotesChk->IsChecked(), batch ); CodeCompleteOptions::SetAutoCloseQuotesOn( pAutocloseQuotesChk->IsChecked() ); - bModified = sal_True; + bModified = true; } if( TriState(pAutoCorrectChk->IsChecked()) != pAutoCorrectChk->GetSavedValue() ) { officecfg::Office::BasicIDE::Autocomplete::AutoCorrect::set( pAutoCorrectChk->IsChecked(), batch ); CodeCompleteOptions::SetAutoCorrectOn( pAutoCorrectChk->IsChecked() ); - bModified = sal_True; + bModified = true; } if( bModified ) diff --git a/cui/source/options/optbasic.hxx b/cui/source/options/optbasic.hxx index 3e75c8116dbf..13c8490383a9 100644 --- a/cui/source/options/optbasic.hxx +++ b/cui/source/options/optbasic.hxx @@ -41,7 +41,7 @@ public: ~SvxBasicIDEOptionsPage(); static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); virtual void FillUserData(); }; diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx index 5fac95aeaf9e..673a08f013af 100644 --- a/cui/source/options/optchart.cxx +++ b/cui/source/options/optchart.cxx @@ -108,12 +108,12 @@ SfxTabPage* SvxDefaultColorOptPage::Create( Window* pParent, const SfxItemSet& r return new SvxDefaultColorOptPage( pParent, rAttrs ); } -sal_Bool SvxDefaultColorOptPage::FillItemSet( SfxItemSet& rOutAttrs ) +bool SvxDefaultColorOptPage::FillItemSet( SfxItemSet& rOutAttrs ) { if( pColorConfig ) rOutAttrs.Put( *(static_cast< SfxPoolItem* >(pColorConfig))); - return sal_True; + return true; } void SvxDefaultColorOptPage::Reset( const SfxItemSet& ) diff --git a/cui/source/options/optchart.hxx b/cui/source/options/optchart.hxx index 8c38565857c2..d91ebb6b6149 100644 --- a/cui/source/options/optchart.hxx +++ b/cui/source/options/optchart.hxx @@ -64,7 +64,7 @@ public: void Construct(); static SfxTabPage* Create( Window* pParent, const SfxItemSet& rInAttrs ); - virtual sal_Bool FillItemSet( SfxItemSet& rOutAttrs ); + virtual bool FillItemSet( SfxItemSet& rOutAttrs ); virtual void Reset( const SfxItemSet& rInAttrs ); }; diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index 6b97a1aaa182..f29162d19ebb 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -1082,7 +1082,7 @@ SfxTabPage* SvxColorOptionsTabPage::Create( Window* pParent, const SfxItemSet& r return ( new SvxColorOptionsTabPage( pParent, rAttrSet ) ); } -sal_Bool SvxColorOptionsTabPage::FillItemSet( SfxItemSet& ) +bool SvxColorOptionsTabPage::FillItemSet( SfxItemSet& ) { bFillItemSetCalled = sal_True; if(m_pColorSchemeLB->GetSavedValue() != m_pColorSchemeLB->GetSelectEntryPos()) @@ -1094,7 +1094,7 @@ sal_Bool SvxColorOptionsTabPage::FillItemSet( SfxItemSet& ) pColorConfig->Commit(); if(pExtColorConfig->IsModified()) pExtColorConfig->Commit(); - return sal_True; + return true; } void SvxColorOptionsTabPage::Reset( const SfxItemSet& ) diff --git a/cui/source/options/optcolor.hxx b/cui/source/options/optcolor.hxx index 119909fdd7ab..4c6216cf9f27 100644 --- a/cui/source/options/optcolor.hxx +++ b/cui/source/options/optcolor.hxx @@ -52,7 +52,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); virtual int DeactivatePage( SfxItemSet* pSet ); diff --git a/cui/source/options/optctl.cxx b/cui/source/options/optctl.cxx index ebd2e495c813..96e95a53d554 100644 --- a/cui/source/options/optctl.cxx +++ b/cui/source/options/optctl.cxx @@ -66,9 +66,9 @@ SfxTabPage* SvxCTLOptionsPage::Create( Window* pParent, const SfxItemSet& rAttrS return new SvxCTLOptionsPage( pParent, rAttrSet ); } -sal_Bool SvxCTLOptionsPage::FillItemSet( SfxItemSet& ) +bool SvxCTLOptionsPage::FillItemSet( SfxItemSet& ) { - sal_Bool bModified = sal_False; + bool bModified = false; SvtCTLOptions aCTLOptions; // Sequence checking @@ -76,20 +76,20 @@ sal_Bool SvxCTLOptionsPage::FillItemSet( SfxItemSet& ) if ( bChecked != m_pSequenceCheckingCB->GetSavedValue() ) { aCTLOptions.SetCTLSequenceChecking( bChecked ); - bModified = sal_True; + bModified = true; } bChecked = m_pRestrictedCB->IsChecked(); if( bChecked != m_pRestrictedCB->GetSavedValue() ) { aCTLOptions.SetCTLSequenceCheckingRestricted( bChecked ); - bModified = sal_True; + bModified = true; } bChecked = m_pTypeReplaceCB->IsChecked(); if( bChecked != m_pTypeReplaceCB->GetSavedValue()) { aCTLOptions.SetCTLSequenceCheckingTypeAndReplace(bChecked); - bModified = sal_True; + bModified = true; } bool bLogicalChecked = m_pMovementLogicalRB->IsChecked(); @@ -100,14 +100,14 @@ sal_Bool SvxCTLOptionsPage::FillItemSet( SfxItemSet& ) SvtCTLOptions::CursorMovement eMovement = bLogicalChecked ? SvtCTLOptions::MOVEMENT_LOGICAL : SvtCTLOptions::MOVEMENT_VISUAL; aCTLOptions.SetCTLCursorMovement( eMovement ); - bModified = sal_True; + bModified = true; } sal_uInt16 nPos = m_pNumeralsLB->GetSelectEntryPos(); if ( nPos != m_pNumeralsLB->GetSavedValue() ) { aCTLOptions.SetCTLTextNumerals( (SvtCTLOptions::TextNumerals)nPos ); - bModified = sal_True; + bModified = true; } return bModified; diff --git a/cui/source/options/optctl.hxx b/cui/source/options/optctl.hxx index 358698c3ac16..32ae80c86873 100644 --- a/cui/source/options/optctl.hxx +++ b/cui/source/options/optctl.hxx @@ -48,7 +48,7 @@ public: virtual ~SvxCTLOptionsPage(); static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); }; diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx index cf9bc8d45f54..f0f58ea1e90a 100644 --- a/cui/source/options/optfltr.cxx +++ b/cui/source/options/optfltr.cxx @@ -76,7 +76,7 @@ SfxTabPage* OfaMSFilterTabPage::Create( Window* pParent, return new OfaMSFilterTabPage( pParent, rAttrSet ); } -sal_Bool OfaMSFilterTabPage::FillItemSet( SfxItemSet& ) +bool OfaMSFilterTabPage::FillItemSet( SfxItemSet& ) { SvtFilterOptions& rOpt = SvtFilterOptions::Get(); @@ -100,7 +100,7 @@ sal_Bool OfaMSFilterTabPage::FillItemSet( SfxItemSet& ) if( aPBasicStgCB->GetSavedValue() != (bFlag = aPBasicStgCB->IsChecked())) rOpt.SetLoadPPointBasicStorage( bFlag ); - return sal_False; + return false; } void OfaMSFilterTabPage::Reset( const SfxItemSet& ) @@ -170,7 +170,7 @@ SfxTabPage* OfaMSFilterTabPage2::Create( Window* pParent, return new OfaMSFilterTabPage2( pParent, rAttrSet ); } -sal_Bool OfaMSFilterTabPage2::FillItemSet( SfxItemSet& ) +bool OfaMSFilterTabPage2::FillItemSet( SfxItemSet& ) { SvtFilterOptions& rOpt = SvtFilterOptions::Get(); @@ -221,7 +221,7 @@ sal_Bool OfaMSFilterTabPage2::FillItemSet( SfxItemSet& ) } } - return sal_True; + return true; } void OfaMSFilterTabPage2::Reset( const SfxItemSet& ) diff --git a/cui/source/options/optfltr.hxx b/cui/source/options/optfltr.hxx index da6459fc41be..9ee8a71c36a4 100644 --- a/cui/source/options/optfltr.hxx +++ b/cui/source/options/optfltr.hxx @@ -46,7 +46,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); }; @@ -95,7 +95,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); }; diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index 67cc8e44efcb..c3794a85c952 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -242,7 +242,7 @@ SfxTabPage* OfaMiscTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet -sal_Bool OfaMiscTabPage::FillItemSet( SfxItemSet& rSet ) +bool OfaMiscTabPage::FillItemSet( SfxItemSet& rSet ) { sal_Bool bModified = sal_False; @@ -652,7 +652,7 @@ SfxTabPage* OfaViewTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet return new OfaViewTabPage(pParent, rAttrSet); } -sal_Bool OfaViewTabPage::FillItemSet( SfxItemSet& ) +bool OfaViewTabPage::FillItemSet( SfxItemSet& ) { SvtFontOptions aFontOpt; SvtMenuOptions aMenuOpt; @@ -1179,7 +1179,7 @@ static void lcl_UpdateAndDelete(SfxVoidItem* pInvalidItems[], SfxBoolItem* pBool } } -sal_Bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet ) +bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet ) { // lock configuration broadcasters so that we can coordinate the notifications pLangConfig->aSysLocaleOptions.BlockBroadcasts( true ); @@ -1414,7 +1414,7 @@ sal_Bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet ) pLangConfig->aLanguageOptions.BlockBroadcasts( false ); pLangConfig->aLinguConfig.BlockBroadcasts( false ); - return sal_False; + return false; } void OfaLanguagesTabPage::Reset( const SfxItemSet& rSet ) diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx index 79aaeaed8c8a..8c28f7ac31a4 100644 --- a/cui/source/options/optgdlg.hxx +++ b/cui/source/options/optgdlg.hxx @@ -70,7 +70,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); }; @@ -125,7 +125,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); }; @@ -167,7 +167,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); }; #endif // INCLUDED_CUI_SOURCE_OPTIONS_OPTGDLG_HXX diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx index b9e639708bff..647d1fde3fb9 100644 --- a/cui/source/options/optgenrl.cxx +++ b/cui/source/options/optgenrl.cxx @@ -304,19 +304,19 @@ SfxTabPage* SvxGeneralTabPage::Create( Window* pParent, const SfxItemSet& rAttrS -sal_Bool SvxGeneralTabPage::FillItemSet( SfxItemSet& ) +bool SvxGeneralTabPage::FillItemSet( SfxItemSet& ) { // remove leading and trailing whitespaces for (unsigned i = 0; i != vFields.size(); ++i) vFields[i]->pEdit->SetText(comphelper::string::strip(vFields[i]->pEdit->GetText(), ' ')); - sal_Bool bModified = sal_False; + bool bModified = false; bModified |= GetAddress_Impl(); SvtSaveOptions aSaveOpt; if ( m_pUseDataCB->IsChecked() != aSaveOpt.IsUseUserData() ) { aSaveOpt.SetUseUserData( m_pUseDataCB->IsChecked() ); - bModified |= sal_True; + bModified |= true; } return bModified; } @@ -383,7 +383,7 @@ IMPL_LINK( SvxGeneralTabPage, ModifyHdl_Impl, Edit *, pEdit ) -sal_Bool SvxGeneralTabPage::GetAddress_Impl() +bool SvxGeneralTabPage::GetAddress_Impl() { // updating SvtUserOptions aUserOpt; diff --git a/cui/source/options/opthtml.cxx b/cui/source/options/opthtml.cxx index 9b5ecba3a71b..3f71addc63e1 100644 --- a/cui/source/options/opthtml.cxx +++ b/cui/source/options/opthtml.cxx @@ -95,7 +95,7 @@ SfxTabPage* OfaHtmlTabPage::Create( Window* pParent, return new OfaHtmlTabPage(pParent, rAttrSet); } -sal_Bool OfaHtmlTabPage::FillItemSet( SfxItemSet& ) +bool OfaHtmlTabPage::FillItemSet( SfxItemSet& ) { SvxHtmlOptions& rHtmlOpt = SvxHtmlOptions::Get(); if(aSize1NF->GetSavedValue() != aSize1NF->GetText()) @@ -140,7 +140,7 @@ sal_Bool OfaHtmlTabPage::FillItemSet( SfxItemSet& ) if( aCharSetLB->GetSelectTextEncoding() != rHtmlOpt.GetTextEncoding() ) rHtmlOpt.SetTextEncoding( aCharSetLB->GetSelectTextEncoding() ); - return sal_False; + return false; } void OfaHtmlTabPage::Reset( const SfxItemSet& ) diff --git a/cui/source/options/opthtml.hxx b/cui/source/options/opthtml.hxx index 6469f8f75def..2aa122f930ff 100644 --- a/cui/source/options/opthtml.hxx +++ b/cui/source/options/opthtml.hxx @@ -59,7 +59,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); }; diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx index d802fb5dbd35..759c68152165 100644 --- a/cui/source/options/optinet2.cxx +++ b/cui/source/options/optinet2.cxx @@ -393,9 +393,9 @@ void SvxProxyTabPage::Reset(const SfxItemSet&) EnableControls_Impl( m_pProxyModeLB->GetSelectEntryPos() == 2 ); } -sal_Bool SvxProxyTabPage::FillItemSet(SfxItemSet& ) +bool SvxProxyTabPage::FillItemSet(SfxItemSet& ) { - sal_Bool bModified=sal_False; + bool bModified = false; try { Reference< beans::XPropertySet > xPropertySet(m_xConfigurationUpdateAccess, UNO_QUERY_THROW ); @@ -406,54 +406,54 @@ sal_Bool SvxProxyTabPage::FillItemSet(SfxItemSet& ) if( nSelPos == 1 ) { RestoreConfigDefaults_Impl(); - return sal_True; + return true; } xPropertySet->setPropertyValue(aProxyModePN, makeAny((sal_Int32) nSelPos)); - bModified = sal_True; + bModified = true; } if(m_pHttpProxyED->GetSavedValue() != m_pHttpProxyED->GetText()) { xPropertySet->setPropertyValue( aHttpProxyPN, makeAny(m_pHttpProxyED->GetText())); - bModified = sal_True; + bModified = true; } if ( m_pHttpPortED->GetSavedValue() != m_pHttpPortED->GetText() ) { xPropertySet->setPropertyValue( aHttpPortPN, makeAny(m_pHttpPortED->GetText().toInt32())); - bModified = sal_True; + bModified = true; } if( m_pHttpsProxyED->GetSavedValue() != m_pHttpsProxyED->GetText() ) { xPropertySet->setPropertyValue( aHttpsProxyPN, makeAny(m_pHttpsProxyED->GetText()) ); - bModified = sal_True; + bModified = true; } if ( m_pHttpsPortED->GetSavedValue() != m_pHttpsPortED->GetText() ) { xPropertySet->setPropertyValue( aHttpsPortPN, makeAny(m_pHttpsPortED->GetText().toInt32()) ); - bModified = sal_True; + bModified = true; } if( m_pFtpProxyED->GetSavedValue() != m_pFtpProxyED->GetText()) { xPropertySet->setPropertyValue( aFtpProxyPN, makeAny(m_pFtpProxyED->GetText()) ); - bModified = sal_True; + bModified = true; } if ( m_pFtpPortED->GetSavedValue() != m_pFtpPortED->GetText() ) { xPropertySet->setPropertyValue( aFtpPortPN, makeAny(m_pFtpPortED->GetText().toInt32())); - bModified = sal_True; + bModified = true; } if ( m_pNoProxyForED->GetSavedValue() != m_pNoProxyForED->GetText() ) { xPropertySet->setPropertyValue( aNoProxyDescPN, makeAny( m_pNoProxyForED->GetText())); - bModified = sal_True; + bModified = true; } Reference< util::XChangesBatch > xChangesBatch(m_xConfigurationUpdateAccess, UNO_QUERY_THROW); @@ -890,7 +890,7 @@ namespace } } -sal_Bool SvxSecurityTabPage::FillItemSet( SfxItemSet& ) +bool SvxSecurityTabPage::FillItemSet( SfxItemSet& ) { bool bModified = false; @@ -930,7 +930,8 @@ SfxTabPage* MozPluginTabPage::Create( Window* pParent, { return new MozPluginTabPage( pParent, rAttrSet ); } -sal_Bool MozPluginTabPage::FillItemSet( SfxItemSet& ) + +bool MozPluginTabPage::FillItemSet( SfxItemSet& ) { sal_Bool hasInstall = isInstalled(); sal_Bool hasChecked = m_pWBasicCodeCB->IsChecked(); @@ -945,8 +946,9 @@ sal_Bool MozPluginTabPage::FillItemSet( SfxItemSet& ) else{ // do nothing } - return sal_True; + return true; } + void MozPluginTabPage::Reset( const SfxItemSet& ) { m_pWBasicCodeCB->Check( isInstalled()); @@ -1232,7 +1234,7 @@ SfxTabPage* SvxEMailTabPage::Create( Window* pParent, const SfxItemSet& rAttrSe /* -------------------------------------------------------------------------*/ -sal_Bool SvxEMailTabPage::FillItemSet( SfxItemSet& ) +bool SvxEMailTabPage::FillItemSet( SfxItemSet& ) { sal_Bool bMailModified = sal_False; if(!pImpl->aMailConfig.bROProgram && m_pMailerURLED->GetSavedValue() != m_pMailerURLED->GetText()) @@ -1243,7 +1245,7 @@ sal_Bool SvxEMailTabPage::FillItemSet( SfxItemSet& ) if ( bMailModified ) pImpl->aMailConfig.Commit(); - return sal_False; + return false; } /* -------------------------------------------------------------------------*/ diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx index 1403b9e47a32..5b7243f85171 100644 --- a/cui/source/options/optinet2.hxx +++ b/cui/source/options/optinet2.hxx @@ -105,7 +105,7 @@ private: public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); }; @@ -175,7 +175,7 @@ protected: public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); }; @@ -195,7 +195,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); }; @@ -220,7 +220,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); }; diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index bb3f0ed983b5..be81c0c49baf 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -640,22 +640,22 @@ SfxTabPage* SvxJavaOptionsPage::Create( Window* pParent, const SfxItemSet& rAttr -sal_Bool SvxJavaOptionsPage::FillItemSet( SfxItemSet& /*rCoreSet*/ ) +bool SvxJavaOptionsPage::FillItemSet( SfxItemSet& /*rCoreSet*/ ) { - sal_Bool bModified = sal_False; + bool bModified = false; if ( TriState(m_pExperimentalCB->IsChecked()) != m_pExperimentalCB->GetSavedValue() ) { SvtMiscOptions aMiscOpt; aMiscOpt.SetExperimentalMode( m_pExperimentalCB->IsChecked() ); - bModified = sal_True; + bModified = true; } if ( TriState(m_pMacroCB->IsChecked()) != m_pMacroCB->GetSavedValue() ) { SvtMiscOptions aMiscOpt; aMiscOpt.SetMacroRecorderMode( m_pMacroCB->IsChecked() ); - bModified = sal_True; + bModified = true; } #if HAVE_FEATURE_JAVA @@ -674,7 +674,7 @@ sal_Bool SvxJavaOptionsPage::FillItemSet( SfxItemSet& /*rCoreSet*/ ) "SvxJavaOptionsPage::FillItemSet(): error in jfw_setVMParameters" ); pParamArrIter = pParamArr; rtl_freeMemory( pParamArr ); - bModified = sal_True; + bModified = true; } if ( m_pPathDlg ) @@ -685,7 +685,7 @@ sal_Bool SvxJavaOptionsPage::FillItemSet( SfxItemSet& /*rCoreSet*/ ) eErr = jfw_setUserClassPath( sPath.pData ); DBG_ASSERT( JFW_E_NONE == eErr, "SvxJavaOptionsPage::FillItemSet(): error in jfw_setUserClassPath" ); - bModified = sal_True; + bModified = true; } } @@ -721,7 +721,7 @@ sal_Bool SvxJavaOptionsPage::FillItemSet( SfxItemSet& /*rCoreSet*/ ) eErr = jfw_setSelectedJRE( pInfo ); DBG_ASSERT( JFW_E_NONE == eErr, "SvxJavaOptionsPage::FillItemSet(): error in jfw_setSelectedJRE" ); - bModified = sal_True; + bModified = true; } } jfw_freeJavaInfo( pSelectedJava ); @@ -738,7 +738,7 @@ sal_Bool SvxJavaOptionsPage::FillItemSet( SfxItemSet& /*rCoreSet*/ ) eErr = jfw_setEnabled( m_pJavaEnableCB->IsChecked() ); DBG_ASSERT( JFW_E_NONE == eErr, "SvxJavaOptionsPage::FillItemSet(): error in jfw_setEnabled" ); - bModified = sal_True; + bModified = true; } #endif diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx index e37baa756c10..6a438f739b50 100644 --- a/cui/source/options/optjava.hxx +++ b/cui/source/options/optjava.hxx @@ -109,7 +109,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); virtual void FillUserData(); }; diff --git a/cui/source/options/optjsearch.cxx b/cui/source/options/optjsearch.cxx index a3828d9e4717..10bb9e68a474 100644 --- a/cui/source/options/optjsearch.cxx +++ b/cui/source/options/optjsearch.cxx @@ -211,16 +211,16 @@ void SvxJSearchOptionsPage::Reset( const SfxItemSet& ) } -sal_Bool SvxJSearchOptionsPage::FillItemSet( SfxItemSet& ) +bool SvxJSearchOptionsPage::FillItemSet( SfxItemSet& ) { sal_Int32 nOldVal = nTransliterationFlags; nTransliterationFlags = GetTransliterationFlags_Impl(); - sal_Bool bModified = nOldVal != nTransliterationFlags; + bool bModified = nOldVal != nTransliterationFlags; if (!IsSaveOptions()) return bModified; - bModified = sal_False; + bModified = false; SvtSearchOptions aOpt; sal_Bool bNewVal, bChanged; @@ -229,133 +229,133 @@ sal_Bool SvxJSearchOptionsPage::FillItemSet( SfxItemSet& ) if (bChanged) { aOpt.SetMatchCase(!bNewVal ); - bModified = sal_True; + bModified = true; } bNewVal = m_pMatchFullHalfWidth->IsChecked(); bChanged = bNewVal != m_pMatchFullHalfWidth->GetSavedValue(); if (bChanged) { aOpt.SetMatchFullHalfWidthForms( bNewVal ); - bModified = sal_True; + bModified = true; } bNewVal = m_pMatchHiraganaKatakana->IsChecked(); bChanged = bNewVal != m_pMatchHiraganaKatakana->GetSavedValue(); if (bChanged) { aOpt.SetMatchHiraganaKatakana( bNewVal ); - bModified = sal_True; + bModified = true; } bNewVal = m_pMatchContractions->IsChecked(); bChanged = bNewVal != m_pMatchContractions->GetSavedValue(); if (bChanged) { aOpt.SetMatchContractions( bNewVal ); - bModified = sal_True; + bModified = true; } bNewVal = m_pMatchMinusDashChoon->IsChecked(); bChanged = bNewVal != m_pMatchMinusDashChoon->GetSavedValue(); if (bChanged) { aOpt.SetMatchMinusDashChoon( bNewVal ); - bModified = sal_True; + bModified = true; } bNewVal = m_pMatchRepeatCharMarks->IsChecked(); bChanged = bNewVal != m_pMatchRepeatCharMarks->GetSavedValue(); if (bChanged) { aOpt.SetMatchRepeatCharMarks( bNewVal ); - bModified = sal_True; + bModified = true; } bNewVal = m_pMatchVariantFormKanji->IsChecked(); bChanged = bNewVal != m_pMatchVariantFormKanji->GetSavedValue(); if (bChanged) { aOpt.SetMatchVariantFormKanji( bNewVal ); - bModified = sal_True; + bModified = true; } bNewVal = m_pMatchOldKanaForms->IsChecked(); bChanged = bNewVal != m_pMatchOldKanaForms->GetSavedValue(); if (bChanged) { aOpt.SetMatchOldKanaForms( bNewVal ); - bModified = sal_True; + bModified = true; } bNewVal = m_pMatchDiziDuzu->IsChecked(); bChanged = bNewVal != m_pMatchDiziDuzu->GetSavedValue(); if (bChanged) { aOpt.SetMatchDiziDuzu( bNewVal ); - bModified = sal_True; + bModified = true; } bNewVal = m_pMatchBavaHafa->IsChecked(); bChanged = bNewVal != m_pMatchBavaHafa->GetSavedValue(); if (bChanged) { aOpt.SetMatchBavaHafa( bNewVal ); - bModified = sal_True; + bModified = true; } bNewVal = m_pMatchTsithichiDhizi->IsChecked(); bChanged = bNewVal != m_pMatchTsithichiDhizi->GetSavedValue(); if (bChanged) { aOpt.SetMatchTsithichiDhizi( bNewVal ); - bModified = sal_True; + bModified = true; } bNewVal = m_pMatchHyuiyuByuvyu->IsChecked(); bChanged = bNewVal != m_pMatchHyuiyuByuvyu->GetSavedValue(); if (bChanged) { aOpt.SetMatchHyuiyuByuvyu( bNewVal ); - bModified = sal_True; + bModified = true; } bNewVal = m_pMatchSesheZeje->IsChecked(); bChanged = bNewVal != m_pMatchSesheZeje->GetSavedValue(); if (bChanged) { aOpt.SetMatchSesheZeje( bNewVal ); - bModified = sal_True; + bModified = true; } bNewVal = m_pMatchIaiya->IsChecked(); bChanged = bNewVal != m_pMatchIaiya->GetSavedValue(); if (bChanged) { aOpt.SetMatchIaiya( bNewVal ); - bModified = sal_True; + bModified = true; } bNewVal = m_pMatchKiku->IsChecked(); bChanged = bNewVal != m_pMatchKiku->GetSavedValue(); if (bChanged) { aOpt.SetMatchKiku( bNewVal ); - bModified = sal_True; + bModified = true; } bNewVal = m_pIgnorePunctuation->IsChecked(); bChanged = bNewVal != m_pIgnorePunctuation->GetSavedValue(); if (bChanged) { aOpt.SetIgnorePunctuation( bNewVal ); - bModified = sal_True; + bModified = true; } bNewVal = m_pIgnoreWhitespace->IsChecked(); bChanged = bNewVal != m_pIgnoreWhitespace->GetSavedValue(); if (bChanged) { aOpt.SetIgnoreWhitespace( bNewVal ); - bModified = sal_True; + bModified = true; } bNewVal = m_pMatchProlongedSoundMark->IsChecked(); bChanged = bNewVal != m_pMatchProlongedSoundMark->GetSavedValue(); if (bChanged) { aOpt.SetIgnoreProlongedSoundMark( bNewVal ); - bModified = sal_True; + bModified = true; } bNewVal = m_pIgnoreMiddleDot->IsChecked(); bChanged = bNewVal != m_pIgnoreMiddleDot->GetSavedValue(); if (bChanged) { aOpt.SetIgnoreMiddleDot( bNewVal ); - bModified = sal_True; + bModified = true; } return bModified; diff --git a/cui/source/options/optjsearch.hxx b/cui/source/options/optjsearch.hxx index f1231fccda9e..6262375083e3 100644 --- a/cui/source/options/optjsearch.hxx +++ b/cui/source/options/optjsearch.hxx @@ -67,7 +67,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); sal_Bool IsSaveOptions() const { return bSaveOptions; } void EnableSaveOptions( sal_Bool bVal ) { bSaveOptions = bVal; } diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index b2f7c1ee5736..acf6a1269c22 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -1183,9 +1183,9 @@ SfxTabPage* SvxLinguTabPage::Create( Window* pParent, -sal_Bool SvxLinguTabPage::FillItemSet( SfxItemSet& rCoreSet ) +bool SvxLinguTabPage::FillItemSet( SfxItemSet& rCoreSet ) { - sal_Bool bModified = sal_True; // !!!! + bool bModified = true; // !!!! // if not HideGroups was called with GROUP_MODULES... if (m_pLinguModulesCLB->IsVisible()) @@ -1340,7 +1340,7 @@ sal_Bool SvxLinguTabPage::FillItemSet( SfxItemSet& rCoreSet ) { rCoreSet.Put( SfxBoolItem( GetWhich( SID_AUTOSPELL_CHECK ), bNewAutoCheck ) ); - bModified |= sal_True; + bModified |= true; } return bModified; diff --git a/cui/source/options/optmemory.cxx b/cui/source/options/optmemory.cxx index 80249e37e940..f67f5b883b96 100644 --- a/cui/source/options/optmemory.cxx +++ b/cui/source/options/optmemory.cxx @@ -155,9 +155,9 @@ SfxTabPage* OfaMemoryOptionsPage::Create( Window* pParent, const SfxItemSet& rAt -sal_Bool OfaMemoryOptionsPage::FillItemSet( SfxItemSet& rSet ) +bool OfaMemoryOptionsPage::FillItemSet( SfxItemSet& rSet ) { - sal_Bool bModified = sal_False; + bool bModified = false; boost::shared_ptr< comphelper::ConfigurationChanges > batch( comphelper::ConfigurationChanges::create()); @@ -199,7 +199,7 @@ sal_Bool OfaMemoryOptionsPage::FillItemSet( SfxItemSet& rSet ) if( TriState(m_pQuickLaunchCB->IsChecked()) != m_pQuickLaunchCB->GetSavedValue()) { rSet.Put(SfxBoolItem(SID_ATTR_QUICKLAUNCHER, m_pQuickLaunchCB->IsChecked())); - bModified = sal_True; + bModified = true; } return bModified; diff --git a/cui/source/options/optmemory.hxx b/cui/source/options/optmemory.hxx index ba85a7e74e60..cba5303e1b36 100644 --- a/cui/source/options/optmemory.hxx +++ b/cui/source/options/optmemory.hxx @@ -61,7 +61,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); }; diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx index 788d08714e81..9d6f538701cf 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -264,7 +264,7 @@ SfxTabPage* SvxPathTabPage::Create( Window* pParent, -sal_Bool SvxPathTabPage::FillItemSet( SfxItemSet& ) +bool SvxPathTabPage::FillItemSet( SfxItemSet& ) { for ( sal_uInt16 i = 0; i < pPathBox->GetEntryCount(); ++i ) { @@ -273,7 +273,7 @@ sal_Bool SvxPathTabPage::FillItemSet( SfxItemSet& ) if ( pPathImpl->eState == SFX_ITEM_SET ) SetPathList( nRealId, pPathImpl->sUserPath, pPathImpl->sWritablePath ); } - return sal_True; + return true; } diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx index b9490de6c6a4..21a4474618be 100644 --- a/cui/source/options/optsave.cxx +++ b/cui/source/options/optsave.cxx @@ -238,9 +238,9 @@ void SfxSaveTabPage::DetectHiddenControls() } -sal_Bool SfxSaveTabPage::FillItemSet( SfxItemSet& rSet ) +bool SfxSaveTabPage::FillItemSet( SfxItemSet& rSet ) { - sal_Bool bModified = sal_False; + bool bModified = false; SvtSaveOptions aSaveOpt; if(TriState(aLoadUserSettingsCB->IsChecked()) != aLoadUserSettingsCB->GetSavedValue()) { @@ -260,55 +260,55 @@ sal_Bool SfxSaveTabPage::FillItemSet( SfxItemSet& rSet ) { rSet.Put( SfxBoolItem( GetWhich( SID_ATTR_DOCINFO ), aDocInfoCB->IsChecked() ) ); - bModified |= sal_True; + bModified |= true; } if ( aBackupCB->IsEnabled() && TriState(aBackupCB->IsChecked()) != aBackupCB->GetSavedValue() ) { rSet.Put( SfxBoolItem( GetWhich( SID_ATTR_BACKUP ), aBackupCB->IsChecked() ) ); - bModified |= sal_True; + bModified |= true; } if ( TriState(aAutoSaveCB->IsChecked()) != aAutoSaveCB->GetSavedValue() ) { rSet.Put( SfxBoolItem( GetWhich( SID_ATTR_AUTOSAVE ), aAutoSaveCB->IsChecked() ) ); - bModified |= sal_True; + bModified |= true; } if ( TriState(aWarnAlienFormatCB->IsChecked()) != aWarnAlienFormatCB->GetSavedValue() ) { rSet.Put( SfxBoolItem( GetWhich( SID_ATTR_WARNALIENFORMAT ), aWarnAlienFormatCB->IsChecked() ) ); - bModified |= sal_True; + bModified |= true; } if ( aAutoSaveEdit->GetText() != aAutoSaveEdit->GetSavedValue() ) { rSet.Put( SfxUInt16Item( GetWhich( SID_ATTR_AUTOSAVEMINUTE ), (sal_uInt16)aAutoSaveEdit->GetValue() ) ); - bModified |= sal_True; + bModified |= true; } if ( TriState(aUserAutoSaveCB->IsChecked()) != aUserAutoSaveCB->GetSavedValue() ) { rSet.Put( SfxBoolItem( GetWhich( SID_ATTR_USERAUTOSAVE ), aUserAutoSaveCB->IsChecked() ) ); - bModified |= sal_True; + bModified |= true; } // save relatively if ( TriState(aRelativeFsysCB->IsChecked()) != aRelativeFsysCB->GetSavedValue() ) { rSet.Put( SfxBoolItem( GetWhich( SID_SAVEREL_FSYS ), aRelativeFsysCB->IsChecked() ) ); - bModified |= sal_True; + bModified |= true; } if ( TriState(aRelativeInetCB->IsChecked()) != aRelativeInetCB->GetSavedValue() ) { rSet.Put( SfxBoolItem( GetWhich( SID_SAVEREL_INET ), aRelativeInetCB->IsChecked() ) ); - bModified |= sal_True; + bModified |= true; } SvtModuleOptions aModuleOpt; diff --git a/cui/source/options/optsave.hxx b/cui/source/options/optsave.hxx index a3d2a1250e0e..b1a1485c6c7b 100644 --- a/cui/source/options/optsave.hxx +++ b/cui/source/options/optsave.hxx @@ -76,7 +76,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); }; diff --git a/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx index 41f875cccca7..788ef9399322 100644 --- a/cui/source/options/optupdt.cxx +++ b/cui/source/options/optupdt.cxx @@ -157,9 +157,9 @@ SvxOnlineUpdateTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) -sal_Bool SvxOnlineUpdateTabPage::FillItemSet( SfxItemSet& ) +bool SvxOnlineUpdateTabPage::FillItemSet( SfxItemSet& ) { - sal_Bool bModified = sal_False; + bool bModified = false; sal_Bool bValue; sal_Int64 nValue; @@ -168,7 +168,7 @@ sal_Bool SvxOnlineUpdateTabPage::FillItemSet( SfxItemSet& ) { bValue = m_pAutoCheckCheckBox->IsChecked(); m_xUpdateAccess->replaceByName( "AutoCheckEnabled", uno::makeAny( bValue ) ); - bModified = sal_True; + bModified = true; } nValue = 0; @@ -191,14 +191,14 @@ sal_Bool SvxOnlineUpdateTabPage::FillItemSet( SfxItemSet& ) if( nValue > 0 ) { m_xUpdateAccess->replaceByName( "CheckInterval", uno::makeAny( nValue ) ); - bModified = sal_True; + bModified = true; } if( m_pAutoDownloadCheckBox->GetSavedValue() != TriState(m_pAutoDownloadCheckBox->IsChecked()) ) { bValue = m_pAutoDownloadCheckBox->IsChecked(); m_xUpdateAccess->replaceByName( "AutoDownloadEnabled", uno::makeAny( bValue ) ); - bModified = sal_True; + bModified = true; } OUString sValue, aURL; @@ -208,7 +208,7 @@ sal_Bool SvxOnlineUpdateTabPage::FillItemSet( SfxItemSet& ) ( ! aURL.equals( sValue ) ) ) { m_xUpdateAccess->replaceByName( "DownloadDestination", uno::makeAny( aURL ) ); - bModified = sal_True; + bModified = true; } uno::Reference< util::XChangesBatch > xChangesBatch(m_xUpdateAccess, uno::UNO_QUERY); diff --git a/cui/source/options/optupdt.hxx b/cui/source/options/optupdt.hxx index 5610fb0fe9a5..53e049161aa9 100644 --- a/cui/source/options/optupdt.hxx +++ b/cui/source/options/optupdt.hxx @@ -56,7 +56,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); virtual void FillUserData(); }; diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx index 0588e384bdc7..21cb2b4dde41 100644 --- a/cui/source/options/personalization.cxx +++ b/cui/source/options/personalization.cxx @@ -108,7 +108,7 @@ SfxTabPage* SvxPersonalizationTabPage::Create( Window *pParent, const SfxItemSet return new SvxPersonalizationTabPage( pParent, rSet ); } -sal_Bool SvxPersonalizationTabPage::FillItemSet( SfxItemSet & ) +bool SvxPersonalizationTabPage::FillItemSet( SfxItemSet & ) { // persona OUString aPersona( "default" ); diff --git a/cui/source/options/personalization.hxx b/cui/source/options/personalization.hxx index f3ef5228daa7..db323d061b90 100644 --- a/cui/source/options/personalization.hxx +++ b/cui/source/options/personalization.hxx @@ -32,7 +32,7 @@ public: static SfxTabPage* Create( Window *pParent, const SfxItemSet &rSet ); /// Apply the settings ([OK] button). - virtual sal_Bool FillItemSet( SfxItemSet &rSet ); + virtual bool FillItemSet( SfxItemSet &rSet ); /// Reset to default settings ([Revert] button). virtual void Reset( const SfxItemSet &rSet ); diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx index e8610a7cdd94..3f56ffafc6ad 100644 --- a/cui/source/tabpages/align.cxx +++ b/cui/source/tabpages/align.cxx @@ -265,7 +265,7 @@ sal_uInt16* AlignmentTabPage::GetRanges() return s_pRanges; } -sal_Bool AlignmentTabPage::FillItemSet( SfxItemSet& rSet ) +bool AlignmentTabPage::FillItemSet( SfxItemSet& rSet ) { bool bChanged = SfxTabPage::FillItemSet(rSet); diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 848190c048b5..81d76d76e2d0 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -197,7 +197,7 @@ SfxTabPage* OfaAutocorrOptionsPage::Create( Window* pParent, return new OfaAutocorrOptionsPage(pParent, rSet); } -sal_Bool OfaAutocorrOptionsPage::FillItemSet( SfxItemSet& ) +bool OfaAutocorrOptionsPage::FillItemSet( SfxItemSet& ) { SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect(); long nFlags = pAutoCorrect->GetFlags(); @@ -481,7 +481,7 @@ SfxTabPage* OfaSwAutoFmtOptionsPage::Create( Window* pParent, return new OfaSwAutoFmtOptionsPage(pParent, rAttrSet); } -sal_Bool OfaSwAutoFmtOptionsPage::FillItemSet( SfxItemSet& ) +bool OfaSwAutoFmtOptionsPage::FillItemSet( SfxItemSet& ) { bool bModified = false; SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect(); @@ -594,7 +594,7 @@ sal_Bool OfaSwAutoFmtOptionsPage::FillItemSet( SfxItemSet& ) rCfg.Commit(); } - return sal_True; + return true; } void OfaSwAutoFmtOptionsPage::ActivatePage( const SfxItemSet& ) @@ -921,7 +921,7 @@ int OfaAutocorrReplacePage::DeactivatePage( SfxItemSet* ) return LEAVE_PAGE; } -sal_Bool OfaAutocorrReplacePage::FillItemSet( SfxItemSet& ) +bool OfaAutocorrReplacePage::FillItemSet( SfxItemSet& ) { SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect(); @@ -959,7 +959,7 @@ sal_Bool OfaAutocorrReplacePage::FillItemSet( SfxItemSet& ) pAutoCorrect->MakeCombinedChanges( aNewWords, aDeleteWords, eCurrentLang ); } aChangesTable.clear(); - return sal_False; + return false; } void OfaAutocorrReplacePage::RefillReplaceBox(sal_Bool bFromReset, @@ -1422,7 +1422,7 @@ int OfaAutocorrExceptPage::DeactivatePage( SfxItemSet* ) return LEAVE_PAGE; } -sal_Bool OfaAutocorrExceptPage::FillItemSet( SfxItemSet& ) +bool OfaAutocorrExceptPage::FillItemSet( SfxItemSet& ) { SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect(); for(StringsTable::reverse_iterator it1 = aStringsTable.rbegin(); it1 != aStringsTable.rend(); ++it1) @@ -1526,7 +1526,7 @@ sal_Bool OfaAutocorrExceptPage::FillItemSet( SfxItemSet& ) pAutoCorrect->SetAutoCorrFlag( SaveWordCplSttLst, m_pAutoAbbrevCB->IsChecked()); if(TriState(m_pAutoCapsCB->IsChecked()) != m_pAutoCapsCB->GetSavedValue()) pAutoCorrect->SetAutoCorrFlag( SaveWordWrdSttLst, m_pAutoCapsCB->IsChecked()); - return sal_False; + return false; } void OfaAutocorrExceptPage::SetLanguage(LanguageType eSet) @@ -1823,7 +1823,7 @@ SfxTabPage* OfaQuoteTabPage::Create( Window* pParent, return new OfaQuoteTabPage(pParent, rAttrSet); } -sal_Bool OfaQuoteTabPage::FillItemSet( SfxItemSet& ) +bool OfaQuoteTabPage::FillItemSet( SfxItemSet& ) { SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect(); @@ -2148,7 +2148,7 @@ SfxTabPage* OfaAutoCompleteTabPage::Create( Window* pParent, return new OfaAutoCompleteTabPage( pParent, rSet ); } -sal_Bool OfaAutoCompleteTabPage::FillItemSet( SfxItemSet& ) +bool OfaAutoCompleteTabPage::FillItemSet( SfxItemSet& ) { bool bModified = false, bCheck; SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect(); @@ -2198,7 +2198,7 @@ sal_Bool OfaAutoCompleteTabPage::FillItemSet( SfxItemSet& ) rCfg.SetModified(); rCfg.Commit(); } - return sal_True; + return true; } void OfaAutoCompleteTabPage::Reset( const SfxItemSet& ) @@ -2518,7 +2518,7 @@ IMPL_LINK_NOARG(OfaSmartTagOptionsTabPage, SelectHdl) /** Propagates the current settings to the smart tag manager. */ -sal_Bool OfaSmartTagOptionsTabPage::FillItemSet( SfxItemSet& ) +bool OfaSmartTagOptionsTabPage::FillItemSet( SfxItemSet& ) { SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect(); SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags(); @@ -2526,7 +2526,7 @@ sal_Bool OfaSmartTagOptionsTabPage::FillItemSet( SfxItemSet& ) // robust! if ( !pSmartTagMgr ) - return sal_False; + return false; sal_Bool bModifiedSmartTagTypes = sal_False; std::vector< OUString > aDisabledSmartTagTypes; @@ -2556,7 +2556,7 @@ sal_Bool OfaSmartTagOptionsTabPage::FillItemSet( SfxItemSet& ) bModifiedSmartTagTypes ? &aDisabledSmartTagTypes : 0 ); } - return sal_True; + return true; } /** Sets the controls based on the current settings at SmartTagMgr. diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index 19f5a363e1e4..5eea3323ad67 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -733,7 +733,7 @@ void SvxBackgroundTabPage::FillUserData() -sal_Bool SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet ) +bool SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet ) { if ( pPageImpl->pLoadTimer && pPageImpl->pLoadTimer->IsActive() ) { @@ -748,7 +748,7 @@ sal_Bool SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet ) if(SFX_ITEM_AVAILABLE <= rCoreSet.GetItemState(GetWhich(SID_VIEW_FLD_PIC), false)) return FillItemSetWithWallpaperItem( rCoreSet, SID_VIEW_FLD_PIC ); - sal_Bool bModified = sal_False; + bool bModified = false; sal_uInt16 nSlot = SID_ATTR_BRUSH; if ( m_pTblLBox->IsVisible() ) @@ -811,7 +811,7 @@ sal_Bool SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet ) if ( rOldItem.GetColor() != aBgdColor || (SFX_ITEM_AVAILABLE >= eOldItemState && !m_pBackgroundColorSet->IsNoSelection())) { - bModified = sal_True; + bModified = true; rCoreSet.Put( SvxBrushItem( aBgdColor, nWhich ) ); } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) ) @@ -851,7 +851,7 @@ sal_Bool SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet ) != aBgdGraphic.GetBitmap() ) ) { - bModified = sal_True; + bModified = true; SvxBrushItem aTmpBrush(nWhich); if ( bIsLink ) @@ -922,7 +922,7 @@ sal_Bool SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet ) else if ( SID_ATTR_BRUSH_CHAR == nSlot && aBgdColor != Color( COL_WHITE ) ) { rCoreSet.Put( SvxBrushItem( aBgdColor, nWhich ) ); - bModified = sal_True; + bModified = true; } if( m_pTblLBox->IsVisible() ) @@ -936,7 +936,7 @@ sal_Bool SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet ) if ( *pTableBck_Impl->pCellBrush != *pOldCell ) { rCoreSet.Put( *pTableBck_Impl->pCellBrush ); - bModified |= sal_True; + bModified |= true; } } @@ -948,7 +948,7 @@ sal_Bool SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet ) if ( *pTableBck_Impl->pRowBrush != *pOldRow ) { rCoreSet.Put( *pTableBck_Impl->pRowBrush ); - bModified |= sal_True; + bModified |= true; } } @@ -960,7 +960,7 @@ sal_Bool SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet ) if ( *pTableBck_Impl->pTableBrush != *pOldTable ) { rCoreSet.Put( *pTableBck_Impl->pTableBrush ); - bModified |= sal_True; + bModified |= true; } } @@ -968,7 +968,7 @@ sal_Bool SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet ) { rCoreSet.Put( SfxUInt16Item( SID_BACKGRND_DESTINATION, m_pTblLBox->GetSelectEntryPos() ) ); - bModified |= sal_True; + bModified |= true; } } else if (m_pParaLBox->GetData() == m_pParaLBox) @@ -982,7 +982,7 @@ sal_Bool SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet ) if ( *pParaBck_Impl->pParaBrush != *pOldPara ) { rCoreSet.Put( *pParaBck_Impl->pParaBrush ); - bModified |= sal_True; + bModified |= true; } } @@ -998,7 +998,7 @@ sal_Bool SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet ) *pParaBck_Impl->pCharBrush != SvxBrushItem(SID_ATTR_BRUSH_CHAR))) { rCoreSet.Put( *pParaBck_Impl->pCharBrush ); - bModified |= sal_True; + bModified |= true; } } @@ -1006,19 +1006,19 @@ sal_Bool SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet ) { rCoreSet.Put( SfxUInt16Item( SID_BACKGRND_DESTINATION, m_pParaLBox->GetSelectEntryPos() ) ); - bModified |= sal_True; + bModified |= true; } } return bModified; } -sal_Bool SvxBackgroundTabPage::FillItemSetWithWallpaperItem( SfxItemSet& rCoreSet, sal_uInt16 nSlot) +bool SvxBackgroundTabPage::FillItemSetWithWallpaperItem( SfxItemSet& rCoreSet, sal_uInt16 nSlot) { sal_uInt16 nWhich = GetWhich( nSlot ); const SfxPoolItem* pOld = GetOldItem( rCoreSet, nSlot ); DBG_ASSERT(pOld,"FillItemSetWithWallpaperItem: Item not found"); if (!pOld) - return sal_False; + return false; const SfxItemSet& rOldSet = GetItemSet(); SvxBrushItem rOldItem( (const CntWallpaperItem&)*pOld, nWhich ); diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index 10c3c42571d3..d6a35e41a241 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.cxx @@ -593,7 +593,7 @@ int SvxBorderTabPage::DeactivatePage( SfxItemSet* _pSet ) -sal_Bool SvxBorderTabPage::FillItemSet( SfxItemSet& rCoreAttrs ) +bool SvxBorderTabPage::FillItemSet( SfxItemSet& rCoreAttrs ) { bool bAttrsChanged = SfxTabPage::FillItemSet( rCoreAttrs ); diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index 652141c58109..5f8e25540e6d 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -839,9 +839,9 @@ void SvxCharNamePage::Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp -sal_Bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp ) +bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp ) { - sal_Bool bModified = sal_False; + bool bModified = false; FontNameBox* pNameBox = NULL; FontStyleBox* pStyleBox = NULL; @@ -915,7 +915,7 @@ sal_Bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLan if ( bChanged && !rFontName.isEmpty() ) { rSet.Put( aFontItem ); - bModified = sal_True; + bModified = true; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) ) rSet.ClearItem( nWhich ); @@ -965,7 +965,7 @@ sal_Bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLan if ( bChanged && !aText.isEmpty() ) { rSet.Put( aWeightItem ); - bModified = sal_True; + bModified = true; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) ) CLEARTITEM; @@ -1012,7 +1012,7 @@ sal_Bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLan if ( bChanged && !aText.isEmpty() ) { rSet.Put( aPostureItem ); - bModified = sal_True; + bModified = true; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) ) CLEARTITEM; @@ -1072,7 +1072,7 @@ sal_Bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLan float fSize = (float)nSize / 10; rSet.Put( SvxFontHeightItem( CalcToUnit( fSize, eUnit ), 100, nWhich ) ); } - bModified = sal_True; + bModified = true; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) ) CLEARTITEM; @@ -1103,7 +1103,7 @@ sal_Bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLan if ( bChanged && nLangPos != LISTBOX_ENTRY_NOTFOUND ) { rSet.Put( SvxLanguageItem( eLangType, nWhich ) ); - bModified = sal_True; + bModified = true; } else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, false ) ) CLEARTITEM; @@ -1179,9 +1179,9 @@ void SvxCharNamePage::Reset( const SfxItemSet& rSet ) -sal_Bool SvxCharNamePage::FillItemSet( SfxItemSet& rSet ) +bool SvxCharNamePage::FillItemSet( SfxItemSet& rSet ) { - sal_Bool bModified = FillItemSet_Impl( rSet, Western ); + bool bModified = FillItemSet_Impl( rSet, Western ); bModified |= FillItemSet_Impl( rSet, Asian ); bModified |= FillItemSet_Impl( rSet, Ctl ); return bModified; @@ -2161,7 +2161,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet ) -sal_Bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) +bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) { const SfxPoolItem* pOld = 0; const SfxItemSet& rOldSet = GetItemSet(); @@ -3119,7 +3119,7 @@ void SvxCharPositionPage::Reset( const SfxItemSet& rSet ) -sal_Bool SvxCharPositionPage::FillItemSet( SfxItemSet& rSet ) +bool SvxCharPositionPage::FillItemSet( SfxItemSet& rSet ) { // Position (high, normal or low) const SfxItemSet& rOldSet = GetItemSet(); @@ -3465,7 +3465,7 @@ void SvxCharTwoLinesPage::Reset( const SfxItemSet& rSet ) -sal_Bool SvxCharTwoLinesPage::FillItemSet( SfxItemSet& rSet ) +bool SvxCharTwoLinesPage::FillItemSet( SfxItemSet& rSet ) { const SfxItemSet& rOldSet = GetItemSet(); sal_Bool bModified = sal_False, bChanged = sal_True; diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx index e16950107a1e..3fa0f2e395a2 100644 --- a/cui/source/tabpages/connect.cxx +++ b/cui/source/tabpages/connect.cxx @@ -308,58 +308,58 @@ void SvxConnectionPage::Reset( const SfxItemSet& rAttrs ) |* \************************************************************************/ -sal_Bool SvxConnectionPage::FillItemSet( SfxItemSet& rAttrs) +bool SvxConnectionPage::FillItemSet( SfxItemSet& rAttrs) { - sal_Bool bModified = sal_False; + bool bModified = false; sal_Int32 nValue; if( m_pMtrFldHorz1->GetText() != m_pMtrFldHorz1->GetSavedValue() ) { nValue = GetCoreValue( *m_pMtrFldHorz1, eUnit ); rAttrs.Put( SdrEdgeNode1HorzDistItem( nValue ) ); - bModified = sal_True; + bModified = true; } if( m_pMtrFldHorz2->GetText() != m_pMtrFldHorz2->GetSavedValue() ) { nValue = GetCoreValue( *m_pMtrFldHorz2, eUnit ); rAttrs.Put( SdrEdgeNode2HorzDistItem( nValue ) ); - bModified = sal_True; + bModified = true; } if( m_pMtrFldVert1->GetText() != m_pMtrFldVert1->GetSavedValue() ) { nValue = GetCoreValue( *m_pMtrFldVert1, eUnit ); rAttrs.Put( SdrEdgeNode1VertDistItem( nValue ) ); - bModified = sal_True; + bModified = true; } if( m_pMtrFldVert2->GetText() != m_pMtrFldVert2->GetSavedValue() ) { nValue = GetCoreValue( *m_pMtrFldVert2, eUnit ); rAttrs.Put( SdrEdgeNode2VertDistItem( nValue ) ); - bModified = sal_True; + bModified = true; } if( m_pMtrFldLine1->GetText() != m_pMtrFldLine1->GetSavedValue() ) { nValue = GetCoreValue( *m_pMtrFldLine1, eUnit ); rAttrs.Put( SdrEdgeLine1DeltaItem( nValue ) ); - bModified = sal_True; + bModified = true; } if( m_pMtrFldLine2->GetText() != m_pMtrFldLine2->GetSavedValue() ) { nValue = GetCoreValue( *m_pMtrFldLine2, eUnit ); rAttrs.Put( SdrEdgeLine2DeltaItem( nValue ) ); - bModified = sal_True; + bModified = true; } if( m_pMtrFldLine3->GetText() != m_pMtrFldLine3->GetSavedValue() ) { nValue = GetCoreValue( *m_pMtrFldLine3, eUnit ); rAttrs.Put( SdrEdgeLine3DeltaItem( nValue ) ); - bModified = sal_True; + bModified = true; } @@ -369,7 +369,7 @@ sal_Bool SvxConnectionPage::FillItemSet( SfxItemSet& rAttrs) if( nPos != LISTBOX_ENTRY_NOTFOUND ) { rAttrs.Put( SdrEdgeKindItem( (SdrEdgeKind) nPos ) ); - bModified = sal_True; + bModified = true; } } diff --git a/cui/source/tabpages/dstribut.cxx b/cui/source/tabpages/dstribut.cxx index 11a546e1b238..4f177947b3f9 100644 --- a/cui/source/tabpages/dstribut.cxx +++ b/cui/source/tabpages/dstribut.cxx @@ -130,7 +130,7 @@ void SvxDistributePage::Reset(const SfxItemSet& ) |* \************************************************************************/ -sal_Bool SvxDistributePage::FillItemSet( SfxItemSet& ) +bool SvxDistributePage::FillItemSet( SfxItemSet& ) { SvxDistributeHorizontal eDistributeHor(SvxDistributeHorizontalNone); SvxDistributeVertical eDistributeVer(SvxDistributeVerticalNone); @@ -157,10 +157,10 @@ sal_Bool SvxDistributePage::FillItemSet( SfxItemSet& ) { m_eDistributeHor = eDistributeHor; m_eDistributeVer = eDistributeVer; - return sal_True; + return true; } - return sal_False; + return false; } diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx index e4bc0aef15c3..0c673b167c38 100644 --- a/cui/source/tabpages/grfpage.cxx +++ b/cui/source/tabpages/grfpage.cxx @@ -233,7 +233,7 @@ void SvxGrfCropPage::Reset( const SfxItemSet &rSet ) bReset = sal_False; } -sal_Bool SvxGrfCropPage::FillItemSet(SfxItemSet &rSet) +bool SvxGrfCropPage::FillItemSet(SfxItemSet &rSet) { const SfxItemPool& rPool = *rSet.GetPool(); bool bModified = false; diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx index daaad329d804..a46fffdfc44f 100644 --- a/cui/source/tabpages/labdlg.cxx +++ b/cui/source/tabpages/labdlg.cxx @@ -140,7 +140,7 @@ void SvxCaptionTabPage::Construct() -sal_Bool SvxCaptionTabPage::FillItemSet( SfxItemSet& _rOutAttrs) +bool SvxCaptionTabPage::FillItemSet( SfxItemSet& _rOutAttrs) { SfxItemPool* pPool = _rOutAttrs.GetPool(); DBG_ASSERT( pPool, "Wo ist der Pool" ); @@ -207,7 +207,7 @@ sal_Bool SvxCaptionTabPage::FillItemSet( SfxItemSet& _rOutAttrs) //NYI-------------the angles have to be added here!!! XXX---------------------- - return( sal_True ); + return true; } diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx index 85d51c0e4588..1f9307854dd9 100644 --- a/cui/source/tabpages/macroass.cxx +++ b/cui/source/tabpages/macroass.cxx @@ -172,7 +172,7 @@ void _SfxMacroTabPage::ScriptChanged() EnableButtons(); } -sal_Bool _SfxMacroTabPage::FillItemSet( SfxItemSet& rSet ) +bool _SfxMacroTabPage::FillItemSet( SfxItemSet& rSet ) { SvxMacroItem aItem( GetWhich( aPageRg[0] ) ); ((SvxMacroTableDtor&)aItem.GetMacroTable()) = aTbl; @@ -182,9 +182,9 @@ sal_Bool _SfxMacroTabPage::FillItemSet( SfxItemSet& rSet ) || aItem != *(SvxMacroItem*)pItem ) { rSet.Put( aItem ); - return sal_True; + return true; } - return sal_False; + return false; } void _SfxMacroTabPage::LaunchFillGroup() diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx index bc617adfc63a..79ba0843c44e 100644 --- a/cui/source/tabpages/measure.cxx +++ b/cui/source/tabpages/measure.cxx @@ -418,7 +418,7 @@ void SvxMeasurePage::Reset( const SfxItemSet& rAttrs ) |* \************************************************************************/ -sal_Bool SvxMeasurePage::FillItemSet( SfxItemSet& rAttrs) +bool SvxMeasurePage::FillItemSet( SfxItemSet& rAttrs) { sal_Bool bModified = sal_False; sal_Int32 nValue; diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index 4c380af2f37a..837f18ce69d7 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -685,7 +685,7 @@ void SvxNumberFormatTabPage::HideLanguage(sal_Bool nFlag) #* #************************************************************************/ -sal_Bool SvxNumberFormatTabPage::FillItemSet( SfxItemSet& rCoreAttrs ) +bool SvxNumberFormatTabPage::FillItemSet( SfxItemSet& rCoreAttrs ) { sal_Bool bDataChanged = m_pFtLanguage->IsEnabled() || m_pCbSourceFormat->IsEnabled(); if ( bDataChanged ) diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index f7716977298d..ffcc27828317 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -228,7 +228,7 @@ SfxTabPage* SvxSingleNumPickTabPage::Create( Window* pParent, return new SvxSingleNumPickTabPage(pParent, rAttrSet); } -sal_Bool SvxSingleNumPickTabPage::FillItemSet( SfxItemSet& rSet ) +bool SvxSingleNumPickTabPage::FillItemSet( SfxItemSet& rSet ) { if( (bPreset || bModified) && pSaveNum) { @@ -389,7 +389,7 @@ SfxTabPage* SvxBulletPickTabPage::Create( Window* pParent, return new SvxBulletPickTabPage(pParent, rAttrSet); } -sal_Bool SvxBulletPickTabPage::FillItemSet( SfxItemSet& rSet ) +bool SvxBulletPickTabPage::FillItemSet( SfxItemSet& rSet ) { if( (bPreset || bModified) && pActNum) { @@ -586,7 +586,7 @@ SfxTabPage* SvxNumPickTabPage::Create( Window* pParent, return new SvxNumPickTabPage(pParent, rAttrSet); } -sal_Bool SvxNumPickTabPage::FillItemSet( SfxItemSet& rSet ) +bool SvxNumPickTabPage::FillItemSet( SfxItemSet& rSet ) { if( (bPreset || bModified) && pActNum) { @@ -869,11 +869,11 @@ int SvxBitmapPickTabPage::DeactivatePage(SfxItemSet *_pSet) return sal_True; } -sal_Bool SvxBitmapPickTabPage::FillItemSet( SfxItemSet& rSet ) +bool SvxBitmapPickTabPage::FillItemSet( SfxItemSet& rSet ) { if ( aGrfNames.empty() ) { - return sal_False; + return false; } if( (bPreset || bModified) && pActNum) { @@ -1194,7 +1194,7 @@ int SvxNumOptionsTabPage::DeactivatePage(SfxItemSet * _pSet) return sal_True; } -sal_Bool SvxNumOptionsTabPage::FillItemSet( SfxItemSet& rSet ) +bool SvxNumOptionsTabPage::FillItemSet( SfxItemSet& rSet ) { rSet.Put(SfxUInt16Item(SID_PARAM_CUR_NUM_LEVEL, nActNumLvl)); if(bModified && pActNum) @@ -2961,7 +2961,7 @@ int SvxNumPositionTabPage::DeactivatePage(SfxItemSet *_pSet) return sal_True; } -sal_Bool SvxNumPositionTabPage::FillItemSet( SfxItemSet& rSet ) +bool SvxNumPositionTabPage::FillItemSet( SfxItemSet& rSet ) { rSet.Put(SfxUInt16Item(SID_PARAM_CUR_NUM_LEVEL, nActNumLvl)); diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index 58853eef05c8..84bf61c6579b 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -661,7 +661,7 @@ void SvxPageDescPage::FillUserData() -sal_Bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet ) +bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet ) { sal_Bool bModified = sal_False; const SfxItemSet& rOldSet = GetItemSet(); diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index 35d76d7fd31f..6cb2a847213a 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -198,7 +198,7 @@ SfxTabPage* SvxStdParagraphTabPage::Create( Window* pParent, const SfxItemSet& r return new SvxStdParagraphTabPage( pParent, rSet ); } -sal_Bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) +bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) { SfxItemState eState = SFX_ITEM_UNKNOWN; const SfxPoolItem* pOld = 0; @@ -1054,7 +1054,7 @@ sal_uInt16* SvxParaAlignTabPage::GetRanges() return pAlignRanges; } -sal_Bool SvxParaAlignTabPage::FillItemSet( SfxItemSet& rOutSet ) +bool SvxParaAlignTabPage::FillItemSet( SfxItemSet& rOutSet ) { sal_Bool bModified = sal_False; @@ -1324,7 +1324,7 @@ SfxTabPage* SvxExtParagraphTabPage::Create( Window* pParent, return new SvxExtParagraphTabPage( pParent, rSet ); } -sal_Bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) +bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) { sal_Bool bModified = sal_False; sal_uInt16 _nWhich = GetWhich( SID_ATTR_PARA_HYPHENZONE ); @@ -2147,7 +2147,7 @@ sal_uInt16* SvxAsianTabPage::GetRanges() return pRanges; } -sal_Bool SvxAsianTabPage::FillItemSet( SfxItemSet& rSet ) +bool SvxAsianTabPage::FillItemSet( SfxItemSet& rSet ) { sal_Bool bRet = sal_False; SfxItemPool* pPool = rSet.GetPool(); diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx index 0b9a01cc3d54..a18c90354e47 100644 --- a/cui/source/tabpages/swpossizetabpage.cxx +++ b/cui/source/tabpages/swpossizetabpage.cxx @@ -726,7 +726,7 @@ sal_uInt16* SvxSwPosSizeTabPage::GetRanges() return pSwPosRanges; } -sal_Bool SvxSwPosSizeTabPage::FillItemSet( SfxItemSet& rSet) +bool SvxSwPosSizeTabPage::FillItemSet( SfxItemSet& rSet) { bool bAnchorChanged = false; short nAnchor = GetAnchorType(&bAnchorChanged); diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx index ae4706eae637..afaff7c771c8 100644 --- a/cui/source/tabpages/tabstpge.cxx +++ b/cui/source/tabpages/tabstpge.cxx @@ -201,7 +201,7 @@ sal_uInt16* SvxTabulatorTabPage::GetRanges() -sal_Bool SvxTabulatorTabPage::FillItemSet( SfxItemSet& rSet ) +bool SvxTabulatorTabPage::FillItemSet( SfxItemSet& rSet ) { sal_Bool bModified = sal_False; diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx index 139c3d179b55..accca2fe1b7b 100644 --- a/cui/source/tabpages/textanim.cxx +++ b/cui/source/tabpages/textanim.cxx @@ -332,7 +332,7 @@ void SvxTextAnimationPage::Reset( const SfxItemSet& rAttrs ) |* \************************************************************************/ -sal_Bool SvxTextAnimationPage::FillItemSet( SfxItemSet& rAttrs) +bool SvxTextAnimationPage::FillItemSet( SfxItemSet& rAttrs) { sal_Bool bModified = sal_False; sal_Int32 nPos; diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx index 282d00920dba..84c4f2fbbdcd 100644 --- a/cui/source/tabpages/textattr.cxx +++ b/cui/source/tabpages/textattr.cxx @@ -320,7 +320,7 @@ void SvxTextAttrPage::Reset( const SfxItemSet& rAttrs ) |* \************************************************************************/ -sal_Bool SvxTextAttrPage::FillItemSet( SfxItemSet& rAttrs) +bool SvxTextAttrPage::FillItemSet( SfxItemSet& rAttrs) { SfxItemPool* pPool = rAttrs.GetPool(); DBG_ASSERT( pPool, "Wo ist der Pool" ); @@ -460,7 +460,7 @@ sal_Bool SvxTextAttrPage::FillItemSet( SfxItemSet& rAttrs) rAttrs.Put( SdrTextHorzAdjustItem( eTHA ) ); } - return( sal_True ); + return true; } void SvxTextAttrPage::Construct() diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx index 488c8e1ddf93..43dd000f766d 100644 --- a/cui/source/tabpages/tparea.cxx +++ b/cui/source/tabpages/tparea.cxx @@ -293,7 +293,7 @@ sal_uInt16* SvxTransparenceTabPage::GetRanges() return(pTransparenceRanges); } -sal_Bool SvxTransparenceTabPage::FillItemSet(SfxItemSet& rAttrs) +bool SvxTransparenceTabPage::FillItemSet(SfxItemSet& rAttrs) { const SfxPoolItem* pGradientItem = NULL; const SfxPoolItem* pLinearItem = NULL; @@ -966,7 +966,7 @@ int SvxAreaTabPage::DeactivatePage( SfxItemSet* _pSet ) -sal_Bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) +bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) { sal_Int32 _nPos; sal_Bool bModified = sal_False; diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index 17aadf2be2cc..8853bc957c54 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -225,7 +225,7 @@ int SvxBitmapTabPage::DeactivatePage( SfxItemSet* _pSet) -sal_Bool SvxBitmapTabPage::FillItemSet( SfxItemSet& _rOutAttrs ) +bool SvxBitmapTabPage::FillItemSet( SfxItemSet& _rOutAttrs ) { if( nDlgType == 0 && *pbAreaTP == sal_False ) // area dialog { @@ -249,7 +249,7 @@ sal_Bool SvxBitmapTabPage::FillItemSet( SfxItemSet& _rOutAttrs ) } } - return sal_True; + return true; } diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index 6f242a794b65..b9bef9861b68 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -556,7 +556,7 @@ long SvxColorTabPage::CheckChanges_Impl() -sal_Bool SvxColorTabPage::FillItemSet( SfxItemSet& rSet ) +bool SvxColorTabPage::FillItemSet( SfxItemSet& rSet ) { if( ( nDlgType != 0 ) || ( *pPageType == PT_COLOR && *pbAreaTP == sal_False ) ) @@ -580,7 +580,7 @@ sal_Bool SvxColorTabPage::FillItemSet( SfxItemSet& rSet ) rSet.Put( XFillStyleItem( XFILL_SOLID ) ); } - return( sal_True ); + return true; } void SvxColorTabPage::UpdateModified() diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx index def2fa7bfa0f..18b8ccec7f3c 100644 --- a/cui/source/tabpages/tpgradnt.cxx +++ b/cui/source/tabpages/tpgradnt.cxx @@ -306,7 +306,7 @@ long SvxGradientTabPage::CheckChanges_Impl() -sal_Bool SvxGradientTabPage::FillItemSet( SfxItemSet& rSet ) +bool SvxGradientTabPage::FillItemSet( SfxItemSet& rSet ) { if( nDlgType == 0 && *pPageType == PT_GRADIENT && *pbAreaTP == sal_False ) { @@ -340,7 +340,7 @@ sal_Bool SvxGradientTabPage::FillItemSet( SfxItemSet& rSet ) delete pXGradient; } - return sal_True; + return true; } diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx index 374c4c77864b..e79b839e1580 100644 --- a/cui/source/tabpages/tphatch.cxx +++ b/cui/source/tabpages/tphatch.cxx @@ -278,7 +278,7 @@ long SvxHatchTabPage::CheckChanges_Impl() -sal_Bool SvxHatchTabPage::FillItemSet( SfxItemSet& rSet ) +bool SvxHatchTabPage::FillItemSet( SfxItemSet& rSet ) { if( nDlgType == 0 && *pbAreaTP == sal_False ) // area dialog { @@ -309,7 +309,7 @@ sal_Bool SvxHatchTabPage::FillItemSet( SfxItemSet& rSet ) delete pXHatch; } } - return sal_True; + return true; } diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index 6bd4deddd722..a9a27e4c6c4c 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -666,7 +666,7 @@ int SvxLineTabPage::DeactivatePage( SfxItemSet* _pSet ) -sal_Bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs ) +bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs ) { const SfxPoolItem* pOld = NULL; sal_Int32 nPos; diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx index 6f63b82680fb..7be9c1bcc07b 100644 --- a/cui/source/tabpages/tplnedef.cxx +++ b/cui/source/tabpages/tplnedef.cxx @@ -257,7 +257,7 @@ void SvxLineDefTabPage::CheckChanges_Impl() -sal_Bool SvxLineDefTabPage::FillItemSet( SfxItemSet& rAttrs ) +bool SvxLineDefTabPage::FillItemSet( SfxItemSet& rAttrs ) { if( nDlgType == 0 ) // line dialog { @@ -270,7 +270,7 @@ sal_Bool SvxLineDefTabPage::FillItemSet( SfxItemSet& rAttrs ) rAttrs.Put( XLineDashItem( aString, aDash ) ); } } - return( sal_True ); + return true; } diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx index 7e38307ed807..cad882b53a98 100644 --- a/cui/source/tabpages/tplneend.cxx +++ b/cui/source/tabpages/tplneend.cxx @@ -205,7 +205,7 @@ void SvxLineEndDefTabPage::CheckChanges_Impl() -sal_Bool SvxLineEndDefTabPage::FillItemSet( SfxItemSet& rSet ) +bool SvxLineEndDefTabPage::FillItemSet( SfxItemSet& rSet ) { if( nDlgType == 0 ) // line dialog { @@ -220,7 +220,7 @@ sal_Bool SvxLineEndDefTabPage::FillItemSet( SfxItemSet& rSet ) rSet.Put( XLineEndItem( pEntry->GetName(), pEntry->GetLineEnd() ) ); } } - return( sal_True ); + return true; } diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx index 98378f102172..77ca6c1c9fd5 100644 --- a/cui/source/tabpages/tpshadow.cxx +++ b/cui/source/tabpages/tpshadow.cxx @@ -244,7 +244,7 @@ int SvxShadowTabPage::DeactivatePage( SfxItemSet* _pSet ) -sal_Bool SvxShadowTabPage::FillItemSet( SfxItemSet& rAttrs ) +bool SvxShadowTabPage::FillItemSet( SfxItemSet& rAttrs ) { const SfxPoolItem* pOld = NULL; sal_Bool bModified = sal_False; diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx index bdaee0c24cc7..5a991bfb1298 100644 --- a/cui/source/tabpages/transfrm.cxx +++ b/cui/source/tabpages/transfrm.cxx @@ -273,7 +273,7 @@ void SvxAngleTabPage::Construct() } } -sal_Bool SvxAngleTabPage::FillItemSet(SfxItemSet& rSet) +bool SvxAngleTabPage::FillItemSet(SfxItemSet& rSet) { sal_Bool bModified = sal_False; @@ -476,7 +476,7 @@ void SvxSlantTabPage::Construct() -sal_Bool SvxSlantTabPage::FillItemSet(SfxItemSet& rAttrs) +bool SvxSlantTabPage::FillItemSet(SfxItemSet& rAttrs) { sal_Bool bModified = sal_False; OUString aStr = m_pMtrRadius->GetText(); @@ -782,7 +782,7 @@ void SvxPositionSizeTabPage::Construct() -sal_Bool SvxPositionSizeTabPage::FillItemSet( SfxItemSet& rOutAttrs ) +bool SvxPositionSizeTabPage::FillItemSet( SfxItemSet& rOutAttrs ) { sal_Bool bModified(sal_False); diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx index 8c3cc7ae2e1c..19b68baf96cf 100644 --- a/dbaccess/source/ui/dlg/ConnectionPage.cxx +++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx @@ -278,7 +278,7 @@ namespace dbaui OConnectionHelper::fillControls(_rControlList); } - sal_Bool OConnectionTabPage::FillItemSet(SfxItemSet& _rSet) + bool OConnectionTabPage::FillItemSet(SfxItemSet& _rSet) { sal_Bool bChangedSomething = sal_False; diff --git a/dbaccess/source/ui/dlg/ConnectionPage.hxx b/dbaccess/source/ui/dlg/ConnectionPage.hxx index 863077136561..468a1cc7fa38 100644 --- a/dbaccess/source/ui/dlg/ConnectionPage.hxx +++ b/dbaccess/source/ui/dlg/ConnectionPage.hxx @@ -58,7 +58,7 @@ namespace dbaui public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& _rAttrSet ); - virtual sal_Bool FillItemSet (SfxItemSet& _rCoreAttrs); + virtual bool FillItemSet (SfxItemSet& _rCoreAttrs); virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue); diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx index 1f199285544a..922927b2397c 100644 --- a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx +++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx @@ -180,7 +180,7 @@ namespace dbaui return commitURL(); } - sal_Bool OConnectionTabPageSetup::FillItemSet(SfxItemSet& _rSet) + bool OConnectionTabPageSetup::FillItemSet(SfxItemSet& _rSet) { sal_Bool bChangedSomething = sal_False; fillString(_rSet,&m_aConnectionURL, DSID_CONNECTURL, bChangedSomething); diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx index b6d54b32d614..8d5372ee0f1f 100644 --- a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx +++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx @@ -51,7 +51,7 @@ namespace dbaui static OGenericAdministrationPage* CreateODBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); static OGenericAdministrationPage* CreateUserDefinedTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); - virtual sal_Bool FillItemSet (SfxItemSet& _rCoreAttrs); + virtual bool FillItemSet (SfxItemSet& _rCoreAttrs); virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue); virtual bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason ); diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx index 24bec7cb8f6a..11d6871e48fc 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx @@ -116,7 +116,7 @@ using namespace ::com::sun::star; m_pTextConnectionHelper->implInitControls(_rSet, bValid); } - sal_Bool OTextConnectionPageSetup::FillItemSet( SfxItemSet& _rSet ) + bool OTextConnectionPageSetup::FillItemSet( SfxItemSet& _rSet ) { sal_Bool bChangedSomething = OConnectionTabPageSetup::FillItemSet(_rSet); bChangedSomething = m_pTextConnectionHelper->FillItemSet(_rSet, bChangedSomething); @@ -156,7 +156,7 @@ using namespace ::com::sun::star; FreeResource(); } - sal_Bool OLDAPConnectionPageSetup::FillItemSet( SfxItemSet& _rSet ) + bool OLDAPConnectionPageSetup::FillItemSet( SfxItemSet& _rSet ) { sal_Bool bChangedSomething = sal_False; fillString(_rSet,&m_aETBaseDN,DSID_CONN_LDAP_BASEDN, bChangedSomething); @@ -281,10 +281,10 @@ using namespace ::com::sun::star; { } - sal_Bool OMySQLIntroPageSetup::FillItemSet(SfxItemSet& /*_rSet*/) + bool OMySQLIntroPageSetup::FillItemSet(SfxItemSet& /*_rSet*/) { OSL_FAIL("Who called me?! Please ask oj for more information."); - return sal_True; + return true; } OMySQLIntroPageSetup::ConnectionType OMySQLIntroPageSetup::getMySQLMode() @@ -329,7 +329,7 @@ using namespace ::com::sun::star; m_aMySQLSettings.fillWindows( _rControlList ); } - sal_Bool MySQLNativeSetupPage::FillItemSet( SfxItemSet& _rSet ) + bool MySQLNativeSetupPage::FillItemSet( SfxItemSet& _rSet ) { return m_aMySQLSettings.FillItemSet( _rSet ); } @@ -439,7 +439,7 @@ using namespace ::com::sun::star; _rControlList.push_back(new ODisableWrapper<FixedText>(&m_aFTDriverClass)); } - sal_Bool OGeneralSpecialJDBCConnectionPageSetup::FillItemSet( SfxItemSet& _rSet ) + bool OGeneralSpecialJDBCConnectionPageSetup::FillItemSet( SfxItemSet& _rSet ) { sal_Bool bChangedSomething = sal_False; fillString(_rSet,&m_aETDriverClass,DSID_JDBCDRIVERCLASS,bChangedSomething); @@ -551,7 +551,7 @@ using namespace ::com::sun::star; _rControlList.push_back(new ODisableWrapper<FixedText>(&m_aFTDriverClass)); } - sal_Bool OJDBCConnectionPageSetup::FillItemSet( SfxItemSet& _rSet ) + bool OJDBCConnectionPageSetup::FillItemSet( SfxItemSet& _rSet ) { sal_Bool bChangedSomething = OConnectionTabPageSetup::FillItemSet(_rSet); fillString(_rSet,&m_aETDriverClass,DSID_JDBCDRIVERCLASS,bChangedSomething); @@ -668,7 +668,7 @@ using namespace ::com::sun::star; OConnectionTabPageSetup::implInitControls(_rSet, _bSaveValue); } - sal_Bool OSpreadSheetConnectionPageSetup::FillItemSet( SfxItemSet& _rSet ) + bool OSpreadSheetConnectionPageSetup::FillItemSet( SfxItemSet& _rSet ) { sal_Bool bChangedSomething = OConnectionTabPageSetup::FillItemSet(_rSet); fillBool(_rSet,&m_aCBPasswordrequired,DSID_PASSWORDREQUIRED,bChangedSomething); @@ -732,7 +732,7 @@ using namespace ::com::sun::star; m_aETUserName.ClearModifyFlag(); } - sal_Bool OAuthentificationPageSetup::FillItemSet( SfxItemSet& _rSet ) + bool OAuthentificationPageSetup::FillItemSet( SfxItemSet& _rSet ) { sal_Bool bChangedSomething = sal_False; @@ -816,10 +816,11 @@ using namespace ::com::sun::star; m_pCBStartTableWizard->Enable(_bSupportsTableCreation); } - sal_Bool OFinalDBPageSetup::FillItemSet( SfxItemSet& /*_rSet*/ ) + bool OFinalDBPageSetup::FillItemSet( SfxItemSet& /*_rSet*/ ) { - return sal_True; + return true; } + IMPL_LINK(OFinalDBPageSetup, OnOpenSelected, CheckBox*, _pBox) { m_pCBStartTableWizard->Enable( _pBox->IsEnabled() && _pBox->IsChecked() ); diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx index f2e850284abb..150640c2d4ec 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx @@ -39,7 +39,7 @@ namespace dbaui class OSpreadSheetConnectionPageSetup : public OConnectionTabPageSetup { public: - virtual sal_Bool FillItemSet ( SfxItemSet& _rCoreAttrs ); + virtual bool FillItemSet ( SfxItemSet& _rCoreAttrs ); static OGenericAdministrationPage* CreateSpreadSheetTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); OSpreadSheetConnectionPageSetup(Window* pParent, const SfxItemSet& _rCoreAttrs); @@ -58,7 +58,7 @@ namespace dbaui class OTextConnectionPageSetup : public OConnectionTabPageSetup { public: - virtual sal_Bool FillItemSet ( SfxItemSet& _rCoreAttrs ); + virtual bool FillItemSet ( SfxItemSet& _rCoreAttrs ); static OGenericAdministrationPage* CreateTextTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); OTextConnectionPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs ); OTextConnectionHelper* m_pTextConnectionHelper; @@ -80,7 +80,7 @@ namespace dbaui class OLDAPConnectionPageSetup : public OGenericAdministrationPage { public: - virtual sal_Bool FillItemSet ( SfxItemSet& _rCoreAttrs ); + virtual bool FillItemSet ( SfxItemSet& _rCoreAttrs ); static OGenericAdministrationPage* CreateLDAPTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); OLDAPConnectionPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs ); virtual Link getControlModifiedLink() { return LINK(this, OLDAPConnectionPageSetup, OnEditModified); } @@ -121,7 +121,7 @@ namespace dbaui virtual void fillControls( ::std::vector< ISaveValueWrapper* >& _rControlList ); virtual void fillWindows( ::std::vector< ISaveValueWrapper* >& _rControlList ); - virtual sal_Bool FillItemSet( SfxItemSet& _rCoreAttrs ); + virtual bool FillItemSet( SfxItemSet& _rCoreAttrs ); virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue); virtual Link getControlModifiedLink(); @@ -146,7 +146,7 @@ namespace dbaui static OGenericAdministrationPage* CreateOracleJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); protected: - virtual sal_Bool FillItemSet( SfxItemSet& _rCoreAttrs ); + virtual bool FillItemSet( SfxItemSet& _rCoreAttrs ); virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue); virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList); virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList); @@ -181,7 +181,7 @@ namespace dbaui protected: virtual bool checkTestConnection(); - virtual sal_Bool FillItemSet( SfxItemSet& _rCoreAttrs ); + virtual bool FillItemSet( SfxItemSet& _rCoreAttrs ); virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue); virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList); virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList); @@ -214,7 +214,7 @@ namespace dbaui DECL_LINK(ImplClickHdl, OMySQLIntroPageSetup*); protected: - virtual sal_Bool FillItemSet(SfxItemSet& _rSet); + virtual bool FillItemSet(SfxItemSet& _rSet); virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue); virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList); virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList); @@ -236,7 +236,7 @@ namespace dbaui class OAuthentificationPageSetup : public OGenericAdministrationPage { public: - virtual sal_Bool FillItemSet ( SfxItemSet& _rCoreAttrs ); + virtual bool FillItemSet ( SfxItemSet& _rCoreAttrs ); static OGenericAdministrationPage* CreateAuthentificationTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); OAuthentificationPageSetup(Window* pParent, const SfxItemSet& _rCoreAttrs); @@ -259,7 +259,7 @@ namespace dbaui class OFinalDBPageSetup : public OGenericAdministrationPage { public: - virtual sal_Bool FillItemSet ( SfxItemSet& _rCoreAttrs ); + virtual bool FillItemSet ( SfxItemSet& _rCoreAttrs ); static OGenericAdministrationPage* CreateFinalDBTabPageSetup( Window* pParent, const SfxItemSet& _rAttrSet); FixedText* m_pFTFinalHeader; diff --git a/dbaccess/source/ui/dlg/admincontrols.cxx b/dbaccess/source/ui/dlg/admincontrols.cxx index 39db3d096089..b8690b1a03e5 100644 --- a/dbaccess/source/ui/dlg/admincontrols.cxx +++ b/dbaccess/source/ui/dlg/admincontrols.cxx @@ -192,7 +192,7 @@ namespace dbaui _rControlList.push_back( new ODisableWrapper< RadioButton >( &m_aNamedPipeRadio ) ); } - sal_Bool MySQLNativeSettings::FillItemSet( SfxItemSet& _rSet ) + bool MySQLNativeSettings::FillItemSet( SfxItemSet& _rSet ) { sal_Bool bChangedSomething = sal_False; diff --git a/dbaccess/source/ui/dlg/admincontrols.hxx b/dbaccess/source/ui/dlg/admincontrols.hxx index 95b729cde6cc..3e1cf8fc6302 100644 --- a/dbaccess/source/ui/dlg/admincontrols.hxx +++ b/dbaccess/source/ui/dlg/admincontrols.hxx @@ -58,7 +58,7 @@ namespace dbaui void fillControls( ::std::vector< ISaveValueWrapper* >& _rControlList ); void fillWindows( ::std::vector< ISaveValueWrapper* >& _rControlList ); - sal_Bool FillItemSet( SfxItemSet& _rCoreAttrs ); + bool FillItemSet( SfxItemSet& _rCoreAttrs ); void implInitControls( const SfxItemSet& _rSet ); bool canAdvance() const; diff --git a/dbaccess/source/ui/dlg/advancedsettings.cxx b/dbaccess/source/ui/dlg/advancedsettings.cxx index 55399ccf6279..780f1e7e8d64 100644 --- a/dbaccess/source/ui/dlg/advancedsettings.cxx +++ b/dbaccess/source/ui/dlg/advancedsettings.cxx @@ -264,7 +264,7 @@ namespace dbaui OGenericAdministrationPage::implInitControls(_rSet, _bSaveValue); } - sal_Bool SpecialSettingsPage::FillItemSet( SfxItemSet& _rSet ) + bool SpecialSettingsPage::FillItemSet( SfxItemSet& _rSet ) { sal_Bool bChangedSomething = sal_False; @@ -357,7 +357,7 @@ namespace dbaui OGenericAdministrationPage::implInitControls( _rSet, _bSaveValue ); } - sal_Bool GeneratedValuesPage::FillItemSet(SfxItemSet& _rSet) + bool GeneratedValuesPage::FillItemSet(SfxItemSet& _rSet) { sal_Bool bChangedSomething = sal_False; diff --git a/dbaccess/source/ui/dlg/advancedsettings.hxx b/dbaccess/source/ui/dlg/advancedsettings.hxx index de516292be6e..d3196bcfa8a1 100644 --- a/dbaccess/source/ui/dlg/advancedsettings.hxx +++ b/dbaccess/source/ui/dlg/advancedsettings.hxx @@ -72,7 +72,7 @@ namespace dbaui bool m_bHasMaxRowScan; public: - virtual sal_Bool FillItemSet ( SfxItemSet& _rCoreAttrs ); + virtual bool FillItemSet ( SfxItemSet& _rCoreAttrs ); SpecialSettingsPage(Window* pParent, const SfxItemSet& _rCoreAttrs, const DataSourceMetaData& _rDSMeta ); @@ -108,7 +108,7 @@ namespace dbaui m_aControlDependencies; public: - virtual sal_Bool FillItemSet (SfxItemSet& _rCoreAttrs); + virtual bool FillItemSet (SfxItemSet& _rCoreAttrs); GeneratedValuesPage( Window* pParent, const SfxItemSet& _rCoreAttrs ); protected: diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx index 69f9bb241f16..de2718c7fc3d 100644 --- a/dbaccess/source/ui/dlg/detailpages.cxx +++ b/dbaccess/source/ui/dlg/detailpages.cxx @@ -182,7 +182,8 @@ namespace dbaui } OGenericAdministrationPage::implInitControls(_rSet, _bSaveValue); } - sal_Bool OCommonBehaviourTabPage::FillItemSet(SfxItemSet& _rSet) + + bool OCommonBehaviourTabPage::FillItemSet(SfxItemSet& _rSet) { sal_Bool bChangedSomething = sal_False; @@ -265,7 +266,7 @@ namespace dbaui OCommonBehaviourTabPage::implInitControls(_rSet, _bSaveValue); } - sal_Bool ODbaseDetailsPage::FillItemSet( SfxItemSet& _rSet ) + bool ODbaseDetailsPage::FillItemSet( SfxItemSet& _rSet ) { sal_Bool bChangedSomething = OCommonBehaviourTabPage::FillItemSet(_rSet); @@ -329,7 +330,7 @@ namespace dbaui return ( new OOdbcDetailsPage( pParent, _rAttrSet ) ); } - sal_Bool OOdbcDetailsPage::FillItemSet( SfxItemSet& _rSet ) + bool OOdbcDetailsPage::FillItemSet( SfxItemSet& _rSet ) { sal_Bool bChangedSomething = OCommonBehaviourTabPage::FillItemSet(_rSet); fillBool(_rSet,&m_aUseCatalog,DSID_USECATALOG,bChangedSomething); @@ -377,7 +378,7 @@ namespace dbaui return ( new OUserDriverDetailsPage( pParent, _rAttrSet ) ); } - sal_Bool OUserDriverDetailsPage::FillItemSet( SfxItemSet& _rSet ) + bool OUserDriverDetailsPage::FillItemSet( SfxItemSet& _rSet ) { sal_Bool bChangedSomething = OCommonBehaviourTabPage::FillItemSet(_rSet); @@ -510,7 +511,7 @@ namespace dbaui _rControlList.push_back(new ODisableWrapper<FixedLine>(&m_aFL_1)); } - sal_Bool OGeneralSpecialJDBCDetailsPage::FillItemSet( SfxItemSet& _rSet ) + bool OGeneralSpecialJDBCDetailsPage::FillItemSet( SfxItemSet& _rSet ) { sal_Bool bChangedSomething = OCommonBehaviourTabPage::FillItemSet(_rSet); if ( m_bUseClass ) @@ -637,17 +638,17 @@ namespace dbaui _rControlList.push_back(new ODisableWrapper<FixedText>(&m_aUserNameLabel)); } - sal_Bool MySQLNativePage::FillItemSet( SfxItemSet& _rSet ) + bool MySQLNativePage::FillItemSet( SfxItemSet& _rSet ) { sal_Bool bChangedSomething = OCommonBehaviourTabPage::FillItemSet( _rSet ); - bChangedSomething |= m_aMySQLSettings.FillItemSet( _rSet ); + bChangedSomething |= (m_aMySQLSettings.FillItemSet( _rSet ) ? 1 : 0); if ( m_aUserName.GetText() != m_aUserName.GetSavedValue() ) { _rSet.Put( SfxStringItem( DSID_USER, m_aUserName.GetText() ) ); _rSet.Put( SfxStringItem( DSID_PASSWORD, OUString())); - bChangedSomething = sal_True; + bChangedSomething = true; } fillBool(_rSet,&m_aPasswordRequired,DSID_PASSWORDREQUIRED,bChangedSomething); @@ -717,7 +718,7 @@ namespace dbaui return ( new OLDAPDetailsPage( pParent, _rAttrSet ) ); } - sal_Bool OLDAPDetailsPage::FillItemSet( SfxItemSet& _rSet ) + bool OLDAPDetailsPage::FillItemSet( SfxItemSet& _rSet ) { sal_Bool bChangedSomething = OCommonBehaviourTabPage::FillItemSet(_rSet); @@ -825,7 +826,7 @@ namespace dbaui OCommonBehaviourTabPage::implInitControls(_rSet, _bSaveValue); } - sal_Bool OTextDetailsPage::FillItemSet( SfxItemSet& rSet ) + bool OTextDetailsPage::FillItemSet( SfxItemSet& rSet ) { sal_Bool bChangedSomething = OCommonBehaviourTabPage::FillItemSet(rSet); bChangedSomething = m_pTextConnectionHelper->FillItemSet(rSet, bChangedSomething); diff --git a/dbaccess/source/ui/dlg/detailpages.hxx b/dbaccess/source/ui/dlg/detailpages.hxx index d042a3da93e7..4ea050dd4efc 100644 --- a/dbaccess/source/ui/dlg/detailpages.hxx +++ b/dbaccess/source/ui/dlg/detailpages.hxx @@ -67,7 +67,7 @@ namespace dbaui sal_uInt32 m_nControlFlags; public: - virtual sal_Bool FillItemSet (SfxItemSet& _rCoreAttrs); + virtual bool FillItemSet (SfxItemSet& _rCoreAttrs); OCommonBehaviourTabPage(Window* pParent, sal_uInt16 nResId, const SfxItemSet& _rCoreAttrs, sal_uInt32 nControlFlags,bool _bFreeResource = true); protected: @@ -89,7 +89,7 @@ namespace dbaui class ODbaseDetailsPage : public OCommonBehaviourTabPage { public: - virtual sal_Bool FillItemSet ( SfxItemSet& _rCoreAttrs ); + virtual bool FillItemSet ( SfxItemSet& _rCoreAttrs ); ODbaseDetailsPage(Window* pParent, const SfxItemSet& _rCoreAttrs); private: @@ -128,7 +128,7 @@ namespace dbaui class OOdbcDetailsPage : public OCommonBehaviourTabPage { public: - virtual sal_Bool FillItemSet ( SfxItemSet& _rCoreAttrs ); + virtual bool FillItemSet ( SfxItemSet& _rCoreAttrs ); OOdbcDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ); protected: @@ -144,7 +144,7 @@ namespace dbaui class OUserDriverDetailsPage : public OCommonBehaviourTabPage { public: - virtual sal_Bool FillItemSet ( SfxItemSet& _rCoreAttrs ); + virtual bool FillItemSet ( SfxItemSet& _rCoreAttrs ); OUserDriverDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ); protected: @@ -178,7 +178,7 @@ namespace dbaui protected: - virtual sal_Bool FillItemSet( SfxItemSet& _rCoreAttrs ); + virtual bool FillItemSet( SfxItemSet& _rCoreAttrs ); virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue); virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList); virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList); @@ -220,7 +220,7 @@ namespace dbaui CheckBox m_aPasswordRequired; protected: - virtual sal_Bool FillItemSet( SfxItemSet& _rCoreAttrs ); + virtual bool FillItemSet( SfxItemSet& _rCoreAttrs ); virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue); virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList); virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList); @@ -230,7 +230,7 @@ namespace dbaui class OLDAPDetailsPage : public OCommonBehaviourTabPage { public: - virtual sal_Bool FillItemSet ( SfxItemSet& _rCoreAttrs ); + virtual bool FillItemSet ( SfxItemSet& _rCoreAttrs ); OLDAPDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ); protected: @@ -266,7 +266,7 @@ namespace dbaui class OTextDetailsPage : public OCommonBehaviourTabPage { public: - virtual sal_Bool FillItemSet ( SfxItemSet& _rCoreAttrs ); + virtual bool FillItemSet ( SfxItemSet& _rCoreAttrs ); OTextDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ); OTextConnectionHelper* m_pTextConnectionHelper; diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx index ff2b8395e09a..a588a69b066d 100644 --- a/dbaccess/source/ui/dlg/generalpage.cxx +++ b/dbaccess/source/ui/dlg/generalpage.cxx @@ -466,7 +466,7 @@ namespace dbaui m_pDatasourceType->Enable( bValid ); } - sal_Bool OGeneralPageDialog::FillItemSet( SfxItemSet& _rCoreAttrs ) + bool OGeneralPageDialog::FillItemSet( SfxItemSet& _rCoreAttrs ) { sal_Bool bChangedSomething = sal_False; @@ -626,7 +626,7 @@ namespace dbaui return OGeneralPage::approveDatasourceType( eType, _inout_rDisplayName ); } - sal_Bool OGeneralPageWizard::FillItemSet(SfxItemSet& _rCoreAttrs) + bool OGeneralPageWizard::FillItemSet(SfxItemSet& _rCoreAttrs) { sal_Bool bChangedSomething = sal_False; diff --git a/dbaccess/source/ui/dlg/generalpage.hxx b/dbaccess/source/ui/dlg/generalpage.hxx index aa4442751d25..6a712784f4b5 100644 --- a/dbaccess/source/ui/dlg/generalpage.hxx +++ b/dbaccess/source/ui/dlg/generalpage.hxx @@ -105,7 +105,7 @@ namespace dbaui OGeneralPageDialog( Window* pParent, const SfxItemSet& _rItems ); protected: - virtual sal_Bool FillItemSet( SfxItemSet& _rCoreAttrs ); + virtual bool FillItemSet( SfxItemSet& _rCoreAttrs ); virtual void implInitControls( const SfxItemSet& _rSet, sal_Bool _bSaveValue ); virtual void setParentTitle( const OUString& _sURLPrefix ); @@ -170,7 +170,7 @@ namespace dbaui DocumentDescriptor GetSelectedDocument() const; protected: - virtual sal_Bool FillItemSet( SfxItemSet& _rCoreAttrs ); + virtual bool FillItemSet( SfxItemSet& _rCoreAttrs ); virtual void GetFocus(); diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx index 1a76c21ebaf5..0bf46c8ea410 100644 --- a/dbaccess/source/ui/dlg/tablespage.cxx +++ b/dbaccess/source/ui/dlg/tablespage.cxx @@ -549,14 +549,14 @@ namespace dbaui return pReturn; } - sal_Bool OTableSubscriptionPage::FillItemSet( SfxItemSet& _rCoreAttrs ) + bool OTableSubscriptionPage::FillItemSet( SfxItemSet& _rCoreAttrs ) { sal_Bool bValid, bReadonly; getFlags(_rCoreAttrs, bValid, bReadonly); if (!bValid || bReadonly) // don't store anything if the data we're working with is invalid or readonly - return sal_True; + return true; // create the output string which contains all the table names if ( m_xCurrentConnection.is() ) @@ -574,7 +574,7 @@ namespace dbaui _rCoreAttrs.Put( OStringListItem(DSID_TABLEFILTER, aTableFilter) ); } - return sal_True; + return true; } void OTableSubscriptionPage::fillControls(::std::vector< ISaveValueWrapper* >& /*_rControlList*/) diff --git a/dbaccess/source/ui/dlg/tablespage.hxx b/dbaccess/source/ui/dlg/tablespage.hxx index 0309fda62306..229170e19172 100644 --- a/dbaccess/source/ui/dlg/tablespage.hxx +++ b/dbaccess/source/ui/dlg/tablespage.hxx @@ -51,7 +51,7 @@ namespace dbaui OTableSubscriptionDialog* m_pTablesDlg; public: - virtual sal_Bool FillItemSet(SfxItemSet& _rCoreAttrs); + virtual bool FillItemSet(SfxItemSet& _rCoreAttrs); virtual int DeactivatePage(SfxItemSet* _pSet); using OGenericAdministrationPage::DeactivatePage; diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx index 19e91785e031..9389559d6776 100644 --- a/include/sfx2/dinfdlg.hxx +++ b/include/sfx2/dinfdlg.hxx @@ -219,7 +219,7 @@ private: protected: SfxDocumentPage( Window* pParent, const SfxItemSet& ); - virtual sal_Bool FillItemSet( SfxItemSet& ); + virtual bool FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet& ); public: @@ -242,7 +242,7 @@ private: protected: SfxDocumentDescPage( Window* pParent, const SfxItemSet& ); - virtual sal_Bool FillItemSet( SfxItemSet& ); + virtual bool FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet& ); public: @@ -506,7 +506,7 @@ private: protected: SfxCustomPropertiesPage( Window* pParent, const SfxItemSet& ); - virtual sal_Bool FillItemSet( SfxItemSet& ); + virtual bool FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet& ); virtual int DeactivatePage( SfxItemSet* pSet = NULL ); @@ -628,7 +628,7 @@ private: protected: SfxCmisPropertiesPage( Window* pParent, const SfxItemSet& ); - virtual sal_Bool FillItemSet( SfxItemSet& ); + virtual bool FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet& ); virtual int DeactivatePage( SfxItemSet* pSet = NULL ); diff --git a/include/sfx2/mgetempl.hxx b/include/sfx2/mgetempl.hxx index e2893429a60a..1b0fcfb3a517 100644 --- a/include/sfx2/mgetempl.hxx +++ b/include/sfx2/mgetempl.hxx @@ -79,7 +79,7 @@ friend class SfxStyleDialog; static SfxTabPage* Create(Window *pParent, const SfxItemSet &rAttrSet ); protected: - virtual sal_Bool FillItemSet(SfxItemSet &); + virtual bool FillItemSet(SfxItemSet &); virtual void Reset(const SfxItemSet &); using TabPage::ActivatePage; diff --git a/include/sfx2/printopt.hxx b/include/sfx2/printopt.hxx index 91cdfec9bb5c..27b5d93bb15e 100644 --- a/include/sfx2/printopt.hxx +++ b/include/sfx2/printopt.hxx @@ -96,7 +96,7 @@ public: SfxCommonPrintOptionsTabPage( Window* pParent, const SfxItemSet& rSet ); ~SfxCommonPrintOptionsTabPage(); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); virtual Window* GetParentLabeledBy( const Window* pLabel ) const; virtual Window* GetParentLabelFor( const Window* pLabel ) const; diff --git a/include/sfx2/securitypage.hxx b/include/sfx2/securitypage.hxx index 9693ebbb5171..676aa971925c 100644 --- a/include/sfx2/securitypage.hxx +++ b/include/sfx2/securitypage.hxx @@ -36,7 +36,7 @@ protected: SfxSecurityPage( Window* pParent, const SfxItemSet& ); virtual ~SfxSecurityPage(); - virtual sal_Bool FillItemSet( SfxItemSet& ); + virtual bool FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet& ); public: diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx index 595769ef450d..f31bebafdef4 100644 --- a/include/sfx2/tabdlg.hxx +++ b/include/sfx2/tabdlg.hxx @@ -259,7 +259,7 @@ public: const SfxItemSet& GetItemSet() const { return *pSet; } - virtual sal_Bool FillItemSet( SfxItemSet& ); + virtual bool FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet& ); bool HasExchangeSupport() const diff --git a/include/svx/hdft.hxx b/include/svx/hdft.hxx index 59f34435b6ea..e3e5938b8487 100644 --- a/include/svx/hdft.hxx +++ b/include/svx/hdft.hxx @@ -44,7 +44,7 @@ class SVX_DLLPUBLIC SvxHFPage: public SfxTabPage public: - virtual sal_Bool FillItemSet( SfxItemSet& rOutSet ); + virtual bool FillItemSet( SfxItemSet& rOutSet ); virtual void Reset( const SfxItemSet& rSet ); virtual ~SvxHFPage(); diff --git a/include/svx/optgrid.hxx b/include/svx/optgrid.hxx index c8f6d4efddcd..7128d1e4172f 100644 --- a/include/svx/optgrid.hxx +++ b/include/svx/optgrid.hxx @@ -104,7 +104,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); virtual void ActivatePage( const SfxItemSet& rSet ); diff --git a/sc/source/ui/attrdlg/tabpages.cxx b/sc/source/ui/attrdlg/tabpages.cxx index 5e3e436460b2..9931208e1943 100644 --- a/sc/source/ui/attrdlg/tabpages.cxx +++ b/sc/source/ui/attrdlg/tabpages.cxx @@ -122,7 +122,7 @@ void ScTabPageProtection::Reset( const SfxItemSet& rCoreAttrs ) -sal_Bool ScTabPageProtection::FillItemSet( SfxItemSet& rCoreAttrs ) +bool ScTabPageProtection::FillItemSet( SfxItemSet& rCoreAttrs ) { sal_Bool bAttrsChanged = false; sal_uInt16 nWhich = GetWhich( SID_SCATTR_PROTECTION ); diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx index bfe7af6abbfe..20c4609a3948 100644 --- a/sc/source/ui/dbgui/tpsort.cxx +++ b/sc/source/ui/dbgui/tpsort.cxx @@ -238,7 +238,7 @@ void ScTabPageSortFields::Reset( const SfxItemSet& /* rArgSet */ ) -sal_Bool ScTabPageSortFields::FillItemSet( SfxItemSet& rArgSet ) +bool ScTabPageSortFields::FillItemSet( SfxItemSet& rArgSet ) { ScSortParam aNewSortData = aSortData; @@ -299,7 +299,7 @@ sal_Bool ScTabPageSortFields::FillItemSet( SfxItemSet& rArgSet ) rArgSet.Put( ScSortItem( SCITEM_SORTDATA, NULL, &aNewSortData ) ); - return sal_True; + return true; } @@ -720,7 +720,7 @@ void ScTabPageSortOptions::Reset( const SfxItemSet& /* rArgSet */ ) -sal_Bool ScTabPageSortOptions::FillItemSet( SfxItemSet& rArgSet ) +bool ScTabPageSortOptions::FillItemSet( SfxItemSet& rArgSet ) { // Create local copy of ScParam ScSortParam aNewSortData = aSortData; @@ -764,7 +764,7 @@ sal_Bool ScTabPageSortOptions::FillItemSet( SfxItemSet& rArgSet ) rArgSet.Put( ScSortItem( SCITEM_SORTDATA, &aNewSortData ) ); - return sal_True; + return true; } diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx index 85dc33b36069..3958ee6e287f 100644 --- a/sc/source/ui/dbgui/tpsubt.cxx +++ b/sc/source/ui/dbgui/tpsubt.cxx @@ -446,9 +446,9 @@ void ScTpSubTotalGroup3::Reset( const SfxItemSet& rArgSet ) { RESET(3); } #define FILLSET(i) (ScTpSubTotalGroup::DoFillItemSet( (i), rArgSet )) -sal_Bool ScTpSubTotalGroup1::FillItemSet( SfxItemSet& rArgSet ) { return FILLSET(1); } -sal_Bool ScTpSubTotalGroup2::FillItemSet( SfxItemSet& rArgSet ) { return FILLSET(2); } -sal_Bool ScTpSubTotalGroup3::FillItemSet( SfxItemSet& rArgSet ) { return FILLSET(3); } +bool ScTpSubTotalGroup1::FillItemSet( SfxItemSet& rArgSet ) { return FILLSET(1); } +bool ScTpSubTotalGroup2::FillItemSet( SfxItemSet& rArgSet ) { return FILLSET(2); } +bool ScTpSubTotalGroup3::FillItemSet( SfxItemSet& rArgSet ) { return FILLSET(3); } #undef FILL @@ -541,7 +541,7 @@ void ScTpSubTotalOptions::Reset( const SfxItemSet& /* rArgSet */ ) -sal_Bool ScTpSubTotalOptions::FillItemSet( SfxItemSet& rArgSet ) +bool ScTpSubTotalOptions::FillItemSet( SfxItemSet& rArgSet ) { ScSubTotalParam theSubTotalData; // auslesen, wenn schon teilweise gefuellt SfxTabDialog* pDlg = GetTabDialog(); diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx index b2d7c2c40602..bcac2499a434 100644 --- a/sc/source/ui/dbgui/validate.cxx +++ b/sc/source/ui/dbgui/validate.cxx @@ -412,7 +412,7 @@ void ScTPValidationValue::Reset( const SfxItemSet& rArgSet ) CheckHdl( NULL ); } -sal_Bool ScTPValidationValue::FillItemSet( SfxItemSet& rArgSet ) +bool ScTPValidationValue::FillItemSet( SfxItemSet& rArgSet ) { sal_Int16 nListType = maCbShow.IsChecked() ? (maCbSort.IsChecked() ? ValidListType::SORTEDASCENDING : ValidListType::UNSORTED) : @@ -426,7 +426,7 @@ sal_Bool ScTPValidationValue::FillItemSet( SfxItemSet& rArgSet ) rArgSet.Put( SfxStringItem( FID_VALID_VALUE2, GetSecondFormula() ) ); rArgSet.Put( SfxBoolItem( FID_VALID_BLANK, maCbAllow.IsChecked() ) ); rArgSet.Put( SfxInt16Item( FID_VALID_LISTTYPE, nListType ) ); - return sal_True; + return true; } OUString ScTPValidationValue::GetFirstFormula() const @@ -745,13 +745,13 @@ void ScTPValidationHelp::Reset( const SfxItemSet& rArgSet ) -sal_Bool ScTPValidationHelp::FillItemSet( SfxItemSet& rArgSet ) +bool ScTPValidationHelp::FillItemSet( SfxItemSet& rArgSet ) { rArgSet.Put( SfxBoolItem( FID_VALID_SHOWHELP, pTsbHelp->GetState() == TRISTATE_TRUE ) ); rArgSet.Put( SfxStringItem( FID_VALID_HELPTITLE, pEdtTitle->GetText() ) ); rArgSet.Put( SfxStringItem( FID_VALID_HELPTEXT, pEdInputHelp->GetText() ) ); - return sal_True; + return true; } @@ -841,14 +841,14 @@ void ScTPValidationError::Reset( const SfxItemSet& rArgSet ) -sal_Bool ScTPValidationError::FillItemSet( SfxItemSet& rArgSet ) +bool ScTPValidationError::FillItemSet( SfxItemSet& rArgSet ) { rArgSet.Put( SfxBoolItem( FID_VALID_SHOWERR, m_pTsbShow->GetState() == TRISTATE_TRUE ) ); rArgSet.Put( SfxAllEnumItem( FID_VALID_ERRSTYLE, m_pLbAction->GetSelectEntryPos() ) ); rArgSet.Put( SfxStringItem( FID_VALID_ERRTITLE, m_pEdtTitle->GetText() ) ); rArgSet.Put( SfxStringItem( FID_VALID_ERRTEXT, m_pEdError->GetText() ) ); - return sal_True; + return true; } diff --git a/sc/source/ui/docshell/tpstat.cxx b/sc/source/ui/docshell/tpstat.cxx index 0117dc47991a..de9afa62bd45 100644 --- a/sc/source/ui/docshell/tpstat.cxx +++ b/sc/source/ui/docshell/tpstat.cxx @@ -70,7 +70,7 @@ ScDocStatPage::~ScDocStatPage() -sal_Bool ScDocStatPage::FillItemSet( SfxItemSet& /* rSet */ ) +bool ScDocStatPage::FillItemSet( SfxItemSet& /* rSet */ ) { return false; } diff --git a/sc/source/ui/inc/opredlin.hxx b/sc/source/ui/inc/opredlin.hxx index 39d8564dcc4c..4ed20bac04c2 100644 --- a/sc/source/ui/inc/opredlin.hxx +++ b/sc/source/ui/inc/opredlin.hxx @@ -51,7 +51,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); }; #endif diff --git a/sc/source/ui/inc/optload.hxx b/sc/source/ui/inc/optload.hxx index fd02f59b7423..ef85e37c17c4 100644 --- a/sc/source/ui/inc/optload.hxx +++ b/sc/source/ui/inc/optload.hxx @@ -49,7 +49,7 @@ public: void SetDocument(ScDocument*); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); }; diff --git a/sc/source/ui/inc/scuitphfedit.hxx b/sc/source/ui/inc/scuitphfedit.hxx index bf1b3aac6dc4..4e8e4b01b06b 100644 --- a/sc/source/ui/inc/scuitphfedit.hxx +++ b/sc/source/ui/inc/scuitphfedit.hxx @@ -47,7 +47,7 @@ class EditEngine; class ScHFEditPage : public SfxTabPage { public: - virtual sal_Bool FillItemSet ( SfxItemSet& rCoreSet ); + virtual bool FillItemSet ( SfxItemSet& rCoreSet ); virtual void Reset ( const SfxItemSet& rCoreSet ); void SetNumType(SvxNumType eNumType); diff --git a/sc/source/ui/inc/tabpages.hxx b/sc/source/ui/inc/tabpages.hxx index 08ce230f2bc4..7dd495b7e07a 100644 --- a/sc/source/ui/inc/tabpages.hxx +++ b/sc/source/ui/inc/tabpages.hxx @@ -32,7 +32,7 @@ public: static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rAttrSet ); static sal_uInt16* GetRanges (); - virtual sal_Bool FillItemSet ( SfxItemSet& rCoreAttrs ); + virtual bool FillItemSet ( SfxItemSet& rCoreAttrs ); virtual void Reset ( const SfxItemSet& ); protected: diff --git a/sc/source/ui/inc/tpcalc.hxx b/sc/source/ui/inc/tpcalc.hxx index 886dde6bac05..155676f1c741 100644 --- a/sc/source/ui/inc/tpcalc.hxx +++ b/sc/source/ui/inc/tpcalc.hxx @@ -37,7 +37,7 @@ class ScTpCalcOptions : public SfxTabPage public: static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rCoreSet ); - virtual sal_Bool FillItemSet ( SfxItemSet& rCoreSet ); + virtual bool FillItemSet ( SfxItemSet& rCoreSet ); virtual void Reset ( const SfxItemSet& rCoreSet ); using SfxTabPage::DeactivatePage; virtual int DeactivatePage ( SfxItemSet* pSet = NULL ); diff --git a/sc/source/ui/inc/tpcompatibility.hxx b/sc/source/ui/inc/tpcompatibility.hxx index 01d74f432307..95478abb662c 100644 --- a/sc/source/ui/inc/tpcompatibility.hxx +++ b/sc/source/ui/inc/tpcompatibility.hxx @@ -21,7 +21,7 @@ public: static SfxTabPage* Create (Window* pParent, const SfxItemSet& rCoreAttrs); - virtual sal_Bool FillItemSet(SfxItemSet& rCoreAttrs); + virtual bool FillItemSet(SfxItemSet& rCoreAttrs); virtual void Reset(const SfxItemSet& rCoreAttrs); virtual int DeactivatePage(SfxItemSet* pSet = NULL); diff --git a/sc/source/ui/inc/tpdefaults.hxx b/sc/source/ui/inc/tpdefaults.hxx index dce6fc18652f..296105f97064 100644 --- a/sc/source/ui/inc/tpdefaults.hxx +++ b/sc/source/ui/inc/tpdefaults.hxx @@ -21,7 +21,7 @@ public: static SfxTabPage* Create (Window* pParent, const SfxItemSet& rCoreSet); - virtual sal_Bool FillItemSet(SfxItemSet& rCoreSet); + virtual bool FillItemSet(SfxItemSet& rCoreSet); virtual void Reset(const SfxItemSet& rCoreSet); virtual int DeactivatePage(SfxItemSet* pSet = NULL); diff --git a/sc/source/ui/inc/tpformula.hxx b/sc/source/ui/inc/tpformula.hxx index acd554fb1087..888870a7cf2e 100644 --- a/sc/source/ui/inc/tpformula.hxx +++ b/sc/source/ui/inc/tpformula.hxx @@ -35,7 +35,7 @@ public: static SfxTabPage* Create (Window* pParent, const SfxItemSet& rCoreSet); - virtual sal_Bool FillItemSet(SfxItemSet& rCoreSet); + virtual bool FillItemSet(SfxItemSet& rCoreSet); virtual void Reset( const SfxItemSet& rCoreSet ); virtual int DeactivatePage(SfxItemSet* pSet = NULL); diff --git a/sc/source/ui/inc/tphf.hxx b/sc/source/ui/inc/tphf.hxx index d87eb644df49..798e4c007b5e 100644 --- a/sc/source/ui/inc/tphf.hxx +++ b/sc/source/ui/inc/tphf.hxx @@ -32,7 +32,7 @@ public: virtual ~ScHFPage(); virtual void Reset( const SfxItemSet& rSet ); - virtual sal_Bool FillItemSet( SfxItemSet& rOutSet ); + virtual bool FillItemSet( SfxItemSet& rOutSet ); void SetPageStyle( const OUString& rName ) { aStrPageStyle = rName; } void SetStyleDlg ( const ScStyleDlg* pDlg ) { pStyleDlg = pDlg; } diff --git a/sc/source/ui/inc/tpprint.hxx b/sc/source/ui/inc/tpprint.hxx index ca9a42fc536f..6b8c013c1b43 100644 --- a/sc/source/ui/inc/tpprint.hxx +++ b/sc/source/ui/inc/tpprint.hxx @@ -36,7 +36,7 @@ class ScTpPrintOptions : public SfxTabPage public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rCoreSet ); - virtual sal_Bool FillItemSet( SfxItemSet& rCoreSet ); + virtual bool FillItemSet( SfxItemSet& rCoreSet ); virtual void Reset( const SfxItemSet& rCoreSet ); using SfxTabPage::DeactivatePage; virtual int DeactivatePage( SfxItemSet* pSet = NULL ); diff --git a/sc/source/ui/inc/tpsort.hxx b/sc/source/ui/inc/tpsort.hxx index ec3ed8c67629..58d483e2a189 100644 --- a/sc/source/ui/inc/tpsort.hxx +++ b/sc/source/ui/inc/tpsort.hxx @@ -56,7 +56,7 @@ public: static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rArgSet ); - virtual sal_Bool FillItemSet ( SfxItemSet& rArgSet ); + virtual bool FillItemSet ( SfxItemSet& rArgSet ); virtual void Reset ( const SfxItemSet& rArgSet ); virtual void SetPosSizePixel(const Point& rAllocPos, const Size& rAllocation); @@ -118,7 +118,7 @@ public: #define SfxTabPage ::SfxTabPage static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rArgSet ); - virtual sal_Bool FillItemSet ( SfxItemSet& rArgSet ); + virtual bool FillItemSet ( SfxItemSet& rArgSet ); virtual void Reset ( const SfxItemSet& rArgSet ); protected: diff --git a/sc/source/ui/inc/tpstat.hxx b/sc/source/ui/inc/tpstat.hxx index 50b83e56e115..781f79ca6e3d 100644 --- a/sc/source/ui/inc/tpstat.hxx +++ b/sc/source/ui/inc/tpstat.hxx @@ -39,7 +39,7 @@ private: ~ScDocStatPage(); protected: - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); virtual void Reset ( const SfxItemSet& rSet ); private: diff --git a/sc/source/ui/inc/tpsubt.hxx b/sc/source/ui/inc/tpsubt.hxx index 66f56af770c9..bfe60d0031df 100644 --- a/sc/source/ui/inc/tpsubt.hxx +++ b/sc/source/ui/inc/tpsubt.hxx @@ -90,7 +90,7 @@ public: static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rArgSet ); - virtual sal_Bool FillItemSet ( SfxItemSet& rArgSet ); + virtual bool FillItemSet ( SfxItemSet& rArgSet ); virtual void Reset ( const SfxItemSet& rArgSet ); }; @@ -107,7 +107,7 @@ public: static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rArgSet ); - virtual sal_Bool FillItemSet ( SfxItemSet& rArgSet ); + virtual bool FillItemSet ( SfxItemSet& rArgSet ); virtual void Reset ( const SfxItemSet& rArgSet ); }; @@ -124,7 +124,7 @@ public: static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rArgSet ); - virtual sal_Bool FillItemSet ( SfxItemSet& rArgSet ); + virtual bool FillItemSet ( SfxItemSet& rArgSet ); virtual void Reset ( const SfxItemSet& rArgSet ); }; @@ -141,7 +141,7 @@ public: static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rArgSet ); - virtual sal_Bool FillItemSet ( SfxItemSet& rArgSet ); + virtual bool FillItemSet ( SfxItemSet& rArgSet ); virtual void Reset ( const SfxItemSet& rArgSet ); private: diff --git a/sc/source/ui/inc/tptable.hxx b/sc/source/ui/inc/tptable.hxx index bb064000a5e2..ba00be991832 100644 --- a/sc/source/ui/inc/tptable.hxx +++ b/sc/source/ui/inc/tptable.hxx @@ -30,8 +30,8 @@ class ScTablePage : public SfxTabPage public: static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rCoreSet ); - static sal_uInt16* GetRanges (); - virtual sal_Bool FillItemSet ( SfxItemSet& rCoreSet ); + static sal_uInt16* GetRanges (); + virtual bool FillItemSet ( SfxItemSet& rCoreSet ); virtual void Reset ( const SfxItemSet& rCoreSet ); using SfxTabPage::DeactivatePage; virtual int DeactivatePage ( SfxItemSet* pSet = NULL ); diff --git a/sc/source/ui/inc/tpusrlst.hxx b/sc/source/ui/inc/tpusrlst.hxx index 03308ea8bd64..eb4a15b92b6b 100644 --- a/sc/source/ui/inc/tpusrlst.hxx +++ b/sc/source/ui/inc/tpusrlst.hxx @@ -37,7 +37,7 @@ class ScTpUserLists : public SfxTabPage public: static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rAttrSet ); - virtual sal_Bool FillItemSet ( SfxItemSet& rCoreAttrs ); + virtual bool FillItemSet ( SfxItemSet& rCoreAttrs ); virtual void Reset ( const SfxItemSet& rCoreAttrs ); using SfxTabPage::DeactivatePage; virtual int DeactivatePage ( SfxItemSet* pSet = NULL ); diff --git a/sc/source/ui/inc/tpview.hxx b/sc/source/ui/inc/tpview.hxx index 547864673588..08cb22c161a7 100644 --- a/sc/source/ui/inc/tpview.hxx +++ b/sc/source/ui/inc/tpview.hxx @@ -75,7 +75,7 @@ class ScTpContentOptions : public SfxTabPage public: static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rCoreSet ); - virtual sal_Bool FillItemSet ( SfxItemSet& rCoreSet ); + virtual bool FillItemSet ( SfxItemSet& rCoreSet ); virtual void Reset ( const SfxItemSet& rCoreSet ); using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; @@ -125,7 +125,7 @@ class ScTpLayoutOptions : public SfxTabPage public: static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rCoreSet ); - virtual sal_Bool FillItemSet ( SfxItemSet& rCoreSet ); + virtual bool FillItemSet ( SfxItemSet& rCoreSet ); virtual void Reset ( const SfxItemSet& rCoreSet ); using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx index 9bc029af93ed..9d360ab054e3 100644 --- a/sc/source/ui/inc/validate.hxx +++ b/sc/source/ui/inc/validate.hxx @@ -188,7 +188,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rArgSet ); static sal_uInt16* GetRanges(); - virtual sal_Bool FillItemSet( SfxItemSet& rArgSet ); + virtual bool FillItemSet( SfxItemSet& rArgSet ); virtual void Reset( const SfxItemSet& rArgSet ); private: @@ -279,7 +279,7 @@ public: static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rArgSet ); static sal_uInt16* GetRanges (); - virtual sal_Bool FillItemSet ( SfxItemSet& rArgSet ); + virtual bool FillItemSet ( SfxItemSet& rArgSet ); virtual void Reset ( const SfxItemSet& rArgSet ); }; @@ -307,7 +307,7 @@ public: static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rArgSet ); static sal_uInt16* GetRanges (); - virtual sal_Bool FillItemSet ( SfxItemSet& rArgSet ); + virtual bool FillItemSet ( SfxItemSet& rArgSet ); virtual void Reset ( const SfxItemSet& rArgSet ); }; diff --git a/sc/source/ui/optdlg/opredlin.cxx b/sc/source/ui/optdlg/opredlin.cxx index 9eff711bf39d..8e7459cac8a3 100644 --- a/sc/source/ui/optdlg/opredlin.cxx +++ b/sc/source/ui/optdlg/opredlin.cxx @@ -72,7 +72,7 @@ SfxTabPage* ScRedlineOptionsTabPage::Create( Window* pParent, const SfxItemSet& return new ScRedlineOptionsTabPage( pParent, rSet ); } -sal_Bool ScRedlineOptionsTabPage::FillItemSet( SfxItemSet& /* rSet */ ) +bool ScRedlineOptionsTabPage::FillItemSet( SfxItemSet& /* rSet */ ) { ScAppOptions aAppOptions=SC_MOD()->GetAppOptions(); diff --git a/sc/source/ui/optdlg/tpcalc.cxx b/sc/source/ui/optdlg/tpcalc.cxx index 5c3a4d6363e5..55db49230b47 100644 --- a/sc/source/ui/optdlg/tpcalc.cxx +++ b/sc/source/ui/optdlg/tpcalc.cxx @@ -148,7 +148,7 @@ void ScTpCalcOptions::Reset( const SfxItemSet& /* rCoreAttrs */ ) -sal_Bool ScTpCalcOptions::FillItemSet( SfxItemSet& rCoreAttrs ) +bool ScTpCalcOptions::FillItemSet( SfxItemSet& rCoreAttrs ) { // alle weiteren Optionen werden in den Handlern aktualisiert pLocalOptions->SetIterCount( (sal_uInt16)m_pEdSteps->GetValue() ); @@ -167,7 +167,7 @@ sal_Bool ScTpCalcOptions::FillItemSet( SfxItemSet& rCoreAttrs ) if ( *pLocalOptions != *pOldOptions ) { rCoreAttrs.Put( ScTpCalcItem( nWhichCalc, *pLocalOptions ) ); - return sal_True; + return true; } else return false; diff --git a/sc/source/ui/optdlg/tpcompatibility.cxx b/sc/source/ui/optdlg/tpcompatibility.cxx index 3aa1b602ef0c..93d75aa91dde 100644 --- a/sc/source/ui/optdlg/tpcompatibility.cxx +++ b/sc/source/ui/optdlg/tpcompatibility.cxx @@ -30,7 +30,7 @@ SfxTabPage* ScTpCompatOptions::Create(Window *pParent, const SfxItemSet &rCoreAt return new ScTpCompatOptions(pParent, rCoreAttrs); } -sal_Bool ScTpCompatOptions::FillItemSet(SfxItemSet &rCoreAttrs) +bool ScTpCompatOptions::FillItemSet(SfxItemSet &rCoreAttrs) { bool bRet = false; if (m_pLbKeyBindings->GetSavedValue() != m_pLbKeyBindings->GetSelectEntryPos()) diff --git a/sc/source/ui/optdlg/tpdefaults.cxx b/sc/source/ui/optdlg/tpdefaults.cxx index 1d91d5c00e21..ef0719934c77 100644 --- a/sc/source/ui/optdlg/tpdefaults.cxx +++ b/sc/source/ui/optdlg/tpdefaults.cxx @@ -39,7 +39,7 @@ SfxTabPage* ScTpDefaultsOptions::Create(Window *pParent, const SfxItemSet &rCore return new ScTpDefaultsOptions(pParent, rCoreAttrs); } -sal_Bool ScTpDefaultsOptions::FillItemSet(SfxItemSet &rCoreSet) +bool ScTpDefaultsOptions::FillItemSet(SfxItemSet &rCoreSet) { sal_Bool bRet = false; ScDefaultsOptions aOpt; diff --git a/sc/source/ui/optdlg/tpformula.cxx b/sc/source/ui/optdlg/tpformula.cxx index ad198d008bd0..9c7f8dc552b5 100644 --- a/sc/source/ui/optdlg/tpformula.cxx +++ b/sc/source/ui/optdlg/tpformula.cxx @@ -227,7 +227,7 @@ SfxTabPage* ScTpFormulaOptions::Create(Window* pParent, const SfxItemSet& rCoreS return new ScTpFormulaOptions(pParent, rCoreSet); } -sal_Bool ScTpFormulaOptions::FillItemSet(SfxItemSet& rCoreSet) +bool ScTpFormulaOptions::FillItemSet(SfxItemSet& rCoreSet) { bool bRet = false; ScFormulaOptions aOpt; diff --git a/sc/source/ui/optdlg/tpprint.cxx b/sc/source/ui/optdlg/tpprint.cxx index dc78e8ed7292..c2108ab6cd2f 100644 --- a/sc/source/ui/optdlg/tpprint.cxx +++ b/sc/source/ui/optdlg/tpprint.cxx @@ -94,7 +94,7 @@ void ScTpPrintOptions::Reset( const SfxItemSet& rCoreSet ) -sal_Bool ScTpPrintOptions::FillItemSet( SfxItemSet& rCoreAttrs ) +bool ScTpPrintOptions::FillItemSet( SfxItemSet& rCoreAttrs ) { rCoreAttrs.ClearItem( SID_PRINT_SELECTEDSHEET ); @@ -113,7 +113,7 @@ sal_Bool ScTpPrintOptions::FillItemSet( SfxItemSet& rCoreAttrs ) { rCoreAttrs.Put( SfxBoolItem( SID_PRINT_SELECTEDSHEET, m_pSelectedSheetsCB->IsChecked() ) ); } - return sal_True; + return true; } else { diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx index 79d6b32ac35d..5eab46a9811b 100644 --- a/sc/source/ui/optdlg/tpusrlst.cxx +++ b/sc/source/ui/optdlg/tpusrlst.cxx @@ -207,7 +207,7 @@ void ScTpUserLists::Reset( const SfxItemSet& rCoreAttrs ) -sal_Bool ScTpUserLists::FillItemSet( SfxItemSet& rCoreAttrs ) +bool ScTpUserLists::FillItemSet( SfxItemSet& rCoreAttrs ) { // Modifikationen noch nicht uebernommen? // -> Click auf Add-Button simulieren diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx index fb055871dbf5..a1edc469210e 100644 --- a/sc/source/ui/optdlg/tpview.cxx +++ b/sc/source/ui/optdlg/tpview.cxx @@ -113,7 +113,7 @@ SfxTabPage* ScTpContentOptions::Create( Window* pParent, return new ScTpContentOptions(pParent, rCoreSet); } -sal_Bool ScTpContentOptions::FillItemSet( SfxItemSet& rCoreSet ) +bool ScTpContentOptions::FillItemSet( SfxItemSet& rCoreSet ) { sal_Bool bRet = false; if( pFormulaCB ->GetSavedValue() != TriState(pFormulaCB ->IsChecked()) || @@ -432,7 +432,7 @@ SfxTabPage* ScTpLayoutOptions::Create( Window* pParent, return pNew; } -sal_Bool ScTpLayoutOptions::FillItemSet( SfxItemSet& rCoreSet ) +bool ScTpLayoutOptions::FillItemSet( SfxItemSet& rCoreSet ) { sal_Bool bRet = sal_True; const sal_Int32 nMPos = m_pUnitLB->GetSelectEntryPos(); diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx index 0f5c3002e019..cc42477cdc0a 100644 --- a/sc/source/ui/pagedlg/scuitphfedit.cxx +++ b/sc/source/ui/pagedlg/scuitphfedit.cxx @@ -187,7 +187,7 @@ void ScHFEditPage::Reset( const SfxItemSet& rCoreSet ) } } -sal_Bool ScHFEditPage::FillItemSet( SfxItemSet& rCoreSet ) +bool ScHFEditPage::FillItemSet( SfxItemSet& rCoreSet ) { ScPageHFItem aItem( nWhich ); EditTextObject* pLeft = m_pWndLeft->CreateTextObject(); @@ -203,7 +203,7 @@ sal_Bool ScHFEditPage::FillItemSet( SfxItemSet& rCoreSet ) rCoreSet.Put( aItem ); - return sal_True; + return true; } diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx index 203102c1e4d6..a50a731d88aa 100644 --- a/sc/source/ui/pagedlg/tphf.cxx +++ b/sc/source/ui/pagedlg/tphf.cxx @@ -102,7 +102,7 @@ void ScHFPage::Reset( const SfxItemSet& rSet ) -sal_Bool ScHFPage::FillItemSet( SfxItemSet& rOutSet ) +bool ScHFPage::FillItemSet( SfxItemSet& rOutSet ) { sal_Bool bResult = SvxHFPage::FillItemSet( rOutSet ); diff --git a/sc/source/ui/pagedlg/tptable.cxx b/sc/source/ui/pagedlg/tptable.cxx index 034d27bcfe6c..581d23719196 100644 --- a/sc/source/ui/pagedlg/tptable.cxx +++ b/sc/source/ui/pagedlg/tptable.cxx @@ -231,7 +231,7 @@ void ScTablePage::Reset( const SfxItemSet& rCoreSet ) m_pEdScalePageNum->SaveValue(); } -sal_Bool ScTablePage::FillItemSet( SfxItemSet& rCoreSet ) +bool ScTablePage::FillItemSet( SfxItemSet& rCoreSet ) { const SfxItemSet& rOldSet = GetItemSet(); sal_uInt16 nWhichPageNo = GetWhich(SID_SCATTR_PAGE_FIRSTPAGENO); diff --git a/sd/source/ui/dlg/paragr.cxx b/sd/source/ui/dlg/paragr.cxx index c30e42396f73..41fddeabfdb6 100644 --- a/sd/source/ui/dlg/paragr.cxx +++ b/sd/source/ui/dlg/paragr.cxx @@ -43,7 +43,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); static sal_uInt16* GetRanges(); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); private: @@ -90,7 +90,7 @@ sal_uInt16* SdParagraphNumTabPage::GetRanges() return aRange; } -sal_Bool SdParagraphNumTabPage::FillItemSet( SfxItemSet& rSet ) +bool SdParagraphNumTabPage::FillItemSet( SfxItemSet& rSet ) { if(m_pNewStartCB->GetState() != m_pNewStartCB->GetSavedValue() || m_pNewStartNumberCB->GetState() != m_pNewStartNumberCB->GetSavedValue()|| diff --git a/sd/source/ui/dlg/prntopts.cxx b/sd/source/ui/dlg/prntopts.cxx index f9cec00e5f76..37b0671d8e93 100644 --- a/sd/source/ui/dlg/prntopts.cxx +++ b/sd/source/ui/dlg/prntopts.cxx @@ -80,7 +80,7 @@ SdPrintOptions::~SdPrintOptions() -sal_Bool SdPrintOptions::FillItemSet( SfxItemSet& rAttrs ) +bool SdPrintOptions::FillItemSet( SfxItemSet& rAttrs ) { if( m_pCbxDraw->GetSavedValue() != TriState(m_pCbxDraw->IsChecked()) || m_pCbxNotes->GetSavedValue() != TriState(m_pCbxNotes->IsChecked()) || @@ -126,9 +126,9 @@ sal_Bool SdPrintOptions::FillItemSet( SfxItemSet& rAttrs ) rAttrs.Put( aOptions ); - return( sal_True ); + return true; } - return( sal_False ); + return false; } diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx index 63a015b69eb9..106eb7cbae37 100644 --- a/sd/source/ui/dlg/tpaction.cxx +++ b/sd/source/ui/dlg/tpaction.cxx @@ -265,7 +265,7 @@ void SdTPAction::Construct() -sal_Bool SdTPAction::FillItemSet( SfxItemSet& rAttrs ) +bool SdTPAction::FillItemSet( SfxItemSet& rAttrs ) { sal_Bool bModified = sal_False; presentation::ClickAction eCA = presentation::ClickAction_NONE; diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx index 84eaced0f763..d347d43c0e91 100644 --- a/sd/source/ui/dlg/tpoption.cxx +++ b/sd/source/ui/dlg/tpoption.cxx @@ -60,7 +60,7 @@ SdTpOptionsSnap::~SdTpOptionsSnap() -sal_Bool SdTpOptionsSnap::FillItemSet( SfxItemSet& rAttrs ) +bool SdTpOptionsSnap::FillItemSet( SfxItemSet& rAttrs ) { SvxGridTabPage::FillItemSet(rAttrs); SdOptionsSnapItem aOptsItem( ATTR_OPTIONS_SNAP ); @@ -80,7 +80,7 @@ sal_Bool SdTpOptionsSnap::FillItemSet( SfxItemSet& rAttrs ) // we get a possible existing GridItem, this ensures that we do net set // some default values by accident - return( sal_True ); + return true; } @@ -137,7 +137,7 @@ SdTpOptionsContents::~SdTpOptionsContents() -sal_Bool SdTpOptionsContents::FillItemSet( SfxItemSet& rAttrs ) +bool SdTpOptionsContents::FillItemSet( SfxItemSet& rAttrs ) { sal_Bool bModified = sal_False; @@ -365,7 +365,7 @@ int SdTpOptionsMisc::DeactivatePage( SfxItemSet* pActiveSet ) -sal_Bool SdTpOptionsMisc::FillItemSet( SfxItemSet& rAttrs ) +bool SdTpOptionsMisc::FillItemSet( SfxItemSet& rAttrs ) { sal_Bool bModified = sal_False; diff --git a/sd/source/ui/inc/prntopts.hxx b/sd/source/ui/inc/prntopts.hxx index a9224cf8aa49..c0457e6cdad0 100644 --- a/sd/source/ui/inc/prntopts.hxx +++ b/sd/source/ui/inc/prntopts.hxx @@ -66,7 +66,7 @@ public: static SfxTabPage* Create( Window*, const SfxItemSet& ); - virtual sal_Bool FillItemSet( SfxItemSet& ); + virtual bool FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet & ); void SetDrawMode(); diff --git a/sd/source/ui/inc/tpaction.hxx b/sd/source/ui/inc/tpaction.hxx index 5f1e436e3848..266c4c71da81 100644 --- a/sd/source/ui/inc/tpaction.hxx +++ b/sd/source/ui/inc/tpaction.hxx @@ -103,7 +103,7 @@ public: static SfxTabPage* Create( Window*, const SfxItemSet& ); - virtual sal_Bool FillItemSet( SfxItemSet& ); + virtual bool FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet & ); virtual void ActivatePage( const SfxItemSet& rSet ); diff --git a/sd/source/ui/inc/tpoption.hxx b/sd/source/ui/inc/tpoption.hxx index 67635ade1cdf..be21955bb6fb 100644 --- a/sd/source/ui/inc/tpoption.hxx +++ b/sd/source/ui/inc/tpoption.hxx @@ -40,7 +40,7 @@ public: ~SdTpOptionsSnap(); static SfxTabPage* Create( Window*, const SfxItemSet& ); - virtual sal_Bool FillItemSet( SfxItemSet& ); + virtual bool FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet & ); }; @@ -62,7 +62,7 @@ public: ~SdTpOptionsContents(); static SfxTabPage* Create( Window*, const SfxItemSet& ); - virtual sal_Bool FillItemSet( SfxItemSet& ); + virtual bool FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet & ); }; @@ -135,7 +135,7 @@ public: ~SdTpOptionsMisc(); static SfxTabPage* Create( Window*, const SfxItemSet& ); - virtual sal_Bool FillItemSet( SfxItemSet& ); + virtual bool FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet & ); /** Hide Impress specific controls, make Draw specific controls visible diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index 1ac853370f53..8b3a9365b7fd 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -650,7 +650,7 @@ SfxTabPage *SfxDocumentDescPage::Create(Window *pParent, const SfxItemSet &rItem } -sal_Bool SfxDocumentDescPage::FillItemSet(SfxItemSet &rSet) +bool SfxDocumentDescPage::FillItemSet(SfxItemSet &rSet) { // Test whether a change is present const sal_Bool bTitleMod = m_pTitleEd->IsModified(); @@ -659,7 +659,7 @@ sal_Bool SfxDocumentDescPage::FillItemSet(SfxItemSet &rSet) const sal_Bool bCommentMod = m_pCommentEd->IsModified(); if ( !( bTitleMod || bThemeMod || bKeywordsMod || bCommentMod ) ) { - return sal_False; + return false; } // Generating the output data @@ -679,7 +679,7 @@ sal_Bool SfxDocumentDescPage::FillItemSet(SfxItemSet &rSet) if ( !pInfo ) { SAL_WARN( "sfx.dialog", "SfxDocumentDescPage::FillItemSet(): no item found" ); - return sal_False; + return false; } if ( bTitleMod ) @@ -704,7 +704,7 @@ sal_Bool SfxDocumentDescPage::FillItemSet(SfxItemSet &rSet) delete pInfo; } - return sal_True; + return true; } @@ -941,9 +941,9 @@ void SfxDocumentPage::EnableUseUserData() -sal_Bool SfxDocumentPage::FillItemSet( SfxItemSet& rSet ) +bool SfxDocumentPage::FillItemSet( SfxItemSet& rSet ) { - sal_Bool bRet = sal_False; + bool bRet = false; if ( !bHandleDelete && bEnableUseUserData && m_pUseUserDataCB->GetState() != m_pUseUserDataCB->GetSavedValue() && @@ -958,7 +958,7 @@ sal_Bool SfxDocumentPage::FillItemSet( SfxItemSet& rSet ) sal_Bool bUseData = ( TRISTATE_TRUE == m_pUseUserDataCB->GetState() ); m_pInfoItem->SetUseUserData( bUseData ); rSet.Put( SfxDocumentInfoItem( *m_pInfoItem ) ); - bRet = sal_True; + bRet = true; } } @@ -979,20 +979,20 @@ sal_Bool SfxDocumentPage::FillItemSet( SfxItemSet& rSet ) newItem.SetDeleteUserData( true ); rSet.Put( newItem ); - bRet = sal_True; + bRet = true; } } if ( m_pNameED->IsModified() && !m_pNameED->GetText().isEmpty() ) { rSet.Put( SfxStringItem( ID_FILETP_TITLE, m_pNameED->GetText() ) ); - bRet = sal_True; + bRet = true; } if ( /* m_pReadOnlyCB->IsModified() */ true ) { rSet.Put( SfxBoolItem( ID_FILETP_READONLY, m_pReadOnlyCB->IsChecked() ) ); - bRet = sal_True; + bRet = true; } return bRet; @@ -2057,9 +2057,9 @@ IMPL_LINK_NOARG(SfxCustomPropertiesPage, AddHdl) return 0; } -sal_Bool SfxCustomPropertiesPage::FillItemSet( SfxItemSet& rSet ) +bool SfxCustomPropertiesPage::FillItemSet( SfxItemSet& rSet ) { - sal_Bool bModified = sal_False; + bool bModified = false; const SfxPoolItem* pItem = NULL; SfxDocumentInfoItem* pInfo = NULL; bool bMustDelete = false; @@ -2083,7 +2083,7 @@ sal_Bool SfxCustomPropertiesPage::FillItemSet( SfxItemSet& rSet ) { if ( bMustDelete ) delete pInfo; - return sal_False; + return false; } pInfo->ClearCustomProperties(); @@ -2096,7 +2096,7 @@ sal_Bool SfxCustomPropertiesPage::FillItemSet( SfxItemSet& rSet ) } } - bModified = sal_True; //!!! + bModified = true; //!!! if ( bModified ) rSet.Put( *pInfo ); if ( bMustDelete ) @@ -2523,7 +2523,7 @@ SfxCmisPropertiesPage::SfxCmisPropertiesPage( Window* pParent, const SfxItemSet& { } -sal_Bool SfxCmisPropertiesPage::FillItemSet( SfxItemSet& rSet ) +bool SfxCmisPropertiesPage::FillItemSet( SfxItemSet& rSet ) { const SfxPoolItem* pItem = NULL; SfxDocumentInfoItem* pInfo = NULL; diff --git a/sfx2/source/dialog/documentfontsdialog.cxx b/sfx2/source/dialog/documentfontsdialog.cxx index 3320121ce64a..fa41757001e4 100644 --- a/sfx2/source/dialog/documentfontsdialog.cxx +++ b/sfx2/source/dialog/documentfontsdialog.cxx @@ -53,7 +53,7 @@ void SfxDocumentFontsPage::Reset( const SfxItemSet& ) embedFontsCheckbox->Check( bVal ); } -sal_Bool SfxDocumentFontsPage::FillItemSet( SfxItemSet& ) +bool SfxDocumentFontsPage::FillItemSet( SfxItemSet& ) { bool bVal = embedFontsCheckbox->IsChecked(); SfxObjectShell* pDocSh = SfxObjectShell::Current(); diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx index 33c60e30be73..a8a94f88df4e 100644 --- a/sfx2/source/dialog/mgetempl.cxx +++ b/sfx2/source/dialog/mgetempl.cxx @@ -352,7 +352,7 @@ IMPL_LINK_INLINE_END( SfxManageStyleSheetPage, LoseFocusHdl, Edit *, pEdit ) -sal_Bool SfxManageStyleSheetPage::FillItemSet( SfxItemSet& rSet ) +bool SfxManageStyleSheetPage::FillItemSet( SfxItemSet& rSet ) /* [Description] diff --git a/sfx2/source/dialog/printopt.cxx b/sfx2/source/dialog/printopt.cxx index 8a01e66b2505..9e166abdd8f9 100644 --- a/sfx2/source/dialog/printopt.cxx +++ b/sfx2/source/dialog/printopt.cxx @@ -114,12 +114,12 @@ Window* SfxCommonPrintOptionsTabPage::GetParentLabelFor( const Window* pWindow ) return SfxTabPage::GetParentLabelFor( pWindow ); } -sal_Bool SfxCommonPrintOptionsTabPage::FillItemSet( SfxItemSet& /*rSet*/ ) +bool SfxCommonPrintOptionsTabPage::FillItemSet( SfxItemSet& /*rSet*/ ) { SvtPrintWarningOptions aWarnOptions; SvtPrinterOptions aPrinterOptions; SvtPrintFileOptions aPrintFileOptions; - sal_Bool bModified = sal_False; + bool bModified = false; if( TriState(m_pPaperSizeCB->IsChecked()) != m_pPaperSizeCB->GetSavedValue()) diff --git a/sfx2/source/dialog/securitypage.cxx b/sfx2/source/dialog/securitypage.cxx index 1b97be80d10c..9fb9fb25b60b 100644 --- a/sfx2/source/dialog/securitypage.cxx +++ b/sfx2/source/dialog/securitypage.cxx @@ -155,7 +155,7 @@ struct SfxSecurityPage_Impl SfxSecurityPage_Impl( SfxSecurityPage &rDlg, const SfxItemSet &rItemSet ); ~SfxSecurityPage_Impl(); - sal_Bool FillItemSet_Impl( SfxItemSet & ); + bool FillItemSet_Impl( SfxItemSet & ); void Reset_Impl( const SfxItemSet & ); }; @@ -188,7 +188,7 @@ SfxSecurityPage_Impl::~SfxSecurityPage_Impl() } -sal_Bool SfxSecurityPage_Impl::FillItemSet_Impl( SfxItemSet & ) +bool SfxSecurityPage_Impl::FillItemSet_Impl( SfxItemSet & ) { bool bModified = false; @@ -439,7 +439,7 @@ SfxSecurityPage::~SfxSecurityPage() } -sal_Bool SfxSecurityPage::FillItemSet( SfxItemSet & rItemSet ) +bool SfxSecurityPage::FillItemSet( SfxItemSet & rItemSet ) { bool bModified = false; DBG_ASSERT( m_pImpl.get(), "implementation pointer is 0. Still in c-tor?" ); diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index b06a65b5fec7..a87ac228be4b 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -254,7 +254,7 @@ SfxTabPage::~SfxTabPage() -sal_Bool SfxTabPage::FillItemSet( SfxItemSet& rSet ) +bool SfxTabPage::FillItemSet( SfxItemSet& rSet ) { return pImpl->maItemConn.DoFillItemSet( rSet, GetItemSet() ); } @@ -918,7 +918,7 @@ short SfxTabDialog::Ok() else if ( pExampleSet ) pOutSet = new SfxItemSet( *pExampleSet ); } - sal_Bool bModified = sal_False; + bool bModified = false; for ( SfxTabDlgData_Impl::const_iterator it = pImpl->aData.begin(); it != pImpl->aData.end(); ++it ) { @@ -939,7 +939,7 @@ short SfxTabDialog::Ok() if ( pTabPage->FillItemSet( aTmp ) ) { - bModified |= sal_True; + bModified |= true; if (pExampleSet) pExampleSet->Put( aTmp ); pOutSet->Put( aTmp ); @@ -949,10 +949,10 @@ short SfxTabDialog::Ok() } if ( pImpl->bModified || ( pOutSet && pOutSet->Count() > 0 ) ) - bModified |= sal_True; + bModified |= true; if ( bFmt == 2 ) - bModified |= sal_True; + bModified |= true; return bModified ? RET_OK : RET_CANCEL; } diff --git a/sfx2/source/inc/documentfontsdialog.hxx b/sfx2/source/inc/documentfontsdialog.hxx index a5f606a48246..47f72cecf26a 100644 --- a/sfx2/source/inc/documentfontsdialog.hxx +++ b/sfx2/source/inc/documentfontsdialog.hxx @@ -33,7 +33,7 @@ public: SfxDocumentFontsPage( Window* parent, const SfxItemSet& set ); static SfxTabPage* Create( Window* parent, const SfxItemSet& set ); protected: - virtual sal_Bool FillItemSet( SfxItemSet& set ); + virtual bool FillItemSet( SfxItemSet& set ); virtual void Reset( const SfxItemSet& set ); private: CheckBox* embedFontsCheckbox; diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx index ee6a23b1e077..ef8b8b40eb0b 100644 --- a/starmath/inc/dialog.hxx +++ b/starmath/inc/dialog.hxx @@ -63,7 +63,7 @@ class SmPrintOptionsTabPage : public SfxTabPage DECL_LINK(SizeButtonClickHdl, Button *); - virtual sal_Bool FillItemSet(SfxItemSet& rSet); + virtual bool FillItemSet(SfxItemSet& rSet); virtual void Reset(const SfxItemSet& rSet); public: diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx index b05a37b1c836..727425baee21 100644 --- a/starmath/source/dialog.cxx +++ b/starmath/source/dialog.cxx @@ -179,7 +179,7 @@ SmPrintOptionsTabPage::SmPrintOptionsTabPage(Window *pParent, const SfxItemSet & } -sal_Bool SmPrintOptionsTabPage::FillItemSet(SfxItemSet& rSet) +bool SmPrintOptionsTabPage::FillItemSet(SfxItemSet& rSet) { sal_uInt16 nPrintSize; if (m_pSizeNormal->IsChecked()) diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx index 14ed07edc49d..6e7f9f10c556 100644 --- a/svx/source/dialog/hdft.cxx +++ b/svx/source/dialog/hdft.cxx @@ -215,7 +215,7 @@ SvxHFPage::~SvxHFPage() -sal_Bool SvxHFPage::FillItemSet( SfxItemSet& rSet ) +bool SvxHFPage::FillItemSet( SfxItemSet& rSet ) { const sal_uInt16 nWSize = GetWhich( SID_ATTR_PAGE_SIZE ); const sal_uInt16 nWLRSpace = GetWhich( SID_ATTR_LRSPACE ); @@ -315,7 +315,7 @@ sal_Bool SvxHFPage::FillItemSet( SfxItemSet& rSet ) SvxSetItem aSetItem( GetWhich( nId ), aSet ); rSet.Put( aSetItem ); - return sal_True; + return true; } diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx index 976dd5c2d302..8337461131d3 100644 --- a/svx/source/dialog/optgrid.cxx +++ b/svx/source/dialog/optgrid.cxx @@ -191,7 +191,7 @@ SfxTabPage* SvxGridTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet -sal_Bool SvxGridTabPage::FillItemSet( SfxItemSet& rCoreSet ) +bool SvxGridTabPage::FillItemSet( SfxItemSet& rCoreSet ) { if ( bAttrModified ) { diff --git a/sw/source/core/uibase/inc/chrdlg.hxx b/sw/source/core/uibase/inc/chrdlg.hxx index c01cc2d16357..d233b37a9143 100644 --- a/sw/source/core/uibase/inc/chrdlg.hxx +++ b/sw/source/core/uibase/inc/chrdlg.hxx @@ -85,7 +85,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); }; diff --git a/sw/source/core/uibase/inc/column.hxx b/sw/source/core/uibase/inc/column.hxx index 2593a35be19c..ca7c55c2e692 100644 --- a/sw/source/core/uibase/inc/column.hxx +++ b/sw/source/core/uibase/inc/column.hxx @@ -177,7 +177,7 @@ public: static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet); static sal_uInt16* GetRanges(); - virtual sal_Bool FillItemSet(SfxItemSet &rSet); + virtual bool FillItemSet(SfxItemSet &rSet); virtual void Reset(const SfxItemSet &rSet); void SetFrmMode(sal_Bool bMod); diff --git a/sw/source/core/uibase/inc/docstdlg.hxx b/sw/source/core/uibase/inc/docstdlg.hxx index 60275da16acd..a7c427550942 100644 --- a/sw/source/core/uibase/inc/docstdlg.hxx +++ b/sw/source/core/uibase/inc/docstdlg.hxx @@ -38,7 +38,7 @@ public: static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet); protected: - virtual sal_Bool FillItemSet( SfxItemSet &rSet); + virtual bool FillItemSet( SfxItemSet &rSet); virtual void Reset (const SfxItemSet &rSet); DECL_LINK(UpdateHdl, void *); diff --git a/sw/source/core/uibase/inc/drpcps.hxx b/sw/source/core/uibase/inc/drpcps.hxx index dd4a37377a4b..27714918c05e 100644 --- a/sw/source/core/uibase/inc/drpcps.hxx +++ b/sw/source/core/uibase/inc/drpcps.hxx @@ -89,7 +89,7 @@ public: static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet); static sal_uInt16* GetRanges(); - virtual sal_Bool FillItemSet( SfxItemSet &rSet); + virtual bool FillItemSet( SfxItemSet &rSet); virtual void Reset (const SfxItemSet &rSet); void SetFormat(sal_Bool bSet){bFormat = bSet;} diff --git a/sw/source/core/uibase/inc/envlop.hxx b/sw/source/core/uibase/inc/envlop.hxx index b7b7906ec79e..69ca85d65349 100644 --- a/sw/source/core/uibase/inc/envlop.hxx +++ b/sw/source/core/uibase/inc/envlop.hxx @@ -113,7 +113,7 @@ public: virtual void ActivatePage(const SfxItemSet& rSet); virtual int DeactivatePage(SfxItemSet* pSet = 0); void FillItem(SwEnvItem& rItem); - virtual sal_Bool FillItemSet(SfxItemSet& rSet); + virtual bool FillItemSet(SfxItemSet& rSet); virtual void Reset(const SfxItemSet& rSet); }; diff --git a/sw/source/core/uibase/inc/frmpage.hxx b/sw/source/core/uibase/inc/frmpage.hxx index 4f47b2c68067..204d6bbb48e5 100644 --- a/sw/source/core/uibase/inc/frmpage.hxx +++ b/sw/source/core/uibase/inc/frmpage.hxx @@ -190,7 +190,7 @@ public: static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet); static sal_uInt16* GetRanges(); - virtual sal_Bool FillItemSet(SfxItemSet &rSet); + virtual bool FillItemSet(SfxItemSet &rSet); virtual void Reset(const SfxItemSet &rSet); void SetNewFrame(sal_Bool bNewFrame) { bNew = bNewFrame; } @@ -236,7 +236,7 @@ public: static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet); - virtual sal_Bool FillItemSet(SfxItemSet &rSet); + virtual bool FillItemSet(SfxItemSet &rSet); virtual void Reset(const SfxItemSet &rSet); virtual int DeactivatePage(SfxItemSet *pSet); }; @@ -265,7 +265,7 @@ public: static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet); - virtual sal_Bool FillItemSet(SfxItemSet &rSet); + virtual bool FillItemSet(SfxItemSet &rSet); virtual void Reset(const SfxItemSet &rSet); }; @@ -313,7 +313,7 @@ public: static SfxTabPage* Create(Window *pParent, const SfxItemSet &rSet); static sal_uInt16* GetRanges(); - virtual sal_Bool FillItemSet(SfxItemSet &rSet); + virtual bool FillItemSet(SfxItemSet &rSet); virtual void Reset(const SfxItemSet &rSet); void SetFormatUsed(sal_Bool bFmt); diff --git a/sw/source/core/uibase/inc/mailconfigpage.hxx b/sw/source/core/uibase/inc/mailconfigpage.hxx index 2de39fd89704..bf16067b5646 100644 --- a/sw/source/core/uibase/inc/mailconfigpage.hxx +++ b/sw/source/core/uibase/inc/mailconfigpage.hxx @@ -61,7 +61,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); }; diff --git a/sw/source/core/uibase/inc/num.hxx b/sw/source/core/uibase/inc/num.hxx index 67d107588265..7a59e849f7e4 100644 --- a/sw/source/core/uibase/inc/num.hxx +++ b/sw/source/core/uibase/inc/num.hxx @@ -121,7 +121,7 @@ public: virtual void ActivatePage(const SfxItemSet& rSet); virtual int DeactivatePage(SfxItemSet *pSet); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); static SfxTabPage* Create( Window* pParent, diff --git a/sw/source/core/uibase/inc/numpara.hxx b/sw/source/core/uibase/inc/numpara.hxx index 71602d8fc33c..67aba90cb323 100644 --- a/sw/source/core/uibase/inc/numpara.hxx +++ b/sw/source/core/uibase/inc/numpara.hxx @@ -71,7 +71,7 @@ public: const SfxItemSet& rSet ); static sal_uInt16* GetRanges(); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); void EnableNewStart(); diff --git a/sw/source/core/uibase/inc/optcomp.hxx b/sw/source/core/uibase/inc/optcomp.hxx index afe29931d1d2..e0a1da8ea987 100644 --- a/sw/source/core/uibase/inc/optcomp.hxx +++ b/sw/source/core/uibase/inc/optcomp.hxx @@ -66,7 +66,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); }; diff --git a/sw/source/core/uibase/inc/optload.hxx b/sw/source/core/uibase/inc/optload.hxx index 6013d8b8dfc3..7aaf68fb3819 100644 --- a/sw/source/core/uibase/inc/optload.hxx +++ b/sw/source/core/uibase/inc/optload.hxx @@ -65,7 +65,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); }; @@ -166,7 +166,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); }; diff --git a/sw/source/core/uibase/inc/optpage.hxx b/sw/source/core/uibase/inc/optpage.hxx index 802b06092eed..c8d81879aa37 100644 --- a/sw/source/core/uibase/inc/optpage.hxx +++ b/sw/source/core/uibase/inc/optpage.hxx @@ -76,7 +76,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); }; @@ -125,7 +125,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); void SetFax( const std::vector<OUString>& ); void SelectFax( const OUString& ); @@ -197,7 +197,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); void SetFontMode(sal_uInt8 nGroup) {nFontGroup = nGroup;} @@ -239,7 +239,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); void SetWrtShell(SwWrtShell* pSh) {pWrtShell = pSh;} @@ -285,7 +285,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); void SetWrtShell( SwWrtShell * pSh ) { m_pWrtShell = pSh; } @@ -369,7 +369,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); }; @@ -388,7 +388,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); private: @@ -431,7 +431,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); }; diff --git a/sw/source/core/uibase/inc/outline.hxx b/sw/source/core/uibase/inc/outline.hxx index 6d54f977108d..6903d74d60bf 100644 --- a/sw/source/core/uibase/inc/outline.hxx +++ b/sw/source/core/uibase/inc/outline.hxx @@ -127,7 +127,7 @@ public: virtual void ActivatePage(const SfxItemSet& rSet); virtual int DeactivatePage(SfxItemSet *pSet); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); diff --git a/sw/source/core/uibase/inc/pgfnote.hxx b/sw/source/core/uibase/inc/pgfnote.hxx index 156607ef105d..270656b7095b 100644 --- a/sw/source/core/uibase/inc/pgfnote.hxx +++ b/sw/source/core/uibase/inc/pgfnote.hxx @@ -37,7 +37,7 @@ public: static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet); static sal_uInt16* GetRanges(); - virtual sal_Bool FillItemSet(SfxItemSet &rSet); + virtual bool FillItemSet(SfxItemSet &rSet); virtual void Reset(const SfxItemSet &rSet); private: diff --git a/sw/source/core/uibase/inc/pggrid.hxx b/sw/source/core/uibase/inc/pggrid.hxx index 4dfc5d22748c..8afce35e8fa6 100644 --- a/sw/source/core/uibase/inc/pggrid.hxx +++ b/sw/source/core/uibase/inc/pggrid.hxx @@ -89,7 +89,7 @@ public: static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet); static sal_uInt16* GetRanges(); - virtual sal_Bool FillItemSet(SfxItemSet &rSet); + virtual bool FillItemSet(SfxItemSet &rSet); virtual void Reset(const SfxItemSet &rSet); virtual void ActivatePage( const SfxItemSet& rSet ); diff --git a/sw/source/core/uibase/inc/regionsw.hxx b/sw/source/core/uibase/inc/regionsw.hxx index 44a9fa642684..185f60246bcc 100644 --- a/sw/source/core/uibase/inc/regionsw.hxx +++ b/sw/source/core/uibase/inc/regionsw.hxx @@ -191,7 +191,7 @@ public: void SetWrtShell(SwWrtShell& rSh); - virtual sal_Bool FillItemSet( SfxItemSet& ); + virtual bool FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet& ); static SfxTabPage* Create( Window* pParent, @@ -233,7 +233,7 @@ public: SwSectionFtnEndTabPage( Window *pParent, const SfxItemSet &rAttrSet ); virtual ~SwSectionFtnEndTabPage(); - virtual sal_Bool FillItemSet( SfxItemSet& ); + virtual bool FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet& ); static SfxTabPage* Create( Window* pParent, @@ -251,7 +251,7 @@ public: SwSectionIndentTabPage( Window *pParent, const SfxItemSet &rAttrSet ); virtual ~SwSectionIndentTabPage(); - virtual sal_Bool FillItemSet( SfxItemSet& ); + virtual bool FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet& ); static SfxTabPage* Create( Window* pParent, diff --git a/sw/source/core/uibase/inc/swuiccoll.hxx b/sw/source/core/uibase/inc/swuiccoll.hxx index d63d7ee99243..53e2fabaabd1 100644 --- a/sw/source/core/uibase/inc/swuiccoll.hxx +++ b/sw/source/core/uibase/inc/swuiccoll.hxx @@ -64,7 +64,7 @@ public: static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet); static sal_uInt16* GetRanges(); - virtual sal_Bool FillItemSet( SfxItemSet &rSet); + virtual bool FillItemSet( SfxItemSet &rSet); virtual void Reset (const SfxItemSet &rSet); void SetCollection( SwFmt* pFormat, sal_Bool bNew ); diff --git a/sw/source/core/uibase/inc/swuicnttab.hxx b/sw/source/core/uibase/inc/swuicnttab.hxx index 1986936f86f3..27385112a311 100644 --- a/sw/source/core/uibase/inc/swuicnttab.hxx +++ b/sw/source/core/uibase/inc/swuicnttab.hxx @@ -222,7 +222,7 @@ public: SwTOXSelectTabPage(Window* pParent, const SfxItemSet& rAttrSet); ~SwTOXSelectTabPage(); - virtual sal_Bool FillItemSet( SfxItemSet& ); + virtual bool FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet& ); virtual void ActivatePage( const SfxItemSet& ); @@ -435,7 +435,7 @@ public: SwTOXEntryTabPage(Window* pParent, const SfxItemSet& rAttrSet); ~SwTOXEntryTabPage(); - virtual sal_Bool FillItemSet( SfxItemSet& ); + virtual bool FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet& ); virtual void ActivatePage( const SfxItemSet& ); virtual int DeactivatePage( SfxItemSet* pSet = 0 ); @@ -481,7 +481,7 @@ public: SwTOXStylesTabPage(Window* pParent, const SfxItemSet& rAttrSet); ~SwTOXStylesTabPage(); - virtual sal_Bool FillItemSet( SfxItemSet& ); + virtual bool FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet& ); virtual void ActivatePage( const SfxItemSet& ); diff --git a/sw/source/core/uibase/inc/wrap.hxx b/sw/source/core/uibase/inc/wrap.hxx index 322b0530a749..7a9aa1fd4bc1 100644 --- a/sw/source/core/uibase/inc/wrap.hxx +++ b/sw/source/core/uibase/inc/wrap.hxx @@ -102,7 +102,7 @@ public: static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet); - virtual sal_Bool FillItemSet(SfxItemSet &rSet); + virtual bool FillItemSet(SfxItemSet &rSet); virtual void Reset(const SfxItemSet &rSet); static sal_uInt16* GetRanges(); diff --git a/sw/source/core/uibase/table/tablepg.hxx b/sw/source/core/uibase/table/tablepg.hxx index 17a708c7b3e3..87b4722b2b19 100644 --- a/sw/source/core/uibase/table/tablepg.hxx +++ b/sw/source/core/uibase/table/tablepg.hxx @@ -83,7 +83,7 @@ public: SwFormatTablePage( Window* pParent, const SfxItemSet& rSet ); static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); virtual void ActivatePage( const SfxItemSet& rSet ); virtual int DeactivatePage( SfxItemSet* pSet = 0 ); @@ -133,7 +133,7 @@ public: ~SwTableColumnPage(); static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); virtual void ActivatePage( const SfxItemSet& rSet ); virtual int DeactivatePage( SfxItemSet* pSet = 0 ); @@ -182,7 +182,7 @@ class SwTextFlowPage : public SfxTabPage public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); void SetShell(SwWrtShell* pSh); diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx index 220023a1404b..50012a53572c 100644 --- a/sw/source/ui/chrdlg/chardlg.cxx +++ b/sw/source/ui/chrdlg/chardlg.cxx @@ -236,7 +236,7 @@ void SwCharURLPage::Reset(const SfxItemSet& rSet) } } -sal_Bool SwCharURLPage::FillItemSet(SfxItemSet& rSet) +bool SwCharURLPage::FillItemSet(SfxItemSet& rSet) { OUString sURL = m_pURLED->GetText(); if(!sURL.isEmpty()) diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx index a525fafe1b36..085759dc0e71 100644 --- a/sw/source/ui/chrdlg/drpcps.cxx +++ b/sw/source/ui/chrdlg/drpcps.cxx @@ -603,7 +603,7 @@ SfxTabPage* SwDropCapsPage::Create(Window *pParent, Page: FillItemSet-Overload ****************************************************************************/ -sal_Bool SwDropCapsPage::FillItemSet(SfxItemSet &rSet) +bool SwDropCapsPage::FillItemSet(SfxItemSet &rSet) { if(bModified) FillSet(rSet); diff --git a/sw/source/ui/chrdlg/numpara.cxx b/sw/source/ui/chrdlg/numpara.cxx index b6c2b8c0ff51..87c7829d341b 100644 --- a/sw/source/ui/chrdlg/numpara.cxx +++ b/sw/source/ui/chrdlg/numpara.cxx @@ -103,7 +103,7 @@ sal_uInt16* SwParagraphNumTabPage::GetRanges() return aPageRg; } -sal_Bool SwParagraphNumTabPage::FillItemSet( SfxItemSet& rSet ) +bool SwParagraphNumTabPage::FillItemSet( SfxItemSet& rSet ) { if( m_pOutlineLvLB->GetSelectEntryPos() != m_pOutlineLvLB->GetSavedValue()) { diff --git a/sw/source/ui/chrdlg/swuiccoll.cxx b/sw/source/ui/chrdlg/swuiccoll.cxx index b391a0f15ecb..6a85aa051dc4 100644 --- a/sw/source/ui/chrdlg/swuiccoll.cxx +++ b/sw/source/ui/chrdlg/swuiccoll.cxx @@ -154,7 +154,7 @@ SfxTabPage* SwCondCollPage::Create(Window *pParent, const SfxItemSet &rSet) Page: FillItemSet-Overload ****************************************************************************/ -sal_Bool SwCondCollPage::FillItemSet(SfxItemSet &rSet) +bool SwCondCollPage::FillItemSet(SfxItemSet &rSet) { sal_Bool bModified = sal_True; SwCondCollItem aCondItem; diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx index b2aebf9d3a2b..f577bee450b8 100644 --- a/sw/source/ui/config/mailconfigpage.cxx +++ b/sw/source/ui/config/mailconfigpage.cxx @@ -143,7 +143,7 @@ SfxTabPage* SwMailConfigPage::Create( Window* pParent, const SfxItemSet& rAttrS return new SwMailConfigPage(pParent, rAttrSet); } -sal_Bool SwMailConfigPage::FillItemSet( SfxItemSet& /*rSet*/ ) +bool SwMailConfigPage::FillItemSet( SfxItemSet& /*rSet*/ ) { if(m_pDisplayNameED->GetText() != m_pDisplayNameED->GetSavedValue()) m_pConfigItem->SetMailDisplayName(m_pDisplayNameED->GetText()); @@ -162,7 +162,7 @@ sal_Bool SwMailConfigPage::FillItemSet( SfxItemSet& /*rSet*/ ) m_pConfigItem->SetSecureConnection(m_pSecureCB->IsChecked()); m_pConfigItem->Commit(); - return sal_True; + return true; } void SwMailConfigPage::Reset( const SfxItemSet& /*rSet*/ ) diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx index f0cd71a01815..89530ff1626c 100644 --- a/sw/source/ui/config/optcomp.cxx +++ b/sw/source/ui/config/optcomp.cxx @@ -409,7 +409,7 @@ SfxTabPage* SwCompatibilityOptPage::Create( Window* pParent, const SfxItemSet& r return new SwCompatibilityOptPage( pParent, rAttrSet ); } -sal_Bool SwCompatibilityOptPage::FillItemSet( SfxItemSet& ) +bool SwCompatibilityOptPage::FillItemSet( SfxItemSet& ) { sal_Bool bModified = sal_False; if ( m_pWrtShell ) diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index 4abd35c76d8c..3b24335757ee 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -128,7 +128,7 @@ SfxTabPage* SwLoadOptPage::Create( Window* pParent, return new SwLoadOptPage(pParent, rAttrSet ); } -sal_Bool SwLoadOptPage::FillItemSet( SfxItemSet& rSet ) +bool SwLoadOptPage::FillItemSet( SfxItemSet& rSet ) { sal_Bool bRet = sal_False; SwModule* pMod = SW_MOD(); @@ -494,7 +494,7 @@ SfxTabPage* SwCaptionOptPage::Create( Window* pParent, return new SwCaptionOptPage(pParent, rAttrSet ); } -sal_Bool SwCaptionOptPage::FillItemSet( SfxItemSet& ) +bool SwCaptionOptPage::FillItemSet( SfxItemSet& ) { sal_Bool bRet = sal_False; SwModuleOptions* pModOpt = SW_MOD()->GetModuleConfig(); diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index 5cf73bcf924f..e57265df7164 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -212,7 +212,7 @@ void SwContentOptPage::Reset(const SfxItemSet& rSet) AnyRulerHdl(m_pAnyRulerCB); } -sal_Bool SwContentOptPage::FillItemSet(SfxItemSet& rSet) +bool SwContentOptPage::FillItemSet(SfxItemSet& rSet) { const SwElemItem* pOldAttr = (const SwElemItem*) GetOldItem(GetItemSet(), FN_PARAM_ELEM); @@ -367,7 +367,7 @@ SfxTabPage* SwAddPrinterTabPage::Create( Window* pParent, return ( new SwAddPrinterTabPage( pParent, rAttrSet ) ); } -sal_Bool SwAddPrinterTabPage::FillItemSet( SfxItemSet& rCoreSet ) +bool SwAddPrinterTabPage::FillItemSet( SfxItemSet& rCoreSet ) { if ( bAttrModified ) { @@ -612,7 +612,7 @@ static void lcl_SetColl(SwWrtShell* pWrtShell, sal_uInt16 nType, pColl->SetFmtAttr(SvxFontHeightItem(nHeight, 100, nFontHeightWhich)); } -sal_Bool SwStdFontTabPage::FillItemSet( SfxItemSet& ) +bool SwStdFontTabPage::FillItemSet( SfxItemSet& ) { sal_Bool bNotDocOnly = !pDocOnlyCB->IsChecked(); SW_MOD()->GetModuleConfig()->SetDefaultFontInCurrDocOnly(!bNotDocOnly); @@ -740,7 +740,7 @@ sal_Bool SwStdFontTabPage::FillItemSet( SfxItemSet& ) pWrtShell->SetModified(); pWrtShell->EndAllAction(); } - return sal_False; + return false; } void SwStdFontTabPage::Reset( const SfxItemSet& rSet) @@ -1096,7 +1096,7 @@ SfxTabPage* SwTableOptionsTabPage::Create( Window* pParent, return new SwTableOptionsTabPage(pParent, rAttrSet ); } -sal_Bool SwTableOptionsTabPage::FillItemSet( SfxItemSet& ) +bool SwTableOptionsTabPage::FillItemSet( SfxItemSet& ) { sal_Bool bRet = sal_False; SwModuleOptions* pModOpt = SW_MOD()->GetModuleConfig(); @@ -1336,7 +1336,7 @@ void SwShdwCrsrOptionsTabPage::PageCreated( SfxAllItemSet aSet ) SetWrtShell(pWrtSh->GetValue()); } -sal_Bool SwShdwCrsrOptionsTabPage::FillItemSet( SfxItemSet& rSet ) +bool SwShdwCrsrOptionsTabPage::FillItemSet( SfxItemSet& rSet ) { SwShadowCursorItem aOpt; aOpt.SetOn( m_pOnOffCB->IsChecked() ); @@ -1739,7 +1739,7 @@ SfxTabPage* SwRedlineOptionsTabPage::Create( Window* pParent, const SfxItemSet& return new SwRedlineOptionsTabPage( pParent, rSet ); } -sal_Bool SwRedlineOptionsTabPage::FillItemSet( SfxItemSet& ) +bool SwRedlineOptionsTabPage::FillItemSet( SfxItemSet& ) { CharAttr *pAttr; SwModuleOptions *pOpt = SW_MOD()->GetModuleConfig(); @@ -1863,7 +1863,7 @@ sal_Bool SwRedlineOptionsTabPage::FillItemSet( SfxItemSet& ) } } - return sal_False; + return false; } void SwRedlineOptionsTabPage::Reset( const SfxItemSet& ) @@ -2242,7 +2242,7 @@ SfxTabPage* SwCompareOptionsTabPage::Create( Window* pParent, const SfxItemSet& return new SwCompareOptionsTabPage( pParent, rAttrSet ); } -sal_Bool SwCompareOptionsTabPage::FillItemSet( SfxItemSet& ) +bool SwCompareOptionsTabPage::FillItemSet( SfxItemSet& ) { sal_Bool bRet = sal_False; SwModuleOptions *pOpt = SW_MOD()->GetModuleConfig(); @@ -2367,7 +2367,7 @@ SfxTabPage* SwTestTabPage::Create( Window* pParent, return new SwTestTabPage(pParent, rAttrSet); } -sal_Bool SwTestTabPage::FillItemSet( SfxItemSet& rCoreSet ) +bool SwTestTabPage::FillItemSet( SfxItemSet& rCoreSet ) { if ( bAttrModified ) diff --git a/sw/source/ui/dialog/docstdlg.cxx b/sw/source/ui/dialog/docstdlg.cxx index 28f390506b93..0cb27d61fdd9 100644 --- a/sw/source/ui/dialog/docstdlg.cxx +++ b/sw/source/ui/dialog/docstdlg.cxx @@ -76,9 +76,9 @@ SwDocStatPage::SwDocStatPage(Window *pParent, const SfxItemSet &rSet) } // Description: fill ItemSet when changed -sal_Bool SwDocStatPage::FillItemSet(SfxItemSet & /*rSet*/) +bool SwDocStatPage::FillItemSet(SfxItemSet & /*rSet*/) { - return sal_False; + return false; } void SwDocStatPage::Reset(const SfxItemSet &/*rSet*/) diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index 0443390cbf3d..24e563093902 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -1611,7 +1611,7 @@ void SwInsertSectionTabPage::SetWrtShell(SwWrtShell& rSh) } } -sal_Bool SwInsertSectionTabPage::FillItemSet( SfxItemSet& ) +bool SwInsertSectionTabPage::FillItemSet( SfxItemSet& ) { SwSectionData aSection(CONTENT_SECTION, m_pCurName->GetText()); aSection.SetCondition(m_pConditionED->GetText()); @@ -1667,7 +1667,7 @@ sal_Bool SwInsertSectionTabPage::FillItemSet( SfxItemSet& ) } } ((SwInsertSectionTabDialog*)GetTabDialog())->SetSectionData(aSection); - return sal_True; + return true; } void SwInsertSectionTabPage::Reset( const SfxItemSet& ) @@ -1892,7 +1892,7 @@ SwSectionFtnEndTabPage::~SwSectionFtnEndTabPage() { } -sal_Bool SwSectionFtnEndTabPage::FillItemSet( SfxItemSet& rSet ) +bool SwSectionFtnEndTabPage::FillItemSet( SfxItemSet& rSet ) { SwFmtFtnAtTxtEnd aFtn( pFtnNtAtTextEndCB->IsChecked() ? ( pFtnNtNumCB->IsChecked() @@ -1939,7 +1939,7 @@ sal_Bool SwSectionFtnEndTabPage::FillItemSet( SfxItemSet& rSet ) rSet.Put( aFtn ); rSet.Put( aEnd ); - return sal_True; + return true; } void SwSectionFtnEndTabPage::ResetState( sal_Bool bFtn, @@ -2153,7 +2153,7 @@ SwSectionIndentTabPage::~SwSectionIndentTabPage() { } -sal_Bool SwSectionIndentTabPage::FillItemSet( SfxItemSet& rSet) +bool SwSectionIndentTabPage::FillItemSet( SfxItemSet& rSet) { if(m_pBeforeMF->IsValueModified() || m_pAfterMF->IsValueModified()) @@ -2163,7 +2163,7 @@ sal_Bool SwSectionIndentTabPage::FillItemSet( SfxItemSet& rSet) static_cast< long >(m_pAfterMF->Denormalize(m_pAfterMF->GetValue(FUNIT_TWIP))), 0, 0, RES_LR_SPACE); rSet.Put(aLRSpace); } - return sal_True; + return true; } void SwSectionIndentTabPage::Reset( const SfxItemSet& rSet) diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx index 468f273fb14e..e9835754e932 100644 --- a/sw/source/ui/envelp/envfmt.cxx +++ b/sw/source/ui/envelp/envfmt.cxx @@ -493,11 +493,11 @@ void SwEnvFmtPage::FillItem(SwEnvItem& rItem) } } -sal_Bool SwEnvFmtPage::FillItemSet(SfxItemSet& rSet) +bool SwEnvFmtPage::FillItemSet(SfxItemSet& rSet) { FillItem(GetParentSwEnvDlg()->aEnvItem); rSet.Put(GetParentSwEnvDlg()->aEnvItem); - return sal_True; + return true; } void SwEnvFmtPage::Reset(const SfxItemSet& rSet) diff --git a/sw/source/ui/envelp/envfmt.hxx b/sw/source/ui/envelp/envfmt.hxx index 8629d5f8deb7..4f3a78af1feb 100644 --- a/sw/source/ui/envelp/envfmt.hxx +++ b/sw/source/ui/envelp/envfmt.hxx @@ -67,7 +67,7 @@ public: virtual void ActivatePage(const SfxItemSet& rSet); virtual int DeactivatePage(SfxItemSet* pSet = 0); void FillItem(SwEnvItem& rItem); - virtual sal_Bool FillItemSet(SfxItemSet& rSet); + virtual bool FillItemSet(SfxItemSet& rSet); virtual void Reset(const SfxItemSet& rSet); }; diff --git a/sw/source/ui/envelp/envlop1.cxx b/sw/source/ui/envelp/envlop1.cxx index f9abd95b55ab..ddf453d5fb74 100644 --- a/sw/source/ui/envelp/envlop1.cxx +++ b/sw/source/ui/envelp/envlop1.cxx @@ -336,11 +336,11 @@ void SwEnvPage::FillItem(SwEnvItem& rItem) rItem.aSendText = m_pSenderEdit->GetText(); } -sal_Bool SwEnvPage::FillItemSet(SfxItemSet& rSet) +bool SwEnvPage::FillItemSet(SfxItemSet& rSet) { FillItem(GetParentSwEnvDlg()->aEnvItem); rSet.Put(GetParentSwEnvDlg()->aEnvItem); - return sal_True; + return true; } void SwEnvPage::Reset(const SfxItemSet& rSet) diff --git a/sw/source/ui/envelp/envprt.cxx b/sw/source/ui/envelp/envprt.cxx index c06c15f77b70..9ec2eb899cbc 100644 --- a/sw/source/ui/envelp/envprt.cxx +++ b/sw/source/ui/envelp/envprt.cxx @@ -161,11 +161,11 @@ void SwEnvPrtPage::FillItem(SwEnvItem& rItem) rItem.lShiftDown = static_cast< sal_Int32 >(GetFldVal(*m_pDownField )); } -sal_Bool SwEnvPrtPage::FillItemSet(SfxItemSet& rSet) +bool SwEnvPrtPage::FillItemSet(SfxItemSet& rSet) { FillItem(GetParentSwEnvDlg()->aEnvItem); rSet.Put(GetParentSwEnvDlg()->aEnvItem); - return sal_True; + return true; } void SwEnvPrtPage::Reset(const SfxItemSet& rSet) diff --git a/sw/source/ui/envelp/envprt.hxx b/sw/source/ui/envelp/envprt.hxx index 6134474a7a6c..01d866b620cb 100644 --- a/sw/source/ui/envelp/envprt.hxx +++ b/sw/source/ui/envelp/envprt.hxx @@ -66,7 +66,7 @@ public: virtual void ActivatePage(const SfxItemSet& rSet); virtual int DeactivatePage(SfxItemSet* pSet = 0); void FillItem(SwEnvItem& rItem); - virtual sal_Bool FillItemSet(SfxItemSet& rSet); + virtual bool FillItemSet(SfxItemSet& rSet); virtual void Reset(const SfxItemSet& rSet); inline void SetPrt(Printer* pPrinter) { pPrt = pPrinter; } diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx index 90267465de83..e366477248f6 100644 --- a/sw/source/ui/envelp/label1.cxx +++ b/sw/source/ui/envelp/label1.cxx @@ -494,12 +494,12 @@ void SwLabPage::FillItem(SwLabItem& rItem) rItem.aLstType = m_pTypeBox->GetSelectEntry(); } -sal_Bool SwLabPage::FillItemSet(SfxItemSet& rSet) +bool SwLabPage::FillItemSet(SfxItemSet& rSet) { FillItem( aItem ); rSet.Put( aItem ); - return sal_True; + return true; } void SwLabPage::Reset(const SfxItemSet& rSet) @@ -614,7 +614,7 @@ int SwVisitingCardPage::DeactivatePage(SfxItemSet* _pSet) return LEAVE_PAGE; } -sal_Bool SwVisitingCardPage::FillItemSet(SfxItemSet& rSet) +bool SwVisitingCardPage::FillItemSet(SfxItemSet& rSet) { const OUString* pGroup = (const OUString*)m_pAutoTextGroupLB->GetEntryData( m_pAutoTextGroupLB->GetSelectEntryPos()); @@ -627,7 +627,7 @@ sal_Bool SwVisitingCardPage::FillItemSet(SfxItemSet& rSet) if(pSelEntry) aLabItem.sGlossaryBlockName = *(OUString*)pSelEntry->GetUserData(); rSet.Put(aLabItem); - return sal_True; + return true; } static void lcl_SelectBlock(SvTreeListBox& rAutoTextLB, const OUString& rBlockName) @@ -747,7 +747,7 @@ int SwPrivateDataPage::DeactivatePage(SfxItemSet* _pSet) return LEAVE_PAGE; } -sal_Bool SwPrivateDataPage::FillItemSet(SfxItemSet& rSet) +bool SwPrivateDataPage::FillItemSet(SfxItemSet& rSet) { SwLabItem aItem = (const SwLabItem&) GetTabDialog()->GetExampleSet()->Get(FN_LABEL); @@ -771,7 +771,7 @@ sal_Bool SwPrivateDataPage::FillItemSet(SfxItemSet& rSet) aItem.aPrivMail = m_pMailED->GetText( ); rSet.Put(aItem); - return sal_True; + return true; } void SwPrivateDataPage::Reset(const SfxItemSet& rSet) @@ -835,7 +835,7 @@ int SwBusinessDataPage::DeactivatePage(SfxItemSet* _pSet) return LEAVE_PAGE; } -sal_Bool SwBusinessDataPage::FillItemSet(SfxItemSet& rSet) +bool SwBusinessDataPage::FillItemSet(SfxItemSet& rSet) { SwLabItem aItem = (const SwLabItem&) GetTabDialog()->GetExampleSet()->Get(FN_LABEL); @@ -855,7 +855,7 @@ sal_Bool SwBusinessDataPage::FillItemSet(SfxItemSet& rSet) aItem.aCompMail = m_pMailED->GetText(); rSet.Put(aItem); - return sal_True; + return true; } void SwBusinessDataPage::Reset(const SfxItemSet& rSet) diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx index dd5aebffb012..97abd798b15d 100644 --- a/sw/source/ui/envelp/labfmt.cxx +++ b/sw/source/ui/envelp/labfmt.cxx @@ -508,12 +508,12 @@ void SwLabFmtPage::FillItem(SwLabItem& rItem) } } -sal_Bool SwLabFmtPage::FillItemSet(SfxItemSet& rSet) +bool SwLabFmtPage::FillItemSet(SfxItemSet& rSet) { FillItem(aItem); rSet.Put(aItem); - return sal_True; + return true; } void SwLabFmtPage::Reset(const SfxItemSet& ) diff --git a/sw/source/ui/envelp/labfmt.hxx b/sw/source/ui/envelp/labfmt.hxx index eb6f3eb7304b..59201444817f 100644 --- a/sw/source/ui/envelp/labfmt.hxx +++ b/sw/source/ui/envelp/labfmt.hxx @@ -112,7 +112,7 @@ public: virtual void ActivatePage(const SfxItemSet& rSet); virtual int DeactivatePage(SfxItemSet* pSet = 0); void FillItem(SwLabItem& rItem); - virtual sal_Bool FillItemSet(SfxItemSet& rSet); + virtual bool FillItemSet(SfxItemSet& rSet); virtual void Reset(const SfxItemSet& rSet); SwLabDlg* GetParentSwLabDlg() {return (SwLabDlg*)GetParentDialog();} diff --git a/sw/source/ui/envelp/labprt.cxx b/sw/source/ui/envelp/labprt.cxx index c59b3593fa38..09124698c698 100644 --- a/sw/source/ui/envelp/labprt.cxx +++ b/sw/source/ui/envelp/labprt.cxx @@ -119,14 +119,14 @@ void SwLabPrtPage::FillItem(SwLabItem& rItem) rItem.bSynchron = m_pSynchronCB->IsChecked() && m_pSynchronCB->IsEnabled(); } -sal_Bool SwLabPrtPage::FillItemSet(SfxItemSet& rSet) +bool SwLabPrtPage::FillItemSet(SfxItemSet& rSet) { SwLabItem aItem; GetParentSwLabDlg()->GetLabItem(aItem); FillItem(aItem); rSet.Put(aItem); - return sal_True; + return true; } void SwLabPrtPage::Reset(const SfxItemSet& ) diff --git a/sw/source/ui/envelp/labprt.hxx b/sw/source/ui/envelp/labprt.hxx index 1821a2877ebc..d07a309c1676 100644 --- a/sw/source/ui/envelp/labprt.hxx +++ b/sw/source/ui/envelp/labprt.hxx @@ -63,7 +63,7 @@ public: virtual void ActivatePage(const SfxItemSet& rSet); virtual int DeactivatePage(SfxItemSet* pSet = 0); void FillItem(SwLabItem& rItem); - virtual sal_Bool FillItemSet(SfxItemSet& rSet); + virtual bool FillItemSet(SfxItemSet& rSet); virtual void Reset(const SfxItemSet& rSet); inline Printer* GetPrt() { return (pPrinter); } }; diff --git a/sw/source/ui/envelp/swuilabimp.hxx b/sw/source/ui/envelp/swuilabimp.hxx index 7e6590251ab1..57b5959e9af5 100644 --- a/sw/source/ui/envelp/swuilabimp.hxx +++ b/sw/source/ui/envelp/swuilabimp.hxx @@ -68,7 +68,7 @@ public: virtual void ActivatePage(const SfxItemSet& rSet); virtual int DeactivatePage(SfxItemSet* pSet = 0); void FillItem(SwLabItem& rItem); - virtual sal_Bool FillItemSet(SfxItemSet& rSet); + virtual bool FillItemSet(SfxItemSet& rSet); virtual void Reset(const SfxItemSet& rSet); SwLabDlg* GetParentSwLabDlg() {return (SwLabDlg*) GetParentDialog();} @@ -119,7 +119,7 @@ public: virtual void ActivatePage(const SfxItemSet& rSet); virtual int DeactivatePage(SfxItemSet* pSet = 0); - virtual sal_Bool FillItemSet(SfxItemSet& rSet); + virtual bool FillItemSet(SfxItemSet& rSet); virtual void Reset(const SfxItemSet& rSet); }; @@ -157,7 +157,7 @@ public: virtual void ActivatePage(const SfxItemSet& rSet); virtual int DeactivatePage(SfxItemSet* pSet = 0); - virtual sal_Bool FillItemSet(SfxItemSet& rSet); + virtual bool FillItemSet(SfxItemSet& rSet); virtual void Reset(const SfxItemSet& rSet); }; @@ -193,7 +193,7 @@ public: virtual void ActivatePage(const SfxItemSet& rSet); virtual int DeactivatePage(SfxItemSet* pSet = 0); - virtual sal_Bool FillItemSet(SfxItemSet& rSet); + virtual bool FillItemSet(SfxItemSet& rSet); virtual void Reset(const SfxItemSet& rSet); }; diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx index f239e8ecac4d..2f775366289e 100644 --- a/sw/source/ui/fldui/flddb.cxx +++ b/sw/source/ui/fldui/flddb.cxx @@ -181,7 +181,7 @@ void SwFldDBPage::Reset(const SfxItemSet&) } } -sal_Bool SwFldDBPage::FillItemSet(SfxItemSet& ) +bool SwFldDBPage::FillItemSet(SfxItemSet& ) { OUString sTableName; OUString sColumnName; @@ -246,7 +246,7 @@ sal_Bool SwFldDBPage::FillItemSet(SfxItemSet& ) } } - return sal_False; + return false; } SfxTabPage* SwFldDBPage::Create( Window* pParent, diff --git a/sw/source/ui/fldui/flddb.hxx b/sw/source/ui/fldui/flddb.hxx index 2874f4e65697..a446ae3a0bd1 100644 --- a/sw/source/ui/fldui/flddb.hxx +++ b/sw/source/ui/fldui/flddb.hxx @@ -74,7 +74,7 @@ public: static SfxTabPage* Create(Window* pParent, const SfxItemSet& rAttrSet); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); virtual void FillUserData(); diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx index 372c6794ac63..18e2393cd6c1 100644 --- a/sw/source/ui/fldui/flddinf.cxx +++ b/sw/source/ui/fldui/flddinf.cxx @@ -414,10 +414,10 @@ sal_Int32 SwFldDokInfPage::FillSelectionLB(sal_uInt16 nSubType) return nSize; } -sal_Bool SwFldDokInfPage::FillItemSet(SfxItemSet& ) +bool SwFldDokInfPage::FillItemSet(SfxItemSet& ) { if (!pSelEntry || (sal_uInt16)(sal_uLong)pSelEntry->GetUserData() == USHRT_MAX) - return sal_False; + return false; sal_uInt16 nTypeId = TYP_DOCINFOFLD; sal_uInt16 nSubType = (sal_uInt16)(sal_uLong)pSelEntry->GetUserData(); @@ -448,7 +448,7 @@ sal_Bool SwFldDokInfPage::FillItemSet(SfxItemSet& ) ' ', m_pFormatLB->IsAutomaticLanguage()); } - return sal_False; + return false; } SfxTabPage* SwFldDokInfPage::Create( Window* pParent, diff --git a/sw/source/ui/fldui/flddinf.hxx b/sw/source/ui/fldui/flddinf.hxx index e58361967468..464e1ecbf053 100644 --- a/sw/source/ui/fldui/flddinf.hxx +++ b/sw/source/ui/fldui/flddinf.hxx @@ -65,7 +65,7 @@ public: static SfxTabPage* Create(Window* pParent, const SfxItemSet& rAttrSet); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); virtual void FillUserData(); diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx index ec6bc4f119df..7753fcc98894 100644 --- a/sw/source/ui/fldui/flddok.cxx +++ b/sw/source/ui/fldui/flddok.cxx @@ -539,7 +539,7 @@ IMPL_LINK_NOARG(SwFldDokPage, FormatHdl) return 0; } -sal_Bool SwFldDokPage::FillItemSet(SfxItemSet& ) +bool SwFldDokPage::FillItemSet(SfxItemSet& ) { sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)m_pTypeLB->GetEntryData(GetTypeSel()); @@ -628,7 +628,7 @@ sal_Bool SwFldDokPage::FillItemSet(SfxItemSet& ) InsertFld( nTypeId, nSubType, aEmptyOUStr, aVal, nFormat, ' ', m_pNumFormatLB->IsAutomaticLanguage() ); } - return sal_False; + return false; } SfxTabPage* SwFldDokPage::Create( Window* pParent, diff --git a/sw/source/ui/fldui/flddok.hxx b/sw/source/ui/fldui/flddok.hxx index 25149e51b401..ec6ec8179dcd 100644 --- a/sw/source/ui/fldui/flddok.hxx +++ b/sw/source/ui/fldui/flddok.hxx @@ -67,7 +67,7 @@ public: static SfxTabPage* Create(Window* pParent, const SfxItemSet& rAttrSet); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); virtual void FillUserData(); diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx index b16075f4beb6..8ab5f5ea1d11 100644 --- a/sw/source/ui/fldui/fldfunc.cxx +++ b/sw/source/ui/fldui/fldfunc.cxx @@ -519,7 +519,7 @@ IMPL_LINK( SwFldFuncPage, MacroHdl, Button *, pBtn ) return 0; } -sal_Bool SwFldFuncPage::FillItemSet(SfxItemSet& ) +bool SwFldFuncPage::FillItemSet(SfxItemSet& ) { sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)m_pTypeLB->GetEntryData(GetTypeSel()); @@ -582,7 +582,7 @@ sal_Bool SwFldFuncPage::FillItemSet(SfxItemSet& ) ModifyHdl(); // enable/disable Insert if applicable - return sal_False; + return false; } OUString SwFldFuncPage::TurnMacroString(const OUString &rMacro) diff --git a/sw/source/ui/fldui/fldfunc.hxx b/sw/source/ui/fldui/fldfunc.hxx index 2923fd2c7fd6..032fb4c94710 100644 --- a/sw/source/ui/fldui/fldfunc.hxx +++ b/sw/source/ui/fldui/fldfunc.hxx @@ -89,7 +89,7 @@ public: static SfxTabPage* Create(Window* pParent, const SfxItemSet& rAttrSet); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); virtual void FillUserData(); diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx index 0eb5cf156fb3..8820f866fb04 100644 --- a/sw/source/ui/fldui/fldref.cxx +++ b/sw/source/ui/fldui/fldref.cxx @@ -776,7 +776,7 @@ IMPL_LINK_NOARG(SwFldRefPage, ModifyHdl) return 0; } -sal_Bool SwFldRefPage::FillItemSet(SfxItemSet& ) +bool SwFldRefPage::FillItemSet(SfxItemSet& ) { sal_Bool bModified = sal_False; sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)m_pTypeLB->GetEntryData(GetTypeSel()); @@ -957,7 +957,7 @@ sal_Bool SwFldRefPage::FillItemSet(SfxItemSet& ) ModifyHdl(); // enable/disable insert if applicable - return sal_False; + return false; } SfxTabPage* SwFldRefPage::Create( Window* pParent, diff --git a/sw/source/ui/fldui/fldref.hxx b/sw/source/ui/fldui/fldref.hxx index 47dde6c62542..99414d70f9c9 100644 --- a/sw/source/ui/fldui/fldref.hxx +++ b/sw/source/ui/fldui/fldref.hxx @@ -83,7 +83,7 @@ public: static SfxTabPage* Create(Window* pParent, const SfxItemSet& rAttrSet); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); virtual void FillUserData(); diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx index 2f844a358650..460ef90d8852 100644 --- a/sw/source/ui/fldui/fldvar.cxx +++ b/sw/source/ui/fldui/fldvar.cxx @@ -1093,7 +1093,7 @@ IMPL_LINK_NOARG(SwFldVarPage, SeparatorHdl) return 0; } -sal_Bool SwFldVarPage::FillItemSet(SfxItemSet& ) +bool SwFldVarPage::FillItemSet(SfxItemSet& ) { sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)m_pTypeLB->GetEntryData(GetTypeSel()); @@ -1217,7 +1217,7 @@ sal_Bool SwFldVarPage::FillItemSet(SfxItemSet& ) UpdateSubType(); - return sal_False; + return false; } SfxTabPage* SwFldVarPage::Create( Window* pParent, diff --git a/sw/source/ui/fldui/fldvar.hxx b/sw/source/ui/fldui/fldvar.hxx index 7165117a6e8b..ec335bae5106 100644 --- a/sw/source/ui/fldui/fldvar.hxx +++ b/sw/source/ui/fldui/fldvar.hxx @@ -96,7 +96,7 @@ public: static SfxTabPage* Create(Window* pParent, const SfxItemSet& rAttrSet); - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); virtual void FillUserData(); diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx index 53d4cb0da98e..43fb6a709af1 100644 --- a/sw/source/ui/frmdlg/column.cxx +++ b/sw/source/ui/frmdlg/column.cxx @@ -638,7 +638,7 @@ SfxTabPage* SwColumnPage::Create(Window *pParent, const SfxItemSet &rSet) /*-------------------------------------------------------------------- Description: stuff attributes into the Set when OK --------------------------------------------------------------------*/ -sal_Bool SwColumnPage::FillItemSet(SfxItemSet &rSet) +bool SwColumnPage::FillItemSet(SfxItemSet &rSet) { if(m_pCLNrEdt->HasChildPathFocus()) m_pCLNrEdt->GetDownHdl().Call(m_pCLNrEdt); @@ -663,7 +663,7 @@ sal_Bool SwColumnPage::FillItemSet(SfxItemSet &rSet) sal_uInt32 nDirection = (sal_uInt32)(sal_IntPtr)m_pTextDirectionLB->GetEntryData( nPos ); rSet.Put( SvxFrameDirectionItem( (SvxFrameDirection)nDirection, RES_FRAMEDIR)); } - return sal_True; + return true; } /*-------------------------------------------------------------------- diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index 7c3732452cf0..8b04a71f7588 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -1039,7 +1039,7 @@ void SwFrmPage::Reset( const SfxItemSet &rSet ) /*-------------------------------------------------------------------- Description: stuff attributes into the set when OK --------------------------------------------------------------------*/ -sal_Bool SwFrmPage::FillItemSet(SfxItemSet &rSet) +bool SwFrmPage::FillItemSet(SfxItemSet &rSet) { bool bRet = false; SwWrtShell* pSh = bFormat ? ::GetActiveWrtShell() @@ -2523,7 +2523,7 @@ void SwGrfExtPage::ActivatePage(const SfxItemSet& rSet) m_pBmpWin->Invalidate(); } -sal_Bool SwGrfExtPage::FillItemSet( SfxItemSet &rSet ) +bool SwGrfExtPage::FillItemSet( SfxItemSet &rSet ) { sal_Bool bModified = sal_False; if ( m_pMirrorHorzBox->GetSavedValue() != TriState(m_pMirrorHorzBox->IsChecked()) || @@ -2795,7 +2795,7 @@ void SwFrmURLPage::Reset( const SfxItemSet &rSet ) pClientCB->SaveValue(); } -sal_Bool SwFrmURLPage::FillItemSet(SfxItemSet &rSet) +bool SwFrmURLPage::FillItemSet(SfxItemSet &rSet) { sal_Bool bModified = sal_False; const SwFmtURL* pOldURL = (SwFmtURL*)GetOldItem(rSet, RES_URL); @@ -3087,7 +3087,7 @@ void SwFrmAddPage::Reset(const SfxItemSet &rSet ) m_pVertAlignLB->SaveValue(); } -sal_Bool SwFrmAddPage::FillItemSet(SfxItemSet &rSet) +bool SwFrmAddPage::FillItemSet(SfxItemSet &rSet) { bool bRet = false; if (pNameED->GetText() != pNameED->GetSavedValue()) diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx index 741b4526e73c..bd8364d4eba1 100644 --- a/sw/source/ui/frmdlg/wrap.cxx +++ b/sw/source/ui/frmdlg/wrap.cxx @@ -269,7 +269,7 @@ void SwWrapTabPage::Reset(const SfxItemSet &rSet) /*-------------------------------------------------------------------- Description: stuff attributes into the set when OK --------------------------------------------------------------------*/ -sal_Bool SwWrapTabPage::FillItemSet(SfxItemSet &rSet) +bool SwWrapTabPage::FillItemSet(SfxItemSet &rSet) { bool bModified = false; const SfxPoolItem* pOldItem; diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 658b00425f20..00872409616f 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -931,9 +931,9 @@ void SwTOXSelectTabPage::SetWrtShell(SwWrtShell& rSh) } } -sal_Bool SwTOXSelectTabPage::FillItemSet( SfxItemSet& ) +bool SwTOXSelectTabPage::FillItemSet( SfxItemSet& ) { - return sal_True; + return true; } static long lcl_TOXTypesToUserData(CurTOXType eType) @@ -1927,10 +1927,10 @@ SwTOXEntryTabPage::~SwTOXEntryTabPage() { } -sal_Bool SwTOXEntryTabPage::FillItemSet( SfxItemSet& ) +bool SwTOXEntryTabPage::FillItemSet( SfxItemSet& ) { // nothing to do - return sal_True; + return true; } void SwTOXEntryTabPage::Reset( const SfxItemSet& ) @@ -3585,9 +3585,9 @@ SwTOXStylesTabPage::~SwTOXStylesTabPage() delete m_pCurrentForm; } -sal_Bool SwTOXStylesTabPage::FillItemSet( SfxItemSet& ) +bool SwTOXStylesTabPage::FillItemSet( SfxItemSet& ) { - return sal_True; + return true; } void SwTOXStylesTabPage::Reset( const SfxItemSet& rSet ) diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx index ff4e2becf734..adb22ef57be7 100644 --- a/sw/source/ui/misc/docfnote.cxx +++ b/sw/source/ui/misc/docfnote.cxx @@ -348,7 +348,7 @@ static SwCharFmt* lcl_GetCharFormat( SwWrtShell* pSh, const OUString& rCharFmtNa return pFmt; } -sal_Bool SwEndNoteOptionPage::FillItemSet( SfxItemSet & ) +bool SwEndNoteOptionPage::FillItemSet( SfxItemSet & ) { SwEndNoteInfo *pInf = bEndNote ? new SwEndNoteInfo() : new SwFtnInfo(); @@ -392,7 +392,7 @@ sal_Bool SwEndNoteOptionPage::FillItemSet( SfxItemSet & ) pSh->SetFtnInfo( *pI ); } delete pInf; - return sal_True; + return true; } SwFootNoteOptionPage::SwFootNoteOptionPage( Window *pParent, const SfxItemSet &rSet ) : diff --git a/sw/source/ui/misc/impfnote.hxx b/sw/source/ui/misc/impfnote.hxx index fab6f1749104..88dc169e13d0 100644 --- a/sw/source/ui/misc/impfnote.hxx +++ b/sw/source/ui/misc/impfnote.hxx @@ -72,7 +72,7 @@ public: ~SwEndNoteOptionPage(); static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet); - virtual sal_Bool FillItemSet(SfxItemSet &rSet); + virtual bool FillItemSet(SfxItemSet &rSet); virtual void Reset( const SfxItemSet& ); void SetShell( SwWrtShell &rShell ); diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx index 5079ed9140ce..011ac07f8b9c 100644 --- a/sw/source/ui/misc/num.cxx +++ b/sw/source/ui/misc/num.cxx @@ -405,7 +405,7 @@ int SwNumPositionTabPage::DeactivatePage(SfxItemSet *_pSet) } -sal_Bool SwNumPositionTabPage::FillItemSet( SfxItemSet& rSet ) +bool SwNumPositionTabPage::FillItemSet( SfxItemSet& rSet ) { if(pOutlineDlg) *pOutlineDlg->GetNumRule() = *pActNum; diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx index b532e69c0fd4..71e7635f63c3 100644 --- a/sw/source/ui/misc/outline.cxx +++ b/sw/source/ui/misc/outline.cxx @@ -818,9 +818,9 @@ int SwOutlineSettingsTabPage::DeactivatePage(SfxItemSet*) return LEAVE_PAGE; } -sal_Bool SwOutlineSettingsTabPage::FillItemSet( SfxItemSet& ) +bool SwOutlineSettingsTabPage::FillItemSet( SfxItemSet& ) { - return sal_True; + return true; } void SwOutlineSettingsTabPage::Reset( const SfxItemSet& rSet ) diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx index 3e356866548f..711a0d469b3c 100644 --- a/sw/source/ui/misc/pgfnote.cxx +++ b/sw/source/ui/misc/pgfnote.cxx @@ -259,7 +259,7 @@ void SwFootNotePage::Reset(const SfxItemSet &rSet) /*-------------------------------------------------------------------- Description: stuff attributes into the set, when OK --------------------------------------------------------------------*/ -sal_Bool SwFootNotePage::FillItemSet(SfxItemSet &rSet) +bool SwFootNotePage::FillItemSet(SfxItemSet &rSet) { SwPageFtnInfoItem aItem((const SwPageFtnInfoItem&)GetItemSet().Get(FN_PARAM_FTN_INFO)); @@ -303,7 +303,7 @@ sal_Bool SwFootNotePage::FillItemSet(SfxItemSet &rSet) aItem != *pOldItem ) rSet.Put(aItem); - return sal_True; + return true; } void SwFootNotePage::ActivatePage(const SfxItemSet& rSet) diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx index 3fb9dd182372..c83e4201ffad 100644 --- a/sw/source/ui/misc/pggrid.cxx +++ b/sw/source/ui/misc/pggrid.cxx @@ -158,7 +158,7 @@ SfxTabPage *SwTextGridPage::Create(Window *pParent, const SfxItemSet &rSet) return new SwTextGridPage(pParent, rSet); } -sal_Bool SwTextGridPage::FillItemSet(SfxItemSet &rSet) +bool SwTextGridPage::FillItemSet(SfxItemSet &rSet) { sal_Bool bRet = sal_False; if(m_pNoGridRB->GetSavedValue() != m_pNoGridRB->IsChecked()|| diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx index 396448cef1b0..1168d3f3e7a1 100644 --- a/sw/source/ui/table/tabledlg.cxx +++ b/sw/source/ui/table/tabledlg.cxx @@ -373,7 +373,7 @@ SfxTabPage* SwFormatTablePage::Create( Window* pParent, return new SwFormatTablePage( pParent, rAttrSet ); } -sal_Bool SwFormatTablePage::FillItemSet( SfxItemSet& rCoreSet ) +bool SwFormatTablePage::FillItemSet( SfxItemSet& rCoreSet ) { //Test if one of the controls still has the focus if (m_aWidthMF.HasFocus()) @@ -904,7 +904,7 @@ IMPL_LINK( SwTableColumnPage, ModeHdl, CheckBox*, pBox ) return 0; }; -sal_Bool SwTableColumnPage::FillItemSet( SfxItemSet& ) +bool SwTableColumnPage::FillItemSet( SfxItemSet& ) { for( sal_uInt16 i = 0; i < MET_FIELDS; i++ ) { @@ -1319,7 +1319,7 @@ SfxTabPage* SwTextFlowPage::Create( Window* pParent, return new SwTextFlowPage(pParent, rAttrSet); } -sal_Bool SwTextFlowPage::FillItemSet( SfxItemSet& rSet ) +bool SwTextFlowPage::FillItemSet( SfxItemSet& rSet ) { bool bModified = false; |