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 /cui | |
| parent | ffca95023020a24eaff4ece1d4c7bedd469bfb78 (diff) | |
sfx2: sal_Bool->bool
Change-Id: I1fd02cc148fd9a54d2092dad1e548f51a0813a14
Diffstat (limited to 'cui')
111 files changed, 324 insertions, 322 deletions
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); |