[Libreoffice-commits] core.git: 5 commits - scaddins/source sccomp/source scripting/source sd/inc sd/qa sd/source xmlsecurity/inc xmlsecurity/source
Noel Grandin
noel at peralex.com
Thu Apr 24 01:55:00 PDT 2014
scaddins/source/analysis/analysis.cxx | 32
scaddins/source/analysis/analysishelper.cxx | 178 ++--
scaddins/source/analysis/analysishelper.hxx | 132 +--
scaddins/source/analysis/financial.cxx | 4
scaddins/source/datefunc/datefunc.cxx | 16
scaddins/source/datefunc/datefunc.hxx | 16
scaddins/source/pricing/pricing.cxx | 4
scaddins/source/pricing/pricing.hxx | 16
sccomp/source/solver/SolverComponent.cxx | 10
sccomp/source/solver/SolverComponent.hxx | 10
scripting/source/basprov/baslibnode.cxx | 2
scripting/source/basprov/basmethnode.cxx | 4
scripting/source/basprov/basmodnode.cxx | 4
scripting/source/basprov/basprov.cxx | 2
scripting/source/protocolhandler/scripthandler.cxx | 6
scripting/source/provider/BrowseNodeFactoryImpl.cxx | 10
scripting/source/provider/MasterScriptProvider.cxx | 4
scripting/source/stringresource/stringresource.cxx | 14
scripting/source/stringresource/stringresource.hxx | 8
sd/inc/CustomAnimationEffect.hxx | 30
sd/inc/EffectMigration.hxx | 10
sd/inc/Outliner.hxx | 4
sd/inc/TransitionPreset.hxx | 4
sd/inc/anminfo.hxx | 16
sd/inc/drawdoc.hxx | 106 +-
sd/inc/sdabstdlg.hxx | 26
sd/inc/sdattr.hxx | 8
sd/inc/sdcgmfilter.hxx | 6
sd/inc/sdfilter.hxx | 14
sd/inc/sdgrffilter.hxx | 4
sd/inc/sdhtmlfilter.hxx | 4
sd/inc/sdiocmpt.hxx | 2
sd/inc/sdmod.hxx | 6
sd/inc/sdpage.hxx | 54 -
sd/inc/sdpptwrp.hxx | 6
sd/inc/sdxmlwrp.hxx | 6
sd/inc/stlpool.hxx | 2
sd/inc/stlsheet.hxx | 2
sd/qa/unit/uimpress.cxx | 2
sd/source/core/CustomAnimationEffect.cxx | 20
sd/source/core/EffectMigration.cxx | 20
sd/source/core/PageListWatcher.cxx | 4
sd/source/core/PageListWatcher.hxx | 4
sd/source/core/anminfo.cxx | 16
sd/source/core/drawdoc.cxx | 24
sd/source/core/drawdoc2.cxx | 84 +-
sd/source/core/drawdoc3.cxx | 149 +--
sd/source/core/drawdoc4.cxx | 16
sd/source/core/pglink.cxx | 14
sd/source/core/sdiocmpt.cxx | 6
sd/source/core/sdpage.cxx | 48 -
sd/source/core/sdpage2.cxx | 18
sd/source/core/stlpool.cxx | 20
sd/source/core/stlsheet.cxx | 4
sd/source/core/undo/undoobjects.cxx | 2
sd/source/core/undoanim.cxx | 4
sd/source/filter/cgm/sdcgmfilter.cxx | 12
sd/source/filter/eppt/eppt.cxx | 118 +--
sd/source/filter/eppt/eppt.hxx | 52 -
sd/source/filter/eppt/epptbase.hxx | 60 -
sd/source/filter/eppt/epptooxml.hxx | 28
sd/source/filter/eppt/epptso.cxx | 196 ++---
sd/source/filter/eppt/grouptable.hxx | 4
sd/source/filter/eppt/pptexanimations.cxx | 126 +--
sd/source/filter/eppt/pptexanimations.hxx | 18
sd/source/filter/eppt/pptexsoundcollection.cxx | 2
sd/source/filter/eppt/pptexsoundcollection.hxx | 2
sd/source/filter/eppt/pptx-epptbase.cxx | 142 +--
sd/source/filter/eppt/pptx-epptooxml.cxx | 116 +--
sd/source/filter/eppt/pptx-grouptable.cxx | 12
sd/source/filter/eppt/pptx-stylesheet.cxx | 28
sd/source/filter/eppt/pptx-text.cxx | 112 +-
sd/source/filter/eppt/text.hxx | 40 -
sd/source/filter/grf/sdgrffilter.cxx | 16
sd/source/filter/html/htmlex.cxx | 24
sd/source/filter/html/pubdlg.cxx | 118 +--
sd/source/filter/html/sdhtmlfilter.cxx | 4
sd/source/filter/ppt/ppt97animations.cxx | 6
sd/source/filter/ppt/pptanimations.hxx | 84 +-
sd/source/filter/ppt/pptin.cxx | 108 +-
sd/source/filter/ppt/pptin.hxx | 8
sd/source/filter/ppt/pptinanimations.cxx | 8
sd/source/filter/ppt/propread.cxx | 30
sd/source/filter/ppt/propread.hxx | 10
sd/source/filter/sdfilter.cxx | 2
sd/source/filter/sdpptwrp.cxx | 10
sd/source/filter/xml/sdxmlwrp.cxx | 46 -
sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx | 12
sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx | 2
sd/source/ui/accessibility/AccessibleSlideSorterView.cxx | 14
sd/source/ui/animations/CustomAnimationDialog.cxx | 38
sd/source/ui/animations/CustomAnimationPane.cxx | 27
sd/source/ui/animations/SlideTransitionPane.cxx | 12
sd/source/ui/animations/motionpathtag.cxx | 22
sd/source/ui/animations/motionpathtag.hxx | 4
sd/source/ui/annotations/annotationmanager.cxx | 2
sd/source/ui/annotations/annotationtag.cxx | 8
sd/source/ui/annotations/annotationtag.hxx | 4
sd/source/ui/app/optsitem.cxx | 252 +++---
sd/source/ui/app/sdmod.cxx | 2
sd/source/ui/app/sdmod1.cxx | 20
sd/source/ui/app/sdmod2.cxx | 22
sd/source/ui/app/sdxfer.cxx | 42 -
sd/source/ui/app/tbxww.cxx | 6
sd/source/ui/dlg/LayerTabBar.cxx | 20
sd/source/ui/dlg/PhotoAlbumDialog.cxx | 2
sd/source/ui/dlg/animobjs.cxx | 32
sd/source/ui/dlg/brkdlg.cxx | 4
sd/source/ui/dlg/custsdlg.cxx | 54 -
sd/source/ui/dlg/dlgass.cxx | 92 +-
sd/source/ui/dlg/dlgassim.cxx | 4
sd/source/ui/dlg/dlgassim.hxx | 2
sd/source/ui/dlg/dlgctrls.cxx | 2
sd/source/ui/dlg/dlgolbul.cxx | 6
sd/source/ui/dlg/dlgpage.cxx | 2
sd/source/ui/dlg/dlgsnap.cxx | 8
sd/source/ui/dlg/docprev.cxx | 2
sd/source/ui/dlg/filedlg.cxx | 20
sd/source/ui/dlg/inspagob.cxx | 4
sd/source/ui/dlg/morphdlg.cxx | 6
sd/source/ui/dlg/navigatr.cxx | 30
sd/source/ui/dlg/paragr.cxx | 8
sd/source/ui/dlg/present.cxx | 6
sd/source/ui/dlg/sddlgfact.cxx | 26
sd/source/ui/dlg/sddlgfact.hxx | 28
sd/source/ui/dlg/sdpreslt.cxx | 14
sd/source/ui/dlg/sdtreelb.cxx | 66 -
sd/source/ui/dlg/tpaction.cxx | 30
sd/source/ui/dlg/tpoption.cxx | 32
sd/source/ui/dlg/vectdlg.cxx | 6
sd/source/ui/docshell/docshel2.cxx | 4
sd/source/ui/docshell/docshel3.cxx | 2
sd/source/ui/docshell/docshel4.cxx | 97 +-
sd/source/ui/docshell/docshell.cxx | 24
sd/source/ui/docshell/grdocsh.cxx | 4
sd/source/ui/docshell/sdclient.cxx | 4
sd/source/ui/framework/factories/ViewShellWrapper.cxx | 4
sd/source/ui/framework/module/ResourceManager.cxx | 2
sd/source/ui/framework/module/ResourceManager.hxx | 2
sd/source/ui/framework/tools/FrameworkHelper.cxx | 2
sd/source/ui/func/fubullet.cxx | 2
sd/source/ui/func/fucon3d.cxx | 16
sd/source/ui/func/fuconarc.cxx | 23
sd/source/ui/func/fuconbez.cxx | 27
sd/source/ui/func/fuconcs.cxx | 29
sd/source/ui/func/fuconrec.cxx | 19
sd/source/ui/func/fuconstr.cxx | 48 -
sd/source/ui/func/fuconuno.cxx | 19
sd/source/ui/func/fucopy.cxx | 12
sd/source/ui/func/fudraw.cxx | 86 +-
sd/source/ui/func/fudspord.cxx | 12
sd/source/ui/func/fuediglu.cxx | 36
sd/source/ui/func/fuexpand.cxx | 4
sd/source/ui/func/fuformatpaintbrush.cxx | 28
sd/source/ui/func/fuhhconv.cxx | 20
sd/source/ui/func/fuinsert.cxx | 8
sd/source/ui/func/fuinsfil.cxx | 32
sd/source/ui/func/fuline.cxx | 2
sd/source/ui/func/fulinend.cxx | 10
sd/source/ui/func/fumorph.cxx | 24
sd/source/ui/func/fuoaprms.cxx | 32
sd/source/ui/func/fuolbull.cxx | 8
sd/source/ui/func/fuoltext.cxx | 18
sd/source/ui/func/fuoutl.cxx | 6
sd/source/ui/func/fupage.cxx | 28
sd/source/ui/func/fuparagr.cxx | 2
sd/source/ui/func/fupoor.cxx | 100 +-
sd/source/ui/func/fuprlout.cxx | 20
sd/source/ui/func/fuprobjs.cxx | 8
sd/source/ui/func/fusearch.cxx | 12
sd/source/ui/func/fusel.cxx | 168 ++--
sd/source/ui/func/fusldlg.cxx | 2
sd/source/ui/func/fusnapln.cxx | 12
sd/source/ui/func/fusumry.cxx | 4
sd/source/ui/func/futempl.cxx | 12
sd/source/ui/func/futext.cxx | 110 +-
sd/source/ui/func/fuzoom.cxx | 26
sd/source/ui/func/smarttag.cxx | 22
sd/source/ui/func/unprlout.cxx | 8
sd/source/ui/inc/AccessibleSlideSorterObject.hxx | 2
sd/source/ui/inc/AccessibleSlideSorterView.hxx | 2
sd/source/ui/inc/BreakDlg.hxx | 2
sd/source/ui/inc/DrawDocShell.hxx | 38
sd/source/ui/inc/DrawViewShell.hxx | 52 -
sd/source/ui/inc/FrameView.hxx | 42 -
sd/source/ui/inc/GraphicDocShell.hxx | 4
sd/source/ui/inc/OutlineBulletDlg.hxx | 2
sd/source/ui/inc/OutlineView.hxx | 8
sd/source/ui/inc/OutlineViewShell.hxx | 14
sd/source/ui/inc/PresentationViewShell.hxx | 2
sd/source/ui/inc/RemoteServer.hxx | 2
sd/source/ui/inc/Ruler.hxx | 4
sd/source/ui/inc/SdUnoDrawView.hxx | 6
sd/source/ui/inc/TabControl.hxx | 2
sd/source/ui/inc/View.hxx | 28
sd/source/ui/inc/ViewShell.hxx | 42 -
sd/source/ui/inc/Window.hxx | 2
sd/source/ui/inc/animobjs.hxx | 4
sd/source/ui/inc/custsdlg.hxx | 10
sd/source/ui/inc/dlgass.hxx | 8
sd/source/ui/inc/dlgpage.hxx | 2
sd/source/ui/inc/dlgsnap.hxx | 2
sd/source/ui/inc/docprev.hxx | 2
sd/source/ui/inc/drawview.hxx | 6
sd/source/ui/inc/fucon3d.hxx | 8
sd/source/ui/inc/fuconarc.hxx | 8
sd/source/ui/inc/fuconbez.hxx | 8
sd/source/ui/inc/fuconcs.hxx | 8
sd/source/ui/inc/fuconrec.hxx | 8
sd/source/ui/inc/fuconstr.hxx | 10
sd/source/ui/inc/fuconuno.hxx | 8
sd/source/ui/inc/fudraw.hxx | 22
sd/source/ui/inc/fudspord.hxx | 6
sd/source/ui/inc/fuediglu.hxx | 12
sd/source/ui/inc/fuformatpaintbrush.hxx | 8
sd/source/ui/inc/fuhhconv.hxx | 4
sd/source/ui/inc/fuinsfil.hxx | 4
sd/source/ui/inc/fumorph.hxx | 4
sd/source/ui/inc/fuoltext.hxx | 8
sd/source/ui/inc/fuoutl.hxx | 2
sd/source/ui/inc/fupoor.hxx | 24
sd/source/ui/inc/fusearch.hxx | 2
sd/source/ui/inc/fusel.hxx | 24
sd/source/ui/inc/futext.hxx | 18
sd/source/ui/inc/fuzoom.hxx | 10
sd/source/ui/inc/inspagob.hxx | 4
sd/source/ui/inc/navigatr.hxx | 16
sd/source/ui/inc/optsitem.hxx | 386 +++++-----
sd/source/ui/inc/pubdlg.hxx | 10
sd/source/ui/inc/sdtreelb.hxx | 26
sd/source/ui/inc/sdxfer.hxx | 28
sd/source/ui/inc/smarttag.hxx | 14
sd/source/ui/inc/tbx_ww.hxx | 2
sd/source/ui/inc/tpaction.hxx | 4
sd/source/ui/inc/tpoption.hxx | 2
sd/source/ui/inc/undopage.hxx | 12
sd/source/ui/inc/unmodpg.hxx | 12
sd/source/ui/inc/unoaprms.hxx | 52 -
sd/source/ui/inc/unomodel.hxx | 8
sd/source/ui/inc/unosrch.hxx | 18
sd/source/ui/inc/unprlout.hxx | 4
sd/source/ui/inc/zoomlist.hxx | 4
sd/source/ui/presenter/CanvasUpdateRequester.cxx | 6
sd/source/ui/presenter/CanvasUpdateRequester.hxx | 4
sd/source/ui/remotecontrol/Server.cxx | 2
sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx | 2
sd/source/ui/sidebar/DocumentHelper.cxx | 20
sd/source/ui/sidebar/LayoutMenu.cxx | 4
sd/source/ui/slideshow/slideshow.cxx | 40 -
sd/source/ui/slideshow/slideshowimpl.cxx | 86 +-
sd/source/ui/slideshow/slideshowimpl.hxx | 8
sd/source/ui/slidesorter/controller/SlsClipboard.cxx | 24
sd/source/ui/slidesorter/controller/SlsListener.cxx | 2
sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx | 44 -
sd/source/ui/slidesorter/controller/SlsSlotManager.cxx | 14
sd/source/ui/slidesorter/controller/SlsTransferableData.cxx | 2
sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx | 8
sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx | 2
sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx | 8
sd/source/ui/table/TableDesignPane.cxx | 4
sd/source/ui/unoidl/DrawController.cxx | 4
sd/source/ui/unoidl/SdUnoDrawView.cxx | 12
sd/source/ui/unoidl/UnoDocumentSettings.cxx | 66 -
sd/source/ui/unoidl/randomnode.cxx | 4
sd/source/ui/unoidl/sddetect.cxx | 10
sd/source/ui/unoidl/unocpres.cxx | 8
sd/source/ui/unoidl/unocpres.hxx | 4
sd/source/ui/unoidl/unodoc.cxx | 4
sd/source/ui/unoidl/unohelp.hxx | 8
sd/source/ui/unoidl/unolayer.cxx | 22
sd/source/ui/unoidl/unolayer.hxx | 6
sd/source/ui/unoidl/unomodel.cxx | 52 -
sd/source/ui/unoidl/unoobj.cxx | 70 -
sd/source/ui/unoidl/unoobj.hxx | 10
sd/source/ui/unoidl/unopage.cxx | 76 -
sd/source/ui/unoidl/unopage.hxx | 2
sd/source/ui/unoidl/unosrch.cxx | 26
sd/source/ui/unoidl/unowcntr.cxx | 6
sd/source/ui/unoidl/unowcntr.hxx | 4
sd/source/ui/view/DocumentRenderer.cxx | 8
sd/source/ui/view/GraphicObjectBar.cxx | 4
sd/source/ui/view/Outliner.cxx | 20
sd/source/ui/view/ViewClipboard.cxx | 18
sd/source/ui/view/ViewShellBase.cxx | 4
sd/source/ui/view/ViewShellImplementation.cxx | 16
sd/source/ui/view/drawview.cxx | 28
sd/source/ui/view/drtxtob.cxx | 38
sd/source/ui/view/drtxtob1.cxx | 2
sd/source/ui/view/drviews1.cxx | 34
sd/source/ui/view/drviews2.cxx | 60 -
sd/source/ui/view/drviews3.cxx | 2
sd/source/ui/view/drviews4.cxx | 32
sd/source/ui/view/drviews5.cxx | 20
sd/source/ui/view/drviews6.cxx | 4
sd/source/ui/view/drviews7.cxx | 60 -
sd/source/ui/view/drviews8.cxx | 4
sd/source/ui/view/drviews9.cxx | 4
sd/source/ui/view/drviewsa.cxx | 28
sd/source/ui/view/drviewsb.cxx | 2
sd/source/ui/view/drviewsc.cxx | 2
sd/source/ui/view/drviewsd.cxx | 2
sd/source/ui/view/drviewse.cxx | 52 -
sd/source/ui/view/drviewsf.cxx | 38
sd/source/ui/view/drviewsg.cxx | 8
sd/source/ui/view/drviewsh.cxx | 4
sd/source/ui/view/drviewsj.cxx | 40 -
sd/source/ui/view/frmview.cxx | 52 -
sd/source/ui/view/outlnvs2.cxx | 4
sd/source/ui/view/outlnvsh.cxx | 94 +-
sd/source/ui/view/outlview.cxx | 54 -
sd/source/ui/view/presvish.cxx | 2
sd/source/ui/view/sdruler.cxx | 4
sd/source/ui/view/sdview.cxx | 50 -
sd/source/ui/view/sdview2.cxx | 74 -
sd/source/ui/view/sdview3.cxx | 32
sd/source/ui/view/sdview4.cxx | 8
sd/source/ui/view/sdwindow.cxx | 20
sd/source/ui/view/tabcontr.cxx | 22
sd/source/ui/view/unmodpg.cxx | 4
sd/source/ui/view/viewshe2.cxx | 29
sd/source/ui/view/viewshe3.cxx | 12
sd/source/ui/view/viewshel.cxx | 40 -
sd/source/ui/view/zoomlist.cxx | 4
xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx | 6
xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx | 2
xmlsecurity/source/component/certificatecontainer.cxx | 10
xmlsecurity/source/component/certificatecontainer.hxx | 6
xmlsecurity/source/component/documentdigitalsignatures.cxx | 12
xmlsecurity/source/component/documentdigitalsignatures.hxx | 4
xmlsecurity/source/dialogs/certificatechooser.cxx | 4
xmlsecurity/source/dialogs/certificateviewer.cxx | 2
xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx | 4
xmlsecurity/source/dialogs/macrosecurity.cxx | 2
xmlsecurity/source/framework/decryptorimpl.hxx | 3
xmlsecurity/source/framework/encryptorimpl.hxx | 3
xmlsecurity/source/framework/saxeventkeeperimpl.cxx | 2
xmlsecurity/source/framework/saxeventkeeperimpl.hxx | 3
xmlsecurity/source/framework/securityengine.cxx | 2
xmlsecurity/source/framework/signaturecreatorimpl.hxx | 3
xmlsecurity/source/framework/signatureverifierimpl.hxx | 3
xmlsecurity/source/helper/xmlsignaturehelper.cxx | 2
xmlsecurity/source/helper/xsecctl.hxx | 2
xmlsecurity/source/helper/xsecsign.cxx | 4
xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.cxx | 4
xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.hxx | 4
xmlsecurity/source/xmlsec/diagnose.cxx | 5
xmlsecurity/source/xmlsec/nss/nssinitializer.hxx | 3
xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx | 2
xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx | 4
xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx | 3
xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx | 8
xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx | 8
xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx | 4
xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx | 3
xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx | 3
355 files changed, 3940 insertions(+), 3973 deletions(-)
New commits:
commit b45a12c37d2b671e54404afda5dee1b0947bd3ed
Author: Noel Grandin <noel at peralex.com>
Date: Thu Apr 24 10:52:02 2014 +0200
sd: sal_Bool->bool
Change-Id: I3172a42f6b6abe434ffe0475d1201ff50b6c06ea
diff --git a/sd/inc/CustomAnimationEffect.hxx b/sd/inc/CustomAnimationEffect.hxx
index 324d3a0..2158177 100644
--- a/sd/inc/CustomAnimationEffect.hxx
+++ b/sd/inc/CustomAnimationEffect.hxx
@@ -109,8 +109,8 @@ public:
::com::sun::star::uno::Any getTarget() const { return maTarget; }
SD_DLLPUBLIC void setTarget( const ::com::sun::star::uno::Any& rTarget );
- sal_Bool hasAfterEffect() const { return mbHasAfterEffect; }
- void setHasAfterEffect( sal_Bool bHasAfterEffect ) { mbHasAfterEffect = bHasAfterEffect; }
+ bool hasAfterEffect() const { return mbHasAfterEffect; }
+ void setHasAfterEffect( bool bHasAfterEffect ) { mbHasAfterEffect = bHasAfterEffect; }
::com::sun::star::uno::Any getDimColor() const { return maDimColor; }
void setDimColor( ::com::sun::star::uno::Any aDimColor ) { maDimColor = aDimColor; }
@@ -120,7 +120,7 @@ public:
sal_Int32 getParaDepth() const { return mnParaDepth; }
- sal_Bool hasText() const { return mbHasText; }
+ bool hasText() const { return mbHasText; }
sal_Int16 getCommand() const { return mnCommand; }
@@ -130,8 +130,8 @@ public:
double getDecelerate() const { return mfDecelerate; }
void setDecelerate( double fDecelerate );
- sal_Bool getAutoReverse() const { return mbAutoReverse; }
- void setAutoReverse( sal_Bool bAutoReverse );
+ bool getAutoReverse() const { return mbAutoReverse; }
+ void setAutoReverse( bool bAutoReverse );
::com::sun::star::uno::Any getProperty( sal_Int32 nNodeType, const OUString& rAttributeName, EValue eValue );
bool setProperty( sal_Int32 nNodeType, const OUString& rAttributeName, EValue eValue, const ::com::sun::star::uno::Any& rValue );
@@ -194,10 +194,10 @@ private:
sal_Int16 mnIterateType;
double mfIterateInterval;
sal_Int32 mnParaDepth;
- sal_Bool mbHasText;
+ bool mbHasText;
double mfAcceleration;
double mfDecelerate;
- sal_Bool mbAutoReverse;
+ bool mbAutoReverse;
sal_Int16 mnTargetSubItem;
sal_Int16 mnCommand;
@@ -209,7 +209,7 @@ private:
::com::sun::star::uno::Reference< ::com::sun::star::animations::XAudio > mxAudio;
::com::sun::star::uno::Any maTarget;
- sal_Bool mbHasAfterEffect;
+ bool mbHasAfterEffect;
::com::sun::star::uno::Any maDimColor;
bool mbAfterEffectOnNextEffect;
};
@@ -251,8 +251,8 @@ public:
/* -1: as single object, 0: all at once, n > 0: by n Th paragraph */
sal_Int32 getTextGrouping() const { return mnTextGrouping; }
- sal_Bool getAnimateForm() const { return mbAnimateForm; }
- sal_Bool getTextReverse() const { return mbTextReverse; }
+ bool getAnimateForm() const { return mbAnimateForm; }
+ bool getTextReverse() const { return mbTextReverse; }
double getTextGroupingAuto() const { return mfGroupingAuto; }
private:
@@ -262,8 +262,8 @@ private:
enum { PARA_LEVELS = 5 };
sal_Int32 mnTextGrouping;
- sal_Bool mbAnimateForm;
- sal_Bool mbTextReverse;
+ bool mbAnimateForm;
+ bool mbTextReverse;
double mfGroupingAuto;
sal_Int32 mnLastPara;
sal_Int8 mnDepthFlags[PARA_LEVELS];
@@ -326,11 +326,11 @@ public:
// text group methods
CustomAnimationTextGroupPtr findGroup( sal_Int32 nGroupId );
- SD_DLLPUBLIC CustomAnimationTextGroupPtr createTextGroup( CustomAnimationEffectPtr pEffect, sal_Int32 nTextGrouping, double fTextGroupingAuto, sal_Bool bAnimateForm, sal_Bool bTextReverse );
+ SD_DLLPUBLIC CustomAnimationTextGroupPtr createTextGroup( CustomAnimationEffectPtr pEffect, sal_Int32 nTextGrouping, double fTextGroupingAuto, bool bAnimateForm, bool bTextReverse );
void setTextGrouping( CustomAnimationTextGroupPtr pTextGroup, sal_Int32 nTextGrouping );
- void setAnimateForm( CustomAnimationTextGroupPtr pTextGroup, sal_Bool bAnimateForm );
+ void setAnimateForm( CustomAnimationTextGroupPtr pTextGroup, bool bAnimateForm );
void setTextGroupingAuto( CustomAnimationTextGroupPtr pTextGroup, double fTextGroupingAuto );
- void setTextReverse( CustomAnimationTextGroupPtr pTextGroup, sal_Bool bAnimateForm );
+ void setTextReverse( CustomAnimationTextGroupPtr pTextGroup, bool bAnimateForm );
sal_Int32 getSequenceType() const { return mnSequenceType; }
diff --git a/sd/inc/EffectMigration.hxx b/sd/inc/EffectMigration.hxx
index 62c6a35..f122901 100644
--- a/sd/inc/EffectMigration.hxx
+++ b/sd/inc/EffectMigration.hxx
@@ -61,15 +61,15 @@ public:
static ::com::sun::star::presentation::AnimationSpeed GetAnimationSpeed( SvxShape* pShape );
static void SetDimColor( SvxShape* pShape, sal_Int32 nColor );
static sal_Int32 GetDimColor( SvxShape* pShape );
- static void SetDimHide( SvxShape* pShape, sal_Bool bDimHide );
- static sal_Bool GetDimHide( SvxShape* pShape );
- static void SetDimPrevious( SvxShape* pShape, sal_Bool bDimPrevious );
- static sal_Bool GetDimPrevious( SvxShape* pShape );
+ static void SetDimHide( SvxShape* pShape, bool bDimHide );
+ static bool GetDimHide( SvxShape* pShape );
+ static void SetDimPrevious( SvxShape* pShape, bool bDimPrevious );
+ static bool GetDimPrevious( SvxShape* pShape );
static void SetPresentationOrder( SvxShape* pShape, sal_Int32 nNewPos );
static sal_Int32 GetPresentationOrder( SvxShape* pShape );
static void UpdateSoundEffect( SvxShape* pShape, SdAnimationInfo* pInfo );
static OUString GetSoundFile( SvxShape* pShape );
- static sal_Bool GetSoundOn( SvxShape* pShape );
+ static bool GetSoundOn( SvxShape* pShape );
static void SetAnimationPath( SvxShape* pShape, SdrPathObj* pPathObj );
static void CreateAnimatedGroup(SdrObjGroup& rGroupObj, SdPage& rPage);
diff --git a/sd/inc/Outliner.hxx b/sd/inc/Outliner.hxx
index 8ced18d..df2d38a 100644
--- a/sd/inc/Outliner.hxx
+++ b/sd/inc/Outliner.hxx
@@ -155,7 +155,7 @@ public:
/** Starts the text conversion (hangul/hanja or Chinese simplified/traditional)
for the current viewshell */
void StartConversion( sal_Int16 nSourceLanguage, sal_Int16 nTargetLanguage,
- const Font *pTargetFont, sal_Int32 nOptions, sal_Bool bIsInteractive );
+ const Font *pTargetFont, sal_Int32 nOptions, bool bIsInteractive );
/** This is called internally when text conversion is started.
The position of current view mode/page/object/caret position
@@ -462,7 +462,7 @@ private:
/** Switch on edit mode for the currently selected text object.
*/
- void EnterEditMode (sal_Bool bGrabFocus=sal_True);
+ void EnterEditMode (bool bGrabFocus=true);
/** Return the position at which a new search is started with respect to
the search direction as specified by the argument.
diff --git a/sd/inc/TransitionPreset.hxx b/sd/inc/TransitionPreset.hxx
index 35476da..a15b1d5 100644
--- a/sd/inc/TransitionPreset.hxx
+++ b/sd/inc/TransitionPreset.hxx
@@ -50,7 +50,7 @@ public:
sal_Int16 getTransition() const { return mnTransition; }
sal_Int16 getSubtype() const { return mnSubtype; }
- sal_Bool getDirection() const { return mbDirection; }
+ bool getDirection() const { return mbDirection; }
sal_Int32 getFadeColor() const { return mnFadeColor; }
const OUString& getUIName() const { return maUIName; }
@@ -61,7 +61,7 @@ private:
sal_Int16 mnTransition;
sal_Int16 mnSubtype;
- sal_Bool mbDirection;
+ bool mbDirection;
sal_Int32 mnFadeColor;
OUString maPresetId;
OUString maUIName;
diff --git a/sd/inc/anminfo.hxx b/sd/inc/anminfo.hxx
index 794b2d1..da0e937 100644
--- a/sd/inc/anminfo.hxx
+++ b/sd/inc/anminfo.hxx
@@ -40,22 +40,22 @@ public:
::com::sun::star::presentation::AnimationEffect meEffect; ///< Animation effect
::com::sun::star::presentation::AnimationEffect meTextEffect; ///< Animation effect for text content
::com::sun::star::presentation::AnimationSpeed meSpeed; ///< Speed of the animation
- sal_Bool mbActive; ///< turned on?
- sal_Bool mbDimPrevious; ///< Object fade out
- sal_Bool mbIsMovie; ///< if group object than it is a sequence of them.
- sal_Bool mbDimHide; ///< hide rather than dim
+ bool mbActive; ///< turned on?
+ bool mbDimPrevious; ///< Object fade out
+ bool mbIsMovie; ///< if group object than it is a sequence of them.
+ bool mbDimHide; ///< hide rather than dim
Color maBlueScreen; ///< identifies "background pixels"
Color maDimColor; ///< for fading the object
OUString maSoundFile; ///< Path to the sound file in MS DOS notation
- sal_Bool mbSoundOn; ///< Sound on / off
- sal_Bool mbPlayFull; ///< play sound completely.
+ bool mbSoundOn; ///< Sound on / off
+ bool mbPlayFull; ///< play sound completely.
SdrPathObj* mpPathObj; ///< The path object
::com::sun::star::presentation::ClickAction meClickAction; ///< Action at mouse click
::com::sun::star::presentation::AnimationEffect meSecondEffect; ///< for object fading.
::com::sun::star::presentation::AnimationSpeed meSecondSpeed; ///< for object fading.
OUString maSecondSoundFile; ///< for object fading.
- sal_Bool mbSecondSoundOn; ///< for object fading.
- sal_Bool mbSecondPlayFull; ///< for object fading.
+ bool mbSecondSoundOn; ///< for object fading.
+ bool mbSecondPlayFull; ///< for object fading.
sal_uInt16 mnVerb; ///< for OLE object
sal_uLong mnPresOrder;
SdrObject& mrObject;
diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx
index 180caf5..bf59fc0 100644
--- a/sd/inc/drawdoc.hxx
+++ b/sd/inc/drawdoc.hxx
@@ -113,19 +113,19 @@ namespace sd
struct PresentationSettings
{
OUString maPresPage;
- sal_Bool mbAll;
- sal_Bool mbEndless;
- sal_Bool mbCustomShow;
- sal_Bool mbManual;
- sal_Bool mbMouseVisible;
- sal_Bool mbMouseAsPen;
- sal_Bool mbLockedPages;
- sal_Bool mbAlwaysOnTop;
- sal_Bool mbFullScreen;
- sal_Bool mbAnimationAllowed;
+ bool mbAll;
+ bool mbEndless;
+ bool mbCustomShow;
+ bool mbManual;
+ bool mbMouseVisible;
+ bool mbMouseAsPen;
+ bool mbLockedPages;
+ bool mbAlwaysOnTop;
+ bool mbFullScreen;
+ bool mbAnimationAllowed;
sal_Int32 mnPauseTimeout;
- sal_Bool mbShowPauseLogo;
- sal_Bool mbStartWithNavigator;
+ bool mbShowPauseLogo;
+ bool mbStartWithNavigator;
PresentationSettings();
PresentationSettings( const PresentationSettings& r );
@@ -141,10 +141,10 @@ public:
virtual void setDocAccTitle( const OUString& rTitle ) { msDocAccTitle = rTitle; }
virtual const OUString getDocAccTitle() const { return msDocAccTitle; }
private:
- sal_Bool bReadOnly;
+ bool bReadOnly;
public:
- virtual void setDocReadOnly( sal_Bool b){ bReadOnly = b; }
- virtual sal_Bool getDocReadOnly() const { return bReadOnly; }
+ virtual void setDocReadOnly( bool b){ bReadOnly = b; }
+ virtual bool getDocReadOnly() const { return bReadOnly; }
private:
::sd::Outliner* mpOutliner; ///< local outliner for outline mode
::sd::Outliner* mpInternalOutliner; ///< internal outliner for creation of text objects
@@ -167,8 +167,8 @@ private:
bool mbNewOrLoadCompleted;
- sal_Bool mbOnlineSpell;
- sal_Bool mbSummationOfParagraphs;
+ bool mbOnlineSpell;
+ bool mbSummationOfParagraphs;
bool mbStartWithPresentation; ///< is set to true when starting with command line parameter -start
bool mbExitAfterPresenting; ///< true if mbStartWithPresentation AND Presentation was shown fully
LanguageType meLanguage;
@@ -220,8 +220,8 @@ public:
SfxItemPool& GetPool() { return( *pItemPool ); }
- ::sd::Outliner* GetOutliner(sal_Bool bCreateOutliner=sal_True);
- SD_DLLPUBLIC ::sd::Outliner* GetInternalOutliner(sal_Bool bCreateOutliner=sal_True);
+ ::sd::Outliner* GetOutliner(bool bCreateOutliner=true);
+ SD_DLLPUBLIC ::sd::Outliner* GetInternalOutliner(bool bCreateOutliner=true);
::sd::DrawDocShell* GetDocSh() const { return mpDocSh; }
@@ -244,7 +244,7 @@ public:
for newly created slides.
*/
SD_DLLPUBLIC void CreateFirstPages( SdDrawDocument* pRefDocument = 0 );
- SD_DLLPUBLIC sal_Bool CreateMissingNotesAndHandoutPages();
+ SD_DLLPUBLIC bool CreateMissingNotesAndHandoutPages();
void MovePage(sal_uInt16 nPgNum, sal_uInt16 nNewPos) SAL_OVERRIDE;
void InsertPage(SdrPage* pPage, sal_uInt16 nPos=0xFFFF) SAL_OVERRIDE;
@@ -254,17 +254,17 @@ public:
virtual void InsertMasterPage(SdrPage* pPage, sal_uInt16 nPos=0xFFFF) SAL_OVERRIDE;
virtual SdrPage* RemoveMasterPage(sal_uInt16 nPgNum) SAL_OVERRIDE;
- void RemoveUnnecessaryMasterPages( SdPage* pMaster=NULL, sal_Bool bOnlyDuplicatePages=sal_False, sal_Bool bUndo=sal_True );
+ void RemoveUnnecessaryMasterPages( SdPage* pMaster=NULL, bool bOnlyDuplicatePages=false, bool bUndo=true );
SD_DLLPUBLIC void SetMasterPage(sal_uInt16 nSdPageNum, const OUString& rLayoutName,
- SdDrawDocument* pSourceDoc, sal_Bool bMaster, sal_Bool bCheckMasters);
+ SdDrawDocument* pSourceDoc, bool bMaster, bool bCheckMasters);
SD_DLLPUBLIC SdDrawDocument* OpenBookmarkDoc(const OUString& rBookmarkFile);
SdDrawDocument* OpenBookmarkDoc(SfxMedium& rMedium);
- sal_Bool InsertBookmark(const std::vector<OUString> &rBookmarkList,
- std::vector<OUString> &rExchangeList, sal_Bool bLink,
- sal_Bool bReplace, sal_uInt16 nPgPos, sal_Bool bNoDialogs,
- ::sd::DrawDocShell* pBookmarkDocSh, sal_Bool bCopy,
+ bool InsertBookmark(const std::vector<OUString> &rBookmarkList,
+ std::vector<OUString> &rExchangeList, bool bLink,
+ bool bReplace, sal_uInt16 nPgPos, bool bNoDialogs,
+ ::sd::DrawDocShell* pBookmarkDocSh, bool bCopy,
Point* pObjPos);
bool IsStartWithPresentation() const;
@@ -292,7 +292,7 @@ public:
@attention Beware! This method in its current state does not
handle all combinations of their input parameters
- correctly. For example, for pBookmarkList=NULL, bReplace=sal_True
+ correctly. For example, for pBookmarkList=NULL, bReplace=true
is ignored (no replace happens).
@param pBookmarkList
@@ -330,16 +330,16 @@ public:
page, or preserve the old name
*/
- sal_Bool InsertBookmarkAsPage(const std::vector<OUString> &rBookmarkList,
+ bool InsertBookmarkAsPage(const std::vector<OUString> &rBookmarkList,
std::vector<OUString> *pExchangeList,
- sal_Bool bLink, sal_Bool bReplace, sal_uInt16 nPgPos,
- sal_Bool bNoDialogs, ::sd::DrawDocShell* pBookmarkDocSh,
- sal_Bool bCopy, sal_Bool bMergeMasterPages,
- sal_Bool bPreservePageNames);
+ bool bLink, bool bReplace, sal_uInt16 nPgPos,
+ bool bNoDialogs, ::sd::DrawDocShell* pBookmarkDocSh,
+ bool bCopy, bool bMergeMasterPages,
+ bool bPreservePageNames);
- sal_Bool InsertBookmarkAsObject(const std::vector<OUString> &rBookmarkList,
+ bool InsertBookmarkAsObject(const std::vector<OUString> &rBookmarkList,
const std::vector<OUString> &rExchangeList,
- sal_Bool bLink, ::sd::DrawDocShell* pBookmarkDocSh,
+ bool bLink, ::sd::DrawDocShell* pBookmarkDocSh,
Point* pObjPos, bool bCalcObjCount = false);
SD_DLLPUBLIC void CloseBookmarkDoc();
@@ -359,12 +359,12 @@ public:
Returns the index of the page with the given name or
SDRPAGE_NOTFOUND (=0xffff) when such a page does not exist.
*/
- sal_uInt16 GetPageByName(const OUString& rPgName, sal_Bool& rbIsMasterPage ) const;
+ sal_uInt16 GetPageByName(const OUString& rPgName, bool& rbIsMasterPage ) const;
SD_DLLPUBLIC SdPage*GetSdPage(sal_uInt16 nPgNum, PageKind ePgKind) const;
SD_DLLPUBLIC sal_uInt16 GetSdPageCount(PageKind ePgKind) const;
- void SetSelected(SdPage* pPage, sal_Bool bSelect);
- sal_Bool MovePages(sal_uInt16 nTargetPage);
+ void SetSelected(SdPage* pPage, bool bSelect);
+ bool MovePages(sal_uInt16 nTargetPage);
SD_DLLPUBLIC SdPage*GetMasterSdPage(sal_uInt16 nPgNum, PageKind ePgKind);
SD_DLLPUBLIC sal_uInt16 GetMasterSdPageCount(PageKind ePgKind) const;
@@ -378,8 +378,8 @@ public:
const ::com::sun::star::uno::Reference< ::com::sun::star::presentation::XPresentation2 >& getPresentation() const;
- void SetSummationOfParagraphs( sal_Bool bOn = sal_True ) { mbSummationOfParagraphs = bOn; }
- sal_Bool IsSummationOfParagraphs() const { return mbSummationOfParagraphs; }
+ void SetSummationOfParagraphs( bool bOn = true ) { mbSummationOfParagraphs = bOn; }
+ bool IsSummationOfParagraphs() const { return mbSummationOfParagraphs; }
/** Set the mode that controls whether (and later how) the formatting of the document
depends on the current printer metrics.
@@ -403,10 +403,10 @@ public:
*/
sal_Int32 GetPrinterIndependentLayout (void);
- void SetOnlineSpell( sal_Bool bIn );
- sal_Bool GetOnlineSpell() const { return mbOnlineSpell; }
+ void SetOnlineSpell( bool bIn );
+ bool GetOnlineSpell() const { return mbOnlineSpell; }
void StopOnlineSpelling();
- void StartOnlineSpelling(sal_Bool bForceSpelling=sal_True);
+ void StartOnlineSpelling(bool bForceSpelling=true);
void ImpOnlineSpellCallback(SpellCallbackInfo* pInfo, SdrObject* pObj, SdrOutliner* pOutl);
@@ -416,9 +416,9 @@ public:
sal_uLong GetLinkCount();
std::vector<sd::FrameView*>& GetFrameViewList() { return maFrameViewList; }
- SD_DLLPUBLIC SdCustomShowList* GetCustomShowList(sal_Bool bCreate = sal_False);
+ SD_DLLPUBLIC SdCustomShowList* GetCustomShowList(bool bCreate = false);
- void NbcSetChanged(sal_Bool bFlag = sal_True);
+ void NbcSetChanged(bool bFlag = true);
void SetTextDefaults() const;
@@ -514,8 +514,8 @@ public:
const OUString& sNotesPageName,
AutoLayout eStandardLayout,
AutoLayout eNotesLayout,
- sal_Bool bIsPageBack,
- sal_Bool bIsPageObj,
+ bool bIsPageBack,
+ bool bIsPageObj,
const sal_Int32 nInsertPosition = -1);
/** This method acts as a simplified front end for the more complex
@@ -562,8 +562,8 @@ public:
PageKind ePageKind,
const OUString& sStandardPageName,
const OUString& sNotesPageName,
- sal_Bool bIsPageBack,
- sal_Bool bIsPageObj,
+ bool bIsPageBack,
+ bool bIsPageObj,
const sal_Int32 nInsertPosition = -1);
/** return the document fonts for latin, cjk and ctl according to the current
@@ -628,8 +628,8 @@ private:
PageKind ePageKind,
const OUString& sStandardPageName,
const OUString& sNotesPageName,
- sal_Bool bIsPageBack,
- sal_Bool bIsPageObj,
+ bool bIsPageBack,
+ bool bIsPageObj,
SdPage* pStandardPage,
SdPage* pNotesPage,
sal_Int32 nInsertPosition = -1);
@@ -654,8 +654,8 @@ private:
SdPage* pPage,
const OUString& sPageName,
sal_uInt16 nInsertionPoint,
- sal_Bool bIsPageBack,
- sal_Bool bIsPageObj);
+ bool bIsPageBack,
+ bool bIsPageObj);
virtual void PageListChanged() SAL_OVERRIDE;
virtual void MasterPageListChanged() SAL_OVERRIDE;
@@ -678,7 +678,7 @@ private:
DrawDocShell* mpDocShell;
SdDrawDocument* mpDoc;
- sal_Bool mbIsEnableSetModified;
+ bool mbIsEnableSetModified;
bool mbIsDocumentChanged;
};
diff --git a/sd/inc/sdabstdlg.hxx b/sd/inc/sdabstdlg.hxx
index 6953f45..a3858ea 100644
--- a/sd/inc/sdabstdlg.hxx
+++ b/sd/inc/sdabstdlg.hxx
@@ -68,8 +68,8 @@ public:
class AbstractSdCustomShowDlg : public VclAbstractDialog
{
public:
- virtual sal_Bool IsModified() const = 0;
- virtual sal_Bool IsCustomShow() const = 0;
+ virtual bool IsModified() const = 0;
+ virtual bool IsCustomShow() const = 0;
};
class AbstractAssistentDlg : public VclAbstractDialog
@@ -77,11 +77,11 @@ class AbstractAssistentDlg : public VclAbstractDialog
public:
virtual SfxObjectShellLock GetDocument() = 0;
virtual OutputType GetOutputMedium() const = 0;
- virtual sal_Bool IsSummary() const = 0;
+ virtual bool IsSummary() const = 0;
virtual StartType GetStartType() const = 0;
virtual OUString GetDocPath() const = 0;
- virtual sal_Bool GetStartWithFlag() const = 0;
- virtual sal_Bool IsDocEmpty() const = 0;
+ virtual bool GetStartWithFlag() const = 0;
+ virtual bool IsDocEmpty() const = 0;
virtual com::sun::star::uno::Sequence< com::sun::star::beans::NamedValue > GetPassword() = 0;
};
@@ -98,7 +98,7 @@ public:
virtual void GetAttr(SfxItemSet& rOutAttrs) = 0;
virtual void HideRadioGroup() = 0;
virtual void HideDeleteBtn() = 0;
- virtual void SetInputFields(sal_Bool bEnableX, sal_Bool bEnableY) = 0;
+ virtual void SetInputFields(bool bEnableX, bool bEnableY) = 0;
//from class ::Window
virtual void SetText( const OUString& rStr ) = 0;
};
@@ -114,7 +114,7 @@ public:
class AbstractSdInsertPasteDlg : public VclAbstractDialog
{
public:
- virtual sal_Bool IsInsertBefore() const = 0;
+ virtual bool IsInsertBefore() const = 0;
};
class AbstractSdInsertPagesObjsDlg : public VclAbstractDialog
@@ -122,8 +122,8 @@ class AbstractSdInsertPagesObjsDlg : public VclAbstractDialog
public:
virtual ::Window* GetWindow() = 0; //this method is added for return a ::Window type pointer
virtual std::vector<OUString> GetList ( const sal_uInt16 nType ) = 0;
- virtual sal_Bool IsLink() = 0;
- virtual sal_Bool IsRemoveUnnessesaryMasterPages() const = 0;
+ virtual bool IsLink() = 0;
+ virtual bool IsRemoveUnnessesaryMasterPages() const = 0;
};
class AbstractMorphDlg : public VclAbstractDialog
@@ -131,8 +131,8 @@ class AbstractMorphDlg : public VclAbstractDialog
public:
virtual void SaveSettings() const = 0;
virtual sal_uInt16 GetFadeSteps() const = 0;
- virtual sal_Bool IsAttributeFade() const = 0;
- virtual sal_Bool IsOrientationFade() const = 0;
+ virtual bool IsAttributeFade() const = 0;
+ virtual bool IsOrientationFade() const = 0;
};
class AbstractSdStartPresDlg : public VclAbstractDialog
@@ -177,8 +177,8 @@ public:
virtual AbstractCopyDlg* CreateCopyDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, const rtl::Reference<XColorList> &pColTab, ::sd::View* pView ) = 0;
virtual AbstractSdCustomShowDlg* CreateSdCustomShowDlg( ::Window* pWindow, SdDrawDocument& rDrawDoc ) = 0;
virtual SfxAbstractTabDialog* CreateSdTabCharDialog( ::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell ) = 0;
- virtual SfxAbstractTabDialog* CreateSdTabPageDialog( ::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell, sal_Bool bAreaPage = sal_True ) = 0;
- virtual AbstractAssistentDlg* CreateAssistentDlg( ::Window* pParent, sal_Bool bAutoPilot) = 0;
+ virtual SfxAbstractTabDialog* CreateSdTabPageDialog( ::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell, bool bAreaPage = true ) = 0;
+ virtual AbstractAssistentDlg* CreateAssistentDlg( ::Window* pParent, bool bAutoPilot) = 0;
virtual AbstractSdModifyFieldDlg* CreateSdModifyFieldDlg( ::Window* pWindow, const SvxFieldData* pInField, const SfxItemSet& rSet ) = 0;
virtual AbstractSdSnapLineDlg* CreateSdSnapLineDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, ::sd::View* pView) = 0;
virtual AbstractSdInsertLayerDlg* CreateSdInsertLayerDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, bool bDeletable, const OUString& aStr ) = 0;
diff --git a/sd/inc/sdattr.hxx b/sd/inc/sdattr.hxx
index f405dc6..eae0bd5 100644
--- a/sd/inc/sdattr.hxx
+++ b/sd/inc/sdattr.hxx
@@ -59,7 +59,7 @@ public:
class SdAttrLayerVisible : public SfxBoolItem
{
public:
- SdAttrLayerVisible( sal_Bool bValue = sal_True ) :
+ SdAttrLayerVisible( bool bValue = true ) :
SfxBoolItem( ATTR_LAYER_VISIBLE, bValue ) {}
};
@@ -67,7 +67,7 @@ public:
class SdAttrLayerPrintable : public SfxBoolItem
{
public:
- SdAttrLayerPrintable( sal_Bool bValue = sal_True ) :
+ SdAttrLayerPrintable( bool bValue = true ) :
SfxBoolItem( ATTR_LAYER_PRINTABLE, bValue ) {}
};
@@ -75,7 +75,7 @@ public:
class SdAttrLayerLocked : public SfxBoolItem
{
public:
- SdAttrLayerLocked( sal_Bool bValue = sal_False ) :
+ SdAttrLayerLocked( bool bValue = false ) :
SfxBoolItem( ATTR_LAYER_LOCKED, bValue ) {}
};
@@ -83,7 +83,7 @@ public:
class SdAttrLayerThisPage : public SfxBoolItem
{
public:
- SdAttrLayerThisPage( sal_Bool bValue = sal_False ) :
+ SdAttrLayerThisPage( bool bValue = false ) :
SfxBoolItem( ATTR_LAYER_THISPAGE, bValue ) {}
};
diff --git a/sd/inc/sdcgmfilter.hxx b/sd/inc/sdcgmfilter.hxx
index ab79181..144f0a0 100644
--- a/sd/inc/sdcgmfilter.hxx
+++ b/sd/inc/sdcgmfilter.hxx
@@ -29,11 +29,11 @@ public:
SdCGMFilter (
SfxMedium& rMedium,
::sd::DrawDocShell& rDocShell,
- sal_Bool bShowProgress );
+ bool bShowProgress );
virtual ~SdCGMFilter (void);
- sal_Bool Import();
- sal_Bool Export() SAL_OVERRIDE;
+ bool Import();
+ bool Export() SAL_OVERRIDE;
};
#endif // INCLUDED_SD_INC_SDCGMFILTER_HXX
diff --git a/sd/inc/sdfilter.hxx b/sd/inc/sdfilter.hxx
index cd384ee..0bd9a9d 100644
--- a/sd/inc/sdfilter.hxx
+++ b/sd/inc/sdfilter.hxx
@@ -37,13 +37,13 @@ namespace osl { class Module; }
class SdFilter
{
public:
- SdFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, sal_Bool bShowProgress );
+ SdFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, bool bShowProgress );
virtual ~SdFilter();
- sal_Bool IsProgress() const { return mbShowProgress; }
- sal_Bool IsDraw() const { return mbIsDraw; }
- sal_Bool IsImpress() const { return !mbIsDraw; }
- virtual sal_Bool Export() = 0;
+ bool IsProgress() const { return mbShowProgress; }
+ bool IsDraw() const { return mbIsDraw; }
+ bool IsImpress() const { return !mbIsDraw; }
+ virtual bool Export() = 0;
protected:
::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > mxModel;
@@ -52,8 +52,8 @@ protected:
SfxMedium& mrMedium;
::sd::DrawDocShell& mrDocShell;
SdDrawDocument& mrDocument;
- sal_Bool mbIsDraw : 1;
- sal_Bool mbShowProgress : 1;
+ bool mbIsDraw : 1;
+ bool mbShowProgress : 1;
#ifndef DISABLE_DYNLOADING
::osl::Module* OpenLibrary( const OUString& rLibraryName ) const;
#endif
diff --git a/sd/inc/sdgrffilter.hxx b/sd/inc/sdgrffilter.hxx
index 83c18b1..d4d87c4 100644
--- a/sd/inc/sdgrffilter.hxx
+++ b/sd/inc/sdgrffilter.hxx
@@ -33,8 +33,8 @@ public:
virtual ~SdGRFFilter (void);
- sal_Bool Import();
- sal_Bool Export() SAL_OVERRIDE;
+ bool Import();
+ bool Export() SAL_OVERRIDE;
static void HandleGraphicFilterError( sal_uInt16 nFilterError, sal_uLong nStreamError = ERRCODE_NONE );
};
diff --git a/sd/inc/sdhtmlfilter.hxx b/sd/inc/sdhtmlfilter.hxx
index 449067e..2eb6eb0 100644
--- a/sd/inc/sdhtmlfilter.hxx
+++ b/sd/inc/sdhtmlfilter.hxx
@@ -31,10 +31,10 @@ public:
SdHTMLFilter (
SfxMedium& rMedium,
::sd::DrawDocShell& rDocShell,
- sal_Bool bShowProgress);
+ bool bShowProgress);
virtual ~SdHTMLFilter (void);
- virtual sal_Bool Export() SAL_OVERRIDE;
+ virtual bool Export() SAL_OVERRIDE;
private:
DECL_LINK( IOProgressHdl, sal_uInt16* );
diff --git a/sd/inc/sdiocmpt.hxx b/sd/inc/sdiocmpt.hxx
index d9c786d..7775d17 100644
--- a/sd/inc/sdiocmpt.hxx
+++ b/sd/inc/sdiocmpt.hxx
@@ -31,7 +31,7 @@ protected:
sal_uInt32 nSubRecSiz;
sal_uInt32 nSubRecPos;
sal_uInt16 nMode;
- sal_Bool bOpen;
+ bool bOpen;
protected:
void Read();
diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx
index 5a5450d..0b695f0 100644
--- a/sd/inc/sdmod.hxx
+++ b/sd/inc/sdmod.hxx
@@ -95,8 +95,8 @@ public:
SdOptions* GetSdOptions(DocumentType eDocType);
SD_DLLPUBLIC SvStorageStreamRef GetOptionStream( const OUString& rOptionName, SdOptionStreamMode eMode );
- sal_Bool GetWaterCan() const { return bWaterCan; }
- void SetWaterCan( sal_Bool bWC ) { bWaterCan = bWC; }
+ bool GetWaterCan() const { return bWaterCan; }
+ void SetWaterCan( bool bWC ) { bWaterCan = bWC; }
SvxSearchItem* GetSearchItem() { return (pSearchItem); }
void SetSearchItem(SvxSearchItem* pItem) { pSearchItem = pItem; }
@@ -129,7 +129,7 @@ protected:
SvxSearchItem* pSearchItem;
SvNumberFormatter* pNumberFormatter;
SvStorageRef xOptionStorage;
- sal_Bool bWaterCan;
+ bool bWaterCan;
SfxErrorHandler* mpErrorHdl;
/** This device is used for printer independent layout. It is virtual
in the sense that it does not represent a printer. The pointer may
diff --git a/sd/inc/sdpage.hxx b/sd/inc/sdpage.hxx
index 80d4073..4cce906 100644
--- a/sd/inc/sdpage.hxx
+++ b/sd/inc/sdpage.hxx
@@ -111,11 +111,11 @@ protected:
AutoLayout meAutoLayout; ///< AutoLayout
sd::ShapeList maPresentationShapeList;///< presentation objects
sd::ScopeLock maLockAutoLayoutArrangement;
- sal_Bool mbSelected; ///< selection identifier
+ bool mbSelected; ///< selection identifier
PresChange mePresChange; ///< manual / automatic / semi automatic
double mfTime; ///< Display time in seconds
- sal_Bool mbSoundOn; ///< with / without sound.
- sal_Bool mbExcluded; ///< will (not) be displayed during show.
+ bool mbSoundOn; ///< with / without sound.
+ bool mbExcluded; ///< will (not) be displayed during show.
OUString maLayoutName; ///< Name of the layout
OUString maSoundFile; ///< Path to sound file (MSDOS notation).
bool mbLoopSound;
@@ -123,8 +123,8 @@ protected:
OUString maCreatedPageName; ///< generated page name by GetPageName.
OUString maFileName; ///< file name.
OUString maBookmarkName; ///< Bookmark name.
- sal_Bool mbScaleObjects; ///< Objects should be scaled
- sal_Bool mbBackgroundFullSize; ///< Background object to represent the whole page.
+ bool mbScaleObjects; ///< Objects should be scaled
+ bool mbBackgroundFullSize; ///< Background object to represent the whole page.
rtl_TextEncoding meCharSet; ///< Text encoding
sal_uInt16 mnPaperBin; ///< PaperBin
Orientation meOrientation; ///< Print orientation.
@@ -149,14 +149,14 @@ protected:
// new transition settings
sal_Int16 mnTransitionType;
sal_Int16 mnTransitionSubtype;
- sal_Bool mbTransitionDirection;
+ bool mbTransitionDirection;
sal_Int32 mnTransitionFadeColor;
double mfTransitionDuration;
public:
TYPEINFO_OVERRIDE();
- SdPage(SdDrawDocument& rNewDoc, sal_Bool bMasterPage=sal_False);
+ SdPage(SdDrawDocument& rNewDoc, bool bMasterPage=false);
SdPage(const SdPage& rSrcPage);
virtual ~SdPage();
virtual SdrPage* Clone() const SAL_OVERRIDE;
@@ -174,7 +174,7 @@ public:
sd::ShapeList& GetPresentationShapeList() { return maPresentationShapeList; }
void EnsureMasterPageDefaultBackground();
- SdrObject* CreatePresObj(PresObjKind eObjKind, sal_Bool bVertical, const Rectangle& rRect, sal_Bool bInsert=sal_False);
+ SdrObject* CreatePresObj(PresObjKind eObjKind, bool bVertical, const Rectangle& rRect, bool bInsert=false);
SdrObject* CreateDefaultPresObj(PresObjKind eObjKind, bool bInsert);
SdrObject* GetPresObj(PresObjKind eObjKind, int nIndex = 1, bool bFuzzySearch = false );
PresObjKind GetPresObjKind(SdrObject* pObj) const;
@@ -192,9 +192,9 @@ public:
/** inserts the given SdrObject into the presentation object list */
void InsertPresObj(SdrObject* pObj, PresObjKind eKind );
- void SetAutoLayout(AutoLayout eLayout, sal_Bool bInit=sal_False, sal_Bool bCreate=sal_False);
+ void SetAutoLayout(AutoLayout eLayout, bool bInit=false, bool bCreate=false);
AutoLayout GetAutoLayout() const { return meAutoLayout; }
- void CreateTitleAndLayout(sal_Bool bInit=sal_False, sal_Bool bCreate=sal_False);
+ void CreateTitleAndLayout(bool bInit=false, bool bCreate=false);
SdrObject* InsertAutoLayoutShape(SdrObject* pObj, PresObjKind eObjKind, bool bVertical, Rectangle aRect, bool bInit );
virtual void NbcInsertObject(SdrObject* pObj, sal_uLong nPos=CONTAINER_APPEND,
@@ -212,8 +212,8 @@ public:
void SetPageKind(PageKind ePgType) { mePageKind = ePgType; }
PageKind GetPageKind() const { return mePageKind; }
- void SetSelected(sal_Bool bSel) { mbSelected = bSel; }
- sal_Bool IsSelected() const { return mbSelected; }
+ void SetSelected(bool bSel) { mbSelected = bSel; }
+ bool IsSelected() const { return mbSelected; }
void SetFadeEffect(::com::sun::star::presentation::FadeEffect eNewEffect);
::com::sun::star::presentation::FadeEffect GetFadeEffect() const;
@@ -224,14 +224,14 @@ public:
void SetTime(double fNewTime) { mfTime = fNewTime; }
double GetTime() const { return mfTime; }
- void SetSound(sal_Bool bNewSoundOn) { mbSoundOn = bNewSoundOn; }
- sal_Bool IsSoundOn() const { return mbSoundOn; }
+ void SetSound(bool bNewSoundOn) { mbSoundOn = bNewSoundOn; }
+ bool IsSoundOn() const { return mbSoundOn; }
- void SetExcluded(sal_Bool bNewExcluded) { mbExcluded = bNewExcluded; }
- sal_Bool IsExcluded() const { return mbExcluded; }
+ void SetExcluded(bool bNewExcluded) { mbExcluded = bNewExcluded; }
+ bool IsExcluded() const { return mbExcluded; }
- void SetScaleObjects(sal_Bool bScale) { mbScaleObjects = bScale; }
- sal_Bool IsScaleObjects() const { return mbScaleObjects; }
+ void SetScaleObjects(bool bScale) { mbScaleObjects = bScale; }
+ bool IsScaleObjects() const { return mbScaleObjects; }
void SetSoundFile(const OUString& rStr) { maSoundFile = rStr; }
OUString GetSoundFile() const { return maSoundFile; }
@@ -248,8 +248,8 @@ public:
sal_Int16 getTransitionSubtype() const;
void setTransitionSubtype( sal_Int16 nTransitionSubtype );
- sal_Bool getTransitionDirection() const;
- void setTransitionDirection( sal_Bool bTransitionbDirection );
+ bool getTransitionDirection() const;
+ void setTransitionDirection( bool bTransitionbDirection );
sal_Int32 getTransitionFadeColor() const;
void setTransitionFadeColor( sal_Int32 nTransitionFadeColor );
@@ -273,19 +273,19 @@ public:
void DisconnectLink();
void ScaleObjects(const Size& rNewPageSize, const Rectangle& rNewBorderRect,
- sal_Bool bScaleAllObj);
+ bool bScaleAllObj);
const OUString& GetName() const;
OUString GetRealName() const { return FmFormPage::GetName(); };
void SetPresentationLayout(const OUString& rLayoutName,
- sal_Bool bReplaceStyleSheets = sal_True,
- sal_Bool bSetMasterPage = sal_True,
- sal_Bool bReverseOrder = sal_False);
+ bool bReplaceStyleSheets = true,
+ bool bSetMasterPage = true,
+ bool bReverseOrder = false);
void EndListenOutlineText();
- void SetBackgroundFullSize( sal_Bool bIn );
- sal_Bool IsBackgroundFullSize() const { return mbBackgroundFullSize; }
+ void SetBackgroundFullSize( bool bIn );
+ bool IsBackgroundFullSize() const { return mbBackgroundFullSize; }
rtl_TextEncoding GetCharSet() { return(meCharSet); }
@@ -296,7 +296,7 @@ public:
virtual SfxStyleSheet* GetTextStyleSheetForObject( SdrObject* pObj ) const SAL_OVERRIDE;
- sal_Bool setAlienAttributes( const com::sun::star::uno::Any& rAttributes );
+ bool setAlienAttributes( const com::sun::star::uno::Any& rAttributes );
void getAlienAttributes( com::sun::star::uno::Any& rAttributes );
/** @return the main animation node */
diff --git a/sd/inc/sdpptwrp.hxx b/sd/inc/sdpptwrp.hxx
index 89e71fc..01432bd 100644
--- a/sd/inc/sdpptwrp.hxx
+++ b/sd/inc/sdpptwrp.hxx
@@ -29,12 +29,12 @@ public:
SdPPTFilter (
SfxMedium& rMedium,
::sd::DrawDocShell& rDocShell,
- sal_Bool bShowProgress);
+ bool bShowProgress);
virtual ~SdPPTFilter (void);
/// these methods are necessary for the export to PowerPoint
- sal_Bool Import();
- sal_Bool Export() SAL_OVERRIDE;
+ bool Import();
+ bool Export() SAL_OVERRIDE;
/// restores the original basic storage
void PreSaveBasic();
diff --git a/sd/inc/sdxmlwrp.hxx b/sd/inc/sdxmlwrp.hxx
index dfa7dc9..8945ab1 100644
--- a/sd/inc/sdxmlwrp.hxx
+++ b/sd/inc/sdxmlwrp.hxx
@@ -36,13 +36,13 @@ public:
SdXMLFilter(
SfxMedium& rMedium,
::sd::DrawDocShell& rDocShell,
- sal_Bool bShowProgress,
+ bool bShowProgress,
SdXMLFilterMode eFilterMode = SDXMLMODE_Normal,
sal_uLong nStoreVer = SOFFICE_FILEFORMAT_8 );
virtual ~SdXMLFilter (void);
- sal_Bool Import( ErrCode& nError );
- sal_Bool Export() SAL_OVERRIDE;
+ bool Import( ErrCode& nError );
+ bool Export() SAL_OVERRIDE;
private:
SdXMLFilterMode meFilterMode;
diff --git a/sd/inc/stlpool.hxx b/sd/inc/stlpool.hxx
index d533067..31cb814 100644
--- a/sd/inc/stlpool.hxx
+++ b/sd/inc/stlpool.hxx
@@ -73,7 +73,7 @@ public:
had to be created. This is used to assert errors in documents
when styles are missing.
*/
- SD_DLLPUBLIC void CreateLayoutStyleSheets(const OUString& rLayoutName, sal_Bool bCheck = sal_False );
+ SD_DLLPUBLIC void CreateLayoutStyleSheets(const OUString& rLayoutName, bool bCheck = false );
void CreateLayoutSheetNames(const OUString& rLayoutName, std::vector<OUString> &aNameList) const;
void CreateLayoutSheetList(const OUString& rLayoutName, SdStyleSheetVector& rLayoutSheets);
void CopyLayoutSheets(const OUString& rLayoutName, SdStyleSheetPool& rSourcePool, SdStyleSheetVector& rCreatedSheets );
diff --git a/sd/inc/stlsheet.hxx b/sd/inc/stlsheet.hxx
index 2db8d3d..90ce7eb 100644
--- a/sd/inc/stlsheet.hxx
+++ b/sd/inc/stlsheet.hxx
@@ -63,7 +63,7 @@ public:
virtual bool SetName( const OUString& ) SAL_OVERRIDE;
virtual void SetHelpId( const OUString& r, sal_uLong nId ) SAL_OVERRIDE;
- void AdjustToFontHeight(SfxItemSet& rSet, sal_Bool bOnlyMissingItems = sal_True);
+ void AdjustToFontHeight(SfxItemSet& rSet, bool bOnlyMissingItems = true);
SdStyleSheet* GetRealStyleSheet() const;
SdStyleSheet* GetPseudoStyleSheet() const;
diff --git a/sd/qa/unit/uimpress.cxx b/sd/qa/unit/uimpress.cxx
index d5f7cb1..f1704a6 100644
--- a/sd/qa/unit/uimpress.cxx
+++ b/sd/qa/unit/uimpress.cxx
@@ -103,7 +103,7 @@ void Test::testAddPage()
void Test::testCustomShow()
{
CPPUNIT_ASSERT_MESSAGE("test generation of custom show list!",
- m_pDoc->GetCustomShowList(sal_True));
+ m_pDoc->GetCustomShowList(true));
}
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx
index 801eed4..53356fe 100644
--- a/sd/source/core/CustomAnimationEffect.cxx
+++ b/sd/source/core/CustomAnimationEffect.cxx
@@ -140,7 +140,7 @@ CustomAnimationEffect::CustomAnimationEffect( const ::com::sun::star::uno::Refer
mnIterateType(0),
mfIterateInterval(0.0),
mnParaDepth( -1 ),
- mbHasText(sal_False),
+ mbHasText(false),
mfAcceleration( 1.0 ),
mfDecelerate( 1.0 ),
mbAutoReverse(false),
@@ -555,7 +555,7 @@ bool CustomAnimationEffect::checkForText()
Reference< XEnumeration > xEnumeration( xEA->createEnumeration(), UNO_QUERY );
if( xEnumeration.is() )
{
- sal_Bool bHasText = xEnumeration->hasMoreElements();
+ bool bHasText = xEnumeration->hasMoreElements();
bChange |= bHasText != mbHasText;
mbHasText = bHasText;
@@ -584,7 +584,7 @@ bool CustomAnimationEffect::checkForText()
else
{
maTarget >>= xText;
- sal_Bool bHasText = xText.is() && !xText->getString().isEmpty();
+ bool bHasText = xText.is() && !xText->getString().isEmpty();
bChange |= bHasText != mbHasText;
mbHasText = bHasText;
}
@@ -805,7 +805,7 @@ void CustomAnimationEffect::setDecelerate( double fDecelerate )
}
}
-void CustomAnimationEffect::setAutoReverse( sal_Bool bAutoReverse )
+void CustomAnimationEffect::setAutoReverse( bool bAutoReverse )
{
if( mxNode.is() ) try
{
@@ -827,7 +827,7 @@ void CustomAnimationEffect::replaceNode( const ::com::sun::star::uno::Reference<
double fDuration = mfDuration;
double fAcceleration = mfAcceleration;
double fDecelerate = mfDecelerate ;
- sal_Bool bAutoReverse = mbAutoReverse;
+ bool bAutoReverse = mbAutoReverse;
Reference< XAudio > xAudio( mxAudio );
sal_Int16 nIterateType = mnIterateType;
double fIterateInterval = mfIterateInterval;
@@ -946,7 +946,7 @@ Reference< XAnimationNode > CustomAnimationEffect::createAfterEffectNode() const
}
else
{
- aTo = makeAny( (sal_Bool)sal_False );
+ aTo = makeAny( false );
aAttributeName = "Visibility";
}
@@ -2393,7 +2393,7 @@ void EffectSequenceHelper::updateTextGroups()
}
}
-CustomAnimationTextGroupPtr EffectSequenceHelper::createTextGroup( CustomAnimationEffectPtr pEffect, sal_Int32 nTextGrouping, double fTextGroupingAuto, sal_Bool bAnimateForm, sal_Bool bTextReverse )
+CustomAnimationTextGroupPtr EffectSequenceHelper::createTextGroup( CustomAnimationEffectPtr pEffect, sal_Int32 nTextGrouping, double fTextGroupingAuto, bool bAnimateForm, bool bTextReverse )
{
// first finde a free group-id
sal_Int32 nGroupId = 0;
@@ -2456,7 +2456,7 @@ void EffectSequenceHelper::createTextGroupParagraphEffects( CustomAnimationTextG
sal_Int32 nTextGrouping = pTextGroup->mnTextGrouping;
double fTextGroupingAuto = pTextGroup->mfGroupingAuto;
- sal_Bool bTextReverse = pTextGroup->mbTextReverse;
+ bool bTextReverse = pTextGroup->mbTextReverse;
// now add an effect for each paragraph
if( nTextGrouping >= 0 ) try
@@ -2623,7 +2623,7 @@ void EffectSequenceHelper::setTextGrouping( CustomAnimationTextGroupPtr pTextGro
}
}
-void EffectSequenceHelper::setAnimateForm( CustomAnimationTextGroupPtr pTextGroup, sal_Bool bAnimateForm )
+void EffectSequenceHelper::setAnimateForm( CustomAnimationTextGroupPtr pTextGroup, bool bAnimateForm )
{
if( pTextGroup->mbAnimateForm == bAnimateForm )
{
@@ -2772,7 +2772,7 @@ bool ImplStlTextGroupSortHelper::operator()( const CustomAnimationEffectPtr& p1,
}
}
-void EffectSequenceHelper::setTextReverse( CustomAnimationTextGroupPtr pTextGroup, sal_Bool bTextReverse )
+void EffectSequenceHelper::setTextReverse( CustomAnimationTextGroupPtr pTextGroup, bool bTextReverse )
{
if( pTextGroup->mbTextReverse == bTextReverse )
{
diff --git a/sd/source/core/EffectMigration.cxx b/sd/source/core/EffectMigration.cxx
index 951a6dd..2c1e940 100644
--- a/sd/source/core/EffectMigration.cxx
+++ b/sd/source/core/EffectMigration.cxx
@@ -191,7 +191,7 @@ void EffectMigration::SetFadeEffect( SdPage* pPage, ::com::sun::star::presentati
{
pPage->setTransitionType( 0 );
pPage->setTransitionSubtype( 0 );
- pPage->setTransitionDirection( 0 );
+ pPage->setTransitionDirection( false );
pPage->setTransitionFadeColor( 0 );
}
}
@@ -501,7 +501,7 @@ void EffectMigration::SetAnimationEffect( SvxShape* pShape, AnimationEffect eEff
{
// special case for outline text, effects are always mapped to text group effect
pMainSequence->
- createTextGroup( pEffect, 10, bManual ? -1 : 0.0, sal_False, sal_False );
+ createTextGroup( pEffect, 10, bManual ? -1 : 0.0, false, false );
}
}
}
@@ -676,7 +676,7 @@ void EffectMigration::SetTextAnimationEffect( SvxShape* pShape, AnimationEffect
// now create effects for each paragraph
pGroup =
pMainSequence->
- createTextGroup( pShapeEffect, 10, bManual ? -1 : 0.0, sal_True, sal_False );
+ createTextGroup( pShapeEffect, 10, bManual ? -1 : 0.0, true, false );
}
}
@@ -967,7 +967,7 @@ sal_Int32 EffectMigration::GetDimColor( SvxShape* pShape )
-void EffectMigration::SetDimHide( SvxShape* pShape, sal_Bool bDimHide )
+void EffectMigration::SetDimHide( SvxShape* pShape, bool bDimHide )
{
DBG_ASSERT( pShape && pShape->GetSdrObject() && pShape->GetSdrObject()->GetPage(),
"sd::EffectMigration::SetAnimationEffect(), invalid argument!" );
@@ -1006,9 +1006,9 @@ void EffectMigration::SetDimHide( SvxShape* pShape, sal_Bool bDimHide )
-sal_Bool EffectMigration::GetDimHide( SvxShape* pShape )
+bool EffectMigration::GetDimHide( SvxShape* pShape )
{
- sal_Bool bRet = sal_False;
+ bool bRet = false;
if( pShape )
{
SdrObject* pObj = pShape->GetSdrObject();
@@ -1038,7 +1038,7 @@ sal_Bool EffectMigration::GetDimHide( SvxShape* pShape )
-void EffectMigration::SetDimPrevious( SvxShape* pShape, sal_Bool bDimPrevious )
+void EffectMigration::SetDimPrevious( SvxShape* pShape, bool bDimPrevious )
{
DBG_ASSERT( pShape && pShape->GetSdrObject() && pShape->GetSdrObject()->GetPage(),
"sd::EffectMigration::SetAnimationEffect(), invalid argument!" );
@@ -1080,9 +1080,9 @@ void EffectMigration::SetDimPrevious( SvxShape* pShape, sal_Bool bDimPrevious )
-sal_Bool EffectMigration::GetDimPrevious( SvxShape* pShape )
+bool EffectMigration::GetDimPrevious( SvxShape* pShape )
{
- sal_Bool bRet = sal_False;
+ bool bRet = false;
if( pShape )
{
SdrObject* pObj = pShape->GetSdrObject();
@@ -1317,7 +1317,7 @@ OUString EffectMigration::GetSoundFile( SvxShape* pShape )
-sal_Bool EffectMigration::GetSoundOn( SvxShape* pShape )
+bool EffectMigration::GetSoundOn( SvxShape* pShape )
{
return !GetSoundFile( pShape ).isEmpty();
}
diff --git a/sd/source/core/PageListWatcher.cxx b/sd/source/core/PageListWatcher.cxx
index 5c2bc12..e6d3ad8 100644
--- a/sd/source/core/PageListWatcher.cxx
+++ b/sd/source/core/PageListWatcher.cxx
@@ -65,13 +65,13 @@ void ImpPageListWatcher::ImpRecreateSortedPageListOnDemand()
}
// set to valid
- mbPageListValid = sal_True;
+ mbPageListValid = true;
}
ImpPageListWatcher::ImpPageListWatcher(const SdrModel& rModel)
: mrModel(rModel)
, mpHandoutPage(0L)
- , mbPageListValid(sal_False)
+ , mbPageListValid(false)
, mnVisiblePageCount(0)
{
}
diff --git a/sd/source/core/PageListWatcher.hxx b/sd/source/core/PageListWatcher.hxx
index 773a50a..26b3a96 100644
--- a/sd/source/core/PageListWatcher.hxx
+++ b/sd/source/core/PageListWatcher.hxx
@@ -42,7 +42,7 @@ protected:
SdPageVector maPageVectorNotes;
SdPage* mpHandoutPage;
- sal_Bool mbPageListValid;
+ bool mbPageListValid;
sal_uInt32 mnVisiblePageCount;
void ImpRecreateSortedPageListOnDemand();
@@ -58,7 +58,7 @@ public:
ImpPageListWatcher(const SdrModel& rModel);
virtual ~ImpPageListWatcher();
- void Invalidate() { mbPageListValid = sal_False; }
+ void Invalidate() { mbPageListValid = false; }
SdPage* GetSdPage(PageKind ePgKind, sal_uInt32 nPgNum = 0L);
sal_uInt32 GetSdPageCount(PageKind ePgKind);
sal_uInt32 GetVisibleSdPageCount();
diff --git a/sd/source/core/anminfo.cxx b/sd/source/core/anminfo.cxx
index f160910..f0ae560 100644
--- a/sd/source/core/anminfo.cxx
+++ b/sd/source/core/anminfo.cxx
@@ -39,18 +39,18 @@ SdAnimationInfo::SdAnimationInfo(SdrObject& rObject)
meEffect (presentation::AnimationEffect_NONE),
meTextEffect (presentation::AnimationEffect_NONE),
meSpeed (presentation::AnimationSpeed_SLOW),
- mbActive (sal_True),
- mbDimPrevious (sal_False),
- mbIsMovie (sal_False),
- mbDimHide (sal_False),
- mbSoundOn (sal_False),
- mbPlayFull (sal_False),
+ mbActive (true),
+ mbDimPrevious (false),
+ mbIsMovie (false),
+ mbDimHide (false),
+ mbSoundOn (false),
+ mbPlayFull (false),
mpPathObj (NULL),
meClickAction (presentation::ClickAction_NONE),
meSecondEffect (presentation::AnimationEffect_NONE),
meSecondSpeed (presentation::AnimationSpeed_SLOW),
- mbSecondSoundOn (sal_False),
- mbSecondPlayFull (sal_False),
+ mbSecondSoundOn (false),
+ mbSecondPlayFull (false),
mnVerb (0),
mnPresOrder (TREELIST_APPEND),
mrObject (rObject)
diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx
index d75ed4f..1de1f33 100644
--- a/sd/source/core/drawdoc.cxx
+++ b/sd/source/core/drawdoc.cxx
@@ -148,7 +148,7 @@ PresentationSettings::PresentationSettings( const PresentationSettings& r )
SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh)
: FmFormModel( SvtPathOptions().GetPalettePath(), NULL, pDrDocSh )
-, bReadOnly(sal_False)
+, bReadOnly(false)
, mpOutliner(NULL)
, mpInternalOutliner(NULL)
, mpWorkStartupTimer(NULL)
@@ -290,7 +290,7 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh)
nCntrl &= ~ EE_CNTRL_ULSPACESUMMATION;
if ( meDocType != DOCUMENT_TYPE_IMPRESS )
- SetSummationOfParagraphs( sal_False );
+ SetSummationOfParagraphs( false );
else
{
SetSummationOfParagraphs( pOptions->IsSummationOfParagraphs() );
@@ -450,10 +450,10 @@ SdrModel* SdDrawDocument::AllocModel() const
if( meDocType == DOCUMENT_TYPE_IMPRESS )
mpCreatingTransferable->SetDocShell( new ::sd::DrawDocShell(
- SFX_CREATE_MODE_EMBEDDED, sal_True, meDocType ) );
+ SFX_CREATE_MODE_EMBEDDED, true, meDocType ) );
else
mpCreatingTransferable->SetDocShell( new ::sd::GraphicDocShell(
- SFX_CREATE_MODE_EMBEDDED, sal_True, meDocType ) );
+ SFX_CREATE_MODE_EMBEDDED, true, meDocType ) );
pNewDocSh = static_cast< ::sd::DrawDocShell*>( pObj = mpCreatingTransferable->GetDocShell() );
pNewDocSh->DoInitNew( NULL );
@@ -486,7 +486,7 @@ SdrModel* SdDrawDocument::AllocModel() const
SdDrawDocument* pDoc = (SdDrawDocument*) this;
pDoc->SetAllocDocSh(false);
pDoc->mxAllocedDocShRef = new ::sd::DrawDocShell(
- SFX_CREATE_MODE_EMBEDDED, sal_True, meDocType);
+ SFX_CREATE_MODE_EMBEDDED, true, meDocType);
pDoc->mxAllocedDocShRef->DoInitNew(NULL);
pNewModel = pDoc->mxAllocedDocShRef->GetDoc();
}
@@ -528,7 +528,7 @@ void SdDrawDocument::SetChanged(bool bFlag)
}
// The model changed, don't call anything else
-void SdDrawDocument::NbcSetChanged(sal_Bool bFlag)
+void SdDrawDocument::NbcSetChanged(bool bFlag)
{
// forward to baseclass
FmFormModel::SetChanged(bFlag);
@@ -555,7 +555,7 @@ void SdDrawDocument::NewOrLoadCompleted(DocCreationMode eMode)
CheckMasterPages();
if ( GetMasterSdPageCount(PK_STANDARD) > 1 )
- RemoveUnnecessaryMasterPages( NULL, sal_True, sal_False );
+ RemoveUnnecessaryMasterPages( NULL, true, false );
for ( sal_uInt16 i = 0; i < GetPageCount(); i++ )
{
@@ -640,7 +640,7 @@ void SdDrawDocument::NewOrLoadCompleted(DocCreationMode eMode)
for (nPage = 0; nPage < nPageCount; nPage++)
{
SdPage* pPage = GetMasterSdPage(nPage, PK_STANDARD);
- pSPool->CreateLayoutStyleSheets( pPage->GetName(), sal_True );
+ pSPool->CreateLayoutStyleSheets( pPage->GetName(), true );
}
// Default and notes pages:
@@ -760,7 +760,7 @@ void SdDrawDocument::NewOrLoadCompleted( SdPage* pPage, SdStyleSheetPool* pSPool
if (!aString.isEmpty())
{
- sd::Outliner* pInternalOutl = GetInternalOutliner(sal_True);
+ sd::Outliner* pInternalOutl = GetInternalOutliner(true);
pPage->SetObjText( (SdrTextObj*) pObj, pInternalOutl, ePresObjKind, aString );
pObj->NbcSetStyleSheet( pPage->GetStyleSheetForPresObj( ePresObjKind ), true );
pInternalOutl->Clear();
@@ -773,7 +773,7 @@ void SdDrawDocument::NewOrLoadCompleted( SdPage* pPage, SdStyleSheetPool* pSPool
// Local outliner that is used for outline mode. In this outliner, OutlinerViews
// may be inserted.
-::sd::Outliner* SdDrawDocument::GetOutliner(sal_Bool bCreateOutliner)
+::sd::Outliner* SdDrawDocument::GetOutliner(bool bCreateOutliner)
{
if (!mpOutliner && bCreateOutliner)
{
@@ -791,7 +791,7 @@ void SdDrawDocument::NewOrLoadCompleted( SdPage* pPage, SdStyleSheetPool* pSPool
// Internal outliner that is used to create text objects. We don't insert any
// OutlinerViews into this outliner!
-::sd::Outliner* SdDrawDocument::GetInternalOutliner(sal_Bool bCreateOutliner)
+::sd::Outliner* SdDrawDocument::GetInternalOutliner(bool bCreateOutliner)
{
if ( !mpInternalOutliner && bCreateOutliner )
{
@@ -823,7 +823,7 @@ void SdDrawDocument::NewOrLoadCompleted( SdPage* pPage, SdStyleSheetPool* pSPool
}
// OnlineSpelling on/off
-void SdDrawDocument::SetOnlineSpell(sal_Bool bIn)
+void SdDrawDocument::SetOnlineSpell(bool bIn)
{
mbOnlineSpell = bIn;
sal_uLong nCntrl = 0;
diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx
index 8175778..3d3b8e9 100644
--- a/sd/source/core/drawdoc2.cxx
+++ b/sd/source/core/drawdoc2.cxx
@@ -138,14 +138,14 @@ SdrObject* SdDrawDocument::GetObj(const OUString& rObjName) const
// Find SdPage by name
-sal_uInt16 SdDrawDocument::GetPageByName(const OUString& rPgName, sal_Bool& rbIsMasterPage) const
+sal_uInt16 SdDrawDocument::GetPageByName(const OUString& rPgName, bool& rbIsMasterPage) const
{
SdPage* pPage = NULL;
sal_uInt16 nPage = 0;
const sal_uInt16 nMaxPages = GetPageCount();
sal_uInt16 nPageNum = SDRPAGE_NOTFOUND;
- rbIsMasterPage = sal_False;
+ rbIsMasterPage = false;
// Search all regular pages and all notes pages (handout pages are
// ignored)
@@ -176,7 +176,7 @@ sal_uInt16 SdDrawDocument::GetPageByName(const OUString& rPgName, sal_Bool& rbIs
if (pPage && pPage->GetName() == rPgName)
{
nPageNum = nPage;
- rbIsMasterPage = sal_True;
+ rbIsMasterPage = true;
}
nPage++;
@@ -433,7 +433,7 @@ SdrPage* SdDrawDocument::RemoveMasterPage(sal_uInt16 nPgNum)
}
//Select pages
-void SdDrawDocument::SetSelected(SdPage* pPage, sal_Bool bSelect)
+void SdDrawDocument::SetSelected(SdPage* pPage, bool bSelect)
{
PageKind ePageKind = pPage->GetPageKind();
@@ -513,7 +513,7 @@ void SdDrawDocument::CreateFirstPages( SdDrawDocument* pRefDocument /* = 0 */ )
// If nPageCount==1 is, the model for the clipboard was created, thus a
// default page must already exist
SdPage* pPage;
- sal_Bool bClipboard = sal_False;
+ bool bClipboard = false;
if( pRefDocument )
pRefPage = pRefDocument->GetSdPage( 0, PK_STANDARD );
@@ -532,7 +532,7 @@ void SdDrawDocument::CreateFirstPages( SdDrawDocument* pRefDocument /* = 0 */ )
// Draw: always use default size with margins
pPage->SetSize(aDefSize);
- SfxPrinter* pPrinter = mpDocSh->GetPrinter(sal_False);
+ SfxPrinter* pPrinter = mpDocSh->GetPrinter(false);
if (pPrinter && pPrinter->IsValid())
{
Size aOutSize(pPrinter->GetOutputSize());
@@ -569,7 +569,7 @@ void SdDrawDocument::CreateFirstPages( SdDrawDocument* pRefDocument /* = 0 */ )
}
else
{
- bClipboard = sal_True;
+ bClipboard = true;
pPage = (SdPage*) GetPage(1);
}
@@ -630,7 +630,7 @@ void SdDrawDocument::CreateFirstPages( SdDrawDocument* pRefDocument /* = 0 */ )
if( !pRefPage && (meDocType != DOCUMENT_TYPE_DRAW) )
- pPage->SetAutoLayout( AUTOLAYOUT_TITLE, sal_True, sal_True );
+ pPage->SetAutoLayout( AUTOLAYOUT_TITLE, true, true );
mpWorkStartupTimer = new Timer();
mpWorkStartupTimer->SetTimeoutHdl( LINK(this, SdDrawDocument, WorkStartupHdl) );
@@ -644,9 +644,9 @@ void SdDrawDocument::CreateFirstPages( SdDrawDocument* pRefDocument /* = 0 */ )
// Creates missing notes and handout pages (after PowerPoint import).
// We assume that at least one default page and one default master page exist.
-sal_Bool SdDrawDocument::CreateMissingNotesAndHandoutPages()
+bool SdDrawDocument::CreateMissingNotesAndHandoutPages()
{
- sal_Bool bOK = sal_False;
+ bool bOK = false;
sal_uInt16 nPageCount = GetPageCount();
if (nPageCount != 0)
@@ -678,7 +678,7 @@ sal_Bool SdDrawDocument::CreateMissingNotesAndHandoutPages()
pNotesPage->TRG_SetMasterPage(*GetMasterPage(nMasterPageAfterPagesMasterPage));
}
- bOK = sal_True;
+ bOK = true;
StopWorkStartupDelay();
SetChanged(false);
}
@@ -689,12 +689,12 @@ sal_Bool SdDrawDocument::CreateMissingNotesAndHandoutPages()
// + Move selected pages after said page
// (nTargetPage = (sal_uInt16)-1 --> move before first page)
// + Returns sal_True when the page has been moved
-sal_Bool SdDrawDocument::MovePages(sal_uInt16 nTargetPage)
+bool SdDrawDocument::MovePages(sal_uInt16 nTargetPage)
{
SdPage* pPage = NULL;
sal_uInt16 nPage;
sal_uInt16 nNoOfPages = GetSdPageCount(PK_STANDARD);
- sal_Bool bSomethingHappened = sal_False;
+ bool bSomethingHappened = false;
const bool bUndo = IsUndoEnabled();
@@ -745,7 +745,7 @@ sal_Bool SdDrawDocument::MovePages(sal_uInt16 nTargetPage)
if( bUndo )
AddUndo(GetSdrUndoFactory().CreateUndoSetPageNum(*pPg, nPage+1, 2));
MovePage(nPage+1, 2);
- bSomethingHappened = sal_True;
+ bSomethingHappened = true;
}
}
}
@@ -774,7 +774,7 @@ sal_Bool SdDrawDocument::MovePages(sal_uInt16 nTargetPage)
if( bUndo )
AddUndo(GetSdrUndoFactory().CreateUndoSetPageNum(*pPg, nPage+1, nTargetPage+1));
MovePage(nPage+1, nTargetPage+1);
- bSomethingHappened = sal_True;
+ bSomethingHappened = true;
}
}
else
@@ -789,7 +789,7 @@ sal_Bool SdDrawDocument::MovePages(sal_uInt16 nTargetPage)
if( bUndo )
AddUndo(GetSdrUndoFactory().CreateUndoSetPageNum(*pPg, nPage, nTargetPage));
MovePage(nPage, nTargetPage);
- bSomethingHappened = sal_True;
+ bSomethingHappened = true;
}
}
nTargetPage = pPage->GetPageNum();
@@ -812,22 +812,22 @@ sal_uLong SdDrawDocument::GetLinkCount()
// Set Language
void SdDrawDocument::SetLanguage( const LanguageType eLang, const sal_uInt16 nId )
{
- sal_Bool bChanged = sal_False;
+ bool bChanged = false;
if( nId == EE_CHAR_LANGUAGE && meLanguage != eLang )
{
meLanguage = eLang;
- bChanged = sal_True;
+ bChanged = true;
}
else if( nId == EE_CHAR_LANGUAGE_CJK && meLanguageCJK != eLang )
{
meLanguageCJK = eLang;
- bChanged = sal_True;
+ bChanged = true;
}
else if( nId == EE_CHAR_LANGUAGE_CTL && meLanguageCTL != eLang )
{
meLanguageCTL = eLang;
- bChanged = sal_True;
+ bChanged = true;
}
if( bChanged )
@@ -860,7 +860,7 @@ IMPL_LINK_NOARG(SdDrawDocument, WorkStartupHdl)
if( mpDocSh )
mpDocSh->SetWaitCursor( true );
- sal_Bool bChanged = IsChanged(); // remember this
+ bool bChanged = IsChanged(); // remember this
// Initialize Autolayouts
SdPage* pHandoutMPage = GetMasterSdPage(0, PK_HANDOUT);
@@ -868,7 +868,7 @@ IMPL_LINK_NOARG(SdDrawDocument, WorkStartupHdl)
if (pHandoutMPage->GetAutoLayout() == AUTOLAYOUT_NONE)
{
// No AutoLayout yet -> initialize
- pHandoutMPage->SetAutoLayout(AUTOLAYOUT_HANDOUT6, sal_True, sal_True);
+ pHandoutMPage->SetAutoLayout(AUTOLAYOUT_HANDOUT6, true, true);
}
SdPage* pPage = GetSdPage(0, PK_STANDARD);
@@ -876,7 +876,7 @@ IMPL_LINK_NOARG(SdDrawDocument, WorkStartupHdl)
if (pPage->GetAutoLayout() == AUTOLAYOUT_NONE)
{
// No AutoLayout yet -> initialize
- pPage->SetAutoLayout(AUTOLAYOUT_NONE, sal_True, sal_True);
+ pPage->SetAutoLayout(AUTOLAYOUT_NONE, true, true);
}
SdPage* pNotesPage = GetSdPage(0, PK_NOTES);
@@ -884,7 +884,7 @@ IMPL_LINK_NOARG(SdDrawDocument, WorkStartupHdl)
if (pNotesPage->GetAutoLayout() == AUTOLAYOUT_NONE)
{
// No AutoLayout yet -> initialize
- pNotesPage->SetAutoLayout(AUTOLAYOUT_NOTES, sal_True, sal_True);
+ pNotesPage->SetAutoLayout(AUTOLAYOUT_NOTES, true, true);
}
SetChanged(bChanged);
@@ -987,7 +987,7 @@ IMapObject* SdDrawDocument::GetHitIMapObject( SdrObject* pObj,
Point aRelPoint( rWinPoint );
ImageMap& rImageMap = (ImageMap&) pIMapInfo->GetImageMap();
const Rectangle& rRect = pObj->GetLogicRect();
- sal_Bool bObjSupported = sal_False;
+ bool bObjSupported = false;
// execute HitTest
if ( pObj->ISA( SdrGrafObj ) ) // simple graphics object
@@ -1015,12 +1015,12 @@ IMapObject* SdDrawDocument::GetHitIMapObject( SdrObject* pObj,
pGrafObj->GetGrafPrefMapMode(), aMap100 );
delete pGeoData;
- bObjSupported = sal_True;
+ bObjSupported = true;
}
else if ( pObj->ISA( SdrOle2Obj ) ) // OLE object
{
aGraphSize = ( (SdrOle2Obj*) pObj )->GetOrigObjSize();
- bObjSupported = sal_True;
+ bObjSupported = true;
}
// Everything worked out well, thus execute HitTest
@@ -1082,7 +1082,7 @@ void SdDrawDocument::CheckMasterPages()
{
// there is a fatal error in the master page order,
// we need to repair the document
- sal_Bool bChanged = sal_False;
+ bool bChanged = false;
nPage = 1;
while( nPage < nMaxPages )
@@ -1090,7 +1090,7 @@ void SdDrawDocument::CheckMasterPages()
pPage = static_cast<SdPage*> (GetMasterPage( nPage ));
if( pPage->GetPageKind() != PK_STANDARD )
{
- bChanged = sal_True;
+ bChanged = true;
sal_uInt16 nFound = nPage + 1;
while( nFound < nMaxPages )
{
@@ -1120,7 +1120,7 @@ void SdDrawDocument::CheckMasterPages()
if( (NULL == pNotesPage) || (pNotesPage->GetPageKind() != PK_NOTES) || ( pPage->GetLayoutName() != pNotesPage->GetLayoutName() ) )
{
- bChanged = sal_True;
+ bChanged = true;
sal_uInt16 nFound = nPage + 1;
while( nFound < nMaxPages )
@@ -1166,7 +1166,7 @@ void SdDrawDocument::CheckMasterPages()
}
InsertMasterPage(pNewNotesPage, nPage );
pNewNotesPage->SetLayoutName( pPage->GetLayoutName() );
- pNewNotesPage->SetAutoLayout(AUTOLAYOUT_NOTES, sal_True, sal_True );
+ pNewNotesPage->SetAutoLayout(AUTOLAYOUT_NOTES, true, true );
nMaxPages++;
}
}
@@ -1177,7 +1177,7 @@ void SdDrawDocument::CheckMasterPages()
// now remove all remaining and unused non PK_STANDARD slides
while( nPage < nMaxPages )
{
- bChanged = sal_True;
+ bChanged = true;
RemoveMasterPage( nPage );
nMaxPages--;
@@ -1198,8 +1198,8 @@ sal_uInt16 SdDrawDocument::CreatePage (
const OUString& sNotesPageName,
AutoLayout eStandardLayout,
AutoLayout eNotesLayout,
- sal_Bool bIsPageBack,
- sal_Bool bIsPageObj,
+ bool bIsPageBack,
+ bool bIsPageObj,
const sal_Int32 nInsertPosition)
{
SdPage* pPreviousStandardPage;
@@ -1240,7 +1240,7 @@ sal_uInt16 SdDrawDocument::CreatePage (
// User layout of current standard page
pStandardPage->SetLayoutName( pPreviousStandardPage->GetLayoutName() );
- pStandardPage->SetAutoLayout(eStandardLayout, sal_True);
+ pStandardPage->SetAutoLayout(eStandardLayout, true);
pStandardPage->setHeaderFooterSettings( pPreviousStandardPage->getHeaderFooterSettings() );
// transition settings of current page
@@ -1263,7 +1263,7 @@ sal_uInt16 SdDrawDocument::CreatePage (
// Use layout of current notes page
pNotesPage->SetLayoutName( pPreviousNotesPage->GetLayoutName() );
- pNotesPage->SetAutoLayout(eNotesLayout, sal_True);
+ pNotesPage->SetAutoLayout(eNotesLayout, true);
pNotesPage->setHeaderFooterSettings( pPreviousNotesPage->getHeaderFooterSettings() );
return InsertPageSet (
@@ -1310,8 +1310,8 @@ sal_uInt16 SdDrawDocument::DuplicatePage (
PageKind ePageKind,
const OUString& sStandardPageName,
const OUString& sNotesPageName,
- sal_Bool bIsPageBack,
- sal_Bool bIsPageObj,
+ bool bIsPageBack,
+ bool bIsPageObj,
const sal_Int32 nInsertPosition)
{
SdPage* pPreviousStandardPage;
@@ -1358,8 +1358,8 @@ sal_uInt16 SdDrawDocument::InsertPageSet (
PageKind ePageKind,
const OUString& sStandardPageName,
const OUString& sNotesPageName,
- sal_Bool bIsPageBack,
- sal_Bool bIsPageObj,
+ bool bIsPageBack,
+ bool bIsPageObj,
SdPage* pStandardPage,
SdPage* pNotesPage,
sal_Int32 nInsertPosition)
@@ -1426,8 +1426,8 @@ void SdDrawDocument::SetupNewPage (
SdPage* pPage,
const OUString& sPageName,
sal_uInt16 nInsertionPoint,
- sal_Bool bIsPageBack,
- sal_Bool bIsPageObj)
+ bool bIsPageBack,
+ bool bIsPageObj)
{
if (pPreviousPage != NULL)
{
diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx
index 272db5d..d423352 100644
--- a/sd/source/core/drawdoc3.cxx
+++ b/sd/source/core/drawdoc3.cxx
@@ -161,7 +161,7 @@ static void lcl_IterateBookmarkPages( SdDrawDocument &rDoc, SdDrawDocument* pBoo
{
// fetch nPos'th entry from bookmark list, and determine master page
OUString aBMPgName(rBookmarkList[nPos]);
- sal_Bool bIsMasterPage;
+ bool bIsMasterPage;
sal_uInt16 nBMPage = pBookmarkDoc->GetPageByName( aBMPgName, bIsMasterPage );
@@ -194,7 +194,7 @@ static void lcl_IterateBookmarkPages( SdDrawDocument &rDoc, SdDrawDocument* pBoo
// Opens a bookmark document
SdDrawDocument* SdDrawDocument::OpenBookmarkDoc(SfxMedium& rMedium)
{
- sal_Bool bOK = sal_True;
+ bool bOK = true;
SdDrawDocument* pBookmarkDoc = NULL;
OUString aBookmarkName = rMedium.GetName();
const SfxFilter* pFilter = rMedium.GetFilter();
@@ -206,12 +206,12 @@ SdDrawDocument* SdDrawDocument::OpenBookmarkDoc(SfxMedium& rMedium)
if ( !pFilter )
{
- bOK = sal_False;
+ bOK = false;
}
else if ( !aBookmarkName.isEmpty() && maBookmarkFile != aBookmarkName )
{
- sal_Bool bCreateGraphicShell = pFilter->GetServiceName() == "com.sun.star.drawing.DrawingDocument";
- sal_Bool bCreateImpressShell = pFilter->GetServiceName() == "com.sun.star.presentation.PresentationDocument";
+ bool bCreateGraphicShell = pFilter->GetServiceName() == "com.sun.star.drawing.DrawingDocument";
+ bool bCreateImpressShell = pFilter->GetServiceName() == "com.sun.star.presentation.PresentationDocument";
if ( bCreateGraphicShell || bCreateImpressShell )
{
CloseBookmarkDoc();
@@ -221,10 +221,10 @@ SdDrawDocument* SdDrawDocument::OpenBookmarkDoc(SfxMedium& rMedium)
// If that wasn't the case, we could load the model directly.
if ( bCreateGraphicShell )
// Draw
- mxBookmarkDocShRef = new ::sd::GraphicDocShell(SFX_CREATE_MODE_STANDARD, sal_True);
+ mxBookmarkDocShRef = new ::sd::GraphicDocShell(SFX_CREATE_MODE_STANDARD, true);
else
// Impress
- mxBookmarkDocShRef = new ::sd::DrawDocShell(SFX_CREATE_MODE_STANDARD, sal_True);
+ mxBookmarkDocShRef = new ::sd::DrawDocShell(SFX_CREATE_MODE_STANDARD, true);
bOK = mxBookmarkDocShRef->DoLoad(&rMedium);
if( bOK )
@@ -272,24 +272,24 @@ SdDrawDocument* SdDrawDocument::OpenBookmarkDoc(const OUString& rBookmarkFile)
}
// Inserts a bookmark (page or object)
-sal_Bool SdDrawDocument::InsertBookmark(
- const std::vector<OUString> &rBookmarkList, // List of names of the bookmarks to be inserted
- std::vector<OUString> &rExchangeList, // List of the names to be used
- sal_Bool bLink, // Insert bookmarks as links?
- sal_Bool bReplace, // Replace current default and notes pages?
- sal_uInt16 nInsertPos, // Insertion position of pages
- sal_Bool bNoDialogs, // Don't show dialogs
- ::sd::DrawDocShell* pBookmarkDocSh, // If set, this is the source document
- sal_Bool bCopy, // Copy the pages?
- Point* pObjPos) // Insertion position of objects
+bool SdDrawDocument::InsertBookmark(
+ const std::vector<OUString> &rBookmarkList, // List of names of the bookmarks to be inserted
+ std::vector<OUString> &rExchangeList, // List of the names to be used
+ bool bLink, // Insert bookmarks as links?
+ bool bReplace, // Replace current default and notes pages?
+ sal_uInt16 nInsertPos, // Insertion position of pages
+ bool bNoDialogs, // Don't show dialogs
+ ::sd::DrawDocShell* pBookmarkDocSh, // If set, this is the source document
+ bool bCopy, // Copy the pages?
+ Point* pObjPos) // Insertion position of objects
{
- sal_Bool bOK = sal_True;
- sal_Bool bInsertPages = sal_False;
+ bool bOK = true;
+ bool bInsertPages = false;
if (rBookmarkList.empty())
{
// Insert all pages
- bInsertPages = sal_True;
+ bInsertPages = true;
}
else
{
@@ -304,28 +304,28 @@ sal_Bool SdDrawDocument::InsertBookmark(
pBookmarkDoc = mxBookmarkDocShRef->GetDoc();
}
else
- bOK = sal_False;
+ bOK = false;
std::vector<OUString>::const_iterator pIter;
for ( pIter = rBookmarkList.begin(); bOK && pIter != rBookmarkList.end() && !bInsertPages; ++pIter )
{
// Is there a page name in the bookmark list?
- sal_Bool bIsMasterPage;
+ bool bIsMasterPage;
if( pBookmarkDoc->GetPageByName( *pIter, bIsMasterPage ) != SDRPAGE_NOTFOUND )
{
// Found the page
- bInsertPages = sal_True;
+ bInsertPages = true;
}
}
}
- sal_Bool bCalcObjCount = !rExchangeList.empty();
+ bool bCalcObjCount = !rExchangeList.empty();
if ( bOK && bInsertPages )
{
// Insert all page bookmarks
bOK = InsertBookmarkAsPage(rBookmarkList, &rExchangeList, bLink, bReplace,
- nInsertPos, bNoDialogs, pBookmarkDocSh, bCopy, sal_True, sal_False);
+ nInsertPos, bNoDialogs, pBookmarkDocSh, bCopy, true, false);
}
if ( bOK && !rBookmarkList.empty() )
@@ -368,21 +368,21 @@ SfxStyleSheet *lcl_findStyle(SdStyleSheetVector& rStyles, const OUString& aStyle
}
-sal_Bool SdDrawDocument::InsertBookmarkAsPage(
+bool SdDrawDocument::InsertBookmarkAsPage(
const std::vector<OUString> &rBookmarkList,
std::vector<OUString> *pExchangeList, // List of names to be used
- sal_Bool bLink,
- sal_Bool bReplace,
+ bool bLink,
+ bool bReplace,
sal_uInt16 nInsertPos,
- sal_Bool bNoDialogs,
+ bool bNoDialogs,
::sd::DrawDocShell* pBookmarkDocSh,
- sal_Bool bCopy,
- sal_Bool bMergeMasterPages,
- sal_Bool bPreservePageNames)
+ bool bCopy,
+ bool bMergeMasterPages,
+ bool bPreservePageNames)
{
- sal_Bool bOK = sal_True;
- sal_Bool bContinue = sal_True;
- sal_Bool bScaleObjects = sal_False;
+ bool bOK = true;
+ bool bContinue = true;
+ bool bScaleObjects = false;
sal_uInt16 nReplacedStandardPages = 0;
SdDrawDocument* pBookmarkDoc = NULL;
@@ -404,7 +404,7 @@ sal_Bool SdDrawDocument::InsertBookmarkAsPage(
}
else
{
- return sal_False;
+ return false;
}
const sal_uInt16 nSdPageCount = GetSdPageCount(PK_STANDARD);
@@ -413,7 +413,7 @@ sal_Bool SdDrawDocument::InsertBookmarkAsPage(
if (nSdPageCount==0 || nBMSdPageCount==0 || nMPageCount==0)
{
- bContinue = bOK = sal_False;
+ bContinue = bOK = false;
return(bContinue);
}
@@ -445,7 +445,7 @@ sal_Bool SdDrawDocument::InsertBookmarkAsPage(
if( rBookmarkList.empty() )
bScaleObjects = pRefPage->IsScaleObjects();
else
- bScaleObjects = sal_True;
+ bScaleObjects = true;
}
else
{
@@ -491,7 +491,7 @@ sal_Bool SdDrawDocument::InsertBookmarkAsPage(
// When copying styles, also copy the master pages!
if( !aLayoutsToTransfer.empty() )
- bMergeMasterPages = sal_True;
+ bMergeMasterPages = true;
std::vector<OUString>::const_iterator pIter;
for ( pIter = aLayoutsToTransfer.begin(); pIter != aLayoutsToTransfer.end(); ++pIter )
@@ -551,7 +551,7 @@ sal_Bool SdDrawDocument::InsertBookmarkAsPage(
{
SdPage* pBMPage = pBookmarkDoc->GetSdPage(nBMSdPage, PK_STANDARD);
OUString sName(pBMPage->GetName());
- sal_Bool bIsMasterPage;
+ bool bIsMasterPage;
if (bLink)
{
@@ -613,7 +613,7 @@ sal_Bool SdDrawDocument::InsertBookmarkAsPage(
if (nInsertPos >= GetPageCount())
{
// Add pages to the end
- bReplace = sal_False;
+ bReplace = false;
nInsertPos = GetPageCount();
}
@@ -624,7 +624,7 @@ sal_Bool SdDrawDocument::InsertBookmarkAsPage(
for ( size_t nPos = 0, n = rBookmarkList.size(); nPos < n; ++nPos)
{
OUString aPgName(rBookmarkList[nPos]);
- sal_Bool bIsMasterPage;
+ bool bIsMasterPage;
sal_uInt16 nBMPage = pBookmarkDoc->GetPageByName( aPgName, bIsMasterPage );
if (nBMPage != SDRPAGE_NOTFOUND)
@@ -641,20 +641,20 @@ sal_Bool SdDrawDocument::InsertBookmarkAsPage(
if (pBMPage && pBMPage->GetPageKind()==PK_STANDARD && !pBMPage->IsMasterPage())
{
// It has to be a default page
- sal_Bool bMustRename = sal_False;
+ bool bMustRename = false;
// delay renaming *after* pages are copied (might destroy source otherwise)
// don't change name if source and dest model are the same!
// avoid renaming if replacing the same page
OUString aPgName(rBookmarkList[nPos]);
- sal_Bool bIsMasterPage;
+ bool bIsMasterPage;
sal_uInt16 nPageSameName = GetPageByName(aPgName, bIsMasterPage);
if( pBookmarkDoc != this &&
nPageSameName != SDRPAGE_NOTFOUND &&
( !bReplace ||
nPageSameName != nActualInsertPos ) )
{
- bMustRename = sal_True;
+ bMustRename = true;
}
SdPage* pBookmarkPage = pBMPage;
@@ -850,7 +850,7 @@ sal_Bool SdDrawDocument::InsertBookmarkAsPage(
if (bScaleObjects)
{
Rectangle aBorderRect(nLeft, nUpper, nRight, nLower);
- pRefPage->ScaleObjects(aSize, aBorderRect, sal_True);
+ pRefPage->ScaleObjects(aSize, aBorderRect, true);
}
pRefPage->SetSize(aSize);
pRefPage->SetBorder(nLeft, nUpper, nRight, nLower);
@@ -869,7 +869,7 @@ sal_Bool SdDrawDocument::InsertBookmarkAsPage(
if (bScaleObjects)
{
Rectangle aBorderRect(nNLeft, nNUpper, nNRight, nNLower);
- pRefPage->ScaleObjects(aNSize, aBorderRect, sal_True);
+ pRefPage->ScaleObjects(aNSize, aBorderRect, true);
}
pRefPage->SetSize(aNSize);
@@ -892,7 +892,7 @@ sal_Bool SdDrawDocument::InsertBookmarkAsPage(
if (bScaleObjects)
{
Rectangle aBorderRect(nLeft, nUpper, nRight, nLower);
- pRefPage->ScaleObjects(aSize, aBorderRect, sal_True);
+ pRefPage->ScaleObjects(aSize, aBorderRect, true);
}
pRefPage->SetSize(aSize);
pRefPage->SetBorder(nLeft, nUpper, nRight, nLower);
@@ -903,7 +903,7 @@ sal_Bool SdDrawDocument::InsertBookmarkAsPage(
if (bScaleObjects)
{
Rectangle aBorderRect(nNLeft, nNUpper, nNRight, nNLower);
- pRefPage->ScaleObjects(aNSize, aBorderRect, sal_True);
+ pRefPage->ScaleObjects(aNSize, aBorderRect, true);
}
pRefPage->SetSize(aNSize);
pRefPage->SetBorder(nNLeft, nNUpper, nNRight, nNLower);
@@ -916,7 +916,7 @@ sal_Bool SdDrawDocument::InsertBookmarkAsPage(
}
// Make absolutely sure no double masterpages are there
- RemoveUnnecessaryMasterPages(NULL, sal_True, sal_True);
+ RemoveUnnecessaryMasterPages(NULL, true, true);
// Rename object styles if necessary
if(!aRenameStr.isEmpty())
@@ -964,15 +964,16 @@ sal_Bool SdDrawDocument::InsertBookmarkAsPage(
}
// Inserts a bookmark as an object
-sal_Bool SdDrawDocument::InsertBookmarkAsObject(
+bool SdDrawDocument::InsertBookmarkAsObject(
const std::vector<OUString> &rBookmarkList,
const std::vector<OUString> &rExchangeList, // List of names to use
- sal_Bool /* bLink */,
+ bool /* bLink */,
::sd::DrawDocShell* pBookmarkDocSh,
- Point* pObjPos, bool bCalcObjCount)
+ Point* pObjPos,
+ bool bCalcObjCount)
{
- sal_Bool bOK = sal_True;
- sal_Bool bOLEObjFound = sal_False;
+ bool bOK = true;
+ bool bOLEObjFound = false;
::sd::View* pBMView = NULL;
SdDrawDocument* pBookmarkDoc = NULL;
@@ -987,7 +988,7 @@ sal_Bool SdDrawDocument::InsertBookmarkAsObject(
}
else
{
- return sal_False;
+ return false;
}
if (rBookmarkList.empty())
@@ -1013,7 +1014,7 @@ sal_Bool SdDrawDocument::InsertBookmarkAsObject(
if (pObj->GetObjInventor() == SdrInventor &&
pObj->GetObjIdentifier() == OBJ_OLE2)
{
- bOLEObjFound = sal_True;
+ bOLEObjFound = true;
}
if (!pBMView)
@@ -1164,7 +1165,7 @@ void SdDrawDocument::SetAllocDocSh(bool bAlloc)
}
// Return list of CustomShows (create it, too, if necessary)
-SdCustomShowList* SdDrawDocument::GetCustomShowList(sal_Bool bCreate)
+SdCustomShowList* SdDrawDocument::GetCustomShowList(bool bCreate)
{
if (!mpCustomShowList && bCreate)
{
@@ -1175,13 +1176,13 @@ SdCustomShowList* SdDrawDocument::GetCustomShowList(sal_Bool bCreate)
}
// Remove unused master pages and layouts
-void SdDrawDocument::RemoveUnnecessaryMasterPages(SdPage* pMasterPage, sal_Bool bOnlyDuplicatePages, sal_Bool bUndo)
+void SdDrawDocument::RemoveUnnecessaryMasterPages(SdPage* pMasterPage, bool bOnlyDuplicatePages, bool bUndo)
{
::sd::View* pView = NULL;
::svl::IUndoManager* pUndoMgr = NULL;
if( bUndo && !IsUndoEnabled() )
- bUndo = sal_False;
+ bUndo = false;
if (mpDocSh)
{
@@ -1222,13 +1223,13 @@ void SdDrawDocument::RemoveUnnecessaryMasterPages(SdPage* pMasterPage, sal_Bool
pNotesMaster )
{
// Do not delete master pages that have their precious flag set
- sal_Bool bDeleteMaster = !pMaster->IsPrecious();
+ bool bDeleteMaster = !pMaster->IsPrecious();
OUString aLayoutName = pMaster->GetLayoutName();
if(bOnlyDuplicatePages )
{
// remove only duplicate pages
- bDeleteMaster = sal_False;
+ bDeleteMaster = false;
for (sal_uInt16 i = 0; i < GetMasterSdPageCount( PK_STANDARD ); i++)
{
SdPage* pMPg = (SdPage*) GetMasterSdPage( i, PK_STANDARD );
@@ -1236,7 +1237,7 @@ void SdDrawDocument::RemoveUnnecessaryMasterPages(SdPage* pMasterPage, sal_Bool
pMPg->GetLayoutName() == aLayoutName )
{
// duplicate page found -> remove it
- bDeleteMaster = sal_True;
+ bDeleteMaster = true;
}
}
}
@@ -1281,7 +1282,7 @@ void SdDrawDocument::RemoveUnnecessaryMasterPages(SdPage* pMasterPage, sal_Bool
EndUndo(); // do this here already, so Joe's actions happen _between_ our own
// Delete old, unused layout stylesheets
- sal_Bool bDeleteOldStyleSheets = sal_True;
+ bool bDeleteOldStyleSheets = true;
for ( sal_uInt16 nMPg = 0;
nMPg < GetMasterPageCount() && bDeleteOldStyleSheets;
nMPg++ )
@@ -1289,7 +1290,7 @@ void SdDrawDocument::RemoveUnnecessaryMasterPages(SdPage* pMasterPage, sal_Bool
SdPage* pMPg = (SdPage*) GetMasterPage(nMPg);
if (pMPg->GetLayoutName() == aLayoutName)
{
- bDeleteOldStyleSheets = sal_False;
+ bDeleteOldStyleSheets = false;
}
}
@@ -1389,8 +1390,8 @@ OUString createNewMasterPageLayoutName(const SdDrawDocument& rDoc)
void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum,
const OUString& rLayoutName,
SdDrawDocument* pSourceDoc,
- sal_Bool bMaster,
- sal_Bool bCheckMasters)
+ bool bMaster,
+ bool bCheckMasters)
{
::svl::IUndoManager* pUndoMgr = NULL;
@@ -1423,7 +1424,7 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum,
if (pSourceDoc)
{
std::vector<StyleReplaceData> aReplList; // List of replaced stylesheets
- sal_Bool bLayoutReloaded = sal_False; // Wurde ex. Layout wieder geladen?
+ bool bLayoutReloaded = false; // Wurde ex. Layout wieder geladen?
// LayoutName, Page and Notes page
if (rLayoutName.isEmpty())
@@ -1528,7 +1529,7 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum,
SdPage* pCheckMaster = (SdPage*)GetMasterPage(nMPage);
if( pCheckMaster->GetName() == aTargetNewLayoutName )
{
- bLayoutReloaded = sal_True;
+ bLayoutReloaded = true;
break;
}
}
@@ -1564,7 +1565,7 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum,
{
// A stylesheet of the same name already exists -> overwrite contents
#ifdef DBG_UTIL
- sal_Bool bTest =
+ bool bTest =
#endif
pMySheet->SetName(pHisSheet->GetName());
DBG_ASSERT(bTest, "Renaming StyleSheet failed.");
@@ -1739,7 +1740,7 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum,
(this,
( pPage && pPage->IsMasterPage() ) ? aLayoutName : aOldLayoutName,
aLayoutName,
- eAutoLayout, eAutoLayout, sal_False, *pIter);
+ eAutoLayout, eAutoLayout, false, *pIter);
pUndoMgr->AddUndoAction(pPLUndoAction);
}
(*pIter)->SetPresentationLayout(aLayoutName);
@@ -1754,7 +1755,7 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum,
rOldMaster.GetUppBorder(),
rOldMaster.GetRgtBorder(),
rOldMaster.GetLwrBorder());
- pMaster->ScaleObjects(aSize, aBorderRect, sal_True);
+ pMaster->ScaleObjects(aSize, aBorderRect, true);
pMaster->SetSize(aSize);
pMaster->SetBorder(rOldMaster.GetLftBorder(),
rOldMaster.GetUppBorder(),
@@ -1768,7 +1769,7 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum,
rOldNotesMaster.GetUppBorder(),
rOldNotesMaster.GetRgtBorder(),
rOldNotesMaster.GetLwrBorder());
- pNotesMaster->ScaleObjects(aSize, aNotesBorderRect, sal_True);
+ pNotesMaster->ScaleObjects(aSize, aNotesBorderRect, true);
pNotesMaster->SetSize(aSize);
pNotesMaster->SetBorder(rOldNotesMaster.GetLftBorder(),
rOldNotesMaster.GetUppBorder(),
@@ -1871,7 +1872,7 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum,
SdPresentationLayoutUndoAction * pPLUndoAction =
new SdPresentationLayoutUndoAction
(this, aOldLayoutName, aName,
- eOldAutoLayout, eNewAutoLayout, sal_True,
+ eOldAutoLayout, eNewAutoLayout, true,
*pIter);
pUndoMgr->AddUndoAction(pPLUndoAction);
}
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index be6a43b..716f008 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -737,14 +737,14 @@ void SdDrawDocument::StopOnlineSpelling()
}
// Start OnlineSpelling in the background
-void SdDrawDocument::StartOnlineSpelling(sal_Bool bForceSpelling)
+void SdDrawDocument::StartOnlineSpelling(bool bForceSpelling)
{
if (mbOnlineSpell && (bForceSpelling || mbInitialOnlineSpellingEnabled) &&
mpDocSh && !mpDocSh->IsReadOnly() )
{
StopOnlineSpelling();
- ::sd::Outliner* pOutl = GetInternalOutliner(sal_True);
+ ::sd::Outliner* pOutl = GetInternalOutliner(true);
Reference< XSpellChecker1 > xSpellChecker( LinguMgr::GetSpellChecker() );
if ( xSpellChecker.is() )
@@ -803,14 +803,14 @@ void SdDrawDocument::FillOnlineSpellingList(SdPage* pPage)
SdrObjListIter aGroupIter(*((SdrObjGroup*)pObj)->GetSubList(),
IM_DEEPNOGROUPS);
- sal_Bool bSubTextObjFound = sal_False;
+ bool bSubTextObjFound = false;
while (aGroupIter.IsMore() && !bSubTextObjFound)
{
if (aGroupIter.Next()->GetOutlinerParaObject())
{
// Found a text object in a group object
- bSubTextObjFound = sal_True;
+ bSubTextObjFound = true;
}
}
@@ -883,7 +883,7 @@ void SdDrawDocument::SpellObject(SdrTextObj* pObj)
if (pObj && pObj->GetOutlinerParaObject() /* && pObj != pView->GetTextEditObject() */)
{
mbHasOnlineSpellErrors = false;
- ::sd::Outliner* pOutl = GetInternalOutliner(sal_True);
+ ::sd::Outliner* pOutl = GetInternalOutliner(true);
pOutl->SetUpdateMode(true);
Link aEvtHdl = pOutl->GetStatusEventHdl();
pOutl->SetStatusEventHdl(LINK(this, SdDrawDocument, OnlineSpellEventHdl));
@@ -982,7 +982,7 @@ void SdDrawDocument::ImpOnlineSpellCallback(SpellCallbackInfo* pInfo, SdrObject*
{
if(pObj && pOutl && pObj->ISA(SdrTextObj))
{
- sal_Bool bModified(IsChanged());
+ bool bModified(IsChanged());
((SdrTextObj*)pObj)->SetOutlinerParaObject(pOutl->CreateParaObject());
SetChanged(bModified);
pObj->BroadcastObjectChange();
@@ -1042,7 +1042,7 @@ void SdDrawDocument::RestoreLayerNames()
OUString SdDrawDocument::CreatePageNumValue(sal_uInt16 nNum) const
{
OUString aPageNumValue;
- sal_Bool bUpper = sal_False;
+ bool bUpper = false;
switch (mePageNumType)
{
@@ -1053,7 +1053,7 @@ OUString SdDrawDocument::CreatePageNumValue(sal_uInt16 nNum) const
aPageNumValue += OUString( (sal_Unicode)(char)((nNum - 1) % 26 + 'a') );
break;
case SVX_ROMAN_UPPER:
- bUpper = sal_True;
+ bUpper = true;
case SVX_ROMAN_LOWER:
aPageNumValue += SvxNumberFormat::CreateRomanString(nNum, bUpper);
break;
diff --git a/sd/source/core/pglink.cxx b/sd/source/core/pglink.cxx
index 81318d1..e7f1c71 100644
--- a/sd/source/core/pglink.cxx
+++ b/sd/source/core/pglink.cxx
@@ -95,20 +95,20 @@ SdPageLink::~SdPageLink()
std::vector<OUString> aBookmarkList;
aBookmarkList.push_back(aBookmarkName);
sal_uInt16 nInsertPos = pPage->GetPageNum();
- sal_Bool bLink = sal_True;
- sal_Bool bReplace = sal_True;
- sal_Bool bNoDialogs = sal_False;
- sal_Bool bCopy = sal_False;
+ bool bLink = true;
+ bool bReplace = true;
+ bool bNoDialogs = false;
+ bool bCopy = false;
if( pDoc->pDocLockedInsertingLinks )
{
// resolving links while loading pDoc
- bNoDialogs = sal_True;
- bCopy = sal_True;
+ bNoDialogs = true;
+ bCopy = true;
}
pDoc->InsertBookmarkAsPage(aBookmarkList, NULL, bLink, bReplace,
- nInsertPos, bNoDialogs, NULL, bCopy, sal_True, sal_True);
+ nInsertPos, bNoDialogs, NULL, bCopy, true, true);
if( !pDoc->pDocLockedInsertingLinks )
pDoc->CloseBookmarkDoc();
diff --git a/sd/source/core/sdiocmpt.cxx b/sd/source/core/sdiocmpt.cxx
index eac66af..09d116e 100644
--- a/sd/source/core/sdiocmpt.cxx
+++ b/sd/source/core/sdiocmpt.cxx
@@ -26,7 +26,7 @@ old_SdrDownCompat::old_SdrDownCompat(SvStream& rNewStream, sal_uInt16 nNewMode)
nSubRecSiz(0),
nSubRecPos(0),
nMode(nNewMode),
- bOpen(sal_False)
+ bOpen(false)
{
OpenSubRecord();
}
@@ -63,7 +63,7 @@ void old_SdrDownCompat::OpenSubRecord()
Write();
}
- bOpen = sal_True;
+ bOpen = true;
}
void old_SdrDownCompat::CloseSubRecord()
@@ -89,7 +89,7 @@ void old_SdrDownCompat::CloseSubRecord()
rStream.Seek(nAktPos);
}
- bOpen = sal_False;
+ bOpen = false;
}
/*************************************************************************
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 4393771..e2f782a 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -90,27 +90,27 @@ TYPEINIT2( SdPage, FmFormPage, SdrObjUserCall );
|*
\************************************************************************/
-SdPage::SdPage(SdDrawDocument& rNewDoc, sal_Bool bMasterPage)
+SdPage::SdPage(SdDrawDocument& rNewDoc, bool bMasterPage)
: FmFormPage(rNewDoc, bMasterPage)
, SdrObjUserCall()
, mePageKind(PK_STANDARD)
, meAutoLayout(AUTOLAYOUT_NONE)
-, mbSelected(sal_False)
+, mbSelected(false)
, mePresChange(PRESCHANGE_MANUAL)
, mfTime(1.0)
-, mbSoundOn(sal_False)
-, mbExcluded(sal_False)
+, mbSoundOn(false)
+, mbExcluded(false)
, mbLoopSound(false)
, mbStopSound(false)
-, mbScaleObjects(sal_True)
-, mbBackgroundFullSize( sal_False )
+, mbScaleObjects(true)
+, mbBackgroundFullSize( false )
, meCharSet(osl_getThreadTextEncoding())
, mnPaperBin(PAPERBIN_PRINTER_SETTINGS)
, mpPageLink(NULL)
, mpItems(NULL)
, mnTransitionType(0)
, mnTransitionSubtype(0)
-, mbTransitionDirection(sal_True)
+, mbTransitionDirection(true)
, mnTransitionFadeColor(0)
, mfTransitionDuration(2.0)
, mbIsPrecious(true)
@@ -242,7 +242,7 @@ void SdPage::EnsureMasterPageDefaultBackground()
/** creates a presentation object with the given PresObjKind on this page. A user call will be set
*/
-SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, sal_Bool bVertical, const Rectangle& rRect, sal_Bool /* bInsert */ )
+SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, bool bVertical, const Rectangle& rRect, bool /* bInsert */ )
{
::svl::IUndoManager* pUndoManager = pModel ? static_cast<SdDrawDocument*>(pModel)->GetUndoManager() : 0;
const bool bUndo = pUndoManager && pUndoManager->IsInListAction() && IsInserted();
@@ -751,7 +751,7 @@ void SdPage::Changed(const SdrObject& rObj, SdrUserCallType eType, const Rectang
|*
\************************************************************************/
-void SdPage::CreateTitleAndLayout(sal_Bool bInit, sal_Bool bCreate )
+void SdPage::CreateTitleAndLayout(bool bInit, bool bCreate )
{
::svl::IUndoManager* pUndoManager = pModel ? static_cast<SdDrawDocument*>(pModel)->GetUndoManager() : 0;
const bool bUndo = pUndoManager && pUndoManager->IsInListAction() && IsInserted();
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list