[Libreoffice-commits] core.git: 10 commits - basctl/source cui/source include/sfx2 include/svx sc/source sd/source sfx2/source starmath/inc starmath/source svx/source sw/inc sw/source
Noel Grandin
noel at peralex.com
Tue Mar 18 02:28:19 PDT 2014
basctl/source/basicide/basides1.cxx | 6
basctl/source/inc/basidesh.hxx | 6
cui/source/dialogs/cuigaldlg.cxx | 4
cui/source/dialogs/hlmailtp.cxx | 2
cui/source/dialogs/linkdlg.cxx | 4
cui/source/factory/dlgfact.cxx | 6
cui/source/factory/dlgfact.hxx | 6
cui/source/tabpages/backgrnd.cxx | 2
cui/source/tabpages/numpages.cxx | 4
cui/source/tabpages/tpbitmap.cxx | 2
include/sfx2/evntconf.hxx | 2
include/sfx2/genlink.hxx | 4
include/sfx2/ipclient.hxx | 10
include/sfx2/linkmgr.hxx | 12
include/sfx2/linksrc.hxx | 20
include/sfx2/lnkbase.hxx | 34 -
include/sfx2/mailmodelapi.hxx | 6
include/sfx2/mgetempl.hxx | 2
include/sfx2/mieclip.hxx | 4
include/sfx2/mnuitem.hxx | 6
include/sfx2/mnumgr.hxx | 6
include/sfx2/module.hxx | 6
include/sfx2/msg.hxx | 4
include/sfx2/new.hxx | 6
include/sfx2/objsh.hxx | 236 ++++-----
include/sfx2/opengrf.hxx | 8
include/sfx2/printer.hxx | 6
include/sfx2/prnmon.hxx | 2
include/sfx2/progress.hxx | 16
include/sfx2/request.hxx | 20
include/sfx2/sfxbasecontroller.hxx | 6
include/sfx2/sfxbasemodel.hxx | 12
include/sfx2/sfxdlg.hxx | 6
include/sfx2/sfxhelp.hxx | 4
include/sfx2/sfxhtml.hxx | 10
include/sfx2/sfxuno.hxx | 2
include/sfx2/shell.hxx | 14
include/sfx2/styfitem.hxx | 2
include/sfx2/viewfrm.hxx | 4
include/sfx2/viewsh.hxx | 6
include/svx/fmshell.hxx | 6
include/svx/svxdlg.hxx | 2
sc/source/filter/excel/impop.cxx | 2
sc/source/ui/docshell/docsh.cxx | 108 ++--
sc/source/ui/docshell/docsh2.cxx | 4
sc/source/ui/docshell/docsh4.cxx | 4
sc/source/ui/docshell/servobj.cxx | 14
sc/source/ui/drawfunc/drawsh2.cxx | 2
sc/source/ui/inc/docsh.hxx | 24
sc/source/ui/inc/drawsh.hxx | 2
sc/source/ui/inc/prevwsh.hxx | 4
sc/source/ui/inc/servobj.hxx | 4
sc/source/ui/inc/tabvwsh.hxx | 4
sc/source/ui/view/cellsh2.cxx | 2
sc/source/ui/view/prevwsh.cxx | 4
sc/source/ui/view/tabvwsh4.cxx | 4
sc/source/ui/view/tabvwsh5.cxx | 2
sd/source/core/drawdoc2.cxx | 4
sd/source/core/drawdoc3.cxx | 6
sd/source/core/drawdoc4.cxx | 4
sd/source/filter/html/htmlex.cxx | 2
sd/source/ui/annotations/annotationwindow.cxx | 2
sd/source/ui/app/sdmod.cxx | 2
sd/source/ui/app/sdmod1.cxx | 2
sd/source/ui/app/sdxfer.cxx | 2
sd/source/ui/dlg/navigatr.cxx | 4
sd/source/ui/dlg/vectdlg.cxx | 4
sd/source/ui/docshell/docshel4.cxx | 46 -
sd/source/ui/docshell/docshell.cxx | 8
sd/source/ui/func/fucopy.cxx | 4
sd/source/ui/func/fuinsfil.cxx | 16
sd/source/ui/func/fuprlout.cxx | 4
sd/source/ui/inc/DrawDocShell.hxx | 26 -
sd/source/ui/inc/DrawViewShell.hxx | 4
sd/source/ui/inc/OutlineViewShell.hxx | 4
sd/source/ui/inc/PresentationViewShell.hxx | 2
sd/source/ui/inc/SlideSorterViewShell.hxx | 4
sd/source/ui/inc/ViewShell.hxx | 4
sd/source/ui/inc/ViewShellBase.hxx | 4
sd/source/ui/sidebar/LayoutMenu.cxx | 2
sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx | 4
sd/source/ui/unoidl/UnoDocumentSettings.cxx | 8
sd/source/ui/view/Outliner.cxx | 22
sd/source/ui/view/ViewShellBase.cxx | 4
sd/source/ui/view/ViewShellManager.cxx | 2
sd/source/ui/view/drawview.cxx | 4
sd/source/ui/view/drviews1.cxx | 4
sd/source/ui/view/drviews9.cxx | 4
sd/source/ui/view/drviewsa.cxx | 2
sd/source/ui/view/outlnvsh.cxx | 4
sd/source/ui/view/outlview.cxx | 4
sd/source/ui/view/presvish.cxx | 2
sd/source/ui/view/viewshe2.cxx | 8
sd/source/ui/view/viewshel.cxx | 6
sfx2/source/appl/app.cxx | 2
sfx2/source/appl/appopen.cxx | 2
sfx2/source/appl/appserv.cxx | 6
sfx2/source/appl/fileobj.cxx | 33 -
sfx2/source/appl/fileobj.hxx | 12
sfx2/source/appl/impldde.cxx | 26 -
sfx2/source/appl/impldde.hxx | 10
sfx2/source/appl/linkmgr2.cxx | 42 -
sfx2/source/appl/linksrc.cxx | 28 -
sfx2/source/appl/lnkbase2.cxx | 28 -
sfx2/source/appl/macroloader.cxx | 4
sfx2/source/appl/module.cxx | 4
sfx2/source/appl/opengrf.cxx | 12
sfx2/source/appl/sfxhelp.cxx | 20
sfx2/source/appl/sfxpicklist.cxx | 2
sfx2/source/bastyp/progress.cxx | 44 -
sfx2/source/bastyp/sfxhtml.cxx | 6
sfx2/source/config/evntconf.cxx | 2
sfx2/source/control/dispatch.cxx | 12
sfx2/source/control/request.cxx | 82 +--
sfx2/source/control/shell.cxx | 42 -
sfx2/source/dialog/mailmodel.cxx | 6
sfx2/source/dialog/mgetempl.cxx | 10
sfx2/source/dialog/securitypage.cxx | 2
sfx2/source/dialog/styfitem.cxx | 6
sfx2/source/dialog/versdlg.cxx | 4
sfx2/source/doc/new.cxx | 6
sfx2/source/doc/objcont.cxx | 66 +-
sfx2/source/doc/objembed.cxx | 2
sfx2/source/doc/objmisc.cxx | 152 ++---
sfx2/source/doc/objserv.cxx | 36 -
sfx2/source/doc/objstor.cxx | 410 ++++++++--------
sfx2/source/doc/objxtor.cxx | 28 -
sfx2/source/doc/sfxbasemodel.cxx | 114 ++--
sfx2/source/menu/mnuitem.cxx | 14
sfx2/source/menu/mnumgr.cxx | 2
sfx2/source/notify/eventsupplier.cxx | 2
sfx2/source/view/frmload.cxx | 2
sfx2/source/view/ipclient.cxx | 24
sfx2/source/view/printer.cxx | 24
sfx2/source/view/sfxbasecontroller.cxx | 22
sfx2/source/view/viewfrm.cxx | 14
sfx2/source/view/viewfrm2.cxx | 6
sfx2/source/view/viewprn.cxx | 2
sfx2/source/view/viewsh.cxx | 16
starmath/inc/document.hxx | 16
starmath/inc/view.hxx | 4
starmath/source/cursor.cxx | 4
starmath/source/document.cxx | 16
starmath/source/smmod.cxx | 2
starmath/source/view.cxx | 4
svx/source/dialog/grfflt.cxx | 20
svx/source/form/fmmodel.cxx | 4
svx/source/form/fmshell.cxx | 10
svx/source/form/fmundo.cxx | 4
sw/inc/docsh.hxx | 18
sw/inc/swserv.hxx | 4
sw/source/core/crsr/crsrsh.cxx | 10
sw/source/core/doc/swserv.cxx | 8
sw/source/core/docnode/section.cxx | 2
sw/source/core/docnode/swbaslnk.cxx | 4
sw/source/core/ole/ndole.cxx | 2
sw/source/core/swg/SwXMLTextBlocks.cxx | 2
sw/source/core/uibase/app/docsh.cxx | 30 -
sw/source/core/uibase/app/docsh2.cxx | 12
sw/source/core/uibase/app/docshini.cxx | 14
sw/source/core/uibase/app/mainwn.cxx | 4
sw/source/core/uibase/app/swmodule.cxx | 2
sw/source/core/uibase/dochdl/swdtflvr.cxx | 2
sw/source/core/uibase/docvw/SidebarWin.cxx | 2
sw/source/core/uibase/inc/glshell.hxx | 4
sw/source/core/uibase/inc/view.hxx | 6
sw/source/core/uibase/misc/glshell.cxx | 12
sw/source/core/uibase/shells/textfld.cxx | 2
sw/source/core/uibase/uiview/srcview.cxx | 2
sw/source/core/uibase/uiview/view.cxx | 6
sw/source/core/uibase/uiview/view1.cxx | 4
sw/source/core/uibase/uiview/viewling.cxx | 2
sw/source/core/uibase/uiview/viewstat.cxx | 4
sw/source/core/uibase/uno/unotxdoc.cxx | 4
sw/source/core/uibase/utlui/navipi.cxx | 2
sw/source/core/uibase/wrtsh/wrtsh1.cxx | 4
sw/source/filter/html/htmlbas.cxx | 2
sw/source/filter/html/swhtml.cxx | 4
sw/source/filter/ww1/fltshell.cxx | 2
sw/source/filter/ww8/wrtww8.cxx | 2
sw/source/filter/ww8/ww8par.cxx | 2
181 files changed, 1300 insertions(+), 1301 deletions(-)
New commits:
commit c3e3f466571e4993c1b5e42c6d15e37c48f3a069
Author: Noel Grandin <noel at peralex.com>
Date: Tue Mar 18 11:23:57 2014 +0200
sfx2: sal_Bool->bool
Change-Id: I375a72c34e46778385a9fdc24c9ebd0f0a3f3c9b
diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx
index 59f2887..eb05257 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -965,7 +965,7 @@ void Shell::GetState(SfxItemSet &rSet)
pCurWin->GetState( rSet );
}
-sal_Bool Shell::HasUIFeature( sal_uInt32 nFeature )
+bool Shell::HasUIFeature( sal_uInt32 nFeature )
{
bool bResult = false;
@@ -1230,7 +1230,7 @@ Reference< XModel > Shell::GetCurrentDocument() const
return xDocument;
}
-void Shell::Activate( sal_Bool bMDI )
+void Shell::Activate( bool bMDI )
{
SfxViewShell::Activate( bMDI );
@@ -1241,7 +1241,7 @@ void Shell::Activate( sal_Bool bMDI )
}
}
-void Shell::Deactivate( sal_Bool bMDI )
+void Shell::Deactivate( bool bMDI )
{
// bMDI == true means that another MDI has been activated; in case of a
// deactivate due to a MessageBox bMDI is false
diff --git a/basctl/source/inc/basidesh.hxx b/basctl/source/inc/basidesh.hxx
index c4c5d72..fdb8ef2 100644
--- a/basctl/source/inc/basidesh.hxx
+++ b/basctl/source/inc/basidesh.hxx
@@ -130,8 +130,8 @@ private:
virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
const SfxHint& rHint, const TypeId& rHintType );
- virtual void Activate(sal_Bool bMDI);
- virtual void Deactivate(sal_Bool bMDI);
+ virtual void Activate(bool bMDI);
+ virtual void Deactivate(bool bMDI);
virtual void Move();
virtual void ShowCursor( bool bOn = true );
@@ -185,7 +185,7 @@ public:
void ExecuteBasic( SfxRequest& rReq );
void ExecuteDialog( SfxRequest& rReq );
- virtual sal_Bool HasUIFeature( sal_uInt32 nFeature );
+ virtual bool HasUIFeature( sal_uInt32 nFeature );
bool CallBasicErrorHdl( StarBASIC* pBasic );
long CallBasicBreakHdl( StarBASIC* pBasic );
diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx
index 08b2df3..c8721cf 100644
--- a/cui/source/dialogs/hlmailtp.cxx
+++ b/cui/source/dialogs/hlmailtp.cxx
@@ -293,7 +293,7 @@ IMPL_LINK_NOARG(SvxHyperlinkMailTp, ClickAdrBookHdl_Impl)
{
SfxItemPool &rPool = pViewFrame->GetPool();
SfxRequest aReq(SID_VIEW_DATA_SOURCE_BROWSER, 0, rPool);
- pViewFrame->ExecuteSlot( aReq, sal_True );
+ pViewFrame->ExecuteSlot( aReq, true );
}
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 9072801..6cd9710 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -380,7 +380,7 @@ Reference < com::sun::star::embed::XEmbeddedObject > AbstractInsertObjectDialog_
return pDlg->GetObject();
}
-sal_Bool AbstractInsertObjectDialog_Impl::IsCreateNew()
+bool AbstractInsertObjectDialog_Impl::IsCreateNew()
{
return pDlg->IsCreateNew();
}
@@ -1182,7 +1182,7 @@ AbstractDialogFactory_Impl::CreateScriptErrorDialog(
AbstractScriptSelectorDialog*
AbstractDialogFactory_Impl::CreateScriptSelectorDialog(
- Window* pParent, sal_Bool bShowSlots, const Reference< frame::XFrame >& _rxFrame )
+ Window* pParent, bool bShowSlots, const Reference< frame::XFrame >& _rxFrame )
{
SvxScriptSelectorDialog* pDlg = new SvxScriptSelectorDialog(pParent, bShowSlots, _rxFrame);
return new AbstractScriptSelectorDialog_Impl(pDlg);
@@ -1792,7 +1792,7 @@ SfxAbstractPasteDialog* AbstractDialogFactory_Impl::CreatePasteDialog( Window* p
return new AbstractPasteDialog_Impl( new SvPasteObjectDialog( pParent ) );
}
-SfxAbstractLinksDialog* AbstractDialogFactory_Impl::CreateLinksDialog( Window* pParent, sfx2::LinkManager* pMgr, sal_Bool bHTML, sfx2::SvBaseLink* p)
+SfxAbstractLinksDialog* AbstractDialogFactory_Impl::CreateLinksDialog( Window* pParent, sfx2::LinkManager* pMgr, bool bHTML, sfx2::SvBaseLink* p)
{
SvBaseLinksDlg* pLinkDlg = new SvBaseLinksDlg( pParent, pMgr, bHTML );
if ( p )
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index 03d4ca9..510385c 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -443,7 +443,7 @@ class AbstractInsertObjectDialog_Impl : public SfxAbstractInsertObjectDialog
DECL_ABSTDLG_BASE(AbstractInsertObjectDialog_Impl, InsertObjectDialog_Impl)
virtual com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > GetObject();
virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > GetIconIfIconified( OUString* pGraphicMediaType );
- virtual sal_Bool IsCreateNew();
+ virtual bool IsCreateNew();
};
class AbstractPasteDialog_Impl : public SfxAbstractPasteDialog
@@ -548,7 +548,7 @@ public:
virtual VclAbstractDialog* CreateEditObjectDialog( Window* pParent, const OUString& rCommmand,
const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >& xObj );
virtual SfxAbstractPasteDialog* CreatePasteDialog( Window* pParent );
- virtual SfxAbstractLinksDialog* CreateLinksDialog( Window* pParent, sfx2::LinkManager* pMgr, sal_Bool bHTML, sfx2::SvBaseLink* p=0 );
+ virtual SfxAbstractLinksDialog* CreateLinksDialog( Window* pParent, sfx2::LinkManager* pMgr, bool bHTML, sfx2::SvBaseLink* p=0 );
virtual AbstractHangulHanjaConversionDialog * CreateHangulHanjaConversionDialog( Window* _pParent,
editeng::HangulHanjaConversion::ConversionDirection _ePrimaryDirection );
@@ -671,7 +671,7 @@ public:
virtual AbstractScriptSelectorDialog*
CreateScriptSelectorDialog(
Window* pParent,
- sal_Bool bShowSlots,
+ bool bShowSlots,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame
);
diff --git a/include/sfx2/sfxbasemodel.hxx b/include/sfx2/sfxbasemodel.hxx
index ecd0b26..2b5b449 100644
--- a/include/sfx2/sfxbasemodel.hxx
+++ b/include/sfx2/sfxbasemodel.hxx
@@ -1390,9 +1390,9 @@ public:
SfxObjectShell* GetObjectShell() const ;
- SAL_DLLPRIVATE sal_Bool impl_isDisposed() const ;
- sal_Bool IsInitialized() const;
- sal_Bool IsDisposed() const { return impl_isDisposed(); }
+ SAL_DLLPRIVATE bool impl_isDisposed() const ;
+ bool IsInitialized() const;
+ bool IsDisposed() const { return impl_isDisposed(); }
void MethodEntryCheck( const bool i_mustBeInitialized ) const;
::osl::Mutex& getMutex() const { return m_aMutex; }
@@ -1403,7 +1403,7 @@ public:
void notifyEvent( const css::document::EventObject& aEvent ) const;
/** returns true if someone added a XEventListener to this XEventBroadcaster */
- sal_Bool hasEventListeners() const;
+ bool hasEventListeners() const;
protected:
@@ -1412,7 +1412,7 @@ protected:
OUString getRuntimeUID() const;
/* returns true if the document signatures are valid, otherwise false */
- sal_Bool hasValidSignatures() const;
+ bool hasValidSignatures() const;
/* GrabBagItem for interim interop purposes */
void getGrabBagItem(com::sun::star::uno::Any& rVal) const;
@@ -1445,7 +1445,7 @@ private:
SAL_DLLPRIVATE void impl_store( const OUString& sURL,
const css::uno::Sequence< css::beans::PropertyValue >& seqArguments ,
- sal_Bool bSaveTo ) ;
+ bool bSaveTo ) ;
SAL_DLLPRIVATE void postEvent_Impl( const OUString& aName, const css::uno::Reference< css::frame::XController2 >& xController = css::uno::Reference< css::frame::XController2 >() );
diff --git a/include/sfx2/sfxdlg.hxx b/include/sfx2/sfxdlg.hxx
index b789920..fcfd9bb 100644
--- a/include/sfx2/sfxdlg.hxx
+++ b/include/sfx2/sfxdlg.hxx
@@ -87,7 +87,7 @@ class SfxAbstractInsertObjectDialog : virtual public VclAbstractDialog
public:
virtual com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > GetObject()=0;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > GetIconIfIconified( OUString* pGraphicMediaType )=0;
- virtual sal_Bool IsCreateNew()=0;
+ virtual bool IsCreateNew()=0;
};
class SfxAbstractPasteDialog : virtual public VclAbstractDialog
@@ -140,13 +140,13 @@ public:
virtual VclAbstractDialog* CreateEditObjectDialog( Window* pParent, const OUString& rCommand,
const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >& xObj )=0;
virtual SfxAbstractPasteDialog* CreatePasteDialog( Window* pParent )=0;
- virtual SfxAbstractLinksDialog* CreateLinksDialog( Window* pParent, sfx2::LinkManager* pMgr, sal_Bool bHTML=sal_False, sfx2::SvBaseLink* p=0 )=0;
+ virtual SfxAbstractLinksDialog* CreateLinksDialog( Window* pParent, sfx2::LinkManager* pMgr, bool bHTML=false, sfx2::SvBaseLink* p=0 )=0;
virtual VclAbstractDialog * CreateSvxScriptOrgDialog( Window* pParent, const rtl::OUString& rLanguage ) = 0;
virtual AbstractScriptSelectorDialog*
CreateScriptSelectorDialog(
Window* pParent,
- sal_Bool bShowSlots,
+ bool bShowSlots,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame
) = 0;
diff --git a/include/sfx2/sfxhelp.hxx b/include/sfx2/sfxhelp.hxx
index cc7ad04..de0b484 100644
--- a/include/sfx2/sfxhelp.hxx
+++ b/include/sfx2/sfxhelp.hxx
@@ -31,11 +31,11 @@ class SFX2_DLLPUBLIC SfxHelp : public Help
{
OUString aTicket; // for Plugins
OUString aUser;
- sal_Bool bIsDebug;
+ bool bIsDebug;
SfxHelp_Impl* pImp;
private:
- SAL_DLLPRIVATE sal_Bool Start_Impl( const OUString& rURL, const Window* pWindow, const OUString& rKeyword );
+ SAL_DLLPRIVATE bool Start_Impl( const OUString& rURL, const Window* pWindow, const OUString& rKeyword );
SAL_DLLPRIVATE virtual bool SearchKeyword( const OUString& rKeyWord );
SAL_DLLPRIVATE virtual bool Start( const OUString& rURL, const Window* pWindow );
SAL_DLLPRIVATE OUString GetHelpModuleName_Impl();
diff --git a/include/sfx2/sfxhtml.hxx b/include/sfx2/sfxhtml.hxx
index 132d98b..1343ac6 100644
--- a/include/sfx2/sfxhtml.hxx
+++ b/include/sfx2/sfxhtml.hxx
@@ -45,7 +45,7 @@ class SFX2_DLLPUBLIC SfxHTMLParser : public HTMLParser
protected:
- SfxHTMLParser( SvStream& rStream, sal_Bool bNewDoc=sal_True, SfxMedium *pMedium=0 );
+ SfxHTMLParser( SvStream& rStream, bool bNewDoc=true, SfxMedium *pMedium=0 );
virtual ~SfxHTMLParser();
@@ -60,7 +60,7 @@ public:
const HTMLOptions& rOptions,
sal_uInt16 nEventMouseOver = 0,
sal_uInt16 nEventMouseOut = 0 );
- inline sal_Bool ParseAreaOptions(ImageMap * pImageMap, const OUString& rBaseURL,
+ inline bool ParseAreaOptions(ImageMap * pImageMap, const OUString& rBaseURL,
sal_uInt16 nEventMouseOver = 0,
sal_uInt16 nEventMouseOut = 0);
@@ -84,11 +84,11 @@ protected:
// End of an asynchronous file download. Returns TRUE if the download
// was successful. The read file is then passed into String.
- sal_Bool FinishFileDownload( OUString& rStr );
+ bool FinishFileDownload( OUString& rStr );
// Returns TRUE if a file was downloaded and if FileDownloadFinished
// has not yet been called
- sal_Bool ShouldFinishFileDownload() const { return pDLMedium != 0; }
+ bool ShouldFinishFileDownload() const { return pDLMedium != 0; }
SfxMedium *GetMedium() { return pMedium; }
const SfxMedium *GetMedium() const { return pMedium; }
@@ -98,7 +98,7 @@ protected:
const OUString& GetScriptTypeString( SvKeyValueIterator* ) const;
};
-inline sal_Bool SfxHTMLParser::ParseAreaOptions(ImageMap * pImageMap, const OUString& rBaseURL,
+inline bool SfxHTMLParser::ParseAreaOptions(ImageMap * pImageMap, const OUString& rBaseURL,
sal_uInt16 nEventMouseOver,
sal_uInt16 nEventMouseOut)
{
diff --git a/include/sfx2/sfxuno.hxx b/include/sfx2/sfxuno.hxx
index e1c27ec..cfe8d8a 100644
--- a/include/sfx2/sfxuno.hxx
+++ b/include/sfx2/sfxuno.hxx
@@ -42,7 +42,7 @@
#include <rtl/ustring.hxx>
-inline sal_Bool operator==( const css::util::URL& aURL1, const css::util::URL& aURL2 )
+inline bool operator==( const css::util::URL& aURL1, const css::util::URL& aURL2 )
{
return aURL1.Complete == aURL2.Complete;
}
diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx
index 8b3664f..b34cda6 100644
--- a/include/sfx2/shell.hxx
+++ b/include/sfx2/shell.hxx
@@ -187,7 +187,7 @@ public:
const SfxPoolItem* GetSlotState( sal_uInt16 nSlotId, const SfxInterface *pIF = 0, SfxItemSet *pStateSet = 0 );
const SfxPoolItem* ExecuteSlot( SfxRequest &rReq, const SfxInterface *pIF = 0 );
- const SfxPoolItem* ExecuteSlot( SfxRequest &rReq, sal_Bool bAsync );
+ const SfxPoolItem* ExecuteSlot( SfxRequest &rReq, bool bAsync );
sal_uIntPtr ExecuteSlot( sal_uInt16 nSlot, sal_uInt16 nMemberId, SbxVariable& rRet, SbxBase* pArgs = 0 );
inline SfxItemPool& GetPool() const;
@@ -202,16 +202,16 @@ public:
virtual void Invalidate(sal_uInt16 nId = 0);
- sal_Bool IsActive() const;
- virtual void Activate(sal_Bool bMDI);
- virtual void Deactivate(sal_Bool bMDI);
+ bool IsActive() const;
+ virtual void Activate(bool bMDI);
+ virtual void Deactivate(bool bMDI);
virtual void ParentActivate();
virtual void ParentDeactivate();
SfxDispatcher* GetDispatcher() const;
SfxViewFrame* GetFrame() const;
ResMgr* GetResMgr() const;
- virtual sal_Bool HasUIFeature( sal_uInt32 nFeature );
+ virtual bool HasUIFeature( sal_uInt32 nFeature );
void UIFeatureChanged();
// Items
@@ -254,8 +254,8 @@ public:
bool SetContextBroadcasterEnabled (const bool bIsEnabled);
SAL_DLLPRIVATE bool CanExecuteSlot_Impl( const SfxSlot &rSlot );
- SAL_DLLPRIVATE void DoActivate_Impl( SfxViewFrame *pFrame, sal_Bool bMDI);
- SAL_DLLPRIVATE void DoDeactivate_Impl( SfxViewFrame *pFrame, sal_Bool bMDI);
+ SAL_DLLPRIVATE void DoActivate_Impl( SfxViewFrame *pFrame, bool bMDI);
+ SAL_DLLPRIVATE void DoDeactivate_Impl( SfxViewFrame *pFrame, bool bMDI);
};
diff --git a/include/sfx2/styfitem.hxx b/include/sfx2/styfitem.hxx
index 14e6ac0..5bbf236 100644
--- a/include/sfx2/styfitem.hxx
+++ b/include/sfx2/styfitem.hxx
@@ -88,7 +88,7 @@ public:
@return
<TRUE/> if an image list for the requested mode could be found in the given resource.
*/
- sal_Bool updateImages( const ResId& _rId );
+ bool updateImages( const ResId& _rId );
};
#endif
diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx
index 2129f55..7076f23 100644
--- a/include/sfx2/viewfrm.hxx
+++ b/include/sfx2/viewfrm.hxx
@@ -135,8 +135,8 @@ public:
void ToTop();
void Enable( sal_Bool bEnable );
virtual sal_Bool Close();
- virtual void Activate( sal_Bool bUI );
- virtual void Deactivate( sal_Bool bUI );
+ virtual void Activate( bool bUI );
+ virtual void Deactivate( bool bUI );
// DDE-Interface
virtual long DdeExecute( const OUString& rCmd );
diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx
index f87ddd3..8488234 100644
--- a/include/sfx2/viewsh.hxx
+++ b/include/sfx2/viewsh.hxx
@@ -141,8 +141,8 @@ friend class SfxPrinterController;
sal_Bool bNoNewWindow;
protected:
- virtual void Activate(sal_Bool IsMDIActivate);
- virtual void Deactivate(sal_Bool IsMDIActivate);
+ virtual void Activate(bool IsMDIActivate);
+ virtual void Deactivate(bool IsMDIActivate);
virtual void InnerResizePixel( const Point &rOfs, const Size &rSize );
virtual void OuterResizePixel( const Point &rOfs, const Size &rSize );
diff --git a/include/svx/fmshell.hxx b/include/svx/fmshell.hxx
index c36b26d..ababcc4 100644
--- a/include/svx/fmshell.hxx
+++ b/include/svx/fmshell.hxx
@@ -108,7 +108,7 @@ public:
virtual void Execute( SfxRequest& );
virtual void GetState( SfxItemSet& );
- virtual sal_Bool HasUIFeature( sal_uInt32 nFeature );
+ virtual bool HasUIFeature( sal_uInt32 nFeature );
void ExecuteTextAttribute( SfxRequest& );
void GetTextAttributeState( SfxItemSet& );
@@ -129,8 +129,8 @@ public:
void ForgetActiveControl();
void SetControlActivationHandler( const Link& _rHdl );
- virtual void Activate(sal_Bool bMDI);
- virtual void Deactivate(sal_Bool bMDI);
+ virtual void Activate(bool bMDI);
+ virtual void Deactivate(bool bMDI);
// helper methods for implementing XFormLayerAccess
SdrUnoObj* GetFormControl(
diff --git a/include/svx/svxdlg.hxx b/include/svx/svxdlg.hxx
index 88a276f..dbbc3d2 100644
--- a/include/svx/svxdlg.hxx
+++ b/include/svx/svxdlg.hxx
@@ -459,7 +459,7 @@ public:
virtual AbstractScriptSelectorDialog*
CreateScriptSelectorDialog(
Window* pParent,
- sal_Bool bShowSlots,
+ bool bShowSlots,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame
) = 0;
diff --git a/sc/source/ui/drawfunc/drawsh2.cxx b/sc/source/ui/drawfunc/drawsh2.cxx
index 7ff85f1..99beae5 100644
--- a/sc/source/ui/drawfunc/drawsh2.cxx
+++ b/sc/source/ui/drawfunc/drawsh2.cxx
@@ -400,7 +400,7 @@ void ScDrawShell::GetDrawAttrStateForIFBX( SfxItemSet& rSet )
-void ScDrawShell::Activate (const sal_Bool bMDI)
+void ScDrawShell::Activate (const bool bMDI)
{
(void)bMDI;
diff --git a/sc/source/ui/inc/drawsh.hxx b/sc/source/ui/inc/drawsh.hxx
index 34050b1..7e5ede5 100644
--- a/sc/source/ui/inc/drawsh.hxx
+++ b/sc/source/ui/inc/drawsh.hxx
@@ -44,7 +44,7 @@ class ScDrawShell : public SfxShell
void SetHlinkForObject( SdrObject* pObj, const OUString& rHlnk );
protected:
- virtual void Activate(sal_Bool bMDI);
+ virtual void Activate(bool bMDI);
ScViewData* GetViewData() { return pViewData; }
public:
diff --git a/sc/source/ui/inc/prevwsh.hxx b/sc/source/ui/inc/prevwsh.hxx
index 524da0b..e9d352c 100644
--- a/sc/source/ui/inc/prevwsh.hxx
+++ b/sc/source/ui/inc/prevwsh.hxx
@@ -64,8 +64,8 @@ private:
void ExitPreview();
protected:
- virtual void Activate(sal_Bool bMDI);
- virtual void Deactivate(sal_Bool bMDI);
+ virtual void Activate(bool bMDI);
+ virtual void Deactivate(bool bMDI);
virtual void AdjustPosSizePixel( const Point &rPos, const Size &rSize );
virtual void InnerResizePixel( const Point &rOfs, const Size &rSize );
diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx
index 5fdc286..c5cdb6e 100644
--- a/sc/source/ui/inc/tabvwsh.hxx
+++ b/sc/source/ui/inc/tabvwsh.hxx
@@ -200,8 +200,8 @@ private:
DECL_LINK( FormControlActivated, void* );
protected:
- virtual void Activate(sal_Bool bMDI);
- virtual void Deactivate(sal_Bool bMDI);
+ virtual void Activate(bool bMDI);
+ virtual void Deactivate(bool bMDI);
virtual bool PrepareClose( sal_Bool bUI = sal_True ) SAL_OVERRIDE;
virtual void ShowCursor(bool bOn);
diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx
index c2eb5b1..a43b85d 100644
--- a/sc/source/ui/view/cellsh2.cxx
+++ b/sc/source/ui/view/cellsh2.cxx
@@ -234,7 +234,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
{
// show database beamer: SfxViewFrame call must be synchronous
- pViewFrame->ExecuteSlot( rReq, (sal_Bool) false ); // sal_False = synchronous
+ pViewFrame->ExecuteSlot( rReq, false ); // false = synchronous
// select current database in database beamer
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index 174520a..bf8311b 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -548,7 +548,7 @@ SfxTabPage* ScPreviewShell::CreatePrintOptionsPage( Window *pParent, const SfxIt
return 0;
}
-void ScPreviewShell::Activate(sal_Bool bMDI)
+void ScPreviewShell::Activate(bool bMDI)
{
SfxViewShell::Activate(bMDI);
@@ -563,7 +563,7 @@ void ScPreviewShell::Activate(sal_Bool bMDI)
}
}
-void ScPreviewShell::Deactivate(sal_Bool bMDI)
+void ScPreviewShell::Deactivate(bool bMDI)
{
SfxViewShell::Deactivate(bMDI);
diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx
index 786a41a..48fe120 100644
--- a/sc/source/ui/view/tabvwsh4.cxx
+++ b/sc/source/ui/view/tabvwsh4.cxx
@@ -103,7 +103,7 @@ sal_uInt16 ScTabViewShell::nInsObjCtrlState = SID_INSERT_DIAGRAM;
-void ScTabViewShell::Activate(sal_Bool bMDI)
+void ScTabViewShell::Activate(bool bMDI)
{
SfxViewShell::Activate(bMDI);
bIsActive = true;
@@ -225,7 +225,7 @@ void ScTabViewShell::Activate(sal_Bool bMDI)
::sfx2::sidebar::EnumContext::Context_Default);
}
-void ScTabViewShell::Deactivate(sal_Bool bMDI)
+void ScTabViewShell::Deactivate(bool bMDI)
{
HideTip();
diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx
index 518eabf..573fb79 100644
--- a/sd/source/ui/docshell/docshell.cxx
+++ b/sd/source/ui/docshell/docshell.cxx
@@ -340,7 +340,7 @@ void DrawDocShell::InPlaceActivate( bool bActive )
}
}
-void DrawDocShell::Activate( sal_Bool bMDI)
+void DrawDocShell::Activate( bool bMDI)
{
if (bMDI)
{
@@ -349,7 +349,7 @@ void DrawDocShell::Activate( sal_Bool bMDI)
}
}
-void DrawDocShell::Deactivate( sal_Bool )
+void DrawDocShell::Deactivate( bool )
{
}
diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx
index 031ed17..c8b22c8 100644
--- a/sd/source/ui/inc/DrawDocShell.hxx
+++ b/sd/source/ui/inc/DrawDocShell.hxx
@@ -71,8 +71,8 @@ public:
virtual ~DrawDocShell();
void UpdateRefDevice();
- virtual void Activate( sal_Bool bMDI );
- virtual void Deactivate( sal_Bool bMDI );
+ virtual void Activate( bool bMDI );
+ virtual void Deactivate( bool bMDI );
virtual bool InitNew( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage );
virtual bool ImportFrom(SfxMedium &rMedium,
css::uno::Reference<css::text::XTextRange> const& xInsertPosition)
diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx
index a6537d6..7341490 100644
--- a/sd/source/ui/inc/DrawViewShell.hxx
+++ b/sd/source/ui/inc/DrawViewShell.hxx
@@ -150,8 +150,8 @@ public:
void SelectionHasChanged();
void ModelHasChanged();
- virtual void Activate(sal_Bool bIsMDIActivate);
- virtual void Deactivate(sal_Bool IsMDIActivate);
+ virtual void Activate(bool bIsMDIActivate);
+ virtual void Deactivate(bool IsMDIActivate);
virtual void UIActivating( SfxInPlaceClient* );
virtual void UIDeactivated( SfxInPlaceClient* );
virtual OUString GetSelectionText( bool bCompleteWords = false );
diff --git a/sd/source/ui/inc/OutlineViewShell.hxx b/sd/source/ui/inc/OutlineViewShell.hxx
index f69132b..deb9307 100644
--- a/sd/source/ui/inc/OutlineViewShell.hxx
+++ b/sd/source/ui/inc/OutlineViewShell.hxx
@@ -78,8 +78,8 @@ public:
virtual void AddWindow(::sd::Window* pWin);
virtual void RemoveWindow(::sd::Window* pWin);
- virtual void Activate( sal_Bool IsMDIActivate );
- virtual void Deactivate( sal_Bool IsMDIActivate );
+ virtual void Activate( bool IsMDIActivate );
+ virtual void Deactivate( bool IsMDIActivate );
virtual SdPage* GetActualPage();
diff --git a/sd/source/ui/inc/PresentationViewShell.hxx b/sd/source/ui/inc/PresentationViewShell.hxx
index bed98a2..f23f501 100644
--- a/sd/source/ui/inc/PresentationViewShell.hxx
+++ b/sd/source/ui/inc/PresentationViewShell.hxx
@@ -56,7 +56,7 @@ protected:
private:
Rectangle maOldVisArea;
- virtual void Activate (sal_Bool bIsMDIActivate);
+ virtual void Activate (bool bIsMDIActivate);
virtual void Paint (const Rectangle& rRect, ::sd::Window* pWin);
};
diff --git a/sd/source/ui/inc/SlideSorterViewShell.hxx b/sd/source/ui/inc/SlideSorterViewShell.hxx
index dd06842..6e212a2 100644
--- a/sd/source/ui/inc/SlideSorterViewShell.hxx
+++ b/sd/source/ui/inc/SlideSorterViewShell.hxx
@@ -110,8 +110,8 @@ public:
*/
virtual void ArrangeGUIElements (void);
- virtual void Activate (sal_Bool IsMDIActivate);
- virtual void Deactivate (sal_Bool IsMDIActivate);
+ virtual void Activate (bool IsMDIActivate);
+ virtual void Deactivate (bool IsMDIActivate);
//===== Drag and Drop =====================================================
diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx
index 7fab33c..759bed4 100644
--- a/sd/source/ui/inc/ViewShell.hxx
+++ b/sd/source/ui/inc/ViewShell.hxx
@@ -541,8 +541,8 @@ protected:
virtual void UpdateHRuler();
virtual void UpdateVRuler();
- virtual void Activate(sal_Bool IsMDIActivate);
- virtual void Deactivate(sal_Bool IsMDIActivate);
+ virtual void Activate(bool IsMDIActivate);
+ virtual void Deactivate(bool IsMDIActivate);
virtual void SetZoomFactor( const Fraction &rZoomX,
const Fraction &rZoomY );
diff --git a/sd/source/ui/inc/ViewShellBase.hxx b/sd/source/ui/inc/ViewShellBase.hxx
index c8bc54f..0368924 100644
--- a/sd/source/ui/inc/ViewShellBase.hxx
+++ b/sd/source/ui/inc/ViewShellBase.hxx
@@ -153,8 +153,8 @@ public:
virtual void UIActivating( SfxInPlaceClient* );
virtual void UIDeactivated( SfxInPlaceClient* );
- virtual void Activate (sal_Bool IsMDIActivate);
- virtual void Deactivate (sal_Bool IsMDIActivate);
+ virtual void Activate (bool IsMDIActivate);
+ virtual void Deactivate (bool IsMDIActivate);
virtual void SetZoomFactor (
const Fraction &rZoomX,
const Fraction &rZoomY);
diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx
index 2cbeb86..ce71491 100644
--- a/sd/source/ui/sidebar/LayoutMenu.cxx
+++ b/sd/source/ui/sidebar/LayoutMenu.cxx
@@ -492,7 +492,7 @@ void LayoutMenu::AssignLayoutToSelectedSlides (AutoLayout aLayout)
SfxRequest aRequest (mrBase.GetViewFrame(), SID_ASSIGN_LAYOUT);
aRequest.AppendItem(SfxUInt32Item (ID_VAL_WHATPAGE, ((*iPage)->GetPageNum()-1)/2));
aRequest.AppendItem(SfxUInt32Item (ID_VAL_WHATLAYOUT, aLayout));
- pMainViewShell->ExecuteSlot (aRequest, sal_Bool(sal_False));
+ pMainViewShell->ExecuteSlot (aRequest, false);
}
}
while(false);
diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
index 87ef407..9e6d070 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
@@ -562,7 +562,7 @@ void SlideSorterViewShell::ArrangeGUIElements (void)
-void SlideSorterViewShell::Activate (sal_Bool bIsMDIActivate)
+void SlideSorterViewShell::Activate (bool bIsMDIActivate)
{
ViewShell::Activate(bIsMDIActivate);
if (mbIsArrangeGUIElementsPending)
@@ -601,7 +601,7 @@ void SlideSorterViewShell::Activate (sal_Bool bIsMDIActivate)
-void SlideSorterViewShell::Deactivate (sal_Bool /*bIsMDIActivate*/)
+void SlideSorterViewShell::Deactivate (bool /*bIsMDIActivate*/)
{
// Save Settings - Specifically SlidesPerRow to retrieve it later
WriteFrameViewData();
diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx
index c585ca4..9c14f4a 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -793,7 +793,7 @@ void ViewShellBase::ReadUserDataSequence (
-void ViewShellBase::Activate (sal_Bool bIsMDIActivate)
+void ViewShellBase::Activate (bool bIsMDIActivate)
{
SfxViewShell::Activate(bIsMDIActivate);
@@ -811,7 +811,7 @@ void ViewShellBase::Activate (sal_Bool bIsMDIActivate)
-void ViewShellBase::Deactivate (sal_Bool bIsMDIActivate)
+void ViewShellBase::Deactivate (bool bIsMDIActivate)
{
SfxViewShell::Deactivate(bIsMDIActivate);
}
diff --git a/sd/source/ui/view/ViewShellManager.cxx b/sd/source/ui/view/ViewShellManager.cxx
index bfb8ef8..dba0ca8 100644
--- a/sd/source/ui/view/ViewShellManager.cxx
+++ b/sd/source/ui/view/ViewShellManager.cxx
@@ -1334,7 +1334,7 @@ void ViewShellManager::Implementation::Deactivate (SfxShell* pShell)
}
// Now we can deactivate the shell.
- pShell->Deactivate(sal_True);
+ pShell->Deactivate(true);
}
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index 009288e..51db4f6 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -88,7 +88,7 @@ using namespace com::sun::star;
namespace sd {
-void DrawViewShell::Activate(sal_Bool bIsMDIActivate)
+void DrawViewShell::Activate(bool bIsMDIActivate)
{
ViewShell::Activate(bIsMDIActivate);
}
@@ -114,7 +114,7 @@ void DrawViewShell::UIDeactivated( SfxInPlaceClient* pCli )
}
-void DrawViewShell::Deactivate(sal_Bool bIsMDIActivate)
+void DrawViewShell::Deactivate(bool bIsMDIActivate)
{
// Temporarily disable context broadcasting while the Deactivate()
// call is forwarded to our base class.
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index 5aff9af..c3b780d 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -359,7 +359,7 @@ void OutlineViewShell::RemoveWindow (::sd::Window* pWin)
/**
* Activate(): during the first invocation the fields get updated
*/
-void OutlineViewShell::Activate( sal_Bool bIsMDIActivate )
+void OutlineViewShell::Activate( bool bIsMDIActivate )
{
if ( ! mbInitialized)
{
@@ -382,7 +382,7 @@ void OutlineViewShell::Activate( sal_Bool bIsMDIActivate )
}
}
-void OutlineViewShell::Deactivate( sal_Bool bIsMDIActivate )
+void OutlineViewShell::Deactivate( bool bIsMDIActivate )
{
pOlView->DisconnectFromApplication();
diff --git a/sd/source/ui/view/presvish.cxx b/sd/source/ui/view/presvish.cxx
index 143b31e..94988d8 100644
--- a/sd/source/ui/view/presvish.cxx
+++ b/sd/source/ui/view/presvish.cxx
@@ -127,7 +127,7 @@ SvxRuler* PresentationViewShell::CreateVRuler(::sd::Window*)
}
-void PresentationViewShell::Activate( sal_Bool bIsMDIActivate )
+void PresentationViewShell::Activate( bool bIsMDIActivate )
{
DrawViewShell::Activate( bIsMDIActivate );
diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx
index 1770bc0..d3bfeec 100644
--- a/sd/source/ui/view/viewshel.cxx
+++ b/sd/source/ui/view/viewshel.cxx
@@ -287,7 +287,7 @@ void ViewShell::Exit (void)
pView->UnmarkAll();
}
- Deactivate (sal_True);
+ Deactivate (true);
if (IsMainViewShell())
{
@@ -303,7 +303,7 @@ void ViewShell::Exit (void)
/**
* set focus to working window
*/
-void ViewShell::Activate(sal_Bool bIsMDIActivate)
+void ViewShell::Activate(bool bIsMDIActivate)
{
// Do not forward to SfxShell::Activate()
@@ -371,7 +371,7 @@ void ViewShell::UIDeactivated( SfxInPlaceClient* )
}
-void ViewShell::Deactivate(sal_Bool bIsMDIActivate)
+void ViewShell::Deactivate(bool bIsMDIActivate)
{
// remove view from a still active drag'n'drop session
SdTransferable* pDragTransferable = SD_MOD()->pTransferDrag;
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index 45165c5..64ff4327 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -573,7 +573,7 @@ SfxApplication::ChooseScript()
uno::Reference< frame::XFrame > xFrame( pFrame ? pFrame->GetFrameInterface() : uno::Reference< frame::XFrame >() );
AbstractScriptSelectorDialog* pDlg =
- pFact->CreateScriptSelectorDialog( NULL, sal_False, xFrame );
+ pFact->CreateScriptSelectorDialog( NULL, false, xFrame );
SAL_INFO( "sfx.appl", "done, now exec it");
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 3e8a893..a80a91a 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -1194,7 +1194,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
do // artificial loop for flow control
{
AbstractScriptSelectorDialog* pDlg = pFact->CreateScriptSelectorDialog(
- lcl_getDialogParent( xFrame, GetTopWindow() ), sal_False, xFrame );
+ lcl_getDialogParent( xFrame, GetTopWindow() ), false, xFrame );
OSL_ENSURE( pDlg, "SfxApplication::OfaExec_Impl( SID_RUNMACRO ): no dialog!" );
if ( !pDlg )
break;
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index 5900501..ff10f76 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -218,7 +218,7 @@ OUString SfxHelp_Impl::GetHelpText( const OUString& aCommandURL, const OUString&
}
SfxHelp::SfxHelp() :
- bIsDebug( sal_False ),
+ bIsDebug( false ),
pImp ( NULL )
{
// read the environment variable "HELP_DEBUG"
@@ -528,7 +528,7 @@ static bool impl_showOnlineHelp( const OUString& rURL )
return false;
}
-sal_Bool SfxHelp::Start_Impl(const OUString& rURL, const Window* pWindow, const OUString& rKeyword)
+bool SfxHelp::Start_Impl(const OUString& rURL, const Window* pWindow, const OUString& rKeyword)
{
OUStringBuffer aHelpRootURL("vnd.sun.star.help://");
AppendConfigToken(aHelpRootURL, sal_True);
@@ -605,13 +605,11 @@ sal_Bool SfxHelp::Start_Impl(const OUString& rURL, const Window* pWindow, const
if ( !impl_hasHelpInstalled() )
{
if ( impl_showOnlineHelp( aHelpURL ) )
- return sal_True;
- else
- {
- NoHelpErrorBox aErrBox( const_cast< Window* >( pWindow ) );
- aErrBox.Execute();
- return sal_False;
- }
+ return true;
+
+ NoHelpErrorBox aErrBox( const_cast< Window* >( pWindow ) );
+ aErrBox.Execute();
+ return false;
}
Reference < XDesktop2 > xDesktop = Desktop::create( ::comphelper::getProcessComponentContext() );
@@ -632,7 +630,7 @@ sal_Bool SfxHelp::Start_Impl(const OUString& rURL, const Window* pWindow, const
else
pHelpWindow = (SfxHelpWindow_Impl*)VCLUnoHelper::GetWindow(xHelp->getComponentWindow());
if (!xHelp.is() || !xHelpContent.is() || !pHelpWindow)
- return sal_False;
+ return false;
#ifdef DBG_UTIL
OStringBuffer aTmp("SfxHelp: HelpId = ");
@@ -649,7 +647,7 @@ sal_Bool SfxHelp::Start_Impl(const OUString& rURL, const Window* pWindow, const
if ( xTopWindow.is() )
xTopWindow->toFront();
- return sal_True;
+ return true;
}
OUString SfxHelp::CreateHelpURL(const OUString& aCommandURL, const OUString& rModuleName)
diff --git a/sfx2/source/bastyp/sfxhtml.cxx b/sfx2/source/bastyp/sfxhtml.cxx
index f06cbc8..95b4751 100644
--- a/sfx2/source/bastyp/sfxhtml.cxx
+++ b/sfx2/source/bastyp/sfxhtml.cxx
@@ -62,7 +62,7 @@ static HTMLOptionEnum const aAreaShapeOptEnums[] =
{ 0, 0 }
};
-SfxHTMLParser::SfxHTMLParser( SvStream& rStream, sal_Bool bIsNewDoc,
+SfxHTMLParser::SfxHTMLParser( SvStream& rStream, bool bIsNewDoc,
SfxMedium *pMed )
: HTMLParser(rStream, bIsNewDoc)
, pMedium(pMed)
@@ -238,9 +238,9 @@ void SfxHTMLParser::StartFileDownload(const OUString& rURL)
pDLMedium->DownLoad();
}
-sal_Bool SfxHTMLParser::FinishFileDownload( OUString& rStr )
+bool SfxHTMLParser::FinishFileDownload( OUString& rStr )
{
- sal_Bool bOK = pDLMedium && pDLMedium->GetErrorCode()==0;
+ bool bOK = pDLMedium && pDLMedium->GetErrorCode()==0;
if( bOK )
{
SvStream* pStream = pDLMedium->GetInStream();
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index a831ec9..d74bd22 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -1692,9 +1692,9 @@ void SfxDispatcher::FlushImpl()
if (!pImp->bActive)
continue;
if (i->bPush)
- i->pCluster->DoActivate_Impl(pImp->pFrame, sal_True);
+ i->pCluster->DoActivate_Impl(pImp->pFrame, true);
else
- i->pCluster->DoDeactivate_Impl(pImp->pFrame, sal_True);
+ i->pCluster->DoDeactivate_Impl(pImp->pFrame, true);
}
aToDoCopy = pImp->aToDoCopyStack.back();
@@ -2354,7 +2354,7 @@ void SfxDispatcher::RemoveShell_Impl( SfxShell& rShell )
{
pImp->aStack.erase( pImp->aStack.begin() + n );
rShell.SetDisableFlags( 0 );
- rShell.DoDeactivate_Impl(pImp->pFrame, sal_True);
+ rShell.DoDeactivate_Impl(pImp->pFrame, true);
break;
}
}
diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx
index c10a496..f77261b 100644
--- a/sfx2/source/control/shell.cxx
+++ b/sfx2/source/control/shell.cxx
@@ -90,10 +90,10 @@ struct SfxShell_Impl: public SfxBroadcaster
// ViewFrame/ViewShell/SubShell list
SfxViewFrame* pFrame; // Frame, if <UI-active>
SfxRepeatTarget* pRepeatTarget; // SbxObjectRef xParent;
- sal_Bool bInAppBASIC;
- sal_Bool bActive;
- sal_uIntPtr nDisableFlags;
- sal_uIntPtr nHelpId;
+ bool bInAppBASIC;
+ bool bActive;
+ sal_uIntPtr nDisableFlags;
+ sal_uIntPtr nHelpId;
svtools::AsynchronLink* pExecuter;
svtools::AsynchronLink* pUpdater;
SfxVerbSlotArr_Impl aSlotArr;
@@ -134,9 +134,9 @@ SfxShell::SfxShell()
pImp->pViewSh = 0;
pImp->pFrame = 0;
pImp->pRepeatTarget = 0;
- pImp->bInAppBASIC = sal_False;
+ pImp->bInAppBASIC = false;
pImp->nHelpId = 0L;
- pImp->bActive = sal_False;
+ pImp->bActive = false;
pImp->nDisableFlags = 0;
}
@@ -159,9 +159,9 @@ SfxShell::SfxShell( SfxViewShell *pViewSh )
pImp->pViewSh = pViewSh;
pImp->pFrame = 0;
pImp->pRepeatTarget = 0;
- pImp->bInAppBASIC = sal_False;
+ pImp->bInAppBASIC = false;
pImp->nHelpId = 0L;
- pImp->bActive = sal_False;
+ pImp->bActive = false;
}
@@ -547,7 +547,7 @@ void SfxShell::Invalidate_Impl( SfxBindings& rBindings, sal_uInt16 nId )
-void SfxShell::DoActivate_Impl( SfxViewFrame *pFrame, sal_Bool bMDI )
+void SfxShell::DoActivate_Impl( SfxViewFrame *pFrame, bool bMDI )
/* [Description]
@@ -575,7 +575,7 @@ void SfxShell::DoActivate_Impl( SfxViewFrame *pFrame, sal_Bool bMDI )
{
// Remember Frame, in which it was activated
pImp->pFrame = pFrame;
- pImp->bActive = sal_True;
+ pImp->bActive = true;
}
// Notify Subclass
@@ -584,7 +584,7 @@ void SfxShell::DoActivate_Impl( SfxViewFrame *pFrame, sal_Bool bMDI )
-void SfxShell::DoDeactivate_Impl( SfxViewFrame *pFrame, sal_Bool bMDI )
+void SfxShell::DoDeactivate_Impl( SfxViewFrame *pFrame, bool bMDI )
/* [Description]
@@ -613,7 +613,7 @@ void SfxShell::DoDeactivate_Impl( SfxViewFrame *pFrame, sal_Bool bMDI )
{
// deliver
pImp->pFrame = 0;
- pImp->bActive = sal_False;
+ pImp->bActive = false;
}
// Notify Subclass
@@ -622,7 +622,7 @@ void SfxShell::DoDeactivate_Impl( SfxViewFrame *pFrame, sal_Bool bMDI )
-sal_Bool SfxShell::IsActive() const
+bool SfxShell::IsActive() const
{
return pImp->bActive;
}
@@ -631,7 +631,7 @@ sal_Bool SfxShell::IsActive() const
void SfxShell::Activate
(
- sal_Bool /*bMDI*/ /* TRUE
+ bool /*bMDI*/ /* TRUE
the <SfxDispatcher>, on which the SfxShell is
located, is activated or the SfxShell instance
was pushed on an active SfxDispatcher.
@@ -651,7 +651,7 @@ void SfxShell::Activate
[Cross-reference]
- StarView SystemWindow::Activate(sal_Bool)
+ StarView SystemWindow::Activate(bool)
*/
{
@@ -662,7 +662,7 @@ void SfxShell::Activate
void SfxShell::Deactivate
(
- sal_Bool /*bMDI*/ /* TRUE
+ bool /*bMDI*/ /* TRUE
the <SfxDispatcher>, on which the SfxShell is
located, is inactivated or the SfxShell instance
was popped on an active SfxDispatcher.
@@ -682,7 +682,7 @@ void SfxShell::Deactivate
[Cross-reference]
- StarView SystemWindow::Dectivate(sal_Bool)
+ StarView SystemWindow::Dectivate(bool)
*/
{
@@ -777,7 +777,7 @@ long ShellCall_Impl( void* pObj, void* pArg )
*/
-const SfxPoolItem* SfxShell::ExecuteSlot( SfxRequest& rReq, sal_Bool bAsync )
+const SfxPoolItem* SfxShell::ExecuteSlot( SfxRequest& rReq, bool bAsync )
{
if( !bAsync )
return ExecuteSlot( rReq, (SfxInterface*)0L );
@@ -1048,7 +1048,7 @@ void SfxShell::VerbExec(SfxRequest& rReq)
SfxViewShell *pViewShell = GetViewShell();
if ( pViewShell )
{
- sal_Bool bReadOnly = pViewShell->GetObjectShell()->IsReadOnly();
+ bool bReadOnly = pViewShell->GetObjectShell()->IsReadOnly();
com::sun::star::uno::Sequence < com::sun::star::embed::VerbDescriptor > aList = pViewShell->GetVerbs();
for (sal_Int32 n=0, nVerb=0; n<aList.getLength(); n++)
{
@@ -1118,9 +1118,9 @@ SfxObjectShell* SfxShell::GetObjectShell()
-sal_Bool SfxShell::HasUIFeature( sal_uInt32 )
+bool SfxShell::HasUIFeature( sal_uInt32 )
{
- return sal_False;
+ return false;
}
long DispatcherUpdate_Impl( void*, void* pArg )
diff --git a/sfx2/source/dialog/styfitem.cxx b/sfx2/source/dialog/styfitem.cxx
index 9da4253..58dee41 100644
--- a/sfx2/source/dialog/styfitem.cxx
+++ b/sfx2/source/dialog/styfitem.cxx
@@ -126,9 +126,9 @@ SfxStyleFamilies::~SfxStyleFamilies()
-sal_Bool SfxStyleFamilies::updateImages( const ResId& _rId )
+bool SfxStyleFamilies::updateImages( const ResId& _rId )
{
- sal_Bool bSuccess = sal_False;
+ bool bSuccess = false;
{
::svt::OLocalResourceAccess aLocalRes( _rId );
@@ -154,7 +154,7 @@ sal_Bool SfxStyleFamilies::updateImages( const ResId& _rId )
pItem->SetImage( aImages.GetImage( aImages.GetImageId( i ) ) );
}
- bSuccess = sal_True;
+ bSuccess = true;
}
}
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index f22ba53..7fc23cb 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -198,13 +198,13 @@ struct IMPL_SfxBaseModel_DataContainer : public ::sfx2::IModifiableDocument
Sequence< Reference< frame::XController > > m_seqControllers ;
Reference< container::XIndexAccess > m_contViewData ;
sal_uInt16 m_nControllerLockCount ;
- sal_Bool m_bClosed ;
- sal_Bool m_bClosing ;
- sal_Bool m_bSaving ;
- sal_Bool m_bSuicide ;
- sal_Bool m_bInitialized ;
- sal_Bool m_bExternalTitle ;
- sal_Bool m_bModifiedSinceLastSave ;
+ bool m_bClosed ;
+ bool m_bClosing ;
+ bool m_bSaving ;
+ bool m_bSuicide ;
+ bool m_bInitialized ;
+ bool m_bExternalTitle ;
+ bool m_bModifiedSinceLastSave ;
Reference< view::XPrintable> m_xPrintable ;
Reference< script::provider::XScriptProvider > m_xScriptProvider ;
Reference< ui::XUIConfigurationManager2 > m_xUIConfigurationManager;
@@ -221,13 +221,13 @@ struct IMPL_SfxBaseModel_DataContainer : public ::sfx2::IModifiableDocument
: m_pObjectShell ( pObjectShell )
, m_aInterfaceContainer ( rMutex )
, m_nControllerLockCount ( 0 )
- , m_bClosed ( sal_False )
- , m_bClosing ( sal_False )
- , m_bSaving ( sal_False )
- , m_bSuicide ( sal_False )
- , m_bInitialized ( sal_False )
- , m_bExternalTitle ( sal_False )
- , m_bModifiedSinceLastSave( sal_False )
+ , m_bClosed ( false )
+ , m_bClosing ( false )
+ , m_bSaving ( false )
+ , m_bSuicide ( false )
+ , m_bInitialized ( false )
+ , m_bExternalTitle ( false )
+ , m_bModifiedSinceLastSave( false )
, m_pStorageModifyListen ( NULL )
, m_xTitleHelper ()
, m_xNumberedControllers ()
@@ -453,13 +453,13 @@ class SfxSaveGuard
public:
SfxSaveGuard(const Reference< frame::XModel >& xModel ,
IMPL_SfxBaseModel_DataContainer* pData ,
- sal_Bool bRejectConcurrentSaveRequest);
+ bool bRejectConcurrentSaveRequest);
~SfxSaveGuard();
};
SfxSaveGuard::SfxSaveGuard(const Reference< frame::XModel >& xModel ,
IMPL_SfxBaseModel_DataContainer* pData ,
- sal_Bool bRejectConcurrentSaveRequest)
+ bool bRejectConcurrentSaveRequest)
: m_xModel (xModel)
, m_pData (pData )
, m_pFramesLock(0 )
@@ -477,7 +477,7 @@ SfxSaveGuard::SfxSaveGuard(const Reference< frame::XModel >& xModel
OUString("Concurrent save requests on the same document are not possible."),
Reference< XInterface >());
- m_pData->m_bSaving = sal_True;
+ m_pData->m_bSaving = true;
m_pFramesLock = new SfxOwnFramesLocker(m_pData->m_pObjectShell);
}
@@ -487,7 +487,7 @@ SfxSaveGuard::~SfxSaveGuard()
m_pFramesLock = 0;
delete pFramesLock;
- m_pData->m_bSaving = sal_False;
+ m_pData->m_bSaving = false;
// m_bSuicide was set e.g. in case someone tried to close a document, while it was used for
// storing at the same time. Further m_bSuicide was set to sal_True only if close(sal_True) was called.
@@ -499,7 +499,7 @@ SfxSaveGuard::~SfxSaveGuard()
{
// Reset this state. In case the new close() request is not accepted by someone else ...
// it's not a good idea to have two "owners" for close .-)
- m_pData->m_bSuicide = sal_False;
+ m_pData->m_bSuicide = false;
try
{
Reference< util::XCloseable > xClose(m_xModel, UNO_QUERY);
@@ -893,7 +893,7 @@ sal_Bool SAL_CALL SfxBaseModel::attachResource( const OUString&
// but _only_ before load() or initNew() methods
if ( m_pData->m_pObjectShell.Is() && !m_pData->m_pObjectShell->GetMedium() )
{
- sal_Bool bEmb = sal_Bool();
+ sal_Bool bEmb(sal_False);
if ( ( rArgs[0].Value >>= bEmb ) && bEmb )
m_pData->m_pObjectShell->SetCreateMode_Impl( SFX_CREATE_MODE_EMBEDDED );
}
@@ -1395,14 +1395,14 @@ void SAL_CALL SfxBaseModel::close( sal_Bool bDeliverOwnership ) throw (util::Clo
if ( m_pData->m_bSaving )
{
if (bDeliverOwnership)
- m_pData->m_bSuicide = sal_True;
+ m_pData->m_bSuicide = true;
throw util::CloseVetoException(
OUString("Cant close while saving."),
static_cast< util::XCloseable* >(this));
}
// no own objections against closing!
- m_pData->m_bClosing = sal_True;
+ m_pData->m_bClosing = true;
pContainer = m_pData->m_aInterfaceContainer.getContainer( ::getCppuType( ( const Reference< util::XCloseListener >*) NULL ) );
if (pContainer!=NULL)
{
@@ -1420,8 +1420,8 @@ void SAL_CALL SfxBaseModel::close( sal_Bool bDeliverOwnership ) throw (util::Clo
}
}
- m_pData->m_bClosed = sal_True;
- m_pData->m_bClosing = sal_False;
+ m_pData->m_bClosed = true;
+ m_pData->m_bClosing = false;
dispose();
}
@@ -1537,7 +1537,7 @@ void SAL_CALL SfxBaseModel::storeSelf( const Sequence< beans::PropertyValue >
if ( m_pData->m_pObjectShell.Is() )
{
m_pData->m_pObjectShell->AddLog( OUString( OSL_LOG_PREFIX "storeSelf" ) );
- SfxSaveGuard aSaveGuard(this, m_pData, sal_False);
+ SfxSaveGuard aSaveGuard(this, m_pData, false);
sal_Bool bCheckIn = sal_False;
for ( sal_Int32 nInd = 0; nInd < aSeqArgs.getLength(); nInd++ )
@@ -1667,9 +1667,9 @@ void SAL_CALL SfxBaseModel::storeAsURL( const OUString& rURL
if ( m_pData->m_pObjectShell.Is() )
{
m_pData->m_pObjectShell->AddLog( OUString( OSL_LOG_PREFIX "storeAsURL" ) );
- SfxSaveGuard aSaveGuard(this, m_pData, sal_False);
+ SfxSaveGuard aSaveGuard(this, m_pData, false);
- impl_store( rURL, rArgs, sal_False );
+ impl_store( rURL, rArgs, false );
Sequence< beans::PropertyValue > aSequence ;
TransformItems( SID_OPENDOC, *m_pData->m_pObjectShell->GetMedium()->GetItemSet(), aSequence );
@@ -1708,12 +1708,12 @@ void SAL_CALL SfxBaseModel::storeToURL( const OUString& rURL
if ( m_pData->m_pObjectShell.Is() )
{
m_pData->m_pObjectShell->AddLog( OUString( OSL_LOG_PREFIX "storeToURL" ) );
- SfxSaveGuard aSaveGuard(this, m_pData, sal_False);
- impl_store( rURL, rArgs, sal_True );
+ SfxSaveGuard aSaveGuard(this, m_pData, false);
+ impl_store( rURL, rArgs, true );
}
}
-::sal_Bool SAL_CALL SfxBaseModel::wasModifiedSinceLastSave() throw ( RuntimeException, std::exception )
+sal_Bool SAL_CALL SfxBaseModel::wasModifiedSinceLastSave() throw ( RuntimeException, std::exception )
{
SfxModelGuard aGuard( *this );
return m_pData->m_bModifiedSinceLastSave;
@@ -1724,11 +1724,11 @@ void SAL_CALL SfxBaseModel::storeToRecoveryFile( const OUString& i_TargetLocatio
SfxModelGuard aGuard( *this );
// delegate
- SfxSaveGuard aSaveGuard( this, m_pData, sal_False );
- impl_store( i_TargetLocation, i_MediaDescriptor, sal_True );
+ SfxSaveGuard aSaveGuard( this, m_pData, false );
+ impl_store( i_TargetLocation, i_MediaDescriptor, true );
// no need for subsequent calls to storeToRecoveryFile, unless we're modified, again
- m_pData->m_bModifiedSinceLastSave = sal_False;
+ m_pData->m_bModifiedSinceLastSave = false;
}
void SAL_CALL SfxBaseModel::recoverFromFile( const OUString& i_SourceLocation, const OUString& i_SalvagedFile, const Sequence< PropertyValue >& i_MediaDescriptor ) throw ( RuntimeException, IOException, WrappedTargetException, std::exception )
@@ -2790,7 +2790,7 @@ void SfxBaseModel::Notify( SfxBroadcaster& rBC ,
{
impl_getPrintHelper();
ListenForStorage_Impl( m_pData->m_pObjectShell->GetStorage() );
- m_pData->m_bModifiedSinceLastSave = sal_False;
+ m_pData->m_bModifiedSinceLastSave = false;
}
break;
@@ -2810,7 +2810,7 @@ void SfxBaseModel::Notify( SfxBroadcaster& rBC ,
case SFX_EVENT_DOCCREATED:
{
impl_getPrintHelper();
- m_pData->m_bModifiedSinceLastSave = sal_False;
+ m_pData->m_bModifiedSinceLastSave = false;
}
break;
@@ -2884,12 +2884,12 @@ SfxObjectShell* SfxBaseModel::GetObjectShell() const
// public impl.
-sal_Bool SfxBaseModel::IsInitialized() const
+bool SfxBaseModel::IsInitialized() const
{
if ( !m_pData || !m_pData->m_pObjectShell )
{
OSL_FAIL( "SfxBaseModel::IsInitialized: this should have been caught earlier!" );
- return sal_False;
+ return false;
}
return m_pData->m_pObjectShell->GetMedium() != NULL;
@@ -2903,7 +2903,7 @@ void SfxBaseModel::MethodEntryCheck( const bool i_mustBeInitialized ) const
throw lang::NotInitializedException( OUString(), *const_cast< SfxBaseModel* >( this ) );
}
-sal_Bool SfxBaseModel::impl_isDisposed() const
+bool SfxBaseModel::impl_isDisposed() const
{
return ( m_pData == NULL ) ;
}
@@ -2927,7 +2927,7 @@ OUString SfxBaseModel::GetMediumFilterName_Impl()
void SfxBaseModel::impl_store( const OUString& sURL ,
const Sequence< beans::PropertyValue >& seqArguments ,
- sal_Bool bSaveTo )
+ bool bSaveTo )
{
if( sURL.isEmpty() )
throw frame::IllegalArgumentIOException();
@@ -3284,7 +3284,7 @@ void SfxBaseModel::notifyEvent( const document::EventObject& aEvent ) const
}
/** returns true if someone added a XEventListener to this XEventBroadcaster */
-sal_Bool SfxBaseModel::hasEventListeners() const
+bool SfxBaseModel::hasEventListeners() const
{
return !impl_isDisposed() && (NULL != m_pData->m_aInterfaceContainer.getContainer( ::getCppuType((const Reference< document::XEventListener >*)0) ) );
}
@@ -3455,12 +3455,12 @@ OUString SfxBaseModel::getRuntimeUID() const
return m_pData->m_sRuntimeUID;
}
-sal_Bool SfxBaseModel::hasValidSignatures() const
+bool SfxBaseModel::hasValidSignatures() const
{
SolarMutexGuard aGuard;
if ( m_pData->m_pObjectShell.Is() )
return ( m_pData->m_pObjectShell->ImplGetSignatureState( false ) == SIGNATURESTATE_SIGNATURES_OK );
- return sal_False;
+ return false;
}
void SfxBaseModel::getGrabBagItem(com::sun::star::uno::Any& rVal) const
@@ -4034,7 +4034,7 @@ void SAL_CALL SfxBaseModel::setTitle( const OUString& sTitle )
SfxModelGuard aGuard( *this );
impl_getTitleHelper()->setTitle (sTitle);
- m_pData->m_bExternalTitle = sal_True;
+ m_pData->m_bExternalTitle = true;
}
diff --git a/sfx2/source/view/viewfrm2.cxx b/sfx2/source/view/viewfrm2.cxx
index b5a4ebb..edade4a 100644
--- a/sfx2/source/view/viewfrm2.cxx
+++ b/sfx2/source/view/viewfrm2.cxx
@@ -390,7 +390,7 @@ void SfxViewFrame::SetZoomFactor( const Fraction &rZoomX, const Fraction &rZoomY
GetViewShell()->SetZoomFactor( rZoomX, rZoomY );
}
-void SfxViewFrame::Activate( sal_Bool bMDI )
+void SfxViewFrame::Activate( bool bMDI )
{
DBG_ASSERT(GetViewShell(), "No Shell");
if ( bMDI )
@@ -398,7 +398,7 @@ void SfxViewFrame::Activate( sal_Bool bMDI )
//(mba): here maybe as in Beanframe NotifyEvent ?!
}
-void SfxViewFrame::Deactivate( sal_Bool bMDI )
+void SfxViewFrame::Deactivate( bool bMDI )
{
DBG_ASSERT(GetViewShell(), "No Shell");
if ( bMDI )
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index beb3993..59a0e8a 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -983,7 +983,7 @@ SfxInPlaceClient* SfxViewShell::GetUIActiveClient() const
-void SfxViewShell::Activate( sal_Bool bMDI )
+void SfxViewShell::Activate( bool bMDI )
{
if ( bMDI )
{
@@ -997,7 +997,7 @@ void SfxViewShell::Activate( sal_Bool bMDI )
-void SfxViewShell::Deactivate(sal_Bool /*bMDI*/)
+void SfxViewShell::Deactivate(bool /*bMDI*/)
{
}
diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx
index 92973a2..f231bda 100644
--- a/starmath/inc/view.hxx
+++ b/starmath/inc/view.hxx
@@ -266,8 +266,8 @@ protected:
virtual bool HasPrintOptionsPage() const;
virtual SfxTabPage *CreatePrintOptionsPage(Window *pParent,
const SfxItemSet &rOptions);
- virtual void Deactivate(sal_Bool IsMDIActivate);
- virtual void Activate(sal_Bool IsMDIActivate);
+ virtual void Deactivate(bool IsMDIActivate);
+ virtual void Activate(bool IsMDIActivate);
virtual void AdjustPosSizePixel(const Point &rPos, const Size &rSize);
virtual void InnerResizePixel(const Point &rOfs, const Size &rSize);
virtual void OuterResizePixel(const Point &rOfs, const Size &rSize);
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index e6f6add..c3d5c49 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -2023,7 +2023,7 @@ SmViewShell::~SmViewShell()
delete pImpl;
}
-void SmViewShell::Deactivate( sal_Bool bIsMDIActivate )
+void SmViewShell::Deactivate( bool bIsMDIActivate )
{
SAL_INFO( "starmath", "SmViewShell::Deactivate" );
@@ -2035,7 +2035,7 @@ void SmViewShell::Deactivate( sal_Bool bIsMDIActivate )
}
-void SmViewShell::Activate( sal_Bool bIsMDIActivate )
+void SmViewShell::Activate( bool bIsMDIActivate )
{
SAL_INFO( "starmath", "SmViewShell::Activate" );
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx
index b336f9c..d7f37c6 100644
--- a/svx/source/form/fmshell.cxx
+++ b/svx/source/form/fmshell.cxx
@@ -321,9 +321,9 @@ void FmFormShell::impl_setDesignMode(bool bDesign)
}
-sal_Bool FmFormShell::HasUIFeature( sal_uInt32 nFeature )
+bool FmFormShell::HasUIFeature( sal_uInt32 nFeature )
{
- sal_Bool bResult = sal_False;
+ bool bResult = false;
if ((nFeature & FM_UI_FEATURE_SHOW_DATABASEBAR) == FM_UI_FEATURE_SHOW_DATABASEBAR)
{
// nur wenn auch formulare verfuegbar
@@ -363,7 +363,7 @@ sal_Bool FmFormShell::HasUIFeature( sal_uInt32 nFeature )
|| ( ( nFeature & FM_UI_FEATURE_TB_FORMDESIGN ) == FM_UI_FEATURE_TB_FORMDESIGN )
)
{
- bResult = sal_True;
+ bResult = true;
}
return bResult;
@@ -1251,7 +1251,7 @@ void FmFormShell::SetY2KState(sal_uInt16 n)
}
-void FmFormShell::Activate(sal_Bool bMDI)
+void FmFormShell::Activate(bool bMDI)
{
SfxShell::Activate(bMDI);
@@ -1260,7 +1260,7 @@ void FmFormShell::Activate(sal_Bool bMDI)
}
-void FmFormShell::Deactivate(sal_Bool bMDI)
+void FmFormShell::Deactivate(bool bMDI)
{
SfxShell::Deactivate(bMDI);
diff --git a/sw/source/core/uibase/inc/view.hxx b/sw/source/core/uibase/inc/view.hxx
index 8caf03f..aa04ee3 100644
--- a/sw/source/core/uibase/inc/view.hxx
+++ b/sw/source/core/uibase/inc/view.hxx
@@ -378,8 +378,8 @@ protected:
virtual void SelectShell();
- virtual void Activate(sal_Bool);
- virtual void Deactivate(sal_Bool);
+ virtual void Activate(bool);
+ virtual void Deactivate(bool);
virtual void InnerResizePixel( const Point &rOfs, const Size &rSize );
virtual void OuterResizePixel( const Point &rOfs, const Size &rSize );
@@ -403,7 +403,7 @@ public:
void GotFocus() const;
virtual SdrView* GetDrawView() const;
- virtual sal_Bool HasUIFeature( sal_uInt32 nFeature );
+ virtual bool HasUIFeature( sal_uInt32 nFeature );
virtual void ShowCursor( bool bOn = true );
virtual ErrCode DoVerb( long nVerb );
diff --git a/sw/source/core/uibase/shells/textfld.cxx b/sw/source/core/uibase/shells/textfld.cxx
index 8a8c880..a2ba081 100644
--- a/sw/source/core/uibase/shells/textfld.cxx
+++ b/sw/source/core/uibase/shells/textfld.cxx
@@ -119,7 +119,7 @@ void SwTextShell::ExecField(SfxRequest &rReq)
if(rLink.IsVisible())
{
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- SfxAbstractLinksDialog* pDlg = pFact->CreateLinksDialog( pMDI, &rSh.GetLinkManager(), sal_False, &rLink );
+ SfxAbstractLinksDialog* pDlg = pFact->CreateLinksDialog( pMDI, &rSh.GetLinkManager(), false, &rLink );
if ( pDlg )
{
pDlg->Execute();
diff --git a/sw/source/core/uibase/uiview/view1.cxx b/sw/source/core/uibase/uiview/view1.cxx
index 14a3c1c..975c879 100644
--- a/sw/source/core/uibase/uiview/view1.cxx
+++ b/sw/source/core/uibase/uiview/view1.cxx
@@ -42,7 +42,7 @@
extern int bDocSzUpdated;
-void SwView::Activate(sal_Bool bMDIActivate)
+void SwView::Activate(bool bMDIActivate)
{
// fdo#40438 Update the layout to make sure everything is correct before showing the content
m_pWrtShell->StartAction();
@@ -115,7 +115,7 @@ void SwView::Activate(sal_Bool bMDIActivate)
SfxViewShell::Activate(bMDIActivate);
}
-void SwView::Deactivate(sal_Bool bMDIActivate)
+void SwView::Deactivate(bool bMDIActivate)
{
extern bool bFlushCharBuffer ;
// Are Characters still in the input buffer?
diff --git a/sw/source/core/uibase/uiview/viewstat.cxx b/sw/source/core/uibase/uiview/viewstat.cxx
index 7e5362e..df30fef 100644
--- a/sw/source/core/uibase/uiview/viewstat.cxx
+++ b/sw/source/core/uibase/uiview/viewstat.cxx
@@ -512,9 +512,9 @@ void SwView::GetDrawState(SfxItemSet &rSet)
}
}
-sal_Bool SwView::HasUIFeature( sal_uInt32 nFeature )
+bool SwView::HasUIFeature( sal_uInt32 nFeature )
{
- sal_Bool bRet = sal_False;
+ bool bRet = false;
switch(nFeature)
{
case CHILDWIN_LABEL : bRet = m_pWrtShell->IsLabelDoc(); break;
commit e399c0759812affd4f7f6e1e3aacfbcafc06ad6d
Author: Noel Grandin <noel at peralex.com>
Date: Mon Mar 17 15:18:55 2014 +0200
SfxProgress::SetState does not need to be virtual
Change-Id: I39a138c05ed995b8f9706a66338b994193fdee50
diff --git a/include/sfx2/progress.hxx b/include/sfx2/progress.hxx
index c5f534f..46d28af 100644
--- a/include/sfx2/progress.hxx
+++ b/include/sfx2/progress.hxx
@@ -48,7 +48,7 @@ public:
virtual void SetText( const OUString& rText );
bool SetStateText( sal_uIntPtr nVal, const rtl::OUString &rVal, sal_uIntPtr nNewRange = 0 );
- virtual bool SetState( sal_uIntPtr nVal, sal_uIntPtr nNewRange = 0 );
+ bool SetState( sal_uIntPtr nVal, sal_uIntPtr nNewRange = 0 );
sal_uIntPtr GetState() const { return nVal; }
void Resume();
commit 86725da2a2a0a7ae34f600b53976b72b7d456c9f
Author: Noel Grandin <noel at peralex.com>
Date: Mon Mar 17 15:06:29 2014 +0200
fix return type of SfxViewShell::HandleNotifyEvent_Impl to be bool
it was long, but it was treated as a bool.
Change-Id: I097ab5f9dff511781a9711594754ae34f25a37bc
diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx
index ae22a37..f87ddd3 100644
--- a/include/sfx2/viewsh.hxx
+++ b/include/sfx2/viewsh.hxx
@@ -276,7 +276,7 @@ public:
SAL_DLLPRIVATE SfxPrinter* SetPrinter_Impl( SfxPrinter *pNewPrinter );
SAL_DLLPRIVATE sal_Bool IsShowView_Impl() const;
- SAL_DLLPRIVATE long HandleNotifyEvent_Impl( NotifyEvent& rEvent );
+ SAL_DLLPRIVATE bool HandleNotifyEvent_Impl( NotifyEvent& rEvent );
SAL_DLLPRIVATE sal_Bool HasKeyListeners_Impl();
SAL_DLLPRIVATE sal_Bool HasMouseClickListeners_Impl();
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index 6a0bd51..beb3993 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -2022,11 +2022,11 @@ void SfxViewShell::TakeFrameOwnership_Impl()
pImp->m_bGotFrameOwnership = true;
}
-long SfxViewShell::HandleNotifyEvent_Impl( NotifyEvent& rEvent )
+bool SfxViewShell::HandleNotifyEvent_Impl( NotifyEvent& rEvent )
{
if (pImp->m_pController.is())
- return pImp->m_pController->HandleEvent_Impl( rEvent ) ? 1 : 0;
- return 0;
+ return pImp->m_pController->HandleEvent_Impl( rEvent );
+ return false;
}
sal_Bool SfxViewShell::HasKeyListeners_Impl()
commit b466b6f2575b4bf55f84b96d3795260901544209
Author: Noel Grandin <noel at peralex.com>
Date: Mon Mar 17 14:34:01 2014 +0200
sfx2: sal_Bool->bool
Change-Id: I0240d8d093478c62fd7d63cac228092e641bf0dc
diff --git a/include/sfx2/sfxbasecontroller.hxx b/include/sfx2/sfxbasecontroller.hxx
index aba163f..561888e 100644
--- a/include/sfx2/sfxbasecontroller.hxx
+++ b/include/sfx2/sfxbasecontroller.hxx
@@ -351,9 +351,9 @@ public:
// FIXME: TL needs this in sw/source/ui/uno/unotxdoc.cxx now;
// either the _Impl name should vanish or there should be an "official" API
SfxViewShell* GetViewShell_Impl() const;
- SAL_DLLPRIVATE sal_Bool HandleEvent_Impl( NotifyEvent& rEvent );
- SAL_DLLPRIVATE sal_Bool HasKeyListeners_Impl();
- SAL_DLLPRIVATE sal_Bool HasMouseClickListeners_Impl();
+ SAL_DLLPRIVATE bool HandleEvent_Impl( NotifyEvent& rEvent );
+ SAL_DLLPRIVATE bool HasKeyListeners_Impl();
+ SAL_DLLPRIVATE bool HasMouseClickListeners_Impl();
SAL_DLLPRIVATE void SetCreationArguments_Impl( const css::uno::Sequence< css::beans::PropertyValue >& i_rCreationArgs );
SAL_DLLPRIVATE css::uno::Reference< css::frame::XTitle > impl_getTitleHelper ();
private:
diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx
index 38404fe..a8b8d97 100644
--- a/sfx2/source/view/sfxbasecontroller.cxx
+++ b/sfx2/source/view/sfxbasecontroller.cxx
@@ -398,7 +398,7 @@ struct IMPL_SfxBaseController_DataContainer
SfxViewShell* m_pViewShell ;
SfxBaseController* m_pController ;
bool m_bDisposing ;
- sal_Bool m_bSuspendState ;
+ bool m_bSuspendState ;
Reference< XTitle > m_xTitleHelper ;
Sequence< PropertyValue > m_aCreationArgs ;
@@ -413,7 +413,7 @@ struct IMPL_SfxBaseController_DataContainer
, m_pViewShell ( pViewShell )
, m_pController ( pController )
, m_bDisposing ( false )
- , m_bSuspendState ( sal_False )
+ , m_bSuspendState ( false )
{
}
@@ -606,14 +606,14 @@ sal_Bool SAL_CALL SfxBaseController::suspend( sal_Bool bSuspend ) throw( Runtime
SolarMutexGuard aGuard;
// ignore dublicate calls, which doesn't change anything real
- if (bSuspend == m_pData->m_bSuspendState)
+ if (bSuspend == (m_pData->m_bSuspendState ? 1 : 0))
return sal_True;
if ( bSuspend == sal_True )
{
if ( !m_pData->m_pViewShell )
{
- m_pData->m_bSuspendState = sal_True;
+ m_pData->m_bSuspendState = true;
return sal_True;
}
@@ -635,7 +635,7 @@ sal_Bool SAL_CALL SfxBaseController::suspend( sal_Bool bSuspend ) throw( Runtime
if ( bRet )
{
ConnectSfxFrame_Impl( E_DISCONNECT );
- m_pData->m_bSuspendState = sal_True;
+ m_pData->m_bSuspendState = true;
}
return bRet;
@@ -650,7 +650,7 @@ sal_Bool SAL_CALL SfxBaseController::suspend( sal_Bool bSuspend ) throw( Runtime
ConnectSfxFrame_Impl( E_RECONNECT );
}
- m_pData->m_bSuspendState = sal_False;
+ m_pData->m_bSuspendState = false;
return sal_True ;
}
}
@@ -743,7 +743,7 @@ Reference< frame::XDispatch > SAL_CALL SfxBaseController::queryDispatch( const
if ( aURL.Protocol == ".uno:" )
{
OUString aMasterCommand = SfxOfficeDispatch::GetMasterUnoCommand( aURL );
- sal_Bool bMasterCommand( !aMasterCommand.isEmpty() );
+ bool bMasterCommand( !aMasterCommand.isEmpty() );
pAct = m_pData->m_pViewShell->GetViewFrame() ;
SfxSlotPool& rSlotPool = SfxSlotPool::GetSlotPool( pAct );
@@ -1210,17 +1210,17 @@ throw (RuntimeException, std::exception)
return aSeq;
}
-sal_Bool SfxBaseController::HandleEvent_Impl( NotifyEvent& rEvent )
+bool SfxBaseController::HandleEvent_Impl( NotifyEvent& rEvent )
{
return m_pData->m_aUserInputInterception.handleNotifyEvent( rEvent );
}
-sal_Bool SfxBaseController::HasKeyListeners_Impl()
+bool SfxBaseController::HasKeyListeners_Impl()
{
return m_pData->m_aUserInputInterception.hasKeyHandlers();
}
-sal_Bool SfxBaseController::HasMouseClickListeners_Impl()
+bool SfxBaseController::HasMouseClickListeners_Impl()
{
return m_pData->m_aUserInputInterception.hasMouseClickListeners();
}
@@ -1431,7 +1431,7 @@ void SfxBaseController::ShowInfoBars( )
// Loop over the CMIS Properties to find cmis:isVersionSeriesCheckedOut
// and find if it is a Google Drive file.
bool bIsGoogleFile = false;
- sal_Bool bCheckedOut = sal_False;
+ bool bCheckedOut = false;
for ( sal_Int32 i = 0; i < aCmisProperties.getLength(); ++i )
{
if ( aCmisProperties[i].Id == "cmis:isVersionSeriesCheckedOut" ) {
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index 802ac84..6a0bd51 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -2025,7 +2025,7 @@ void SfxViewShell::TakeFrameOwnership_Impl()
long SfxViewShell::HandleNotifyEvent_Impl( NotifyEvent& rEvent )
{
if (pImp->m_pController.is())
- return pImp->m_pController->HandleEvent_Impl( rEvent );
+ return pImp->m_pController->HandleEvent_Impl( rEvent ) ? 1 : 0;
return 0;
}
commit fb77ab1dc237faec245633f99d727350d9ae295f
Author: Noel Grandin <noel at peralex.com>
Date: Mon Mar 17 14:23:36 2014 +0200
sfx2: sal_Bool->bool
Change-Id: Ib2a02c7e05e48657b9745bcccc8f8f626daaef2d
diff --git a/include/sfx2/printer.hxx b/include/sfx2/printer.hxx
index 73e990e..6994cb5 100644
--- a/include/sfx2/printer.hxx
+++ b/include/sfx2/printer.hxx
@@ -37,7 +37,7 @@ private:
JobSetup aOrigJobSetup;
SfxItemSet* pOptions;
SfxPrinter_Impl* pImpl;
- sal_Bool bKnown;
+ bool bKnown;
SAL_DLLPRIVATE void operator =(SfxPrinter &); // not defined
@@ -66,8 +66,8 @@ public:
const SfxItemSet& GetOptions() const { return *pOptions; }
void SetOptions( const SfxItemSet &rNewOptions );
- sal_Bool IsKnown() const { return bKnown; }
- sal_Bool IsOriginal() const { return bKnown; }
+ bool IsKnown() const { return bKnown; }
+ bool IsOriginal() const { return bKnown; }
};
#endif
diff --git a/include/sfx2/prnmon.hxx b/include/sfx2/prnmon.hxx
index 15a9a28..95ea9ea 100644
--- a/include/sfx2/prnmon.hxx
+++ b/include/sfx2/prnmon.hxx
@@ -46,7 +46,7 @@ public:
const SfxItemSet *rOptions );
virtual ~SfxPrintOptionsDialog();
- sal_Bool Construct();
+ bool Construct();
virtual short Execute();
virtual bool Notify( NotifyEvent& rNEvt );
diff --git a/include/sfx2/progress.hxx b/include/sfx2/progress.hxx
index 0e21a43..c5f534f 100644
--- a/include/sfx2/progress.hxx
+++ b/include/sfx2/progress.hxx
@@ -36,24 +36,24 @@ struct SvProgressArg;
class SFX2_DLLPUBLIC SfxProgress
{
SfxProgress_Impl* pImp;
- sal_uIntPtr nVal;
- sal_Bool bSuspended;
+ sal_uIntPtr nVal;
+ bool bSuspended;
public:
SfxProgress( SfxObjectShell* pObjSh,
const rtl::OUString& rText,
- sal_uIntPtr nRange, sal_Bool bAllDocs = sal_False,
- sal_Bool bWait = sal_True );
+ sal_uIntPtr nRange, bool bAllDocs = false,
+ bool bWait = true );
virtual ~SfxProgress();
virtual void SetText( const OUString& rText );
- sal_Bool SetStateText( sal_uIntPtr nVal, const rtl::OUString &rVal, sal_uIntPtr nNewRange = 0 );
- virtual sal_Bool SetState( sal_uIntPtr nVal, sal_uIntPtr nNewRange = 0 );
- sal_uIntPtr GetState() const { return nVal; }
+ bool SetStateText( sal_uIntPtr nVal, const rtl::OUString &rVal, sal_uIntPtr nNewRange = 0 );
+ virtual bool SetState( sal_uIntPtr nVal, sal_uIntPtr nNewRange = 0 );
+ sal_uIntPtr GetState() const { return nVal; }
void Resume();
void Suspend();
- sal_Bool IsSuspended() const { return bSuspended; }
+ bool IsSuspended() const { return bSuspended; }
void UnLock();
void Reschedule();
diff --git a/include/sfx2/request.hxx b/include/sfx2/request.hxx
index 55f7f1c..0512e68 100644
--- a/include/sfx2/request.hxx
+++ b/include/sfx2/request.hxx
@@ -88,20 +88,20 @@ public:
const SfxPoolItem* GetReturnValue() const;
static com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder > GetMacroRecorder( SfxViewFrame* pFrame=NULL );
- static sal_Bool HasMacroRecorder( SfxViewFrame* pFrame=NULL );
- sal_uInt16 GetCallMode() const;
- void AllowRecording( sal_Bool );
- sal_Bool AllowsRecording() const;
- sal_Bool IsAPI() const;
- sal_Bool IsSynchronCall() const;
- void SetSynchronCall( sal_Bool bSynchron );
+ static bool HasMacroRecorder( SfxViewFrame* pFrame=NULL );
+ sal_uInt16 GetCallMode() const;
+ void AllowRecording( bool );
+ bool AllowsRecording() const;
+ bool IsAPI() const;
+ bool IsSynchronCall() const;
+ void SetSynchronCall( bool bSynchron );
- sal_Bool IsDone() const;
- void Done( sal_Bool bRemove = sal_False );
+ bool IsDone() const;
+ void Done( bool bRemove = false );
void Ignore();
void Cancel();
- sal_Bool IsCancelled() const;
+ bool IsCancelled() const;
void Done(const SfxItemSet &, bool bKeep = true );
void ForgetAllArgs();
diff --git a/sfx2/source/bastyp/progress.cxx b/sfx2/source/bastyp/progress.cxx
index 816d2bc..0f5340f 100644
--- a/sfx2/source/bastyp/progress.cxx
+++ b/sfx2/source/bastyp/progress.cxx
@@ -55,10 +55,10 @@ struct SfxProgress_Impl
sal_uIntPtr nMax;
clock_t nCreate;
clock_t nNextReschedule;
- sal_Bool bLocked, bAllDocs;
- sal_Bool bWaitMode;
- sal_Bool bAllowRescheduling;
- sal_Bool bRunning;
+ bool bLocked, bAllDocs;
+ bool bWaitMode;
+ bool bAllowRescheduling;
+ bool bRunning;
SfxProgress* pActiveProgress;
SfxObjectShellRef xObjSh;
@@ -66,7 +66,7 @@ struct SfxProgress_Impl
SfxViewFrame* pView;
SfxProgress_Impl( const OUString& );
- void Enable_Impl( sal_Bool );
+ void Enable_Impl( bool );
};
@@ -79,7 +79,7 @@ extern sal_uInt32 Get10ThSec();
-void SfxProgress_Impl::Enable_Impl( sal_Bool bEnable )
+void SfxProgress_Impl::Enable_Impl( bool bEnable )
{
SfxObjectShell* pDoc = bAllDocs ? NULL : (SfxObjectShell*) xObjSh;
SfxViewFrame *pFrame= SfxViewFrame::GetFirst(pDoc);
@@ -131,8 +131,8 @@ SfxProgress::SfxProgress
sal_uIntPtr nRange, /* Max value for range */
- sal_Bool bAll, /* Disable all documents or only the document of the ViewFram */
- sal_Bool bWait /* Activate the wait-Pointer initially (TRUE) */
+ bool bAll, /* Disable all documents or only the document of the ViewFram */
+ bool bWait /* Activate the wait-Pointer initially (TRUE) */
)
/* [Description]
@@ -146,15 +146,15 @@ SfxProgress::SfxProgress
: pImp( new SfxProgress_Impl( rText ) ),
nVal(0),
- bSuspended(sal_True)
+ bSuspended(true)
{
- pImp->bRunning = sal_True;
+ pImp->bRunning = true;
pImp->bAllowRescheduling = Application::IsInExecute();
pImp->xObjSh = pObjSh;
pImp->aText = rText;
pImp->nMax = nRange;
- pImp->bLocked = sal_False;
+ pImp->bLocked = false;
pImp->bWaitMode = bWait;
pImp->nCreate = Get10ThSec();
pImp->nNextReschedule = pImp->nCreate;
@@ -208,7 +208,7 @@ void SfxProgress::Stop()
if ( !pImp->bRunning )
return;
- pImp->bRunning = sal_False;
+ pImp->bRunning = false;
DBG( DbgOutf( "SfxProgress: destroyed at %luds", Get10ThSec() ) );
Suspend();
@@ -217,7 +217,7 @@ void SfxProgress::Stop()
else
SFX_APP()->SetProgress_Impl(0);
if ( pImp->bLocked )
- pImp->Enable_Impl(sal_True);
+ pImp->Enable_Impl(true);
}
@@ -257,7 +257,7 @@ long TimeOut_Impl( void*, void* pArgV )
-sal_Bool SfxProgress::SetStateText
+bool SfxProgress::SetStateText
(
sal_uLong nNewVal, /* New value for the progress-bar */
const OUString& rNewVal, /* Status as Text */
@@ -271,7 +271,7 @@ sal_Bool SfxProgress::SetStateText
-sal_Bool SfxProgress::SetState
+bool SfxProgress::SetState
(
sal_uLong nNewVal, /* new value for the progress bar */
@@ -283,7 +283,7 @@ sal_Bool SfxProgress::SetState
[Return value]
- sal_Bool TRUE
+ bool TRUE
Proceed with the action
FALSE
@@ -291,7 +291,7 @@ sal_Bool SfxProgress::SetState
*/
{
- if( pImp->pActiveProgress ) return sal_True;
+ if( pImp->pActiveProgress ) return true;
nVal = nNewVal;
@@ -351,7 +351,7 @@ sal_Bool SfxProgress::SetState
pImp->xStatusInd->setValue( nNewVal );
}
- return sal_True;
+ return true;
}
@@ -396,7 +396,7 @@ void SfxProgress::Resume()
pFrame->GetBindings().ENTERREGISTRATIONS();
}
- bSuspended = sal_False;
+ bSuspended = false;
}
}
@@ -418,7 +418,7 @@ void SfxProgress::Suspend()
if ( !bSuspended )
{
DBG( DbgOutf( "SfxProgress: suspended" ) );
- bSuspended = sal_True;
+ bSuspended = true;
if ( pImp->xStatusInd.is() )
{
@@ -451,8 +451,8 @@ void SfxProgress::UnLock()
return;
DBG( DbgOutf( "SfxProgress: unlocked" ) );
- pImp->bLocked = sal_False;
- pImp->Enable_Impl(sal_True);
+ pImp->bLocked = false;
+ pImp->Enable_Impl(true);
}
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 9541771..a831ec9 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -307,7 +307,7 @@ int SfxDispatcher::Call_Impl( SfxShell& rShell, const SfxSlot &rSlot, SfxRequest
}
// do nothing after this object is dead
- return rReq.IsDone();
+ return rReq.IsDone() ? 1 : 0;
}
}
@@ -960,7 +960,7 @@ void SfxDispatcher::_Execute
if ( &rShell == *(pDispat->pImp->aStack.rbegin() + n) )
{
if ( eCallMode & SFX_CALLMODE_RECORD )
- rReq.AllowRecording( sal_True );
+ rReq.AllowRecording( true );
pDispat->pImp->xPoster->Post(new SfxRequest(rReq));
return;
}
@@ -1267,7 +1267,7 @@ IMPL_LINK( SfxDispatcher, PostMsgHandler, SfxRequest*, pReq )
// When the pSlot is a "Pseudoslot" for macros or Verbs, it can
// be destroyed in the Call_Impl, thus do not use it anymore!
- pReq->SetSynchronCall( sal_False );
+ pReq->SetSynchronCall( false );
Call_Impl( *pSh, *pSlot, *pReq, pReq->AllowsRecording() ); //! why bRecord?
DBG( pSfxApp->LeaveAsynchronCall_Impl() );
}
diff --git a/sfx2/source/control/request.cxx b/sfx2/source/control/request.cxx
index 9aea012..c96fc99 100644
--- a/sfx2/source/control/request.cxx
+++ b/sfx2/source/control/request.cxx
@@ -59,15 +59,15 @@ struct SfxRequest_Impl: public SfxListener
SfxPoolItem* pRetVal; // Return value belongs to itself
SfxShell* pShell; // run from this shell
const SfxSlot* pSlot; // executed Slot
- sal_uInt16 nModifier; // which Modifier was pressed?
- sal_Bool bDone; // at all executed
- sal_Bool bIgnored; // Cancelled by the User
- sal_Bool bCancelled; // no longer notify
- sal_Bool bUseTarget; // aTarget was set by Application
- sal_uInt16 nCallMode; // Synch/Asynch/API/Record
- sal_Bool bAllowRecording;
- SfxAllItemSet* pInternalArgs;
- SfxViewFrame* pViewFrame;
+ sal_uInt16 nModifier; // which Modifier was pressed?
+ bool bDone; // at all executed
+ bool bIgnored; // Cancelled by the User
+ bool bCancelled; // no longer notify
+ bool bUseTarget; // aTarget was set by Application
+ sal_uInt16 nCallMode; // Synch/Asynch/API/Record
+ bool bAllowRecording;
+ SfxAllItemSet* pInternalArgs;
+ SfxViewFrame* pViewFrame;
com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder > xRecorder;
@@ -78,9 +78,9 @@ struct SfxRequest_Impl: public SfxListener
, pShell(0)
, pSlot(0)
, nModifier(0)
- , bCancelled(sal_False)
+ , bCancelled(false)
, nCallMode( SFX_CALLMODE_SYNCHRON )
- , bAllowRecording( sal_False )
+ , bAllowRecording( false )
, pInternalArgs( 0 )
, pViewFrame(0)
{}
@@ -144,8 +144,8 @@ SfxRequest::SfxRequest
pImp( new SfxRequest_Impl(this) )
{
pImp->bAllowRecording = rOrig.pImp->bAllowRecording;
- pImp->bDone = sal_False;
- pImp->bIgnored = sal_False;
+ pImp->bDone = false;
+ pImp->bIgnored = false;
pImp->pRetVal = 0;
pImp->pShell = 0;
pImp->pSlot = 0;
@@ -185,14 +185,14 @@ SfxRequest::SfxRequest
pArgs(0),
pImp( new SfxRequest_Impl(this) )
{
- pImp->bDone = sal_False;
- pImp->bIgnored = sal_False;
+ pImp->bDone = false;
+ pImp->bIgnored = false;
pImp->SetPool( &pViewFrame->GetPool() );
pImp->pRetVal = 0;
pImp->pShell = 0;
pImp->pSlot = 0;
pImp->nCallMode = SFX_CALLMODE_SYNCHRON;
- pImp->bUseTarget = sal_False;
+ pImp->bUseTarget = false;
pImp->pViewFrame = pViewFrame;
if( pImp->pViewFrame->GetDispatcher()->GetShellAndSlot_Impl( nSlotId, &pImp->pShell, &pImp->pSlot, true, true ) )
{
@@ -226,14 +226,14 @@ SfxRequest::SfxRequest
pArgs(0),
pImp( new SfxRequest_Impl(this) )
{
- pImp->bDone = sal_False;
- pImp->bIgnored = sal_False;
+ pImp->bDone = false;
+ pImp->bIgnored = false;
pImp->SetPool( &rPool );
pImp->pRetVal = 0;
pImp->pShell = 0;
pImp->pSlot = 0;
pImp->nCallMode = nMode;
- pImp->bUseTarget = sal_False;
+ pImp->bUseTarget = false;
}
SfxRequest::SfxRequest
@@ -247,14 +247,14 @@ SfxRequest::SfxRequest
pArgs(new SfxAllItemSet(rPool)),
pImp( new SfxRequest_Impl(this) )
{
- pImp->bDone = sal_False;
- pImp->bIgnored = sal_False;
+ pImp->bDone = false;
+ pImp->bIgnored = false;
pImp->SetPool( &rPool );
pImp->pRetVal = 0;
pImp->pShell = 0;
pImp->pSlot = 0;
pImp->nCallMode = nMode;
- pImp->bUseTarget = sal_False;
+ pImp->bUseTarget = false;
TransformParameters( nSlot, rArgs, *pArgs, pSlot );
}
@@ -273,14 +273,14 @@ SfxRequest::SfxRequest
pArgs(new SfxAllItemSet(rSfxArgs)),
pImp( new SfxRequest_Impl(this) )
{
- pImp->bDone = sal_False;
- pImp->bIgnored = sal_False;
+ pImp->bDone = false;
+ pImp->bIgnored = false;
pImp->SetPool( rSfxArgs.GetPool() );
pImp->pRetVal = 0;
pImp->pShell = 0;
pImp->pSlot = 0;
pImp->nCallMode = nMode;
- pImp->bUseTarget = sal_False;
+ pImp->bUseTarget = false;
}
@@ -291,14 +291,14 @@ sal_uInt16 SfxRequest::GetCallMode() const
-sal_Bool SfxRequest::IsSynchronCall() const
+bool SfxRequest::IsSynchronCall() const
{
return SFX_CALLMODE_SYNCHRON == ( SFX_CALLMODE_SYNCHRON & pImp->nCallMode );
}
-void SfxRequest::SetSynchronCall( sal_Bool bSynchron )
+void SfxRequest::SetSynchronCall( bool bSynchron )
{
if ( bSynchron )
pImp->nCallMode |= SFX_CALLMODE_SYNCHRON;
@@ -590,7 +590,7 @@ void SfxRequest::Done
-void SfxRequest::Done( sal_Bool bRelease )
+void SfxRequest::Done( bool bRelease )
// [<SfxRequest::Done(SfxItemSet&)>]
{
Done_Impl( pArgs );
@@ -608,7 +608,7 @@ void SfxRequest::ForgetAllArgs()
-sal_Bool SfxRequest::IsCancelled() const
+bool SfxRequest::IsCancelled() const
{
return pImp->bCancelled;
}
@@ -624,7 +624,7 @@ void SfxRequest::Cancel()
*/
{
- pImp->bCancelled = sal_True;
+ pImp->bCancelled = true;
pImp->SetPool( 0 );
DELETEZ( pArgs );
}
@@ -648,7 +648,7 @@ void SfxRequest::Ignore()
{
// Mark as actually executed
- pImp->bIgnored = sal_True;
+ pImp->bIgnored = true;
}
@@ -670,7 +670,7 @@ void SfxRequest::Done_Impl
{
// Mark as actually executed
- pImp->bDone = sal_True;
+ pImp->bDone = true;
// not Recording
if ( !pImp->xRecorder.is() )
@@ -768,7 +768,7 @@ void SfxRequest::Done_Impl
-sal_Bool SfxRequest::IsDone() const
+bool SfxRequest::IsDone() const
/* [Description]
@@ -777,7 +777,7 @@ sal_Bool SfxRequest::IsDone() const
because it was canceled by the user or the context for this request was
wrong, this was not implemented on a separate <SfxShell>.
- SfxRequest instances that return sal_False will not be recorded.
+ SfxRequest instances that return false will not be recorded.
[Cross-reference]
@@ -821,7 +821,7 @@ com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder > SfxRe
return xRecorder;
}
-sal_Bool SfxRequest::HasMacroRecorder( SfxViewFrame* pView )
+bool SfxRequest::HasMacroRecorder( SfxViewFrame* pView )
{
return GetMacroRecorder( pView ).is();
}
@@ -829,12 +829,12 @@ sal_Bool SfxRequest::HasMacroRecorder( SfxViewFrame* pView )
-sal_Bool SfxRequest::IsAPI() const
+bool SfxRequest::IsAPI() const
/* [Description]
- Returns sal_True if this SfxRequest was generated by an API (for example BASIC),
- otherwise sal_False.
+ Returns true if this SfxRequest was generated by an API (for example BASIC),
+ otherwise false.
*/
{
@@ -855,14 +855,14 @@ sal_uInt16 SfxRequest::GetModifier() const
-void SfxRequest::AllowRecording( sal_Bool bSet )
+void SfxRequest::AllowRecording( bool bSet )
{
pImp->bAllowRecording = bSet;
}
-sal_Bool SfxRequest::AllowsRecording() const
+bool SfxRequest::AllowsRecording() const
{
- sal_Bool bAllow = pImp->bAllowRecording;
+ bool bAllow = pImp->bAllowRecording;
if( !bAllow )
bAllow = ( SFX_CALLMODE_API != ( SFX_CALLMODE_API & pImp->nCallMode ) ) &&
( SFX_CALLMODE_RECORD == ( SFX_CALLMODE_RECORD & pImp->nCallMode ) );
diff --git a/sfx2/source/view/printer.cxx b/sfx2/source/view/printer.cxx
index 8c22941..bfaa3ed 100644
--- a/sfx2/source/view/printer.cxx
+++ b/sfx2/source/view/printer.cxx
@@ -37,25 +37,25 @@
struct SfxPrinter_Impl
{
- sal_Bool mbAll;
- sal_Bool mbSelection;
- sal_Bool mbFromTo;
- sal_Bool mbRange;
+ bool mbAll;
+ bool mbSelection;
+ bool mbFromTo;
+ bool mbRange;
SfxPrinter_Impl() :
- mbAll ( sal_True ),
- mbSelection ( sal_True ),
- mbFromTo ( sal_True ),
- mbRange ( sal_True ) {}
+ mbAll ( true ),
+ mbSelection ( true ),
+ mbFromTo ( true ),
+ mbRange ( true ) {}
~SfxPrinter_Impl() {}
};
struct SfxPrintOptDlg_Impl
{
- sal_Bool mbHelpDisabled;
+ bool mbHelpDisabled;
SfxPrintOptDlg_Impl() :
- mbHelpDisabled ( sal_False ) {}
+ mbHelpDisabled ( false ) {}
};
// class SfxPrinter ------------------------------------------------------
@@ -106,7 +106,7 @@ SfxPrinter::SfxPrinter( SfxItemSet* pTheOptions ) :
*/
pOptions( pTheOptions ),
- bKnown(sal_True)
+ bKnown(true)
{
pImpl = new SfxPrinter_Impl;
@@ -262,7 +262,7 @@ bool SfxPrintOptionsDialog::Notify( NotifyEvent& rNEvt )
void SfxPrintOptionsDialog::DisableHelp()
{
- pDlgImpl->mbHelpDisabled = sal_True;
+ pDlgImpl->mbHelpDisabled = true;
get<HelpButton>("help")->Disable();
}
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 7a521a9..1a5f1ec 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -504,7 +504,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq )
}
// Readonly document can not be switched to edit mode?
- rReq.Done( sal_False );
+ rReq.Done( false );
if ( nOpenMode == SFX_STREAM_READWRITE && !rReq.IsAPI() )
{
@@ -548,7 +548,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq )
pSh->DoSaveCompleted( pMed );
pSh->Broadcast( SfxSimpleHint(SFX_HINT_MODECHANGED) );
rReq.SetReturnValue( SfxBoolItem( rReq.GetSlot(), true ) );
- rReq.Done( sal_True );
+ rReq.Done( true );
return;
}
}
@@ -840,7 +840,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq )
}
// Record as done
- rReq.Done( sal_True );
+ rReq.Done( true );
rReq.SetReturnValue(SfxBoolItem(rReq.GetSlot(), true));
return;
}
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index 51122c0..802ac84 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -657,7 +657,7 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq )
// No type and no location => error
if ( aFilterName.isEmpty() || aTypeName.isEmpty())
{
- rReq.Done(sal_False);
+ rReq.Done(false);
return;
}
@@ -698,7 +698,7 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq )
}
catch (const io::IOException&)
{
- rReq.Done(sal_False);
+ rReq.Done(false);
return;
}
@@ -707,7 +707,7 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq )
}
else
{
- rReq.Done(sal_False);
+ rReq.Done(false);
return;
}
}
@@ -725,7 +725,7 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq )
// Jetzt schon DONE aufrufen, da die Argumente evtl. einen Pool
// benutzen, der demn"achst weg ist
- rReq.Done(sal_True);
+ rReq.Done(true);
// ausfuehren
if (!pShowItem || (bActive != pImp->m_bPlugInsActive))
diff --git a/sw/source/core/uibase/app/mainwn.cxx b/sw/source/core/uibase/app/mainwn.cxx
index 98b2e4b..d7553a0 100644
--- a/sw/source/core/uibase/app/mainwn.cxx
+++ b/sw/source/core/uibase/app/mainwn.cxx
@@ -68,8 +68,8 @@ void StartProgress( sal_uInt16 nMessResId, long nStartValue, long nEndValue,
pProgress->pProgress = new SfxProgress( pDocShell,
SW_RESSTR(nMessResId),
nEndValue - nStartValue,
- sal_False,
- sal_True );
+ false,
+ true );
pProgress->nStartCount = 1;
pProgress->pDocShell = pDocShell;
pProgressContainer->insert( pProgressContainer->begin(), pProgress );
commit ac01de882d368c4d8044361f874edd4b53e33f2b
Author: Noel Grandin <noel at peralex.com>
Date: Mon Mar 17 13:38:26 2014 +0200
sfx2: sal_Bool->bool
Change-Id: I87c5a180566e9da185c2992844e6522e82c17747
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index b96a091..b1d359d 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -1086,8 +1086,8 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, ClickTakeHdl)
if( !m_pLbxFound->GetSelectEntryCount() || !bEntriesFound )
{
SvxOpenGraphicDialog aDlg("Gallery");
- aDlg.EnableLink(sal_False);
- aDlg.AsLink(sal_False);
+ aDlg.EnableLink(false);
+ aDlg.AsLink(false);
if( !aDlg.Execute() )
pData->pTheme->InsertURL( INetURLObject( aDlg.GetPath() ) );
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 828529d..19f5a36 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -1523,7 +1523,7 @@ IMPL_LINK_NOARG(SvxBackgroundTabPage, BrowseHdl_Impl)
OUString aStrBrowse(get<Window>("findgraphicsft")->GetText());
pImportDlg = new SvxOpenGraphicDialog( aStrBrowse );
if ( bHtml || bLinkOnly )
- pImportDlg->EnableLink(sal_False);
+ pImportDlg->EnableLink(false);
pImportDlg->SetPath( aBgdGraphicPath, m_pBtnLink->IsChecked() );
pPageImpl->bIsImportDlgInExecute = sal_True;
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 8e34cf4..f771697 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -1893,8 +1893,8 @@ IMPL_LINK( SvxNumOptionsTabPage, GraphicHdl_Impl, MenuButton *, pButton )
}
else
{
- aGrfDlg.EnableLink( sal_False );
- aGrfDlg.AsLink( sal_False );
+ aGrfDlg.EnableLink( false );
+ aGrfDlg.AsLink( false );
if ( !aGrfDlg.Execute() )
{
// memorize selected filter
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 94761f5..17aadf2 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -579,7 +579,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickImportHdl_Impl)
{
ResMgr& rMgr = CUI_MGR();
SvxOpenGraphicDialog aDlg( OUString("Import") );
- aDlg.EnableLink(sal_False);
+ aDlg.EnableLink(false);
if( !aDlg.Execute() )
{
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index 10cd1f7..a80abe3 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -174,15 +174,15 @@ private:
// storage that contains the object
SfxStyleSheetBasePool* pStyleSheetPool; // StyleSheets
SfxObjectCreateMode eCreateMode; // Purpose of the object
- sal_Bool bHasName :1; // sal_True := existing object,
+ bool bHasName :1; // sal_True := existing object,
// sal_False := new object
- sal_Bool bIsInGenerateThumbnail; //optimize thumbnail generate and store procedure to improve odt saving performance, i120030
+ bool bIsInGenerateThumbnail; //optimize thumbnail generate and store procedure to improve odt saving performance, i120030
private:
SAL_DLLPRIVATE void UpdateTime_Impl(const ::com::sun::star::uno::Reference<
::com::sun::star::document::XDocumentProperties> & i_xDocProps);
- SAL_DLLPRIVATE sal_Bool SaveTo_Impl(SfxMedium &rMedium, const SfxItemSet* pSet );
+ SAL_DLLPRIVATE bool SaveTo_Impl(SfxMedium &rMedium, const SfxItemSet* pSet );
protected:
SfxObjectShell(SfxObjectCreateMode);
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list