[Libreoffice-commits] core.git: 8 commits - animations/source basic/inc basic/source cppcanvas/source drawinglayer/source framework/inc framework/source include/sfx2 sax/inc sax/source sd/source sfx2/inc sfx2/source sw/source xmlscript/source
Noel Grandin
noel at peralex.com
Mon Apr 7 04:54:37 PDT 2014
animations/source/animcore/animcore.cxx | 22
basic/inc/sbprop.hxx | 2
basic/inc/sbstdobj.hxx | 54 -
basic/source/basmgr/basmgr.cxx | 10
basic/source/classes/eventatt.cxx | 2
basic/source/classes/propacc.cxx | 4
basic/source/classes/sb.cxx | 2
basic/source/classes/sbunoobj.cxx | 28
basic/source/classes/sbxmod.cxx | 13
basic/source/inc/dlgcont.hxx | 6
basic/source/inc/namecont.hxx | 44 -
basic/source/inc/propacc.hxx | 4
basic/source/inc/runtime.hxx | 14
basic/source/inc/sbunoobj.hxx | 18
basic/source/inc/scriptcont.hxx | 14
basic/source/runtime/comenumwrapper.cxx | 2
basic/source/runtime/iosys.cxx | 2
basic/source/runtime/methods.cxx | 54 -
basic/source/runtime/methods1.cxx | 52 -
basic/source/runtime/rtlproto.hxx | 4
basic/source/runtime/runtime.cxx | 14
basic/source/runtime/stdobj.cxx | 4
basic/source/runtime/stdobj1.cxx | 36
basic/source/sbx/sbxdate.cxx | 4
basic/source/sbx/sbxscan.cxx | 2
basic/source/uno/dlgcont.cxx | 12
basic/source/uno/namecont.cxx | 148 +--
basic/source/uno/scriptcont.cxx | 108 +-
cppcanvas/source/inc/implrenderer.hxx | 2
cppcanvas/source/mtfrenderer/emfplus.cxx | 6
cppcanvas/source/mtfrenderer/mtftools.cxx | 2
drawinglayer/source/dumper/EnhancedShapeDumper.cxx | 64 -
drawinglayer/source/dumper/EnhancedShapeDumper.hxx | 28
drawinglayer/source/dumper/XShapeDumper.cxx | 104 +-
drawinglayer/source/geometry/viewinformation2d.cxx | 2
framework/inc/classes/actiontriggerpropertyset.hxx | 6
framework/inc/classes/actiontriggerseparatorpropertyset.hxx | 2
framework/inc/classes/checkediterator.hxx | 6
framework/inc/classes/filtercache.hxx | 116 +--
framework/inc/classes/filtercachedata.hxx | 98 +-
framework/inc/classes/framecontainer.hxx | 2
framework/inc/classes/fwktabwindow.hxx | 2
framework/inc/classes/menumanager.hxx | 20
framework/inc/classes/propertysethelper.hxx | 6
framework/inc/classes/protocolhandlercache.hxx | 4
framework/inc/classes/rootactiontriggercontainer.hxx | 6
framework/inc/classes/taskcreator.hxx | 2
framework/inc/classes/wildcard.hxx | 8
framework/inc/dispatch/closedispatcher.hxx | 14
framework/inc/dispatch/dispatchprovider.hxx | 2
framework/inc/dispatch/interceptionhelper.hxx | 2
framework/inc/dispatch/mailtodispatcher.hxx | 2
framework/inc/dispatch/menudispatcher.hxx | 6
framework/inc/dispatch/popupmenudispatcher.hxx | 4
framework/inc/dispatch/startmoduledispatcher.hxx | 4
framework/inc/helper/mischelper.hxx | 2
framework/inc/helper/ocomponentaccess.hxx | 2
framework/inc/helper/ocomponentenumeration.hxx | 4
framework/inc/helper/oframes.hxx | 10
framework/inc/helper/persistentwindowstate.hxx | 2
framework/inc/helper/statusindicatorfactory.hxx | 10
framework/inc/helper/titlebarupdate.hxx | 2
framework/inc/helper/uielementwrapperbase.hxx | 2
framework/inc/interaction/quietinteraction.hxx | 2
framework/inc/jobs/helponstartup.hxx | 2
framework/inc/jobs/job.hxx | 10
framework/inc/jobs/jobdata.hxx | 4
framework/inc/jobs/jobresult.hxx | 4
framework/inc/jobs/joburl.hxx | 10
framework/inc/jobs/shelljob.hxx | 4
framework/inc/properties.h | 4
framework/inc/protocols.h | 4
framework/inc/queries.h | 18
framework/inc/recording/dispatchrecorder.hxx | 2
framework/inc/services/desktop.hxx | 16
framework/inc/services/layoutmanager.hxx | 34
framework/inc/tabwin/tabwindow.hxx | 4
framework/inc/threadhelp/gate.hxx | 18
framework/inc/threadhelp/igate.h | 2
framework/inc/threadhelp/itransactionmanager.h | 2
framework/inc/threadhelp/transactionmanager.hxx | 2
framework/inc/uiconfiguration/globalsettings.hxx | 4
framework/inc/uielement/buttontoolbarcontroller.hxx | 2
framework/inc/uielement/commandinfo.hxx | 2
framework/inc/uielement/complextoolbarcontroller.hxx | 2
framework/inc/uielement/constitemcontainer.hxx | 2
framework/inc/uielement/genericstatusbarcontroller.hxx | 4
framework/inc/uielement/generictoolbarcontroller.hxx | 2
framework/inc/uielement/imagebuttontoolbarcontroller.hxx | 2
framework/inc/uielement/langselectionmenucontroller.hxx | 2
framework/inc/uielement/menubarmanager.hxx | 32
framework/inc/uielement/menubarwrapper.hxx | 4
framework/inc/uielement/newmenucontroller.hxx | 4
framework/inc/uielement/progressbarwrapper.hxx | 4
framework/inc/uielement/statusbarmanager.hxx | 4
framework/inc/uielement/toolbarmanager.hxx | 4
framework/inc/uielement/toolbarsmenucontroller.hxx | 6
framework/inc/uielement/uicommanddescription.hxx | 2
framework/inc/uifactory/configurationaccessfactorymanager.hxx | 4
framework/inc/uifactory/factoryconfiguration.hxx | 4
framework/inc/xml/acceleratorconfigurationreader.hxx | 4
framework/inc/xml/imagesconfiguration.hxx | 4
framework/inc/xml/imagesdocumenthandler.hxx | 16
framework/inc/xml/menudocumenthandler.hxx | 8
framework/inc/xml/statusbardocumenthandler.hxx | 6
framework/inc/xml/toolboxdocumenthandler.hxx | 12
framework/source/accelerators/acceleratorcache.cxx | 4
framework/source/accelerators/acceleratorconfiguration.cxx | 90 +-
framework/source/accelerators/documentacceleratorconfiguration.cxx | 2
framework/source/accelerators/keymapping.cxx | 6
framework/source/accelerators/presethandler.cxx | 34
framework/source/accelerators/storageholder.cxx | 6
framework/source/classes/framecontainer.cxx | 2
framework/source/classes/fwktabwindow.cxx | 4
framework/source/classes/menumanager.cxx | 40 -
framework/source/classes/taskcreator.cxx | 2
framework/source/dispatch/closedispatcher.cxx | 70 -
framework/source/dispatch/dispatchprovider.cxx | 4
framework/source/dispatch/interceptionhelper.cxx | 2
framework/source/dispatch/mailtodispatcher.cxx | 8
framework/source/dispatch/menudispatcher.cxx | 42 -
framework/source/dispatch/popupmenudispatcher.cxx | 12
framework/source/dispatch/startmoduledispatcher.cxx | 12
framework/source/fwe/classes/actiontriggerpropertyset.cxx | 26
framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx | 10
framework/source/fwe/classes/bmkmenu.cxx | 12
framework/source/fwe/classes/framelistanalyzer.cxx | 2
framework/source/fwe/classes/rootactiontriggercontainer.cxx | 18
framework/source/fwe/helper/actiontriggerhelper.cxx | 8
framework/source/fwe/interaction/preventduplicateinteraction.cxx | 2
framework/source/fwe/xml/menudocumenthandler.cxx | 34
framework/source/fwe/xml/statusbardocumenthandler.cxx | 18
framework/source/fwe/xml/toolboxdocumenthandler.cxx | 46 -
framework/source/fwi/classes/propertysethelper.cxx | 22
framework/source/fwi/classes/protocolhandlercache.cxx | 8
framework/source/fwi/helper/mischelper.cxx | 4
framework/source/fwi/threadhelp/transactionmanager.cxx | 10
framework/source/fwi/uielement/constitemcontainer.cxx | 2
framework/source/fwi/uielement/rootitemcontainer.cxx | 2
framework/source/helper/ocomponentaccess.cxx | 4
framework/source/helper/ocomponentenumeration.cxx | 8
framework/source/helper/oframes.cxx | 26
framework/source/helper/persistentwindowstate.cxx | 10
framework/source/helper/statusindicatorfactory.cxx | 34
framework/source/helper/tagwindowasmodified.cxx | 6
framework/source/helper/titlebarupdate.cxx | 10
framework/source/helper/uiconfigelementwrapperbase.cxx | 6
framework/source/helper/uielementwrapperbase.cxx | 6
framework/source/inc/accelerators/acceleratorcache.hxx | 4
framework/source/inc/accelerators/acceleratorconfiguration.hxx | 14
framework/source/inc/accelerators/keymapping.hxx | 2
framework/source/inc/accelerators/presethandler.hxx | 12
framework/source/inc/accelerators/storageholder.hxx | 4
framework/source/inc/loadenv/actionlockguard.hxx | 18
framework/source/inc/loadenv/loadenv.hxx | 20
framework/source/inc/loadenv/targethelper.hxx | 4
framework/source/inc/pattern/frame.hxx | 12
framework/source/inc/pattern/window.hxx | 6
framework/source/interaction/quietinteraction.cxx | 4
framework/source/jobs/helponstartup.cxx | 20
framework/source/jobs/job.cxx | 50 -
framework/source/jobs/jobdata.cxx | 14
framework/source/jobs/jobresult.cxx | 2
framework/source/jobs/joburl.cxx | 18
framework/source/jobs/shelljob.cxx | 20
framework/source/layoutmanager/helpers.cxx | 12
framework/source/layoutmanager/helpers.hxx | 4
framework/source/layoutmanager/layoutmanager.cxx | 164 ++--
framework/source/layoutmanager/toolbarlayoutmanager.cxx | 10
framework/source/layoutmanager/toolbarlayoutmanager.hxx | 2
framework/source/loadenv/loadenv.cxx | 94 +-
framework/source/loadenv/targethelper.cxx | 8
framework/source/recording/dispatchrecorder.cxx | 8
framework/source/services/autorecovery.cxx | 196 ++---
framework/source/services/desktop.cxx | 48 -
framework/source/services/dispatchhelper.cxx | 2
framework/source/services/frame.cxx | 108 +-
framework/source/services/mediatypedetectionhelper.cxx | 4
framework/source/services/pathsettings.cxx | 60 -
framework/source/services/sessionlistener.cxx | 40 -
framework/source/services/tabwindowservice.cxx | 10
framework/source/services/taskcreatorsrv.cxx | 18
framework/source/services/urltransformer.cxx | 2
framework/source/tabwin/tabwindow.cxx | 12
framework/source/uiconfiguration/globalsettings.cxx | 54 -
framework/source/uiconfiguration/imagemanagerimpl.cxx | 42 -
framework/source/uiconfiguration/imagemanagerimpl.hxx | 12
framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx | 8
framework/source/uiconfiguration/uicategorydescription.cxx | 30
framework/source/uiconfiguration/uiconfigurationmanager.cxx | 8
framework/source/uiconfiguration/windowstateconfiguration.cxx | 54 -
framework/source/uielement/addonstoolbarmanager.cxx | 18
framework/source/uielement/addonstoolbarwrapper.cxx | 2
framework/source/uielement/buttontoolbarcontroller.cxx | 8
framework/source/uielement/complextoolbarcontroller.cxx | 6
framework/source/uielement/controlmenucontroller.cxx | 6
framework/source/uielement/genericstatusbarcontroller.cxx | 4
framework/source/uielement/generictoolbarcontroller.cxx | 18
framework/source/uielement/headermenucontroller.cxx | 16
framework/source/uielement/imagebuttontoolbarcontroller.cxx | 8
framework/source/uielement/langselectionmenucontroller.cxx | 8
framework/source/uielement/langselectionstatusbarcontroller.cxx | 10
framework/source/uielement/macrosmenucontroller.cxx | 4
framework/source/uielement/menubarmanager.cxx | 120 +--
framework/source/uielement/menubarwrapper.cxx | 10
framework/source/uielement/newmenucontroller.cxx | 26
framework/source/uielement/popuptoolbarcontroller.cxx | 18
framework/source/uielement/progressbarwrapper.cxx | 10
framework/source/uielement/recentfilesmenucontroller.cxx | 6
framework/source/uielement/statusbarmanager.cxx | 20
framework/source/uielement/statusbarmerger.cxx | 4
framework/source/uielement/toolbarmanager.cxx | 40 -
framework/source/uielement/toolbarsmenucontroller.cxx | 44 -
framework/source/uielement/toolbarwrapper.cxx | 6
framework/source/uielement/uicommanddescription.cxx | 56 -
framework/source/uifactory/addonstoolbarfactory.cxx | 18
framework/source/uifactory/factoryconfiguration.cxx | 12
framework/source/uifactory/menubarfactory.cxx | 4
framework/source/uifactory/uicontrollerfactory.cxx | 14
framework/source/uifactory/uielementfactorymanager.cxx | 26
framework/source/uifactory/windowcontentfactorymanager.cxx | 6
framework/source/xml/acceleratorconfigurationreader.cxx | 12
framework/source/xml/imagesconfiguration.cxx | 20
framework/source/xml/imagesdocumenthandler.cxx | 36
include/sfx2/childwin.hxx | 8
include/sfx2/sfxbasemodel.hxx | 2
include/sfx2/tabdlg.hxx | 2
sax/inc/xml2utf.hxx | 20
sax/source/expatwrap/sax_expat.cxx | 20
sax/source/expatwrap/saxwriter.cxx | 144 +--
sax/source/expatwrap/xml2utf.cxx | 40 -
sax/source/tools/converter.cxx | 2
sd/source/ui/app/sddll.cxx | 32
sfx2/inc/bitset.hxx | 46 -
sfx2/inc/guisaveas.hxx | 12
sfx2/inc/idpool.hxx | 12
sfx2/inc/inettbc.hxx | 2
sfx2/source/appl/app.cxx | 4
sfx2/source/appl/appbaslib.cxx | 5
sfx2/source/appl/appcfg.cxx | 4
sfx2/source/appl/appdata.cxx | 8
sfx2/source/appl/appdispatchprovider.cxx | 2
sfx2/source/appl/appinit.cxx | 2
sfx2/source/appl/appopen.cxx | 34
sfx2/source/appl/appquit.cxx | 6
sfx2/source/appl/appreg.cxx | 6
sfx2/source/appl/appserv.cxx | 38
sfx2/source/appl/appuno.cxx | 156 ++--
sfx2/source/appl/childwin.cxx | 8
sfx2/source/appl/fileobj.cxx | 48 -
sfx2/source/appl/fileobj.hxx | 26
sfx2/source/appl/helpdispatch.cxx | 2
sfx2/source/appl/helpinterceptor.cxx | 12
sfx2/source/appl/helpinterceptor.hxx | 4
sfx2/source/appl/imestatuswindow.cxx | 15
sfx2/source/appl/impldde.cxx | 6
sfx2/source/appl/impldde.hxx | 2
sfx2/source/appl/linkmgr2.cxx | 6
sfx2/source/appl/linksrc.cxx | 12
sfx2/source/appl/lnkbase2.cxx | 28
sfx2/source/appl/newhelp.cxx | 168 ++--
sfx2/source/appl/newhelp.hxx | 50 -
sfx2/source/appl/opengrf.cxx | 4
sfx2/source/appl/panelist.hxx | 6
sfx2/source/appl/sfxhelp.cxx | 18
sfx2/source/appl/sfxpicklist.cxx | 8
sfx2/source/appl/shutdownicon.cxx | 10
sfx2/source/appl/workwin.cxx | 180 ++--
sfx2/source/appl/xpackcreator.cxx | 4
sfx2/source/bastyp/bitset.cxx | 12
sfx2/source/bastyp/fltfnc.cxx | 10
sfx2/source/bastyp/frmhtml.cxx | 18
sfx2/source/bastyp/frmhtmlw.cxx | 2
sfx2/source/bastyp/helper.cxx | 2
sfx2/source/bastyp/sfxhtml.cxx | 10
sfx2/source/control/bindings.cxx | 124 +--
sfx2/source/control/ctrlitem.cxx | 2
sfx2/source/control/dispatch.cxx | 8
sfx2/source/control/querystatus.cxx | 10
sfx2/source/control/recentdocsview.cxx | 2
sfx2/source/control/sfxstatuslistener.cxx | 2
sfx2/source/control/shell.cxx | 4
sfx2/source/control/sorgitm.cxx | 2
sfx2/source/control/statcach.cxx | 58 -
sfx2/source/control/thumbnailviewacc.cxx | 10
sfx2/source/control/thumbnailviewacc.hxx | 4
sfx2/source/control/unoctitm.cxx | 12
sfx2/source/dialog/basedlgs.cxx | 16
sfx2/source/dialog/dinfdlg.cxx | 42 -
sfx2/source/dialog/dockwin.cxx | 88 +-
sfx2/source/dialog/filedlghelper.cxx | 76 -
sfx2/source/dialog/filedlgimpl.hxx | 16
sfx2/source/dialog/filtergrouping.cxx | 26
sfx2/source/dialog/filtergrouping.hxx | 2
sfx2/source/dialog/mailmodel.cxx | 14
sfx2/source/dialog/mgetempl.cxx | 2
sfx2/source/dialog/partwnd.cxx | 4
sfx2/source/dialog/printopt.cxx | 16
sfx2/source/dialog/recfloat.cxx | 2
sfx2/source/dialog/securitypage.cxx | 2
sfx2/source/dialog/splitwin.cxx | 184 ++--
sfx2/source/dialog/srchdlg.cxx | 2
sfx2/source/dialog/templdlg.cxx | 192 ++---
sfx2/source/dialog/tplcitem.cxx | 2
sfx2/source/dialog/versdlg.cxx | 6
sfx2/source/doc/DocumentMetadataAccess.cxx | 2
sfx2/source/doc/SfxDocumentMetaData.cxx | 10
sfx2/source/doc/docfac.cxx | 6
sfx2/source/doc/docfile.cxx | 2
sfx2/source/doc/docinsert.cxx | 6
sfx2/source/doc/docmacromode.cxx | 22
sfx2/source/doc/doctempl.cxx | 54 -
sfx2/source/doc/doctemplates.cxx | 384 +++++-----
sfx2/source/doc/graphhelp.cxx | 16
sfx2/source/doc/graphhelp.hxx | 8
sfx2/source/doc/guisaveas.cxx | 138 +--
sfx2/source/doc/iframe.cxx | 28
sfx2/source/doc/objcont.cxx | 8
sfx2/source/doc/objmisc.cxx | 26
sfx2/source/doc/objserv.cxx | 52 -
sfx2/source/doc/objstor.cxx | 34
sfx2/source/doc/objxtor.cxx | 104 +-
sfx2/source/doc/printhelper.cxx | 6
sfx2/source/doc/sfxbasemodel.cxx | 50 -
sfx2/source/doc/sfxmodelfactory.cxx | 6
sfx2/source/inc/appbaslib.hxx | 2
sfx2/source/inc/appdata.hxx | 10
sfx2/source/inc/eventsupplier.hxx | 2
sfx2/source/inc/fltoptint.hxx | 2
sfx2/source/inc/objshimp.hxx | 24
sfx2/source/inc/partwnd.hxx | 2
sfx2/source/inc/sfxtypes.hxx | 6
sfx2/source/inc/splitwin.hxx | 40 -
sfx2/source/inc/statcach.hxx | 30
sfx2/source/inc/templdgi.hxx | 54 -
sfx2/source/inc/versdlg.hxx | 4
sfx2/source/inc/virtmenu.hxx | 28
sfx2/source/inc/workwin.hxx | 106 +-
sfx2/source/inet/inettbc.cxx | 4
sfx2/source/menu/mnuitem.cxx | 4
sfx2/source/menu/mnumgr.cxx | 2
sfx2/source/menu/virtmenu.cxx | 64 -
sfx2/source/notify/eventsupplier.cxx | 6
sfx2/source/notify/globalevents.cxx | 4
sfx2/source/sidebar/PanelDescriptor.hxx | 2
sfx2/source/sidebar/Theme.cxx | 4
sfx2/source/statbar/stbitem.cxx | 2
sfx2/source/toolbox/imgmgr.cxx | 10
sfx2/source/toolbox/tbxitem.cxx | 4
sfx2/source/view/frame.cxx | 14
sfx2/source/view/frmload.cxx | 18
sfx2/source/view/impframe.hxx | 24
sfx2/source/view/impviewframe.hxx | 22
sfx2/source/view/ipclient.cxx | 40 -
sfx2/source/view/sfxbasecontroller.cxx | 2
sfx2/source/view/viewfrm.cxx | 4
sfx2/source/view/viewfrm2.cxx | 22
sfx2/source/view/viewprn.cxx | 46 -
sw/source/core/uibase/app/swmodule.cxx | 40 -
xmlscript/source/xmldlg_imexp/exp_share.hxx | 4
xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx | 2
xmlscript/source/xmldlg_imexp/xmldlg_export.cxx | 4
xmlscript/source/xmlflat_imexp/xmlbas_export.cxx | 10
363 files changed, 3934 insertions(+), 3943 deletions(-)
New commits:
commit 74fdda0cd41d97b6c97d2115584ee48fd552514e
Author: Noel Grandin <noel at peralex.com>
Date: Mon Apr 7 09:15:28 2014 +0200
sfx2: sal_Bool->bool
Change-Id: I48ae51781f64e60deb0c03352087100729c8c3cd
diff --git a/include/sfx2/childwin.hxx b/include/sfx2/childwin.hxx
index 8680809..0dec11a 100644
--- a/include/sfx2/childwin.hxx
+++ b/include/sfx2/childwin.hxx
@@ -208,7 +208,7 @@ public:
void SetHideNotDelete( bool bOn );
bool IsHideNotDelete() const;
bool IsHideAtToggle() const;
- sal_Bool IsVisible() const;
+ bool IsVisible() const;
void SetWantsFocus( bool );
bool WantsFocus() const;
@@ -217,7 +217,7 @@ public:
void SetFrame( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > & );
SAL_DLLPRIVATE static void InitializeChildWinFactory_Impl(sal_uInt16, SfxChildWinInfo&);
- SAL_DLLPRIVATE void SetVisible_Impl( sal_Bool bVis );
+ SAL_DLLPRIVATE void SetVisible_Impl( bool bVis );
SAL_DLLPRIVATE void SetWorkWindow_Impl( SfxWorkWindow* );
SAL_DLLPRIVATE void Activate_Impl();
SAL_DLLPRIVATE void Deactivate_Impl();
@@ -281,7 +281,7 @@ public:
public : \
static SfxChildWindow* CreateImpl(::Window *pParent, sal_uInt16 nId, \
SfxBindings *pBindings, SfxChildWinInfo* pInfo ); \
- static void RegisterChildWindow (sal_Bool bVisible=sal_False, SfxModule *pMod=NULL, sal_uInt16 nFlags=0); \
+ static void RegisterChildWindow (bool bVisible=false, SfxModule *pMod=NULL, sal_uInt16 nFlags=0); \
virtual SfxChildWinInfo GetInfo() const SAL_OVERRIDE
#define SFX_DECL_CHILDWINDOW_WITHID(Class) \
@@ -301,7 +301,7 @@ public:
SfxChildWindow *pWin = new Class(pParent, nId, pBindings, pInfo);\
return pWin; \
} \
- void Class::RegisterChildWindow (sal_Bool bVis, SfxModule *pMod, sal_uInt16 nFlags) \
+ void Class::RegisterChildWindow (bool bVis, SfxModule *pMod, sal_uInt16 nFlags) \
{ \
SfxChildWinFactory *pFact = new SfxChildWinFactory( \
Class::CreateImpl, MyID, Pos ); \
diff --git a/include/sfx2/sfxbasemodel.hxx b/include/sfx2/sfxbasemodel.hxx
index 2ed6834..3225e28 100644
--- a/include/sfx2/sfxbasemodel.hxx
+++ b/include/sfx2/sfxbasemodel.hxx
@@ -1334,7 +1334,7 @@ public:
virtual sal_Bool SAL_CALL canCancelCheckOut( ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL canCheckIn( ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- sal_Bool getBoolPropertyValue( const OUString& rName ) throw ( css::uno::RuntimeException );
+ bool getBoolPropertyValue( const OUString& rName ) throw ( css::uno::RuntimeException );
// SfxListener
diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx
index 54baa7a..79c7500 100644
--- a/include/sfx2/tabdlg.hxx
+++ b/include/sfx2/tabdlg.hxx
@@ -198,7 +198,7 @@ public:
const sal_uInt16* GetInputRanges( const SfxItemPool& );
void SetInputSet( const SfxItemSet* pInSet );
const SfxItemSet* GetOutputItemSet() const { return pOutSet; }
- bool IsFormat() const { return bFmt; }
+ sal_Bool IsFormat() const { return bFmt; }
const PushButton& GetOKButton() const { return *m_pOKBtn; }
PushButton& GetOKButton() { return *m_pOKBtn; }
diff --git a/sd/source/ui/app/sddll.cxx b/sd/source/ui/app/sddll.cxx
index 1863c75..fd0d5b8 100644
--- a/sd/source/ui/app/sddll.cxx
+++ b/sd/source/ui/app/sddll.cxx
@@ -193,24 +193,24 @@ void SdDLL::RegisterControllers()
SdTbxCtlDiaPages::RegisterControl( SID_PAGES_PER_ROW, pMod );
SdTbxCtlGlueEscDir::RegisterControl( SID_GLUE_ESCDIR, pMod );
- ::sd::AnimationChildWindow::RegisterChildWindow(0, pMod);
+ ::sd::AnimationChildWindow::RegisterChildWindow(false, pMod);
::sd::NavigatorChildWindow::RegisterChildWindowContext( (sal_uInt16) ::sd::DrawViewShell::GetInterfaceId(), pMod );
::sd::NavigatorChildWindow::RegisterChildWindowContext( (sal_uInt16) ::sd::GraphicViewShell::GetInterfaceId(), pMod );
- ::sd::LayerDialogChildWindow::RegisterChildWindow(0, pMod);
-
- Svx3DChildWindow::RegisterChildWindow(0, pMod);
- SvxFontWorkChildWindow::RegisterChildWindow(0, pMod);
- SvxColorChildWindow::RegisterChildWindow(0, pMod, SFX_CHILDWIN_TASK);
- SvxSearchDialogWrapper::RegisterChildWindow(0, pMod);
- SvxBmpMaskChildWindow::RegisterChildWindow(0, pMod);
- GalleryChildWindow::RegisterChildWindow(0, pMod);
- SvxIMapDlgChildWindow::RegisterChildWindow(0, pMod);
- SvxHlinkDlgWrapper::RegisterChildWindow(0, pMod);
- ::sd::SpellDialogChildWindow::RegisterChildWindow(0, pMod);
- ::avmedia::MediaPlayer::RegisterChildWindow(0, pMod);
- ::sd::LeftPaneImpressChildWindow::RegisterChildWindow(0, pMod);
- ::sd::LeftPaneDrawChildWindow::RegisterChildWindow(0, pMod);
- ::sfx2::sidebar::SidebarChildWindow::RegisterChildWindow(0, pMod);
+ ::sd::LayerDialogChildWindow::RegisterChildWindow(false, pMod);
+
+ Svx3DChildWindow::RegisterChildWindow(false, pMod);
+ SvxFontWorkChildWindow::RegisterChildWindow(false, pMod);
+ SvxColorChildWindow::RegisterChildWindow(false, pMod, SFX_CHILDWIN_TASK);
+ SvxSearchDialogWrapper::RegisterChildWindow(false, pMod);
+ SvxBmpMaskChildWindow::RegisterChildWindow(false, pMod);
+ GalleryChildWindow::RegisterChildWindow(false, pMod);
+ SvxIMapDlgChildWindow::RegisterChildWindow(false, pMod);
+ SvxHlinkDlgWrapper::RegisterChildWindow(false, pMod);
+ ::sd::SpellDialogChildWindow::RegisterChildWindow(false, pMod);
+ ::avmedia::MediaPlayer::RegisterChildWindow(false, pMod);
+ ::sd::LeftPaneImpressChildWindow::RegisterChildWindow(false, pMod);
+ ::sd::LeftPaneDrawChildWindow::RegisterChildWindow(false, pMod);
+ ::sfx2::sidebar::SidebarChildWindow::RegisterChildWindow(false, pMod);
SvxFillToolBoxControl::RegisterControl(0, pMod);
SvxLineStyleToolBoxControl::RegisterControl(0, pMod);
diff --git a/sfx2/inc/bitset.hxx b/sfx2/inc/bitset.hxx
index 0711513..fdc17e1 100644
--- a/sfx2/inc/bitset.hxx
+++ b/sfx2/inc/bitset.hxx
@@ -30,7 +30,7 @@ public:
BitSet operator<<( sal_uInt16 nOffset ) const;
BitSet operator>>( sal_uInt16 nOffset ) const;
static sal_uInt16 CountBits( sal_uIntPtr nBits );
- sal_Bool operator!() const;
+ bool operator!() const;
BitSet();
BitSet( const BitSet& rOrig );
~BitSet();
@@ -51,20 +51,20 @@ public:
BitSet operator^( sal_uInt16 nBit ) const;
BitSet& operator^=( const BitSet& rSet );
BitSet& operator^=( sal_uInt16 nBit );
- sal_Bool IsRealSubSet( const BitSet& rSet ) const;
- sal_Bool IsSubSet( const BitSet& rSet ) const;
- sal_Bool IsRealSuperSet( const BitSet& rSet ) const;
- sal_Bool Contains( sal_uInt16 nBit ) const;
- sal_Bool IsSuperSet( const BitSet& rSet ) const;
- sal_Bool operator==( const BitSet& rSet ) const;
- sal_Bool operator==( sal_uInt16 nBit ) const;
- sal_Bool operator!=( const BitSet& rSet ) const;
- sal_Bool operator!=( sal_uInt16 nBit ) const;
+ bool IsRealSubSet( const BitSet& rSet ) const;
+ bool IsSubSet( const BitSet& rSet ) const;
+ bool IsRealSuperSet( const BitSet& rSet ) const;
+ bool Contains( sal_uInt16 nBit ) const;
+ bool IsSuperSet( const BitSet& rSet ) const;
+ bool operator==( const BitSet& rSet ) const;
+ bool operator==( sal_uInt16 nBit ) const;
+ bool operator!=( const BitSet& rSet ) const;
+ bool operator!=( sal_uInt16 nBit ) const;
};
// returns sal_True if the set is empty
-inline sal_Bool BitSet::operator!() const
+inline bool BitSet::operator!() const
{
return nCount == 0;
}
@@ -145,43 +145,43 @@ inline BitSet& BitSet::operator^=( sal_uInt16 )
#endif
// determines if the other bitset is a real superset
-inline sal_Bool BitSet::IsRealSubSet( const BitSet& ) const
+inline bool BitSet::IsRealSubSet( const BitSet& ) const
{
- return sal_False;
+ return false;
}
// determines if the other bitset is a superset or equal
-inline sal_Bool BitSet::IsSubSet( const BitSet& ) const
+inline bool BitSet::IsSubSet( const BitSet& ) const
{
- return sal_False;
+ return false;
}
// determines if the other bitset is a real subset
-inline sal_Bool BitSet::IsRealSuperSet( const BitSet& ) const
+inline bool BitSet::IsRealSuperSet( const BitSet& ) const
{
- return sal_False;
+ return false;
}
// determines if the other bitset is a subset or equal
-inline sal_Bool BitSet::IsSuperSet( const BitSet& ) const
+inline bool BitSet::IsSuperSet( const BitSet& ) const
{
- return sal_False;
+ return false;
}
// determines if the bit is the only one in the bitset
-inline sal_Bool BitSet::operator==( sal_uInt16 ) const
+inline bool BitSet::operator==( sal_uInt16 ) const
{
- return sal_False;
+ return false;
}
// determines if the bitsets aren't equal
-inline sal_Bool BitSet::operator!=( const BitSet& rSet ) const
+inline bool BitSet::operator!=( const BitSet& rSet ) const
{
return !( *this == rSet );
}
// determines if the bitset doesn't contain only this bit
-inline sal_Bool BitSet::operator!=( sal_uInt16 nBit ) const
+inline bool BitSet::operator!=( sal_uInt16 nBit ) const
{
return !( *this == nBit );
}
diff --git a/sfx2/inc/guisaveas.hxx b/sfx2/inc/guisaveas.hxx
index 0e9905e..60c5754 100644
--- a/sfx2/inc/guisaveas.hxx
+++ b/sfx2/inc/guisaveas.hxx
@@ -57,15 +57,15 @@ private:
public:
SfxStoringHelper();
- sal_Bool GUIStoreModel(
+ bool GUIStoreModel(
::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > xModel,
const OUString& aSlotName,
::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgsSequence,
- sal_Bool bPreselectPassword,
+ bool bPreselectPassword,
const OUString& aUserSelectedName,
sal_uInt16 nDocumentSignatureState = SIGNATURESTATE_NOSIGNATURES );
- static sal_Bool CheckFilterOptionsAppearence(
+ static bool CheckFilterOptionsAppearence(
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& xFilterCFG,
const OUString& aFilterName );
@@ -74,13 +74,13 @@ public:
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel,
const ::com::sun::star::uno::Reference<
::com::sun::star::document::XDocumentProperties>& i_xOldDocInfo,
- sal_Bool bNoModify );
+ bool bNoModify );
- static sal_Bool WarnUnacceptableFormat(
+ static bool WarnUnacceptableFormat(
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel,
const OUString& aOldUIName,
const OUString& aDefUIName,
- sal_Bool bCanProceedFurther );
+ bool bCanProceedFurther );
static Window* GetModelWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel );
diff --git a/sfx2/inc/idpool.hxx b/sfx2/inc/idpool.hxx
index e267942..89d3077 100644
--- a/sfx2/inc/idpool.hxx
+++ b/sfx2/inc/idpool.hxx
@@ -31,13 +31,13 @@ private:
sal_uInt16 nRange;
sal_uInt16 nOffset;
public:
- sal_Bool Lock( const BitSet& rLockSet );
- sal_Bool IsLocked( sal_uInt16 nId ) const;
+ bool Lock( const BitSet& rLockSet );
+ bool IsLocked( sal_uInt16 nId ) const;
IdPool( sal_uInt16 nMin = 1, sal_uInt16 nMax = USHRT_MAX );
sal_uInt16 Get();
- sal_Bool Put( sal_uInt16 nId );
- sal_Bool Lock( const Range& rRange );
- sal_Bool Lock( sal_uInt16 nId );
+ bool Put( sal_uInt16 nId );
+ bool Lock( const Range& rRange );
+ bool Lock( sal_uInt16 nId );
};
@@ -45,7 +45,7 @@ public:
// returns sal_True if the id is locked
-inline sal_Bool IdPool::IsLocked( sal_uInt16 nId ) const
+inline bool IdPool::IsLocked( sal_uInt16 nId ) const
{
return ( this->Contains(nId-nOffset) );
}
diff --git a/sfx2/inc/inettbc.hxx b/sfx2/inc/inettbc.hxx
index 9b6b7cc..a0447b4 100644
--- a/sfx2/inc/inettbc.hxx
+++ b/sfx2/inc/inettbc.hxx
@@ -32,7 +32,7 @@ class SfxURLToolBoxControl_Impl : public SfxToolBoxControl
private:
SvtURLBox* GetURLBox() const;
- void OpenURL( const OUString& rName, sal_Bool bNew ) const;
+ void OpenURL( const OUString& rName, bool bNew ) const;
DECL_LINK( OpenHdl, void* );
DECL_LINK( SelectHdl, void* );
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index 64ff4327..6e51c1b 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -190,7 +190,7 @@ SfxApplication::SfxApplication()
SAL_INFO( "sfx.appl", "{ initialize DDE" );
- sal_Bool bOk = InitializeDde();
+ bool bOk = InitializeDde();
#ifdef DBG_UTIL
if( !bOk )
@@ -327,7 +327,7 @@ void SfxApplication::SetViewFrame_Impl( SfxViewFrame *pFrame )
// DocWinActivate : both frames belong to the same TopWindow
// TopWinActivate : both frames belong to different TopWindows
- sal_Bool bTaskActivate = pOldContainerFrame != pNewContainerFrame;
+ bool bTaskActivate = pOldContainerFrame != pNewContainerFrame;
if ( pOldContainerFrame )
{
diff --git a/sfx2/source/appl/appbaslib.cxx b/sfx2/source/appl/appbaslib.cxx
index aeee952..d22dc48 100644
--- a/sfx2/source/appl/appbaslib.cxx
+++ b/sfx2/source/appl/appbaslib.cxx
@@ -141,8 +141,7 @@ void SfxBasicManagerHolder::impl_releaseContainers()
mxDialogContainer.clear();
}
-sal_Bool
-SfxBasicManagerHolder::LegacyPsswdBinaryLimitExceeded( Sequence< OUString >& sModules )
+bool SfxBasicManagerHolder::LegacyPsswdBinaryLimitExceeded( Sequence< OUString >& sModules )
{
#ifdef DISABLE_SCRIPTING
(void) sModules;
@@ -150,7 +149,7 @@ SfxBasicManagerHolder::LegacyPsswdBinaryLimitExceeded( Sequence< OUString >& sMo
if ( mpBasicManager )
return mpBasicManager->LegacyPsswdBinaryLimitExceeded( sModules );
#endif
- return sal_True;
+ return true;
}
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
index 959cdd2..225fc4c 100644
--- a/sfx2/source/appl/appcfg.cxx
+++ b/sfx2/source/appl/appcfg.cxx
@@ -518,7 +518,7 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet )
if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_ATTR_BUTTON_BIGSIZE), true, &pItem) )
{
DBG_ASSERT(pItem->ISA(SfxBoolItem), "BoolItem expected");
- sal_Bool bBigSize = ( (const SfxBoolItem*)pItem )->GetValue();
+ bool bBigSize = ( (const SfxBoolItem*)pItem )->GetValue();
aMiscOptions.SetSymbolsSize(
sal::static_int_cast< sal_Int16 >(
bBigSize ? SFX_SYMBOLS_SIZE_LARGE : SFX_SYMBOLS_SIZE_SMALL ) );
@@ -633,7 +633,7 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet )
if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_WELCOMESCREEN_RESET ), true, &pItem))
{
DBG_ASSERT(pItem->ISA(SfxBoolItem), "BoolItem expected");
- sal_Bool bReset = ((const SfxBoolItem *)pItem)->GetValue();
+ bool bReset = ((const SfxBoolItem *)pItem)->GetValue();
if ( bReset )
{
OSL_FAIL( "Not implemented, may be EOL!" );
diff --git a/sfx2/source/appl/appdata.cxx b/sfx2/source/appl/appdata.cxx
index 21ed069..82f4c2d 100644
--- a/sfx2/source/appl/appdata.cxx
+++ b/sfx2/source/appl/appdata.cxx
@@ -114,10 +114,10 @@ SfxAppData_Impl::SfxAppData_Impl( SfxApplication* )
, pInterfaces( 0 )
, nDocNo(0)
, nInterfaces( 0 )
- , bDowning( sal_True )
- , bInQuit( sal_False )
- , bInvalidateOnUnlock( sal_False )
- , bODFVersionWarningLater( sal_False )
+ , bDowning( true )
+ , bInQuit( false )
+ , bInvalidateOnUnlock( false )
+ , bODFVersionWarningLater( false )
{
#ifndef DISABLE_SCRIPTING
diff --git a/sfx2/source/appl/appdispatchprovider.cxx b/sfx2/source/appl/appdispatchprovider.cxx
index f7b6f16..740b052 100644
--- a/sfx2/source/appl/appdispatchprovider.cxx
+++ b/sfx2/source/appl/appdispatchprovider.cxx
@@ -133,7 +133,7 @@ Reference < XDispatch > SAL_CALL SfxAppDispatchProvider::queryDispatch(
FrameSearchFlags /*eSearchFlags*/ ) throw( RuntimeException, std::exception )
{
sal_uInt16 nId( 0 );
- sal_Bool bMasterCommand( sal_False );
+ bool bMasterCommand( false );
Reference < XDispatch > xDisp;
const SfxSlot* pSlot = 0;
SfxDispatcher* pAppDisp = SFX_APP()->GetAppDispatcher_Impl();
diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx
index 1ff37e1..fe4611f 100644
--- a/sfx2/source/appl/appinit.cxx
+++ b/sfx2/source/appl/appinit.cxx
@@ -260,7 +260,7 @@ bool SfxApplication::Initialize_Impl()
Registrations_Impl();
// Subklasse initialisieren
- pAppData_Impl->bDowning = sal_False;
+ pAppData_Impl->bDowning = false;
Init();
// get CHAOS item pool...
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index d399d7f..96f604a 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -118,20 +118,20 @@ using namespace ::sfx2;
class SfxOpenDocStatusListener_Impl : public WeakImplHelper1< XDispatchResultListener >
{
public:
- sal_Bool bFinished;
- sal_Bool bSuccess;
+ bool bFinished;
+ bool bSuccess;
virtual void SAL_CALL dispatchFinished( const DispatchResultEvent& Event ) throw(RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL disposing( const EventObject& Source ) throw(RuntimeException, std::exception) SAL_OVERRIDE;
SfxOpenDocStatusListener_Impl()
- : bFinished( sal_False )
- , bSuccess( sal_False )
+ : bFinished( false )
+ , bSuccess( false )
{}
};
void SAL_CALL SfxOpenDocStatusListener_Impl::dispatchFinished( const DispatchResultEvent& aEvent ) throw(RuntimeException, std::exception)
{
bSuccess = ( aEvent.State == DispatchResultState::SUCCESS );
- bFinished = sal_True;
+ bFinished = true;
}
void SAL_CALL SfxOpenDocStatusListener_Impl::disposing( const EventObject& ) throw(RuntimeException, std::exception)
@@ -234,7 +234,7 @@ sal_uInt32 CheckPasswd_Impl
uno::Reference< beans::XPropertySet > xStorageProps( xStorage, uno::UNO_QUERY );
if ( xStorageProps.is() )
{
- sal_Bool bIsEncrypted = sal_False;
+ bool bIsEncrypted = false;
try {
xStorageProps->getPropertyValue("HasEncryptedEntries")
>>= bIsEncrypted;
@@ -483,11 +483,11 @@ void SfxApplication::NewDocExec_Impl( SfxRequest& rReq )
SfxObjectShellLock xDoc;
OUString aTemplateRegion, aTemplateName, aTemplateFileName;
- sal_Bool bDirect = sal_False; // through FileName instead of Region/Template
+ bool bDirect = false; // through FileName instead of Region/Template
SfxErrorContext aEc(ERRCTX_SFX_NEWDOC);
if ( !pTemplNameItem && !pTemplFileNameItem )
{
- sal_Bool bNewWin = sal_False;
+ bool bNewWin = false;
Window* pTopWin = GetTopWindow();
SfxTemplateManagerDlg aTemplDlg;
@@ -499,7 +499,7 @@ void SfxApplication::NewDocExec_Impl( SfxRequest& rReq )
{
// the dialogue opens a document -> a new TopWindow appears
pTopWin = GetTopWindow();
- bNewWin = sal_True;
+ bNewWin = true;
}
}
@@ -524,7 +524,7 @@ void SfxApplication::NewDocExec_Impl( SfxRequest& rReq )
if ( pTemplFileNameItem )
{
aTemplateFileName = pTemplFileNameItem->GetValue();
- bDirect = sal_True;
+ bDirect = true;
}
}
@@ -758,7 +758,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
pURLList.clear();
}
- sal_Bool bHyperlinkUsed = sal_False;
+ bool bHyperlinkUsed = false;
if ( SID_OPENURL == nSID )
{
@@ -781,7 +781,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
{
rReq.SetSlot( SID_OPENDOC );
nSID = SID_OPENDOC;
- bHyperlinkUsed = sal_True;
+ bHyperlinkUsed = true;
}
// no else here! It's optional ...
@@ -916,20 +916,20 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
}
}
- sal_Bool bFound = sal_False;
+ bool bFound = false;
for ( sal_Int32 nProt=0; nProt<aProtocols.getLength(); nProt++ )
{
WildCard aPattern(aProtocols[nProt]);
if ( aPattern.Matches( aURL.Complete ) )
{
- bFound = sal_True;
+ bFound = true;
break;
}
}
if ( !bFound )
{
- sal_Bool bLoadInternal = sal_False;
+ bool bLoadInternal = false;
try
{
sfx2::openUriExternally(
@@ -939,7 +939,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
{
rReq.RemoveItem( SID_TARGETNAME );
rReq.AppendItem( SfxStringItem( SID_TARGETNAME, OUString("_default") ) );
- bLoadInternal = sal_True;
+ bLoadInternal = true;
}
if ( !bLoadInternal )
return;
@@ -989,7 +989,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
rReq.RemoveItem( SID_DONELINK );
// check if the view must be hidden
- sal_Bool bHidden = sal_False;
+ bool bHidden = false;
SFX_REQUEST_ARG(rReq, pHidItem, SfxBoolItem, SID_HIDDEN, false);
if ( pHidItem )
bHidden = pHidItem->GetValue();
diff --git a/sfx2/source/appl/appquit.cxx b/sfx2/source/appl/appquit.cxx
index 26a8b2d..4ec7bb1 100644
--- a/sfx2/source/appl/appquit.cxx
+++ b/sfx2/source/appl/appquit.cxx
@@ -87,7 +87,7 @@ void SfxApplication::Deinitialize()
SaveBasicAndDialogContainer();
#endif
- pAppData_Impl->bDowning = sal_True; // due to Timer from DecAliveCount and QueryExit
+ pAppData_Impl->bDowning = true; // due to Timer from DecAliveCount and QueryExit
DELETEZ( pAppData_Impl->pTemplates );
@@ -95,14 +95,14 @@ void SfxApplication::Deinitialize()
// this method. Therefore this call makes no sense and is the source of
// some stack traces, which we don't understand.
// For more information see:
- pAppData_Impl->bDowning = sal_False;
+ pAppData_Impl->bDowning = false;
DBG_ASSERT( !SfxViewFrame::GetFirst(),
"existing SfxViewFrame after Execute" );
DBG_ASSERT( !SfxObjectShell::GetFirst(),
"existing SfxObjectShell after Execute" );
pAppData_Impl->pAppDispat->Pop( *this, SFX_SHELL_POP_UNTIL );
pAppData_Impl->pAppDispat->Flush();
- pAppData_Impl->bDowning = sal_True;
+ pAppData_Impl->bDowning = true;
pAppData_Impl->pAppDispat->DoDeactivate_Impl( true, NULL );
// call derived application-exit
diff --git a/sfx2/source/appl/appreg.cxx b/sfx2/source/appl/appreg.cxx
index 7c1cde6..a53f987 100644
--- a/sfx2/source/appl/appreg.cxx
+++ b/sfx2/source/appl/appreg.cxx
@@ -53,11 +53,11 @@ void SfxApplication::Registrations_Impl()
// ChildWindows
SfxRecordingFloatWrapper_Impl::RegisterChildWindow();
- SfxNavigatorWrapper::RegisterChildWindow( sal_False, NULL, SFX_CHILDWIN_NEVERHIDE );
+ SfxNavigatorWrapper::RegisterChildWindow( false, NULL, SFX_CHILDWIN_NEVERHIDE );
SfxPartChildWnd_Impl::RegisterChildWindow();
- SfxTemplateDialogWrapper::RegisterChildWindow(sal_True);
+ SfxTemplateDialogWrapper::RegisterChildWindow(true);
SfxDockingWrapper::RegisterChildWindow();
- SfxInfoBarContainerChild::RegisterChildWindow( sal_True, NULL, SFX_CHILDWIN_NEVERHIDE );
+ SfxInfoBarContainerChild::RegisterChildWindow( true, NULL, SFX_CHILDWIN_NEVERHIDE );
// Controller
SfxToolBoxControl::RegisterControl(SID_REPEAT);
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index e845ab9..53250ba 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -194,7 +194,7 @@ namespace
}
/// Find the correct location of the document (LICENSE.fodt, etc.), and return
/// it in rURL if found.
-static sal_Bool checkURL( const char *pName, const char *pExt, OUString &rURL )
+static bool checkURL( const char *pName, const char *pExt, OUString &rURL )
{
using namespace osl;
DirectoryItem aDirItem;
@@ -206,7 +206,7 @@ static sal_Bool checkURL( const char *pName, const char *pExt, OUString &rURL )
if (!rURL.isEmpty())
return DirectoryItem::get( rURL, aDirItem ) == DirectoryItem::E_None;
else
- return sal_False;
+ return false;
}
/// Displays CREDITS or LICENSE in any of the available version
@@ -312,16 +312,16 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
}
// block reentrant calls
- pAppData_Impl->bInQuit = sal_True;
+ pAppData_Impl->bInQuit = true;
Reference < XDesktop2 > xDesktop = Desktop::create ( ::comphelper::getProcessComponentContext() );
rReq.ForgetAllArgs();
// if terminate() failed, pAppData_Impl->bInQuit will now be sal_False, allowing further calls of SID_QUITAPP
- sal_Bool bTerminated = xDesktop->terminate();
+ bool bTerminated = xDesktop->terminate();
if (!bTerminated)
// if terminate() was successful, SfxApplication is now dead!
- pAppData_Impl->bInQuit = sal_False;
+ pAppData_Impl->bInQuit = false;
// Set return value, terminate if possible
rReq.SetReturnValue( SfxBoolItem( rReq.GetSlot(), bTerminated ) );
@@ -404,7 +404,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
}
while( true );
- sal_Bool bOk = ( n == 0);
+ bool bOk = ( n == 0);
rReq.SetReturnValue( SfxBoolItem( 0, bOk ) );
bDone = true;
break;
@@ -412,7 +412,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
case SID_SAVEDOCS:
{
- sal_Bool bOK = sal_True;
+ bool bOK = true;
for ( SfxObjectShell *pObjSh = SfxObjectShell::GetFirst();
pObjSh;
pObjSh = SfxObjectShell::GetNext( *pObjSh ) )
@@ -423,7 +423,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
pObjSh->ExecuteSlot( aReq );
SfxBoolItem *pItem = PTR_CAST( SfxBoolItem, aReq.GetReturnValue() );
if ( !pItem || !pItem->GetValue() )
- bOK = sal_False;
+ bOK = false;
}
}
@@ -666,7 +666,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
// Evaluate Parameter
OUString aToolbarName( aBuf.makeStringAndClear() );
- sal_Bool bShow( !xLayoutManager->isElementVisible( aToolbarName ));
+ bool bShow( !xLayoutManager->isElementVisible( aToolbarName ));
if ( bShow )
{
@@ -763,14 +763,14 @@ void SfxApplication::MiscState_Impl(SfxItemSet &rSet)
case SID_SAVEDOCS:
{
- sal_Bool bModified = sal_False;
+ bool bModified = false;
for ( SfxObjectShell *pObjSh = SfxObjectShell::GetFirst();
pObjSh;
pObjSh = SfxObjectShell::GetNext( *pObjSh ) )
{
if ( pObjSh->IsModified() )
{
- bModified = sal_True;
+ bModified = true;
break;
}
}
@@ -845,7 +845,7 @@ extern "C" void basicide_macro_organizer( sal_Int16 );
#endif
-OUString ChooseMacro( const Reference< XModel >& rxLimitToDocument, sal_Bool bChooseOnly, const OUString& rMacroDesc = OUString() )
+OUString ChooseMacro( const Reference< XModel >& rxLimitToDocument, bool bChooseOnly, const OUString& rMacroDesc = OUString() )
{
#ifndef DISABLE_DYNLOADING
// get basctl dllname
@@ -1128,15 +1128,15 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
{
const SfxItemSet* pArgs = rReq.GetArgs();
const SfxPoolItem* pItem;
- sal_Bool bChooseOnly = sal_False;
+ bool bChooseOnly = false;
Reference< XModel > xLimitToModel;
if(pArgs && SFX_ITEM_SET == pArgs->GetItemState(SID_RECORDMACRO, false, &pItem) )
{
- sal_Bool bRecord = ((SfxBoolItem*)pItem)->GetValue();
+ bool bRecord = ((SfxBoolItem*)pItem)->GetValue();
if ( bRecord )
{
// !Hack
- bChooseOnly = sal_False;
+ bChooseOnly = false;
SfxObjectShell* pCurrentShell = SfxObjectShell::Current();
OSL_ENSURE( pCurrentShell, "macro recording outside an SFX document?" );
if ( pCurrentShell )
@@ -1254,12 +1254,12 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
case SID_OFFICE_CHECK_PLZ:
{
- sal_Bool bRet = sal_False;
+ bool bRet = false;
SFX_REQUEST_ARG(rReq, pStringItem, SfxStringItem, rReq.GetSlot(), false);
if ( pStringItem )
{
- bRet = sal_True /*!!!SfxIniManager::CheckPLZ( aPLZ )*/;
+ bRet = true /*!!!SfxIniManager::CheckPLZ( aPLZ )*/;
}
#ifndef DISABLE_SCRIPTING
else
@@ -1309,7 +1309,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
TransformItems( rReq.GetSlot(), *rReq.GetArgs(), aSeq );
Any aResult = xHelper->executeDispatch( xProv, aCmd, OUString(), 0, aSeq );
frame::DispatchResultEvent aEvent;
- sal_Bool bSuccess = (aResult >>= aEvent) &&
+ bool bSuccess = (aResult >>= aEvent) &&
(aEvent.State == frame::DispatchResultState::SUCCESS);
rReq.SetReturnValue( SfxBoolItem( rReq.GetSlot(), bSuccess ) );
}
@@ -1329,7 +1329,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
TransformItems( rReq.GetSlot(), *rReq.GetArgs(), aSeq );
Any aResult = xHelper->executeDispatch( xProv, aCmd, OUString(), 0, aSeq );
frame::DispatchResultEvent aEvent;
- sal_Bool bSuccess = (aResult >>= aEvent) &&
+ bool bSuccess = (aResult >>= aEvent) &&
(aEvent.State == frame::DispatchResultState::SUCCESS);
rReq.SetReturnValue( SfxBoolItem( rReq.GetSlot(), bSuccess ) );
}
diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index 9d8d210..d6278bf 100644
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.cxx
@@ -208,7 +208,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert
}
sal_uInt16 nWhich = rSet.GetPool()->GetWhich(nSlotId);
- sal_Bool bConvertTwips = ( rSet.GetPool()->GetMetric( nWhich ) == SFX_MAPUNIT_TWIP );
+ bool bConvertTwips = ( rSet.GetPool()->GetMetric( nWhich ) == SFX_MAPUNIT_TWIP );
pItem->SetWhich( nWhich );
sal_uInt16 nSubCount = pType->nAttribs;
@@ -327,7 +327,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert
}
sal_uInt16 nWhich = rSet.GetPool()->GetWhich(rArg.nSlotId);
- sal_Bool bConvertTwips = ( rSet.GetPool()->GetMetric( nWhich ) == SFX_MAPUNIT_TWIP );
+ bool bConvertTwips = ( rSet.GetPool()->GetMetric( nWhich ) == SFX_MAPUNIT_TWIP );
pItem->SetWhich( nWhich );
const SfxType* pType = rArg.pType;
sal_uInt16 nSubCount = pType->nAttribs;
@@ -361,14 +361,14 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert
else
{
// complex argument, could be passed in one struct
- sal_Bool bAsWholeItem = sal_False;
+ bool bAsWholeItem = false;
for ( sal_uInt16 n=0; n<nCount; n++ )
{
const beans::PropertyValue& rProp = pPropsVal[n];
OUString aName = rProp.Name;
if ( aName == OUString(rArg.pName, strlen(rArg.pName), RTL_TEXTENCODING_UTF8) )
{
- bAsWholeItem = sal_True;
+ bAsWholeItem = true;
#ifdef DBG_UTIL
++nFoundArgs;
#endif
@@ -391,7 +391,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert
// complex argument; collect sub items from argument array and reconstruct complex item
// only put item if at least one member was found and had the correct type
// (is this a good idea?! Should we ask for *all* members?)
- sal_Bool bRet = sal_False;
+ bool bRet = false;
for ( sal_uInt16 n=0; n<nCount; n++ )
{
const beans::PropertyValue& rProp = pPropsVal[n];
@@ -403,7 +403,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert
if ( rProp.Name.equalsAsciiL(aStr.getStr(), aStr.getLength()) )
{
// at least one member found ...
- bRet = sal_True;
+ bRet = true;
#ifdef DBG_UTIL
++nFoundArgs;
#endif
@@ -413,7 +413,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert
if (!pItem->PutValue( rProp.Value, nSubId ) )
{
// ... but it was not convertible
- bRet = sal_False;
+ bRet = false;
#ifdef DBG_UTIL
OStringBuffer aDbgStr("Property not convertible: ");
aDbgStr.append(rArg.pName);
@@ -454,7 +454,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert
else
if ( aName == sHidden )
{
- sal_Bool bVal = sal_False;
+ bool bVal = false;
if (rProp.Value >>= bVal)
rSet.Put( SfxBoolItem( SID_HIDDEN, bVal ) );
}
@@ -482,7 +482,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert
else if ( aName == sStatusInd )
{
Reference<task::XStatusIndicator> xVal;
- sal_Bool bOK = (rProp.Value >>= xVal);
+ bool bOK = (rProp.Value >>= xVal);
DBG_ASSERT( bOK, "invalid type for StatusIndicator" );
if (bOK && xVal.is())
rSet.Put( SfxUnoAnyItem( SID_PROGRESS_STATUSBAR_CONTROL, rProp.Value ) );
@@ -490,7 +490,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert
else if ( aName == sInteractionHdl )
{
Reference<task::XInteractionHandler> xVal;
- sal_Bool bOK = (rProp.Value >>= xVal);
+ bool bOK = (rProp.Value >>= xVal);
DBG_ASSERT( bOK, "invalid type for InteractionHandler" );
if (bOK && xVal.is())
rSet.Put( SfxUnoAnyItem( SID_INTERACTIONHANDLER, rProp.Value ) );
@@ -502,7 +502,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert
else if ( aName == sInputStream )
{
Reference< XInputStream > xVal;
- sal_Bool bOK = ((rProp.Value >>= xVal) && xVal.is());
+ bool bOK = ((rProp.Value >>= xVal) && xVal.is());
DBG_ASSERT( bOK, "invalid type for InputStream" );
if (bOK)
rSet.Put( SfxUnoAnyItem( SID_INPUTSTREAM, rProp.Value ) );
@@ -510,7 +510,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert
else if ( aName == sStream )
{
Reference< XInputStream > xVal;
- sal_Bool bOK = ((rProp.Value >>= xVal) && xVal.is());
+ bool bOK = ((rProp.Value >>= xVal) && xVal.is());
DBG_ASSERT( bOK, "invalid type for Stream" );
if (bOK)
rSet.Put( SfxUnoAnyItem( SID_STREAM, rProp.Value ) );
@@ -518,7 +518,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert
else if ( aName == sUCBContent )
{
Reference< XContent > xVal;
- sal_Bool bOK = ((rProp.Value >>= xVal) && xVal.is());
+ bool bOK = ((rProp.Value >>= xVal) && xVal.is());
DBG_ASSERT( bOK, "invalid type for UCBContent" );
if (bOK)
rSet.Put( SfxUnoAnyItem( SID_CONTENT, rProp.Value ) );
@@ -526,7 +526,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert
else if ( aName == sOutputStream )
{
Reference< XOutputStream > xVal;
- sal_Bool bOK = ((rProp.Value >>= xVal) && xVal.is());
+ bool bOK = ((rProp.Value >>= xVal) && xVal.is());
DBG_ASSERT( bOK, "invalid type for OutputStream" );
if (bOK)
rSet.Put( SfxUnoAnyItem( SID_OUTPUTSTREAM, rProp.Value ) );
@@ -534,7 +534,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert
else if ( aName == sPostData )
{
Reference< XInputStream > xVal;
- sal_Bool bOK = (rProp.Value >>= xVal);
+ bool bOK = (rProp.Value >>= xVal);
DBG_ASSERT( bOK, "invalid type for PostData" );
if (bOK)
rSet.Put( SfxUnoAnyItem( SID_POSTDATA, rProp.Value ) );
@@ -542,31 +542,31 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert
else if ( aName == sFrame )
{
Reference< XFrame > xFrame;
- sal_Bool bOK = (rProp.Value >>= xFrame);
+ bool bOK = (rProp.Value >>= xFrame);
DBG_ASSERT( bOK, "invalid type for Frame" );
if (bOK)
rSet.Put( SfxUnoFrameItem( SID_FILLFRAME, xFrame ) );
}
else if ( aName == sAsTemplate )
{
- sal_Bool bVal = sal_False;
- sal_Bool bOK = (rProp.Value >>= bVal);
+ bool bVal = false;
+ bool bOK = (rProp.Value >>= bVal);
DBG_ASSERT( bOK, "invalid type for AsTemplate" );
if (bOK)
rSet.Put( SfxBoolItem( SID_TEMPLATE, bVal ) );
}
else if ( aName == sOpenNewView )
{
- sal_Bool bVal = sal_False;
- sal_Bool bOK = (rProp.Value >>= bVal);
+ bool bVal = false;
+ bool bOK = (rProp.Value >>= bVal);
DBG_ASSERT( bOK, "invalid type for OpenNewView" );
if (bOK)
rSet.Put( SfxBoolItem( SID_OPEN_NEW_VIEW, bVal ) );
}
else if ( aName == sFailOnWarning )
{
- sal_Bool bVal = sal_False;
- sal_Bool bOK = (rProp.Value >>= bVal);
+ bool bVal = false;
+ bool bOK = (rProp.Value >>= bVal);
DBG_ASSERT( bOK, "invalid type for FailOnWarning" );
if (bOK)
rSet.Put( SfxBoolItem( SID_FAIL_ON_WARNING, bVal ) );
@@ -574,7 +574,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert
else if ( aName == sViewId )
{
sal_Int16 nVal = -1;
- sal_Bool bOK = ((rProp.Value >>= nVal) && (nVal != -1));
+ bool bOK = ((rProp.Value >>= nVal) && (nVal != -1));
DBG_ASSERT( bOK, "invalid type for ViewId" );
if (bOK)
rSet.Put( SfxUInt16Item( SID_VIEW_ID, nVal ) );
@@ -582,95 +582,95 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert
else if ( aName == sPluginMode )
{
sal_Int16 nVal = -1;
- sal_Bool bOK = ((rProp.Value >>= nVal) && (nVal != -1));
+ bool bOK = ((rProp.Value >>= nVal) && (nVal != -1));
DBG_ASSERT( bOK, "invalid type for PluginMode" );
if (bOK)
rSet.Put( SfxUInt16Item( SID_PLUGIN_MODE, nVal ) );
}
else if ( aName == sReadOnly )
{
- sal_Bool bVal = sal_False;
- sal_Bool bOK = (rProp.Value >>= bVal);
+ bool bVal = false;
+ bool bOK = (rProp.Value >>= bVal);
DBG_ASSERT( bOK, "invalid type for ReadOnly" );
if (bOK)
rSet.Put( SfxBoolItem( SID_DOC_READONLY, bVal ) );
}
else if ( aName == sDdeReconnect )
{
- sal_Bool bVal = sal_True;
- sal_Bool bOK = (rProp.Value >>= bVal);
+ bool bVal = true;
+ bool bOK = (rProp.Value >>= bVal);
DBG_ASSERT( bOK, "invalid type for DDEReconnect" );
if (bOK)
rSet.Put( SfxBoolItem( SID_DDE_RECONNECT_ONLOAD, bVal ) );
}
else if ( aName == sStartPresentation )
{
- sal_Bool bVal = sal_False;
- sal_Bool bOK = (rProp.Value >>= bVal);
+ bool bVal = false;
+ bool bOK = (rProp.Value >>= bVal);
DBG_ASSERT( bOK, "invalid type for StartPresentation" );
if (bOK)
rSet.Put( SfxBoolItem( SID_DOC_STARTPRESENTATION, bVal ) );
}
else if ( aName == sSelectionOnly )
{
- sal_Bool bVal = sal_False;
- sal_Bool bOK = (rProp.Value >>= bVal);
+ bool bVal = false;
+ bool bOK = (rProp.Value >>= bVal);
DBG_ASSERT( bOK, "invalid type for SelectionOnly" );
if (bOK)
rSet.Put( SfxBoolItem( SID_SELECTION, bVal ) );
}
else if ( aName == sHidden )
{
- sal_Bool bVal = sal_False;
- sal_Bool bOK = (rProp.Value >>= bVal);
+ bool bVal = false;
+ bool bOK = (rProp.Value >>= bVal);
DBG_ASSERT( bOK, "invalid type for Hidden" );
if (bOK)
rSet.Put( SfxBoolItem( SID_HIDDEN, bVal ) );
}
else if ( aName == sMinimized )
{
- sal_Bool bVal = sal_False;
- sal_Bool bOK = (rProp.Value >>= bVal);
+ bool bVal = false;
+ bool bOK = (rProp.Value >>= bVal);
DBG_ASSERT( bOK, "invalid type for Minimized" );
if (bOK)
rSet.Put( SfxBoolItem( SID_MINIMIZED, bVal ) );
}
else if ( aName == sSilent )
{
- sal_Bool bVal = sal_False;
- sal_Bool bOK = (rProp.Value >>= bVal);
+ bool bVal = false;
+ bool bOK = (rProp.Value >>= bVal);
DBG_ASSERT( bOK, "invalid type for Silent" );
if (bOK)
rSet.Put( SfxBoolItem( SID_SILENT, bVal ) );
}
else if ( aName == sPreview )
{
- sal_Bool bVal = sal_False;
- sal_Bool bOK = (rProp.Value >>= bVal);
+ bool bVal = false;
+ bool bOK = (rProp.Value >>= bVal);
DBG_ASSERT( bOK, "invalid type for Preview" );
if (bOK)
rSet.Put( SfxBoolItem( SID_PREVIEW, bVal ) );
}
else if ( aName == sViewOnly )
{
- sal_Bool bVal = sal_False;
- sal_Bool bOK = (rProp.Value >>= bVal);
+ bool bVal = false;
+ bool bOK = (rProp.Value >>= bVal);
DBG_ASSERT( bOK, "invalid type for ViewOnly" );
if (bOK)
rSet.Put( SfxBoolItem( SID_VIEWONLY, bVal ) );
}
else if ( aName == sDontEdit )
{
- sal_Bool bVal = sal_False;
- sal_Bool bOK = (rProp.Value >>= bVal);
+ bool bVal = false;
+ bool bOK = (rProp.Value >>= bVal);
DBG_ASSERT( bOK, "invalid type for ViewOnly" );
if (bOK)
rSet.Put( SfxBoolItem( SID_EDITDOC, !bVal ) );
}
else if ( aName == sUseSystemDialog )
{
- sal_Bool bVal = sal_False;
- sal_Bool bOK = (rProp.Value >>= bVal);
+ bool bVal = false;
+ bool bOK = (rProp.Value >>= bVal);
DBG_ASSERT( bOK, "invalid type for ViewOnly" );
if (bOK)
rSet.Put( SfxBoolItem( SID_FILE_DIALOG, bVal ) );
@@ -678,7 +678,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert
else if ( aName == sStandardDir )
{
OUString sVal;
- sal_Bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty());
+ bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty());
DBG_ASSERT( bOK, "invalid type or value for StandardDir" );
if (bOK)
rSet.Put( SfxStringItem( SID_STANDARD_DIR, sVal ) );
@@ -686,7 +686,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert
else if ( aName == sBlackList )
{
uno::Sequence<OUString> xVal;
- sal_Bool bOK = (rProp.Value >>= xVal);
+ bool bOK = (rProp.Value >>= xVal);
DBG_ASSERT( bOK, "invalid type or value for BlackList" );
if (bOK)
{
@@ -698,7 +698,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert
else if ( aName == sFileName )
{
OUString sVal;
- sal_Bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty());
+ bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty());
DBG_ASSERT( bOK, "invalid type or value for FileName" );
if (bOK)
rSet.Put( SfxStringItem( SID_FILE_NAME, sVal ) );
@@ -706,7 +706,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert
else if ( aName == sSalvagedFile )
{
OUString sVal;
- sal_Bool bOK = (rProp.Value >>= sVal);
+ bool bOK = (rProp.Value >>= sVal);
DBG_ASSERT( bOK, "invalid type or value for SalvagedFile" );
if (bOK)
rSet.Put( SfxStringItem( SID_DOC_SALVAGE, sVal ) );
@@ -714,7 +714,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert
else if ( aName == sFolderName )
{
OUString sVal;
- sal_Bool bOK = (rProp.Value >>= sVal);
+ bool bOK = (rProp.Value >>= sVal);
DBG_ASSERT( bOK, "invalid type or value for FolderName" );
if (bOK)
rSet.Put( SfxStringItem( SID_PATH, sVal ) );
@@ -722,7 +722,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert
else if ( aName == sFrameName )
{
OUString sVal;
- sal_Bool bOK = (rProp.Value >>= sVal);
+ bool bOK = (rProp.Value >>= sVal);
DBG_ASSERT( bOK, "invalid type for FrameName" );
if (bOK && !sVal.isEmpty())
rSet.Put( SfxStringItem( SID_TARGETNAME, sVal ) );
@@ -730,7 +730,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert
else if ( aName == sMediaType )
{
OUString sVal;
- sal_Bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty());
+ bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty());
DBG_ASSERT( bOK, "invalid type or value for MediaType" );
if (bOK)
rSet.Put( SfxStringItem( SID_CONTENTTYPE, sVal ) );
@@ -738,7 +738,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert
else if ( aName == sTemplateName )
{
OUString sVal;
- sal_Bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty());
+ bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty());
DBG_ASSERT( bOK, "invalid type or value for TemplateName" );
if (bOK)
rSet.Put( SfxStringItem( SID_TEMPLATE_NAME, sVal ) );
@@ -746,7 +746,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert
else if ( aName == sTemplateRegionName )
{
OUString sVal;
- sal_Bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty());
+ bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty());
DBG_ASSERT( bOK, "invalid type or value for TemplateRegionName" );
if (bOK)
rSet.Put( SfxStringItem( SID_TEMPLATE_REGIONNAME, sVal ) );
@@ -754,7 +754,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert
else if ( aName == sJumpMark )
{
OUString sVal;
- sal_Bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty());
+ bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty());
DBG_ASSERT( bOK, "invalid type or value for JumpMark" );
if (bOK)
rSet.Put( SfxStringItem( SID_JUMPMARK, sVal ) );
@@ -762,7 +762,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert
else if ( aName == sCharacterSet )
{
OUString sVal;
- sal_Bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty());
+ bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty());
DBG_ASSERT( bOK, "invalid type or value for CharacterSet" );
if (bOK)
rSet.Put( SfxStringItem( SID_CHARSET, sVal ) );
@@ -770,7 +770,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert
else if ( aName == sFilterFlags )
{
OUString sVal;
- sal_Bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty());
+ bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty());
DBG_ASSERT( bOK, "invalid type or value for FilterFlags" );
if (bOK)
rSet.Put( SfxStringItem( SID_FILE_FILTEROPTIONS, sVal ) );
@@ -778,7 +778,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert
else if ( aName == sMacroExecMode )
{
sal_Int16 nVal =-1;
- sal_Bool bOK = ((rProp.Value >>= nVal) && (nVal != -1));
+ bool bOK = ((rProp.Value >>= nVal) && (nVal != -1));
DBG_ASSERT( bOK, "invalid type for MacroExecMode" );
if (bOK)
rSet.Put( SfxUInt16Item( SID_MACROEXECMODE, nVal ) );
@@ -786,15 +786,15 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert
else if ( aName == sUpdateDocMode )
{
sal_Int16 nVal =-1;
- sal_Bool bOK = ((rProp.Value >>= nVal) && (nVal != -1));
+ bool bOK = ((rProp.Value >>= nVal) && (nVal != -1));
DBG_ASSERT( bOK, "invalid type for UpdateDocMode" );
if (bOK)
rSet.Put( SfxUInt16Item( SID_UPDATEDOCMODE, nVal ) );
}
else if ( aName == sRepairPackage )
{
- sal_Bool bVal = sal_False;
- sal_Bool bOK = (rProp.Value >>= bVal);
+ bool bVal = false;
+ bool bOK = (rProp.Value >>= bVal);
DBG_ASSERT( bOK, "invalid type for RepairPackage" );
if (bOK)
rSet.Put( SfxBoolItem( SID_REPAIRPACKAGE, bVal ) );
@@ -802,7 +802,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert
else if ( aName == sDocumentTitle )
{
OUString sVal;
- sal_Bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty());
+ bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty());
DBG_ASSERT( bOK, "invalid type or value for DocumentTitle" );
if (bOK)
rSet.Put( SfxStringItem( SID_DOCINFO_TITLE, sVal ) );
@@ -811,7 +811,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert
{
OUString sVal;
// the base url can be set to empty ( for embedded objects for example )
- sal_Bool bOK = (rProp.Value >>= sVal);
+ bool bOK = (rProp.Value >>= sVal);
DBG_ASSERT( bOK, "invalid type or value for DocumentBaseURL" );
if (bOK)
rSet.Put( SfxStringItem( SID_DOC_BASEURL, sVal ) );
@@ -819,23 +819,23 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert
else if ( aName == sHierarchicalDocumentName )
{
OUString sVal;
- sal_Bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty());
+ bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty());
DBG_ASSERT( bOK, "invalid type or value for HierarchicalDocumentName" );
if (bOK)
rSet.Put( SfxStringItem( SID_DOC_HIERARCHICALNAME, sVal ) );
}
else if ( aName == sCopyStreamIfPossible )
{
- sal_Bool bVal = sal_False;
- sal_Bool bOK = (rProp.Value >>= bVal);
+ bool bVal = false;
+ bool bOK = (rProp.Value >>= bVal);
DBG_ASSERT( bOK, "invalid type for CopyStreamIfPossible" );
if (bOK)
rSet.Put( SfxBoolItem( SID_COPY_STREAM_IF_POSSIBLE, bVal ) );
}
else if ( aName == sNoAutoSave )
{
- sal_Bool bVal = sal_False;
- sal_Bool bOK = (rProp.Value >>= bVal);
+ bool bVal = false;
+ bool bOK = (rProp.Value >>= bVal);
DBG_ASSERT( bOK, "invalid type for NoAutoSave" );
if (bOK)
rSet.Put( SfxBoolItem( SID_NOAUTOSAVE, bVal ) );
@@ -851,7 +851,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert
else if ( aName == sSuggestedSaveAsDir )
{
OUString sVal;
- sal_Bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty());
+ bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty());
DBG_ASSERT( bOK, "invalid type or value for SuggestedSaveAsDir" );
if (bOK)
rSet.Put( SfxStringItem( SID_SUGGESTEDSAVEASDIR, sVal ) );
@@ -859,7 +859,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert
else if ( aName == sSuggestedSaveAsName )
{
OUString sVal;
- sal_Bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty());
+ bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty());
DBG_ASSERT( bOK, "invalid type or value for SuggestedSaveAsName" );
if (bOK)
rSet.Put( SfxStringItem( SID_SUGGESTEDSAVEASNAME, sVal ) );
@@ -1280,7 +1280,7 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, uno::Sequence<b
{
// slot is a property
sal_uInt16 nWhich = rSet.GetPool()->GetWhich(nSlotId);
- sal_Bool bConvertTwips = ( rSet.GetPool()->GetMetric( nWhich ) == SFX_MAPUNIT_TWIP );
+ bool bConvertTwips = ( rSet.GetPool()->GetMetric( nWhich ) == SFX_MAPUNIT_TWIP );
SFX_ITEMSET_ARG( &rSet, pItem, SfxPoolItem, nWhich, false );
if ( pItem ) //???
{
@@ -1332,7 +1332,7 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, uno::Sequence<b
{
const SfxFormalArgument &rArg = pSlot->GetFormalArgument( nArg );
sal_uInt16 nWhich = rSet.GetPool()->GetWhich( rArg.nSlotId );
- sal_Bool bConvertTwips = ( rSet.GetPool()->GetMetric( nWhich ) == SFX_MAPUNIT_TWIP );
+ bool bConvertTwips = ( rSet.GetPool()->GetMetric( nWhich ) == SFX_MAPUNIT_TWIP );
SFX_ITEMSET_ARG( &rSet, pItem, SfxPoolItem, nWhich, false );
if ( pItem ) //???
{
@@ -1521,17 +1521,17 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, uno::Sequence<b
if ( rSet.GetItemState( SID_VIEWONLY, false, &pItem ) == SFX_ITEM_SET )
{
pValue[nActProp].Name = OUString(sViewOnly);
- pValue[nActProp++].Value <<= (sal_Bool) (( ((SfxBoolItem*)pItem)->GetValue() ));
+ pValue[nActProp++].Value <<= ((SfxBoolItem*)pItem)->GetValue() ;
}
if ( rSet.GetItemState( SID_EDITDOC, false, &pItem ) == SFX_ITEM_SET )
{
pValue[nActProp].Name = OUString(sDontEdit);
- pValue[nActProp++].Value <<= (sal_Bool) (!( ((SfxBoolItem*)pItem)->GetValue() ));
+ pValue[nActProp++].Value <<= !( ((SfxBoolItem*)pItem)->GetValue() );
}
if ( rSet.GetItemState( SID_FILE_DIALOG, false, &pItem ) == SFX_ITEM_SET )
{
pValue[nActProp].Name = OUString(sUseSystemDialog);
- pValue[nActProp++].Value <<= (sal_Bool) ( ((SfxBoolItem*)pItem)->GetValue() );
+ pValue[nActProp++].Value <<= ((SfxBoolItem*)pItem)->GetValue();
}
if ( rSet.GetItemState( SID_STANDARD_DIR, false, &pItem ) == SFX_ITEM_SET )
{
@@ -1721,7 +1721,7 @@ class RequestPackageReparation_Impl : public ::cppu::WeakImplHelper1< task::XInt
public:
RequestPackageReparation_Impl( const OUString& aName );
- sal_Bool isApproved();
+ bool isApproved();
virtual uno::Any SAL_CALL getRequest() throw( uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual uno::Sequence< uno::Reference< task::XInteractionContinuation > > SAL_CALL getContinuations()
throw( uno::RuntimeException, std::exception ) SAL_OVERRIDE;
@@ -1742,7 +1742,7 @@ RequestPackageReparation_Impl::RequestPackageReparation_Impl( const OUString& aN
m_lContinuations[1] = uno::Reference< task::XInteractionContinuation >( m_pDisapprove );
}
-sal_Bool RequestPackageReparation_Impl::isApproved()
+bool RequestPackageReparation_Impl::isApproved()
{
return m_pApprove->wasSelected();
}
diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx
index b6f5c01..85d4d68 100644
--- a/sfx2/source/appl/childwin.cxx
+++ b/sfx2/source/appl/childwin.cxx
@@ -47,7 +47,7 @@ struct SfxChildWindow_Impl
::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > xListener;
SfxChildWinFactory* pFact;
bool bHideNotDelete;
- sal_Bool bVisible;
+ bool bVisible;
bool bHideAtToggle;
bool bWantsFocus;
SfxModule* pContextModule;
@@ -154,7 +154,7 @@ SfxChildWindow::SfxChildWindow(Window *pParentWindow, sal_uInt16 nId)
pImp->bHideNotDelete = false;
pImp->bHideAtToggle = false;
pImp->bWantsFocus = true;
- pImp->bVisible = sal_True;
+ pImp->bVisible = true;
pImp->pContextModule = NULL;
pImp->pWorkWin = NULL;
@@ -632,12 +632,12 @@ bool SfxChildWinInfo::GetExtraData_Impl
return false;
}
-sal_Bool SfxChildWindow::IsVisible() const
+bool SfxChildWindow::IsVisible() const
{
return pImp->bVisible;
}
-void SfxChildWindow::SetVisible_Impl( sal_Bool bVis )
+void SfxChildWindow::SetVisible_Impl( bool bVis )
{
pImp->bVisible = bVis;
}
diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx
index 509b17b..b4a68bb 100644
--- a/sfx2/source/appl/fileobj.cxx
+++ b/sfx2/source/appl/fileobj.cxx
@@ -121,7 +121,7 @@ bool SvFileObject::GetData( ::com::sun::star::uno::Any & rData,
// If the native format is reqested, has to be reset at the
// end of the flag. Is solely in the sw/ndgrf.cxx used when
// the link is removed form GraphicNode.
- sal_Bool bOldNativFormat = bNativFormat;
+ bool bOldNativFormat = bNativFormat;
// If about to print, waiting for the data to be available
if( bGetSynchron )
@@ -137,7 +137,7 @@ bool SvFileObject::GetData( ::com::sun::star::uno::Any & rData,
Application::Reschedule();
xMed = xTmpMed;
- bClearMedium = sal_True;
+ bClearMedium = true;
}
}
@@ -202,7 +202,7 @@ bool SvFileObject::GetData( ::com::sun::star::uno::Any & rData,
if( xMed.Is() && !bSynchron && bClearMedium )
{
xMed.Clear();
- bClearMedium = sal_False;
+ bClearMedium = false;
}
}
}
@@ -263,11 +263,11 @@ bool SvFileObject::Connect( sfx2::SvBaseLink* pLink )
return true;
}
-sal_Bool SvFileObject::LoadFile_Impl()
+bool SvFileObject::LoadFile_Impl()
{
// We are still at Loading!!
if( bWaitForData || !bLoadAgain || xMed.Is() || pDownLoadData )
- return sal_False;
+ return false;
// at the moment on the current DocShell
xMed = new SfxMedium( sFileNm, sReferer, STREAM_STD_READ );
@@ -279,13 +279,13 @@ sal_Bool SvFileObject::LoadFile_Impl()
if( !bSynchron )
{
- bLoadAgain = bDataReady = bInNewData = sal_False;
- bWaitForData = sal_True;
+ bLoadAgain = bDataReady = bInNewData = false;
+ bWaitForData = true;
SfxMediumRef xTmpMed = xMed;
- bInCallDownLoad = sal_True;
+ bInCallDownLoad = true;
xMed->DownLoad( STATIC_LINK( this, SvFileObject, LoadGrfReady_Impl ) );
- bInCallDownLoad = sal_False;
+ bInCallDownLoad = false;
bClearMedium = !xMed.Is();
if( bClearMedium )
@@ -293,20 +293,20 @@ sal_Bool SvFileObject::LoadFile_Impl()
return bDataReady;
}
- bWaitForData = sal_True;
- bDataReady = bInNewData = sal_False;
+ bWaitForData = true;
+ bDataReady = bInNewData = false;
xMed->DownLoad();
bLoadAgain = !xMed->IsRemote();
- bWaitForData = sal_False;
+ bWaitForData = false;
// Graphic is finished, also send DataChanged of the Status change:
SendStateChg_Impl( xMed->GetInStream() && xMed->GetInStream()->GetError()
? sfx2::LinkManager::STATE_LOAD_ERROR : sfx2::LinkManager::STATE_LOAD_OK );
- return sal_True;
+ return true;
}
-sal_Bool SvFileObject::GetGraphic_Impl( Graphic& rGrf, SvStream* pStream )
+bool SvFileObject::GetGraphic_Impl( Graphic& rGrf, SvStream* pStream )
{
GraphicFilter& rGF = GraphicFilter::GetGraphicFilter();
@@ -348,8 +348,8 @@ sal_Bool SvFileObject::GetGraphic_Impl( Graphic& rGrf, SvStream* pStream )
if( !pDownLoadData->aGrf.GetContext() )
{
delete pDownLoadData, pDownLoadData = 0;
- bDataReady = sal_True;
- bWaitForData = sal_False;
+ bDataReady = true;
+ bWaitForData = false;
}
}
}
@@ -503,14 +503,14 @@ void SvFileObject::Edit( Window* pParent, sfx2::SvBaseLink* pLink, const Link& r
IMPL_STATIC_LINK( SvFileObject, LoadGrfReady_Impl, void*, EMPTYARG )
{
// When we come form here there it can not be an error no more.
- pThis->bLoadError = sal_False;
- pThis->bWaitForData = sal_False;
- pThis->bInCallDownLoad = sal_False;
+ pThis->bLoadError = false;
+ pThis->bWaitForData = false;
+ pThis->bInCallDownLoad = false;
if( !pThis->bInNewData && !pThis->bDataReady )
{
// Graphic is finished, also send DataChanged from Status change
- pThis->bDataReady = sal_True;
+ pThis->bDataReady = true;
pThis->SendStateChg_Impl( sfx2::LinkManager::STATE_LOAD_OK );
// and then send the data again
@@ -519,7 +519,7 @@ IMPL_STATIC_LINK( SvFileObject, LoadGrfReady_Impl, void*, EMPTYARG )
if( pThis->bDataReady )
{
- pThis->bLoadAgain = sal_True;
+ pThis->bLoadAgain = true;
if( pThis->xMed.Is() )
{
pThis->xMed->SetDoneLink( Link() );
@@ -614,8 +614,8 @@ void SvFileObject::CancelTransfers()
if( !bDataReady )
{
// Do not set-up again
- bLoadAgain = sal_False;
- bDataReady = bLoadError = bWaitForData = sal_True;
+ bLoadAgain = false;
+ bDataReady = bLoadError = bWaitForData = true;
SendStateChg_Impl( sfx2::LinkManager::STATE_LOAD_ABORT );
}
}
@@ -629,7 +629,7 @@ void SvFileObject::SendStateChg_Impl( sfx2::LinkManager::LinkState nState )
aAny <<= OUString::number( nState );
DataChanged( SotExchange::GetFormatName(
sfx2::LinkManager::RegisterStatusInfoId()), aAny );
- bStateChangeCalled = sal_True;
+ bStateChangeCalled = true;
}
}
diff --git a/sfx2/source/appl/fileobj.hxx b/sfx2/source/appl/fileobj.hxx
index 6a16080..3c491ed 100644
--- a/sfx2/source/appl/fileobj.hxx
+++ b/sfx2/source/appl/fileobj.hxx
@@ -39,19 +39,19 @@ class SvFileObject : public sfx2::SvLinkSource
sal_uInt8 nType;
- sal_Bool bLoadAgain : 1;
- sal_Bool bSynchron : 1;
- sal_Bool bLoadError : 1;
- sal_Bool bWaitForData : 1;
- sal_Bool bInNewData : 1;
- sal_Bool bDataReady : 1;
- sal_Bool bNativFormat : 1;
- sal_Bool bClearMedium : 1;
- sal_Bool bStateChangeCalled : 1;
- sal_Bool bInCallDownLoad : 1;
-
- sal_Bool GetGraphic_Impl( Graphic&, SvStream* pStream = 0 );
- sal_Bool LoadFile_Impl();
+ bool bLoadAgain : 1;
+ bool bSynchron : 1;
+ bool bLoadError : 1;
+ bool bWaitForData : 1;
+ bool bInNewData : 1;
+ bool bDataReady : 1;
+ bool bNativFormat : 1;
+ bool bClearMedium : 1;
+ bool bStateChangeCalled : 1;
+ bool bInCallDownLoad : 1;
+
+ bool GetGraphic_Impl( Graphic&, SvStream* pStream = 0 );
+ bool LoadFile_Impl();
void SendStateChg_Impl( sfx2::LinkManager::LinkState nState );
DECL_STATIC_LINK( SvFileObject, DelMedium_Impl, SfxMediumRef* );
diff --git a/sfx2/source/appl/helpdispatch.cxx b/sfx2/source/appl/helpdispatch.cxx
index f9fd4f7..5173c4e 100644
--- a/sfx2/source/appl/helpdispatch.cxx
+++ b/sfx2/source/appl/helpdispatch.cxx
@@ -58,7 +58,7 @@ void SAL_CALL HelpDispatch_Impl::dispatch(
DBG_ASSERT( m_xRealDispatch.is(), "invalid dispatch" );
// search for a keyword (dispatch from the basic ide)
- sal_Bool bHasKeyword = sal_False;
+ bool bHasKeyword = false;
OUString sKeyword;
const PropertyValue* pBegin = aArgs.getConstArray();
const PropertyValue* pEnd = pBegin + aArgs.getLength();
diff --git a/sfx2/source/appl/helpinterceptor.cxx b/sfx2/source/appl/helpinterceptor.cxx
index 44aef3b..fa81e54 100644
--- a/sfx2/source/appl/helpinterceptor.cxx
+++ b/sfx2/source/appl/helpinterceptor.cxx
@@ -36,7 +36,7 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::util;
using namespace ::com::sun::star::lang;
-extern void AppendConfigToken_Impl( OUString& rURL, sal_Bool bQuestionMark ); // sfxhelp.cxx
+extern void AppendConfigToken_Impl( OUString& rURL, bool bQuestionMark ); // sfxhelp.cxx
// class HelpInterceptor_Impl --------------------------------------------
@@ -118,12 +118,12 @@ void HelpInterceptor_Impl::setInterception( Reference< XFrame > xFrame )
-sal_Bool HelpInterceptor_Impl::HasHistoryPred() const
+bool HelpInterceptor_Impl::HasHistoryPred() const
{
return m_pHistory && ( m_nCurPos > 0 );
}
-sal_Bool HelpInterceptor_Impl::HasHistorySucc() const
+bool HelpInterceptor_Impl::HasHistorySucc() const
{
return m_pHistory && ( m_nCurPos < ( m_pHistory->size() - 1 ) );
}
@@ -143,7 +143,7 @@ Reference< XDispatch > SAL_CALL HelpInterceptor_Impl::queryDispatch(
if ( m_xSlaveDispatcher.is() )
xResult = m_xSlaveDispatcher->queryDispatch( aURL, aTargetFrameName, nSearchFlags );
- sal_Bool bHelpURL = aURL.Complete.toAsciiLowerCase().match("vnd.sun.star.help",0);
+ bool bHelpURL = aURL.Complete.toAsciiLowerCase().match("vnd.sun.star.help",0);
if ( bHelpURL )
{
@@ -234,7 +234,7 @@ Sequence< OUString > SAL_CALL HelpInterceptor_Impl::getInterceptedURLs()
void SAL_CALL HelpInterceptor_Impl::dispatch(
const URL& aURL, const Sequence< ::com::sun::star::beans::PropertyValue >& ) throw( RuntimeException, std::exception )
{
- sal_Bool bBack = ( OUString( ".uno:Backward" ) == aURL.Complete );
+ bool bBack = ( OUString( ".uno:Backward" ) == aURL.Complete );
if ( bBack || OUString( ".uno:Forward" ) == aURL.Complete )
{
if ( m_pHistory )
@@ -260,7 +260,7 @@ void SAL_CALL HelpInterceptor_Impl::dispatch(
{
HelpHistoryEntry_Impl* pEntry = m_pHistory->at( nPos );
if ( pEntry )
- m_pWindow->loadHelpContent(pEntry->aURL, sal_False); // false => dont add item to history again!
+ m_pWindow->loadHelpContent(pEntry->aURL, false); // false => dont add item to history again!
}
m_pWindow->UpdateToolbox();
diff --git a/sfx2/source/appl/helpinterceptor.hxx b/sfx2/source/appl/helpinterceptor.hxx
index da24e05..e34686e 100644
--- a/sfx2/source/appl/helpinterceptor.hxx
+++ b/sfx2/source/appl/helpinterceptor.hxx
@@ -81,8 +81,8 @@ public:
const com::sun::star::uno::Any& GetViewData()const {return m_aViewData;}
- sal_Bool HasHistoryPred() const; // is there a predecessor for the current in the history
- sal_Bool HasHistorySucc() const; // is there a successor for the current in the history
+ bool HasHistoryPred() const; // is there a predecessor for the current in the history
+ bool HasHistorySucc() const; // is there a successor for the current in the history
// XDispatchProvider
virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL
diff --git a/sfx2/source/appl/imestatuswindow.cxx b/sfx2/source/appl/imestatuswindow.cxx
index e3e60fe..d38b690 100644
--- a/sfx2/source/appl/imestatuswindow.cxx
+++ b/sfx2/source/appl/imestatuswindow.cxx
@@ -93,11 +93,8 @@ void ImeStatusWindow::init()
if (Application::CanToggleImeStatusWindow())
try
{
- sal_Bool bShow = sal_Bool();
- if (getConfig()->getPropertyValue(
- OUString(
- "ShowStatusWindow"))
- >>= bShow)
+ bool bShow;
+ if (getConfig()->getPropertyValue(OUString("ShowStatusWindow")) >>= bShow)
Application::ShowImeStatusWindow(bShow);
}
catch (css::uno::Exception &)
@@ -112,10 +109,8 @@ bool ImeStatusWindow::isShowing()
{
try
{
- sal_Bool bShow = sal_Bool();
- if (getConfig()->getPropertyValue(
- OUString("ShowStatusWindow"))
- >>= bShow)
+ bool bShow;
+ if (getConfig()->getPropertyValue(OUString("ShowStatusWindow")) >>= bShow)
return bShow;
}
catch (css::uno::Exception &)
@@ -134,7 +129,7 @@ void ImeStatusWindow::show(bool bShow)
css::uno::Reference< css::beans::XPropertySet > xConfig(getConfig());
xConfig->setPropertyValue(
OUString("ShowStatusWindow"),
- css::uno::makeAny(static_cast< sal_Bool >(bShow)));
+ css::uno::makeAny(bShow));
css::uno::Reference< css::util::XChangesBatch > xCommit(
xConfig, css::uno::UNO_QUERY);
// Degrade gracefully by not saving the settings permanently:
diff --git a/sfx2/source/appl/impldde.cxx b/sfx2/source/appl/impldde.cxx
index 3839d85..5d39bac 100644
--- a/sfx2/source/appl/impldde.cxx
+++ b/sfx2/source/appl/impldde.cxx
@@ -228,7 +228,7 @@ bool SvDDEObject::Connect( SvBaseLink * pSvLink )
// then the server is up, it just does not know the topic!
if( sTopic.equalsIgnoreAsciiCase( "SYSTEM" ) )
{
- sal_Bool bSysTopic;
+ bool bSysTopic;
{
DdeConnection aTmp(sServer, OUString("SYSTEM"));
bSysTopic = !aTmp.GetError();
@@ -314,7 +314,7 @@ void SvDDEObject::Edit( Window* pParent, sfx2::SvBaseLink* pBaseLink, const Link
}
}
-sal_Bool SvDDEObject::ImplHasOtherFormat( DdeTransaction& rReq )
+bool SvDDEObject::ImplHasOtherFormat( DdeTransaction& rReq )
{
sal_uInt16 nFmt = 0;
switch( rReq.GetFormat() )
@@ -400,7 +400,7 @@ IMPL_LINK( SvDDEObject, ImplGetDDEData, DdeData*, pData )
IMPL_LINK( SvDDEObject, ImplDoneDDEData, void*, pData )
{
- sal_Bool bValid = (sal_Bool)(sal_uIntPtr)pData;
+ bool bValid = (sal_Bool)(sal_uIntPtr)pData;
if( !bValid && ( pRequest || pLink ))
{
DdeTransaction* pReq = 0;
diff --git a/sfx2/source/appl/impldde.hxx b/sfx2/source/appl/impldde.hxx
index 354ac95..53810ab 100644
--- a/sfx2/source/appl/impldde.hxx
+++ b/sfx2/source/appl/impldde.hxx
@@ -44,7 +44,7 @@ class SvDDEObject : public SvLinkSource
sal_uInt8 nError : 7; // Error code for dialogue
- sal_Bool ImplHasOtherFormat( DdeTransaction& );
+ bool ImplHasOtherFormat( DdeTransaction& );
DECL_LINK( ImplGetDDEData, DdeData* );
DECL_LINK( ImplDoneDDEData, void* );
diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx
index d61c2f1..2916713 100644
--- a/sfx2/source/appl/linkmgr2.cxx
+++ b/sfx2/source/appl/linkmgr2.cxx
@@ -573,7 +573,7 @@ bool SvxInternalLink::Connect( sfx2::SvBaseLink* pLink )
TypeId aType( TYPE(SfxObjectShell) );
- sal_Bool bFirst = sal_True;
+ bool bFirst = true;
SfxObjectShell* pShell = pLinkMgr->GetPersist();
if( pShell && pShell->GetMedium() )
{
@@ -587,7 +587,7 @@ bool SvxInternalLink::Connect( sfx2::SvBaseLink* pLink )
if ( !pShell )
{
- bFirst = sal_False;
+ bFirst = false;
pShell = SfxObjectShell::GetFirst( &aType, false );
}
@@ -610,7 +610,7 @@ bool SvxInternalLink::Connect( sfx2::SvBaseLink* pLink )
if( bFirst )
{
- bFirst = sal_False;
+ bFirst = false;
pShell = SfxObjectShell::GetFirst( &aType, false );
}
else
diff --git a/sfx2/source/appl/linksrc.cxx b/sfx2/source/appl/linksrc.cxx
index 3271237..5c3e98c 100644
--- a/sfx2/source/appl/linksrc.cxx
+++ b/sfx2/source/appl/linksrc.cxx
@@ -72,16 +72,16 @@ struct SvLinkSource_Entry_Impl
SvBaseLinkRef xSink;
OUString aDataMimeType;
sal_uInt16 nAdviseModes;
- sal_Bool bIsDataSink;
+ bool bIsDataSink;
SvLinkSource_Entry_Impl( SvBaseLink* pLink, const OUString& rMimeType,
sal_uInt16 nAdvMode )
: xSink( pLink ), aDataMimeType( rMimeType ),
- nAdviseModes( nAdvMode ), bIsDataSink( sal_True )
+ nAdviseModes( nAdvMode ), bIsDataSink( true )
{}
SvLinkSource_Entry_Impl( SvBaseLink* pLink )
- : xSink( pLink ), nAdviseModes( 0 ), bIsDataSink( sal_False )
+ : xSink( pLink ), nAdviseModes( 0 ), bIsDataSink( false )
{}
~SvLinkSource_Entry_Impl();
@@ -122,7 +122,7 @@ public:
SvLinkSource_Entry_Impl* Curr()
{ return nPos < aArr.size() ? aArr[ nPos ] : 0; }
SvLinkSource_Entry_Impl* Next();
- sal_Bool IsValidCurrValue( SvLinkSource_Entry_Impl* pEntry );
+ bool IsValidCurrValue( SvLinkSource_Entry_Impl* pEntry );
};
SvLinkSource_EntryIter_Impl::SvLinkSource_EntryIter_Impl(
@@ -135,7 +135,7 @@ SvLinkSource_EntryIter_Impl::~SvLinkSource_EntryIter_Impl()
aArr.clear();
}
-sal_Bool SvLinkSource_EntryIter_Impl::IsValidCurrValue( SvLinkSource_Entry_Impl* pEntry )
+bool SvLinkSource_EntryIter_Impl::IsValidCurrValue( SvLinkSource_Entry_Impl* pEntry )
{
return ( nPos < aArr.size() && aArr[nPos] == pEntry
&& std::find( rOrigArr.begin(), rOrigArr.end(), pEntry ) != rOrigArr.end() );
@@ -176,7 +176,7 @@ struct SvLinkSource_Impl
sal_uIntPtr nTimeout;
css::uno::Reference<css::io::XInputStream>
m_xInputStreamToLoadFrom;
- sal_Bool m_bIsReadOnly;
+ bool m_bIsReadOnly;
SvLinkSource_Impl()
: pTimer(0)
diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx
index 75a8c3e..ac85991 100644
--- a/sfx2/source/appl/lnkbase2.cxx
+++ b/sfx2/source/appl/lnkbase2.cxx
@@ -71,7 +71,7 @@ struct ImplBaseLinkData
// applies for all links
sal_uIntPtr nCntntType; // Update Format
// Not Ole-Links
- sal_Bool bIntrnlLnk; // It is an internal link
+ bool bIntrnlLnk; // It is an internal link
sal_uInt16 nUpdateMode; // UpdateMode
};
@@ -87,7 +87,7 @@ struct ImplBaseLinkData
ImplBaseLinkData()
{
ClientType.nCntntType = 0;
- ClientType.bIntrnlLnk = sal_False;
+ ClientType.bIntrnlLnk = false;
ClientType.nUpdateMode = 0;
DDEType.pItem = NULL;
}
@@ -99,12 +99,12 @@ class ImplDdeItem : public DdeGetPutItem
SvBaseLink* pLink;
DdeData aData;
Sequence< sal_Int8 > aSeq; // Datacontainer for DdeData !!!
- sal_Bool bIsValidData : 1;
- sal_Bool bIsInDTOR : 1;
+ bool bIsValidData : 1;
+ bool bIsInDTOR : 1;
public:
ImplDdeItem( SvBaseLink& rLink, const OUString& rStr )
- : DdeGetPutItem( rStr ), pLink( &rLink ), bIsValidData( sal_False ),
- bIsInDTOR( sal_False )
+ : DdeGetPutItem( rStr ), pLink( &rLink ), bIsValidData( false ),
+ bIsInDTOR( false )
{}
virtual ~ImplDdeItem();
@@ -114,11 +114,11 @@ public:
void Notify()
{
- bIsValidData = sal_False;
+ bIsValidData = false;
DdeGetPutItem::NotifyClient();
}
- sal_Bool IsInDTOR() const { return bIsInDTOR; }
+ bool IsInDTOR() const { return bIsInDTOR; }
};
@@ -147,7 +147,7 @@ SvBaseLink::SvBaseLink( sal_uInt16 nUpdateMode, sal_uIntPtr nContentType )
// It it going to be a Ole-Link,
pImplData->ClientType.nUpdateMode = nUpdateMode;
pImplData->ClientType.nCntntType = nContentType;
- pImplData->ClientType.bIntrnlLnk = sal_False;
+ pImplData->ClientType.bIntrnlLnk = false;
}
@@ -367,12 +367,12 @@ void SvBaseLink::_GetRealObject( bool bConnect)
nObjType = OBJECT_INTERN;
xObj = pImpl->m_pLinkMgr->CreateObj( this );
- pImplData->ClientType.bIntrnlLnk = sal_True;
+ pImplData->ClientType.bIntrnlLnk = true;
nObjType = OBJECT_CLIENT_DDE; // so we know what it once was!
}
else
{
- pImplData->ClientType.bIntrnlLnk = sal_False;
+ pImplData->ClientType.bIntrnlLnk = false;
xObj = pImpl->m_pLinkMgr->CreateObj( this );
}
}
@@ -536,7 +536,7 @@ FileDialogHelper & SvBaseLink::GetInsertFileDialog(const OUString& rFactory) con
ImplDdeItem::~ImplDdeItem()
{
- bIsInDTOR = sal_True;
+ bIsInDTOR = true;
// So that no-one gets the idea to delete the pointer when Disconnecting!
SvBaseLinkRef aRef( pLink );
aRef->Disconnect();
@@ -558,13 +558,13 @@ DdeData* ImplDdeItem::Get( sal_uIntPtr nFormat )
{
aData = DdeData( (const char *)aSeq.getConstArray(), aSeq.getLength(), nFormat );
- bIsValidData = sal_True;
+ bIsValidData = true;
return &aData;
}
}
}
aSeq.realloc( 0 );
- bIsValidData = sal_False;
+ bIsValidData = false;
return 0;
}
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 03d7611..b54060d 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -174,7 +174,7 @@ namespace sfx2
{
- void HandleTaskPaneList( Window* pWindow, sal_Bool bAddToList )
+ void HandleTaskPaneList( Window* pWindow, bool bAddToList )
{
Window* pParent = pWindow->GetParent();
DBG_ASSERT( pParent, "HandleTaskPaneList(): every window here should have a parent" );
@@ -250,10 +250,10 @@ namespace sfx2
struct IndexEntry_Impl
{
- sal_Bool m_bSubEntry;
+ bool m_bSubEntry;
OUString m_aURL;
- IndexEntry_Impl( const OUString& rURL, sal_Bool bSubEntry ) :
+ IndexEntry_Impl( const OUString& rURL, bool bSubEntry ) :
m_bSubEntry( bSubEntry ), m_aURL( rURL ) {}
};
@@ -262,9 +262,9 @@ struct IndexEntry_Impl
struct ContentEntry_Impl
{
OUString aURL;
- sal_Bool bIsFolder;
+ bool bIsFolder;
- ContentEntry_Impl( const OUString& rURL, sal_Bool bFolder ) :
+ ContentEntry_Impl( const OUString& rURL, bool bFolder ) :
aURL( rURL ), bIsFolder( bFolder ) {}
};
@@ -328,7 +328,7 @@ void ContentListBox_Impl::InitRoot()
bool bIsFolder = ( '1' == cFolder );
SvTreeListEntry* pEntry = InsertEntry( aTitle, aOpenBookImage, aClosedBookImage, NULL, true );
if ( bIsFolder )
- pEntry->SetUserData( new ContentEntry_Impl( aURL, sal_True ) );
+ pEntry->SetUserData( new ContentEntry_Impl( aURL, true ) );
}
}
@@ -371,7 +371,7 @@ void ContentListBox_Impl::RequestingChildren( SvTreeListEntry* pParent )
if ( bIsFolder )
{
pEntry = InsertEntry( aTitle, aOpenBookImage, aClosedBookImage, pParent, true );
- pEntry->SetUserData( new ContentEntry_Impl( aURL, sal_True ) );
+ pEntry->SetUserData( new ContentEntry_Impl( aURL, true ) );
}
else
{
@@ -379,7 +379,7 @@ void ContentListBox_Impl::RequestingChildren( SvTreeListEntry* pParent )
Any aAny( ::utl::UCBContentHelper::GetProperty( aURL, OUString("TargetURL" ) ) );
OUString aTargetURL;
if ( aAny >>= aTargetURL )
- pEntry->SetUserData( new ContentEntry_Impl( aTargetURL, sal_False ) );
+ pEntry->SetUserData( new ContentEntry_Impl( aTargetURL, false ) );
}
}
}
@@ -611,7 +611,7 @@ void IndexTabPage_Impl::InitializeIndex()
{
OUStringBuffer aURL = HELP_URL;
aURL.append(sFactory);
- AppendConfigToken(aURL, sal_True);
+ AppendConfigToken(aURL, true);
Content aCnt( aURL.makeStringAndClear(), Reference< ::com::sun::star::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() );
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > xInfo = aCnt.getProperties();
@@ -635,7 +635,7 @@ void IndexTabPage_Impl::InitializeIndex()
if ( ( aAnySeq[0] >>= aKeywordList ) && ( aAnySeq[1] >>= aKeywordRefList ) &&
( aAnySeq[2] >>= aAnchorRefList ) && ( aAnySeq[3] >>= aTitleRefList ) )
{
- sal_Bool insert;
+ bool insert;
sal_uInt16 nPos;
int ndx,tmp;
OUString aIndex, aTempString;
@@ -804,9 +804,9 @@ void IndexTabPage_Impl::SetKeyword( const OUString& rKeyword )
-sal_Bool IndexTabPage_Impl::HasKeyword() const
+bool IndexTabPage_Impl::HasKeyword() const
{
- sal_Bool bRet = sal_False;
+ bool bRet = false;
if ( !sKeyword.isEmpty() )
{
sal_Int32 nPos = m_pIndexCB->GetEntryPos( sKeyword );
@@ -818,9 +818,9 @@ sal_Bool IndexTabPage_Impl::HasKeyword() const
-sal_Bool IndexTabPage_Impl::HasKeywordIgnoreCase()
+bool IndexTabPage_Impl::HasKeywordIgnoreCase()
{
- sal_Bool bRet = sal_False;
+ bool bRet = false;
if ( !sKeyword.isEmpty() )
{
sal_Int32 nEntries = m_pIndexCB->GetEntryCount();
@@ -832,7 +832,7 @@ sal_Bool IndexTabPage_Impl::HasKeywordIgnoreCase()
if (rI18nHelper.MatchString( sIndexItem, sKeyword ))
{
sKeyword = sIndexItem;
- bRet = sal_True;
+ bRet = true;
}
}
}
@@ -865,14 +865,14 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSearchBox(Window *pParent,
bool SearchBox_Impl::PreNotify( NotifyEvent& rNEvt )
{
- sal_Bool bHandled = sal_False;
+ bool bHandled = false;
if ( !IsInDropDown() &&
rNEvt.GetWindow() == GetSubEdit() &&
rNEvt.GetType() == EVENT_KEYINPUT &&
KEY_RETURN == rNEvt.GetKeyEvent()->GetKeyCode().GetCode() )
{
aSearchLink.Call( NULL );
- bHandled = sal_True;
+ bHandled = true;
}
return bHandled || ComboBox::PreNotify( rNEvt );
}
@@ -946,7 +946,7 @@ SearchTabPage_Impl::SearchTabPage_Impl(Window* pParent, SfxHelpIndexWindow_Impl*
Any aUserItem = aViewOpt.GetUserItem( USERITEM_NAME );
if ( aUserItem >>= aUserData )
{
- sal_Bool bChecked = ( 1 == aUserData.getToken(0, ';').toInt32() ) ? sal_True : sal_False;
+ bool bChecked = ( 1 == aUserData.getToken(0, ';').toInt32() ) ? sal_True : sal_False;
m_pFullWordsCB->Check( bChecked );
bChecked = ( 1 == aUserData.getToken(1, ';').toInt32() ) ? sal_True : sal_False;
m_pScopeCB->Check( bChecked );
@@ -1031,7 +1031,7 @@ IMPL_LINK_NOARG(SearchTabPage_Impl, SearchHdl)
if ( !m_pFullWordsCB->IsChecked() )
aSearchText = sfx2::PrepareSearchString( aSearchText, xBreakIterator, true );
aSearchURL.append(aSearchText);
- AppendConfigToken(aSearchURL, sal_False);
+ AppendConfigToken(aSearchURL, false);
if ( m_pScopeCB->IsChecked() )
aSearchURL.append("&Scope=Heading");
std::vector< OUString > aFactories = SfxContentHelper::GetResultSet(aSearchURL.makeStringAndClear());
@@ -1107,9 +1107,9 @@ void SearchTabPage_Impl::ClearPage()
-sal_Bool SearchTabPage_Impl::OpenKeyword( const OUString& rKeyword )
+bool SearchTabPage_Impl::OpenKeyword( const OUString& rKeyword )
{
- sal_Bool bRet = sal_False;
+ bool bRet = false;
m_pSearchED->SetText( rKeyword );
SearchHdl( NULL );
if ( m_pResultsLB->GetEntryCount() > 0 )
@@ -1117,7 +1117,7 @@ sal_Bool SearchTabPage_Impl::OpenKeyword( const OUString& rKeyword )
// found keyword -> open it
m_pResultsLB->SelectEntryPos(0);
OpenHdl( NULL );
- bRet = sal_True;
+ bRet = true;
}
return bRet;
@@ -1190,7 +1190,7 @@ void BookmarksBox_Impl::DoAction( sal_uInt16 nAction )
sal_Int32 nPos = GetSelectEntryPos();
if ( nPos != LISTBOX_ENTRY_NOTFOUND )
{
- SfxAddHelpBookmarkDialog_Impl aDlg( this, sal_True );
+ SfxAddHelpBookmarkDialog_Impl aDlg( this, true );
aDlg.SetTitle( GetEntry( nPos ) );
if ( aDlg.Execute() == RET_OK )
{
@@ -1337,7 +1337,7 @@ void BookmarksTabPage_Impl::AddBookmarks( const OUString& rTitle, const OUString
OUString SfxHelpWindow_Impl::buildHelpURL(const OUString& sFactory ,
const OUString& sContent ,
const OUString& sAnchor ,
- sal_Bool bUseQuestionMark)
+ bool bUseQuestionMark)
{
OUStringBuffer sHelpURL(256);
sHelpURL.append(HELP_URL);
@@ -1349,7 +1349,7 @@ OUString SfxHelpWindow_Impl::buildHelpURL(const OUString& sFactory ,
return sHelpURL.makeStringAndClear();
}
-void SfxHelpWindow_Impl::loadHelpContent(const OUString& sHelpURL, sal_Bool bAddToHistory)
+void SfxHelpWindow_Impl::loadHelpContent(const OUString& sHelpURL, bool bAddToHistory)
{
Reference< XComponentLoader > xLoader(getTextFrame(), UNO_QUERY);
if (!xLoader.is())
@@ -1372,7 +1372,7 @@ void SfxHelpWindow_Impl::loadHelpContent(const OUString& sHelpURL, sal_Bool bAdd
if ( !IsWait() )
EnterWait();
- sal_Bool bSuccess = sal_False;
+ bool bSuccess = false;
// TODO implement locale fallback ... see below while(true)
{
try
@@ -1380,7 +1380,7 @@ void SfxHelpWindow_Impl::loadHelpContent(const OUString& sHelpURL, sal_Bool bAdd
Reference< XComponent > xContent = xLoader->loadComponentFromURL(sHelpURL, "_self", 0, Sequence< PropertyValue >());
if (xContent.is())
{
- bSuccess = sal_True;
+ bSuccess = true;
}
}
catch(const RuntimeException&)
@@ -1461,7 +1461,7 @@ SfxHelpIndexWindow_Impl::~SfxHelpIndexWindow_Impl()
void SfxHelpIndexWindow_Impl::Initialize()
{
OUStringBuffer aHelpURL(HELP_URL);
- AppendConfigToken(aHelpURL, sal_True);
+ AppendConfigToken(aHelpURL, true);
std::vector<OUString> aFactories = SfxContentHelper::GetResultSet(aHelpURL.makeStringAndClear());
for (size_t i = 0, n = aFactories.size(); i < n; ++i )
{
@@ -1585,7 +1585,7 @@ IMPL_LINK_NOARG(SfxHelpIndexWindow_Impl, SelectFactoryHdl)
OUString* pFactory = (OUString*)(sal_uIntPtr)aActiveLB.GetEntryData( aActiveLB.GetSelectEntryPos() );
if ( pFactory )
{
- SetFactory( OUString( *pFactory ).toAsciiLowerCase(), sal_False );
+ SetFactory( OUString( *pFactory ).toAsciiLowerCase(), false );
aSelectFactoryLink.Call( this );
}
@@ -1597,7 +1597,7 @@ IMPL_LINK_NOARG(SfxHelpIndexWindow_Impl, SelectFactoryHdl)
IMPL_LINK_NOARG(SfxHelpIndexWindow_Impl, KeywordHdl)
{
// keyword found on index?
- sal_Bool bIndex = pIPage->HasKeyword();
+ bool bIndex = pIPage->HasKeyword();
if( !bIndex)
bIndex = pIPage->HasKeywordIgnoreCase();
@@ -1658,8 +1658,8 @@ bool SfxHelpIndexWindow_Impl::PreNotify( NotifyEvent& rNEvt )
sal_uInt16 nPageId = 0;
HelpTabPage_Impl* pCurPage = GetCurrentPage( nPageId );
Control* pControl = pCurPage->GetLastFocusControl();
- sal_Bool bShift = rKeyCode.IsShift();
- sal_Bool bCtrl = rKeyCode.IsMod1();
+ bool bShift = rKeyCode.IsShift();
+ bool bCtrl = rKeyCode.IsMod1();
if ( !bCtrl && bShift && aActiveLB.HasChildPathFocus() )
{
pControl->GrabFocus();
@@ -1722,7 +1722,7 @@ void SfxHelpIndexWindow_Impl::SetDoubleClickHdl( const Link& rLink )
-void SfxHelpIndexWindow_Impl::SetFactory( const OUString& rFactory, sal_Bool bActive )
+void SfxHelpIndexWindow_Impl::SetFactory( const OUString& rFactory, bool bActive )
{
if ( !rFactory.isEmpty() )
{
@@ -1811,9 +1811,9 @@ void SfxHelpIndexWindow_Impl::GrabFocusBack()
-sal_Bool SfxHelpIndexWindow_Impl::HasFocusOnEdit() const
+bool SfxHelpIndexWindow_Impl::HasFocusOnEdit() const
{
- sal_Bool bRet = sal_False;
+ bool bRet = false;
if ( aTabCtrl.GetCurPageId() == HELP_INDEX_PAGE_INDEX && pIPage )
bRet = pIPage->HasFocusOnEdit();
else if ( aTabCtrl.GetCurPageId() == HELP_INDEX_PAGE_SEARCH && pSPage )
@@ -1833,9 +1833,9 @@ OUString SfxHelpIndexWindow_Impl::GetSearchText() const
-sal_Bool SfxHelpIndexWindow_Impl::IsFullWordSearch() const
+bool SfxHelpIndexWindow_Impl::IsFullWordSearch() const
{
- sal_Bool bRet = sal_False;
+ bool bRet = false;
if ( aTabCtrl.GetCurPageId() == HELP_INDEX_PAGE_SEARCH && pSPage )
bRet = pSPage->IsFullWordSearch();
return bRet;
@@ -1900,10 +1900,10 @@ SfxHelpTextWindow_Impl::SfxHelpTextWindow_Impl( SfxHelpWindow_Impl* pParent ) :
pTextWin ( new TextWin_Impl( this ) ),
pSrchDlg ( NULL ),
nMinPos ( 0 ),
- bIsDebug ( sal_False ),
- bIsIndexOn ( sal_False ),
- bIsInClose ( sal_False ),
- bIsFullWordSearch ( sal_False )
+ bIsDebug ( false ),
+ bIsIndexOn ( false ),
+ bIsInClose ( false ),
+ bIsFullWordSearch ( false )
{
sfx2::AddToTaskPaneList( &aToolBox );
@@ -1942,7 +1942,7 @@ SfxHelpTextWindow_Impl::SfxHelpTextWindow_Impl( SfxHelpWindow_Impl* pParent ) :
char* pEnv = getenv( "help_debug" );
if ( pEnv )
- bIsDebug = sal_True;
+ bIsDebug = true;
SvtMiscOptions().AddListenerLink( LINK( this, SfxHelpTextWindow_Impl, NotifyHdl ) );
@@ -1956,17 +1956,17 @@ SfxHelpTextWindow_Impl::~SfxHelpTextWindow_Impl()
{
sfx2::RemoveFromTaskPaneList( &aToolBox );
- bIsInClose = sal_True;
+ bIsInClose = true;
SvtMiscOptions().RemoveListenerLink( LINK( this, SfxHelpTextWindow_Impl, NotifyHdl ) );
delete pSrchDlg;
}
-sal_Bool SfxHelpTextWindow_Impl::HasSelection() const
+bool SfxHelpTextWindow_Impl::HasSelection() const
{
// is there any selection in the text and not only a cursor?
- sal_Bool bRet = sal_False;
+ bool bRet = false;
Reference < XTextRange > xRange = getCursor();
if ( xRange.is() )
{
@@ -1982,7 +1982,7 @@ sal_Bool SfxHelpTextWindow_Impl::HasSelection() const
void SfxHelpTextWindow_Impl::InitToolBoxImages()
{
- sal_Bool bLarge = SvtMiscOptions().AreCurrentSymbolsLarge();
+ bool bLarge = SvtMiscOptions().AreCurrentSymbolsLarge();
aIndexOnImage = Image( SfxResId( bLarge ? IMG_HELP_TOOLBOX_L_INDEX_ON : IMG_HELP_TOOLBOX_INDEX_ON ) );
aIndexOffImage = Image( SfxResId( bLarge ? IMG_HELP_TOOLBOX_L_INDEX_OFF : IMG_HELP_TOOLBOX_INDEX_OFF ) );
@@ -2039,7 +2039,7 @@ void SfxHelpTextWindow_Impl::InitOnStartupBox( bool bOnlyText )
// 2) We read sal_True/sal_False => check box must be shown and enabled/disabled
bool bHideBox = true;
- sal_Bool bHelpAtStartup = sal_False;
+ bool bHelpAtStartup = false;
try
{
xConfiguration = ConfigurationHelper::openConfig(
@@ -2206,11 +2206,9 @@ IMPL_LINK_NOARG(SfxHelpTextWindow_Impl, SelectHdl)
{
// create descriptor, set string and find all words
Reference < XSearchDescriptor > xSrchDesc = xSearchable->createSearchDescriptor();
- xSrchDesc->setPropertyValue( "SearchRegularExpression",
- makeAny( sal_Bool( sal_True ) ) );
+ xSrchDesc->setPropertyValue( "SearchRegularExpression", makeAny( true ) );
if ( bIsFullWordSearch )
- xSrchDesc->setPropertyValue( "SearchWords",
- makeAny( sal_Bool( sal_True ) ) );
+ xSrchDesc->setPropertyValue( "SearchWords", makeAny( true ) );
OUString sSearchString = sfx2::PrepareSearchString( aSearchText, GetBreakIterator(), false );
xSrchDesc->setSearchString( sSearchString );
@@ -2267,9 +2265,9 @@ IMPL_LINK( SfxHelpTextWindow_Impl, FindHdl, sfx2::SearchDialog*, pDlg )
{
// create descriptor, set string and find all words
Reference < XSearchDescriptor > xSrchDesc = xSearchable->createSearchDescriptor();
- xSrchDesc->setPropertyValue( "SearchWords", makeAny( sal_Bool( pDlg->IsOnlyWholeWords() != false ) ) );
- xSrchDesc->setPropertyValue( "SearchCaseSensitive", makeAny( sal_Bool( pDlg->IsMarchCase() != false ) ) );
- xSrchDesc->setPropertyValue( "SearchBackwards", makeAny( sal_Bool( pDlg->IsSearchBackwards() != false ) ) );
+ xSrchDesc->setPropertyValue( "SearchWords", makeAny( pDlg->IsOnlyWholeWords() != false ) );
+ xSrchDesc->setPropertyValue( "SearchCaseSensitive", makeAny( pDlg->IsMarchCase() != false ) );
+ xSrchDesc->setPropertyValue( "SearchBackwards", makeAny( pDlg->IsSearchBackwards() != false ) );
xSrchDesc->setSearchString( sSearchText );
Reference< XInterface > xSelection;
Reference< XTextRange > xCursor = getCursor();
@@ -2346,7 +2344,7 @@ IMPL_LINK( SfxHelpTextWindow_Impl, CheckHdl, CheckBox*, pBox )
{
if ( xConfiguration.is() )
{
- sal_Bool bChecked = pBox->IsChecked();
+ bool bChecked = pBox->IsChecked();
OUString sPath( PATH_OFFICE_FACTORIES );
sPath += sCurrentFactory;
try
@@ -2448,7 +2446,7 @@ bool SfxHelpTextWindow_Impl::PreNotify( NotifyEvent& rNEvt )
Reference<XStatusListener>xStateListener = pStateListener =
new HelpStatusListener_Impl(xDisp, aURL );
FeatureStateEvent rEvent = pStateListener->GetStateEvent();
- sal_Bool bCheck = sal_False;
+ bool bCheck = false;
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list