[Libreoffice-commits] core.git: 10 commits - basic/source chart2/source cui/source dbaccess/source framework/source include/basic include/framework include/sfx2 include/svx include/xmlscript sc/source sd/source sfx2/source starmath/inc starmath/source svx/source sw/source xmlscript/source
Noel Grandin
noel at peralex.com
Thu Mar 27 04:45:42 PDT 2014
basic/source/basmgr/basmgr.cxx | 164 ++++----
basic/source/basmgr/vbahelper.cxx | 12
basic/source/classes/sb.cxx | 44 +-
basic/source/classes/sbunoobj.cxx | 12
basic/source/classes/sbxmod.cxx | 112 ++---
basic/source/comp/sbcomp.cxx | 8
basic/source/inc/sbjsmod.hxx | 4
basic/source/inc/scriptcont.hxx | 2
basic/source/inc/stdobj.hxx | 2
basic/source/runtime/props.cxx | 4
basic/source/runtime/runtime.cxx | 6
basic/source/runtime/stdobj.cxx | 2
basic/source/runtime/stdobj1.cxx | 2
basic/source/sbx/sbxarray.cxx | 41 +-
basic/source/sbx/sbxbase.cxx | 48 +-
basic/source/sbx/sbxbool.cxx | 2
basic/source/sbx/sbxcoll.cxx | 16
basic/source/sbx/sbxform.cxx | 126 +++---
basic/source/sbx/sbxobj.cxx | 48 +-
basic/source/sbx/sbxscan.cxx | 7
basic/source/sbx/sbxvalue.cxx | 201 +++++-----
basic/source/sbx/sbxvar.cxx | 34 -
basic/source/uno/modsizeexceeded.cxx | 4
basic/source/uno/scriptcont.cxx | 6
chart2/source/controller/dialogs/res_DataLabel.cxx | 4
chart2/source/controller/dialogs/res_DataLabel.hxx | 2
chart2/source/controller/dialogs/res_ErrorBar.cxx | 4
chart2/source/controller/dialogs/res_Trendline.cxx | 4
chart2/source/controller/dialogs/res_Trendline.hxx | 2
chart2/source/controller/dialogs/tp_AxisLabel.cxx | 4
chart2/source/controller/dialogs/tp_AxisLabel.hxx | 2
chart2/source/controller/dialogs/tp_AxisPositions.cxx | 4
chart2/source/controller/dialogs/tp_AxisPositions.hxx | 2
chart2/source/controller/dialogs/tp_DataLabel.cxx | 2
chart2/source/controller/dialogs/tp_DataLabel.hxx | 2
chart2/source/controller/dialogs/tp_ErrorBars.cxx | 2
chart2/source/controller/dialogs/tp_ErrorBars.hxx | 2
chart2/source/controller/dialogs/tp_LegendPosition.cxx | 4
chart2/source/controller/dialogs/tp_LegendPosition.hxx | 2
chart2/source/controller/dialogs/tp_PointGeometry.cxx | 4
chart2/source/controller/dialogs/tp_PointGeometry.hxx | 2
chart2/source/controller/dialogs/tp_PolarOptions.cxx | 4
chart2/source/controller/dialogs/tp_PolarOptions.hxx | 2
chart2/source/controller/dialogs/tp_Scale.cxx | 4
chart2/source/controller/dialogs/tp_Scale.hxx | 2
chart2/source/controller/dialogs/tp_SeriesToAxis.cxx | 4
chart2/source/controller/dialogs/tp_SeriesToAxis.hxx | 2
chart2/source/controller/dialogs/tp_TitleRotation.cxx | 4
chart2/source/controller/dialogs/tp_TitleRotation.hxx | 2
chart2/source/controller/dialogs/tp_Trendline.cxx | 2
chart2/source/controller/dialogs/tp_Trendline.hxx | 2
chart2/source/controller/inc/res_ErrorBar.hxx | 2
cui/source/customize/acccfg.cxx | 6
cui/source/customize/cfg.cxx | 2
cui/source/customize/eventdlg.cxx | 2
cui/source/customize/eventdlg.hxx | 2
cui/source/customize/macropg.cxx | 4
cui/source/dialogs/cuigaldlg.cxx | 4
cui/source/dialogs/hltpbase.cxx | 4
cui/source/dialogs/iconcdlg.cxx | 6
cui/source/inc/acccfg.hxx | 2
cui/source/inc/align.hxx | 2
cui/source/inc/autocdlg.hxx | 14
cui/source/inc/backgrnd.hxx | 4
cui/source/inc/border.hxx | 2
cui/source/inc/cfg.hxx | 2
cui/source/inc/chardlg.hxx | 10
cui/source/inc/connect.hxx | 2
cui/source/inc/cuigaldlg.hxx | 4
cui/source/inc/cuioptgenrl.hxx | 4
cui/source/inc/cuitabarea.hxx | 14
cui/source/inc/cuitabline.hxx | 6
cui/source/inc/dbregister.hxx | 2
cui/source/inc/dstribut.hxx | 2
cui/source/inc/grfpage.hxx | 2
cui/source/inc/hltpbase.hxx | 2
cui/source/inc/iconcdlg.hxx | 2
cui/source/inc/labdlg.hxx | 2
cui/source/inc/macroass.hxx | 2
cui/source/inc/macropg.hxx | 4
cui/source/inc/measure.hxx | 2
cui/source/inc/numfmt.hxx | 2
cui/source/inc/numpages.hxx | 12
cui/source/inc/optasian.hxx | 2
cui/source/inc/optlingu.hxx | 2
cui/source/inc/optpath.hxx | 2
cui/source/inc/page.hxx | 2
cui/source/inc/paragrph.hxx | 8
cui/source/inc/swpossizetabpage.hxx | 2
cui/source/inc/tabstpge.hxx | 2
cui/source/inc/textanim.hxx | 2
cui/source/inc/textattr.hxx | 2
cui/source/inc/transfrm.hxx | 6
cui/source/options/connpooloptions.cxx | 8
cui/source/options/connpooloptions.hxx | 2
cui/source/options/dbregister.cxx | 6
cui/source/options/fontsubs.cxx | 4
cui/source/options/fontsubs.hxx | 2
cui/source/options/optaboutconfig.cxx | 6
cui/source/options/optaboutconfig.hxx | 2
cui/source/options/optaccessibility.cxx | 4
cui/source/options/optaccessibility.hxx | 2
cui/source/options/optasian.cxx | 4
cui/source/options/optbasic.cxx | 16
cui/source/options/optbasic.hxx | 2
cui/source/options/optchart.cxx | 4
cui/source/options/optchart.hxx | 2
cui/source/options/optcolor.cxx | 4
cui/source/options/optcolor.hxx | 2
cui/source/options/optctl.cxx | 14
cui/source/options/optctl.hxx | 2
cui/source/options/optfltr.cxx | 8
cui/source/options/optfltr.hxx | 4
cui/source/options/optgdlg.cxx | 8
cui/source/options/optgdlg.hxx | 6
cui/source/options/optgenrl.cxx | 8
cui/source/options/opthtml.cxx | 4
cui/source/options/opthtml.hxx | 2
cui/source/options/optinet2.cxx | 34 -
cui/source/options/optinet2.hxx | 8
cui/source/options/optjava.cxx | 16
cui/source/options/optjava.hxx | 2
cui/source/options/optjsearch.cxx | 44 +-
cui/source/options/optjsearch.hxx | 2
cui/source/options/optlingu.cxx | 6
cui/source/options/optmemory.cxx | 6
cui/source/options/optmemory.hxx | 2
cui/source/options/optpath.cxx | 4
cui/source/options/optsave.cxx | 20
cui/source/options/optsave.hxx | 2
cui/source/options/optupdt.cxx | 12
cui/source/options/optupdt.hxx | 2
cui/source/options/personalization.cxx | 2
cui/source/options/personalization.hxx | 2
cui/source/tabpages/align.cxx | 2
cui/source/tabpages/autocdlg.cxx | 26 -
cui/source/tabpages/backgrnd.cxx | 28 -
cui/source/tabpages/border.cxx | 2
cui/source/tabpages/chardlg.cxx | 24 -
cui/source/tabpages/connect.cxx | 20
cui/source/tabpages/dstribut.cxx | 6
cui/source/tabpages/grfpage.cxx | 2
cui/source/tabpages/labdlg.cxx | 4
cui/source/tabpages/macroass.cxx | 6
cui/source/tabpages/measure.cxx | 2
cui/source/tabpages/numfmt.cxx | 2
cui/source/tabpages/numpages.cxx | 14
cui/source/tabpages/page.cxx | 2
cui/source/tabpages/paragrph.cxx | 8
cui/source/tabpages/swpossizetabpage.cxx | 2
cui/source/tabpages/tabstpge.cxx | 2
cui/source/tabpages/textanim.cxx | 2
cui/source/tabpages/textattr.cxx | 4
cui/source/tabpages/tparea.cxx | 4
cui/source/tabpages/tpbitmap.cxx | 4
cui/source/tabpages/tpcolor.cxx | 4
cui/source/tabpages/tpgradnt.cxx | 4
cui/source/tabpages/tphatch.cxx | 4
cui/source/tabpages/tpline.cxx | 2
cui/source/tabpages/tplnedef.cxx | 4
cui/source/tabpages/tplneend.cxx | 4
cui/source/tabpages/tpshadow.cxx | 2
cui/source/tabpages/transfrm.cxx | 6
dbaccess/source/ui/dlg/ConnectionPage.cxx | 2
dbaccess/source/ui/dlg/ConnectionPage.hxx | 2
dbaccess/source/ui/dlg/ConnectionPageSetup.cxx | 2
dbaccess/source/ui/dlg/ConnectionPageSetup.hxx | 2
dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx | 23 -
dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx | 18
dbaccess/source/ui/dlg/admincontrols.cxx | 2
dbaccess/source/ui/dlg/admincontrols.hxx | 2
dbaccess/source/ui/dlg/advancedsettings.cxx | 4
dbaccess/source/ui/dlg/advancedsettings.hxx | 4
dbaccess/source/ui/dlg/detailpages.cxx | 21 -
dbaccess/source/ui/dlg/detailpages.hxx | 16
dbaccess/source/ui/dlg/generalpage.cxx | 4
dbaccess/source/ui/dlg/generalpage.hxx | 4
dbaccess/source/ui/dlg/tablespage.cxx | 6
dbaccess/source/ui/dlg/tablespage.hxx | 2
framework/source/fwe/classes/addonmenu.cxx | 20
framework/source/fwe/classes/addonsoptions.cxx | 140 +++---
framework/source/fwe/classes/framelistanalyzer.cxx | 8
framework/source/fwe/dispatch/interaction.cxx | 6
framework/source/fwe/helper/actiontriggerhelper.cxx | 2
framework/source/fwe/helper/configimporter.cxx | 6
framework/source/fwe/helper/titlehelper.cxx | 16
framework/source/fwe/helper/undomanagerhelper.cxx | 10
framework/source/fwe/interaction/preventduplicateinteraction.cxx | 10
framework/source/fwe/xml/statusbarconfiguration.cxx | 20
framework/source/fwe/xml/toolboxconfiguration.cxx | 20
framework/source/uielement/imagebuttontoolbarcontroller.cxx | 2
include/basic/basmgr.hxx | 30 -
include/basic/modsizeexceeded.hxx | 4
include/basic/sbmeth.hxx | 6
include/basic/sbmod.hxx | 34 -
include/basic/sbstar.hxx | 14
include/basic/sbx.hxx | 28 -
include/basic/sbxcore.hxx | 58 +-
include/basic/sbxform.hxx | 26 -
include/basic/sbxobj.hxx | 10
include/basic/sbxvar.hxx | 150 +++----
include/basic/vbahelper.hxx | 4
include/framework/addonmenu.hxx | 10
include/framework/addonsoptions.hxx | 8
include/framework/configimporter.hxx | 2
include/framework/framelistanalyzer.hxx | 6
include/framework/interaction.hxx | 2
include/framework/preventduplicateinteraction.hxx | 6
include/framework/statusbarconfiguration.hxx | 4
include/framework/titlehelper.hxx | 2
include/framework/toolboxconfiguration.hxx | 4
include/framework/undomanagerhelper.hxx | 6
include/sfx2/childwin.hxx | 28 -
include/sfx2/dinfdlg.hxx | 8
include/sfx2/mgetempl.hxx | 2
include/sfx2/objsh.hxx | 1
include/sfx2/printopt.hxx | 2
include/sfx2/securitypage.hxx | 2
include/sfx2/stbitem.hxx | 16
include/sfx2/tabdlg.hxx | 4
include/svx/hdft.hxx | 2
include/svx/hyperdlg.hxx | 2
include/svx/optgrid.hxx | 2
include/svx/selctrl.hxx | 2
include/svx/zoomsliderctrl.hxx | 4
include/xmlscript/xmllib_imexp.hxx | 8
sc/source/ui/attrdlg/tabpages.cxx | 2
sc/source/ui/dbgui/tpsort.cxx | 8
sc/source/ui/dbgui/tpsubt.cxx | 8
sc/source/ui/dbgui/validate.cxx | 12
sc/source/ui/docshell/tpstat.cxx | 2
sc/source/ui/inc/opredlin.hxx | 2
sc/source/ui/inc/optload.hxx | 2
sc/source/ui/inc/scuitphfedit.hxx | 2
sc/source/ui/inc/tabpages.hxx | 2
sc/source/ui/inc/tpcalc.hxx | 2
sc/source/ui/inc/tpcompatibility.hxx | 2
sc/source/ui/inc/tpdefaults.hxx | 2
sc/source/ui/inc/tpformula.hxx | 2
sc/source/ui/inc/tphf.hxx | 2
sc/source/ui/inc/tpprint.hxx | 2
sc/source/ui/inc/tpsort.hxx | 4
sc/source/ui/inc/tpstat.hxx | 2
sc/source/ui/inc/tpsubt.hxx | 8
sc/source/ui/inc/tptable.hxx | 4
sc/source/ui/inc/tpusrlst.hxx | 2
sc/source/ui/inc/tpview.hxx | 4
sc/source/ui/inc/validate.hxx | 6
sc/source/ui/optdlg/opredlin.cxx | 2
sc/source/ui/optdlg/tpcalc.cxx | 4
sc/source/ui/optdlg/tpcompatibility.cxx | 2
sc/source/ui/optdlg/tpdefaults.cxx | 2
sc/source/ui/optdlg/tpformula.cxx | 2
sc/source/ui/optdlg/tpprint.cxx | 4
sc/source/ui/optdlg/tpusrlst.cxx | 2
sc/source/ui/optdlg/tpview.cxx | 4
sc/source/ui/pagedlg/scuitphfedit.cxx | 4
sc/source/ui/pagedlg/tphf.cxx | 2
sc/source/ui/pagedlg/tptable.cxx | 2
sc/source/ui/view/tabvwshc.cxx | 2
sd/source/ui/dlg/AnimationChildWindow.cxx | 2
sd/source/ui/dlg/PaneChildWindows.cxx | 2
sd/source/ui/dlg/paragr.cxx | 4
sd/source/ui/dlg/prntopts.cxx | 6
sd/source/ui/dlg/tpaction.cxx | 2
sd/source/ui/dlg/tpoption.cxx | 8
sd/source/ui/inc/prntopts.hxx | 2
sd/source/ui/inc/tpaction.hxx | 2
sd/source/ui/inc/tpoption.hxx | 6
sfx2/source/appl/childwin.cxx | 66 +--
sfx2/source/dialog/dinfdlg.cxx | 30 -
sfx2/source/dialog/dockwin.cxx | 2
sfx2/source/dialog/documentfontsdialog.cxx | 2
sfx2/source/dialog/mgetempl.cxx | 2
sfx2/source/dialog/partwnd.cxx | 4
sfx2/source/dialog/printopt.cxx | 4
sfx2/source/dialog/recfloat.cxx | 6
sfx2/source/dialog/securitypage.cxx | 6
sfx2/source/dialog/tabdlg.cxx | 10
sfx2/source/inc/documentfontsdialog.hxx | 2
sfx2/source/inc/partwnd.hxx | 2
sfx2/source/inc/recfloat.hxx | 2
sfx2/source/statbar/stbitem.cxx | 12
starmath/inc/dialog.hxx | 2
starmath/source/dialog.cxx | 2
svx/source/dialog/hdft.cxx | 4
svx/source/dialog/hyperdlg.cxx | 2
svx/source/dialog/optgrid.cxx | 2
svx/source/form/tabwin.cxx | 2
svx/source/stbctrls/selctrl.cxx | 4
svx/source/stbctrls/zoomsliderctrl.cxx | 14
sw/source/core/bastyp/calc.cxx | 6
sw/source/core/uibase/app/docsh2.cxx | 2
sw/source/core/uibase/inc/chrdlg.hxx | 2
sw/source/core/uibase/inc/column.hxx | 2
sw/source/core/uibase/inc/docstdlg.hxx | 2
sw/source/core/uibase/inc/drpcps.hxx | 2
sw/source/core/uibase/inc/envlop.hxx | 2
sw/source/core/uibase/inc/frmpage.hxx | 8
sw/source/core/uibase/inc/mailconfigpage.hxx | 2
sw/source/core/uibase/inc/num.hxx | 2
sw/source/core/uibase/inc/numpara.hxx | 2
sw/source/core/uibase/inc/optcomp.hxx | 2
sw/source/core/uibase/inc/optload.hxx | 4
sw/source/core/uibase/inc/optpage.hxx | 16
sw/source/core/uibase/inc/outline.hxx | 2
sw/source/core/uibase/inc/pgfnote.hxx | 2
sw/source/core/uibase/inc/pggrid.hxx | 2
sw/source/core/uibase/inc/regionsw.hxx | 6
sw/source/core/uibase/inc/swuiccoll.hxx | 2
sw/source/core/uibase/inc/swuicnttab.hxx | 6
sw/source/core/uibase/inc/viewlayoutctrl.hxx | 2
sw/source/core/uibase/inc/wrap.hxx | 2
sw/source/core/uibase/table/tablepg.hxx | 6
sw/source/core/uibase/utlui/viewlayoutctrl.cxx | 4
sw/source/ui/chrdlg/chardlg.cxx | 2
sw/source/ui/chrdlg/drpcps.cxx | 2
sw/source/ui/chrdlg/numpara.cxx | 2
sw/source/ui/chrdlg/swuiccoll.cxx | 2
sw/source/ui/config/mailconfigpage.cxx | 4
sw/source/ui/config/optcomp.cxx | 2
sw/source/ui/config/optload.cxx | 4
sw/source/ui/config/optpage.cxx | 20
sw/source/ui/dialog/docstdlg.cxx | 4
sw/source/ui/dialog/uiregionsw.cxx | 12
sw/source/ui/envelp/envfmt.cxx | 4
sw/source/ui/envelp/envfmt.hxx | 2
sw/source/ui/envelp/envlop1.cxx | 4
sw/source/ui/envelp/envprt.cxx | 4
sw/source/ui/envelp/envprt.hxx | 2
sw/source/ui/envelp/label1.cxx | 16
sw/source/ui/envelp/labfmt.cxx | 4
sw/source/ui/envelp/labfmt.hxx | 2
sw/source/ui/envelp/labprt.cxx | 4
sw/source/ui/envelp/labprt.hxx | 2
sw/source/ui/envelp/swuilabimp.hxx | 8
sw/source/ui/fldui/flddb.cxx | 4
sw/source/ui/fldui/flddb.hxx | 2
sw/source/ui/fldui/flddinf.cxx | 6
sw/source/ui/fldui/flddinf.hxx | 2
sw/source/ui/fldui/flddok.cxx | 4
sw/source/ui/fldui/flddok.hxx | 2
sw/source/ui/fldui/fldfunc.cxx | 4
sw/source/ui/fldui/fldfunc.hxx | 2
sw/source/ui/fldui/fldref.cxx | 4
sw/source/ui/fldui/fldref.hxx | 2
sw/source/ui/fldui/fldvar.cxx | 4
sw/source/ui/fldui/fldvar.hxx | 2
sw/source/ui/frmdlg/column.cxx | 4
sw/source/ui/frmdlg/frmpage.cxx | 8
sw/source/ui/frmdlg/wrap.cxx | 2
sw/source/ui/index/cnttab.cxx | 12
sw/source/ui/misc/docfnote.cxx | 4
sw/source/ui/misc/impfnote.hxx | 2
sw/source/ui/misc/num.cxx | 2
sw/source/ui/misc/outline.cxx | 4
sw/source/ui/misc/pgfnote.cxx | 4
sw/source/ui/misc/pggrid.cxx | 2
sw/source/ui/table/tabledlg.cxx | 6
xmlscript/source/xmllib_imexp/imp_share.hxx | 6
xmlscript/source/xmllib_imexp/xmllib_import.cxx | 4
361 files changed, 1569 insertions(+), 1555 deletions(-)
New commits:
commit fa1cebc00281b1e051c0f4b0494d02b5af7d1851
Author: Noel Grandin <noel at peralex.com>
Date: Thu Mar 27 10:13:15 2014 +0200
document that SfxTabDialog::bFmt is being used in a hacky way
Change-Id: Ie90e834176fd03de440739b317f23c7d8c9da795
diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx
index f31beba..1b439ee 100644
--- a/include/sfx2/tabdlg.hxx
+++ b/include/sfx2/tabdlg.hxx
@@ -94,7 +94,7 @@ friend class SfxTabDialogController;
sal_uInt32 nResId;
sal_uInt16 nAppPageId;
bool bItemsReset;
- sal_Bool bFmt;
+ sal_Bool bFmt; // sal_True, sal_False or 2(some kind of hack)
DECL_DLLPRIVATE_LINK( ActivatePageHdl, TabControl * );
DECL_DLLPRIVATE_LINK( DeactivatePageHdl, TabControl * );
commit e9745e3a7fff649a03252a22f72d1d16aa162dad
Author: Noel Grandin <noel at peralex.com>
Date: Thu Mar 27 09:29:41 2014 +0200
sfx2/stbitem.hxx: sal_Bool->bool
Change-Id: I7303d9533551fcfa7c7a99c9592402511492165a
diff --git a/include/sfx2/stbitem.hxx b/include/sfx2/stbitem.hxx
index c9b5dc1..0680234 100644
--- a/include/sfx2/stbitem.hxx
+++ b/include/sfx2/stbitem.hxx
@@ -42,7 +42,7 @@ struct SfxStbCtrlFactory
{
SfxStatusBarControlCtor pCtor;
TypeId nTypeId;
- sal_uInt16 nSlotId;
+ sal_uInt16 nSlotId;
SfxStbCtrlFactory( SfxStatusBarControlCtor pTheCtor,
TypeId nTheTypeId, sal_uInt16 nTheSlotId ):
@@ -60,8 +60,8 @@ class UserDrawEvent;
class SFX2_DLLPUBLIC SfxStatusBarControl: public svt::StatusbarController
{
- sal_uInt16 nSlotId;
- sal_uInt16 nId;
+ sal_uInt16 nSlotId;
+ sal_uInt16 nId;
StatusBar* pBar;
protected:
@@ -101,9 +101,9 @@ protected:
virtual void Click();
virtual void DoubleClick();
virtual void Command( const CommandEvent& rCEvt );
- virtual sal_Bool MouseButtonDown( const MouseEvent & );
- virtual sal_Bool MouseMove( const MouseEvent & );
- virtual sal_Bool MouseButtonUp( const MouseEvent & );
+ virtual bool MouseButtonDown( const MouseEvent & );
+ virtual bool MouseMove( const MouseEvent & );
+ virtual bool MouseButtonUp( const MouseEvent & );
virtual void Paint( const UserDrawEvent &rUDEvt );
static sal_uInt16 convertAwtToVCLMouseButtons( sal_Int16 nAwtMouseButtons );
@@ -112,8 +112,8 @@ public:
SfxStatusBarControl( sal_uInt16 nSlotID, sal_uInt16 nId, StatusBar& rBar );
virtual ~SfxStatusBarControl();
- sal_uInt16 GetSlotId() const { return nSlotId; }
- sal_uInt16 GetId() const { return nId; }
+ sal_uInt16 GetSlotId() const { return nSlotId; }
+ sal_uInt16 GetId() const { return nId; }
StatusBar& GetStatusBar() const { return *pBar; }
void CaptureMouse();
void ReleaseMouse();
diff --git a/include/svx/selctrl.hxx b/include/svx/selctrl.hxx
index b3081f1..be8b05a 100644
--- a/include/svx/selctrl.hxx
+++ b/include/svx/selctrl.hxx
@@ -33,7 +33,7 @@ public:
virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState );
- virtual sal_Bool MouseButtonDown( const MouseEvent& rEvt );
+ virtual bool MouseButtonDown( const MouseEvent& rEvt );
virtual void Paint( const UserDrawEvent& rEvt );
private:
diff --git a/include/svx/zoomsliderctrl.hxx b/include/svx/zoomsliderctrl.hxx
index 11c9627..0aad296 100644
--- a/include/svx/zoomsliderctrl.hxx
+++ b/include/svx/zoomsliderctrl.hxx
@@ -44,8 +44,8 @@ public:
virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
virtual void Paint( const UserDrawEvent& rEvt );
- virtual sal_Bool MouseButtonDown( const MouseEvent & );
- virtual sal_Bool MouseMove( const MouseEvent & rEvt );
+ virtual bool MouseButtonDown( const MouseEvent & );
+ virtual bool MouseMove( const MouseEvent & rEvt );
};
#endif
diff --git a/sfx2/source/statbar/stbitem.cxx b/sfx2/source/statbar/stbitem.cxx
index 48c2023..e205733 100644
--- a/sfx2/source/statbar/stbitem.cxx
+++ b/sfx2/source/statbar/stbitem.cxx
@@ -459,7 +459,7 @@ void SfxStatusBarControl::StateChanged
-sal_Bool SfxStatusBarControl::MouseButtonDown( const MouseEvent & )
+bool SfxStatusBarControl::MouseButtonDown( const MouseEvent & )
/* [Description]
@@ -481,12 +481,12 @@ sal_Bool SfxStatusBarControl::MouseButtonDown( const MouseEvent & )
*/
{
- return sal_False;
+ return false;
}
-sal_Bool SfxStatusBarControl::MouseMove( const MouseEvent & )
+bool SfxStatusBarControl::MouseMove( const MouseEvent & )
/* [Description]
@@ -508,12 +508,12 @@ sal_Bool SfxStatusBarControl::MouseMove( const MouseEvent & )
*/
{
- return sal_False;
+ return false;
}
-sal_Bool SfxStatusBarControl::MouseButtonUp( const MouseEvent & )
+bool SfxStatusBarControl::MouseButtonUp( const MouseEvent & )
/* [Description]
@@ -535,7 +535,7 @@ sal_Bool SfxStatusBarControl::MouseButtonUp( const MouseEvent & )
*/
{
- return sal_False;
+ return false;
}
diff --git a/svx/source/stbctrls/selctrl.cxx b/svx/source/stbctrls/selctrl.cxx
index acfb2da..1536aa4 100644
--- a/svx/source/stbctrls/selctrl.cxx
+++ b/svx/source/stbctrls/selctrl.cxx
@@ -109,7 +109,7 @@ void SvxSelectionModeControl::StateChanged( sal_uInt16, SfxItemState eState,
-sal_Bool SvxSelectionModeControl::MouseButtonDown( const MouseEvent& rEvt )
+bool SvxSelectionModeControl::MouseButtonDown( const MouseEvent& rEvt )
{
CaptureMouse();
SelectionTypePopup aPop( mnState );
@@ -136,7 +136,7 @@ sal_Bool SvxSelectionModeControl::MouseButtonDown( const MouseEvent& rEvt )
}
ReleaseMouse();
- return sal_True;
+ return true;
}
diff --git a/svx/source/stbctrls/zoomsliderctrl.cxx b/svx/source/stbctrls/zoomsliderctrl.cxx
index 7497bfa..e0fa879 100644
--- a/svx/source/stbctrls/zoomsliderctrl.cxx
+++ b/svx/source/stbctrls/zoomsliderctrl.cxx
@@ -325,10 +325,10 @@ void SvxZoomSliderControl::Paint( const UserDrawEvent& rUsrEvt )
-sal_Bool SvxZoomSliderControl::MouseButtonDown( const MouseEvent & rEvt )
+bool SvxZoomSliderControl::MouseButtonDown( const MouseEvent & rEvt )
{
if ( !mpImpl->mbValuesSet )
- return sal_True;
+ return true;
const Rectangle aControlRect = getControlRect();
const Point aPoint = rEvt.GetPosPixel();
@@ -358,7 +358,7 @@ sal_Bool SvxZoomSliderControl::MouseButtonDown( const MouseEvent & rEvt )
mpImpl->mnCurrentZoom = mpImpl->mnMaxZoom;
if ( nOldZoom == mpImpl->mnCurrentZoom )
- return sal_True;
+ return true;
if ( GetStatusBar().AreItemsVisible() )
GetStatusBar().SetItemData( GetId(), 0 ); // force repaint
@@ -379,15 +379,15 @@ sal_Bool SvxZoomSliderControl::MouseButtonDown( const MouseEvent & rEvt )
mpImpl->mbOmitPaint = false;
- return sal_True;
+ return true;
}
-sal_Bool SvxZoomSliderControl::MouseMove( const MouseEvent & rEvt )
+bool SvxZoomSliderControl::MouseMove( const MouseEvent & rEvt )
{
if ( !mpImpl->mbValuesSet )
- return sal_True;
+ return true;
const short nButtons = rEvt.GetButtons();
@@ -424,7 +424,7 @@ sal_Bool SvxZoomSliderControl::MouseMove( const MouseEvent & rEvt )
}
}
- return sal_True;
+ return true;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/uibase/inc/viewlayoutctrl.hxx b/sw/source/core/uibase/inc/viewlayoutctrl.hxx
index 10648cd..531dc57 100644
--- a/sw/source/core/uibase/inc/viewlayoutctrl.hxx
+++ b/sw/source/core/uibase/inc/viewlayoutctrl.hxx
@@ -38,7 +38,7 @@ public:
virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
virtual void Paint( const UserDrawEvent& rEvt );
- virtual sal_Bool MouseButtonDown( const MouseEvent & );
+ virtual bool MouseButtonDown( const MouseEvent & );
};
#endif
diff --git a/sw/source/core/uibase/utlui/viewlayoutctrl.cxx b/sw/source/core/uibase/utlui/viewlayoutctrl.cxx
index 798213d..633af05 100644
--- a/sw/source/core/uibase/utlui/viewlayoutctrl.cxx
+++ b/sw/source/core/uibase/utlui/viewlayoutctrl.cxx
@@ -143,7 +143,7 @@ void SwViewLayoutControl::Paint( const UserDrawEvent& rUsrEvt )
pDev->DrawImage( aRect.TopLeft(), bBookMode ? mpImpl->maImageBookMode_Active : mpImpl->maImageBookMode );
}
-sal_Bool SwViewLayoutControl::MouseButtonDown( const MouseEvent & rEvt )
+bool SwViewLayoutControl::MouseButtonDown( const MouseEvent & rEvt )
{
const Rectangle aRect = getControlRect();
const Point aPoint = rEvt.GetPosPixel();
@@ -188,7 +188,7 @@ sal_Bool SwViewLayoutControl::MouseButtonDown( const MouseEvent & rEvt )
execute( aArgs );
- return sal_True;
+ return true;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 12f49da9baed5798a9dcb1814ff740f6b6a059db
Author: Noel Grandin <noel at peralex.com>
Date: Wed Mar 26 15:48:23 2014 +0200
add comment to method to warn other developers
Change-Id: Iae27d951a80d7f5bf3c2d37693c7088f57e0e04d
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index b912b96..3374d08 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -401,6 +401,7 @@ public:
static sal_uInt32 HandleFilter( SfxMedium* pMedium, SfxObjectShell* pDoc );
virtual void ViewAssigned();
+ // the bUI parameter may be sal_False, sal_True or 2 - there is some kind of hack at work
virtual bool PrepareClose( sal_Bool bUI = sal_True );
virtual bool IsInformationLost();
virtual sal_uInt16 GetHiddenInformationState( sal_uInt16 nStates );
commit 34002c4e5cf68ac0c98c3922c653c9ea8b898207
Author: Noel Grandin <noel at peralex.com>
Date: Wed Mar 26 15:34:49 2014 +0200
sfx2: sal_Bool->bool
Change-Id: I1fd02cc148fd9a54d2092dad1e548f51a0813a14
diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx b/chart2/source/controller/dialogs/res_DataLabel.cxx
index a6e995a..383f492 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.cxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.cxx
@@ -273,7 +273,7 @@ void DataLabelResources::EnableControls()
m_pBxOrientation->Enable( bEnableRotation );
}
-sal_Bool DataLabelResources::FillItemSet( SfxItemSet& rOutAttrs ) const
+bool DataLabelResources::FillItemSet( SfxItemSet& rOutAttrs ) const
{
if( m_pCBNumber->IsChecked() )
{
@@ -318,7 +318,7 @@ sal_Bool DataLabelResources::FillItemSet( SfxItemSet& rOutAttrs ) const
rOutAttrs.Put(SfxInt32Item( SCHATTR_TEXT_DEGREES, nDegrees ) );
}
- return sal_True;
+ return true;
}
void DataLabelResources::Reset(const SfxItemSet& rInAttrs)
diff --git a/chart2/source/controller/dialogs/res_DataLabel.hxx b/chart2/source/controller/dialogs/res_DataLabel.hxx
index fa32bd5..69317e8 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.hxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.hxx
@@ -43,7 +43,7 @@ public:
DataLabelResources( VclBuilderContainer* pWindow, Window* pParent, const SfxItemSet& rInAttrs );
virtual ~DataLabelResources();
- sal_Bool FillItemSet(SfxItemSet& rOutAttrs) const;
+ bool FillItemSet(SfxItemSet& rOutAttrs) const;
void Reset(const SfxItemSet& rInAttrs);
void SetNumberFormatter( SvNumberFormatter* pFormatter );
diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx
index 2803f37..4270b53 100644
--- a/chart2/source/controller/dialogs/res_ErrorBar.cxx
+++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx
@@ -605,7 +605,7 @@ void ErrorBarResources::Reset(const SfxItemSet& rInAttrs)
UpdateControlStates();
}
-sal_Bool ErrorBarResources::FillItemSet(SfxItemSet& rOutAttrs) const
+bool ErrorBarResources::FillItemSet(SfxItemSet& rOutAttrs) const
{
if( m_bErrorKindUnique )
rOutAttrs.Put( SvxChartKindErrorItem( m_eErrorKind, SCHATTR_STAT_KIND_ERROR ));
@@ -660,7 +660,7 @@ sal_Bool ErrorBarResources::FillItemSet(SfxItemSet& rOutAttrs) const
rOutAttrs.Put( SfxBoolItem( SCHATTR_STAT_ERRORBAR_TYPE , m_eErrorBarType == ERROR_BAR_Y ));
- return sal_True;
+ return true;
}
void ErrorBarResources::FillValueSets()
diff --git a/chart2/source/controller/dialogs/res_Trendline.cxx b/chart2/source/controller/dialogs/res_Trendline.cxx
index 1d2307a..624330d 100644
--- a/chart2/source/controller/dialogs/res_Trendline.cxx
+++ b/chart2/source/controller/dialogs/res_Trendline.cxx
@@ -242,7 +242,7 @@ void TrendlineResources::Reset( const SfxItemSet& rInAttrs )
}
}
-sal_Bool TrendlineResources::FillItemSet(SfxItemSet& rOutAttrs) const
+bool TrendlineResources::FillItemSet(SfxItemSet& rOutAttrs) const
{
if( m_bTrendLineUnique )
rOutAttrs.Put( SvxChartRegressItem( m_eTrendLineType, SCHATTR_REGRESSION_TYPE ));
@@ -278,7 +278,7 @@ sal_Bool TrendlineResources::FillItemSet(SfxItemSet& rOutAttrs) const
m_pNumFormatter->IsNumberFormat(m_pFmtFld_InterceptValue->GetText(),nIndex,aValue);
rOutAttrs.Put(SvxDoubleItem( aValue, SCHATTR_REGRESSION_INTERCEPT_VALUE ) );
- return sal_True;
+ return true;
}
void TrendlineResources::FillValueSets()
diff --git a/chart2/source/controller/dialogs/res_Trendline.hxx b/chart2/source/controller/dialogs/res_Trendline.hxx
index 6057505..bf26e30 100644
--- a/chart2/source/controller/dialogs/res_Trendline.hxx
+++ b/chart2/source/controller/dialogs/res_Trendline.hxx
@@ -39,7 +39,7 @@ public:
virtual ~TrendlineResources();
void Reset(const SfxItemSet& rInAttrs);
- sal_Bool FillItemSet(SfxItemSet& rOutAttrs) const;
+ bool FillItemSet(SfxItemSet& rOutAttrs) const;
void FillValueSets();
diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.cxx b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
index f1126e5..b4f0d85 100644
--- a/chart2/source/controller/dialogs/tp_AxisLabel.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
@@ -88,7 +88,7 @@ SfxTabPage* SchAxisLabelTabPage::Create( Window* pParent, const SfxItemSet& rAtt
return new SchAxisLabelTabPage( pParent, rAttrs );
}
-sal_Bool SchAxisLabelTabPage::FillItemSet( SfxItemSet& rOutAttrs )
+bool SchAxisLabelTabPage::FillItemSet( SfxItemSet& rOutAttrs )
{
bool bStacked = false;
if( m_pOrientHlp->GetStackedState() != TRISTATE_INDET )
@@ -135,7 +135,7 @@ sal_Bool SchAxisLabelTabPage::FillItemSet( SfxItemSet& rOutAttrs )
if( m_pLbTextDirection->GetSelectEntryCount() > 0 )
rOutAttrs.Put( SfxInt32Item( EE_PARA_WRITINGDIR, m_pLbTextDirection->GetSelectEntryValue() ) );
- return sal_True;
+ return true;
}
void SchAxisLabelTabPage::Reset( const SfxItemSet& rInAttrs )
diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.hxx b/chart2/source/controller/dialogs/tp_AxisLabel.hxx
index 15f4542..0cd61c5 100644
--- a/chart2/source/controller/dialogs/tp_AxisLabel.hxx
+++ b/chart2/source/controller/dialogs/tp_AxisLabel.hxx
@@ -75,7 +75,7 @@ public:
void Construct();
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rInAttrs );
- virtual sal_Bool FillItemSet( SfxItemSet& rOutAttrs );
+ virtual bool FillItemSet( SfxItemSet& rOutAttrs );
virtual void Reset( const SfxItemSet& rInAttrs );
void ShowStaggeringControls( sal_Bool bShowStaggeringControls );
diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.cxx b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
index bee38f1..2f07138 100644
--- a/chart2/source/controller/dialogs/tp_AxisPositions.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
@@ -98,7 +98,7 @@ SfxTabPage* AxisPositionsTabPage::Create(Window* pWindow,const SfxItemSet& rOutA
return new AxisPositionsTabPage(pWindow, rOutAttrs);
}
-sal_Bool AxisPositionsTabPage::FillItemSet(SfxItemSet& rOutAttrs)
+bool AxisPositionsTabPage::FillItemSet(SfxItemSet& rOutAttrs)
{
// axis line
sal_Int32 nPos = m_pLB_CrossesAt->GetSelectEntryPos();
@@ -136,7 +136,7 @@ sal_Bool AxisPositionsTabPage::FillItemSet(SfxItemSet& rOutAttrs)
if( nMarkPos != LISTBOX_ENTRY_NOTFOUND )
rOutAttrs.Put( SfxInt32Item( SCHATTR_AXIS_MARK_POSITION, nMarkPos ));
- return sal_True;
+ return true;
}
void AxisPositionsTabPage::Reset(const SfxItemSet& rInAttrs)
diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.hxx b/chart2/source/controller/dialogs/tp_AxisPositions.hxx
index 1e24b7c..8c40cac 100644
--- a/chart2/source/controller/dialogs/tp_AxisPositions.hxx
+++ b/chart2/source/controller/dialogs/tp_AxisPositions.hxx
@@ -36,7 +36,7 @@ public:
AxisPositionsTabPage( Window* pParent, const SfxItemSet& rInAttrs );
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rInAttrs );
- virtual sal_Bool FillItemSet( SfxItemSet& rOutAttrs );
+ virtual bool FillItemSet( SfxItemSet& rOutAttrs );
virtual void Reset( const SfxItemSet& rInAttrs );
using TabPage::DeactivatePage;
virtual int DeactivatePage( SfxItemSet* pItemSet = NULL );
diff --git a/chart2/source/controller/dialogs/tp_DataLabel.cxx b/chart2/source/controller/dialogs/tp_DataLabel.cxx
index c8bb89d..f139f28 100644
--- a/chart2/source/controller/dialogs/tp_DataLabel.cxx
+++ b/chart2/source/controller/dialogs/tp_DataLabel.cxx
@@ -43,7 +43,7 @@ SfxTabPage* DataLabelsTabPage::Create(Window* pWindow, const SfxItemSet& rOutAtt
return new DataLabelsTabPage(pWindow, rOutAttrs);
}
-sal_Bool DataLabelsTabPage::FillItemSet(SfxItemSet& rOutAttrs)
+bool DataLabelsTabPage::FillItemSet(SfxItemSet& rOutAttrs)
{
return m_aDataLabelResources.FillItemSet(rOutAttrs);
}
diff --git a/chart2/source/controller/dialogs/tp_DataLabel.hxx b/chart2/source/controller/dialogs/tp_DataLabel.hxx
index 9d44d9e..6fdccb1 100644
--- a/chart2/source/controller/dialogs/tp_DataLabel.hxx
+++ b/chart2/source/controller/dialogs/tp_DataLabel.hxx
@@ -41,7 +41,7 @@ public:
void SetNumberFormatter( SvNumberFormatter* pFormatter );
virtual void Reset(const SfxItemSet& rInAttrs);
- virtual sal_Bool FillItemSet(SfxItemSet& rOutAttrs);
+ virtual bool FillItemSet(SfxItemSet& rOutAttrs);
private:
DataLabelResources m_aDataLabelResources;
diff --git a/chart2/source/controller/dialogs/tp_ErrorBars.cxx b/chart2/source/controller/dialogs/tp_ErrorBars.cxx
index 05b04b0..e775921 100644
--- a/chart2/source/controller/dialogs/tp_ErrorBars.cxx
+++ b/chart2/source/controller/dialogs/tp_ErrorBars.cxx
@@ -47,7 +47,7 @@ SfxTabPage* ErrorBarsTabPage::Create(
return new ErrorBarsTabPage( pParent, rOutAttrs );
}
-sal_Bool ErrorBarsTabPage::FillItemSet( SfxItemSet& rOutAttrs )
+bool ErrorBarsTabPage::FillItemSet( SfxItemSet& rOutAttrs )
{
return m_aErrorBarResources.FillItemSet( rOutAttrs );
}
diff --git a/chart2/source/controller/dialogs/tp_ErrorBars.hxx b/chart2/source/controller/dialogs/tp_ErrorBars.hxx
index a1bb2ae..cc38831 100644
--- a/chart2/source/controller/dialogs/tp_ErrorBars.hxx
+++ b/chart2/source/controller/dialogs/tp_ErrorBars.hxx
@@ -38,7 +38,7 @@ public:
::com::sun::star::chart2::XChartDocument > & xChartDocument );
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rInAttrs );
- virtual sal_Bool FillItemSet( SfxItemSet& rOutAttrs );
+ virtual bool FillItemSet( SfxItemSet& rOutAttrs );
virtual void Reset( const SfxItemSet& rInAttrs );
virtual void DataChanged( const DataChangedEvent& rDCEvt );
diff --git a/chart2/source/controller/dialogs/tp_LegendPosition.cxx b/chart2/source/controller/dialogs/tp_LegendPosition.cxx
index 878eaf9..64868b5 100644
--- a/chart2/source/controller/dialogs/tp_LegendPosition.cxx
+++ b/chart2/source/controller/dialogs/tp_LegendPosition.cxx
@@ -46,14 +46,14 @@ SfxTabPage* SchLegendPosTabPage::Create(Window* pWindow, const SfxItemSet& rOutA
return new SchLegendPosTabPage(pWindow, rOutAttrs);
}
-sal_Bool SchLegendPosTabPage::FillItemSet(SfxItemSet& rOutAttrs)
+bool SchLegendPosTabPage::FillItemSet(SfxItemSet& rOutAttrs)
{
m_aLegendPositionResources.writeToItemSet(rOutAttrs);
if( m_pLbTextDirection->GetSelectEntryCount() > 0 )
rOutAttrs.Put( SfxInt32Item( EE_PARA_WRITINGDIR, m_pLbTextDirection->GetSelectEntryValue() ) );
- return sal_True;
+ return true;
}
void SchLegendPosTabPage::Reset(const SfxItemSet& rInAttrs)
diff --git a/chart2/source/controller/dialogs/tp_LegendPosition.hxx b/chart2/source/controller/dialogs/tp_LegendPosition.hxx
index fdadbb3..4c52326 100644
--- a/chart2/source/controller/dialogs/tp_LegendPosition.hxx
+++ b/chart2/source/controller/dialogs/tp_LegendPosition.hxx
@@ -39,7 +39,7 @@ public:
SchLegendPosTabPage(Window* pParent, const SfxItemSet& rInAttrs);
static SfxTabPage* Create(Window* pParent, const SfxItemSet& rInAttrs);
- virtual sal_Bool FillItemSet(SfxItemSet& rOutAttrs);
+ virtual bool FillItemSet(SfxItemSet& rOutAttrs);
virtual void Reset(const SfxItemSet& rInAttrs);
};
diff --git a/chart2/source/controller/dialogs/tp_PointGeometry.cxx b/chart2/source/controller/dialogs/tp_PointGeometry.cxx
index 16ba403..b30160c 100644
--- a/chart2/source/controller/dialogs/tp_PointGeometry.cxx
+++ b/chart2/source/controller/dialogs/tp_PointGeometry.cxx
@@ -50,7 +50,7 @@ SfxTabPage* SchLayoutTabPage::Create(Window* pWindow,
return new SchLayoutTabPage(pWindow, rOutAttrs);
}
-sal_Bool SchLayoutTabPage::FillItemSet(SfxItemSet& rOutAttrs)
+bool SchLayoutTabPage::FillItemSet(SfxItemSet& rOutAttrs)
{
if(m_pGeometryResources && m_pGeometryResources->GetSelectEntryCount())
@@ -64,7 +64,7 @@ sal_Bool SchLayoutTabPage::FillItemSet(SfxItemSet& rOutAttrs)
rOutAttrs.Put(SfxInt32Item(SCHATTR_STYLE_SHAPE,nShape));
rOutAttrs.Put(Svx3DHorizontalSegmentsItem(nSegs));
}
- return sal_True;
+ return true;
}
void SchLayoutTabPage::Reset(const SfxItemSet& rInAttrs)
diff --git a/chart2/source/controller/dialogs/tp_PointGeometry.hxx b/chart2/source/controller/dialogs/tp_PointGeometry.hxx
index b4b873a..965af45 100644
--- a/chart2/source/controller/dialogs/tp_PointGeometry.hxx
+++ b/chart2/source/controller/dialogs/tp_PointGeometry.hxx
@@ -33,7 +33,7 @@ public:
virtual ~SchLayoutTabPage();
static SfxTabPage* Create(Window* pParent, const SfxItemSet& rInAttrs);
- virtual sal_Bool FillItemSet(SfxItemSet& rOutAttrs);
+ virtual bool FillItemSet(SfxItemSet& rOutAttrs);
virtual void Reset(const SfxItemSet& rInAttrs);
private:
diff --git a/chart2/source/controller/dialogs/tp_PolarOptions.cxx b/chart2/source/controller/dialogs/tp_PolarOptions.cxx
index c4f6771..c5eda1f 100644
--- a/chart2/source/controller/dialogs/tp_PolarOptions.cxx
+++ b/chart2/source/controller/dialogs/tp_PolarOptions.cxx
@@ -53,7 +53,7 @@ SfxTabPage* PolarOptionsTabPage::Create( Window* pWindow,const SfxItemSet& rOutA
return new PolarOptionsTabPage( pWindow, rOutAttrs );
}
-sal_Bool PolarOptionsTabPage::FillItemSet( SfxItemSet& rOutAttrs )
+bool PolarOptionsTabPage::FillItemSet( SfxItemSet& rOutAttrs )
{
if( m_pAngleDial->IsVisible() )
{
@@ -67,7 +67,7 @@ sal_Bool PolarOptionsTabPage::FillItemSet( SfxItemSet& rOutAttrs )
if (m_pCB_IncludeHiddenCells->IsVisible())
rOutAttrs.Put(SfxBoolItem(SCHATTR_INCLUDE_HIDDEN_CELLS, m_pCB_IncludeHiddenCells->IsChecked()));
- return sal_True;
+ return true;
}
void PolarOptionsTabPage::Reset(const SfxItemSet& rInAttrs)
diff --git a/chart2/source/controller/dialogs/tp_PolarOptions.hxx b/chart2/source/controller/dialogs/tp_PolarOptions.hxx
index 4a95903..a30835a 100644
--- a/chart2/source/controller/dialogs/tp_PolarOptions.hxx
+++ b/chart2/source/controller/dialogs/tp_PolarOptions.hxx
@@ -36,7 +36,7 @@ public:
virtual ~PolarOptionsTabPage();
static SfxTabPage* Create(Window* pParent, const SfxItemSet& rInAttrs);
- virtual sal_Bool FillItemSet(SfxItemSet& rOutAttrs);
+ virtual bool FillItemSet(SfxItemSet& rOutAttrs);
virtual void Reset(const SfxItemSet& rInAttrs);
private:
diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx
index 0da4722..6edd87e 100644
--- a/chart2/source/controller/dialogs/tp_Scale.cxx
+++ b/chart2/source/controller/dialogs/tp_Scale.cxx
@@ -246,7 +246,7 @@ SfxTabPage* ScaleTabPage::Create(Window* pWindow,const SfxItemSet& rOutAttrs)
return new ScaleTabPage(pWindow, rOutAttrs);
}
-sal_Bool ScaleTabPage::FillItemSet(SfxItemSet& rOutAttrs)
+bool ScaleTabPage::FillItemSet(SfxItemSet& rOutAttrs)
{
OSL_PRECOND( pNumFormatter, "No NumberFormatter available" );
@@ -278,7 +278,7 @@ sal_Bool ScaleTabPage::FillItemSet(SfxItemSet& rOutAttrs)
rOutAttrs.Put(SfxInt32Item(SCHATTR_AXIS_MAIN_TIME_UNIT,m_nMainTimeUnit));
rOutAttrs.Put(SfxInt32Item(SCHATTR_AXIS_HELP_TIME_UNIT,m_nHelpTimeUnit));
- return sal_True;
+ return true;
}
void ScaleTabPage::Reset(const SfxItemSet& rInAttrs)
diff --git a/chart2/source/controller/dialogs/tp_Scale.hxx b/chart2/source/controller/dialogs/tp_Scale.hxx
index deaa75d..bae4891 100644
--- a/chart2/source/controller/dialogs/tp_Scale.hxx
+++ b/chart2/source/controller/dialogs/tp_Scale.hxx
@@ -41,7 +41,7 @@ public:
ScaleTabPage( Window* pParent, const SfxItemSet& rInAttrs );
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rInAttrs );
- virtual sal_Bool FillItemSet( SfxItemSet& rOutAttrs );
+ virtual bool FillItemSet( SfxItemSet& rOutAttrs );
virtual void Reset( const SfxItemSet& rInAttrs );
using TabPage::DeactivatePage;
virtual int DeactivatePage( SfxItemSet* pItemSet = NULL );
diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
index 43bdad7..e0a7c42 100644
--- a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
+++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
@@ -82,7 +82,7 @@ SfxTabPage* SchOptionTabPage::Create(Window* pWindow,const SfxItemSet& rOutAttrs
return new SchOptionTabPage(pWindow, rOutAttrs);
}
-sal_Bool SchOptionTabPage::FillItemSet(SfxItemSet& rOutAttrs)
+bool SchOptionTabPage::FillItemSet(SfxItemSet& rOutAttrs)
{
if(m_pRbtAxis2->IsChecked())
rOutAttrs.Put(SfxInt32Item(SCHATTR_AXIS,CHART_AXIS_SECONDARY_Y));
@@ -113,7 +113,7 @@ sal_Bool SchOptionTabPage::FillItemSet(SfxItemSet& rOutAttrs)
if (m_pCBIncludeHiddenCells->IsVisible())
rOutAttrs.Put(SfxBoolItem(SCHATTR_INCLUDE_HIDDEN_CELLS, m_pCBIncludeHiddenCells->IsChecked()));
- return sal_True;
+ return true;
}
void SchOptionTabPage::Reset(const SfxItemSet& rInAttrs)
diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx
index 53524e4..eb23d82 100644
--- a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx
+++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx
@@ -38,7 +38,7 @@ public:
virtual ~SchOptionTabPage();
static SfxTabPage* Create(Window* pParent, const SfxItemSet& rInAttrs);
- virtual sal_Bool FillItemSet(SfxItemSet& rOutAttrs);
+ virtual bool FillItemSet(SfxItemSet& rOutAttrs);
virtual void Reset(const SfxItemSet& rInAttrs);
void Init( bool bProvidesSecondaryYAxis, bool bProvidesOverlapAndGapWidth, bool bProvidesBarConnectors );
diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.cxx b/chart2/source/controller/dialogs/tp_TitleRotation.cxx
index 0bf2029..ee5237c 100644
--- a/chart2/source/controller/dialogs/tp_TitleRotation.cxx
+++ b/chart2/source/controller/dialogs/tp_TitleRotation.cxx
@@ -73,7 +73,7 @@ SfxTabPage* SchAlignmentTabPage::CreateWithoutRotation(Window* pParent,
return new SchAlignmentTabPage(pParent, rInAttrs, false);
}
-sal_Bool SchAlignmentTabPage::FillItemSet(SfxItemSet& rOutAttrs)
+bool SchAlignmentTabPage::FillItemSet(SfxItemSet& rOutAttrs)
{
//Since 04/1998 text can be rotated by an arbitrary angle: SCHATTR_TEXT_DEGREES
bool bStacked = m_pOrientHlp->GetStackedState() == TRISTATE_TRUE;
@@ -85,7 +85,7 @@ sal_Bool SchAlignmentTabPage::FillItemSet(SfxItemSet& rOutAttrs)
SvxFrameDirection aDirection( m_pLbTextDirection->GetSelectEntryValue() );
rOutAttrs.Put( SfxInt32Item( EE_PARA_WRITINGDIR, aDirection ) );
- return sal_True;
+ return true;
}
void SchAlignmentTabPage::Reset(const SfxItemSet& rInAttrs)
diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.hxx b/chart2/source/controller/dialogs/tp_TitleRotation.hxx
index 407c832..8e04fe0 100644
--- a/chart2/source/controller/dialogs/tp_TitleRotation.hxx
+++ b/chart2/source/controller/dialogs/tp_TitleRotation.hxx
@@ -48,7 +48,7 @@ public:
static SfxTabPage* Create(Window* pParent, const SfxItemSet& rInAttrs);
static SfxTabPage* CreateWithoutRotation(Window* pParent, const SfxItemSet& rInAttrs);
- virtual sal_Bool FillItemSet(SfxItemSet& rOutAttrs);
+ virtual bool FillItemSet(SfxItemSet& rOutAttrs);
virtual void Reset(const SfxItemSet& rInAttrs);
};
diff --git a/chart2/source/controller/dialogs/tp_Trendline.cxx b/chart2/source/controller/dialogs/tp_Trendline.cxx
index f8633d8..2b796cc 100644
--- a/chart2/source/controller/dialogs/tp_Trendline.cxx
+++ b/chart2/source/controller/dialogs/tp_Trendline.cxx
@@ -41,7 +41,7 @@ SfxTabPage* TrendlineTabPage::Create(
return new TrendlineTabPage( pParent, rOutAttrs );
}
-sal_Bool TrendlineTabPage::FillItemSet( SfxItemSet& rOutAttrs )
+bool TrendlineTabPage::FillItemSet( SfxItemSet& rOutAttrs )
{
return m_aTrendlineResources.FillItemSet( rOutAttrs );
}
diff --git a/chart2/source/controller/dialogs/tp_Trendline.hxx b/chart2/source/controller/dialogs/tp_Trendline.hxx
index 4e5114e..02d8ceb 100644
--- a/chart2/source/controller/dialogs/tp_Trendline.hxx
+++ b/chart2/source/controller/dialogs/tp_Trendline.hxx
@@ -33,7 +33,7 @@ public:
virtual ~TrendlineTabPage ();
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rInAttrs );
- virtual sal_Bool FillItemSet( SfxItemSet& rOutAttrs );
+ virtual bool FillItemSet( SfxItemSet& rOutAttrs );
virtual void Reset( const SfxItemSet& rInAttrs );
virtual void DataChanged( const DataChangedEvent& rDCEvt );
diff --git a/chart2/source/controller/inc/res_ErrorBar.hxx b/chart2/source/controller/inc/res_ErrorBar.hxx
index de97253..c6b3112 100644
--- a/chart2/source/controller/inc/res_ErrorBar.hxx
+++ b/chart2/source/controller/inc/res_ErrorBar.hxx
@@ -58,7 +58,7 @@ public:
const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XChartDocument > & xChartDocument );
void Reset(const SfxItemSet& rInAttrs);
- sal_Bool FillItemSet(SfxItemSet& rOutAttrs) const;
+ bool FillItemSet(SfxItemSet& rOutAttrs) const;
void FillValueSets();
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index f326ed9..8b59ed2 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 cf210e0..f4df220 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 9320c2b..f3bea62 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 734812b..51a4aab 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 e985358..5f5e397 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 a2d26e0..4a802e9 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 4b6bfb4..9d17318 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 8c901d4..e1aecea 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 79ed0db..a0d6ee4 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 37dd2f9..2889de1 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 1a0292f..fcca210 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 4b83a17..59f6082 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 f0bb77b..7f1a251 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 370c893e..33484e2 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 fca1233..68456ab 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 00933e0..f4f595d 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 e6a6156..b97e32e 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 8f96c09..fe56efe 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 b3d34e3..29b4b399 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 6d5cbd7..f75ae74 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 2b51bef..5c4a590 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 d8288eb..bf62078 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 0b13e11..bf45d41 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 847a079..88ea764 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 6770612..9a90c9d 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 1df123b..9d3e813 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 c495db6..b647536 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 00e20db..8b12c30 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 02273fa..e52c5ae 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 55389f1..4c4fc82 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 d5d07c4..28c1f86 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 20beb24..b0e4167 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 52bcac4..30103891 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 e1ce74b..caa21eb 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 49c638e..a06efff 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 299b6e4..911f05a 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 29289ca..4c4a23b 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 4ca435b..b6fb6c1 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 3d6ea3a..a7fd339 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 adc7317..be3e1ae 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 79e6b8e..6ae053d 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 b966c03..b00df7a 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 535c8d5..27fef9a 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 4ea6481..d71d792 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 84a4868..86fe6b5 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 1630172..bbc8915 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 df029f0..0ac4654 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 135fc21..e9a11d4 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 47a2f5c..88c2a2a 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 c004d23..400d3eb 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 2681de8..953e742 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 366ac53..bd8c9bd 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 3e75c81..13c8490 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 5fac95a..673a08f 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 8c38565..d91ebb6 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 6b97a1a..f29162d 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 119909f..4c6216c 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 ebd2e49..96e95a5 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 358698c..32ae80c 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 cf9bc8d..f0f58ea 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 da6459f..9ee8a71c 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 67cc8e4..c3794a8 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 79aaeae..8c28f7a 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 b9e6397..647d1fd 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 9b5ecba..3f71add 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 6469f8f..2aa122f 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 d802fb5..759c681 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 1403b9e..5b7243f 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 bb3f0ed..be81c0c 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 e37baa7..6a438f7 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 a3828d9..10bb9e6 100644
--- a/cui/source/options/optjsearch.cxx
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list