summaryrefslogtreecommitdiff
path: root/sd/inc
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-04-24 10:52:02 +0200
committerNoel Grandin <noel@peralex.com>2014-04-24 10:53:17 +0200
commitb45a12c37d2b671e54404afda5dee1b0947bd3ed (patch)
tree484fa50da87e5434970c774527a77e0dd079e1b9 /sd/inc
parente4e654e40575300eaab429a6b94348bf43b9d7ce (diff)
sd: sal_Bool->bool
Change-Id: I3172a42f6b6abe434ffe0475d1201ff50b6c06ea
Diffstat (limited to 'sd/inc')
-rw-r--r--sd/inc/CustomAnimationEffect.hxx30
-rw-r--r--sd/inc/EffectMigration.hxx10
-rw-r--r--sd/inc/Outliner.hxx4
-rw-r--r--sd/inc/TransitionPreset.hxx4
-rw-r--r--sd/inc/anminfo.hxx16
-rw-r--r--sd/inc/drawdoc.hxx106
-rw-r--r--sd/inc/sdabstdlg.hxx26
-rw-r--r--sd/inc/sdattr.hxx8
-rw-r--r--sd/inc/sdcgmfilter.hxx6
-rw-r--r--sd/inc/sdfilter.hxx14
-rw-r--r--sd/inc/sdgrffilter.hxx4
-rw-r--r--sd/inc/sdhtmlfilter.hxx4
-rw-r--r--sd/inc/sdiocmpt.hxx2
-rw-r--r--sd/inc/sdmod.hxx6
-rw-r--r--sd/inc/sdpage.hxx54
-rw-r--r--sd/inc/sdpptwrp.hxx6
-rw-r--r--sd/inc/sdxmlwrp.hxx6
-rw-r--r--sd/inc/stlpool.hxx2
-rw-r--r--sd/inc/stlsheet.hxx2
19 files changed, 155 insertions, 155 deletions
diff --git a/sd/inc/CustomAnimationEffect.hxx b/sd/inc/CustomAnimationEffect.hxx
index 324d3a0647cc..215817789310 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 62c6a355ce88..f12290167ca7 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 8ced18d5e05a..df2d38ab75c4 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 35476da02c8d..a15b1d51df6f 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 794b2d19a4d7..da0e9377af7e 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 180caf5466de..bf59fc060e35 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 6953f4527952..a3858ea12347 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 f405dc6f6e7e..eae0bd5785e1 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 ab79181c829f..144f0a03a3cb 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 cd384eebbbd3..0bd9a9d29cc7 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 83c18b1fbf0d..d4d87c4b8fb4 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 449067e1a5e0..2eb6eb0e4440 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 d9c786d3ae8c..7775d1757b24 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 5a5450d9c3c6..0b695f0fdb3f 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 80d40737c1ec..4cce90698c09 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 89e71fc50ddb..01432bd0df70 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 dfa7dc9e1989..8945ab1fac78 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 d53306786c72..31cb81438cd0 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 2db8d3dc59af..90ce7eb28e81 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;