[Libreoffice-commits] core.git: 8 commits - chart2/source cui/source dbaccess/source filter/source include/sfx2 include/svx sc/source sd/source sfx2/source starmath/source svx/source sw/source
Noel Grandin
noel at peralex.com
Thu Mar 13 22:51:59 PDT 2014
chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx | 2
cui/source/options/optgdlg.cxx | 2
cui/source/tabpages/tparea.cxx | 8
cui/source/tabpages/tpline.cxx | 8
dbaccess/source/core/dataaccess/ModelImpl.cxx | 10
dbaccess/source/core/dataaccess/ModelImpl.hxx | 6
dbaccess/source/filter/xml/xmlfilter.cxx | 2
filter/source/msfilter/msdffimp.cxx | 2
include/sfx2/app.hxx | 14
include/sfx2/bindings.hxx | 30 -
include/sfx2/brokenpackageint.hxx | 4
include/sfx2/chalign.hxx | 2
include/sfx2/controlwrapper.hxx | 6
include/sfx2/ctrlitem.hxx | 4
include/sfx2/dinfdlg.hxx | 36 -
include/sfx2/dispatch.hxx | 42 -
include/sfx2/docfac.hxx | 2
include/sfx2/docfile.hxx | 96 +--
include/sfx2/dockwin.hxx | 10
include/sfx2/docmacromode.hxx | 24
include/sfx2/doctempl.hxx | 28 -
include/sfx2/fcontnr.hxx | 10
include/sfx2/filedlghelper.hxx | 2
include/sfx2/frame.hxx | 46 -
include/sfx2/frmdescr.hxx | 66 +-
include/sfx2/frmhtml.hxx | 2
include/sfx2/frmhtmlw.hxx | 6
include/svx/unoapi.hxx | 6
include/svx/unomaster.hxx | 2
include/svx/unomod.hxx | 2
include/svx/unomodel.hxx | 12
include/svx/unoshape.hxx | 12
include/svx/verttexttbxctrl.hxx | 4
include/svx/view3d.hxx | 18
include/svx/viewpt3d.hxx | 6
include/svx/xbitmap.hxx | 8
include/svx/xbtmpit.hxx | 2
include/svx/xflbckit.hxx | 2
include/svx/xflbmsli.hxx | 2
include/svx/xflbmtit.hxx | 2
include/svx/xflbstit.hxx | 2
include/svx/xflftrit.hxx | 12
include/svx/xflgrit.hxx | 2
include/svx/xflhtit.hxx | 2
include/svx/xftmrit.hxx | 2
include/svx/xftouit.hxx | 2
include/svx/xit.hxx | 4
include/svx/xlndsit.hxx | 2
include/svx/xlnedcit.hxx | 2
include/svx/xlnstcit.hxx | 2
include/svx/xmleohlp.hxx | 18
include/svx/xmlgrhlp.hxx | 12
include/svx/xoutbmp.hxx | 4
include/svx/xpoly.hxx | 18
include/svx/xpool.hxx | 2
include/svx/xtextit0.hxx | 2
sc/source/core/tool/detfunc.cxx | 6
sc/source/ui/condformat/condformatdlgentry.cxx | 2
sc/source/ui/miscdlgs/instbdlg.cxx | 2
sc/source/ui/miscdlgs/linkarea.cxx | 2
sc/source/ui/unoobj/scdetect.cxx | 2
sc/source/ui/view/tabvwshc.cxx | 2
sc/source/ui/view/viewfun4.cxx | 2
sd/source/core/drawdoc3.cxx | 2
sd/source/core/drawdoc4.cxx | 2
sd/source/filter/xml/sdxmlwrp.cxx | 8
sd/source/ui/animations/motionpathtag.cxx | 6
sd/source/ui/app/sdmod1.cxx | 2
sd/source/ui/app/sdmod2.cxx | 2
sd/source/ui/dlg/dlgass.cxx | 4
sd/source/ui/dlg/navigatr.cxx | 4
sd/source/ui/docshell/docshel4.cxx | 6
sd/source/ui/docshell/docshell.cxx | 2
sd/source/ui/func/fucon3d.cxx | 4
sd/source/ui/func/fupage.cxx | 4
sd/source/ui/sidebar/MasterPageContainerProviders.cxx | 2
sd/source/ui/slideshow/slideshow.cxx | 4
sd/source/ui/slideshow/slideshowimpl.cxx | 4
sd/source/ui/table/tablefunction.cxx | 2
sd/source/ui/unoidl/sddetect.cxx | 4
sd/source/ui/unoidl/unoobj.cxx | 6
sd/source/ui/unoidl/unoobj.hxx | 2
sd/source/ui/view/drtxtob1.cxx | 16
sd/source/ui/view/drviews1.cxx | 12
sd/source/ui/view/drviews2.cxx | 6
sd/source/ui/view/drviews5.cxx | 2
sd/source/ui/view/drviewsf.cxx | 32 -
sd/source/ui/view/outlnvsh.cxx | 16
sd/source/ui/view/viewshe2.cxx | 2
sd/source/ui/view/viewshel.cxx | 6
sfx2/source/appl/app.cxx | 8
sfx2/source/appl/appcfg.cxx | 92 +--
sfx2/source/appl/appdde.cxx | 2
sfx2/source/appl/appdispatchprovider.cxx | 2
sfx2/source/appl/appinit.cxx | 2
sfx2/source/appl/appmisc.cxx | 2
sfx2/source/appl/appopen.cxx | 8
sfx2/source/appl/appquit.cxx | 10
sfx2/source/appl/appserv.cxx | 2
sfx2/source/appl/appuno.cxx | 2
sfx2/source/bastyp/fltfnc.cxx | 20
sfx2/source/bastyp/fltlst.cxx | 2
sfx2/source/bastyp/frmhtml.cxx | 2
sfx2/source/bastyp/frmhtmlw.cxx | 27 -
sfx2/source/control/bindings.cxx | 48 -
sfx2/source/control/ctrlitem.cxx | 2
sfx2/source/control/dispatch.cxx | 254 +++++-----
sfx2/source/control/request.cxx | 2
sfx2/source/control/shell.cxx | 10
sfx2/source/control/statcach.cxx | 2
sfx2/source/control/unoctitm.cxx | 4
sfx2/source/dialog/dinfdlg.cxx | 34 -
sfx2/source/dialog/dockwin.cxx | 10
sfx2/source/dialog/filedlghelper.cxx | 4
sfx2/source/dialog/itemconnect.cxx | 4
sfx2/source/dialog/navigat.cxx | 2
sfx2/source/dialog/taskpane.cxx | 2
sfx2/source/dialog/templdlg.cxx | 14
sfx2/source/doc/docfac.cxx | 2
sfx2/source/doc/docfile.cxx | 82 +--
sfx2/source/doc/docinsert.cxx | 8
sfx2/source/doc/docmacromode.cxx | 42 -
sfx2/source/doc/doctempl.cxx | 134 ++---
sfx2/source/doc/frmdescr.cxx | 20
sfx2/source/doc/new.cxx | 4
sfx2/source/doc/objmisc.cxx | 30 -
sfx2/source/doc/objserv.cxx | 6
sfx2/source/doc/objstor.cxx | 30 -
sfx2/source/doc/objxtor.cxx | 4
sfx2/source/doc/sfxbasemodel.cxx | 8
sfx2/source/inc/objshimp.hxx | 6
sfx2/source/inc/partwnd.hxx | 2
sfx2/source/inc/recfloat.hxx | 2
sfx2/source/sidebar/SidebarChildWindow.cxx | 2
sfx2/source/view/frame.cxx | 68 +-
sfx2/source/view/frame2.cxx | 16
sfx2/source/view/ipclient.cxx | 8
sfx2/source/view/sfxbasecontroller.cxx | 12
sfx2/source/view/viewfrm.cxx | 32 -
sfx2/source/view/viewfrm2.cxx | 2
sfx2/source/view/viewsh.cxx | 6
starmath/source/smdetect.cxx | 2
svx/source/dialog/SpellDialogChildWindow.cxx | 2
svx/source/dialog/hyperdlg.cxx | 4
svx/source/engine3d/view3d.cxx | 4
svx/source/engine3d/view3d1.cxx | 6
svx/source/engine3d/viewpt3d2.cxx | 14
svx/source/form/fmshimp.cxx | 8
svx/source/form/fmview.cxx | 2
svx/source/form/navigatortree.cxx | 2
svx/source/sidebar/area/AreaPropertyPanel.cxx | 2
svx/source/sidebar/possize/PosSizePropertyPanel.cxx | 8
svx/source/svdraw/svdopath.cxx | 4
svx/source/tbxctrls/tbcontrl.cxx | 2
svx/source/tbxctrls/verttexttbxctrl.cxx | 6
svx/source/unodraw/unomod.cxx | 6
svx/source/unodraw/unoprov.cxx | 14
svx/source/unodraw/unoshap4.cxx | 10
svx/source/unodraw/unoshape.cxx | 36 -
svx/source/unodraw/unottabl.cxx | 2
svx/source/xml/xmleohlp.cxx | 50 -
svx/source/xml/xmlexport.cxx | 12
svx/source/xml/xmlgrhlp.cxx | 18
svx/source/xml/xmlxtimp.cxx | 2
svx/source/xoutdev/_xoutbmp.cxx | 8
svx/source/xoutdev/_xpoly.cxx | 30 -
svx/source/xoutdev/xattr.cxx | 28 -
svx/source/xoutdev/xattr2.cxx | 8
svx/source/xoutdev/xattrbmp.cxx | 6
svx/source/xoutdev/xpool.cxx | 4
sw/source/core/uibase/app/docsh2.cxx | 6
sw/source/core/uibase/app/swwait.cxx | 4
sw/source/core/uibase/dbui/dbmgr.cxx | 4
sw/source/core/uibase/dochdl/gloshdl.cxx | 2
sw/source/core/uibase/docvw/SidebarTxtControl.cxx | 4
sw/source/core/uibase/docvw/edtdd.cxx | 2
sw/source/core/uibase/docvw/edtwin.cxx | 8
sw/source/core/uibase/ribbar/inputwin.cxx | 8
sw/source/core/uibase/shells/annotsh.cxx | 8
sw/source/core/uibase/shells/basesh.cxx | 2
sw/source/core/uibase/shells/drwbassh.cxx | 4
sw/source/core/uibase/shells/drwtxtex.cxx | 10
sw/source/core/uibase/shells/drwtxtsh.cxx | 4
sw/source/core/uibase/shells/textsh1.cxx | 12
sw/source/core/uibase/sidebar/PagePropertyPanel.cxx | 2
sw/source/core/uibase/uiview/srcview.cxx | 4
sw/source/core/uibase/uiview/view.cxx | 8
sw/source/core/uibase/uiview/view2.cxx | 2
sw/source/core/uibase/uiview/viewstat.cxx | 4
sw/source/core/uibase/web/wview.cxx | 2
sw/source/core/unocore/unocrsrhelper.cxx | 4
sw/source/filter/xml/swxml.cxx | 4
sw/source/filter/xml/wrtxml.cxx | 6
sw/source/ui/uno/swdetect.cxx | 4
194 files changed, 1164 insertions(+), 1169 deletions(-)
New commits:
commit e7ea15aef2ac619c153de57cb2bd97ab8dbadf68
Author: Noel Grandin <noel at peralex.com>
Date: Fri Mar 14 07:50:04 2014 +0200
sfx2: sal_Bool->bool
Change-Id: Ifd9bc57fd0c6d32796013cb9fca9c935a2f71e54
diff --git a/include/sfx2/fcontnr.hxx b/include/sfx2/fcontnr.hxx
index ad04fde..67e04d3 100644
--- a/include/sfx2/fcontnr.hxx
+++ b/include/sfx2/fcontnr.hxx
@@ -93,11 +93,11 @@ public:
const SfxFilter* GetFilter4Extension( const OUString& rExt, SfxFilterFlags nMust = SFX_FILTER_IMPORT, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED ) const;
const SfxFilter* GetFilter4FilterName( const OUString& rName, SfxFilterFlags nMust = 0, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED ) const;
- SAL_DLLPRIVATE static void ReadFilters_Impl( sal_Bool bUpdate=sal_False );
+ SAL_DLLPRIVATE static void ReadFilters_Impl( bool bUpdate=false );
SAL_DLLPRIVATE static void ReadSingleFilter_Impl( const OUString& rName,
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& xTypeCFG,
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& xFilterCFG,
- sal_Bool bUpdate );
+ bool bUpdate );
SAL_DLLPRIVATE static const SfxFilter* GetDefaultFilter_Impl( const OUString& );
};
@@ -112,13 +112,13 @@ public:
SfxFilterMatcher();
~SfxFilterMatcher();
- SAL_DLLPRIVATE static sal_Bool IsFilterInstalled_Impl( const SfxFilter* pFilter );
+ SAL_DLLPRIVATE static bool IsFilterInstalled_Impl( const SfxFilter* pFilter );
DECL_DLLPRIVATE_STATIC_LINK( SfxFilterMatcher, MaybeFileHdl_Impl, OUString* );
sal_uInt32 GuessFilterIgnoringContent( SfxMedium& rMedium, const SfxFilter **, SfxFilterFlags nMust = SFX_FILTER_IMPORT, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED ) const;
sal_uInt32 GuessFilter( SfxMedium& rMedium, const SfxFilter **, SfxFilterFlags nMust = SFX_FILTER_IMPORT, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED ) const;
- sal_uInt32 GuessFilterControlDefaultUI( SfxMedium& rMedium, const SfxFilter **, SfxFilterFlags nMust = SFX_FILTER_IMPORT, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED, sal_Bool bDefUI = sal_True ) const;
- sal_uInt32 DetectFilter( SfxMedium& rMedium, const SfxFilter **, sal_Bool bPlugIn, sal_Bool bAPI = sal_False ) const;
+ sal_uInt32 GuessFilterControlDefaultUI( SfxMedium& rMedium, const SfxFilter **, SfxFilterFlags nMust = SFX_FILTER_IMPORT, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED, bool bDefUI = true ) const;
+ sal_uInt32 DetectFilter( SfxMedium& rMedium, const SfxFilter **, bool bPlugIn, bool bAPI = false ) const;
const SfxFilter* GetFilter4Mime( const OUString& rMime, SfxFilterFlags nMust = SFX_FILTER_IMPORT, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED) const;
const SfxFilter* GetFilter4ClipBoardId( sal_uInt32 nId, SfxFilterFlags nMust = SFX_FILTER_IMPORT, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED ) const;
diff --git a/include/sfx2/filedlghelper.hxx b/include/sfx2/filedlghelper.hxx
index a68a791..000f502 100644
--- a/include/sfx2/filedlghelper.hxx
+++ b/include/sfx2/filedlghelper.hxx
@@ -135,7 +135,7 @@ public:
void StartExecuteModal( const Link& rEndDialogHdl );
inline ErrCode GetError() const { return m_nError; }
sal_Int16 GetDialogType() const;
- sal_Bool IsPasswordEnabled() const;
+ bool IsPasswordEnabled() const;
OUString GetRealFilter() const;
void SetTitle( const OUString& rNewTitle );
diff --git a/include/sfx2/frame.hxx b/include/sfx2/frame.hxx
index d44e114..7678e0b 100644
--- a/include/sfx2/frame.hxx
+++ b/include/sfx2/frame.hxx
@@ -110,7 +110,7 @@ private:
Window* pWindow;
protected:
- sal_Bool Close();
+ bool Close();
virtual ~SfxFrame();
SAL_DLLPRIVATE void RemoveChildFrame_Impl( SfxFrame* );
@@ -128,14 +128,14 @@ public:
SvCompatWeakHdl* GetHdl();
Window& GetWindow() const;
- void CancelTransfers( sal_Bool bCancelLoadEnv = sal_True );
- sal_Bool DoClose();
+ void CancelTransfers( bool bCancelLoadEnv = true );
+ bool DoClose();
sal_uInt16 GetChildFrameCount() const;
SfxFrame* GetChildFrame( sal_uInt16 nPos ) const;
SfxFrame* GetParentFrame() const
{ return pParentFrame; }
- void SetPresentationMode( sal_Bool bSet );
+ void SetPresentationMode( bool bSet );
SystemWindow* GetSystemWindow() const;
static SfxFrame* GetFirst();
@@ -147,14 +147,14 @@ public:
SfxObjectShell* GetCurrentDocument() const;
SfxViewFrame* GetCurrentViewFrame() const;
SfxFrame& GetTopFrame() const;
- sal_Bool IsParent( SfxFrame* ) const;
+ bool IsParent( SfxFrame* ) const;
sal_uInt32 GetFrameType() const;
void GetTargetList( TargetList& ) const;
SAL_DLLPRIVATE SfxFrame* GetContainingDocFrame_Impl( SfxFrame* pSelf );
void UpdateDescriptor( SfxObjectShell *pDoc );
void Resize();
- sal_Bool HasComponent() const;
+ bool HasComponent() const;
::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >
GetComponent() const;
void ReleaseComponent();
@@ -165,30 +165,30 @@ public:
::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >
GetController() const;
- sal_Bool IsInPlace() const;
+ bool IsInPlace() const;
- SAL_DLLPRIVATE sal_Bool DoClose_Impl();
+ SAL_DLLPRIVATE bool DoClose_Impl();
SAL_DLLPRIVATE void SetFrameInterface_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame );
- SAL_DLLPRIVATE void ReleasingComponent_Impl( sal_Bool bSet );
+ SAL_DLLPRIVATE void ReleasingComponent_Impl( bool bSet );
SAL_DLLPRIVATE void GetViewData_Impl();
SAL_DLLPRIVATE void SetFrameType_Impl( sal_uInt32 );
- SAL_DLLPRIVATE bool PrepareClose_Impl( sal_Bool bUI );
- SAL_DLLPRIVATE sal_Bool DocIsModified_Impl();
+ SAL_DLLPRIVATE bool PrepareClose_Impl( bool bUI );
+ SAL_DLLPRIVATE bool DocIsModified_Impl();
SAL_DLLPRIVATE void SetCurrentViewFrame_Impl( SfxViewFrame* );
- SAL_DLLPRIVATE sal_Bool IsClosing_Impl() const;
+ SAL_DLLPRIVATE bool IsClosing_Impl() const;
SAL_DLLPRIVATE void SetIsClosing_Impl();
// Methods for accessing the current set
SAL_DLLPRIVATE SfxFrameDescriptor* GetDescriptor() const;
- SAL_DLLPRIVATE void Lock_Impl( sal_Bool bLock );
+ SAL_DLLPRIVATE void Lock_Impl( bool bLock );
SAL_DLLPRIVATE SfxDispatcher* GetDispatcher_Impl() const;
- SAL_DLLPRIVATE sal_Bool IsAutoLoadLocked_Impl() const;
+ SAL_DLLPRIVATE bool IsAutoLoadLocked_Impl() const;
SAL_DLLPRIVATE static void InsertTopFrame_Impl( SfxFrame* pFrame );
SAL_DLLPRIVATE static void RemoveTopFrame_Impl( SfxFrame* pFrame );
- SAL_DLLPRIVATE void SetOwnsBindings_Impl( sal_Bool bSet );
- SAL_DLLPRIVATE sal_Bool OwnsBindings_Impl() const;
+ SAL_DLLPRIVATE void SetOwnsBindings_Impl( bool bSet );
+ SAL_DLLPRIVATE bool OwnsBindings_Impl() const;
SAL_DLLPRIVATE void InvalidateUnoControllers_Impl();
SAL_DLLPRIVATE void RegisterUnoController_Impl( SfxUnoControllerItem* );
SAL_DLLPRIVATE void ReleaseUnoController_Impl( SfxUnoControllerItem* );
@@ -197,12 +197,12 @@ public:
SAL_DLLPRIVATE Rectangle GetTopOuterRectPixel_Impl() const;
SAL_DLLPRIVATE void CreateWorkWindow_Impl();
SAL_DLLPRIVATE void GrabFocusOnComponent_Impl();
- SAL_DLLPRIVATE void SetInPlace_Impl( sal_Bool );
+ SAL_DLLPRIVATE void SetInPlace_Impl( bool );
SAL_DLLPRIVATE void PrepareForDoc_Impl( SfxObjectShell& i_rDoc );
- SAL_DLLPRIVATE void LockResize_Impl( sal_Bool bLock );
- SAL_DLLPRIVATE void SetMenuBarOn_Impl( sal_Bool bOn );
- SAL_DLLPRIVATE sal_Bool IsMenuBarOn_Impl() const;
+ SAL_DLLPRIVATE void LockResize_Impl( bool bLock );
+ SAL_DLLPRIVATE void SetMenuBarOn_Impl( bool bOn );
+ SAL_DLLPRIVATE bool IsMenuBarOn_Impl() const;
SAL_DLLPRIVATE SystemWindow* GetTopWindow_Impl() const;
SAL_DLLPRIVATE bool IsMarkedHidden_Impl() const;
private:
@@ -214,12 +214,12 @@ SV_DECL_COMPAT_WEAK( SfxFrame )
class SfxFrameIterator
{
const SfxFrame* pFrame;
- sal_Bool bRecursive;
+ bool bRecursive;
SfxFrame* NextSibling_Impl( SfxFrame& rPrev );
public:
- SfxFrameIterator( const SfxFrame& rFrame, sal_Bool bRecursive=sal_True );
+ SfxFrameIterator( const SfxFrame& rFrame, bool bRecursive=true );
SfxFrame* FirstFrame();
SfxFrame* NextFrame( SfxFrame& rPrev );
};
@@ -246,7 +246,7 @@ public:
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
- sal_Bool FrameKilled() const { return &wFrame != pFrame; }
+ bool FrameKilled() const { return &wFrame != pFrame; }
SfxFrame* GetFrame() const
{ return wFrame; }
diff --git a/include/sfx2/frmdescr.hxx b/include/sfx2/frmdescr.hxx
index ebc40e4..ffa57ed 100644
--- a/include/sfx2/frmdescr.hxx
+++ b/include/sfx2/frmdescr.hxx
@@ -75,12 +75,12 @@ class SFX2_DLLPUBLIC SfxFrameDescriptor
long nWidth;
ScrollingMode eScroll;
SizeSelector eSizeSelector;
- sal_uInt16 nHasBorder;
- sal_uInt16 nItemId;
- sal_Bool bResizeHorizontal;
- sal_Bool bResizeVertical;
- sal_Bool bHasUI;
- sal_Bool bReadOnly;
+ sal_uInt16 nHasBorder;
+ sal_uInt16 nItemId;
+ bool bResizeHorizontal;
+ bool bResizeVertical;
+ bool bHasUI;
+ bool bReadOnly;
SfxFrameDescriptor_Impl* pImp;
public:
@@ -96,10 +96,10 @@ public:
{ return aActualURL; }
void SetActualURL( const INetURLObject& rURL );
void SetActualURL( const OUString& rURL );
- void SetReadOnly( sal_Bool bSet ) { bReadOnly = bSet;}
- sal_Bool IsReadOnly( ) const { return bReadOnly;}
- void SetEditable( sal_Bool bSet );
- sal_Bool IsEditable() const;
+ void SetReadOnly( bool bSet ) { bReadOnly = bSet;}
+ bool IsReadOnly( ) const { return bReadOnly;}
+ void SetEditable( bool bSet );
+ bool IsEditable() const;
// Size
void SetWidth( long n )
@@ -114,9 +114,9 @@ public:
{ return nWidth; }
SizeSelector GetSizeSelector() const
{ return eSizeSelector; }
- sal_Bool IsResizable() const
+ bool IsResizable() const
{ return bResizeHorizontal && bResizeVertical; }
- void SetResizable( sal_Bool bRes )
+ void SetResizable( bool bRes )
{ bResizeHorizontal = bResizeVertical = bRes; }
// FrameName
@@ -137,25 +137,25 @@ public:
// FrameBorder
void SetWallpaper( const Wallpaper& rWallpaper );
- sal_Bool HasFrameBorder() const;
+ bool HasFrameBorder() const;
- sal_Bool IsFrameBorderOn() const
+ bool IsFrameBorderOn() const
{ return ( nHasBorder & BORDER_YES ) != 0; }
- void SetFrameBorder( sal_Bool bBorder )
+ void SetFrameBorder( bool bBorder )
{
nHasBorder = bBorder ?
BORDER_YES | BORDER_SET :
BORDER_NO | BORDER_SET;
}
- sal_Bool IsFrameBorderSet() const
+ bool IsFrameBorderSet() const
{ return (nHasBorder & BORDER_SET) != 0; }
void ResetBorder()
{ nHasBorder = 0; }
- sal_Bool HasUI() const
+ bool HasUI() const
{ return bHasUI; }
- void SetHasUI( sal_Bool bOn )
+ void SetHasUI( bool bOn )
{ bHasUI = bOn; }
// Attribute for Splitwindow
@@ -165,7 +165,7 @@ public:
{ nItemId = nId; }
// Copy for example for Views
- SfxFrameDescriptor* Clone( sal_Bool bWithIds = sal_True ) const;
+ SfxFrameDescriptor* Clone( bool bWithIds = true ) const;
};
// No block to implement a =operator
@@ -182,13 +182,13 @@ struct SfxFrameProperties
ScrollingMode eScroll;
SizeSelector eSizeSelector;
SizeSelector eSetSizeSelector;
- sal_Bool bHasBorder;
- sal_Bool bBorderSet;
- sal_Bool bResizable;
- sal_Bool bSetResizable;
- sal_Bool bIsRootSet;
- sal_Bool bIsInColSet;
- sal_Bool bHasBorderInherited;
+ bool bHasBorder;
+ bool bBorderSet;
+ bool bResizable;
+ bool bSetResizable;
+ bool bIsRootSet;
+ bool bIsInColSet;
+ bool bHasBorderInherited;
SfxFrameDescriptor* pFrame;
private:
@@ -204,13 +204,13 @@ public:
eScroll( ScrollingAuto ),
eSizeSelector( SIZE_REL ),
eSetSizeSelector( SIZE_REL ),
- bHasBorder( sal_True ),
- bBorderSet( sal_True ),
- bResizable( sal_True ),
- bSetResizable( sal_True ),
- bIsRootSet( sal_False ),
- bIsInColSet( sal_False ),
- bHasBorderInherited( sal_True ),
+ bHasBorder( true ),
+ bBorderSet( true ),
+ bResizable( true ),
+ bSetResizable( true ),
+ bIsRootSet( false ),
+ bIsInColSet( false ),
+ bHasBorderInherited( true ),
pFrame( 0 ) {}
~SfxFrameProperties() { delete pFrame; }
diff --git a/include/sfx2/frmhtml.hxx b/include/sfx2/frmhtml.hxx
index 22108715..a501d84 100644
--- a/include/sfx2/frmhtml.hxx
+++ b/include/sfx2/frmhtml.hxx
@@ -32,7 +32,7 @@ class SfxMedium;
class SFX2_DLLPUBLIC SfxFrameHTMLParser : public SfxHTMLParser
{
protected:
- SfxFrameHTMLParser( SvStream& rStream, sal_Bool bIsNewDoc=sal_True, SfxMedium *pMediumPtr=0 ):
+ SfxFrameHTMLParser( SvStream& rStream, bool bIsNewDoc=true, SfxMedium *pMediumPtr=0 ):
SfxHTMLParser( rStream, bIsNewDoc, pMediumPtr ) {};
public:
diff --git a/include/sfx2/frmhtmlw.hxx b/include/sfx2/frmhtmlw.hxx
index 2f7479f..c6527bd 100644
--- a/include/sfx2/frmhtmlw.hxx
+++ b/include/sfx2/frmhtmlw.hxx
@@ -43,12 +43,12 @@ class SFX2_DLLPUBLIC SfxFrameHTMLWriter
{
SAL_DLLPRIVATE static void OutMeta( SvStream& rStrm,
const sal_Char *pIndent, const OUString& rName,
- const OUString& rContent, sal_Bool bHTTPEquiv,
+ const OUString& rContent, bool bHTTPEquiv,
rtl_TextEncoding eDestEnc,
OUString *pNonConvertableChars = 0 );
SAL_DLLPRIVATE inline static void OutMeta( SvStream& rStrm,
const sal_Char *pIndent, const sal_Char *pName,
- const OUString& rContent, sal_Bool bHTTPEquiv,
+ const OUString& rContent, bool bHTTPEquiv,
rtl_TextEncoding eDestEnc,
OUString *pNonConvertableChars = 0 );
@@ -68,7 +68,7 @@ public:
inline void SfxFrameHTMLWriter::OutMeta( SvStream& rStrm,
const sal_Char *pIndent, const sal_Char *pName,
- const OUString& rContent, sal_Bool bHTTPEquiv,
+ const OUString& rContent, bool bHTTPEquiv,
rtl_TextEncoding eDestEnc,
OUString *pNonConvertableChars )
{
diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx
index f59b9b9..892fbad 100644
--- a/sd/source/ui/slideshow/slideshow.cxx
+++ b/sd/source/ui/slideshow/slideshow.cxx
@@ -1263,7 +1263,7 @@ void SlideShow::StartFullscreenPresentation( )
// new view shell--a prerequisite to process slot calls and initialize
// its panes--a GrabFocus() has to be called later on.
SfxFrame* pNewFrame = SfxFrame::Create( *mpDoc->GetDocSh(), *pWorkWindow, PRESENTATION_FACTORY_ID, true );
- pNewFrame->SetPresentationMode(sal_True);
+ pNewFrame->SetPresentationMode(true);
mpFullScreenViewShellBase = static_cast<ViewShellBase*>(pNewFrame->GetCurrentViewFrame()->GetViewShell());
if(mpFullScreenViewShellBase != NULL)
diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx
index 5e10936..f86c1da 100644
--- a/sfx2/source/bastyp/fltfnc.cxx
+++ b/sfx2/source/bastyp/fltfnc.cxx
@@ -410,12 +410,12 @@ sal_uInt32 SfxFilterMatcher::GuessFilterIgnoringContent(
sal_uInt32 SfxFilterMatcher::GuessFilter( SfxMedium& rMedium, const SfxFilter**ppFilter, SfxFilterFlags nMust, SfxFilterFlags nDont ) const
{
- return GuessFilterControlDefaultUI( rMedium, ppFilter, nMust, nDont, sal_True );
+ return GuessFilterControlDefaultUI( rMedium, ppFilter, nMust, nDont, true );
}
-sal_uInt32 SfxFilterMatcher::GuessFilterControlDefaultUI( SfxMedium& rMedium, const SfxFilter** ppFilter, SfxFilterFlags nMust, SfxFilterFlags nDont, sal_Bool /*bDefUI*/ ) const
+sal_uInt32 SfxFilterMatcher::GuessFilterControlDefaultUI( SfxMedium& rMedium, const SfxFilter** ppFilter, SfxFilterFlags nMust, SfxFilterFlags nDont, bool /*bDefUI*/ ) const
{
const SfxFilter* pOldFilter = *ppFilter;
@@ -509,7 +509,7 @@ sal_uInt32 SfxFilterMatcher::GuessFilterControlDefaultUI( SfxMedium& rMedium, c
}
-sal_Bool SfxFilterMatcher::IsFilterInstalled_Impl( const SfxFilter* pFilter )
+bool SfxFilterMatcher::IsFilterInstalled_Impl( const SfxFilter* pFilter )
{
if ( pFilter->GetFilterFlags() & SFX_FILTER_MUSTINSTALL )
{
@@ -535,14 +535,14 @@ sal_Bool SfxFilterMatcher::IsFilterInstalled_Impl( const SfxFilter* pFilter )
OUString aText( SfxResId(STR_FILTER_CONSULT_SERVICE).toString() );
aText = aText.replaceFirst( "$(FILTER)", pFilter->GetUIName() );
InfoBox ( NULL, aText ).Execute();
- return sal_False;
+ return false;
}
else
- return sal_True;
+ return true;
}
-sal_uInt32 SfxFilterMatcher::DetectFilter( SfxMedium& rMedium, const SfxFilter**ppFilter, sal_Bool /*bPlugIn*/, sal_Bool bAPI ) const
+sal_uInt32 SfxFilterMatcher::DetectFilter( SfxMedium& rMedium, const SfxFilter**ppFilter, bool /*bPlugIn*/, bool bAPI ) const
/* [Description]
Here the Filter selection box is pulled up. Otherwise GuessFilter
@@ -825,7 +825,7 @@ const SfxFilter* SfxFilterMatcher::GetFilter4FilterName( const OUString& rName,
}
}
- SfxFilterContainer::ReadSingleFilter_Impl( rName, xTypeCFG, xFilterCFG, sal_False );
+ SfxFilterContainer::ReadSingleFilter_Impl( rName, xTypeCFG, xFilterCFG, false );
}
}
@@ -931,7 +931,7 @@ void SfxFilterContainer::ReadSingleFilter_Impl(
const OUString& rName,
const uno::Reference< container::XNameAccess >& xTypeCFG,
const uno::Reference< container::XNameAccess >& xFilterCFG,
- sal_Bool bUpdate
+ bool bUpdate
)
{
OUString sFilterName( rName );
@@ -1124,7 +1124,7 @@ void SfxFilterContainer::ReadSingleFilter_Impl(
}
}
-void SfxFilterContainer::ReadFilters_Impl( sal_Bool bUpdate )
+void SfxFilterContainer::ReadFilters_Impl( bool bUpdate )
{
SAL_INFO( "sfx.bastyp", "SfxFilterContainer::ReadFilters" );
if ( !pFilterArr )
@@ -1157,7 +1157,7 @@ void SfxFilterContainer::ReadFilters_Impl( sal_Bool bUpdate )
// and change it back for all valid filters afterwards.
if( !rList.empty() )
{
- bUpdate = sal_True;
+ bUpdate = true;
SfxFilter* pFilter;
for ( size_t i = 0, n = rList.size(); i < n; ++i )
{
diff --git a/sfx2/source/bastyp/fltlst.cxx b/sfx2/source/bastyp/fltlst.cxx
index 5792dba..9afef3b 100644
--- a/sfx2/source/bastyp/fltlst.cxx
+++ b/sfx2/source/bastyp/fltlst.cxx
@@ -108,7 +108,7 @@ void SAL_CALL SfxFilterListener::refreshed( const lang::EventObject& aSource ) t
(xContainer==m_xFilterCache)
)
{
- SfxFilterContainer::ReadFilters_Impl( sal_True );
+ SfxFilterContainer::ReadFilters_Impl( true );
}
}
diff --git a/sfx2/source/bastyp/frmhtml.cxx b/sfx2/source/bastyp/frmhtml.cxx
index ecdc5ee..f9541d4 100644
--- a/sfx2/source/bastyp/frmhtml.cxx
+++ b/sfx2/source/bastyp/frmhtml.cxx
@@ -109,7 +109,7 @@ void SfxFrameHTMLParser::ParseFrameOptions(
break;
}
case HTML_O_NORESIZE:
- pFrame->SetResizable( sal_False );
+ pFrame->SetResizable( false );
break;
default:
if (aOption.GetTokenString().equalsIgnoreAsciiCase(HTML_O_READONLY))
diff --git a/sfx2/source/bastyp/frmhtmlw.cxx b/sfx2/source/bastyp/frmhtmlw.cxx
index a0d20f8..df69712 100644
--- a/sfx2/source/bastyp/frmhtmlw.cxx
+++ b/sfx2/source/bastyp/frmhtmlw.cxx
@@ -57,8 +57,9 @@ static sal_Char const sHTML_MIME_text_html[] = "text/html; charset=";
void SfxFrameHTMLWriter::OutMeta( SvStream& rStrm,
const sal_Char *pIndent,
const OUString& rName,
- const OUString& rContent, sal_Bool bHTTPEquiv,
- rtl_TextEncoding eDestEnc,
+ const OUString& rContent,
+ bool bHTTPEquiv,
+ rtl_TextEncoding eDestEnc,
OUString *pNonConvertableChars )
{
rStrm.WriteCharPtr( SAL_NEWLINE_STRING );
@@ -91,7 +92,7 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const OUString& rBaseURL,
{
OUString aContentType(sHTML_MIME_text_html);
aContentType += OUString(pCharSet, strlen(pCharSet), RTL_TEXTENCODING_UTF8);
- OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_content_type, aContentType, sal_True,
+ OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_content_type, aContentType, true,
eDestEnc, pNonConvertableChars );
}
@@ -132,7 +133,7 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const OUString& rBaseURL,
OUString os( "$_OS" );
::rtl::Bootstrap::expandMacros(os);
sGenerator = sGenerator.replaceFirst( "%1", os );
- OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_generator, sGenerator, sal_False, eDestEnc, pNonConvertableChars );
+ OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_generator, sGenerator, false, eDestEnc, pNonConvertableChars );
if( i_xDocProps.is() )
{
@@ -151,14 +152,14 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const OUString& rBaseURL,
rBaseURL, rReloadURL);
}
- OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_refresh, sContent, sal_True,
+ OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_refresh, sContent, true,
eDestEnc, pNonConvertableChars );
}
// Author
const OUString& rAuthor = i_xDocProps->getAuthor();
if( !rAuthor.isEmpty() )
- OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_author, rAuthor, sal_False,
+ OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_author, rAuthor, false,
eDestEnc, pNonConvertableChars );
// created
@@ -168,13 +169,13 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const OUString& rBaseURL,
OUString sOut = OUString::number(aD.GetDate());
sOut += ";";
sOut += OUString::number(aT.GetTime());
- OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_created, sOut, sal_False,
+ OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_created, sOut, false,
eDestEnc, pNonConvertableChars );
// changedby
const OUString& rChangedBy = i_xDocProps->getModifiedBy();
if( !rChangedBy.isEmpty() )
- OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_changedby, rChangedBy, sal_False,
+ OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_changedby, rChangedBy, false,
eDestEnc, pNonConvertableChars );
// changed
@@ -184,26 +185,26 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const OUString& rBaseURL,
sOut = OUString::number(aD2.GetDate());
sOut += ";";
sOut += OUString::number(aT2.GetTime());
- OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_changed, sOut, sal_False,
+ OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_changed, sOut, false,
eDestEnc, pNonConvertableChars );
// Subject
const OUString& rTheme = i_xDocProps->getSubject();
if( !rTheme.isEmpty() )
- OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_classification, rTheme, sal_False,
+ OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_classification, rTheme, false,
eDestEnc, pNonConvertableChars );
// Description
const OUString& rComment = i_xDocProps->getDescription();
if( !rComment.isEmpty() )
- OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_description, rComment, sal_False,
+ OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_description, rComment, false,
eDestEnc, pNonConvertableChars);
// Keywords
OUString Keywords = ::comphelper::string::convertCommaSeparated(
i_xDocProps->getKeywords());
if( !Keywords.isEmpty() )
- OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_keywords, Keywords, sal_False,
+ OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_keywords, Keywords, false,
eDestEnc, pNonConvertableChars);
uno::Reference < script::XTypeConverter > xConverter( script::Converter::create(
@@ -226,7 +227,7 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const OUString& rBaseURL,
OUString str;
aStr >>= str;
OUString valstr(comphelper::string::stripEnd(str, ' '));
- OutMeta( rStrm, pIndent, name, valstr, sal_False,
+ OutMeta( rStrm, pIndent, name, valstr, false,
eDestEnc, pNonConvertableChars );
}
catch (const uno::Exception&)
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx
index b2d9989..79df9c8 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -2390,9 +2390,9 @@ short FileDialogHelper::GetDialogType() const
return mpImp ? mpImp->m_nDialogType : 0;
}
-sal_Bool FileDialogHelper::IsPasswordEnabled() const
+bool FileDialogHelper::IsPasswordEnabled() const
{
- return mpImp ? mpImp->isPasswordEnabled() : sal_False;
+ return mpImp && mpImp->isPasswordEnabled();
}
OUString FileDialogHelper::GetRealFilter() const
diff --git a/sfx2/source/doc/docinsert.cxx b/sfx2/source/doc/docinsert.cxx
index 6c57bd3..260fb42 100644
--- a/sfx2/source/doc/docinsert.cxx
+++ b/sfx2/source/doc/docinsert.cxx
@@ -98,7 +98,7 @@ SfxMedium* DocumentInserter::CreateMedium()
pMatcher = new SfxFilterMatcher();
const SfxFilter* pFilter = NULL;
- sal_uInt32 nError = pMatcher->DetectFilter( *pMedium, &pFilter, sal_False );
+ sal_uInt32 nError = pMatcher->DetectFilter( *pMedium, &pFilter, false );
if ( nError == ERRCODE_NONE && pFilter )
pMedium->SetFilter( pFilter );
else
@@ -128,7 +128,7 @@ SfxMediumList* DocumentInserter::CreateMediumList()
SfxFilterMatcher aMatcher( m_sDocFactory );
const SfxFilter* pFilter = NULL;
- sal_uInt32 nError = aMatcher.DetectFilter( *pMedium, &pFilter, sal_False );
+ sal_uInt32 nError = aMatcher.DetectFilter( *pMedium, &pFilter, false );
if ( nError == ERRCODE_NONE && pFilter )
pMedium->SetFilter( pFilter );
else
diff --git a/sfx2/source/doc/frmdescr.cxx b/sfx2/source/doc/frmdescr.cxx
index 2d1440d..8f97af4 100644
--- a/sfx2/source/doc/frmdescr.cxx
+++ b/sfx2/source/doc/frmdescr.cxx
@@ -32,9 +32,9 @@ struct SfxFrameDescriptor_Impl
{
Wallpaper* pWallpaper;
SfxItemSet* pArgs;
- sal_Bool bEditable;
+ bool bEditable;
- SfxFrameDescriptor_Impl() : pWallpaper( NULL ), pArgs( NULL ), bEditable( sal_True ) {}
+ SfxFrameDescriptor_Impl() : pWallpaper( NULL ), pArgs( NULL ), bEditable( true ) {}
~SfxFrameDescriptor_Impl()
{
delete pWallpaper;
@@ -49,10 +49,10 @@ SfxFrameDescriptor::SfxFrameDescriptor() :
eSizeSelector( SIZE_ABS ),
nHasBorder( BORDER_YES ),
nItemId( 0 ),
- bResizeHorizontal( sal_True ),
- bResizeVertical( sal_True ),
- bHasUI( sal_True ),
- bReadOnly( sal_False )
+ bResizeHorizontal( true ),
+ bResizeVertical( true ),
+ bHasUI( true ),
+ bReadOnly( false )
{
pImp = new SfxFrameDescriptor_Impl;
@@ -88,17 +88,17 @@ void SfxFrameDescriptor::SetActualURL( const INetURLObject& rURL )
SetActualURL(rURL.GetMainURL( INetURLObject::DECODE_TO_IURI ));
}
-void SfxFrameDescriptor::SetEditable( sal_Bool bSet )
+void SfxFrameDescriptor::SetEditable( bool bSet )
{
pImp->bEditable = bSet;
}
-sal_Bool SfxFrameDescriptor::IsEditable() const
+bool SfxFrameDescriptor::IsEditable() const
{
return pImp->bEditable;
}
-SfxFrameDescriptor* SfxFrameDescriptor::Clone( sal_Bool bWithIds ) const
+SfxFrameDescriptor* SfxFrameDescriptor::Clone( bool bWithIds ) const
{
SfxFrameDescriptor *pFrame = new SfxFrameDescriptor;
@@ -132,7 +132,7 @@ SfxFrameDescriptor* SfxFrameDescriptor::Clone( sal_Bool bWithIds ) const
return pFrame;
}
-sal_Bool SfxFrameDescriptor::HasFrameBorder() const
+bool SfxFrameDescriptor::HasFrameBorder() const
{
return (nHasBorder & BORDER_YES) != 0;
}
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index dd8da00..ac4e6c2 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -4315,7 +4315,7 @@ Reference< frame::XController2 > SAL_CALL SfxBaseModel::createViewController(
// some initial view settings, coming from our most recent attachResource call
::comphelper::NamedValueCollection aDocumentLoadArgs( getArgs() );
if ( aDocumentLoadArgs.getOrDefault( "ViewOnly", false ) )
- pViewFrame->GetFrame().SetMenuBarOn_Impl( sal_False );
+ pViewFrame->GetFrame().SetMenuBarOn_Impl( false );
const sal_Int16 nPluginMode = aDocumentLoadArgs.getOrDefault( "PluginMode", sal_Int16( 0 ) );
if ( nPluginMode == 1 )
diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx
index dc794e5..1fd37a7 100644
--- a/sfx2/source/view/frame.cxx
+++ b/sfx2/source/view/frame.cxx
@@ -121,17 +121,17 @@ SfxFrame::~SfxFrame()
delete pImp;
}
-sal_Bool SfxFrame::DoClose()
+bool SfxFrame::DoClose()
{
// Actually, one more PrepareClose is still needed!
- sal_Bool bRet = sal_False;
+ bool bRet = false;
if ( !pImp->bClosing )
{
pImp->bClosing = sal_True;
CancelTransfers();
// now close frame; it will be deleted if this call is successful, so don't use any members after that!
- bRet = sal_True;
+ bRet = true;
try
{
Reference< XCloseable > xCloseable ( pImp->xFrame, UNO_QUERY );
@@ -149,7 +149,7 @@ sal_Bool SfxFrame::DoClose()
catch( ::com::sun::star::util::CloseVetoException& )
{
pImp->bClosing = sal_False;
- bRet = sal_False;
+ bRet = false;
}
catch( ::com::sun::star::lang::DisposedException& )
{
@@ -159,9 +159,9 @@ sal_Bool SfxFrame::DoClose()
return bRet;
}
-sal_Bool SfxFrame::DoClose_Impl()
+bool SfxFrame::DoClose_Impl()
{
- sal_Bool bRet = sal_True;
+ bool bRet = true;
SfxBindings* pBindings = NULL;
if ( pImp->pCurrentViewFrame )
pBindings = &pImp->pCurrentViewFrame->GetBindings();
@@ -181,18 +181,18 @@ sal_Bool SfxFrame::DoClose_Impl()
return bRet;
}
-sal_Bool SfxFrame::DocIsModified_Impl()
+bool SfxFrame::DocIsModified_Impl()
{
if ( pImp->pCurrentViewFrame && pImp->pCurrentViewFrame->GetObjectShell() &&
pImp->pCurrentViewFrame->GetObjectShell()->IsModified() )
- return sal_True;
+ return true;
for( sal_uInt16 nPos = GetChildFrameCount(); nPos--; )
if( (*pChildArr)[ nPos ]->DocIsModified_Impl() )
- return sal_True;
- return sal_False;
+ return true;
+ return false;
}
-bool SfxFrame::PrepareClose_Impl( sal_Bool bUI )
+bool SfxFrame::PrepareClose_Impl( bool bUI )
{
bool nRet = true;
@@ -269,7 +269,7 @@ SfxFrame& SfxFrame::GetTopFrame() const
return *const_cast< SfxFrame* >( pParent );
}
-sal_Bool SfxFrame::IsClosing_Impl() const
+bool SfxFrame::IsClosing_Impl() const
{
return pImp->bClosing;
}
@@ -284,7 +284,7 @@ sal_uInt16 SfxFrame::GetChildFrameCount() const
return pChildArr ? pChildArr->size() : 0;
}
-void SfxFrame::CancelTransfers( sal_Bool /*bCancelLoadEnv*/ )
+void SfxFrame::CancelTransfers( bool /*bCancelLoadEnv*/ )
{
if( !pImp->bInCancelTransfers )
{
@@ -328,20 +328,20 @@ SfxDispatcher* SfxFrame::GetDispatcher_Impl() const
return GetParentFrame()->GetDispatcher_Impl();
}
-sal_Bool SfxFrame::IsAutoLoadLocked_Impl() const
+bool SfxFrame::IsAutoLoadLocked_Impl() const
{
// Its own Docucument is locked?
const SfxObjectShell* pObjSh = GetCurrentDocument();
if ( !pObjSh || !pObjSh->IsAutoLoadLocked() )
- return sal_False;
+ return false;
// Its children are locked?
for ( sal_uInt16 n = GetChildFrameCount(); n--; )
if ( !GetChildFrame(n)->IsAutoLoadLocked_Impl() )
- return sal_False;
+ return false;
// otherwise allow AutoLoad
- return sal_True;
+ return true;
}
SfxObjectShell* SfxFrame::GetCurrentDocument() const
@@ -376,16 +376,16 @@ void SfxFrame::GetViewData_Impl()
if( pViewFrame && pViewFrame->GetViewShell() )
{
const SfxMedium *pMed = GetCurrentDocument()->GetMedium();
- sal_Bool bReadOnly = pMed->GetOpenMode() == SFX_STREAM_READONLY;
+ bool bReadOnly = pMed->GetOpenMode() == SFX_STREAM_READONLY;
GetDescriptor()->SetReadOnly( bReadOnly );
SfxItemSet *pSet = GetDescriptor()->GetArgs();
- sal_Bool bGetViewData = sal_False;
+ bool bGetViewData = false;
if ( GetController().is() && pSet->GetItemState( SID_VIEW_DATA ) != SFX_ITEM_SET )
{
::com::sun::star::uno::Any aData = GetController()->getViewData();
pSet->Put( SfxUsrAnyItem( SID_VIEW_DATA, aData ) );
- bGetViewData = sal_True;
+ bGetViewData = true;
}
if ( pViewFrame->GetCurViewId() )
@@ -423,7 +423,7 @@ void SfxFrame::UpdateDescriptor( SfxObjectShell *pDoc )
GetDescriptor()->SetActualURL( pMed->GetOrigURL() );
SFX_ITEMSET_ARG( pMed->GetItemSet(), pItem, SfxBoolItem, SID_EDITDOC, false );
- sal_Bool bEditable = ( !pItem || pItem->GetValue() );
+ bool bEditable = ( !pItem || pItem->GetValue() );
GetDescriptor()->SetEditable( bEditable );
@@ -503,17 +503,17 @@ void SfxFrame::GetTargetList( TargetList& rList ) const
-sal_Bool SfxFrame::IsParent( SfxFrame *pFrame ) const
+bool SfxFrame::IsParent( SfxFrame *pFrame ) const
{
SfxFrame *pParent = pParentFrame;
while ( pParent )
{
if ( pParent == pFrame )
- return sal_True;
+ return true;
pParent = pParent->pParentFrame;
}
- return sal_False;
+ return false;
}
void SfxFrame::InsertTopFrame_Impl( SfxFrame* pFrame )
@@ -663,7 +663,7 @@ bool SfxUnoFrameItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8
return ( rVal >>= m_xFrame );
}
-SfxFrameIterator::SfxFrameIterator( const SfxFrame& rFrame, sal_Bool bRecur )
+SfxFrameIterator::SfxFrameIterator( const SfxFrame& rFrame, bool bRecur )
: pFrame( &rFrame )
, bRecursive( bRecur )
{}
@@ -707,9 +707,9 @@ SfxFrame* SfxFrameIterator::NextSibling_Impl( SfxFrame& rPrev )
return pRet;
}
-sal_Bool SfxFrame::HasComponent() const
+bool SfxFrame::HasComponent() const
{
- return sal_False;
+ return false;
}
::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > SfxFrame::GetController() const
@@ -755,12 +755,12 @@ void SfxFrame::AppearWithUpdate()
GetCurrentViewFrame()->GetDispatcher()->Update_Impl( true );
}
-void SfxFrame::SetOwnsBindings_Impl( sal_Bool bSet )
+void SfxFrame::SetOwnsBindings_Impl( bool bSet )
{
pImp->bOwnsBindings = bSet;
}
-sal_Bool SfxFrame::OwnsBindings_Impl() const
+bool SfxFrame::OwnsBindings_Impl() const
{
return pImp->bOwnsBindings;
}
@@ -787,7 +787,7 @@ void SfxFrame::SetToolSpaceBorderPixel_Impl( const SvBorder& rBorder )
if ( GetParentFrame() )
{
- sal_Bool bHasTools = rBorder.Left() != rBorder.Right() || rBorder.Top() != rBorder.Bottom();
+ bool bHasTools = rBorder.Left() != rBorder.Right() || rBorder.Top() != rBorder.Bottom();
pF->GetWindow().SetBorderStyle( bHasTools ? WINDOW_BORDER_NORMAL : WINDOW_BORDER_NOBORDER );
}
@@ -871,17 +871,17 @@ void SfxFrame::GrabFocusOnComponent_Impl()
pFocusWindow->GrabFocus();
}
-void SfxFrame::ReleasingComponent_Impl( sal_Bool bSet )
+void SfxFrame::ReleasingComponent_Impl( bool bSet )
{
pImp->bReleasingComponent = bSet;
}
-sal_Bool SfxFrame::IsInPlace() const
+bool SfxFrame::IsInPlace() const
{
return pImp->bInPlace;
}
-void SfxFrame::SetInPlace_Impl( sal_Bool bSet )
+void SfxFrame::SetInPlace_Impl( bool bSet )
{
pImp->bInPlace = bSet;
}
diff --git a/sfx2/source/view/frame2.cxx b/sfx2/source/view/frame2.cxx
index 8f3e89c..880b81a 100644
--- a/sfx2/source/view/frame2.cxx
+++ b/sfx2/source/view/frame2.cxx
@@ -316,7 +316,7 @@ SfxFrame::SfxFrame( Window& i_rContainerWindow, bool i_bHidden )
pWindow->Show();
}
-void SfxFrame::SetPresentationMode( sal_Bool bSet )
+void SfxFrame::SetPresentationMode( bool bSet )
{
if ( GetCurrentViewFrame() )
GetCurrentViewFrame()->GetWindow().SetBorderStyle( bSet ? WINDOW_BORDER_NOBORDER : WINDOW_BORDER_NORMAL );
@@ -358,18 +358,18 @@ Window& SfxFrame::GetWindow() const
return *pWindow;
}
-sal_Bool SfxFrame::Close()
+bool SfxFrame::Close()
{
delete this;
- return sal_True;
+ return true;
}
-void SfxFrame::LockResize_Impl( sal_Bool bLock )
+void SfxFrame::LockResize_Impl( bool bLock )
{
pImp->bLockResize = bLock;
}
-void SfxFrame::SetMenuBarOn_Impl( sal_Bool bOn )
+void SfxFrame::SetMenuBarOn_Impl( bool bOn )
{
pImp->bMenuBarOn = bOn;
@@ -393,7 +393,7 @@ void SfxFrame::SetMenuBarOn_Impl( sal_Bool bOn )
}
}
-sal_Bool SfxFrame::IsMenuBarOn_Impl() const
+bool SfxFrame::IsMenuBarOn_Impl() const
{
return pImp->bMenuBarOn;
}
@@ -412,7 +412,7 @@ void SfxFrame::PrepareForDoc_Impl( SfxObjectShell& i_rDoc )
// plugin mode
sal_Int16 nPluginMode = aDocumentArgs.getOrDefault( "PluginMode", sal_Int16( 0 ) );
if ( nPluginMode && ( nPluginMode != 2 ) )
- SetInPlace_Impl( sal_True );
+ SetInPlace_Impl( true );
}
bool SfxFrame::IsMarkedHidden_Impl() const
diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx
index 2b5ec14..7db5e12 100644
--- a/sfx2/source/view/ipclient.cxx
+++ b/sfx2/source/view/ipclient.cxx
@@ -930,7 +930,7 @@ ErrCode SfxInPlaceClient::DoVerb( long nVerb )
{
if ( m_pViewSh )
- m_pViewSh->GetViewFrame()->GetTopFrame().LockResize_Impl(sal_True);
+ m_pViewSh->GetViewFrame()->GetTopFrame().LockResize_Impl(true);
try
{
m_pImp->m_xObject->setClientSite( m_pImp->m_xClient );
@@ -985,7 +985,7 @@ ErrCode SfxInPlaceClient::DoVerb( long nVerb )
if ( m_pViewSh )
{
SfxViewFrame* pFrame = m_pViewSh->GetViewFrame();
- pFrame->GetTopFrame().LockResize_Impl(sal_False);
+ pFrame->GetTopFrame().LockResize_Impl(false);
pFrame->GetTopFrame().Resize();
}
}
@@ -1051,7 +1051,7 @@ void SfxInPlaceClient::DeactivateObject()
}
if ( m_pViewSh )
- m_pViewSh->GetViewFrame()->GetTopFrame().LockResize_Impl(sal_True);
+ m_pViewSh->GetViewFrame()->GetTopFrame().LockResize_Impl(true);
if ( m_pImp->m_xObject->getStatus( m_pImp->m_nAspect ) & embed::EmbedMisc::MS_EMBED_ACTIVATEWHENVISIBLE )
{
@@ -1073,7 +1073,7 @@ void SfxInPlaceClient::DeactivateObject()
{
SfxViewFrame* pFrame = m_pViewSh->GetViewFrame();
SfxViewFrame::SetViewFrame( pFrame );
- pFrame->GetTopFrame().LockResize_Impl(sal_False);
+ pFrame->GetTopFrame().LockResize_Impl(false);
pFrame->GetTopFrame().Resize();
}
}
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 3aaddc8..be41c0f 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -306,7 +306,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq )
if ( pParent == &rFrame && rFrame.GetChildFrameCount() )
{
sal_Bool bReloadAvailable = sal_False;
- SfxFrameIterator aIter( rFrame, sal_False );
+ SfxFrameIterator aIter( rFrame, false );
SfxFrame *pChild = aIter.FirstFrame();
while ( pChild )
{
@@ -905,7 +905,7 @@ void SfxViewFrame::StateReload_Impl( SfxItemSet& rSet )
// If any ChildFrame is reloadable, the slot is enabled,
// so you can perfom CTRL-Reload
sal_Bool bReloadAvailable = sal_False;
- SfxFrameIterator aFrameIter( *pFrame, sal_True );
+ SfxFrameIterator aFrameIter( *pFrame, true );
for( SfxFrame* pNextFrame = aFrameIter.FirstFrame();
pFrame;
pNextFrame = pNextFrame ?
@@ -1077,7 +1077,7 @@ void SfxViewFrame::ReleaseObjectShell_Impl()
{
DBG_ASSERT( xObjSh.Is(), "no SfxObjectShell to release!" );
- GetFrame().ReleasingComponent_Impl( sal_True );
+ GetFrame().ReleasingComponent_Impl( true );
if ( GetWindow().HasChildPathFocus( true ) )
{
DBG_ASSERT( !GetActiveChildFrame_Impl(), "Wrong active child frame!" );
@@ -1466,7 +1466,7 @@ SfxViewFrame::SfxViewFrame
pImp->pWindow = new SfxFrameViewWindow_Impl( this, rFrame.GetWindow() );
pImp->pWindow->SetSizePixel( rFrame.GetWindow().GetOutputSizePixel() );
- rFrame.SetOwnsBindings_Impl( sal_True );
+ rFrame.SetOwnsBindings_Impl( true );
rFrame.CreateWorkWindow_Impl();
}
diff --git a/sw/source/core/uibase/app/docsh2.cxx b/sw/source/core/uibase/app/docsh2.cxx
index fb8d353..5870226 100644
--- a/sw/source/core/uibase/app/docsh2.cxx
+++ b/sw/source/core/uibase/app/docsh2.cxx
@@ -1396,12 +1396,12 @@ sal_uLong SwDocShell::LoadStylesFromFile( const OUString& rURL,
// search for filter in WebDocShell, too
SfxMedium aMed( rURL, STREAM_STD_READ );
const SfxFilter* pFlt = 0;
- aMatcher.DetectFilter( aMed, &pFlt, sal_False, sal_False );
+ aMatcher.DetectFilter( aMed, &pFlt, false, false );
if(!pFlt)
{
OUString sWebFactory(OUString::createFromAscii(SwWebDocShell::Factory().GetShortName()));
SfxFilterMatcher aWebMatcher( sWebFactory );
- aWebMatcher.DetectFilter( aMed, &pFlt, sal_False, sal_False );
+ aWebMatcher.DetectFilter( aMed, &pFlt, false, false );
}
// --> OD #i117339# - trigger import only for own formats
bool bImport( false );
@@ -1562,7 +1562,7 @@ int SwFindDocShell( SfxObjectShellRef& xDocSh,
pMed->GetItemSet()->Put( SfxStringItem( SID_PASSWORD, rPasswd ));
if( !pSfxFlt )
- aMatcher.DetectFilter( *pMed, &pSfxFlt, sal_False, sal_False );
+ aMatcher.DetectFilter( *pMed, &pSfxFlt, false, false );
if( pSfxFlt )
{
commit a8f721ff96121697de8a97856ba4da145fc0c14e
Author: Noel Grandin <noel at peralex.com>
Date: Thu Mar 13 11:57:14 2014 +0200
sfx2: sal_Bool->bool
Change-Id: I626371bac4fbd9c6a2cdc5a57a3022f8b6ac55b2
diff --git a/include/sfx2/chalign.hxx b/include/sfx2/chalign.hxx
index bea8eca..3351152 100644
--- a/include/sfx2/chalign.hxx
+++ b/include/sfx2/chalign.hxx
@@ -45,7 +45,7 @@ enum SfxChildAlignment
};
// Verifies that a valid alignment is used
-inline sal_Bool SfxChildAlignValid( SfxChildAlignment eAlign )
+inline bool SfxChildAlignValid( SfxChildAlignment eAlign )
{
return ( eAlign >= SFX_ALIGN_HIGHESTTOP && eAlign <= SFX_ALIGN_NOALIGNMENT );
}
diff --git a/include/sfx2/controlwrapper.hxx b/include/sfx2/controlwrapper.hxx
index 531ad50..acf0d6c 100644
--- a/include/sfx2/controlwrapper.hxx
+++ b/include/sfx2/controlwrapper.hxx
@@ -237,7 +237,7 @@ public:
/** A wrapper for the VCL CheckBox. */
class SFX2_DLLPUBLIC CheckBoxWrapper:
- public SingleControlWrapper< CheckBox, sal_Bool >
+ public SingleControlWrapper< CheckBox, bool >
{
public:
explicit CheckBoxWrapper( CheckBox& rCheckBox );
@@ -245,8 +245,8 @@ public:
virtual bool IsControlDontKnow() const;
virtual void SetControlDontKnow( bool bSet );
- virtual sal_Bool GetControlValue() const;
- virtual void SetControlValue( sal_Bool bValue );
+ virtual bool GetControlValue() const;
+ virtual void SetControlValue( bool bValue );
};
diff --git a/include/sfx2/ctrlitem.hxx b/include/sfx2/ctrlitem.hxx
index c693fc9..9925b54 100644
--- a/include/sfx2/ctrlitem.hxx
+++ b/include/sfx2/ctrlitem.hxx
@@ -57,7 +57,7 @@ public:
void Bind( sal_uInt16 nNewId, SfxBindings * = 0); // Register in SfxBindings
void UnBind();
void ReBind();
- sal_Bool IsBound() const;
+ bool IsBound() const;
void ClearCache();
void SetBindings(SfxBindings &rBindings) { pBindings = &rBindings; }
@@ -75,7 +75,7 @@ public:
static SfxItemState GetItemState( const SfxPoolItem* pState );
- SAL_DLLPRIVATE sal_Bool IsBindable_Impl() const
+ SAL_DLLPRIVATE bool IsBindable_Impl() const
{ return pBindings != NULL; }
SAL_DLLPRIVATE void BindInternal_Impl( sal_uInt16 nNewId, SfxBindings* );
};
diff --git a/sfx2/source/control/ctrlitem.cxx b/sfx2/source/control/ctrlitem.cxx
index f0d05e9..dfeb6e8 100644
--- a/sfx2/source/control/ctrlitem.cxx
+++ b/sfx2/source/control/ctrlitem.cxx
@@ -63,7 +63,7 @@ SfxControllerItem* SfxControllerItem::GetItemLink()
// returns sal_True if this binding is really bound to a function
-sal_Bool SfxControllerItem::IsBound() const
+bool SfxControllerItem::IsBound() const
{
return pNext != this;
}
diff --git a/sfx2/source/dialog/itemconnect.cxx b/sfx2/source/dialog/itemconnect.cxx
index 8fe25fe..9211329 100644
--- a/sfx2/source/dialog/itemconnect.cxx
+++ b/sfx2/source/dialog/itemconnect.cxx
@@ -123,12 +123,12 @@ void CheckBoxWrapper::SetControlDontKnow( bool bSet )
GetControl().SetState( bSet ? TRISTATE_INDET : TRISTATE_FALSE );
}
-sal_Bool CheckBoxWrapper::GetControlValue() const
+bool CheckBoxWrapper::GetControlValue() const
{
return GetControl().IsChecked();
}
-void CheckBoxWrapper::SetControlValue( sal_Bool bValue )
+void CheckBoxWrapper::SetControlValue( bool bValue )
{
GetControl().Check( bValue );
}
diff --git a/sfx2/source/dialog/navigat.cxx b/sfx2/source/dialog/navigat.cxx
index 31cebec..66faa47 100644
--- a/sfx2/source/dialog/navigat.cxx
+++ b/sfx2/source/dialog/navigat.cxx
@@ -39,7 +39,7 @@ SfxNavigatorWrapper::SfxNavigatorWrapper( Window* pParentWnd ,
pWindow->SetOutputSizePixel( Size( 270, 240 ) );
( ( SfxDockingWindow* ) pWindow )->Initialize( pInfo );
- SetHideNotDelete( sal_True );
+ SetHideNotDelete( true );
}
SfxNavigator::SfxNavigator( SfxBindings* pBind ,
diff --git a/sfx2/source/dialog/taskpane.cxx b/sfx2/source/dialog/taskpane.cxx
index f8687b1..e86f06e 100644
--- a/sfx2/source/dialog/taskpane.cxx
+++ b/sfx2/source/dialog/taskpane.cxx
@@ -246,7 +246,7 @@ namespace sfx2
pWindow->SetOutputSizePixel( Size( 300, 450 ) );
dynamic_cast< SfxDockingWindow* >( pWindow )->Initialize( i_pInfo );
- SetHideNotDelete( sal_True );
+ SetHideNotDelete( true );
pWindow->Show();
}
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index d5387ae..38fa315 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -1421,7 +1421,7 @@ void SfxCommonTemplateDialog_Impl::SetWaterCanState(const SfxBoolItem *pItem)
for(size_t n = 0; n < nCount; n++)
{
SfxControllerItem *pCItem=pBoundItems[n];
- sal_Bool bChecked = pItem && pItem->GetValue();
+ bool bChecked = pItem && pItem->GetValue();
if( pCItem->IsBound() == bChecked )
{
if( !bChecked )
diff --git a/sfx2/source/inc/partwnd.hxx b/sfx2/source/inc/partwnd.hxx
index 0ecf7e5..71bb446 100644
--- a/sfx2/source/inc/partwnd.hxx
+++ b/sfx2/source/inc/partwnd.hxx
@@ -52,7 +52,7 @@ public:
SFX_DECL_CHILDWINDOW(SfxPartChildWnd_Impl);
~SfxPartChildWnd_Impl();
- virtual sal_Bool QueryClose();
+ virtual sal_Bool QueryClose();
};
// class SfxExplorerDockWnd_Impl -----------------------------------------
diff --git a/sfx2/source/inc/recfloat.hxx b/sfx2/source/inc/recfloat.hxx
index dfb3a59..1562b5e 100644
--- a/sfx2/source/inc/recfloat.hxx
+++ b/sfx2/source/inc/recfloat.hxx
@@ -34,7 +34,7 @@ public:
~SfxRecordingFloatWrapper_Impl();
SFX_DECL_CHILDWINDOW(SfxRecordingFloatWrapper_Impl);
- virtual sal_Bool QueryClose();
+ virtual sal_Bool QueryClose();
};
class SfxRecordingFloat_Impl : public SfxFloatingWindow
diff --git a/sfx2/source/sidebar/SidebarChildWindow.cxx b/sfx2/source/sidebar/SidebarChildWindow.cxx
index f4347b1..1cb12104 100644
--- a/sfx2/source/sidebar/SidebarChildWindow.cxx
+++ b/sfx2/source/sidebar/SidebarChildWindow.cxx
@@ -52,7 +52,7 @@ SidebarChildWindow::SidebarChildWindow (
SfxDockingWindow* pDockingParent = dynamic_cast<SfxDockingWindow*>(this->pWindow);
if (pDockingParent != NULL)
pDockingParent->Initialize(pInfo);
- SetHideNotDelete(sal_True);
+ SetHideNotDelete(true);
this->pWindow->Show();
}
diff --git a/svx/source/dialog/SpellDialogChildWindow.cxx b/svx/source/dialog/SpellDialogChildWindow.cxx
index 7df28db..d05e500 100644
--- a/svx/source/dialog/SpellDialogChildWindow.cxx
+++ b/svx/source/dialog/SpellDialogChildWindow.cxx
@@ -40,7 +40,7 @@ SpellDialogChildWindow::SpellDialogChildWindow (
this );
pWindow = m_pAbstractSpellDialog->GetWindow();
eChildAlignment = SFX_ALIGN_NOALIGNMENT;
- SetHideNotDelete (sal_True);
+ SetHideNotDelete(true);
}
SpellDialogChildWindow::~SpellDialogChildWindow (void)
diff --git a/svx/source/dialog/hyperdlg.cxx b/svx/source/dialog/hyperdlg.cxx
index 3ac50cd..31f3ffa 100644
--- a/svx/source/dialog/hyperdlg.cxx
+++ b/svx/source/dialog/hyperdlg.cxx
@@ -79,7 +79,7 @@ SvxHlinkDlgWrapper::SvxHlinkDlgWrapper( Window* _pParent, sal_uInt16 nId,
eChildAlignment = SFX_ALIGN_NOALIGNMENT;
- SetHideNotDelete( sal_True );
+ SetHideNotDelete( true );
}
SfxChildWinInfo SvxHlinkDlgWrapper::GetInfo() const
@@ -89,7 +89,7 @@ SfxChildWinInfo SvxHlinkDlgWrapper::GetInfo() const
sal_Bool SvxHlinkDlgWrapper::QueryClose()
{
- return mpDlg ? mpDlg->QueryClose() : sal_True;
+ return !mpDlg || mpDlg->QueryClose();
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 5fe7ecc04f35ef785510e3ef404f46eb6f05a123
Author: Noel Grandin <noel at peralex.com>
Date: Thu Mar 13 10:22:49 2014 +0200
sfx2: sal_Bool->bool
Change-Id: I56a50ee4a169c8f82c830ebf498f7ead1335f0b5
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx b/dbaccess/source/core/dataaccess/ModelImpl.cxx
index fcf3574..4149433 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.cxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx
@@ -1292,10 +1292,10 @@ sal_Int16 ODatabaseModelImpl::getCurrentMacroExecMode() const
return nCurrentMode;
}
-sal_Bool ODatabaseModelImpl::setCurrentMacroExecMode( sal_uInt16 nMacroMode )
+bool ODatabaseModelImpl::setCurrentMacroExecMode( sal_uInt16 nMacroMode )
{
m_aMediaDescriptor.put( "MacroExecutionMode", nMacroMode );
- return sal_True;
+ return true;
}
OUString ODatabaseModelImpl::getDocumentLocation() const
@@ -1338,7 +1338,7 @@ ODatabaseModelImpl::EmbeddedMacros ODatabaseModelImpl::determineEmbeddedMacros()
return *m_aEmbeddedMacros;
}
-sal_Bool ODatabaseModelImpl::documentStorageHasMacros() const
+bool ODatabaseModelImpl::documentStorageHasMacros() const
{
const_cast< ODatabaseModelImpl* >( this )->determineEmbeddedMacros();
return ( *m_aEmbeddedMacros != eNoMacros );
@@ -1355,10 +1355,10 @@ sal_Int16 ODatabaseModelImpl::getScriptingSignatureState()
return SIGNATURESTATE_NOSIGNATURES;
}
-sal_Bool ODatabaseModelImpl::hasTrustedScriptingSignature( sal_Bool /*bAllowUIToAddAuthor*/ )
+bool ODatabaseModelImpl::hasTrustedScriptingSignature( bool /*bAllowUIToAddAuthor*/ )
{
// no support for signatures at the moment
- return sal_False;
+ return false;
}
void ODatabaseModelImpl::showBrokenSignatureWarning( const Reference< XInteractionHandler >& /*_rxInteraction*/ ) const
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.hxx b/dbaccess/source/core/dataaccess/ModelImpl.hxx
index 814a5b9..bfb9763 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.hxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.hxx
@@ -476,13 +476,13 @@ public:
public:
// IMacroDocumentAccess overridables
virtual sal_Int16 getCurrentMacroExecMode() const;
- virtual sal_Bool setCurrentMacroExecMode( sal_uInt16 );
+ virtual bool setCurrentMacroExecMode( sal_uInt16 );
virtual OUString getDocumentLocation() const;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > getZipStorageToSign();
- virtual sal_Bool documentStorageHasMacros() const;
+ virtual bool documentStorageHasMacros() const;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::document::XEmbeddedScripts > getEmbeddedDocumentScripts() const;
virtual sal_Int16 getScriptingSignatureState();
- virtual sal_Bool hasTrustedScriptingSignature( sal_Bool bAllowUIToAddAuthor );
+ virtual bool hasTrustedScriptingSignature( bool bAllowUIToAddAuthor );
virtual void showBrokenSignatureWarning( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& _rxInteraction ) const;
// IModifiableDocument
diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx
index c0e9550..56a358a 100644
--- a/dbaccess/source/filter/xml/xmlfilter.cxx
+++ b/dbaccess/source/filter/xml/xmlfilter.cxx
@@ -436,7 +436,7 @@ sal_Bool ODBFilter::implImport( const Sequence< PropertyValue >& rDescriptor )
uno::Reference< embed::XStorage > xStorage;
try
{
- xStorage.set( pMedium->GetStorage( sal_False ), UNO_QUERY_THROW );
+ xStorage.set( pMedium->GetStorage( false ), UNO_QUERY_THROW );
}
catch (const Exception&)
{
diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx
index beffc57..86e466a 100644
--- a/include/sfx2/dinfdlg.hxx
+++ b/include/sfx2/dinfdlg.hxx
@@ -62,9 +62,9 @@ struct CustomProperty;
class SFX2_DLLPUBLIC SfxDocumentInfoItem : public SfxStringItem
{
private:
- sal_Int32 m_AutoloadDelay;
+ sal_Int32 m_AutoloadDelay;
OUString m_AutoloadURL;
- sal_Bool m_isAutoloadEnabled;
+ bool m_isAutoloadEnabled;
OUString m_DefaultTarget;
OUString m_TemplateName;
OUString m_Author;
@@ -73,15 +73,15 @@ private:
::com::sun::star::util::DateTime m_ModificationDate;
OUString m_PrintedBy;
::com::sun::star::util::DateTime m_PrintDate;
- sal_Int16 m_EditingCycles;
- sal_Int32 m_EditingDuration;
+ sal_Int16 m_EditingCycles;
+ sal_Int32 m_EditingDuration;
OUString m_Description;
OUString m_Keywords;
OUString m_Subject;
OUString m_Title;
- sal_Bool m_bHasTemplate;
- sal_Bool m_bDeleteUserData;
- sal_Bool m_bUseUserData;
+ bool m_bHasTemplate;
+ bool m_bDeleteUserData;
+ bool m_bUseUserData;
std::vector< CustomProperty* > m_aCustomProperties;
::com::sun::star::uno::Sequence< ::com::sun::star::document::CmisProperty > m_aCmisProperties;
@@ -93,7 +93,7 @@ public:
::com::sun::star::document::XDocumentProperties> & i_xDocProps,
const ::com::sun::star::uno::Sequence<
::com::sun::star::document::CmisProperty> & i_cmisProps,
- sal_Bool bUseUserData );
+ bool bUseUserData );
SfxDocumentInfoItem( const SfxDocumentInfoItem& );
virtual ~SfxDocumentInfoItem();
@@ -103,10 +103,10 @@ public:
::com::sun::star::document::XDocumentProperties> & i_xDocProps,
bool i_bDoNotUpdateUserDefined = false)
const;
- sal_Bool isCmisDocument() const { return m_aCmisProperties.getLength() > 0;}
+ bool isCmisDocument() const { return m_aCmisProperties.getLength() > 0;}
- sal_Bool isAutoloadEnabled() const { return m_isAutoloadEnabled; }
- void setAutoloadEnabled(sal_Bool i_val) { m_isAutoloadEnabled = i_val; }
+ bool isAutoloadEnabled() const { return m_isAutoloadEnabled; }
+ void setAutoloadEnabled(bool i_val) { m_isAutoloadEnabled = i_val; }
sal_Int32 getAutoloadDelay() const { return m_AutoloadDelay; }
void setAutoloadDelay(sal_Int32 i_val) { m_AutoloadDelay = i_val; }
OUString getAutoloadURL() const { return m_AutoloadURL; }
@@ -154,12 +154,12 @@ public:
/// reset user-specific data (author, modified-by, ...)
void resetUserData(const OUString & i_rAuthor);
- void SetTemplate( sal_Bool b ) { m_bHasTemplate = b; }
- sal_Bool HasTemplate() const { return m_bHasTemplate; }
- void SetDeleteUserData( sal_Bool bSet );
- void SetUseUserData( sal_Bool bSet );
- sal_Bool IsDeleteUserData() const;
- sal_Bool IsUseUserData() const;
+ void SetTemplate( bool b ) { m_bHasTemplate = b; }
+ bool HasTemplate() const { return m_bHasTemplate; }
+ void SetDeleteUserData( bool bSet );
+ void SetUseUserData( bool bSet );
+ bool IsDeleteUserData() const;
+ bool IsUseUserData() const;
std::vector< CustomProperty* > GetCustomProperties() const;
void ClearCustomProperties();
@@ -207,7 +207,7 @@ private:
OUString m_aUnknownSize;
OUString m_aMultiSignedStr;
- sal_Bool bEnableUseUserData : 1,
+ bool bEnableUseUserData : 1,
bHandleDelete : 1;
DECL_LINK(DeleteHdl, void *);
diff --git a/include/sfx2/dispatch.hxx b/include/sfx2/dispatch.hxx
index 0f1f908..f9d1d3a 100644
--- a/include/sfx2/dispatch.hxx
+++ b/include/sfx2/dispatch.hxx
@@ -68,7 +68,7 @@ class SFX2_DLLPUBLIC SfxDispatcher
private:
// Search for temporary evaluated Todos
- SAL_DLLPRIVATE sal_Bool CheckVirtualStack( const SfxShell& rShell, sal_Bool bDeep );
+ SAL_DLLPRIVATE bool CheckVirtualStack( const SfxShell& rShell, bool bDeep );
#ifndef _SFX_HXX
@@ -78,8 +78,8 @@ friend class SfxViewFrame;
DECL_DLLPRIVATE_LINK( EventHdl_Impl, void * );
DECL_DLLPRIVATE_LINK( PostMsgHandler, SfxRequest * );
- SAL_DLLPRIVATE int Call_Impl( SfxShell& rShell, const SfxSlot &rSlot, SfxRequest &rReq, sal_Bool bRecord );
- SAL_DLLPRIVATE void _Update_Impl( sal_Bool,sal_Bool,sal_Bool,SfxWorkWindow*);
+ SAL_DLLPRIVATE int Call_Impl( SfxShell& rShell, const SfxSlot &rSlot, SfxRequest &rReq, bool bRecord );
+ SAL_DLLPRIVATE void _Update_Impl( bool,bool,bool,SfxWorkWindow*);
SAL_DLLPRIVATE void CollectTools_Impl(SfxWorkWindow*);
protected:
@@ -89,9 +89,9 @@ friend class SfxPopupMenuManager;
friend class SfxHelp;
// For bindings: Finding the Message;
// level for re-access
- SAL_DLLPRIVATE sal_Bool _TryIntercept_Impl( sal_uInt16 nId, SfxSlotServer &rServer, sal_Bool bModal );
- sal_Bool _FindServer( sal_uInt16 nId, SfxSlotServer &rServer, sal_Bool bModal );
- sal_Bool _FillState( const SfxSlotServer &rServer,
+ SAL_DLLPRIVATE bool _TryIntercept_Impl( sal_uInt16 nId, SfxSlotServer &rServer, bool bModal );
+ bool _FindServer( sal_uInt16 nId, SfxSlotServer &rServer, bool bModal );
+ bool _FillState( const SfxSlotServer &rServer,
SfxItemSet &rState, const SfxSlot *pRealSlot );
void _Execute( SfxShell &rShell, const SfxSlot &rSlot,
SfxRequest &rReq,
@@ -135,7 +135,7 @@ public:
const SfxSlot* GetSlot( const OUString& rCommand );
- sal_Bool IsActive( const SfxShell& rShell );
+ bool IsActive( const SfxShell& rShell );
sal_uInt16 GetShellLevel( const SfxShell &rShell );
SfxBindings* GetBindings() const;
@@ -153,15 +153,15 @@ public:
static void ExecutePopup( sal_uInt16 nConfigId = 0,
Window *pWin = 0, const Point *pPosPixel = 0 );
- sal_Bool IsAppDispatcher() const;
+ bool IsAppDispatcher() const;
bool IsFlushed() const;
void Flush();
- void Lock( sal_Bool bLock );
- sal_Bool IsLocked( sal_uInt16 nSID = 0 ) const;
+ void Lock( bool bLock );
+ bool IsLocked( sal_uInt16 nSID = 0 ) const;
void SetSlotFilter( sal_Bool bEnable = sal_False,
sal_uInt16 nCount = 0, const sal_uInt16 *pSIDs = 0 );
- void HideUI( sal_Bool bHide = sal_True );
+ void HideUI( bool bHide = true );
void ShowObjectBar(sal_uInt16 nId, SfxShell *pShell=0) const;
sal_uInt32 GetObjectBarId( sal_uInt16 nPos ) const;
@@ -173,21 +173,21 @@ public:
sal_uInt32 GetDisableFlags() const;
SAL_DLLPRIVATE void SetMenu_Impl();
- SAL_DLLPRIVATE void Update_Impl( sal_Bool bForce = sal_False ); // ObjectBars etc.
- SAL_DLLPRIVATE sal_Bool IsUpdated_Impl() const;
+ SAL_DLLPRIVATE void Update_Impl( bool bForce = false ); // ObjectBars etc.
+ SAL_DLLPRIVATE bool IsUpdated_Impl() const;
SAL_DLLPRIVATE int GetShellAndSlot_Impl( sal_uInt16 nSlot, SfxShell **ppShell, const SfxSlot **ppSlot,
- sal_Bool bOwnShellsOnly, sal_Bool bModal, sal_Bool bRealSlot=sal_True );
- SAL_DLLPRIVATE void SetReadOnly_Impl( sal_Bool bOn );
- SAL_DLLPRIVATE sal_Bool GetReadOnly_Impl() const;
+ bool bOwnShellsOnly, bool bModal, bool bRealSlot=true );
+ SAL_DLLPRIVATE void SetReadOnly_Impl( bool bOn );
+ SAL_DLLPRIVATE bool GetReadOnly_Impl() const;
SAL_DLLPRIVATE sal_Bool IsSlotEnabledByFilter_Impl( sal_uInt16 nSID ) const;
- SAL_DLLPRIVATE void SetQuietMode_Impl( sal_Bool bOn );
- SAL_DLLPRIVATE sal_Bool IsReadOnlyShell_Impl( sal_uInt16 nShell ) const;
+ SAL_DLLPRIVATE void SetQuietMode_Impl( bool bOn );
+ SAL_DLLPRIVATE bool IsReadOnlyShell_Impl( sal_uInt16 nShell ) const;
SAL_DLLPRIVATE void RemoveShell_Impl( SfxShell& rShell );
SAL_DLLPRIVATE void DoParentActivate_Impl();
SAL_DLLPRIVATE void DoParentDeactivate_Impl();
- SAL_DLLPRIVATE void DoActivate_Impl( sal_Bool bMDI, SfxViewFrame* pOld );
- SAL_DLLPRIVATE void DoDeactivate_Impl( sal_Bool bMDI, SfxViewFrame* pNew );
- SAL_DLLPRIVATE void InvalidateBindings_Impl(sal_Bool);
+ SAL_DLLPRIVATE void DoActivate_Impl( bool bMDI, SfxViewFrame* pOld );
+ SAL_DLLPRIVATE void DoDeactivate_Impl( bool bMDI, SfxViewFrame* pNew );
+ SAL_DLLPRIVATE void InvalidateBindings_Impl(bool);
SAL_DLLPRIVATE sal_uInt16 GetNextToolBox_Impl( sal_uInt16 nPos, sal_uInt16 nType, OUString *pStr );
};
diff --git a/include/sfx2/docfac.hxx b/include/sfx2/docfac.hxx
index af0b7f9..85d25fe 100644
--- a/include/sfx2/docfac.hxx
+++ b/include/sfx2/docfac.hxx
@@ -71,7 +71,7 @@ public:
OUString GetFactoryURL() const; // shortcut for "private:factory/GetShortName()"
OUString GetFactoryName() const { return OUString::createFromAscii(pShortName); }
OUString GetModuleName() const;
- SfxFilterContainer *GetFilterContainer( sal_Bool bForceLoad = sal_True) const;
+ SfxFilterContainer *GetFilterContainer( bool bForceLoad = true) const;
// Views
void RegisterViewFactory(SfxViewFactory &rFactory);
diff --git a/include/sfx2/docfile.hxx b/include/sfx2/docfile.hxx
index 33450a3..ef9ef9b 100644
--- a/include/sfx2/docfile.hxx
+++ b/include/sfx2/docfile.hxx
@@ -60,7 +60,7 @@ class SFX2_DLLPUBLIC SfxMedium : public SvRefBase
SAL_DLLPRIVATE void SetIsRemote_Impl();
SAL_DLLPRIVATE void CloseInStream_Impl();
- SAL_DLLPRIVATE sal_Bool CloseOutStream_Impl();
+ SAL_DLLPRIVATE bool CloseOutStream_Impl();
SAL_DLLPRIVATE void CloseStreams_Impl();
DECL_DLLPRIVATE_STATIC_LINK( SfxMedium, UCBHdl_Impl, sal_uInt32 * );
@@ -102,20 +102,20 @@ public:
~SfxMedium();
- void UseInteractionHandler( sal_Bool );
+ void UseInteractionHandler( bool );
css::uno::Reference< css::task::XInteractionHandler >
GetInteractionHandler();
void setStreamToLoadFrom(
const css::uno::Reference<css::io::XInputStream>& xInputStream,
- sal_Bool bIsReadOnly);
+ bool bIsReadOnly);
void SetLoadTargetFrame(SfxFrame* pFrame );
SfxFrame* GetLoadTargetFrame() const;
- void SetFilter(const SfxFilter *pFlt, sal_Bool bResetOrig = sal_False);
+ void SetFilter(const SfxFilter *pFlt, bool bResetOrig = false);
const SfxFilter* GetFilter() const;
- const SfxFilter * GetOrigFilter( sal_Bool bNotCurrent = sal_False ) const;
+ const SfxFilter * GetOrigFilter( bool bNotCurrent = false ) const;
const OUString& GetOrigURL() const;
SfxItemSet * GetItemSet() const;
@@ -127,13 +127,13 @@ public:
const INetURLObject& GetURLObject() const;
void CheckFileDate( const css::util::DateTime& aInitDate );
- sal_Bool DocNeedsFileDateCheck();
- css::util::DateTime GetInitFileDate( sal_Bool bIgnoreOldValue );
+ bool DocNeedsFileDateCheck();
+ css::util::DateTime GetInitFileDate( bool bIgnoreOldValue );
css::uno::Reference< css::ucb::XContent > GetContent() const;
const OUString& GetPhysicalName() const;
- sal_Bool IsRemote();
- sal_Bool IsOpen() const; // { return aStorage.Is() || pInStream; }
+ bool IsRemote();
+ bool IsOpen() const; // { return aStorage.Is() || pInStream; }
void DownLoad( const Link& aLink = Link());
void SetDoneLink( const Link& rLink );
@@ -147,36 +147,36 @@ public:
void AddLog( const OUString& aMessage );
void CloseInStream();
- sal_Bool CloseOutStream();
+ bool CloseOutStream();
void CloseStorage();
StreamMode GetOpenMode() const;
- void SetOpenMode( StreamMode nStorOpen, sal_Bool bDontClose = sal_False );
+ void SetOpenMode( StreamMode nStorOpen, bool bDontClose = false );
SvStream* GetInStream();
SvStream* GetOutStream();
- sal_Bool Commit();
- sal_Bool IsStorage();
+ bool Commit();
+ bool IsStorage();
- sal_Int8 ShowLockedDocumentDialog( const css::uno::Sequence< OUString >& aData, sal_Bool bIsLoading, sal_Bool bOwnLock );
- void LockOrigFileOnDemand( sal_Bool bLoading, sal_Bool bNoUI );
- void UnlockFile( sal_Bool bReleaseLockStream );
+ sal_Int8 ShowLockedDocumentDialog( const css::uno::Sequence< OUString >& aData, bool bIsLoading, bool bOwnLock );
+ void LockOrigFileOnDemand( bool bLoading, bool bNoUI );
+ void UnlockFile( bool bReleaseLockStream );
- css::uno::Reference< css::embed::XStorage > GetStorage( sal_Bool bCreateTempIfNo = sal_True );
+ css::uno::Reference< css::embed::XStorage > GetStorage( bool bCreateTempIfNo = true );
css::uno::Reference< css::embed::XStorage > GetOutputStorage();
void ResetError();
- sal_Bool UsesCache() const;
- void SetUsesCache( sal_Bool );
- sal_Bool IsExpired() const;
- void SetName( const OUString& rName, sal_Bool bSetOrigURL = sal_False );
- sal_Bool IsAllowedForExternalBrowser() const;
+ bool UsesCache() const;
+ void SetUsesCache( bool );
+ bool IsExpired() const;
+ void SetName( const OUString& rName, bool bSetOrigURL = false );
+ bool IsAllowedForExternalBrowser() const;
long GetFileVersion() const;
const css::uno::Sequence < css::util::RevisionTag >&
GetVersionList( bool _bNoReload = false );
- sal_Bool IsReadOnly();
+ bool IsReadOnly();
// Whether the medium had originally been opened r/o, independent of later
// changes via SetOpenMode; used to keep track of the "true" state of the
@@ -185,21 +185,21 @@ public:
css::uno::Reference< css::io::XInputStream > GetInputStream();
- void CreateTempFile( sal_Bool bReplace = sal_True );
+ void CreateTempFile( bool bReplace = true );
void CreateTempFileNoCopy();
- OUString SwitchDocumentToTempFile();
- sal_Bool SwitchDocumentToFile( const OUString& aURL );
+ OUString SwitchDocumentToTempFile();
+ bool SwitchDocumentToFile( const OUString& aURL );
- OUString GetBaseURL( bool bForSaving=false );
+ OUString GetBaseURL( bool bForSaving=false );
void SetInCheckIn( bool bInCheckIn );
bool IsInCheckIn( );
- SAL_DLLPRIVATE sal_Bool HasStorage_Impl() const;
+ SAL_DLLPRIVATE bool HasStorage_Impl() const;
SAL_DLLPRIVATE void StorageBackup_Impl();
SAL_DLLPRIVATE OUString GetBackup_Impl();
- SAL_DLLPRIVATE css::uno::Reference< css::embed::XStorage > GetZipStorageToSign_Impl( sal_Bool bReadOnly = sal_True );
+ SAL_DLLPRIVATE css::uno::Reference< css::embed::XStorage > GetZipStorageToSign_Impl( bool bReadOnly = true );
SAL_DLLPRIVATE void CloseZipStorage_Impl();
// the storage that will be returned by the medium on GetStorage request
@@ -208,36 +208,36 @@ public:
SAL_DLLPRIVATE css::uno::Reference< css::io::XInputStream > GetInputStream_Impl();
SAL_DLLPRIVATE void CloseAndReleaseStreams_Impl();
SAL_DLLPRIVATE sal_uInt16 AddVersion_Impl( css::util::RevisionTag& rVersion );
- SAL_DLLPRIVATE sal_Bool TransferVersionList_Impl( SfxMedium& rMedium );
- SAL_DLLPRIVATE sal_Bool SaveVersionList_Impl( sal_Bool bUseXML );
- SAL_DLLPRIVATE sal_Bool RemoveVersion_Impl( const OUString& rVersion );
+ SAL_DLLPRIVATE bool TransferVersionList_Impl( SfxMedium& rMedium );
+ SAL_DLLPRIVATE bool SaveVersionList_Impl( bool bUseXML );
+ SAL_DLLPRIVATE bool RemoveVersion_Impl( const OUString& rVersion );
SAL_DLLPRIVATE void SetExpired_Impl( const DateTime& rDateTime );
SAL_DLLPRIVATE SvKeyValueIterator* GetHeaderAttributes_Impl();
// Diese Protokolle liefern MIME Typen
- SAL_DLLPRIVATE sal_Bool SupportsMIME_Impl() const;
+ SAL_DLLPRIVATE bool SupportsMIME_Impl() const;
SAL_DLLPRIVATE void Init_Impl();
- SAL_DLLPRIVATE void ForceSynchronStream_Impl( sal_Bool bSynchron );
+ SAL_DLLPRIVATE void ForceSynchronStream_Impl( bool bSynchron );
SAL_DLLPRIVATE void GetLockingStream_Impl();
SAL_DLLPRIVATE void GetMedium_Impl();
- SAL_DLLPRIVATE sal_Bool TryDirectTransfer( const OUString& aURL, SfxItemSet& aTargetSet );
+ SAL_DLLPRIVATE bool TryDirectTransfer( const OUString& aURL, SfxItemSet& aTargetSet );
SAL_DLLPRIVATE void Transfer_Impl();
SAL_DLLPRIVATE void CreateFileStream();
- SAL_DLLPRIVATE void SetUpdatePickList(sal_Bool);
- SAL_DLLPRIVATE sal_Bool IsUpdatePickList() const;
+ SAL_DLLPRIVATE void SetUpdatePickList(bool);
+ SAL_DLLPRIVATE bool IsUpdatePickList() const;
SAL_DLLPRIVATE void SetLongName(const OUString &rName);
SAL_DLLPRIVATE const OUString & GetLongName() const;
- SAL_DLLPRIVATE ErrCode CheckOpenMode_Impl( sal_Bool bSilent, sal_Bool bAllowRO = sal_True );
- SAL_DLLPRIVATE sal_Bool IsPreview_Impl();
+ SAL_DLLPRIVATE ErrCode CheckOpenMode_Impl( bool bSilent, bool bAllowRO = true );
+ SAL_DLLPRIVATE bool IsPreview_Impl();
SAL_DLLPRIVATE void ClearBackup_Impl();
SAL_DLLPRIVATE void Done_Impl( ErrCode );
SAL_DLLPRIVATE void SetPhysicalName_Impl(const OUString& rName);
- SAL_DLLPRIVATE void CanDisposeStorage_Impl( sal_Bool bDisposeStorage );
- SAL_DLLPRIVATE sal_Bool WillDisposeStorageOnClose_Impl();
+ SAL_DLLPRIVATE void CanDisposeStorage_Impl( bool bDisposeStorage );
+ SAL_DLLPRIVATE bool WillDisposeStorageOnClose_Impl();
SAL_DLLPRIVATE void DoBackup_Impl();
SAL_DLLPRIVATE void DoInternalBackup_Impl( const ::ucbhelper::Content& aOriginalContent );
@@ -246,16 +246,16 @@ public:
const OUString& aExtension,
const OUString& aDestDir );
- SAL_DLLPRIVATE sal_Bool UseBackupToRestore_Impl( ::ucbhelper::Content& aOriginalContent,
+ SAL_DLLPRIVATE bool UseBackupToRestore_Impl( ::ucbhelper::Content& aOriginalContent,
const css::uno::Reference< css::ucb::XCommandEnvironment >& xComEnv );
- SAL_DLLPRIVATE sal_Bool StorageCommit_Impl();
+ SAL_DLLPRIVATE bool StorageCommit_Impl();
- SAL_DLLPRIVATE sal_Bool TransactedTransferForFS_Impl( const INetURLObject& aSource,
+ SAL_DLLPRIVATE bool TransactedTransferForFS_Impl( const INetURLObject& aSource,
const INetURLObject& aDest,
const css::uno::Reference< css::ucb::XCommandEnvironment >& xComEnv );
- SAL_DLLPRIVATE sal_Bool SignContents_Impl( sal_Bool bScriptingContent, const OUString& aODFVersion, sal_Bool bHasValidDocumentSignature );
+ SAL_DLLPRIVATE bool SignContents_Impl( bool bScriptingContent, const OUString& aODFVersion, bool bHasValidDocumentSignature );
// the following two methods must be used and make sence only during saving currently
// TODO/LATER: in future the signature state should be controlled by the medium not by the document
@@ -266,10 +266,10 @@ public:
static css::uno::Sequence < css::util::RevisionTag > GetVersionList(
const css::uno::Reference< css::embed::XStorage >& xStorage );
static OUString CreateTempCopyWithExt( const OUString& aURL );
- static sal_Bool CallApproveHandler( const css::uno::Reference< css::task::XInteractionHandler >& xHandler, css::uno::Any aRequest, sal_Bool bAllowAbort );
+ static bool CallApproveHandler( const css::uno::Reference< css::task::XInteractionHandler >& xHandler, css::uno::Any aRequest, bool bAllowAbort );
- static sal_Bool SetWritableForUserOnly( const OUString& aURL );
- static sal_uInt32 CreatePasswordToModifyHash( const OUString& aPasswd, sal_Bool bWriter );
+ static bool SetWritableForUserOnly( const OUString& aURL );
+ static sal_uInt32 CreatePasswordToModifyHash( const OUString& aPasswd, bool bWriter );
};
SV_DECL_IMPL_REF( SfxMedium )
diff --git a/include/sfx2/dockwin.hxx b/include/sfx2/dockwin.hxx
index 19ffcb8..f299889 100644
--- a/include/sfx2/dockwin.hxx
+++ b/include/sfx2/dockwin.hxx
@@ -99,8 +99,8 @@ public:
void SetMinOutputSizePixel( const Size& rSize );
Size GetMinOutputSizePixel() const;
virtual bool Notify( NotifyEvent& rNEvt );
- virtual void FadeIn( sal_Bool );
- void AutoShow( sal_Bool bShow = sal_True );
+ virtual void FadeIn( bool );
+ void AutoShow( bool bShow = true );
DECL_LINK(TimerHdl, void *);
SAL_DLLPRIVATE void Initialize_Impl();
@@ -108,9 +108,9 @@ public:
SAL_DLLPRIVATE void SetItemSize_Impl( const Size& rSize );
SAL_DLLPRIVATE void Disappear_Impl();
SAL_DLLPRIVATE void Reappear_Impl();
- SAL_DLLPRIVATE sal_Bool IsAutoHide_Impl() const;
- SAL_DLLPRIVATE void AutoShow_Impl( sal_Bool bShow = sal_True );
- SAL_DLLPRIVATE void Pin_Impl( sal_Bool bPinned );
+ SAL_DLLPRIVATE bool IsAutoHide_Impl() const;
+ SAL_DLLPRIVATE void AutoShow_Impl( bool bShow = true );
+ SAL_DLLPRIVATE void Pin_Impl( bool bPinned );
SAL_DLLPRIVATE void ReleaseChildWindow_Impl();
};
diff --git a/include/sfx2/docmacromode.hxx b/include/sfx2/docmacromode.hxx
index 016f94a..c971cb9 100644
--- a/include/sfx2/docmacromode.hxx
+++ b/include/sfx2/docmacromode.hxx
@@ -82,7 +82,7 @@ namespace sfx2
see getCurrentMacroExecMode
*/
- virtual sal_Bool
+ virtual bool
setCurrentMacroExecMode( sal_uInt16 ) = 0;
/** returns the origin of the document
@@ -123,7 +123,7 @@ namespace sfx2
isn't sufficient (e.g. database documents which contain sub documents which can also
contain macro/script storages).
*/
- virtual sal_Bool
+ virtual bool
documentStorageHasMacros() const = 0;
/** provides access to the XEmbeddedScripts interface of the document
@@ -161,8 +161,8 @@ namespace sfx2
@seealso <sfx2/signaturestate.hxx>
*/
- virtual sal_Bool
- hasTrustedScriptingSignature( sal_Bool bAllowUIToAddAuthor ) = 0;
+ virtual bool
+ hasTrustedScriptingSignature( bool bAllowUIToAddAuthor ) = 0;
/** shows a warning that the document's signature is broken
@@ -214,7 +214,7 @@ namespace sfx2
@return
<TRUE/>, always
*/
- sal_Bool allowMacroExecution();
+ bool allowMacroExecution();
/** disallows macro execution in the document
@@ -223,7 +223,7 @@ namespace sfx2
@return
<TRUE/>, always
*/
- sal_Bool disallowMacroExecution();
+ bool disallowMacroExecution();
/** checks whether the document allows executing contained macros.
@@ -245,7 +245,7 @@ namespace sfx2
@return
<TRUE/> if and only if macro execution in this document is allowed.
*/
- sal_Bool adjustMacroMode(
+ bool adjustMacroMode(
const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& _rxInteraction
);
@@ -267,7 +267,7 @@ namespace sfx2
denying macro execution, in which ->adjustMacroMode will return <FALSE/>,
and the next call to isMacroExecutionDisallowed will return <TRUE/>.
*/
- sal_Bool isMacroExecutionDisallowed() const;
+ bool isMacroExecutionDisallowed() const;
/** determines whether the document actually has a macros library
@@ -275,7 +275,7 @@ namespace sfx2
IMacroDocumentAccess::getEmbeddedDocumentScripts().getBasicLibraries) for
content.
*/
- sal_Bool hasMacroLibrary() const;
+ bool hasMacroLibrary() const;
/** determines whether the given document storage has sub storages containing scripts
or macros.
@@ -284,10 +284,10 @@ namespace sfx2
BeanShell-/JavaScript-/Python-Scripts are stored, and a sub storage named "Basic" (where
Basic scripts are stored).
*/
- static sal_Bool
+ static bool
storageHasMacros( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& _rxStorage );
- static sal_Bool containerHasBasicMacros( const ::com::sun::star::uno::Reference< ::com::sun::star::script::XLibraryContainer >& xContainter );
+ static bool containerHasBasicMacros( const ::com::sun::star::uno::Reference< ::com::sun::star::script::XLibraryContainer >& xContainter );
/** checks the macro execution mode while loading the document.
This must be called when the loading is effectively finished, but before any macro action
@@ -310,7 +310,7 @@ namespace sfx2
@see hasMacroLibrary
@see IMacroDocumentAccess::checkForBrokenScriptingSignatures
*/
- sal_Bool
+ bool
checkMacrosOnLoading(
const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& _rxInteraction
);
diff --git a/include/sfx2/doctempl.hxx b/include/sfx2/doctempl.hxx
index cc3fc4e..36008bc 100644
--- a/include/sfx2/doctempl.hxx
+++ b/include/sfx2/doctempl.hxx
@@ -48,14 +48,14 @@ class SFX2_DLLPUBLIC SfxDocumentTemplates
private:
SfxDocTemplate_ImplRef pImp;
- SAL_DLLPRIVATE sal_Bool CopyOrMove( sal_uInt16 nTargetRegion, sal_uInt16 nTargetIdx,
- sal_uInt16 nSourceRegion, sal_uInt16 nSourceIdx, sal_Bool bMove );
+ SAL_DLLPRIVATE bool CopyOrMove( sal_uInt16 nTargetRegion, sal_uInt16 nTargetIdx,
+ sal_uInt16 nSourceRegion, sal_uInt16 nSourceIdx, bool bMove );
public:
SfxDocumentTemplates();
SfxDocumentTemplates(const SfxDocumentTemplates &);
~SfxDocumentTemplates();
- sal_Bool IsConstructed() { return pImp != NULL; }
+ bool IsConstructed() { return pImp != NULL; }
void Construct();
const SfxDocumentTemplates &operator=(const SfxDocumentTemplates &);
@@ -81,18 +81,18 @@ public:
int nCount,
const OUString& rString);
- sal_Bool Copy(sal_uInt16 nTargetRegion,
+ bool Copy(sal_uInt16 nTargetRegion,
sal_uInt16 nTargetIdx,
sal_uInt16 nSourceRegion,
sal_uInt16 nSourceIdx);
- sal_Bool Move(sal_uInt16 nTargetRegion,
+ bool Move(sal_uInt16 nTargetRegion,
sal_uInt16 nTargetIdx,
sal_uInt16 nSourceRegion,
sal_uInt16 nSourceIdx);
- sal_Bool Delete(sal_uInt16 nRegion, sal_uInt16 nIdx);
- sal_Bool InsertDir(const OUString &rText, sal_uInt16 nRegion);
+ bool Delete(sal_uInt16 nRegion, sal_uInt16 nIdx);
+ bool InsertDir(const OUString &rText, sal_uInt16 nRegion);
- sal_Bool InsertTemplate (sal_uInt16 nSourceRegion, sal_uInt16 nIdx, const OUString &rName, const OUString &rPath);
+ bool InsertTemplate (sal_uInt16 nSourceRegion, sal_uInt16 nIdx, const OUString &rName, const OUString &rPath);
/** Change the name of an entry or a directory
@@ -107,13 +107,13 @@ public:
sal_True if the action could be performed, sal_False otherwise
*/
- sal_Bool SetName(const OUString &rName, sal_uInt16 nRegion, sal_uInt16 nIdx);
+ bool SetName(const OUString &rName, sal_uInt16 nRegion, sal_uInt16 nIdx);
- sal_Bool CopyTo(sal_uInt16 nRegion, sal_uInt16 nIdx, const OUString &rName) const;
- sal_Bool CopyFrom(sal_uInt16 nRegion, sal_uInt16 nIdx, OUString &rName);
+ bool CopyTo(sal_uInt16 nRegion, sal_uInt16 nIdx, const OUString &rName) const;
+ bool CopyFrom(sal_uInt16 nRegion, sal_uInt16 nIdx, OUString &rName);
- sal_Bool GetFull( const OUString& rRegion, const OUString& rName, OUString& rPath );
- sal_Bool GetLogicNames( const OUString& rPath, OUString& rRegion, OUString& rName ) const;
+ bool GetFull( const OUString& rRegion, const OUString& rName, OUString& rPath );
+ bool GetLogicNames( const OUString& rPath, OUString& rRegion, OUString& rName ) const;
/** updates the configuration where the document templates structure is stored.
@@ -130,7 +130,7 @@ public:
<br/>
So set <arg>_bSmart</arg> to <TRUE/> to do a check for necessity first.
*/
- void Update( sal_Bool _bSmart = sal_True );
+ void Update( bool _bSmart = true );
};
#endif // #ifndef _SFXDOCTEMPL_HXX
diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx
index 83b4eef..cbea8fe 100644
--- a/sc/source/ui/condformat/condformatdlgentry.cxx
+++ b/sc/source/ui/condformat/condformatdlgentry.cxx
@@ -502,7 +502,7 @@ void StyleSelect( ListBox& rLbStyle, ScDocument* pDoc, SvxFontPrevWindow& rWdPre
0L );
if (bLocked)
- pDisp->Lock(sal_True);
+ pDisp->Lock(true);
// Find the new style and add it into the style list boxes
SfxStyleSheetIterator aStyleIter( pDoc->GetStyleSheetPool(), SFX_STYLE_FAMILY_PARA );
diff --git a/sc/source/ui/miscdlgs/instbdlg.cxx b/sc/source/ui/miscdlgs/instbdlg.cxx
index 5ab17d9..9701656 100644
--- a/sc/source/ui/miscdlgs/instbdlg.cxx
+++ b/sc/source/ui/miscdlgs/instbdlg.cxx
@@ -353,7 +353,7 @@ IMPL_LINK( ScInsertTableDlg, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg
if ( pDocShTables )
pDocShTables->DoClose(); // delete passiert beim Zuweisen auf die Ref
- pMed->UseInteractionHandler( sal_True ); // to enable the filter options dialog
+ pMed->UseInteractionHandler( true ); // to enable the filter options dialog
pDocShTables = new ScDocShell;
aDocShTablesRef = pDocShTables;
diff --git a/sc/source/ui/miscdlgs/linkarea.cxx b/sc/source/ui/miscdlgs/linkarea.cxx
index 37a814c..01a4b5f 100644
--- a/sc/source/ui/miscdlgs/linkarea.cxx
+++ b/sc/source/ui/miscdlgs/linkarea.cxx
@@ -231,7 +231,7 @@ IMPL_LINK( ScLinkedAreaDlg, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg
if (pSourceShell)
pSourceShell->DoClose(); // deleted when assigning aSourceRef
- pMed->UseInteractionHandler( sal_True ); // to enable the filter options dialog
+ pMed->UseInteractionHandler( true ); // to enable the filter options dialog
pSourceShell = new ScDocShell;
aSourceRef = pSourceShell;
diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx
index d87a197..11f8444 100644
--- a/sc/source/ui/unoobj/scdetect.cxx
+++ b/sc/source/ui/unoobj/scdetect.cxx
@@ -392,7 +392,7 @@ OUString SAL_CALL ScFilterDetect::detect( uno::Sequence<beans::PropertyValue>& l
// ctor of SfxMedium uses owner transition of ItemSet
SfxMedium aMedium( aURL, bWasReadOnly ? STREAM_STD_READ : STREAM_STD_READWRITE, NULL, pSet );
- aMedium.UseInteractionHandler( sal_True );
+ aMedium.UseInteractionHandler( true );
sal_Bool bIsStorage = aMedium.IsStorage();
if ( aMedium.GetErrorCode() == ERRCODE_NONE )
diff --git a/sc/source/ui/view/tabvwshc.cxx b/sc/source/ui/view/tabvwshc.cxx
index 03430ea..f4701c7 100644
--- a/sc/source/ui/view/tabvwshc.cxx
+++ b/sc/source/ui/view/tabvwshc.cxx
@@ -128,7 +128,7 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog(
// the dialog has been opened in a different view
// -> lock the dispatcher for this view (modal mode)
- GetViewData()->GetDispatcher().Lock( sal_True ); // lock is reset when closing dialog
+ GetViewData()->GetDispatcher().Lock( true ); // lock is reset when closing dialog
return NULL;
}
diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx
index 1492e19..8cef91a 100644
--- a/sc/source/ui/view/viewfun4.cxx
+++ b/sc/source/ui/view/viewfun4.cxx
@@ -595,7 +595,7 @@ bool ScViewFunc::PasteFile( const Point& rPos, const OUString& rFile, bool bLink
SfxMedium aSfxMedium( aStrURL, (STREAM_READ | STREAM_SHARE_DENYNONE) );
// #i73992# GuessFilter no longer calls UseInteractionHandler.
// This is UI, so it can be called here.
- aSfxMedium.UseInteractionHandler(sal_True);
+ aSfxMedium.UseInteractionHandler(true);
ErrCode nErr = aMatcher.GuessFilter( aSfxMedium, &pFlt );
if ( pFlt && !nErr )
diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx
index 1bccb601..61c4533 100644
--- a/sd/source/core/drawdoc3.cxx
+++ b/sd/source/core/drawdoc3.cxx
@@ -200,7 +200,7 @@ SdDrawDocument* SdDrawDocument::OpenBookmarkDoc(SfxMedium& rMedium)
const SfxFilter* pFilter = rMedium.GetFilter();
if ( !pFilter )
{
- rMedium.UseInteractionHandler( sal_True );
+ rMedium.UseInteractionHandler( true );
SFX_APP()->GetFilterMatcher().GuessFilter( rMedium, &pFilter );
}
diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx
index 5adfe03..3ccf8ab 100644
--- a/sd/source/ui/dlg/navigatr.cxx
+++ b/sd/source/ui/dlg/navigatr.cxx
@@ -629,7 +629,7 @@ bool SdNavigatorWin::InsertFile(const OUString& rFileName)
{
SfxMedium aMed(aFileName, (STREAM_READ | STREAM_SHARE_DENYNONE));
SfxFilterMatcher aMatch( OUString("simpress") );
- aMed.UseInteractionHandler( sal_True );
+ aMed.UseInteractionHandler( true );
nErr = aMatch.GuessFilter(aMed, &pFilter);
}
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index ef93486..c7e3ad4 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -2744,7 +2744,7 @@ void SAL_CALL SlideshowImpl::activate() throw (RuntimeException, std::exception)
if( pDispatcher )
{
// filter all forbiden slots
- pDispatcher->SetSlotFilter( sal_True, sizeof(pAllowed) / sizeof(sal_uInt16), pAllowed );
+ pDispatcher->SetSlotFilter( true, sizeof(pAllowed) / sizeof(sal_uInt16), pAllowed );
}
if( getBindings() )
diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx
index 614773c..b1c12c1 100644
--- a/sd/source/ui/unoidl/sddetect.cxx
+++ b/sd/source/ui/unoidl/sddetect.cxx
@@ -213,7 +213,7 @@ OUString SAL_CALL SdFilterDetect::detect( Sequence< beans::PropertyValue >& lDes
{
// ctor of SfxMedium uses owner transition of ItemSet
SfxMedium aMedium( aURL, bWasReadOnly ? STREAM_STD_READ : STREAM_STD_READWRITE, NULL, pSet );
- aMedium.UseInteractionHandler( sal_True );
+ aMedium.UseInteractionHandler( true );
if ( !aPreselectedFilterName.isEmpty() )
pFilter = SfxFilter::GetFilterByName( aPreselectedFilterName );
else if (!aTypeName.isEmpty())
@@ -237,7 +237,7 @@ OUString SAL_CALL SdFilterDetect::detect( Sequence< beans::PropertyValue >& lDes
{
// PowerPoint needs to be detected via StreamName, all other storage based formats are our own and can
// be detected by the ClipboardId, so except for the PPT filter all filters must have a ClipboardId set
- Reference < embed::XStorage > xStorage = aMedium.GetStorage( sal_False );
+ Reference < embed::XStorage > xStorage = aMedium.GetStorage( false );
//TODO/LATER: move error handling to central place! (maybe even complete own filters)
if ( aMedium.GetLastStorageCreationState() != ERRCODE_NONE )
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index 92d1c7c..45165c5 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -363,7 +363,7 @@ void SfxApplication::SetViewFrame_Impl( SfxViewFrame *pFrame )
{
SfxDispatcher* pDisp = pAppData_Impl->pViewFrame->GetDispatcher();
pDisp->Flush();
- pDisp->Update_Impl(sal_True);
+ pDisp->Update_Impl(true);
}
}
}
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
index 821f91c..ced0510 100644
--- a/sfx2/source/appl/appcfg.cxx
+++ b/sfx2/source/appl/appcfg.cxx
@@ -527,7 +527,7 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet )
{
// update all "final" dispatchers
if ( !pCurrViewFrame->GetActiveChildFrame_Impl() )
- pCurrViewFrame->GetDispatcher()->Update_Impl(sal_True);
+ pCurrViewFrame->GetDispatcher()->Update_Impl(true);
pCurrViewFrame = SfxViewFrame::GetNext(*pCurrViewFrame);
}
}
diff --git a/sfx2/source/appl/appdispatchprovider.cxx b/sfx2/source/appl/appdispatchprovider.cxx
index 4c912d7..8fe8bf8 100644
--- a/sfx2/source/appl/appdispatchprovider.cxx
+++ b/sfx2/source/appl/appdispatchprovider.cxx
@@ -141,7 +141,7 @@ Reference < XDispatch > SAL_CALL SfxAppDispatchProvider::queryDispatch(
{
nId = (sal_uInt16) aURL.Path.toInt32();
SfxShell* pShell;
- pAppDisp->GetShellAndSlot_Impl( nId, &pShell, &pSlot, sal_True, sal_True );
+ pAppDisp->GetShellAndSlot_Impl( nId, &pShell, &pSlot, true, true );
}
else if ( aURL.Protocol == ".uno:" )
{
diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx
index 610a1e1..171e3be 100644
--- a/sfx2/source/appl/appinit.cxx
+++ b/sfx2/source/appl/appinit.cxx
@@ -273,7 +273,7 @@ bool SfxApplication::Initialize_Impl()
// App-Dispatcher aufbauen
pAppData_Impl->pAppDispat->Push(*this);
pAppData_Impl->pAppDispat->Flush();
- pAppData_Impl->pAppDispat->DoActivate_Impl( sal_True, NULL );
+ pAppData_Impl->pAppDispat->DoActivate_Impl( true, NULL );
{
SolarMutexGuard aGuard;
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index 80cf5a8..095bd5e 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -228,7 +228,7 @@ sal_uInt32 CheckPasswd_Impl
if( ( !pFile->GetFilter() || pFile->IsStorage() ) )
{
- uno::Reference< embed::XStorage > xStorage = pFile->GetStorage( sal_True );
+ uno::Reference< embed::XStorage > xStorage = pFile->GetStorage( true );
if( xStorage.is() )
{
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list