diff options
| author | Noel Grandin <noel@peralex.com> | 2014-04-24 10:52:02 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-04-24 10:53:17 +0200 |
| commit | b45a12c37d2b671e54404afda5dee1b0947bd3ed (patch) | |
| tree | 484fa50da87e5434970c774527a77e0dd079e1b9 | |
| parent | e4e654e40575300eaab429a6b94348bf43b9d7ce (diff) | |
sd: sal_Bool->bool
Change-Id: I3172a42f6b6abe434ffe0475d1201ff50b6c06ea
304 files changed, 3653 insertions, 3658 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; diff --git a/sd/qa/unit/uimpress.cxx b/sd/qa/unit/uimpress.cxx index d5f7cb1b1552..f1704a6d5699 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 801eed4a5e87..53356febc11f 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 951a6dd05402..2c1e94010dd6 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 5c2bc128e712..e6d3ad81ce57 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 773a50aec729..26b3a96e9d71 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 f160910ede1a..f0ae560c6f72 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 d75ed4f953c2..1de1f33b94e4 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 817577842adc..3d3b8e9c57f2 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 272db5d30237..d423352d4c06 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 be6a43b9f52c..716f008a9180 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 81318d193fe8..e7f1c71b172f 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 eac66af774dd..09d116e0457e 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 439377134296..e2f782ad8fdb 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(); @@ -806,7 +806,7 @@ void SdPage::CreateTitleAndLayout(sal_Bool bInit, sal_Bool bCreate ) while( iter != aAreas.end() ) { - SdrPageObj* pPageObj = static_cast<SdrPageObj*>(pMasterPage->CreatePresObj(PRESOBJ_HANDOUT, sal_False, (*iter++), sal_True) ); + SdrPageObj* pPageObj = static_cast<SdrPageObj*>(pMasterPage->CreatePresObj(PRESOBJ_HANDOUT, false, (*iter++), true) ); // #i105146# We want no content to be displayed for PK_HANDOUT, // so just never set a page as content pPageObj->SetReferencedPage(0L); @@ -938,17 +938,17 @@ SdrObject* SdPage::CreateDefaultPresObj(PresObjKind eObjKind, bool bInsert) if( eObjKind == PRESOBJ_TITLE ) { Rectangle aTitleRect( GetTitleRect() ); - return CreatePresObj(PRESOBJ_TITLE, sal_False, aTitleRect, bInsert); + return CreatePresObj(PRESOBJ_TITLE, false, aTitleRect, bInsert); } else if( eObjKind == PRESOBJ_OUTLINE ) { Rectangle aLayoutRect( GetLayoutRect() ); - return CreatePresObj( PRESOBJ_OUTLINE, sal_False, aLayoutRect, bInsert); + return CreatePresObj( PRESOBJ_OUTLINE, false, aLayoutRect, bInsert); } else if( eObjKind == PRESOBJ_NOTES ) { Rectangle aLayoutRect( GetLayoutRect() ); - return CreatePresObj( PRESOBJ_NOTES, sal_False, aLayoutRect, bInsert); + return CreatePresObj( PRESOBJ_NOTES, false, aLayoutRect, bInsert); } else if( (eObjKind == PRESOBJ_FOOTER) || (eObjKind == PRESOBJ_DATETIME) || (eObjKind == PRESOBJ_SLIDENUMBER) || (eObjKind == PRESOBJ_HEADER ) ) { @@ -981,7 +981,7 @@ SdrObject* SdPage::CreateDefaultPresObj(PresObjKind eObjKind, bool bInsert) else { Rectangle aRect( aPos, aSize ); - return CreatePresObj( eObjKind, sal_False, aRect, bInsert ); + return CreatePresObj( eObjKind, false, aRect, bInsert ); } } else @@ -1008,7 +1008,7 @@ SdrObject* SdPage::CreateDefaultPresObj(PresObjKind eObjKind, bool bInsert) aPos.Y() = aPosition.Y() + long( aPageSize.Height() - NOTES_HEADER_FOOTER_HEIGHT ); Rectangle aRect( aPos, aSize ); - return CreatePresObj( eObjKind, sal_False, aRect, bInsert ); + return CreatePresObj( eObjKind, false, aRect, bInsert ); } } else @@ -1554,7 +1554,7 @@ void findAutoLayoutShapesImpl( SdPage& rPage, const LayoutDescriptor& rDescripto } } -void SdPage::SetAutoLayout(AutoLayout eLayout, sal_Bool bInit, sal_Bool bCreate ) +void SdPage::SetAutoLayout(AutoLayout eLayout, bool bInit, bool bCreate ) { sd::ScopeLockGuard aGuard( maLockAutoLayoutArrangement ); @@ -1775,7 +1775,7 @@ void SdPage::SetLwrBorder(sal_Int32 nBorder) |* \************************************************************************/ -void SdPage::SetBackgroundFullSize( sal_Bool bIn ) +void SdPage::SetBackgroundFullSize( bool bIn ) { if( bIn != mbBackgroundFullSize ) { @@ -1793,7 +1793,7 @@ void SdPage::SetBackgroundFullSize( sal_Bool bIn ) |* \************************************************************************/ -void SdPage::ScaleObjects(const Size& rNewPageSize, const Rectangle& rNewBorderRect, sal_Bool bScaleAllObj) +void SdPage::ScaleObjects(const Size& rNewPageSize, const Rectangle& rNewBorderRect, bool bScaleAllObj) { sd::ScopeLockGuard aGuard( maLockAutoLayoutArrangement ); @@ -1855,7 +1855,7 @@ void SdPage::ScaleObjects(const Size& rNewPageSize, const Rectangle& rNewBorderR for (sal_uLong nObj = 0; nObj < nObjCnt; nObj++) { - sal_Bool bIsPresObjOnMaster = sal_False; + bool bIsPresObjOnMaster = false; // all Objects pObj = GetObj(nObj); @@ -1863,7 +1863,7 @@ void SdPage::ScaleObjects(const Size& rNewPageSize, const Rectangle& rNewBorderR if (mbMaster && IsPresObj(pObj)) { // There is a presentation object on the master page - bIsPresObjOnMaster = sal_True; + bIsPresObjOnMaster = true; } if (pObj) @@ -1966,7 +1966,7 @@ void SdPage::ScaleObjects(const Size& rNewPageSize, const Rectangle& rNewBorderR } // adjust bullet - ((SdStyleSheet*) pOutlineSheet)->AdjustToFontHeight(aTempSet, sal_False); + ((SdStyleSheet*) pOutlineSheet)->AdjustToFontHeight(aTempSet, false); // Special treatment: reset the INVALIDS to // NULL pointer (otherwise we have INVALID's @@ -2077,7 +2077,7 @@ SdrObject* convertPresentationObjectImpl( SdPage& rPage, SdrObject* pSourceObj, if(pOutlParaObj) { // assign text - ::sd::Outliner* pOutl = pModel->GetInternalOutliner( sal_True ); + ::sd::Outliner* pOutl = pModel->GetInternalOutliner( true ); pOutl->Clear(); pOutl->SetText( *pOutlParaObj ); pOutlParaObj = pOutl->CreateParaObject(); @@ -2382,7 +2382,7 @@ void SdPage::SetObjText(SdrTextObj* pObj, SdrOutliner* pOutliner, PresObjKind eO sal_uInt16 nOutlMode = pOutl->GetMode(); Size aPaperSize = pOutl->GetPaperSize(); - sal_Bool bUpdateMode = pOutl->GetUpdateMode(); + bool bUpdateMode = pOutl->GetUpdateMode(); pOutl->SetUpdateMode(false); pOutl->SetParaAttribs( 0, pOutl->GetEmptyItemSet() ); @@ -2872,7 +2872,7 @@ bool SdPage::RestoreDefaultText( SdrObject* pObj ) if (!aString.isEmpty()) { - sal_Bool bVertical = sal_False; + bool bVertical = false; OutlinerParaObject* pOldPara = pTextObj->GetOutlinerParaObject(); if( pOldPara ) bVertical = pOldPara->IsVertical(); // is old para object vertical? diff --git a/sd/source/core/sdpage2.cxx b/sd/source/core/sdpage2.cxx index 738f745c8b07..d76d29a3fb77 100644 --- a/sd/source/core/sdpage2.cxx +++ b/sd/source/core/sdpage2.cxx @@ -76,9 +76,9 @@ using namespace ::com::sun::star::office; \************************************************************************/ void SdPage::SetPresentationLayout(const OUString& rLayoutName, - sal_Bool bReplaceStyleSheets, - sal_Bool bSetMasterPage, - sal_Bool bReverseOrder) + bool bReplaceStyleSheets, + bool bSetMasterPage, + bool bReverseOrder) { /********************************************************************* |* Name of the layout of the page @@ -388,7 +388,7 @@ SdPage::SdPage(const SdPage& rSrcPage) InsertPresObj(GetObj(pObj->GetOrdNum()), rSrcPage.GetPresObjKind(pObj)); } - mbSelected = sal_False; + mbSelected = false; mnTransitionType = rSrcPage.mnTransitionType; mnTransitionSubtype = rSrcPage.mnTransitionSubtype; mbTransitionDirection = rSrcPage.mbTransitionDirection; @@ -483,7 +483,7 @@ SfxItemSet* SdPage::getOrCreateItems() } -sal_Bool SdPage::setAlienAttributes( const com::sun::star::uno::Any& rAttributes ) +bool SdPage::setAlienAttributes( const com::sun::star::uno::Any& rAttributes ) { SfxItemSet* pSet = getOrCreateItems(); @@ -491,10 +491,10 @@ sal_Bool SdPage::setAlienAttributes( const com::sun::star::uno::Any& rAttributes if( aAlienAttributes.PutValue( rAttributes, 0 ) ) { pSet->Put( aAlienAttributes ); - return sal_True; + return true; } - return sal_False; + return false; } void SdPage::getAlienAttributes( com::sun::star::uno::Any& rAttributes ) @@ -550,12 +550,12 @@ void SdPage::setTransitionSubtype ( sal_Int16 nTransitionSubtype ) ActionChanged(); } -sal_Bool SdPage::getTransitionDirection (void) const +bool SdPage::getTransitionDirection (void) const { return mbTransitionDirection; } -void SdPage::setTransitionDirection ( sal_Bool bTransitionbDirection ) +void SdPage::setTransitionDirection ( bool bTransitionbDirection ) { mbTransitionDirection = bTransitionbDirection; ActionChanged(); diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx index 19f3031993cb..45133f1c8cff 100644 --- a/sd/source/core/stlpool.cxx +++ b/sd/source/core/stlpool.cxx @@ -187,12 +187,12 @@ void SdStyleSheetPool::CreateOutlineSheetList (const OUString& rLayoutName, std: |* \************************************************************************/ -void SdStyleSheetPool::CreateLayoutStyleSheets(const OUString& rLayoutName, sal_Bool bCheck /*= sal_False*/ ) +void SdStyleSheetPool::CreateLayoutStyleSheets(const OUString& rLayoutName, bool bCheck /*= sal_False*/ ) { const sal_uInt16 nUsedMask = SFXSTYLEBIT_ALL & ~SFXSTYLEBIT_USERDEF; (void)bCheck; - sal_Bool bCreated = sal_False; + bool bCreated = false; SfxStyleSheetBase* pSheet = NULL; @@ -230,7 +230,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const OUString& rLayoutName, sal_ if (!Find(aLevelName, SD_STYLE_FAMILY_MASTERPAGE)) { - bCreated = sal_True; + bCreated = true; pSheet = &Make(aLevelName, SD_STYLE_FAMILY_MASTERPAGE,nUsedMask); pSheet->SetHelpId( aHelpFile, HID_PSEUDOSHEET_OUTLINE + nLevel ); @@ -347,7 +347,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const OUString& rLayoutName, sal_ if (!Find(aName, SD_STYLE_FAMILY_MASTERPAGE)) { - bCreated = sal_True; + bCreated = true; pSheet = &Make(aName, SD_STYLE_FAMILY_MASTERPAGE,nUsedMask); pSheet->SetHelpId( aHelpFile, HID_PSEUDOSHEET_TITLE ); @@ -392,7 +392,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const OUString& rLayoutName, sal_ if (!Find(aName, SD_STYLE_FAMILY_MASTERPAGE)) { - bCreated = sal_True; + bCreated = true; pSheet = &Make(aName, SD_STYLE_FAMILY_MASTERPAGE,nUsedMask); pSheet->SetHelpId( aHelpFile, HID_PSEUDOSHEET_SUBTITLE ); @@ -440,7 +440,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const OUString& rLayoutName, sal_ if (!Find(aName, SD_STYLE_FAMILY_MASTERPAGE)) { - bCreated = sal_True; + bCreated = true; pSheet = &Make(aName, SD_STYLE_FAMILY_MASTERPAGE,nUsedMask); pSheet->SetHelpId( aHelpFile, HID_PSEUDOSHEET_NOTES ); @@ -484,7 +484,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const OUString& rLayoutName, sal_ if (!Find(aName, SD_STYLE_FAMILY_MASTERPAGE)) { - bCreated = sal_True; + bCreated = true; pSheet = &Make(aName, SD_STYLE_FAMILY_MASTERPAGE,nUsedMask); pSheet->SetHelpId( aHelpFile, HID_PSEUDOSHEET_BACKGROUNDOBJECTS ); @@ -506,7 +506,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const OUString& rLayoutName, sal_ if (!Find(aName, SD_STYLE_FAMILY_MASTERPAGE)) { - bCreated = sal_True; + bCreated = true; pSheet = &Make(aName, SD_STYLE_FAMILY_MASTERPAGE,nUsedMask); pSheet->SetHelpId( aHelpFile, HID_PSEUDOSHEET_BACKGROUND ); @@ -961,7 +961,7 @@ void SdStyleSheetPool::UpdateStdNames() sal_uLong nHelpId = pStyle->GetHelpId( aHelpFile ); SfxStyleFamily eFam = pStyle->GetFamily(); - sal_Bool bHelpKnown = sal_True; + bool bHelpKnown = true; OUString aNewName; sal_uInt16 nNameId = 0; switch( nHelpId ) @@ -1007,7 +1007,7 @@ void SdStyleSheetPool::UpdateStdNames() default: // 0 or wrong (old) HelpId - bHelpKnown = sal_False; + bHelpKnown = false; } if( bHelpKnown ) { diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx index 8ee3a6d925d2..7dd6df603c86 100644 --- a/sd/source/core/stlsheet.cxx +++ b/sd/source/core/stlsheet.cxx @@ -553,7 +553,7 @@ void SdStyleSheet::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) * @param bOnlyMissingItems If sal_True, only not set items are completed. With * sal_False, are items are overwritten. */ -void SdStyleSheet::AdjustToFontHeight(SfxItemSet& rSet, sal_Bool bOnlyMissingItems) +void SdStyleSheet::AdjustToFontHeight(SfxItemSet& rSet, bool bOnlyMissingItems) { /* If not explicit set, adjust bullet width and text indent to new font height. */ @@ -1022,7 +1022,7 @@ void SAL_CALL SdStyleSheet::setPropertyValue( const OUString& aPropertyName, con { if( pEntry->nWID == WID_STYLE_HIDDEN ) { - sal_Bool bValue = sal_False; + bool bValue = false; if ( aValue >>= bValue ) SetHidden( bValue ); return; diff --git a/sd/source/core/undo/undoobjects.cxx b/sd/source/core/undo/undoobjects.cxx index 9f1ab74db1ce..ec2989da1e63 100644 --- a/sd/source/core/undo/undoobjects.cxx +++ b/sd/source/core/undo/undoobjects.cxx @@ -285,7 +285,7 @@ void UndoAutoLayoutPosAndSize::Redo() { SdPage* pPage = static_cast< SdPage* >( mxPage.get() ); if( pPage ) - pPage->SetAutoLayout( pPage->GetAutoLayout(), sal_False, sal_False ); + pPage->SetAutoLayout( pPage->GetAutoLayout(), false, false ); } UndoGeoObject::UndoGeoObject( SdrObject& rNewObj ) diff --git a/sd/source/core/undoanim.cxx b/sd/source/core/undoanim.cxx index 8dad60b441f6..4c7de1454a8c 100644 --- a/sd/source/core/undoanim.cxx +++ b/sd/source/core/undoanim.cxx @@ -192,7 +192,7 @@ struct UndoTransitionImpl sal_Int16 mnNewTransitionType; sal_Int16 mnNewTransitionSubtype; - sal_Bool mbNewTransitionDirection; + bool mbNewTransitionDirection; sal_Int32 mnNewTransitionFadeColor; double mfNewTransitionDuration; OUString maNewSoundFile; @@ -202,7 +202,7 @@ struct UndoTransitionImpl sal_Int16 mnOldTransitionType; sal_Int16 mnOldTransitionSubtype; - sal_Bool mbOldTransitionDirection; + bool mbOldTransitionDirection; sal_Int32 mnOldTransitionFadeColor; double mfOldTransitionDuration; OUString maOldSoundFile; diff --git a/sd/source/filter/cgm/sdcgmfilter.cxx b/sd/source/filter/cgm/sdcgmfilter.cxx index 1793453622c6..5ef8987574d9 100644 --- a/sd/source/filter/cgm/sdcgmfilter.cxx +++ b/sd/source/filter/cgm/sdcgmfilter.cxx @@ -49,7 +49,7 @@ extern "C" sal_uInt32 ImportCGM( OUString&, Reference< XModel >&, sal_uInt32, Re #endif -SdCGMFilter::SdCGMFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, sal_Bool bShowProgress ) : +SdCGMFilter::SdCGMFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, bool bShowProgress ) : SdFilter( rMedium, rDocShell, bShowProgress ) { } @@ -58,12 +58,12 @@ SdCGMFilter::~SdCGMFilter() { } -sal_Bool SdCGMFilter::Import() +bool SdCGMFilter::Import() { #ifndef DISABLE_DYNLOADING ::osl::Module* pLibrary = OpenLibrary( mrMedium.GetFilter()->GetUserData() ); #endif - sal_Bool bRet = sal_False; + bool bRet = false; if( #ifndef DISABLE_DYNLOADING @@ -87,7 +87,7 @@ sal_Bool SdCGMFilter::Import() if( nRetValue ) { - bRet = sal_True; + bRet = true; if( ( nRetValue &~0xff000000 ) != 0xffffff ) // maybe the backgroundcolor is already white { // so we must not set a master page @@ -110,14 +110,14 @@ sal_Bool SdCGMFilter::Import() return bRet; } -sal_Bool SdCGMFilter::Export() +bool SdCGMFilter::Export() { #ifdef DISABLE_DYNLOADING // No ExportCGM function exists(!) return sal_False; #else ::osl::Module* pLibrary = OpenLibrary( mrMedium.GetFilter()->GetUserData() ); - sal_Bool bRet = sal_False; + bool bRet = false; if( pLibrary && mxModel.is() ) { diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx index 68c8fe94ffb2..d3e91bf8a9e8 100644 --- a/sd/source/filter/eppt/eppt.cxx +++ b/sd/source/filter/eppt/eppt.cxx @@ -69,8 +69,8 @@ PPTWriter::PPTWriter( SvStorageRef& rSvStorage, SvMemoryStream* pVBA, sal_uInt32 nCnvrtFlags ) : PPTWriterBase ( rXModel, rXStatInd ), mnCnvrtFlags ( nCnvrtFlags ), - mbStatus ( sal_False ), - mbUseNewAnimations ( sal_True ), + mbStatus ( false ), + mbUseNewAnimations ( true ), mnStatMaxValue ( 0 ), mnLatestStatValue ( 0 ), mnTextStyle( 0 ), @@ -105,7 +105,7 @@ void PPTWriter::exportPPTPre( const std::vector< com::sun::star::beans::Property if ( mXStatusIndicator.is() ) { - mbStatusIndicator = sal_True; + mbStatusIndicator = true; mnStatMaxValue = ( mnPages + mnMasterPages ) * 5; mXStatusIndicator->start( OUString( "PowerPoint Export" ), mnStatMaxValue + ( mnStatMaxValue >> 3 ) ); } @@ -161,13 +161,13 @@ void PPTWriter::exportPPTPost( ) if ( !ImplCreateDocumentSummaryInformation() ) return; - mbStatus = sal_True; + mbStatus = true; }; void ImplExportComments( uno::Reference< drawing::XDrawPage > xPage, SvMemoryStream& rBinaryTagData10Atom ); void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_uInt16 nMode, - sal_Bool bHasBackground, Reference< XPropertySet > aXBackgroundPropSet ) + bool bHasBackground, Reference< XPropertySet > aXBackgroundPropSet ) { Any aAny; @@ -183,7 +183,7 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_ .WriteUInt16( (sal_uInt16)0 ); // padword mnDiaMode = 0; - sal_Bool bVisible = sal_True; + bool bVisible = true; ::com::sun::star::presentation::FadeEffect eFe = ::com::sun::star::presentation::FadeEffect_NONE; if ( GetPropertyValue( aAny, mXPagePropSet, OUString( "Visible" ) ) ) @@ -205,9 +205,9 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_ aAny >>= eFe; sal_uInt32 nSoundRef = 0; - sal_Bool bIsSound = sal_False; - sal_Bool bStopSound = sal_False; - sal_Bool bLoopSound = sal_False; + bool bIsSound = false; + bool bStopSound = false; + bool bLoopSound = false; if ( GetPropertyValue( aAny, mXPagePropSet, OUString( "Sound" ) ) ) { @@ -215,7 +215,7 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_ if ( aAny >>= aSoundURL ) { nSoundRef = maSoundCollection.GetId( aSoundURL ); - bIsSound = sal_True; + bIsSound = true; } else aAny >>= bStopSound; @@ -223,11 +223,11 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_ if ( GetPropertyValue( aAny, mXPagePropSet, OUString( "LoopSound" ) ) ) aAny >>= bLoopSound; - sal_Bool bNeedsSSSlideInfoAtom = ( bVisible == sal_False ) - || ( mnDiaMode == 2 ) - || ( bIsSound ) - || ( bStopSound ) - || ( eFe != ::com::sun::star::presentation::FadeEffect_NONE ); + bool bNeedsSSSlideInfoAtom = ( bVisible == false ) + || ( mnDiaMode == 2 ) + || ( bIsSound ) + || ( bStopSound ) + || ( eFe != ::com::sun::star::presentation::FadeEffect_NONE ); if ( bNeedsSSSlideInfoAtom ) { sal_uInt8 nDirection = 0; @@ -256,7 +256,7 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_ nTransitionType = GetTransition( eFe, nDirection ); if ( mnDiaMode == 2 ) // automatic ? nBuildFlags |= 0x400; - if ( bVisible == sal_False ) + if ( bVisible == false ) nBuildFlags |= 4; if ( bIsSound ) nBuildFlags |= 16; @@ -284,7 +284,7 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_ mpPptEscherEx->OpenContainer( EPP_PPDrawing ); mpPptEscherEx->OpenContainer( ESCHER_DgContainer ); mpPptEscherEx->EnterGroup(0,0); - ImplWritePage( rLayout, aSolverContainer, NORMAL, sal_False, nPageNum ); // the shapes of the pages are created in the PPT document + ImplWritePage( rLayout, aSolverContainer, NORMAL, false, nPageNum ); // the shapes of the pages are created in the PPT document mpPptEscherEx->LeaveGroup(); if ( bHasBackground ) @@ -396,8 +396,8 @@ void PPTWriter::ImplWriteSlideMaster( sal_uInt32 nPageNum, Reference< XPropertyS mpPptEscherEx->BeginAtom(); - sal_Bool bFirst = sal_True; - sal_Bool bSimpleText = sal_False; + bool bFirst = true; + bool bSimpleText = false; mpStrm->WriteUInt16( (sal_uInt16)5 ); // paragraph count @@ -405,13 +405,13 @@ void PPTWriter::ImplWriteSlideMaster( sal_uInt32 nPageNum, Reference< XPropertyS { if ( nInstance >= EPP_TEXTTYPE_CenterBody ) { - bFirst = sal_False; - bSimpleText = sal_True; + bFirst = false; + bSimpleText = true; mpStrm->WriteUInt16( nLev ); } mpStyleSheet->mpParaSheet[ nInstance ]->Write( *mpStrm, mpPptEscherEx, nLev, bFirst, bSimpleText, mXPagePropSet ); mpStyleSheet->mpCharSheet[ nInstance ]->Write( *mpStrm, mpPptEscherEx, nLev, bFirst, bSimpleText, mXPagePropSet ); - bFirst = sal_False; + bFirst = false; } mpPptEscherEx->EndAtom( EPP_TxMasterStyleAtom, 0, nInstance ); } @@ -423,7 +423,7 @@ void PPTWriter::ImplWriteSlideMaster( sal_uInt32 nPageNum, Reference< XPropertyS mpPptEscherEx->OpenContainer( ESCHER_DgContainer ); mpPptEscherEx->EnterGroup(0,0); - ImplWritePage( GetLayout( 0 ), aSolverContainer, MASTER, sal_True ); // the shapes of the pages are created in the PPT document + ImplWritePage( GetLayout( 0 ), aSolverContainer, MASTER, true ); // the shapes of the pages are created in the PPT document mpPptEscherEx->LeaveGroup(); ImplWriteBackground( aXBackgroundPropSet ); @@ -461,11 +461,11 @@ PPTWriter::~PPTWriter() mXStatusIndicator->end(); } -sal_Bool PPTWriter::ImplCreateCurrentUserStream() +bool PPTWriter::ImplCreateCurrentUserStream() { mpCurUserStrm = mrStg->OpenSotStream( OUString( "Current User" ) ); if ( !mpCurUserStrm ) - return sal_False; + return false; char pUserName[] = "Current User"; sal_uInt32 nLenOfUserName = strlen( pUserName ); sal_uInt32 nSizeOfRecord = 0x14 + ( ( nLenOfUserName + 4 ) & ~ 3 ); @@ -488,10 +488,10 @@ sal_Bool PPTWriter::ImplCreateCurrentUserStream() mpCurUserStrm->WriteUChar( (sal_uInt8)0 ); // pad bytes }; mpCurUserStrm->Seek( nEditPos ); - return sal_True; + return true; }; -sal_Bool PPTWriter::ImplCreateDocumentSummaryInformation() +bool PPTWriter::ImplCreateDocumentSummaryInformation() { uno::Reference<document::XDocumentPropertiesSupplier> xDPS( mXModel, uno::UNO_QUERY_THROW); @@ -539,7 +539,7 @@ sal_Bool PPTWriter::ImplCreateDocumentSummaryInformation() } } - return sal_True; + return true; } void PPTWriter::ImplWriteExtParaHeader( SvMemoryStream& rSt, sal_uInt32 nRef, sal_uInt32 nInstance, sal_uInt32 nSlideId ) @@ -561,17 +561,17 @@ void PPTWriter::ImplCreateHeaderFooterStrings( SvStream& rStrm, ::com::sun::star { OUString aString; ::com::sun::star::uno::Any aAny; - if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, OUString( "HeaderText" ), sal_True ) ) + if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, OUString( "HeaderText" ), true ) ) { if ( aAny >>= aString ) PPTWriter::WriteCString( rStrm, aString, 1 ); } - if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, OUString( "FooterText" ), sal_True ) ) + if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, OUString( "FooterText" ), true ) ) { if ( aAny >>= aString ) PPTWriter::WriteCString( rStrm, aString, 2 ); } - if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, OUString( "DateTimeText" ), sal_True ) ) + if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, OUString( "DateTimeText" ), true ) ) { if ( aAny >>= aString ) PPTWriter::WriteCString( rStrm, aString, 0 ); @@ -583,37 +583,37 @@ void PPTWriter::ImplCreateHeaderFooters( ::com::sun::star::uno::Reference< ::com { if ( rXPagePropSet.is() ) { - sal_Bool bVal = sal_False; + bool bVal = false; sal_uInt32 nVal = 0; ::com::sun::star::uno::Any aAny; - if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, OUString( "IsHeaderVisible" ), sal_True ) ) + if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, OUString( "IsHeaderVisible" ), true ) ) { if ( ( aAny >>= bVal ) && bVal ) nVal |= 0x100000; } - if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, OUString( "IsFooterVisible" ), sal_True ) ) + if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, OUString( "IsFooterVisible" ), true ) ) { if ( ( aAny >>= bVal ) && bVal ) nVal |= 0x200000; } - if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, OUString( "IsDateTimeVisible" ), sal_True ) ) + if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, OUString( "IsDateTimeVisible" ), true ) ) { if ( ( aAny >>= bVal ) && bVal ) nVal |= 0x010000; } - if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, OUString( "IsPageNumberVisible" ), sal_True ) ) + if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, OUString( "IsPageNumberVisible" ), true ) ) { if ( ( aAny >>= bVal ) && bVal ) nVal |= 0x080000; } - if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, OUString( "IsDateTimeFixed" ), sal_True ) ) + if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, OUString( "IsDateTimeFixed" ), true ) ) { if ( ( aAny >>= bVal ) && !bVal ) nVal |= 0x20000; else nVal |= 0x40000; } - if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, OUString( "DateTimeFormat" ), sal_True ) ) + if ( PropValue::GetPropertyValue( aAny, rXPagePropSet, OUString( "DateTimeFormat" ), true ) ) { sal_Int32 nFormat = *(sal_Int32*)aAny.getValue(); SvxDateFormat eDateFormat = (SvxDateFormat)( nFormat & 0xf ); @@ -661,7 +661,7 @@ void PPTWriter::ImplCreateHeaderFooters( ::com::sun::star::uno::Reference< ::com } } -sal_Bool PPTWriter::ImplCreateDocument() +bool PPTWriter::ImplCreateDocument() { sal_uInt32 i; sal_uInt16 nSlideType = EPP_SLIDESIZE_TYPECUSTOM; @@ -724,7 +724,7 @@ sal_Bool PPTWriter::ImplCreateDocument() .WriteUInt32( (sal_uInt32)0 ); // reserved, usually 0 if ( !GetPageByIndex( i, NORMAL ) ) // very exciting: once again through all pages - return sal_False; + return false; SetCurrentStyleSheet( GetMasterIndex( NORMAL ) ); ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed > @@ -805,7 +805,7 @@ sal_Bool PPTWriter::ImplCreateDocument() if ( ImplGetPropertyValue( OUString("IsAutomatic" ) ) ) { - sal_Bool bBool = sal_False; + bool bBool = false; mAny >>= bBool; if ( !bBool ) nFlags |= 1; @@ -813,14 +813,14 @@ sal_Bool PPTWriter::ImplCreateDocument() if ( ImplGetPropertyValue( OUString( "IsEndless" ) ) ) // the correct name would be IsNotEndless: WTF? { - sal_Bool bBool = sal_False; + bool bBool = false; mAny >>= bBool; if ( bBool ) nFlags |= 0x80; } if ( ImplGetPropertyValue( OUString( "IsFullScreen" ) ) ) { - sal_Bool bBool = sal_False; + bool bBool = false; mAny >>= bBool; if ( !bBool ) nFlags |= 0x11; @@ -922,10 +922,10 @@ sal_Bool PPTWriter::ImplCreateDocument() } mpPptEscherEx->AddAtom( 0, EPP_EndDocument ); mpPptEscherEx->CloseContainer(); // EPP_Document - return sal_True; + return true; }; -sal_Bool PPTWriter::ImplCreateHyperBlob( SvMemoryStream& rStrm ) +bool PPTWriter::ImplCreateHyperBlob( SvMemoryStream& rStrm ) { sal_uInt32 nCurrentOfs, nParaOfs, nParaCount = 0; @@ -1003,10 +1003,10 @@ sal_Bool PPTWriter::ImplCreateHyperBlob( SvMemoryStream& rStrm ) rStrm.WriteUInt32( (sal_uInt32)( nCurrentOfs - ( nParaOfs + 4 ) ) ); rStrm.WriteUInt32( nParaCount ); rStrm.Seek( nCurrentOfs ); - return sal_True; + return true; } -sal_Bool PPTWriter::ImplCreateMainNotes() +bool PPTWriter::ImplCreateMainNotes() { EscherSolverContainer aSolverContainer; @@ -1019,7 +1019,7 @@ sal_Bool PPTWriter::ImplCreateMainNotes() mpPptEscherEx->OpenContainer( ESCHER_DgContainer ); mpPptEscherEx->EnterGroup(0,0); - ImplWritePage( GetLayout( 20 ), aSolverContainer, NOTICE, sal_True ); + ImplWritePage( GetLayout( 20 ), aSolverContainer, NOTICE, true ); mpPptEscherEx->LeaveGroup(); mpPptEscherEx->OpenContainer( ESCHER_SpContainer ); @@ -1043,7 +1043,7 @@ sal_Bool PPTWriter::ImplCreateMainNotes() mpPptEscherEx->AddAtom( 32, EPP_ColorSchemeAtom, 0, 1 ); mpStrm->WriteUInt32( (sal_uInt32)0xffffff ).WriteUInt32( (sal_uInt32)0x000000 ).WriteUInt32( (sal_uInt32)0x808080 ).WriteUInt32( (sal_uInt32)0x000000 ).WriteUInt32( (sal_uInt32)0x99cc00 ).WriteUInt32( (sal_uInt32)0xcc3333 ).WriteUInt32( (sal_uInt32)0xffcccc ).WriteUInt32( (sal_uInt32)0xb2b2b2 ); mpPptEscherEx->CloseContainer(); // EPP_Notes - return sal_True; + return true; } static OUString getInitials( const OUString& rName ) @@ -1148,7 +1148,7 @@ void PPTWriter::ImplWriteNotes( sal_uInt32 nPageNum ) mpPptEscherEx->OpenContainer( ESCHER_DgContainer ); mpPptEscherEx->EnterGroup(0,0); - ImplWritePage( GetLayout( 20 ), aSolverContainer, NOTICE, sal_False ); // the shapes of the pages are created in the PPT document + ImplWritePage( GetLayout( 20 ), aSolverContainer, NOTICE, false ); // the shapes of the pages are created in the PPT document mpPptEscherEx->LeaveGroup(); mpPptEscherEx->OpenContainer( ESCHER_SpContainer ); @@ -1308,7 +1308,7 @@ void PPTWriter::ImplWriteOLE( ) //Initialize the graphic size which will be used on export ::com::sun::star::awt::Size aSize( pPtr->xShape->getSize() ); SvStorageRef xDest( new SvStorage( new SvMemoryStream(), true ) ); - sal_Bool bOk = oox::ole::MSConvertOCXControls::WriteOCXStream( mXModel, xDest, pPtr->xControlModel, aSize, aName ); + bool bOk = oox::ole::MSConvertOCXControls::WriteOCXStream( mXModel, xDest, pPtr->xControlModel, aSize, aName ); if ( bOk ) pStrm = xDest->CreateMemoryStream(); } @@ -1334,7 +1334,7 @@ void PPTWriter::ImplWriteOLE( ) // write PersistantTable and UserEditAtom -sal_Bool PPTWriter::ImplWriteAtomEnding() +bool PPTWriter::ImplWriteAtomEnding() { #define EPP_LastViewTypeSlideView 1 @@ -1439,31 +1439,31 @@ sal_Bool PPTWriter::ImplWriteAtomEnding() .WriteInt16( (sal_Int16)EPP_LastViewTypeSlideView ) // last view type .WriteInt16( (sal_Int16)0x12 ); // padword - return sal_True; + return true; } // - exported function - -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL ExportPPT( const std::vector< com::sun::star::beans::PropertyValue >& rMediaData, SvStorageRef& rSvStorage, +extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL ExportPPT( const std::vector< com::sun::star::beans::PropertyValue >& rMediaData, SvStorageRef& rSvStorage, ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & rXModel, ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator > & rXStatInd, SvMemoryStream* pVBA, sal_uInt32 nCnvrtFlags ) { PPTWriter* pPPTWriter; - sal_Bool bStatus = sal_False; + bool bStatus = false; pPPTWriter = new PPTWriter( rSvStorage, rXModel, rXStatInd, pVBA, nCnvrtFlags ); if ( pPPTWriter ) { pPPTWriter->exportPPT(rMediaData); - bStatus = ( pPPTWriter->IsValid() == sal_True ); + bStatus = pPPTWriter->IsValid(); delete pPPTWriter; } return bStatus; } -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL SaveVBA( SfxObjectShell& rDocShell, SvMemoryStream*& pBas ) +extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL SaveVBA( SfxObjectShell& rDocShell, SvMemoryStream*& pBas ) { SvStorageRef xDest( new SvStorage( new SvMemoryStream(), true ) ); SvxImportMSVBasic aMSVBas( rDocShell, *xDest ); @@ -1488,14 +1488,14 @@ extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL SaveVBA( SfxObjectShell& rDocS xTemp->Read( pTemp, nLen ); pBas = new SvMemoryStream( pTemp, nLen, STREAM_READ ); pBas->ObjectOwnsMemory( true ); - return sal_True; + return true; } } } } } - return sal_False; + return false; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/filter/eppt/eppt.hxx b/sd/source/filter/eppt/eppt.hxx index 9350bda4658b..e2b6f03bca56 100644 --- a/sd/source/filter/eppt/eppt.hxx +++ b/sd/source/filter/eppt/eppt.hxx @@ -159,8 +159,8 @@ struct CellBorder; class PPTWriter : public PPTWriterBase, public PPTExBulletProvider { sal_uInt32 mnCnvrtFlags; - sal_Bool mbStatus; - sal_Bool mbUseNewAnimations; + bool mbStatus; + bool mbUseNewAnimations; sal_uInt32 mnStatMaxValue; sal_uInt32 mnLatestStatValue; @@ -174,7 +174,7 @@ class PPTWriter : public PPTWriterBase, public PPTExBulletProvider ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextField > mXTextField; sal_uInt32 mnTextStyle; - sal_Bool mbFontIndependentLineSpacing; + bool mbFontIndependentLineSpacing; sal_uInt32 mnTextSize; SvStorageRef mrStg; @@ -220,56 +220,56 @@ class PPTWriter : public PPTWriterBase, public PPTExBulletProvider protected: - sal_Bool ImplCreateDocumentSummaryInformation(); - sal_Bool ImplCreateCurrentUserStream(); + bool ImplCreateDocumentSummaryInformation(); + bool ImplCreateCurrentUserStream(); void ImplCreateHeaderFooterStrings( SvStream& rOut, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rXPagePropSet ); void ImplCreateHeaderFooters( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rXPagePropSet ); - virtual sal_Bool ImplCreateDocument() SAL_OVERRIDE; - sal_Bool ImplCreateHyperBlob( SvMemoryStream& rStream ); + virtual bool ImplCreateDocument() SAL_OVERRIDE; + bool ImplCreateHyperBlob( SvMemoryStream& rStream ); sal_uInt32 ImplInsertBookmarkURL( const OUString& rBookmark, const sal_uInt32 nType, - const OUString& rStringVer0, const OUString& rStringVer1, const OUString& rStringVer2, const OUString& rStringVer3 ); - virtual sal_Bool ImplCreateMainNotes() SAL_OVERRIDE; - sal_Bool ImplCreateNotes( sal_uInt32 nPageNum ); + const OUString& rStringVer0, const OUString& rStringVer1, const OUString& rStringVer2, const OUString& rStringVer3 ); + virtual bool ImplCreateMainNotes() SAL_OVERRIDE; + bool ImplCreateNotes( sal_uInt32 nPageNum ); void ImplWriteBackground( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXBackgroundPropSet ); - void ImplWriteVBA(); + void ImplWriteVBA(); void ImplWriteOLE(); - sal_Bool ImplWriteAtomEnding(); + bool ImplWriteAtomEnding(); void ImplFlipBoundingBox( EscherPropertyContainer& rPropOpt ); - sal_Bool ImplGetText(); - sal_Bool ImplCreatePresentationPlaceholder( const sal_Bool bMaster, const PageType PageType, + bool ImplGetText(); + bool ImplCreatePresentationPlaceholder( const bool bMaster, const PageType PageType, const sal_uInt32 StyleInstance, const sal_uInt8 PlaceHolderId ); - sal_Bool ImplGetEffect( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &, + bool ImplGetEffect( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &, ::com::sun::star::presentation::AnimationEffect& eEffect, ::com::sun::star::presentation::AnimationEffect& eTextEffect, - sal_Bool& bHasSound ); + bool& bHasSound ); void ImplWriteObjectEffect( SvStream& rSt, ::com::sun::star::presentation::AnimationEffect eEffect, ::com::sun::star::presentation::AnimationEffect eTextEffect, sal_uInt16 nOrder ); - void ImplWriteClickAction( SvStream& rSt, ::com::sun::star::presentation::ClickAction eAction, sal_Bool bMediaClickAction ); + void ImplWriteClickAction( SvStream& rSt, ::com::sun::star::presentation::ClickAction eAction, bool bMediaClickAction ); void ImplWriteParagraphs( SvStream& rOutStrm, TextObj& rTextObj ); void ImplWritePortions( SvStream& rOutStrm, TextObj& rTextObj ); void ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_uInt32 nAtomInstance, TextRuleEntry* pTextRule, SvStream& rExtBu, EscherPropertyContainer* ); void ImplAdjustFirstLineLineSpacing( TextObj& rTextObj, EscherPropertyContainer& rPropOpt ); void ImplCreateShape( sal_uInt32 nType, sal_uInt32 nFlags, EscherSolverContainer& ); - void ImplCreateTextShape( EscherPropertyContainer&, EscherSolverContainer&, sal_Bool bFill ); + void ImplCreateTextShape( EscherPropertyContainer&, EscherSolverContainer&, bool bFill ); void ImplWritePage( const PHLayout& rLayout, - EscherSolverContainer& rSolver, - PageType ePageType, - sal_Bool bMaster, - int nPageNumber = 0 ); - sal_Bool ImplCreateCellBorder( const CellBorder* pCellBorder, sal_Int32 nX1, sal_Int32 nY1, sal_Int32 nX2, sal_Int32 nY2 ); + EscherSolverContainer& rSolver, + PageType ePageType, + bool bMaster, + int nPageNumber = 0 ); + bool ImplCreateCellBorder( const CellBorder* pCellBorder, sal_Int32 nX1, sal_Int32 nY1, sal_Int32 nX2, sal_Int32 nY2 ); void ImplCreateTable( com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rXShape, EscherSolverContainer& aSolverContainer, EscherPropertyContainer& aPropOpt ); - sal_Bool ImplCloseDocument(); // we write the font, hyper and sound list + bool ImplCloseDocument(); // we write the font, hyper and sound list virtual void ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterID, sal_uInt16 nMode, - sal_Bool bHasBackground, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > aXBackgroundPropSet ) SAL_OVERRIDE; + bool bHasBackground, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > aXBackgroundPropSet ) SAL_OVERRIDE; virtual void ImplWriteNotes( sal_uInt32 nPageNum ) SAL_OVERRIDE; virtual void ImplWriteSlideMaster( sal_uInt32 nPageNum, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > aXBackgroundPropSet ) SAL_OVERRIDE; @@ -281,7 +281,7 @@ class PPTWriter : public PPTWriterBase, public PPTExBulletProvider virtual ~PPTWriter(); - sal_Bool IsValid() const { return mbStatus; }; + bool IsValid() const { return mbStatus; }; virtual void exportPPTPre( const std::vector< com::sun::star::beans::PropertyValue >& ) SAL_OVERRIDE; virtual void exportPPTPost( ) SAL_OVERRIDE; diff --git a/sd/source/filter/eppt/epptbase.hxx b/sd/source/filter/eppt/epptbase.hxx index 1cef1d08aa05..00eb6a1a3de8 100644 --- a/sd/source/filter/eppt/epptbase.hxx +++ b/sd/source/filter/eppt/epptbase.hxx @@ -71,9 +71,9 @@ struct PHLayout sal_uInt8 nTypeOfTitle; sal_uInt8 nTypeOfOutliner; - sal_Bool bTitlePossible; - sal_Bool bOutlinerPossible; - sal_Bool bSecOutlinerPossible; + bool bTitlePossible; + bool bOutlinerPossible; + bool bSecOutlinerPossible; }; enum PageType { NORMAL = 0, MASTER = 1, NOTICE = 2, UNDEFINED = 3, LAYOUT = 4 }; @@ -87,8 +87,8 @@ class PropValue ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > mXPropSet; - sal_Bool ImplGetPropertyValue( const OUString& rString ); - sal_Bool ImplGetPropertyValue( const ::com::sun::star::uno::Reference + bool ImplGetPropertyValue( const OUString& rString ); + bool ImplGetPropertyValue( const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > &, const OUString& ); public : @@ -101,11 +101,11 @@ class PropValue ::com::sun::star::uno::Any GetAny() { return mAny; } - static sal_Bool GetPropertyValue( + static bool GetPropertyValue( ::com::sun::star::uno::Any& rAny, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &, const OUString& rPropertyName, - sal_Bool bTestPropertyAvailability = sal_False ); + bool bTestPropertyAvailability = false ); static ::com::sun::star::beans::PropertyState GetPropertyState( const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > &, @@ -142,7 +142,7 @@ struct FontCollectionEntry sal_Int16 CharSet; OUString Original; - sal_Bool bIsConverted; + bool bIsConverted; FontCollectionEntry( const OUString& rName, sal_Int16 nFamily, sal_Int16 nPitch, sal_Int16 nCharSet ) : Scaling ( 1.0 ), @@ -252,14 +252,14 @@ struct PPTExCharSheet void SetStyleSheet( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &, FontCollection& rFontCollection, int nLevel ); - void Write( SvStream& rSt, PptEscherEx* pEx, sal_uInt16 nLev, sal_Bool bFirst, sal_Bool bSimpleText, + void Write( SvStream& rSt, PptEscherEx* pEx, sal_uInt16 nLev, bool bFirst, bool bSimpleText, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rPagePropSet ); }; struct PPTExParaLevel { - sal_Bool mbIsBullet; + bool mbIsBullet; sal_uInt16 mnBulletChar; sal_uInt16 mnBulletFont; sal_uInt16 mnBulletHeight; @@ -274,7 +274,7 @@ struct PPTExParaLevel sal_uInt16 mnBulletOfs; sal_uInt16 mnDefaultTab; - sal_Bool mbExtendedBulletsUsed; + bool mbExtendedBulletsUsed; sal_uInt16 mnBulletId; sal_uInt16 mnBulletStart; sal_uInt32 mnMappedNumType; @@ -294,7 +294,7 @@ struct PPTExParaSheet void SetStyleSheet( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &, FontCollection& rFontCollection, int nLevel, const PPTExCharLevel& rCharLevel ); - void Write( SvStream& rSt, PptEscherEx* pEx, sal_uInt16 nLev, sal_Bool bFirst, sal_Bool bSimpleText, + void Write( SvStream& rSt, PptEscherEx* pEx, sal_uInt16 nLev, bool bFirst, bool bSimpleText, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rPagePropSet ); }; @@ -314,7 +314,7 @@ class PPTExStyleSheet void SetStyleSheet( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &, FontCollection& rFontCollection, int nInstance, int nLevel ); - sal_Bool IsHardAttribute( sal_uInt32 nInstance, sal_uInt32 nLevel, PPTExTextAttr eAttr, sal_uInt32 nValue ); + bool IsHardAttribute( sal_uInt32 nInstance, sal_uInt32 nLevel, PPTExTextAttr eAttr, sal_uInt32 nValue ); sal_uInt32 SizeOfTxCFStyleAtom() const; void WriteTxCFStyleAtom( SvStream& rSt ); @@ -326,7 +326,7 @@ protected: ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > mXModel; ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator > mXStatusIndicator; - sal_Bool mbStatusIndicator; + bool mbStatusIndicator; ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPagesSupplier > mXDrawPagesSupplier; ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XMasterPagesSupplier > mXMasterPagesSupplier; @@ -340,8 +340,8 @@ protected: ::com::sun::star::awt::Point maPosition; Rectangle maRect; OString mType; - sal_Bool mbPresObj; - sal_Bool mbEmptyPresObj; + bool mbPresObj; + bool mbEmptyPresObj; sal_Int32 mnAngle; sal_uInt32 mnPages; ///< number of Slides ( w/o master pages & notes & handout ) @@ -361,7 +361,7 @@ protected: FontCollection maFontCollection; virtual void ImplWriteSlide( sal_uInt32 /* nPageNum */, sal_uInt32 /* nMasterNum */, sal_uInt16 /* nMode */, - sal_Bool /* bHasBackground */, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > /* aXBackgroundPropSet */ ) {} + bool /* bHasBackground */, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > /* aXBackgroundPropSet */ ) {} virtual void ImplWriteNotes( sal_uInt32 nPageNum ) = 0; virtual void ImplWriteSlideMaster( sal_uInt32 /* nPageNum */, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > /* aXBackgroundPropSet */ ) {} virtual void ImplWriteLayout( sal_Int32 /* nOffset */, sal_uInt32 /* nMasterNum */ ) {} @@ -369,19 +369,19 @@ protected: virtual void exportPPTPre( const std::vector< com::sun::star::beans::PropertyValue >& ) {} virtual void exportPPTPost() {} - virtual sal_Bool ImplCreateDocument()=0; - virtual sal_Bool ImplCreateMainNotes()=0; + virtual bool ImplCreateDocument()=0; + virtual bool ImplCreateMainNotes()=0; - sal_Bool GetStyleSheets(); - sal_Bool GetShapeByIndex( sal_uInt32 nIndex, sal_Bool bGroup = sal_False ); + bool GetStyleSheets(); + bool GetShapeByIndex( sal_uInt32 nIndex, bool bGroup = false ); - sal_Bool CreateMainNotes(); + bool CreateMainNotes(); ::com::sun::star::awt::Size MapSize( const ::com::sun::star::awt::Size& ); ::com::sun::star::awt::Point MapPoint( const ::com::sun::star::awt::Point& ); Rectangle MapRectangle( const ::com::sun::star::awt::Rectangle& ); - sal_Bool ContainsOtherShapeThanPlaceholders( sal_Bool bForOOMLX ); + bool ContainsOtherShapeThanPlaceholders( bool bForOOMLX ); public: PPTWriterBase(); @@ -392,21 +392,21 @@ public: void exportPPT(const std::vector< com::sun::star::beans::PropertyValue >&); - sal_Bool InitSOIface(); - sal_Bool GetPageByIndex( sal_uInt32 nIndex, PageType ); + bool InitSOIface(); + bool GetPageByIndex( sal_uInt32 nIndex, PageType ); sal_uInt32 GetMasterIndex( PageType ePageType ); - sal_Bool SetCurrentStyleSheet( sal_uInt32 nPageNum ); + bool SetCurrentStyleSheet( sal_uInt32 nPageNum ); - sal_Bool GetPresObj() { return mbPresObj; } + bool GetPresObj() { return mbPresObj; } PHLayout& GetLayout( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rXPropSet ) const; PHLayout& GetLayout( sal_Int32 nOffset ) const; sal_Int32 GetLayoutOffset( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rXPropSet ) const; sal_Int32 GetLayoutOffsetFixed( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rXPropSet ) const; - sal_Bool CreateSlide( sal_uInt32 nPageNum ); - sal_Bool CreateSlideMaster( sal_uInt32 nPageNum ); - sal_Bool CreateNotes( sal_uInt32 nPageNum ); + bool CreateSlide( sal_uInt32 nPageNum ); + bool CreateSlideMaster( sal_uInt32 nPageNum ); + bool CreateNotes( sal_uInt32 nPageNum ); static sal_Int8 GetTransition( sal_Int16 nTransitionType, sal_Int16 nTransitionSubtype, ::com::sun::star::presentation::FadeEffect eEffect, sal_uInt8& nDirection ); static sal_Int8 GetTransition( ::com::sun::star::presentation::FadeEffect eEffect, sal_uInt8& nDirection ); diff --git a/sd/source/filter/eppt/epptooxml.hxx b/sd/source/filter/eppt/epptooxml.hxx index 6f47adf1e43f..23e5b8e383dc 100644 --- a/sd/source/filter/eppt/epptooxml.hxx +++ b/sd/source/filter/eppt/epptooxml.hxx @@ -88,30 +88,30 @@ public: protected: virtual void ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_uInt16 nMode, - sal_Bool bHasBackground, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > aXBackgroundPropSet ) SAL_OVERRIDE; + bool bHasBackground, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > aXBackgroundPropSet ) SAL_OVERRIDE; virtual void ImplWriteNotes( sal_uInt32 nPageNum ) SAL_OVERRIDE; virtual void ImplWriteSlideMaster( sal_uInt32 nPageNum, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > aXBackgroundPropSet ) SAL_OVERRIDE; virtual void ImplWriteLayout( sal_Int32 nOffset, sal_uInt32 nMasterNum ) SAL_OVERRIDE; void ImplWritePPTXLayout( sal_Int32 nOffset, sal_uInt32 nMasterNum ); void WriteTheme( sal_Int32 nThemeNum ); - virtual sal_Bool ImplCreateDocument() SAL_OVERRIDE; - virtual sal_Bool ImplCreateMainNotes() SAL_OVERRIDE; + virtual bool ImplCreateDocument() SAL_OVERRIDE; + virtual bool ImplCreateMainNotes() SAL_OVERRIDE; virtual ::oox::ole::VbaProject* implCreateVbaProject() const SAL_OVERRIDE; - sal_Bool WriteNotesMaster(); + bool WriteNotesMaster(); void WriteAnimateTo( ::sax_fastparser::FSHelperPtr pFS, const ::com::sun::star::uno::Any aValue, const OUString& rAttributeName ); void WriteAnimateValues( ::sax_fastparser::FSHelperPtr pFS, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimate >& rXAnimate ); - void WriteAnimationCondition( ::sax_fastparser::FSHelperPtr pFS, ::com::sun::star::uno::Any& rAny, sal_Bool bWriteEvent, sal_Bool bMainSeqChild ); - void WriteAnimationCondition( ::sax_fastparser::FSHelperPtr pFS, const char* pDelay, const char* pEvent, double fDelay, sal_Bool bHasFDelay ); + void WriteAnimationCondition( ::sax_fastparser::FSHelperPtr pFS, ::com::sun::star::uno::Any& rAny, bool bWriteEvent, bool bMainSeqChild ); + void WriteAnimationCondition( ::sax_fastparser::FSHelperPtr pFS, const char* pDelay, const char* pEvent, double fDelay, bool bHasFDelay ); void WriteAnimations( ::sax_fastparser::FSHelperPtr pFS ); void WriteAnimationAttributeName( ::sax_fastparser::FSHelperPtr pFS, const OUString& rAttributeName ); - void WriteAnimationNode( ::sax_fastparser::FSHelperPtr pFS, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& rXNode, sal_Bool bMainSeqChild ); - void WriteAnimationNodeAnimate( ::sax_fastparser::FSHelperPtr pFS, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& rXNode, sal_Int32 nXmlNodeType, sal_Bool bMainSeqChild ); - void WriteAnimationNodeAnimateInside( ::sax_fastparser::FSHelperPtr pFS, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& rXNode, sal_Bool bMainSeqChild, sal_Bool bSimple ); - void WriteAnimationNodeSeq( ::sax_fastparser::FSHelperPtr pFS, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& rXNode, sal_Int32 nXmlNodeType, sal_Bool bMainSeqChild ); - void WriteAnimationNodeEffect( ::sax_fastparser::FSHelperPtr pFS, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& rXNode, sal_Int32 nXmlNodeType, sal_Bool bMainSeqChild ); - void WriteAnimationNodeCommonPropsStart( ::sax_fastparser::FSHelperPtr pFS, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& rXNode, sal_Bool bSingle, sal_Bool bMainSeqChild ); + void WriteAnimationNode( ::sax_fastparser::FSHelperPtr pFS, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& rXNode, bool bMainSeqChild ); + void WriteAnimationNodeAnimate( ::sax_fastparser::FSHelperPtr pFS, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& rXNode, sal_Int32 nXmlNodeType, bool bMainSeqChild ); + void WriteAnimationNodeAnimateInside( ::sax_fastparser::FSHelperPtr pFS, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& rXNode, bool bMainSeqChild, bool bSimple ); + void WriteAnimationNodeSeq( ::sax_fastparser::FSHelperPtr pFS, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& rXNode, sal_Int32 nXmlNodeType, bool bMainSeqChild ); + void WriteAnimationNodeEffect( ::sax_fastparser::FSHelperPtr pFS, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& rXNode, sal_Int32 nXmlNodeType, bool bMainSeqChild ); + void WriteAnimationNodeCommonPropsStart( ::sax_fastparser::FSHelperPtr pFS, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& rXNode, bool bSingle, bool bMainSeqChild ); void WriteAnimationProperty( ::sax_fastparser::FSHelperPtr pFS, const ::com::sun::star::uno::Any& rAny ); void WriteAnimationTarget( ::sax_fastparser::FSHelperPtr pFS, ::com::sun::star::uno::Any aTarget ); bool WriteComments( sal_uInt32 nPageNum ); @@ -121,7 +121,7 @@ protected: sal_Int32 GetLayoutFileId( sal_Int32 nOffset, sal_uInt32 nMasterNum ); // shapes - void WriteShapeTree( ::sax_fastparser::FSHelperPtr pFS, PageType ePageType, sal_Bool bMaster ); + void WriteShapeTree( ::sax_fastparser::FSHelperPtr pFS, PageType ePageType, bool bMaster ); sal_uInt32 GetNewSlideId() { return mnSlideIdMax ++; } sal_uInt32 GetNewSlideMasterId() { return mnSlideMasterIdMax ++; } @@ -145,7 +145,7 @@ private: sal_uInt32 mnSlideMasterIdMax; sal_uInt32 mnAnimationNodeIdMax; - sal_Bool mbCreateNotes; + bool mbCreateNotes; static sal_Int32 nStyleLevelToken[5]; diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index f78ee569614d..bf8bd4fd0807 100644 --- a/sd/source/filter/eppt/epptso.cxx +++ b/sd/source/filter/eppt/epptso.cxx @@ -394,7 +394,7 @@ sal_uInt32 PPTWriter::ImplInsertBookmarkURL( const OUString& rBookmarkURL, const return nHyperId; } -sal_Bool PPTWriter::ImplCloseDocument() +bool PPTWriter::ImplCloseDocument() { sal_uInt32 nOfs = mpPptEscherEx->PtGetOffsetByID( EPP_Persist_Document ); if ( nOfs ) @@ -408,12 +408,12 @@ sal_Bool PPTWriter::ImplCloseDocument() EscherExAtom aTxMasterStyleAtom( aTxMasterStyleAtomStrm, EPP_TxMasterStyleAtom, EPP_TEXTTYPE_Other ); aTxMasterStyleAtomStrm.WriteUInt16( (sal_uInt16)5 ); // paragraph count sal_uInt16 nLev; - sal_Bool bFirst = sal_True; + bool bFirst = true; for ( nLev = 0; nLev < 5; nLev++ ) { - mpStyleSheet->mpParaSheet[ EPP_TEXTTYPE_Other ]->Write( aTxMasterStyleAtomStrm, mpPptEscherEx, nLev, bFirst, sal_False, mXPagePropSet ); - mpStyleSheet->mpCharSheet[ EPP_TEXTTYPE_Other ]->Write( aTxMasterStyleAtomStrm, mpPptEscherEx, nLev, bFirst, sal_False, mXPagePropSet ); - bFirst = sal_False; + mpStyleSheet->mpParaSheet[ EPP_TEXTTYPE_Other ]->Write( aTxMasterStyleAtomStrm, mpPptEscherEx, nLev, bFirst, false, mXPagePropSet ); + mpStyleSheet->mpCharSheet[ EPP_TEXTTYPE_Other ]->Write( aTxMasterStyleAtomStrm, mpPptEscherEx, nLev, bFirst, false, mXPagePropSet ); + bFirst = false; } } @@ -547,22 +547,22 @@ sal_Bool PPTWriter::ImplCloseDocument() if ( nOldPos ) { mpStrm->Seek( nOldPos ); - return sal_True; + return true; } } - return sal_False; + return false; } -sal_Bool PropValue::GetPropertyValue( +bool PropValue::GetPropertyValue( ::com::sun::star::uno::Any& rAny, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet, const OUString& rString, - sal_Bool bTestPropertyAvailability ) + bool bTestPropertyAvailability ) { - sal_Bool bRetValue = sal_True; + bool bRetValue = true; if ( bTestPropertyAvailability ) { - bRetValue = sal_False; + bRetValue = false; try { ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > @@ -572,7 +572,7 @@ sal_Bool PropValue::GetPropertyValue( } catch( ::com::sun::star::uno::Exception& ) { - bRetValue = sal_False; + bRetValue = false; } } if ( bRetValue ) @@ -581,11 +581,11 @@ sal_Bool PropValue::GetPropertyValue( { rAny = rXPropSet->getPropertyValue( rString ); if ( !rAny.hasValue() ) - bRetValue = sal_False; + bRetValue = false; } catch( ::com::sun::star::uno::Exception& ) { - bRetValue = sal_False; + bRetValue = false; } } return bRetValue; @@ -610,31 +610,31 @@ sal_Bool PropValue::GetPropertyValue( return eRetValue; } -sal_Bool PropValue::ImplGetPropertyValue( const OUString& rString ) +bool PropValue::ImplGetPropertyValue( const OUString& rString ) { return GetPropertyValue( mAny, mXPropSet, rString ); } -sal_Bool PropValue::ImplGetPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & aXPropSet, const OUString& rString ) +bool PropValue::ImplGetPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & aXPropSet, const OUString& rString ) { return GetPropertyValue( mAny, aXPropSet, rString ); } -sal_Bool PropStateValue::ImplGetPropertyValue( const OUString& rString, sal_Bool bGetPropertyState ) +bool PropStateValue::ImplGetPropertyValue( const OUString& rString, bool bGetPropertyState ) { ePropState = ::com::sun::star::beans::PropertyState_AMBIGUOUS_VALUE; - sal_Bool bRetValue = sal_True; + bool bRetValue = true; #ifdef UNX ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > aXPropSetInfo( mXPropSet->getPropertySetInfo() ); if ( !aXPropSetInfo.is() ) - return sal_False; + return false; #endif try { mAny = mXPropSet->getPropertyValue( rString ); if ( !mAny.hasValue() ) - bRetValue = sal_False; + bRetValue = false; else if ( bGetPropertyState ) ePropState = mXPropState->getPropertyState( rString ); else @@ -642,21 +642,21 @@ sal_Bool PropStateValue::ImplGetPropertyValue( const OUString& rString, sal_Bool } catch( ::com::sun::star::uno::Exception& ) { - bRetValue = sal_False; + bRetValue = false; } return bRetValue; } void PPTWriter::ImplWriteParagraphs( SvStream& rOut, TextObj& rTextObj ) { - sal_Bool bFirstParagraph = sal_True; + bool bFirstParagraph = true; sal_uInt32 nCharCount; sal_uInt32 nPropertyFlags = 0; sal_uInt16 nDepth = 0; sal_Int16 nLineSpacing; int nInstance = rTextObj.GetInstance(); - for ( sal_uInt32 i = 0; i < rTextObj.ParagraphCount(); ++i, bFirstParagraph = sal_False ) + for ( sal_uInt32 i = 0; i < rTextObj.ParagraphCount(); ++i, bFirstParagraph = false ) { ParagraphObj* pPara = rTextObj.GetParagraph(i); PortionObj* pPortion = pPara->front(); @@ -709,10 +709,10 @@ void PPTWriter::ImplWriteParagraphs( SvStream& rOut, TextObj& rTextObj ) ( mpStyleSheet->IsHardAttribute( nInstance, pPara->nDepth, ParaAttr_LowerDist, pPara->mnLineSpacingBottom ) ) ) nPropertyFlags |= 0x00004000; if ( ( pPara->meForbiddenRules == ::com::sun::star::beans::PropertyState_DIRECT_VALUE ) || - ( mpStyleSheet->IsHardAttribute( nInstance, pPara->nDepth, ParaAttr_UpperDist, pPara->mbForbiddenRules ) ) ) + ( mpStyleSheet->IsHardAttribute( nInstance, pPara->nDepth, ParaAttr_UpperDist, pPara->mbForbiddenRules ? 1 : 0 ) ) ) nPropertyFlags |= 0x00020000; if ( ( pPara->meParagraphPunctation == ::com::sun::star::beans::PropertyState_DIRECT_VALUE ) || - ( mpStyleSheet->IsHardAttribute( nInstance, pPara->nDepth, ParaAttr_UpperDist, pPara->mbParagraphPunctation ) ) ) + ( mpStyleSheet->IsHardAttribute( nInstance, pPara->nDepth, ParaAttr_UpperDist, pPara->mbParagraphPunctation ? 1 : 0 ) ) ) nPropertyFlags |= 0x00080000; if ( ( pPara->meBiDi == ::com::sun::star::beans::PropertyState_DIRECT_VALUE ) || ( mpStyleSheet->IsHardAttribute( nInstance, nDepth, ParaAttr_BiDi, pPara->mnBiDi ) ) ) @@ -755,9 +755,9 @@ void PPTWriter::ImplWriteParagraphs( SvStream& rOut, TextObj& rTextObj ) sal_uInt32 nBulletColor = pPara->nBulletColor; if ( nBulletColor == COL_AUTO ) { - sal_Bool bIsDark = sal_False; + bool bIsDark = false; ::com::sun::star::uno::Any aAny; - if ( PropValue::GetPropertyValue( aAny, mXPagePropSet, OUString( "IsBackgroundDark" ), sal_True ) ) + if ( PropValue::GetPropertyValue( aAny, mXPagePropSet, OUString( "IsBackgroundDark" ), true ) ) aAny >>= bIsDark; nBulletColor = bIsDark ? 0xffffff : 0x000000; } @@ -808,9 +808,9 @@ void PPTWriter::ImplWritePortions( SvStream& rOut, TextObj& rTextObj ) if ( nCharColor == COL_AUTO ) // nCharColor depends to the background color { - sal_Bool bIsDark = sal_False; + bool bIsDark = false; ::com::sun::star::uno::Any aAny; - if ( PropValue::GetPropertyValue( aAny, mXPagePropSet, OUString( "IsBackgroundDark" ), sal_True ) ) + if ( PropValue::GetPropertyValue( aAny, mXPagePropSet, OUString( "IsBackgroundDark" ), true ) ) aAny >>= bIsDark; nCharColor = bIsDark ? 0xffffff : 0x000000; } @@ -900,7 +900,7 @@ void PPTWriter::ImplWritePortions( SvStream& rOut, TextObj& rTextObj ) if ( aPropSetOfNextShape.is() ) { if ( PropValue::GetPropertyValue( aAny, aPropSetOfNextShape, - OUString( "FillColor" ), sal_True ) ) + OUString( "FillColor" ), true ) ) { if ( nCharColor == mpPptEscherEx->GetColor( *((sal_uInt32*)aAny.getValue()) ) ) { @@ -978,10 +978,10 @@ void PPTWriter::ImplWritePortions( SvStream& rOut, TextObj& rTextObj ) /** * Loads and converts text from shape, value is stored in mnTextSize. */ -sal_Bool PPTWriter::ImplGetText() +bool PPTWriter::ImplGetText() { mnTextSize = 0; - mbFontIndependentLineSpacing = sal_False; + mbFontIndependentLineSpacing = false; mXText = ::com::sun::star::uno::Reference< ::com::sun::star::text::XSimpleText > ( mXShape, ::com::sun::star::uno::UNO_QUERY ); @@ -1864,7 +1864,7 @@ void PPTWriter::ImplWriteObjectEffect( SvStream& rSt, nBuildType = 2; if ( ImplGetPropertyValue( OUString( "SoundOn" ) ) ) { - sal_Bool bBool(sal_False); + bool bBool(false); mAny >>= bBool; if ( bBool ) { @@ -1876,8 +1876,8 @@ void PPTWriter::ImplWriteObjectEffect( SvStream& rSt, } } } - sal_Bool bDimHide = sal_False; - sal_Bool bDimPrevious = sal_False; + bool bDimHide = false; + bool bDimPrevious = false; if ( ImplGetPropertyValue( OUString( "DimHide" ) ) ) mAny >>= bDimHide; if ( ImplGetPropertyValue( OUString( "DimPrevious" ) ) ) @@ -1896,7 +1896,7 @@ void PPTWriter::ImplWriteObjectEffect( SvStream& rSt, .WriteUInt16( (sal_uInt16)0 ); // PadWord } -void PPTWriter::ImplWriteClickAction( SvStream& rSt, ::com::sun::star::presentation::ClickAction eCa, sal_Bool bMediaClickAction ) +void PPTWriter::ImplWriteClickAction( SvStream& rSt, ::com::sun::star::presentation::ClickAction eCa, bool bMediaClickAction ) { sal_uInt32 nSoundRef = 0; // a reference to a sound in the sound collection, or NULL. sal_uInt32 nHyperLinkID = 0;// a persistent unique identifier to an external hyperlink object (only valid when action == HyperlinkAction). @@ -2050,10 +2050,10 @@ void PPTWriter::ImplWriteClickAction( SvStream& rSt, ::com::sun::star::presentat for ( int i = 0; i < 4; i++, rSt.WriteUInt32( (sal_uInt32)0 ) ) ; } -sal_Bool PPTWriter::ImplGetEffect( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rPropSet, +bool PPTWriter::ImplGetEffect( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rPropSet, ::com::sun::star::presentation::AnimationEffect& eEffect, ::com::sun::star::presentation::AnimationEffect& eTextEffect, - sal_Bool& bIsSound ) + bool& bIsSound ) { ::com::sun::star::uno::Any aAny; if ( GetPropertyValue( aAny, rPropSet, OUString( "Effect" ) ) ) @@ -2068,18 +2068,18 @@ sal_Bool PPTWriter::ImplGetEffect( const ::com::sun::star::uno::Reference< ::com if ( GetPropertyValue( aAny, rPropSet, OUString( "SoundOn" ) ) ) aAny >>= bIsSound; else - bIsSound = sal_False; + bIsSound = false; - sal_Bool bHasEffect = ( ( eEffect != ::com::sun::star::presentation::AnimationEffect_NONE ) + bool bHasEffect = ( ( eEffect != ::com::sun::star::presentation::AnimationEffect_NONE ) || ( eTextEffect != ::com::sun::star::presentation::AnimationEffect_NONE ) || bIsSound ); return bHasEffect; }; -sal_Bool PPTWriter::ImplCreatePresentationPlaceholder( const sal_Bool bMasterPage, const PageType /* ePageType */, - const sal_uInt32 nStyleInstance, const sal_uInt8 nPlaceHolderId ) +bool PPTWriter::ImplCreatePresentationPlaceholder( const bool bMasterPage, const PageType /* ePageType */, + const sal_uInt32 nStyleInstance, const sal_uInt8 nPlaceHolderId ) { - sal_Bool bRet = ImplGetText(); + bool bRet = ImplGetText(); if ( bRet && bMasterPage ) { mpPptEscherEx->OpenContainer( ESCHER_SpContainer ); @@ -2125,7 +2125,7 @@ sal_Bool PPTWriter::ImplCreatePresentationPlaceholder( const sal_Bool bMasterPag mpPptEscherEx->CloseContainer(); // ESCHER_SpContainer } else - bRet = sal_False; + bRet = false; return bRet; } @@ -2136,7 +2136,7 @@ void PPTWriter::ImplCreateShape( sal_uInt32 nType, sal_uInt32 nFlags, EscherSolv rSolver.AddShape( mXShape, nId ); } -void PPTWriter::ImplCreateTextShape( EscherPropertyContainer& rPropOpt, EscherSolverContainer& rSolver, sal_Bool bFill ) +void PPTWriter::ImplCreateTextShape( EscherPropertyContainer& rPropOpt, EscherSolverContainer& rSolver, bool bFill ) { mnTextStyle = EPP_TEXTSTYLE_TEXT; mpPptEscherEx->OpenContainer( ESCHER_SpContainer ); @@ -2147,7 +2147,7 @@ void PPTWriter::ImplCreateTextShape( EscherPropertyContainer& rPropOpt, EscherSo rPropOpt.CreateTextProperties( mXPropSet, mnTxId += 0x60, false, true ); } -void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& aSolverContainer, PageType ePageType, sal_Bool bMasterPage, int nPageNumber ) +void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& aSolverContainer, PageType ePageType, bool bMasterPage, int nPageNumber ) { // #i119551# PPT does not support groups of polygons and text (MS patch KB2289187) // sal_uInt32 nGroupLevel = 0; @@ -2160,16 +2160,16 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a nIndices = nInstance = nLastPer = nShapeCount = nEffectCount = 0; - sal_Bool bIsTitlePossible = sal_True; // powerpoint is not able to handle more than one title + bool bIsTitlePossible = true; // powerpoint is not able to handle more than one title sal_uInt32 nOutlinerCount = 0; // the outline objects have to conform to the layout, sal_uInt32 nPrevTextStyle = 0; // there are no more than two allowed nOlePictureId = 0; - sal_Bool bAdditionalText = sal_False; + bool bAdditionalText = false; - sal_Bool bSecOutl = sal_False; + bool bSecOutl = false; sal_uInt32 nPObjects = 0; SvMemoryStream* pClientTextBox = NULL; @@ -2195,26 +2195,26 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a nGroups = GetGroupsClosed(); for ( sal_uInt32 i = 0; i < nGroups; i++, mpPptEscherEx->LeaveGroup() ) ; - if ( GetShapeByIndex( GetCurrentGroupIndex(), sal_True ) ) + if ( GetShapeByIndex( GetCurrentGroupIndex(), true ) ) { - sal_Bool bIsSound; - sal_Bool bMediaClickAction = sal_False; + bool bIsSound; + bool bMediaClickAction = false; ::com::sun::star::presentation::AnimationEffect eAe; ::com::sun::star::presentation::AnimationEffect eTe; if ( ImplGetPropertyValue( OUString( "PresentationOrder" ) ) ) nEffectCount = *(sal_uInt16*)mAny.getValue(); - sal_Bool bEffect = ImplGetEffect( mXPropSet, eAe, eTe, bIsSound ); + bool bEffect = ImplGetEffect( mXPropSet, eAe, eTe, bIsSound ); ::com::sun::star::presentation::ClickAction eCa = ::com::sun::star::presentation::ClickAction_NONE; if ( ImplGetPropertyValue( OUString( "OnClick" ) ) ) mAny >>= eCa; - sal_Bool bGroup = mType == "drawing.Group"; - sal_Bool bOpenBezier = mType == "drawing.OpenBezier"; - sal_Bool bClosedBezier = mType == "drawing.ClosedBezier"; - sal_Bool bPolyPolygon = mType == "drawing.PolyPolygon"; - sal_Bool bPolyLine = mType == "drawing.PolyLine"; + bool bGroup = mType == "drawing.Group"; + bool bOpenBezier = mType == "drawing.OpenBezier"; + bool bClosedBezier = mType == "drawing.ClosedBezier"; + bool bPolyPolygon = mType == "drawing.PolyPolygon"; + bool bPolyLine = mType == "drawing.PolyLine"; const ::com::sun::star::awt::Size aSize100thmm( mXShape->getSize() ); const ::com::sun::star::awt::Point aPoint100thmm( mXShape->getPosition() ); @@ -2246,13 +2246,13 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a } else { - sal_Bool bIsFontwork = sal_False; - sal_Bool bIsHatching = sal_False; + bool bIsFontwork = false; + bool bIsHatching = false; ::com::sun::star::uno::Any aAny; ::com::sun::star::drawing::FillStyle eFS; - if ( GetPropertyValue( aAny, mXPropSet, OUString( "IsFontwork" ), sal_True ) ) + if ( GetPropertyValue( aAny, mXPropSet, OUString( "IsFontwork" ), true ) ) aAny >>= bIsFontwork; - if ( GetPropertyValue( aAny, mXPropSet, OUString( "FillStyle" ), sal_True ) ) + if ( GetPropertyValue( aAny, mXPropSet, OUString( "FillStyle" ), true ) ) { aAny >>= eFS; bIsHatching = eFS == ::com::sun::star::drawing::FillStyle_HATCH; @@ -2401,7 +2401,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a aEnd.X += aCenter.X; aEnd.Y += aCenter.Y; Polygon aPolygon( aRect, Point( aStart.X, aStart.Y ), Point( aEnd.X, aEnd.Y ), ePolyKind ); - sal_Bool bNeedText = sal_True; + bool bNeedText = true; if ( mnAngle ) { aPolygon.Rotate( aRect.TopLeft(), (sal_uInt16)( mnAngle / 10 ) ); @@ -2410,8 +2410,8 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a // #i119551# PPT does not support groups of polygons and text (MS patch KB2289187) // mpPptEscherEx->EnterGroup( 0,0 ); // nGroupLevel = mpPptEscherEx->GetGroupLevel(); - bNeedText = sal_False; - bAdditionalText = sal_True; + bNeedText = false; + bAdditionalText = true; mnTextSize = 0; } mnAngle = 0; @@ -2602,7 +2602,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a { aTextRefPoint = ::com::sun::star::awt::Point( maRect.Left(), maRect.Top() ); mnTextSize = 0; - bAdditionalText = sal_True; + bAdditionalText = true; // #i119551# PPT does not support groups of polygons and text (MS patch KB2289187) // mpPptEscherEx->EnterGroup( &maRect,0 ); } @@ -2625,7 +2625,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a // #i119551# PPT does not support groups of polygons and text (MS patch KB2289187) // mpPptEscherEx->EnterGroup( 0,0 ); // nGroupLevel = mpPptEscherEx->GetGroupLevel(); - bAdditionalText = sal_True; + bAdditionalText = true; mnTextSize = 0; } mpPptEscherEx->OpenContainer( ESCHER_SpContainer ); @@ -2645,7 +2645,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a // #i119551# PPT does not support groups of polygons and text (MS patch KB2289187) // mpPptEscherEx->EnterGroup( 0,0 ); // nGroupLevel = mpPptEscherEx->GetGroupLevel(); - bAdditionalText = sal_True; + bAdditionalText = true; mnTextSize = 0; } mpPptEscherEx->OpenContainer( ESCHER_SpContainer ); @@ -2665,7 +2665,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a // #i119551# PPT does not support groups of polygons and text (MS patch KB2289187) // mpPptEscherEx->EnterGroup( 0,0 ); // nGroupLevel = mpPptEscherEx->GetGroupLevel(); - bAdditionalText = sal_True; + bAdditionalText = true; mnTextSize = 0; } mpPptEscherEx->OpenContainer( ESCHER_SpContainer ); @@ -2685,7 +2685,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a // #i119551# PPT does not support groups of polygons and text (MS patch KB2289187) // mpPptEscherEx->EnterGroup( 0,0 ); // nGroupLevel = mpPptEscherEx->GetGroupLevel(); - bAdditionalText = sal_True; + bAdditionalText = true; mnTextSize = 0; } mpPptEscherEx->OpenContainer( ESCHER_SpContainer ); @@ -2758,7 +2758,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a else nPlaceHolderAtom = EPP_PLACEHOLDER_NOTESBODY; } - ImplCreateTextShape( aPropOpt, aSolverContainer, sal_True ); + ImplCreateTextShape( aPropOpt, aSolverContainer, true ); } else if ( mType == "presentation.TitleText" ) { @@ -2774,7 +2774,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a } else if ( rLayout.bTitlePossible && bIsTitlePossible ) { - bIsTitlePossible = sal_False; + bIsTitlePossible = false; ImplGetText(); TextObjBinary aTextObj( mXText, EPP_TEXTTYPE_Title, maFontCollection, (PPTExBulletProvider&)*this ); @@ -2853,12 +2853,12 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a } } else - mbPresObj = sal_False; + mbPresObj = false; } if ( !mbPresObj ) { mType = "drawing.Text"; - ImplCreateTextShape( aPropOpt, aSolverContainer, sal_True ); + ImplCreateTextShape( aPropOpt, aSolverContainer, true ); } } else if ( ( mType == "presentation.Outliner" ) || ( mType == "presentation.Subtitle" ) ) @@ -2966,7 +2966,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a } mType = "drawing.Text"; - ImplCreateTextShape( aPropOpt, aSolverContainer, sal_True ); + ImplCreateTextShape( aPropOpt, aSolverContainer, true ); } } else if ( ( mType == "drawing.Page" ) || ( mType == "presentation.Page" ) ) @@ -2978,7 +2978,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a else nPlaceHolderAtom = EPP_PLACEHOLDER_NOTESSLIDEIMAGE; } - ImplCreateTextShape( aPropOpt, aSolverContainer, sal_True ); + ImplCreateTextShape( aPropOpt, aSolverContainer, true ); } else if ( mType == "drawing.Frame" ) { @@ -3063,9 +3063,9 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a continue; else { - mbPresObj = sal_False; + mbPresObj = false; mType = "drawing.Text"; - ImplCreateTextShape( aPropOpt, aSolverContainer, sal_True ); + ImplCreateTextShape( aPropOpt, aSolverContainer, true ); } } else if ( mType == "presentation.Footer" ) @@ -3074,9 +3074,9 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a continue; else { - mbPresObj = sal_False; + mbPresObj = false; mType = "drawing.Text"; - ImplCreateTextShape( aPropOpt, aSolverContainer, sal_True ); + ImplCreateTextShape( aPropOpt, aSolverContainer, true ); } } else if ( mType == "presentation.DateTime" ) @@ -3085,9 +3085,9 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a continue; else { - mbPresObj = sal_False; + mbPresObj = false; mType = "drawing.Text"; - ImplCreateTextShape( aPropOpt, aSolverContainer, sal_True ); + ImplCreateTextShape( aPropOpt, aSolverContainer, true ); } } else if ( mType == "presentation.SlideNumber" ) @@ -3096,9 +3096,9 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a continue; else { - mbPresObj = sal_False; + mbPresObj = false; mType = "drawing.Text"; - ImplCreateTextShape( aPropOpt, aSolverContainer, sal_True ); + ImplCreateTextShape( aPropOpt, aSolverContainer, true ); } } else if ( (mType.getLength() > 9) && (mType[8] == '3') && (mType[9] == 'D') ) // drawing.3D @@ -3214,7 +3214,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a continue; } - sal_Bool bClientData = ( bEffect || ( eCa != ::com::sun::star::presentation::ClickAction_NONE ) || + bool bClientData = ( bEffect || ( eCa != ::com::sun::star::presentation::ClickAction_NONE ) || nPlaceHolderAtom || nOlePictureId ); if ( bClientData ) { @@ -3296,9 +3296,9 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a if ( !pClientTextBox ) pClientTextBox = new SvMemoryStream( 0x200, 0x200 ); - if ( mbEmptyPresObj == sal_False ) + if ( mbEmptyPresObj == false ) { - if ( ( ePageType == NORMAL ) && ( bMasterPage == sal_False ) ) + if ( ( ePageType == NORMAL ) && ( bMasterPage == false ) ) { sal_uInt32 nTextType = EPP_TEXTTYPE_Body; if ( mnTextStyle == EPP_TEXTSTYLE_BODY ) @@ -3307,7 +3307,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a nTextType = EPP_TEXTTYPE_HalfBody; else if ( mType == "presentation.Subtitle" ) nTextType = EPP_TEXTTYPE_CenterBody; - bSecOutl = sal_True; + bSecOutl = true; } else nTextType = EPP_TEXTTYPE_Title; @@ -3400,12 +3400,12 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a if ( bAdditionalText ) { - bAdditionalText = sal_False; + bAdditionalText = false; ::com::sun::star::uno::Any aAny; EscherPropertyContainer aPropOpt; mnAngle = ( PropValue::GetPropertyValue( aAny, - mXPropSet, OUString( "RotateAngle" ), sal_True ) ) + mXPropSet, OUString( "RotateAngle" ), true ) ) ? *((sal_Int32*)aAny.getValue() ) : 0; @@ -3416,7 +3416,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a double fDist = hypot( maRect.GetWidth(), maRect.GetHeight() ); maRect = Rectangle( Point( aTextRefPoint.X, aTextRefPoint.Y ), Point( (sal_Int32)( aTextRefPoint.X + fDist ), aTextRefPoint.Y - 1 ) ); - ImplCreateTextShape( aPropOpt, aSolverContainer, sal_False ); + ImplCreateTextShape( aPropOpt, aSolverContainer, false ); aPropOpt.AddOpt( ESCHER_Prop_FitTextToShape, 0x60006 ); // Size Shape To Fit Text if ( mnAngle < 0 ) mnAngle = ( 36000 + mnAngle ) % 36000; @@ -3425,7 +3425,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a } else { - ImplCreateTextShape( aPropOpt, aSolverContainer, sal_False ); + ImplCreateTextShape( aPropOpt, aSolverContainer, false ); if ( mnAngle < 0 ) mnAngle = ( 36000 + mnAngle ) % 36000; else @@ -3480,7 +3480,7 @@ struct CellBorder CellBorder() : mnPos ( 0 ), mnLength( 0 ){}; }; -sal_Bool PPTWriter::ImplCreateCellBorder( const CellBorder* pCellBorder, sal_Int32 nX1, sal_Int32 nY1, sal_Int32 nX2, sal_Int32 nY2) +bool PPTWriter::ImplCreateCellBorder( const CellBorder* pCellBorder, sal_Int32 nX1, sal_Int32 nY1, sal_Int32 nX2, sal_Int32 nY2) { sal_Int32 nLineWidth = pCellBorder->maCellBorder.OuterLineWidth + pCellBorder->maCellBorder.InnerLineWidth; if ( nLineWidth ) @@ -3510,9 +3510,9 @@ sal_Bool PPTWriter::ImplCreateCellBorder( const CellBorder* pCellBorder, sal_Int .WriteInt32( nX2 ) .WriteInt32( nY2 ); mpPptEscherEx->CloseContainer(); - return sal_True; + return true; } - return sal_False; + return false; } //get merged cell's width @@ -3659,7 +3659,7 @@ void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, Esc sal_Int32 nRight = GetCellRight( nColumn, maRect,aColumns,xCell ); sal_Int32 nBottom = GetCellBottom( nRow, maRect,aRows,xCell ); - mbFontIndependentLineSpacing = sal_False; + mbFontIndependentLineSpacing = false; mXPropSet = uno::Reference< beans::XPropertySet >( xCell, uno::UNO_QUERY_THROW ); mXText = uno::Reference< text::XSimpleText >( xCell, uno::UNO_QUERY_THROW ); mnTextSize = mXText->getString().getLength(); @@ -3722,7 +3722,7 @@ void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, Esc CellBorder aCellBorder; aCellBorder.mnPos = aColumns[ nColumn ].first; aCellBorder.mnLength = aColumns[ nColumn ].second; - sal_Bool bTop = sal_False; + bool bTop = false; //write nLine*nColumn cell's top border if ( nLine < xRows->getCount() ) { // top border @@ -3780,7 +3780,7 @@ void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, Esc CellBorder aCellBorder; aCellBorder.mnPos = aRows[ nRow].first; aCellBorder.mnLength = aRows[ nRow].second; - sal_Bool bLeft = sal_False; + bool bLeft = false; if ( nLine < xColumns->getCount() ) { // left border uno::Reference< table::XMergeableCell > xCell( xCellRange->getCellByPosition( nLine, nRow ), uno::UNO_QUERY_THROW ); diff --git a/sd/source/filter/eppt/grouptable.hxx b/sd/source/filter/eppt/grouptable.hxx index ac3acb746e58..ae6c59407a87 100644 --- a/sd/source/filter/eppt/grouptable.hxx +++ b/sd/source/filter/eppt/grouptable.hxx @@ -65,8 +65,8 @@ class GroupTable sal_uInt32 GetGroupsClosed(); void ResetGroupTable( sal_uInt32 nCount ); void ClearGroupTable(); - sal_Bool EnterGroup( ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > & rIndex ); - sal_Bool GetNextGroupEntry(); + bool EnterGroup( ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > & rIndex ); + bool GetNextGroupEntry(); GroupTable(); ~GroupTable(); }; diff --git a/sd/source/filter/eppt/pptexanimations.cxx b/sd/source/filter/eppt/pptexanimations.cxx index aae16dede5b1..e16df1f0265f 100644 --- a/sd/source/filter/eppt/pptexanimations.cxx +++ b/sd/source/filter/eppt/pptexanimations.cxx @@ -148,7 +148,7 @@ void ImplTranslateAttribute( OUString& rString, const TranslateMode eTranslateMo sal_uInt32 AnimationExporter::TranslatePresetSubType( const sal_uInt32 nPresetClass, const sal_uInt32 nPresetId, const OUString& rPresetSubType ) { sal_uInt32 nPresetSubType = 0; - sal_Bool bTranslated = sal_False; + bool bTranslated = false; if ( ( nPresetClass == (sal_uInt32)EffectPresetClass::ENTRANCE ) || ( nPresetClass == (sal_uInt32)EffectPresetClass::EXIT ) ) { @@ -161,12 +161,12 @@ sal_uInt32 AnimationExporter::TranslatePresetSubType( const sal_uInt32 nPresetCl if ( rPresetSubType == "downward" ) { nPresetSubType = 5; - bTranslated = sal_True; + bTranslated = true; } else if ( rPresetSubType == "across" ) { nPresetSubType = 10; - bTranslated = sal_True; + bTranslated = true; } } break; @@ -175,7 +175,7 @@ sal_uInt32 AnimationExporter::TranslatePresetSubType( const sal_uInt32 nPresetCl if ( rPresetSubType == "across" ) { nPresetSubType = 10; - bTranslated = sal_True; + bTranslated = true; } } break; @@ -184,22 +184,22 @@ sal_uInt32 AnimationExporter::TranslatePresetSubType( const sal_uInt32 nPresetCl if ( rPresetSubType == "right-to-top" ) { nPresetSubType = 3; - bTranslated = sal_True; + bTranslated = true; } else if ( rPresetSubType == "right-to-bottom" ) { nPresetSubType = 6; - bTranslated = sal_True; + bTranslated = true; } else if ( rPresetSubType == "left-to-top" ) { nPresetSubType = 9; - bTranslated = sal_True; + bTranslated = true; } else if ( rPresetSubType == "left-to-bottom" ) { nPresetSubType = 12; - bTranslated = sal_True; + bTranslated = true; } } break; @@ -213,7 +213,7 @@ sal_uInt32 AnimationExporter::TranslatePresetSubType( const sal_uInt32 nPresetCl if ( rPresetSubType.equalsAscii( p->mpStrSubType ) ) { nPresetSubType = p->mnID; - bTranslated = sal_True; + bTranslated = true; break; } p++; @@ -225,7 +225,7 @@ sal_uInt32 AnimationExporter::TranslatePresetSubType( const sal_uInt32 nPresetCl return nPresetSubType; } -const sal_Char* AnimationExporter::FindTransitionName( const sal_Int16 nType, const sal_Int16 nSubType, const sal_Bool bDirection ) +const sal_Char* AnimationExporter::FindTransitionName( const sal_Int16 nType, const sal_Int16 nSubType, const bool bDirection ) { const sal_Char* pRet = NULL; int nFit = 0; @@ -297,7 +297,7 @@ sal_Int16 AnimationExporter::GetFillMode( const Reference< XAnimationNode >& xNo if( nFill == AnimationFill::AUTO ) { nFill = AnimationFill::REMOVE; - sal_Bool bIsIndefiniteTiming = sal_True; + bool bIsIndefiniteTiming = true; Any aAny = xNode->getDuration(); if( aAny.hasValue() ) { @@ -343,7 +343,7 @@ void AnimationExporter::doexport( const Reference< XDrawPage >& xPage, SvStream& if( xRootNode.is() ) { processAfterEffectNodes( xRootNode ); - exportNode( rStrm, xRootNode, NULL, DFF_msofbtAnimGroup, 1, 0, sal_False, AnimationFill::AUTO ); + exportNode( rStrm, xRootNode, NULL, DFF_msofbtAnimGroup, 1, 0, false, AnimationFill::AUTO ); } } } @@ -483,7 +483,7 @@ bool AnimationExporter::isEmptyNode( const Reference< XAnimationNode >& xNode ) } void AnimationExporter::exportNode( SvStream& rStrm, Reference< XAnimationNode > xNode, const Reference< XAnimationNode >* pParent, const sal_uInt16 nContainerRecType, - const sal_uInt16 nInstance, const sal_Int32 nGroupLevel, const sal_Bool bTakeBackInteractiveSequenceTiming, const sal_Int16 nFDef ) + const sal_uInt16 nInstance, const sal_Int32 nGroupLevel, const bool bTakeBackInteractiveSequenceTiming, const sal_Int16 nFDef ) { if( (nGroupLevel == 4) && isEmptyNode( xNode ) ) return; @@ -494,7 +494,7 @@ void AnimationExporter::exportNode( SvStream& rStrm, Reference< XAnimationNode > if( nContainerRecType == DFF_msofbtAnimGroup ) mnCurrentGroup++; - sal_Bool bTakeBackInteractiveSequenceTimingForChild = sal_False; + bool bTakeBackInteractiveSequenceTimingForChild = false; sal_Int16 nFillDefault = GetFillMode( xNode, nFDef ); bool bSkipChildren = false; @@ -511,7 +511,7 @@ void AnimationExporter::exportNode( SvStream& rStrm, Reference< XAnimationNode > exportAnimNode( rStrm, xNode, pParent, nGroupLevel, nFillDefault ); exportAnimPropertySet( rStrm, xNode ); exportAnimEvent( rStrm, xNode, 0 ); - exportAnimValue( rStrm, xNode, sal_False ); + exportAnimValue( rStrm, xNode, false ); } break; @@ -535,11 +535,11 @@ void AnimationExporter::exportNode( SvStream& rStrm, Reference< XAnimationNode > if ( ( nGroupLevel == 1 ) && ( nNodeType == ::com::sun::star::presentation::EffectNodeType::INTERACTIVE_SEQUENCE ) ) { nFlags |= 0x20; - bTakeBackInteractiveSequenceTimingForChild = sal_True; + bTakeBackInteractiveSequenceTimingForChild = true; } exportAnimAction( rStrm, xNode ); exportAnimEvent( rStrm, xNode, nFlags ); - exportAnimValue( rStrm, xNode, sal_False ); + exportAnimValue( rStrm, xNode, false ); } break; @@ -575,7 +575,7 @@ void AnimationExporter::exportNode( SvStream& rStrm, Reference< XAnimationNode > exportIterate( rStrm, xNode ); exportAnimPropertySet( rStrm, xNode ); exportAnimEvent( rStrm, xNode, 0 ); - exportAnimValue( rStrm, xNode, sal_False ); + exportAnimValue( rStrm, xNode, false ); } break; @@ -584,7 +584,7 @@ void AnimationExporter::exportNode( SvStream& rStrm, Reference< XAnimationNode > exportAnimNode( rStrm, xNode, pParent, nGroupLevel, nFillDefault ); exportAnimPropertySet( rStrm, xNode ); exportAnimEvent( rStrm, xNode, 0 ); - exportAnimValue( rStrm, xNode, sal_False ); + exportAnimValue( rStrm, xNode, false ); exportAnimate( rStrm, xNode ); } break; @@ -598,7 +598,7 @@ void AnimationExporter::exportNode( SvStream& rStrm, Reference< XAnimationNode > exportAnimPropertySet( rStrm, xNode ); exportAnimateSet( rStrm, xNode, bIsAfterEffectNode ? AFTEREFFECT_SET : AFTEREFFECT_NONE ); exportAnimEvent( rStrm, xNode, 0 ); - exportAnimValue( rStrm, xNode, sal_False ); + exportAnimValue( rStrm, xNode, false ); } else { @@ -613,7 +613,7 @@ void AnimationExporter::exportNode( SvStream& rStrm, Reference< XAnimationNode > exportAnimPropertySet( rStrm, xNode ); exportAnimateMotion( rStrm, xNode ); exportAnimEvent( rStrm, xNode, 0 ); - exportAnimValue( rStrm, xNode, sal_False ); + exportAnimValue( rStrm, xNode, false ); } break; @@ -629,7 +629,7 @@ void AnimationExporter::exportNode( SvStream& rStrm, Reference< XAnimationNode > exportAnimPropertySet( rStrm, xNode ); exportAnimateColor( rStrm, xNode, bIsAfterEffectNode ? AFTEREFFECT_COLOR : AFTEREFFECT_NONE ); exportAnimEvent( rStrm, xNode, 0 ); - exportAnimValue( rStrm, xNode, sal_False ); + exportAnimValue( rStrm, xNode, false ); } else { @@ -644,7 +644,7 @@ void AnimationExporter::exportNode( SvStream& rStrm, Reference< XAnimationNode > exportAnimPropertySet( rStrm, xNode ); exportAnimateTransform( rStrm, xNode ); exportAnimEvent( rStrm, xNode, 0 ); - exportAnimValue( rStrm, xNode, sal_False ); + exportAnimValue( rStrm, xNode, false ); } break; @@ -653,7 +653,7 @@ void AnimationExporter::exportNode( SvStream& rStrm, Reference< XAnimationNode > exportAnimNode( rStrm, xNode, pParent, nGroupLevel, nFillDefault ); exportAnimPropertySet( rStrm, xNode ); exportAnimEvent( rStrm, xNode, 0 ); - exportAnimValue( rStrm, xNode, sal_False ); + exportAnimValue( rStrm, xNode, false ); exportTransitionFilter( rStrm, xNode ); } break; @@ -705,7 +705,7 @@ void AnimationExporter::exportNode( SvStream& rStrm, Reference< XAnimationNode > } } } - exportAnimValue( rStrm, xNode, sal_False ); + exportAnimValue( rStrm, xNode, false ); } break; } @@ -768,7 +768,7 @@ Reference< XAnimationNode > AnimationExporter::createAfterEffectNodeClone( const return xNode; } -sal_Bool AnimationExporter::GetNodeType( const Reference< XAnimationNode >& xNode, sal_Int16& nType ) +bool AnimationExporter::GetNodeType( const Reference< XAnimationNode >& xNode, sal_Int16& nType ) { // trying to get the nodetype Sequence< NamedValue > aUserData = xNode->getUserData(); @@ -781,12 +781,12 @@ sal_Bool AnimationExporter::GetNodeType( const Reference< XAnimationNode >& xNod if ( p->Name == "node-type" ) { if ( p->Value >>= nType ) - return sal_True; + return true; } } } - return sal_False; + return false; } void AnimationExporter::exportAnimNode( SvStream& rStrm, const Reference< XAnimationNode >& xNode, @@ -916,10 +916,10 @@ void AnimationExporter::GetUserData( const Sequence< NamedValue >& rUserData, co } } -sal_uInt32 AnimationExporter::GetPresetID( const OUString& rPreset, sal_uInt32 nAPIPresetClass, sal_Bool& bPresetId ) +sal_uInt32 AnimationExporter::GetPresetID( const OUString& rPreset, sal_uInt32 nAPIPresetClass, bool& bPresetId ) { sal_uInt32 nPresetId = 0; - bPresetId = sal_False; + bPresetId = false; if ( rPreset.match( OUString( "ppt_" ), 0 ) ) { @@ -928,7 +928,7 @@ sal_uInt32 AnimationExporter::GetPresetID( const OUString& rPreset, sal_uInt32 n { OUString aNumber( rPreset.copy( nLast + 1 ) ); nPresetId = aNumber.toInt32(); - bPresetId = sal_True; + bPresetId = true; } } else @@ -940,7 +940,7 @@ sal_uInt32 AnimationExporter::GetPresetID( const OUString& rPreset, sal_uInt32 n if( p->mpStrPresetId ) { nPresetId = p->mnPresetId; - bPresetId = sal_True; + bPresetId = true; } } @@ -1005,8 +1005,8 @@ sal_Int16 AnimationExporter::exportAnimPropertySet( SvStream& rStrm, const Refer sal_uInt32 nPresetSubType = 0; sal_uInt32 nAPIPresetClass = EffectPresetClass::CUSTOM; sal_uInt32 nPresetClass = DFF_ANIM_PRESS_CLASS_USER_DEFINED; - sal_Bool bPresetClass, bPresetId, bPresetSubType; - bPresetId = bPresetClass = bPresetSubType = sal_False; + bool bPresetClass, bPresetId, bPresetSubType; + bPresetId = bPresetClass = bPresetSubType = false; if ( pAny[ DFF_ANIM_PRESET_CLASS ] ) { @@ -1025,7 +1025,7 @@ sal_Int16 AnimationExporter::exportAnimPropertySet( SvStream& rStrm, const Refer nPPTPresetClass = DFF_ANIM_PRESS_CLASS_USER_DEFINED; } nPresetClass = nPPTPresetClass; - bPresetClass = sal_True; + bPresetClass = true; } } if ( pAny[ DFF_ANIM_PRESET_ID ] ) @@ -1041,7 +1041,7 @@ sal_Int16 AnimationExporter::exportAnimPropertySet( SvStream& rStrm, const Refer if ( *pAny[ DFF_ANIM_PRESET_SUB_TYPE ] >>= sPresetSubType ) { nPresetSubType = TranslatePresetSubType( nPresetClass, nPresetId, sPresetSubType ); - bPresetSubType = sal_True; + bPresetSubType = true; } } if ( bPresetId ) @@ -1058,7 +1058,7 @@ sal_Int16 AnimationExporter::exportAnimPropertySet( SvStream& rStrm, const Refer if ( pAny[ DFF_ANIM_AFTEREFFECT ] ) { - sal_Bool bAfterEffect = sal_False; + bool bAfterEffect = false; if ( *pAny[ DFF_ANIM_AFTEREFFECT ] >>= bAfterEffect ) exportAnimPropertyByte( rStrm, DFF_ANIM_AFTEREFFECT, bAfterEffect, TRANSLATE_NONE ); } @@ -1080,8 +1080,8 @@ sal_Int16 AnimationExporter::exportAnimPropertySet( SvStream& rStrm, const Refer if( xColor.is() ) { - sal_Bool bDirection = !xColor->getDirection(); - exportAnimPropertyuInt32( rStrm, DFF_ANIM_DIRECTION, bDirection, TRANSLATE_NONE ); + bool bDirection = !xColor->getDirection(); + exportAnimPropertyuInt32( rStrm, DFF_ANIM_DIRECTION, bDirection ? 1 : 0, TRANSLATE_NONE ); } } @@ -1124,9 +1124,9 @@ sal_Int16 AnimationExporter::exportAnimPropertySet( SvStream& rStrm, const Refer return nNodeType; } -sal_Bool AnimationExporter::exportAnimProperty( SvStream& rStrm, const sal_uInt16 nPropertyId, const ::com::sun::star::uno::Any& rAny, const TranslateMode eTranslateMode ) +bool AnimationExporter::exportAnimProperty( SvStream& rStrm, const sal_uInt16 nPropertyId, const ::com::sun::star::uno::Any& rAny, const TranslateMode eTranslateMode ) { - sal_Bool bRet = sal_False; + bool bRet = false; if ( rAny.hasValue() ) { switch( rAny.getValueType().getTypeClass() ) @@ -1140,7 +1140,7 @@ sal_Bool AnimationExporter::exportAnimProperty( SvStream& rStrm, const sal_uInt1 if ( rAny >>= nVal ) { exportAnimPropertyuInt32( rStrm, nPropertyId, nVal, eTranslateMode ); - bRet = sal_True; + bRet = true; } } break; @@ -1151,7 +1151,7 @@ sal_Bool AnimationExporter::exportAnimProperty( SvStream& rStrm, const sal_uInt1 if ( rAny >>= fVal ) { exportAnimPropertyFloat( rStrm, nPropertyId, fVal, eTranslateMode ); - bRet = sal_True; + bRet = true; } } break; @@ -1170,7 +1170,7 @@ sal_Bool AnimationExporter::exportAnimProperty( SvStream& rStrm, const sal_uInt1 else { exportAnimPropertyFloat( rStrm, nPropertyId, fVal, eTranslateMode ); - bRet = sal_True; + bRet = true; } } } @@ -1181,7 +1181,7 @@ sal_Bool AnimationExporter::exportAnimProperty( SvStream& rStrm, const sal_uInt1 if ( rAny >>= aStr ) { exportAnimPropertyString( rStrm, nPropertyId, aStr, eTranslateMode ); - bRet = sal_True; + bRet = true; } } break; @@ -1272,7 +1272,7 @@ void AnimationExporter::exportAnimEvent( SvStream& rStrm, const Reference< XAnim sal_Int32 nU3 = 0; sal_Int32 nBegin = 0; - sal_Bool bCreateEvent = sal_False; + bool bCreateEvent = false; Any aSource; switch( i ) @@ -1321,7 +1321,7 @@ void AnimationExporter::exportAnimEvent( SvStream& rStrm, const Reference< XAnim double fTiming = 0.0; if ( aAny >>= aEvent ) { - bCreateEvent = sal_True; + bCreateEvent = true; switch( aEvent.Trigger ) { case EventTrigger::NONE : nTrigger = 0; break; @@ -1351,13 +1351,13 @@ void AnimationExporter::exportAnimEvent( SvStream& rStrm, const Reference< XAnim } else if ( aAny >>= eTiming ) { - bCreateEvent = sal_True; + bCreateEvent = true; if ( eTiming == Timing_INDEFINITE ) nBegin = -1; } else if ( aAny >>= fTiming ) { - bCreateEvent = sal_True; + bCreateEvent = true; nBegin = (sal_Int32)( fTiming * 1000.0 ); } } @@ -1367,7 +1367,7 @@ void AnimationExporter::exportAnimEvent( SvStream& rStrm, const Reference< XAnim { if ( nFlags & ( 1 << i ) ) { - bCreateEvent = sal_True; + bCreateEvent = true; nU1 = 1; nTrigger = 9; } @@ -1377,7 +1377,7 @@ void AnimationExporter::exportAnimEvent( SvStream& rStrm, const Reference< XAnim { if ( nFlags & ( 1 << i ) ) { - bCreateEvent = sal_True; + bCreateEvent = true; nU1 = 1; nTrigger = 10; } @@ -1512,7 +1512,7 @@ Any AnimationExporter::convertAnimateValue( const Any& rSourceValue, const OUStr } else if ( rAttributeName == "Visibility" ) { - sal_Bool bVisible = sal_True; + bool bVisible = true; if ( rSourceValue >>= bVisible ) { if ( bVisible ) @@ -1713,16 +1713,16 @@ void AnimationExporter::exportAnimateTarget( SvStream& rStrm, const Reference< X exportAnimPropertyuInt32( rStrm, 5, 0, TRANSLATE_NONE ); } } - exportAnimateTargetElement( rStrm, aTarget.hasValue() ? aTarget : xAnimate->getTarget(), sal_False ); + exportAnimateTargetElement( rStrm, aTarget.hasValue() ? aTarget : xAnimate->getTarget(), false ); } } -Reference< XShape > AnimationExporter::getTargetElementShape( const Any& rAny, sal_Int32& rBegin, sal_Int32& rEnd, sal_Bool& rParagraphTarget ) +Reference< XShape > AnimationExporter::getTargetElementShape( const Any& rAny, sal_Int32& rBegin, sal_Int32& rEnd, bool& rParagraphTarget ) { Reference< XShape > xShape; rAny >>= xShape; - rParagraphTarget = sal_False; + rParagraphTarget = false; if( !xShape.is() ) { @@ -1736,7 +1736,7 @@ Reference< XShape > AnimationExporter::getTargetElementShape( const Any& rAny, s Reference< XSimpleText > xText( xShape, UNO_QUERY ); if ( xText.is() ) { - rParagraphTarget = sal_True; + rParagraphTarget = true; Reference< XEnumerationAccess > xTextParagraphEnumerationAccess( xText, UNO_QUERY ); if ( xTextParagraphEnumerationAccess.is() ) { @@ -1768,12 +1768,12 @@ Reference< XShape > AnimationExporter::getTargetElementShape( const Any& rAny, s return xShape; } -void AnimationExporter::exportAnimateTargetElement( SvStream& rStrm, const Any aAny, const sal_Bool bCreate2b01Atom ) +void AnimationExporter::exportAnimateTargetElement( SvStream& rStrm, const Any aAny, const bool bCreate2b01Atom ) { sal_uInt32 nRefMode = 0; // nRefMode == 2 -> Paragraph sal_Int32 begin = -1; sal_Int32 end = -1; - sal_Bool bParagraphTarget; + bool bParagraphTarget; Reference< XShape > xShape = getTargetElementShape( aAny, begin, end, bParagraphTarget ); @@ -1845,7 +1845,7 @@ void AnimationExporter::exportAnimateKeyPoints( SvStream& rStrm, const Reference } } -void AnimationExporter::exportAnimValue( SvStream& rStrm, const Reference< XAnimationNode >& xNode, const sal_Bool bExportAlways ) +void AnimationExporter::exportAnimValue( SvStream& rStrm, const Reference< XAnimationNode >& xNode, const bool bExportAlways ) { Any aAny; // repeat count (0) @@ -1888,7 +1888,7 @@ void AnimationExporter::exportAnimValue( SvStream& rStrm, const Reference< XAnim } // autoreverse (5) - sal_Bool bAutoReverse = xNode->getAutoReverse(); + bool bAutoReverse = xNode->getAutoReverse(); if ( bExportAlways || bAutoReverse ) { EscherExAtom aExAtom( rStrm, DFF_msofbtAnimValue ); @@ -2046,9 +2046,9 @@ void AnimationExporter::exportAnimateTransform( SvStream& rStrm, const Reference } } -sal_Bool AnimationExporter::getColorAny( const Any& rAny, const sal_Int16 nColorSpace, sal_Int32& rMode, sal_Int32& rA, sal_Int32& rB, sal_Int32& rC ) const +bool AnimationExporter::getColorAny( const Any& rAny, const sal_Int16 nColorSpace, sal_Int32& rMode, sal_Int32& rA, sal_Int32& rB, sal_Int32& rC ) const { - sal_Bool bIsColor = sal_True; + bool bIsColor = true; rMode = 0; if ( nColorSpace == AnimationColorSpace::HSL ) @@ -2069,7 +2069,7 @@ sal_Bool AnimationExporter::getColorAny( const Any& rAny, const sal_Int16 nColor rC = (sal_Int32) ( aHSL[ 2 ] * 255.0 ); } else - bIsColor = sal_False; + bIsColor = false; return bIsColor; } diff --git a/sd/source/filter/eppt/pptexanimations.hxx b/sd/source/filter/eppt/pptexanimations.hxx index 18b24c439292..a73b730feab0 100644 --- a/sd/source/filter/eppt/pptexanimations.hxx +++ b/sd/source/filter/eppt/pptexanimations.hxx @@ -69,8 +69,8 @@ class AnimationExporter ::com::sun::star::uno::Any aTarget; void writeZString( SvStream& rStrm, const OUString& rVal ); - sal_Bool getColorAny( const ::com::sun::star::uno::Any& rAny, const sal_Int16 nColorSpace, sal_Int32& rMode, sal_Int32& rA, sal_Int32& rB, sal_Int32& rC ) const; - sal_Bool exportAnimProperty( SvStream& rStrm, const sal_uInt16 nPropertyId, const ::com::sun::star::uno::Any& rAny, const TranslateMode eTranslateMode ); + bool getColorAny( const ::com::sun::star::uno::Any& rAny, const sal_Int16 nColorSpace, sal_Int32& rMode, sal_Int32& rA, sal_Int32& rB, sal_Int32& rC ) const; + bool exportAnimProperty( SvStream& rStrm, const sal_uInt16 nPropertyId, const ::com::sun::star::uno::Any& rAny, const TranslateMode eTranslateMode ); void exportAnimPropertyString( SvStream& rStrm, const sal_uInt16 nPropertyId, const OUString& rVal, const TranslateMode eTranslateMode ); void exportAnimPropertyFloat( SvStream& rStrm, const sal_uInt16 nPropertyId, const double& rVal, const TranslateMode eTranslateMode ); void exportAnimPropertyuInt32( SvStream& rStrm, const sal_uInt16 nPropertyId, const sal_uInt32 nVal, const TranslateMode eTranslateMode ); @@ -88,11 +88,11 @@ class AnimationExporter void exportAnimEvent( SvStream& rStrm, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode, const sal_Int32 nFlags = 0 ); void exportNode( SvStream& rStrm, ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > xNode, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >* xParent, - const sal_uInt16 nContainerRecType, const sal_uInt16 nInstance, const sal_Int32 nGroupLevel, const sal_Bool bTakeBackInteractiveSequenceTiming, + const sal_uInt16 nContainerRecType, const sal_uInt16 nInstance, const sal_Int32 nGroupLevel, const bool bTakeBackInteractiveSequenceTiming, const sal_Int16 nFillDefault ); - void exportAnimateTargetElement( SvStream& rStrm, const ::com::sun::star::uno::Any aAny, const sal_Bool bCreate2b01Atom ); + void exportAnimateTargetElement( SvStream& rStrm, const ::com::sun::star::uno::Any aAny, const bool bCreate2b01Atom ); void exportAnimateKeyPoints( SvStream& rStrm, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimate >& xAnimate ); - void exportAnimValue( SvStream& rStrm, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode, const sal_Bool bExportAlways ); + void exportAnimValue( SvStream& rStrm, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode, const bool bExportAlways ); void exportTransitionFilter( SvStream& rStrm, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ); void exportAnimateMotion( SvStream& rStrm, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ); void exportAnimateTransform( SvStream& rStrm, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ); @@ -120,15 +120,15 @@ public: // helper methods also used in ooxml export static ::com::sun::star::uno::Any convertAnimateValue( const ::com::sun::star::uno::Any& rSource, const OUString& rAttributeName ); - static sal_Bool GetNodeType( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode, sal_Int16& nType ); + static bool GetNodeType( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode, sal_Int16& nType ); static sal_Int16 GetFillMode( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode, const sal_Int16 nFillDefault ); static void GetUserData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rUserData, const ::com::sun::star::uno::Any ** pAny, sal_Size nLen ); static sal_uInt32 TranslatePresetSubType( const sal_uInt32 nPresetClass, const sal_uInt32 nPresetId, const OUString& rPresetSubType ); - static sal_uInt32 GetPresetID( const OUString& rPreset, sal_uInt32 nAPIPresetClass, sal_Bool& bPresetId ); + static sal_uInt32 GetPresetID( const OUString& rPreset, sal_uInt32 nAPIPresetClass, bool& bPresetId ); static sal_uInt32 GetValueTypeForAttributeName( const OUString& rAttributeName ); - static const sal_Char* FindTransitionName( const sal_Int16 nType, const sal_Int16 nSubType, const sal_Bool bDirection ); - static ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > getTargetElementShape( const ::com::sun::star::uno::Any& rAny, sal_Int32& rBegin, sal_Int32& rEnd, sal_Bool& rParagraphTarget ); + static const sal_Char* FindTransitionName( const sal_Int16 nType, const sal_Int16 nSubType, const bool bDirection ); + static ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > getTargetElementShape( const ::com::sun::star::uno::Any& rAny, sal_Int32& rBegin, sal_Int32& rEnd, bool& rParagraphTarget ); }; } // namespace ppt diff --git a/sd/source/filter/eppt/pptexsoundcollection.cxx b/sd/source/filter/eppt/pptexsoundcollection.cxx index dea8b243d456..1ebeb6fcd51f 100644 --- a/sd/source/filter/eppt/pptexsoundcollection.cxx +++ b/sd/source/filter/eppt/pptexsoundcollection.cxx @@ -64,7 +64,7 @@ OUString ExSoundEntry::ImplGetExtension() const return aExtension; } -sal_Bool ExSoundEntry::IsSameURL(const OUString& rURL) const +bool ExSoundEntry::IsSameURL(const OUString& rURL) const { return ( rURL == aSoundURL ); } diff --git a/sd/source/filter/eppt/pptexsoundcollection.hxx b/sd/source/filter/eppt/pptexsoundcollection.hxx index 8a0561e658db..8bb5c52f4adc 100644 --- a/sd/source/filter/eppt/pptexsoundcollection.hxx +++ b/sd/source/filter/eppt/pptexsoundcollection.hxx @@ -41,7 +41,7 @@ class ExSoundEntry public : - sal_Bool IsSameURL(const OUString& rURL) const; + bool IsSameURL(const OUString& rURL) const; sal_uInt32 GetFileSize( ) const { return nFileSize; }; ExSoundEntry(const OUString& rSoundURL); diff --git a/sd/source/filter/eppt/pptx-epptbase.cxx b/sd/source/filter/eppt/pptx-epptbase.cxx index a6df016fe948..4205bf9b2ae4 100644 --- a/sd/source/filter/eppt/pptx-epptbase.cxx +++ b/sd/source/filter/eppt/pptx-epptbase.cxx @@ -100,31 +100,31 @@ using ::com::sun::star::uno::UNO_QUERY; static PHLayout pPHLayout[] = { - { EPP_LAYOUT_TITLESLIDE, { 0x0d, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x10, sal_True, sal_True, sal_False }, - { EPP_LAYOUT_TITLEANDBODYSLIDE, { 0x0d, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, sal_True, sal_True, sal_False }, - { EPP_LAYOUT_TITLEANDBODYSLIDE, { 0x0d, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x14, 0x0d, 0x0e, sal_True, sal_True, sal_False }, - { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x0e, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, sal_True, sal_True, sal_True }, - { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x0e, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x14, 0x0d, 0x0e, sal_True, sal_True, sal_False }, - { EPP_LAYOUT_BLANCSLIDE, { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, sal_False, sal_False, sal_False }, - { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x0e, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x16, 0x0d, 0x0e, sal_True, sal_True, sal_False }, - { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x14, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x14, 0x0d, 0x0e, sal_True, sal_True, sal_False }, - { EPP_LAYOUT_TITLEANDBODYSLIDE, { 0x0d, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x15, 0x0d, 0x0e, sal_True, sal_False, sal_False }, - { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x16, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x16, 0x0d, 0x0e, sal_True, sal_True, sal_False }, - { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x0e, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, sal_True, sal_True, sal_False }, - { EPP_LAYOUT_TITLEANDBODYSLIDE, { 0x0d, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, sal_True, sal_False, sal_False }, - { EPP_LAYOUT_RIGHTCOLUMN2ROWS, { 0x0d, 0x0e, 0x13, 0x13, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, sal_True, sal_True, sal_False }, - { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x13, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, sal_True, sal_True, sal_False }, - { EPP_LAYOUT_2ROWSANDTITLE, { 0x0d, 0x13, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, sal_True, sal_True, sal_False }, - { EPP_LAYOUT_LEFTCOLUMN2ROWS, { 0x0d, 0x13, 0x13, 0x0e, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, sal_True, sal_True, sal_False }, - { EPP_LAYOUT_TOPROW2COLUMN, { 0x0d, 0x13, 0x13, 0x0e, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, sal_True, sal_True, sal_False }, - { EPP_LAYOUT_2ROWSANDTITLE, { 0x0d, 0x0e, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, sal_True, sal_True, sal_False }, - { EPP_LAYOUT_4OBJECTS, { 0x0d, 0x13, 0x13, 0x13, 0x13, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, sal_True, sal_False, sal_False }, - { EPP_LAYOUT_ONLYTITLE, { 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, sal_True, sal_False, sal_False }, - { EPP_LAYOUT_BLANCSLIDE, { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, sal_False, sal_False, sal_False }, - { EPP_LAYOUT_TITLERIGHT2BODIESLEFT, { 0x11, 0x12, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x14, 0x11, 0x12, sal_True, sal_True, sal_False }, - { EPP_LAYOUT_TITLERIGHTBODYLEFT, { 0x11, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x11, 0x12, sal_True, sal_True, sal_False }, - { EPP_LAYOUT_TITLEANDBODYSLIDE, { 0x0d, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x12, sal_True, sal_True, sal_False }, - { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x16, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x16, 0x0d, 0x12, sal_True, sal_True, sal_False } + { EPP_LAYOUT_TITLESLIDE, { 0x0d, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x10, true, true, false }, + { EPP_LAYOUT_TITLEANDBODYSLIDE, { 0x0d, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, true, true, false }, + { EPP_LAYOUT_TITLEANDBODYSLIDE, { 0x0d, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x14, 0x0d, 0x0e, true, true, false }, + { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x0e, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, true, true, true }, + { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x0e, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x14, 0x0d, 0x0e, true, true, false }, + { EPP_LAYOUT_BLANCSLIDE, { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, false, false, false }, + { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x0e, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x16, 0x0d, 0x0e, true, true, false }, + { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x14, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x14, 0x0d, 0x0e, true, true, false }, + { EPP_LAYOUT_TITLEANDBODYSLIDE, { 0x0d, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x15, 0x0d, 0x0e, true, false, false }, + { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x16, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x16, 0x0d, 0x0e, true, true, false }, + { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x0e, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, true, true, false }, + { EPP_LAYOUT_TITLEANDBODYSLIDE, { 0x0d, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, true, false, false }, + { EPP_LAYOUT_RIGHTCOLUMN2ROWS, { 0x0d, 0x0e, 0x13, 0x13, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, true, true, false }, + { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x13, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, true, true, false }, + { EPP_LAYOUT_2ROWSANDTITLE, { 0x0d, 0x13, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, true, true, false }, + { EPP_LAYOUT_LEFTCOLUMN2ROWS, { 0x0d, 0x13, 0x13, 0x0e, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, true, true, false }, + { EPP_LAYOUT_TOPROW2COLUMN, { 0x0d, 0x13, 0x13, 0x0e, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, true, true, false }, + { EPP_LAYOUT_2ROWSANDTITLE, { 0x0d, 0x0e, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, true, true, false }, + { EPP_LAYOUT_4OBJECTS, { 0x0d, 0x13, 0x13, 0x13, 0x13, 0x00, 0x00, 0x00 }, 0x13, 0x0d, 0x0e, true, false, false }, + { EPP_LAYOUT_ONLYTITLE, { 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, true, false, false }, + { EPP_LAYOUT_BLANCSLIDE, { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x0e, false, false, false }, + { EPP_LAYOUT_TITLERIGHT2BODIESLEFT, { 0x11, 0x12, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x14, 0x11, 0x12, true, true, false }, + { EPP_LAYOUT_TITLERIGHTBODYLEFT, { 0x11, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x11, 0x12, true, true, false }, + { EPP_LAYOUT_TITLEANDBODYSLIDE, { 0x0d, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x00, 0x0d, 0x12, true, true, false }, + { EPP_LAYOUT_2COLUMNSANDTITLE, { 0x0d, 0x16, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x16, 0x0d, 0x12, true, true, false } }; PPTWriterBase::PPTWriterBase() @@ -252,7 +252,7 @@ void PPTWriterBase::exportPPT( const std::vector< com::sun::star::beans::Propert exportPPTPost(); } -sal_Bool PPTWriterBase::InitSOIface() +bool PPTWriterBase::InitSOIface() { while( true ) { @@ -274,12 +274,12 @@ sal_Bool PPTWriterBase::InitSOIface() if ( !GetPageByIndex( 0, NORMAL ) ) break; - return sal_True; + return true; } - return sal_False; + return false; } -sal_Bool PPTWriterBase::GetPageByIndex( sal_uInt32 nIndex, PageType ePageType ) +bool PPTWriterBase::GetPageByIndex( sal_uInt32 nIndex, PageType ePageType ) { while( true ) { @@ -292,7 +292,7 @@ sal_Bool PPTWriterBase::GetPageByIndex( sal_uInt32 nIndex, PageType ePageType ) { mXDrawPages = mXDrawPagesSupplier->getDrawPages(); if( !mXDrawPages.is() ) - return sal_False; + return false; } break; @@ -300,7 +300,7 @@ sal_Bool PPTWriterBase::GetPageByIndex( sal_uInt32 nIndex, PageType ePageType ) { mXDrawPages = mXMasterPagesSupplier->getMasterPages(); if( !mXDrawPages.is() ) - return sal_False; + return false; } break; default: @@ -331,7 +331,7 @@ sal_Bool PPTWriterBase::GetPageByIndex( sal_uInt32 nIndex, PageType ePageType ) /* try to get the "real" background PropertySet. If the normal page is not supporting this property, it is taken the property from the master */ - sal_Bool bHasBackground = GetPropertyValue( aAny, mXPagePropSet, OUString( "Background" ), sal_True ); + bool bHasBackground = GetPropertyValue( aAny, mXPagePropSet, OUString( "Background" ), true ); if ( bHasBackground ) bHasBackground = ( aAny >>= mXBackgroundPropSet ); if ( !bHasBackground ) @@ -348,7 +348,7 @@ sal_Bool PPTWriterBase::GetPageByIndex( sal_uInt32 nIndex, PageType ePageType ) ( aXMasterDrawPage, UNO_QUERY ); if ( aXMasterPagePropSet.is() ) { - sal_Bool bBackground = GetPropertyValue( aAny, aXMasterPagePropSet, OUString( "Background" ) ); + bool bBackground = GetPropertyValue( aAny, aXMasterPagePropSet, OUString( "Background" ) ); if ( bBackground ) { aAny >>= mXBackgroundPropSet; @@ -357,23 +357,23 @@ sal_Bool PPTWriterBase::GetPageByIndex( sal_uInt32 nIndex, PageType ePageType ) } } } - return sal_True; + return true; } - return sal_False; + return false; } -sal_Bool PPTWriterBase::CreateSlide( sal_uInt32 nPageNum ) +bool PPTWriterBase::CreateSlide( sal_uInt32 nPageNum ) { Any aAny; if ( !GetPageByIndex( nPageNum, NORMAL ) ) - return sal_False; + return false; sal_uInt32 nMasterNum = GetMasterIndex( NORMAL ); SetCurrentStyleSheet( nMasterNum ); Reference< XPropertySet > aXBackgroundPropSet; - sal_Bool bHasBackground = GetPropertyValue( aAny, mXPagePropSet, OUString( "Background" ) ); + bool bHasBackground = GetPropertyValue( aAny, mXPagePropSet, OUString( "Background" ) ); if ( bHasBackground ) bHasBackground = ( aAny >>= aXBackgroundPropSet ); @@ -384,7 +384,7 @@ sal_Bool PPTWriterBase::CreateSlide( sal_uInt32 nPageNum ) /* sj: Don't know what's IsBackgroundVisible for, have to ask cl if ( GetPropertyValue( aAny, mXPagePropSet, OUString( "IsBackgroundVisible" ) ) ) { - sal_Bool bBackgroundVisible; + bool bBackgroundVisible; if ( aAny >>= bBackgroundVisible ) { if ( bBackgroundVisible ) @@ -394,7 +394,7 @@ sal_Bool PPTWriterBase::CreateSlide( sal_uInt32 nPageNum ) */ if ( GetPropertyValue( aAny, mXPagePropSet, OUString( "IsBackgroundObjectsVisible" ) ) ) { - sal_Bool bBackgroundObjectsVisible = sal_False; + bool bBackgroundObjectsVisible = false; if ( aAny >>= bBackgroundObjectsVisible ) { if ( !bBackgroundObjectsVisible ) @@ -404,35 +404,35 @@ sal_Bool PPTWriterBase::CreateSlide( sal_uInt32 nPageNum ) ImplWriteSlide( nPageNum, nMasterNum, nMode, bHasBackground, aXBackgroundPropSet ); - return sal_True; + return true; }; -sal_Bool PPTWriterBase::CreateNotes( sal_uInt32 nPageNum ) +bool PPTWriterBase::CreateNotes( sal_uInt32 nPageNum ) { if ( !GetPageByIndex( nPageNum, NOTICE ) ) - return sal_False; + return false; SetCurrentStyleSheet( GetMasterIndex( NORMAL ) ); ImplWriteNotes( nPageNum ); - return sal_True; + return true; }; -sal_Bool PPTWriterBase::CreateSlideMaster( sal_uInt32 nPageNum ) +bool PPTWriterBase::CreateSlideMaster( sal_uInt32 nPageNum ) { if ( !GetPageByIndex( nPageNum, MASTER ) ) - return sal_False; + return false; SetCurrentStyleSheet( nPageNum ); if ( !ImplGetPropertyValue( mXPagePropSet, OUString( "Background" ) ) ) // load background shape - return sal_False; + return false; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > aXBackgroundPropSet; if ( !( mAny >>= aXBackgroundPropSet ) ) - return sal_False; + return false; ImplWriteSlideMaster( nPageNum, aXBackgroundPropSet ); - return sal_True; + return true; }; sal_Int32 PPTWriterBase::GetLayoutOffset( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rXPropSet ) const @@ -505,21 +505,21 @@ sal_uInt32 PPTWriterBase::GetMasterIndex( PageType ePageType ) return nRetValue; } -sal_Bool PPTWriterBase::SetCurrentStyleSheet( sal_uInt32 nPageNum ) +bool PPTWriterBase::SetCurrentStyleSheet( sal_uInt32 nPageNum ) { - sal_Bool bRet = sal_False; + bool bRet = false; if ( nPageNum >= maStyleSheetList.size() ) nPageNum = 0; else - bRet = sal_True; + bRet = true; mpStyleSheet = maStyleSheetList[ nPageNum ]; return bRet; } -sal_Bool PPTWriterBase::GetStyleSheets() +bool PPTWriterBase::GetStyleSheets() { int nInstance, nLevel; - sal_Bool bRetValue = sal_False; + bool bRetValue = false; sal_uInt32 nPageNum; for ( nPageNum = 0; nPageNum < mnMasterPages; nPageNum++ ) @@ -653,33 +653,33 @@ sal_Bool PPTWriterBase::GetStyleSheets() return bRetValue; } -sal_Bool PPTWriterBase::CreateMainNotes() +bool PPTWriterBase::CreateMainNotes() { if ( !GetPageByIndex( 0, NOTICE ) ) - return sal_False; + return false; SetCurrentStyleSheet( 0 ); ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XMasterPageTarget > aXMasterPageTarget( mXDrawPage, ::com::sun::star::uno::UNO_QUERY ); if ( !aXMasterPageTarget.is() ) - return sal_False; + return false; mXDrawPage = aXMasterPageTarget->getMasterPage(); if ( !mXDrawPage.is() ) - return sal_False; + return false; mXPropSet = ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > ( mXDrawPage, ::com::sun::star::uno::UNO_QUERY ); if ( !mXPropSet.is() ) - return sal_False; + return false; mXShapes = ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > ( mXDrawPage, ::com::sun::star::uno::UNO_QUERY ); if ( !mXShapes.is() ) - return sal_False; + return false; return ImplCreateMainNotes(); } @@ -710,11 +710,11 @@ Rectangle PPTWriterBase::MapRectangle( const awt::Rectangle& rRect ) return Rectangle( Point( aP.X, aP.Y ), Size( aS.Width, aS.Height ) ); } -sal_Bool PPTWriterBase::GetShapeByIndex( sal_uInt32 nIndex, sal_Bool bGroup ) +bool PPTWriterBase::GetShapeByIndex( sal_uInt32 nIndex, bool bGroup ) { while(true) { - if ( ( bGroup == sal_False ) || ( GetCurrentGroupLevel() == 0 ) ) + if ( ( bGroup == false ) || ( GetCurrentGroupLevel() == 0 ) ) { Any aAny( mXShapes->getByIndex( nIndex ) ); aAny >>= mXShape; @@ -745,7 +745,7 @@ sal_Bool PPTWriterBase::GetShapeByIndex( sal_uInt32 nIndex, sal_Bool bGroup ) aTypeBuffer.remove(nPos, RTL_CONSTASCII_LENGTH("Shape")); mType = aTypeBuffer.makeStringAndClear(); - mbPresObj = mbEmptyPresObj = sal_False; + mbPresObj = mbEmptyPresObj = false; if ( ImplGetPropertyValue( OUString( "IsPresentationObject" ) ) ) mAny >>= mbPresObj; @@ -753,13 +753,13 @@ sal_Bool PPTWriterBase::GetShapeByIndex( sal_uInt32 nIndex, sal_Bool bGroup ) mAny >>= mbEmptyPresObj; mnAngle = ( PropValue::GetPropertyValue( aAny, - mXPropSet, OUString( "RotateAngle" ), sal_True ) ) + mXPropSet, OUString( "RotateAngle" ), true ) ) ? *((sal_Int32*)aAny.getValue() ) : 0; - return sal_True; + return true; } - return sal_False; + return false; } sal_Int8 PPTWriterBase::GetTransition( sal_Int16 nTransitionType, sal_Int16 nTransitionSubtype, FadeEffect eEffect, sal_uInt8& nDirection ) @@ -966,13 +966,13 @@ sal_Int8 PPTWriterBase::GetTransition( FadeEffect eEffect, sal_uInt8& nDirection return nPPTTransitionType; } -sal_Bool PPTWriterBase::ContainsOtherShapeThanPlaceholders( sal_Bool bForOOMLX ) +bool PPTWriterBase::ContainsOtherShapeThanPlaceholders( bool bForOOMLX ) { sal_uInt32 nShapes = mXShapes->getCount(); - sal_Bool bOtherThanPlaceHolders = sal_False; + bool bOtherThanPlaceHolders = false; if ( nShapes ) - for ( sal_uInt32 nIndex = 0; ( nIndex < nShapes ) && ( bOtherThanPlaceHolders == sal_False ); nIndex++ ) + for ( sal_uInt32 nIndex = 0; ( nIndex < nShapes ) && ( bOtherThanPlaceHolders == false ); nIndex++ ) { if ( GetShapeByIndex( nIndex ) && mType != "drawing.Page" ) { @@ -982,10 +982,10 @@ sal_Bool PPTWriterBase::ContainsOtherShapeThanPlaceholders( sal_Bool bForOOMLX ) Reference< XSimpleText > rXText( mXShape, UNO_QUERY ); if( rXText.is() && !rXText->getString().isEmpty() ) - bOtherThanPlaceHolders = sal_True; + bOtherThanPlaceHolders = true; } else - bOtherThanPlaceHolders = sal_True; + bOtherThanPlaceHolders = true; } DBG(printf("mType == %s\n", mType.getStr())); } diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx index 6d9453968ac4..886cb9459239 100644 --- a/sd/source/filter/eppt/pptx-epptooxml.cxx +++ b/sd/source/filter/eppt/pptx-epptooxml.cxx @@ -105,19 +105,19 @@ class PowerPointShapeExport : public ShapeExport { PowerPointExport& mrExport; PageType mePageType; - sal_Bool mbMaster; + bool mbMaster; public: PowerPointShapeExport( FSHelperPtr pFS, ShapeHashMap* pShapeMap, PowerPointExport* pFB ); - void SetMaster( sal_Bool bMaster ); + void SetMaster( bool bMaster ); void SetPageType( PageType ePageType ); ShapeExport& WriteNonVisualProperties( Reference< XShape > xShape ) SAL_OVERRIDE; ShapeExport& WriteTextShape( Reference< XShape > xShape ) SAL_OVERRIDE; ShapeExport& WriteUnknownShape( Reference< XShape > xShape ) SAL_OVERRIDE; ShapeExport& WritePlaceholderShape( Reference< XShape > xShape, PlaceholderType ePlaceholder ); - ShapeExport& WritePageShape( Reference< XShape > xShape, PageType ePageType, sal_Bool bPresObj ); + ShapeExport& WritePageShape( Reference< XShape > xShape, PageType ePageType, bool bPresObj ); // helper parts - sal_Bool WritePlaceholder( Reference< XShape > xShape, PlaceholderType ePlaceholder, sal_Bool bMaster ); + bool WritePlaceholder( Reference< XShape > xShape, PlaceholderType ePlaceholder, bool bMaster ); }; enum PPTXLayout { @@ -211,11 +211,11 @@ PowerPointShapeExport::PowerPointShapeExport( FSHelperPtr pFS, ShapeHashMap* pSh : ShapeExport( XML_p, pFS, pShapeMap, pFB ) , mrExport( *pFB ) , mePageType(UNDEFINED) - , mbMaster(sal_False) + , mbMaster(false) { } -void PowerPointShapeExport::SetMaster( sal_Bool bMaster ) +void PowerPointShapeExport::SetMaster( bool bMaster ) { mbMaster = bMaster; } @@ -733,7 +733,7 @@ void PowerPointExport::WriteAnimationAttributeName( FSHelperPtr pFS, const OUStr void PowerPointExport::WriteAnimationTarget( FSHelperPtr pFS, Any aTarget ) { sal_Int32 nBegin = -1, nEnd = -1; - sal_Bool bParagraphTarget; + bool bParagraphTarget; Reference< XShape > rXShape = AnimationExporter::getTargetElementShape( aTarget, nBegin, nEnd, bParagraphTarget ); if( rXShape.is() ) { @@ -754,7 +754,7 @@ void PowerPointExport::WriteAnimationTarget( FSHelperPtr pFS, Any aTarget ) } } -void PowerPointExport::WriteAnimationNodeAnimate( FSHelperPtr pFS, const Reference< XAnimationNode >& rXNode, sal_Int32 nXmlNodeType, sal_Bool bMainSeqChild ) +void PowerPointExport::WriteAnimationNodeAnimate( FSHelperPtr pFS, const Reference< XAnimationNode >& rXNode, sal_Int32 nXmlNodeType, bool bMainSeqChild ) { Reference< XAnimate > rXAnimate( rXNode, UNO_QUERY ); if( !rXAnimate.is() ) @@ -762,7 +762,7 @@ void PowerPointExport::WriteAnimationNodeAnimate( FSHelperPtr pFS, const Referen const char* pCalcMode = NULL; const char* pValueType = NULL; - sal_Bool bSimple = ( nXmlNodeType != XML_anim ); + bool bSimple = ( nXmlNodeType != XML_anim ); if( !bSimple ) { switch( rXAnimate->getCalcMode() ) { @@ -795,7 +795,7 @@ void PowerPointExport::WriteAnimationNodeAnimate( FSHelperPtr pFS, const Referen pFS->endElementNS( XML_p, nXmlNodeType ); } -void PowerPointExport::WriteAnimationNodeAnimateInside( FSHelperPtr pFS, const Reference< XAnimationNode >& rXNode, sal_Bool bMainSeqChild, sal_Bool bSimple ) +void PowerPointExport::WriteAnimationNodeAnimateInside( FSHelperPtr pFS, const Reference< XAnimationNode >& rXNode, bool bMainSeqChild, bool bSimple ) { Reference< XAnimate > rXAnimate( rXNode, UNO_QUERY ); if( !rXAnimate.is() ) @@ -826,7 +826,7 @@ void PowerPointExport::WriteAnimationNodeAnimateInside( FSHelperPtr pFS, const R pFS->startElementNS( XML_p, XML_cBhvr, XML_additive, pAdditive, FSEND ); - WriteAnimationNodeCommonPropsStart( pFS, rXNode, sal_True, bMainSeqChild ); + WriteAnimationNodeCommonPropsStart( pFS, rXNode, true, bMainSeqChild ); WriteAnimationTarget( pFS, rXAnimate->getTarget() ); WriteAnimationAttributeName( pFS, rXAnimate->getAttributeName() ); pFS->endElementNS( XML_p, XML_cBhvr ); @@ -834,7 +834,7 @@ void PowerPointExport::WriteAnimationNodeAnimateInside( FSHelperPtr pFS, const R WriteAnimateTo( pFS, rXAnimate->getTo(), rXAnimate->getAttributeName() ); } -void PowerPointExport::WriteAnimationCondition( FSHelperPtr pFS, const char* pDelay, const char* pEvent, double fDelay, sal_Bool bHasFDelay ) +void PowerPointExport::WriteAnimationCondition( FSHelperPtr pFS, const char* pDelay, const char* pEvent, double fDelay, bool bHasFDelay ) { if( bHasFDelay || pDelay || pEvent ) { if( !pEvent ) @@ -856,9 +856,9 @@ void PowerPointExport::WriteAnimationCondition( FSHelperPtr pFS, const char* pDe } } -void PowerPointExport::WriteAnimationCondition( FSHelperPtr pFS, Any& rAny, sal_Bool bWriteEvent, sal_Bool bMainSeqChild ) +void PowerPointExport::WriteAnimationCondition( FSHelperPtr pFS, Any& rAny, bool bWriteEvent, bool bMainSeqChild ) { - sal_Bool bHasFDelay = sal_False; + bool bHasFDelay = false; double fDelay = 0; Timing eTiming; Event aEvent; @@ -866,7 +866,7 @@ void PowerPointExport::WriteAnimationCondition( FSHelperPtr pFS, Any& rAny, sal_ const char* pEvent = NULL; if( rAny >>= fDelay ) - bHasFDelay = sal_True; + bHasFDelay = true; else if( rAny >>= eTiming ) { if( eTiming == Timing_INDEFINITE ) @@ -919,7 +919,7 @@ void PowerPointExport::WriteAnimationCondition( FSHelperPtr pFS, Any& rAny, sal_ } if( aEvent.Offset >>= fDelay ) { - bHasFDelay = sal_True; + bHasFDelay = true; DBG(printf ("event offset: %f\n", fDelay)); } else if( aEvent.Offset >>= eTiming ) { if( eTiming == Timing_INDEFINITE ) @@ -931,7 +931,7 @@ void PowerPointExport::WriteAnimationCondition( FSHelperPtr pFS, Any& rAny, sal_ WriteAnimationCondition( pFS, pDelay, pEvent, fDelay, bHasFDelay ); } -void PowerPointExport::WriteAnimationNodeCommonPropsStart( FSHelperPtr pFS, const Reference< XAnimationNode >& rXNode, sal_Bool bSingle, sal_Bool bMainSeqChild ) +void PowerPointExport::WriteAnimationNodeCommonPropsStart( FSHelperPtr pFS, const Reference< XAnimationNode >& rXNode, bool bSingle, bool bMainSeqChild ) { const char* pDuration = NULL; const char* pRestart = NULL; @@ -1023,7 +1023,7 @@ void PowerPointExport::WriteAnimationNodeCommonPropsStart( FSHelperPtr pFS, cons } sal_uInt32 nPresetId = 0; - sal_Bool bPresetId = sal_False; + bool bPresetId = false; if ( pAny[ DFF_ANIM_PRESET_ID ] ) { OUString sPreset; if ( *pAny[ DFF_ANIM_PRESET_ID ] >>= sPreset ) @@ -1031,12 +1031,12 @@ void PowerPointExport::WriteAnimationNodeCommonPropsStart( FSHelperPtr pFS, cons } sal_uInt32 nPresetSubType = 0; - sal_Bool bPresetSubType = sal_False; + bool bPresetSubType = false; if ( pAny[ DFF_ANIM_PRESET_SUB_TYPE ] ) { OUString sPresetSubType; if ( *pAny[ DFF_ANIM_PRESET_SUB_TYPE ] >>= sPresetSubType ) { nPresetSubType = AnimationExporter::TranslatePresetSubType( nPresetClass, nPresetId, sPresetSubType ); - bPresetSubType = sal_True; + bPresetSubType = true; } } @@ -1077,9 +1077,9 @@ void PowerPointExport::WriteAnimationNodeCommonPropsStart( FSHelperPtr pFS, cons pFS->startElementNS( XML_p, XML_stCondLst, FSEND ); if( aAny >>= aCondSeq ) { for( int i = 0; i < aCondSeq.getLength(); i ++ ) - WriteAnimationCondition( pFS, aCondSeq[ i ], sal_False, bMainSeqChild ); + WriteAnimationCondition( pFS, aCondSeq[ i ], false, bMainSeqChild ); } else - WriteAnimationCondition( pFS, aAny, sal_False, bMainSeqChild ); + WriteAnimationCondition( pFS, aAny, false, bMainSeqChild ); pFS->endElementNS( XML_p, XML_stCondLst ); } @@ -1090,9 +1090,9 @@ void PowerPointExport::WriteAnimationNodeCommonPropsStart( FSHelperPtr pFS, cons pFS->startElementNS( XML_p, XML_endCondLst, FSEND ); if( aAny >>= aCondSeq ) { for( int i = 0; i < aCondSeq.getLength(); i ++ ) - WriteAnimationCondition( pFS, aCondSeq[ i ], sal_False, bMainSeqChild ); + WriteAnimationCondition( pFS, aCondSeq[ i ], false, bMainSeqChild ); } else - WriteAnimationCondition( pFS, aAny, sal_False, bMainSeqChild ); + WriteAnimationCondition( pFS, aAny, false, bMainSeqChild ); pFS->endElementNS( XML_p, XML_stCondLst ); } @@ -1121,26 +1121,26 @@ void PowerPointExport::WriteAnimationNodeCommonPropsStart( FSHelperPtr pFS, cons pFS->endElementNS( XML_p, XML_cTn ); } -void PowerPointExport::WriteAnimationNodeSeq( FSHelperPtr pFS, const Reference< XAnimationNode >& rXNode, sal_Int32, sal_Bool bMainSeqChild ) +void PowerPointExport::WriteAnimationNodeSeq( FSHelperPtr pFS, const Reference< XAnimationNode >& rXNode, sal_Int32, bool bMainSeqChild ) { DBG(printf ("write animation node SEQ\n")); pFS->startElementNS( XML_p, XML_seq, FSEND ); - WriteAnimationNodeCommonPropsStart( pFS, rXNode, sal_True, bMainSeqChild ); + WriteAnimationNodeCommonPropsStart( pFS, rXNode, true, bMainSeqChild ); pFS->startElementNS( XML_p, XML_prevCondLst, FSEND ); - WriteAnimationCondition( pFS, NULL, "onPrev", 0, sal_True ); + WriteAnimationCondition( pFS, NULL, "onPrev", 0, true ); pFS->endElementNS( XML_p, XML_prevCondLst ); pFS->startElementNS( XML_p, XML_nextCondLst, FSEND ); - WriteAnimationCondition( pFS, NULL, "onNext", 0, sal_True ); + WriteAnimationCondition( pFS, NULL, "onNext", 0, true ); pFS->endElementNS( XML_p, XML_nextCondLst ); pFS->endElementNS( XML_p, XML_seq ); } -void PowerPointExport::WriteAnimationNodeEffect( FSHelperPtr pFS, const Reference< XAnimationNode >& rXNode, sal_Int32, sal_Bool bMainSeqChild ) +void PowerPointExport::WriteAnimationNodeEffect( FSHelperPtr pFS, const Reference< XAnimationNode >& rXNode, sal_Int32, bool bMainSeqChild ) { DBG(printf ("write animation node FILTER\n")); @@ -1153,17 +1153,17 @@ void PowerPointExport::WriteAnimationNodeEffect( FSHelperPtr pFS, const Referenc XML_transition, pDirection, FSEND ); - WriteAnimationNodeAnimateInside( pFS, rXNode, bMainSeqChild, sal_False ); + WriteAnimationNodeAnimateInside( pFS, rXNode, bMainSeqChild, false ); pFS->endElementNS( XML_p, XML_animEffect ); } } -void PowerPointExport::WriteAnimationNode( FSHelperPtr pFS, const Reference< XAnimationNode >& rXNode, sal_Bool bMainSeqChild ) +void PowerPointExport::WriteAnimationNode( FSHelperPtr pFS, const Reference< XAnimationNode >& rXNode, bool bMainSeqChild ) { DBG(printf ("export node type: %d\n", rXNode->getType())); sal_Int32 xmlNodeType = -1; - typedef void (PowerPointExport::*AnimationNodeWriteMethod)( FSHelperPtr, const Reference< XAnimationNode >&, sal_Int32, sal_Bool ); + typedef void (PowerPointExport::*AnimationNodeWriteMethod)( FSHelperPtr, const Reference< XAnimationNode >&, sal_Int32, bool ); AnimationNodeWriteMethod pMethod = NULL; switch( rXNode->getType() ) { @@ -1197,7 +1197,7 @@ void PowerPointExport::WriteAnimationNode( FSHelperPtr pFS, const Reference< XAn pFS->startElementNS( XML_p, xmlNodeType, FSEND ); - WriteAnimationNodeCommonPropsStart( pFS, rXNode, sal_True, bMainSeqChild ); + WriteAnimationNodeCommonPropsStart( pFS, rXNode, true, bMainSeqChild ); pFS->endElementNS( XML_p, xmlNodeType ); } @@ -1216,7 +1216,7 @@ void PowerPointExport::WriteAnimations( FSHelperPtr pFS ) pFS->startElementNS( XML_p, XML_timing, FSEND ); pFS->startElementNS( XML_p, XML_tnLst, FSEND ); - WriteAnimationNode( pFS, xNode, sal_False ); + WriteAnimationNode( pFS, xNode, false ); pFS->endElementNS( XML_p, XML_tnLst ); pFS->endElementNS( XML_p, XML_timing ); @@ -1350,7 +1350,7 @@ bool PowerPointExport::WriteComments( sal_uInt32 nPageNum ) } void PowerPointExport::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_uInt16 /* nMode */, - sal_Bool bHasBackground, Reference< XPropertySet > aXBackgroundPropSet ) + bool bHasBackground, Reference< XPropertySet > aXBackgroundPropSet ) { DBG(printf("write slide: %" SAL_PRIuUINT32 "\n----------------\n", nPageNum)); @@ -1389,7 +1389,7 @@ void PowerPointExport::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNu const char* pShow = NULL; if( GETA( Visible ) ) { - sal_Bool bShow(sal_False); + bool bShow(false); if( ( mAny >>= bShow ) && !bShow ) pShow = "0"; } @@ -1405,7 +1405,7 @@ void PowerPointExport::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNu ImplWriteBackground( pFS, aXBackgroundPropSet ); } - WriteShapeTree( pFS, NORMAL, sal_False ); + WriteShapeTree( pFS, NORMAL, false ); pFS->endElementNS( XML_p, XML_cSld ); @@ -1438,7 +1438,7 @@ void PowerPointExport::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNu void PowerPointExport::ImplWriteNotes( sal_uInt32 nPageNum ) { - if( !mbCreateNotes || !ContainsOtherShapeThanPlaceholders( sal_True ) ) + if( !mbCreateNotes || !ContainsOtherShapeThanPlaceholders( true ) ) return; DBG(printf("write Notes %" SAL_PRIuUINT32 "\n----------------\n", nPageNum)); @@ -1454,7 +1454,7 @@ void PowerPointExport::ImplWriteNotes( sal_uInt32 nPageNum ) pFS->startElementNS( XML_p, XML_cSld, FSEND ); - WriteShapeTree( pFS, NOTICE, sal_False ); + WriteShapeTree( pFS, NOTICE, false ); pFS->endElementNS( XML_p, XML_cSld ); @@ -1565,7 +1565,7 @@ void PowerPointExport::ImplWriteSlideMaster( sal_uInt32 nPageNum, Reference< XPr pFS->startElementNS( XML_p, XML_cSld, FSEND ); ImplWriteBackground( pFS, aXBackgroundPropSet ); - WriteShapeTree( pFS, LAYOUT, sal_True ); + WriteShapeTree( pFS, LAYOUT, true ); pFS->endElementNS( XML_p, XML_cSld ); @@ -1679,7 +1679,7 @@ void PowerPointExport::ImplWritePPTXLayout( sal_Int32 nOffset, sal_uInt32 nMaste XML_name, aLayoutInfo[ nOffset ].sName, FSEND ); //pFS->write( MINIMAL_SPTREE ); // TODO: write actual shape tree - WriteShapeTree( pFS, LAYOUT, sal_True ); + WriteShapeTree( pFS, LAYOUT, true ); pFS->endElementNS( XML_p, XML_cSld ); @@ -1692,7 +1692,7 @@ void PowerPointExport::ImplWritePPTXLayout( sal_Int32 nOffset, sal_uInt32 nMaste xDrawPages->remove( xSlide ); } -void PowerPointExport::WriteShapeTree( FSHelperPtr pFS, PageType ePageType, sal_Bool bMaster ) +void PowerPointExport::WriteShapeTree( FSHelperPtr pFS, PageType ePageType, bool bMaster ) { PowerPointShapeExport aDML( pFS, &maShapeMap, this ); aDML.SetMaster( bMaster ); @@ -1711,7 +1711,7 @@ void PowerPointExport::WriteShapeTree( FSHelperPtr pFS, PageType ePageType, sal_ DBG(printf( "leave group\n" )); } - if ( GetShapeByIndex( GetCurrentGroupIndex(), sal_True ) ) { + if ( GetShapeByIndex( GetCurrentGroupIndex(), true ) ) { DBG(printf( "mType: \"%s\"\n", mType.getStr() )); aDML.WriteShape( mXShape ); } @@ -1723,7 +1723,7 @@ void PowerPointExport::WriteShapeTree( FSHelperPtr pFS, PageType ePageType, sal_ #define BEGIN_SHAPE mpFS->startElementNS( XML_p, XML_sp, FSEND ) #define END_SHAPE mpFS->endElementNS( XML_p, XML_sp ) -ShapeExport& PowerPointShapeExport::WritePageShape( Reference< XShape > xShape, PageType ePageType, sal_Bool bPresObj ) +ShapeExport& PowerPointShapeExport::WritePageShape( Reference< XShape > xShape, PageType ePageType, bool bPresObj ) { if( ( ePageType == NOTICE && bPresObj ) || ePageType == LAYOUT ) return WritePlaceholderShape( xShape, SlideImage ); @@ -1731,16 +1731,16 @@ ShapeExport& PowerPointShapeExport::WritePageShape( Reference< XShape > xShape, return WriteTextShape( xShape ); } -sal_Bool PowerPointShapeExport::WritePlaceholder( Reference< XShape > xShape, PlaceholderType ePlaceholder, sal_Bool bMaster ) +bool PowerPointShapeExport::WritePlaceholder( Reference< XShape > xShape, PlaceholderType ePlaceholder, bool bMaster ) { DBG(printf("WritePlaceholder %d %d\n", bMaster, ShapeExport::NonEmptyText( xShape ))); if( bMaster && ShapeExport::NonEmptyText( xShape ) ) { WritePlaceholderShape( xShape, ePlaceholder ); - return sal_True; + return true; } - return sal_False; + return false; } ShapeExport& PowerPointShapeExport::WritePlaceholderShape( Reference< XShape > xShape, PlaceholderType ePlaceholder ) @@ -2045,25 +2045,25 @@ void PowerPointExport::WriteTheme( sal_Int32 nThemeNum ) pFS->endElementNS( XML_a, XML_theme ); } -sal_Bool PowerPointExport::ImplCreateDocument() +bool PowerPointExport::ImplCreateDocument() { - mbCreateNotes = sal_False; + mbCreateNotes = false; for( sal_uInt32 i = 0; i < mnPages; i++ ) { if ( !GetPageByIndex( i, NOTICE ) ) - return sal_False; + return false; - if( ContainsOtherShapeThanPlaceholders( sal_True ) ) { - mbCreateNotes = sal_True; + if( ContainsOtherShapeThanPlaceholders( true ) ) { + mbCreateNotes = true; break; } } - return sal_True; + return true; } -sal_Bool PowerPointExport::WriteNotesMaster() +bool PowerPointExport::WriteNotesMaster() { DBG(printf("write Notes master\n----------------\n")); @@ -2103,7 +2103,7 @@ sal_Bool PowerPointExport::WriteNotesMaster() ( mAny >>= aXBackgroundPropSet ) ) ImplWriteBackground( pFS, aXBackgroundPropSet ); - WriteShapeTree( pFS, NOTICE, sal_True ); + WriteShapeTree( pFS, NOTICE, true ); pFS->endElementNS( XML_p, XML_cSld ); @@ -2127,15 +2127,15 @@ sal_Bool PowerPointExport::WriteNotesMaster() DBG(printf("----------------\n")); - return sal_True; + return true; } -sal_Bool PowerPointExport::ImplCreateMainNotes() +bool PowerPointExport::ImplCreateMainNotes() { if( mbCreateNotes ) return WriteNotesMaster(); - return sal_True; + return true; } OUString SAL_CALL PowerPointExport_getImplementationName() throw() diff --git a/sd/source/filter/eppt/pptx-grouptable.cxx b/sd/source/filter/eppt/pptx-grouptable.cxx index a6595d98af23..24c398f5a46f 100644 --- a/sd/source/filter/eppt/pptx-grouptable.cxx +++ b/sd/source/filter/eppt/pptx-grouptable.cxx @@ -54,9 +54,9 @@ void GroupTable::ImplResizeGroupTable( sal_uInt32 nEntrys ) -sal_Bool GroupTable::EnterGroup( ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& rXIndexAccessRef ) +bool GroupTable::EnterGroup( ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& rXIndexAccessRef ) { - sal_Bool bRet = sal_False; + bool bRet = false; if ( rXIndexAccessRef.is() ) { GroupEntry* pNewGroup = new GroupEntry( rXIndexAccessRef ); @@ -65,7 +65,7 @@ sal_Bool GroupTable::EnterGroup( ::com::sun::star::uno::Reference< ::com::sun::s if ( mnMaxGroupEntry == mnCurrentGroupEntry ) ImplResizeGroupTable( mnMaxGroupEntry + 8 ); mpGroupEntry[ mnCurrentGroupEntry++ ] = pNewGroup; - bRet = sal_True; + bRet = true; } else delete pNewGroup; @@ -100,21 +100,21 @@ void GroupTable::ResetGroupTable( sal_uInt32 nCount ) -sal_Bool GroupTable::GetNextGroupEntry() +bool GroupTable::GetNextGroupEntry() { while ( mnCurrentGroupEntry ) { mnIndex = mpGroupEntry[ mnCurrentGroupEntry - 1 ]->mnCurrentPos++; if ( mpGroupEntry[ mnCurrentGroupEntry - 1 ]->mnCount > mnIndex ) - return sal_True; + return true; delete ( mpGroupEntry[ --mnCurrentGroupEntry ] ); if ( mnCurrentGroupEntry ) mnGroupsClosed++; } - return sal_False; + return false; } diff --git a/sd/source/filter/eppt/pptx-stylesheet.cxx b/sd/source/filter/eppt/pptx-stylesheet.cxx index b99755e9ab8e..cd1e8fd6570f 100644 --- a/sd/source/filter/eppt/pptx-stylesheet.cxx +++ b/sd/source/filter/eppt/pptx-stylesheet.cxx @@ -90,7 +90,7 @@ void PPTExCharSheet::SetStyleSheet( const ::com::sun::star::uno::Reference< ::co rLev.mnFlags = aPortionObj.mnCharAttr; } -void PPTExCharSheet::Write( SvStream& rSt, PptEscherEx*, sal_uInt16 nLev, sal_Bool, sal_Bool bSimpleText, +void PPTExCharSheet::Write( SvStream& rSt, PptEscherEx*, sal_uInt16 nLev, bool, bool bSimpleText, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rPagePropSet ) { const PPTExCharLevel& rLev = maCharLevel[ nLev ]; @@ -106,9 +106,9 @@ void PPTExCharSheet::Write( SvStream& rSt, PptEscherEx*, sal_uInt16 nLev, sal_Bo sal_uInt32 nFontColor = rLev.mnFontColor; if ( nFontColor == COL_AUTO ) { - sal_Bool bIsDark = sal_False; + bool bIsDark = false; ::com::sun::star::uno::Any aAny; - if ( PropValue::GetPropertyValue( aAny, rPagePropSet, OUString( "IsBackgroundDark" ), sal_True ) ) + if ( PropValue::GetPropertyValue( aAny, rPagePropSet, OUString( "IsBackgroundDark" ), true ) ) aAny >>= bIsDark; nFontColor = bIsDark ? 0xffffff : 0x000000; } @@ -134,7 +134,7 @@ PPTExParaSheet::PPTExParaSheet( int nInstance, sal_uInt16 nDefaultTab, PPTExBull rBuProv ( rProv ), mnInstance ( nInstance ) { - sal_Bool bHasBullet = sal_False; + bool bHasBullet = false; sal_uInt16 nUpperDist = 0; sal_uInt16 nBulletChar = 0x2022; @@ -154,7 +154,7 @@ PPTExParaSheet::PPTExParaSheet( int nInstance, sal_uInt16 nDefaultTab, PPTExBull case EPP_TEXTTYPE_HalfBody : case EPP_TEXTTYPE_QuarterBody : { - bHasBullet = sal_True; + bHasBullet = true; nUpperDist = 0x14; } break; @@ -216,7 +216,7 @@ PPTExParaSheet::PPTExParaSheet( int nInstance, sal_uInt16 nDefaultTab, PPTExBull rLev.mnAsianSettings = 2; rLev.mnBiDi = 0; - rLev.mbExtendedBulletsUsed = sal_False; + rLev.mbExtendedBulletsUsed = false; rLev.mnBulletId = 0xffff; rLev.mnBulletStart = 0; rLev.mnMappedNumType = 0; @@ -238,7 +238,7 @@ void PPTExParaSheet::SetStyleSheet( const ::com::sun::star::uno::Reference< ::co sal_Int16 nLineSpacing = aParagraphObj.mnLineSpacing; if ( nLineSpacing > 0 ) // if nLinespacing is < 0 the linespacing is an absolute spacing { - sal_Bool bFixedLineSpacing = sal_False; + bool bFixedLineSpacing = false; uno::Any aAny = rXPropSet->getPropertyValue("FontIndependentLineSpacing"); if( !(aAny >>= bFixedLineSpacing) || !bFixedLineSpacing ) { @@ -293,7 +293,7 @@ void PPTExParaSheet::SetStyleSheet( const ::com::sun::star::uno::Reference< ::co { PPTExParaLevel& rLevel = maParaLevel[ i ]; if ( i ) - aParagraphObj.ImplGetNumberingLevel( rBuProv, i, sal_False ); + aParagraphObj.ImplGetNumberingLevel( rBuProv, i, false ); rLevel.mnTextOfs = aParagraphObj.nTextOfs; rLevel.mnBulletOfs = (sal_uInt16)aParagraphObj.nBulletOfs; rLevel.mnBulletChar = aParagraphObj.cBulletId; @@ -313,7 +313,7 @@ void PPTExParaSheet::SetStyleSheet( const ::com::sun::star::uno::Reference< ::co } } -void PPTExParaSheet::Write( SvStream& rSt, PptEscherEx*, sal_uInt16 nLev, sal_Bool, sal_Bool bSimpleText, +void PPTExParaSheet::Write( SvStream& rSt, PptEscherEx*, sal_uInt16 nLev, bool, bool bSimpleText, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rPagePropSet ) { const PPTExParaLevel& rLev = maParaLevel[ nLev ]; @@ -349,9 +349,9 @@ void PPTExParaSheet::Write( SvStream& rSt, PptEscherEx*, sal_uInt16 nLev, sal_Bo sal_uInt32 nBulletColor = rLev.mnBulletColor; if ( nBulletColor == COL_AUTO ) { - sal_Bool bIsDark = sal_False; + bool bIsDark = false; ::com::sun::star::uno::Any aAny; - if ( PropValue::GetPropertyValue( aAny, rPagePropSet, OUString( "IsBackgroundDark" ), sal_True ) ) + if ( PropValue::GetPropertyValue( aAny, rPagePropSet, OUString( "IsBackgroundDark" ), true ) ) aAny >>= bIsDark; nBulletColor = bIsDark ? 0xffffff : 0x000000; } @@ -416,7 +416,7 @@ void PPTExStyleSheet::SetStyleSheet( const ::com::sun::star::uno::Reference< ::c mpParaSheet[ nInstance ]->SetStyleSheet( rXPropSet, rFontCollection, nLevel, mpCharSheet[ nInstance ]->maCharLevel[ nLevel ] ); } -sal_Bool PPTExStyleSheet::IsHardAttribute( sal_uInt32 nInstance, sal_uInt32 nLevel, PPTExTextAttr eAttr, sal_uInt32 nValue ) +bool PPTExStyleSheet::IsHardAttribute( sal_uInt32 nInstance, sal_uInt32 nLevel, PPTExTextAttr eAttr, sal_uInt32 nValue ) { const PPTExParaLevel& rPara = mpParaSheet[ nInstance ]->maParaLevel[ nLevel ]; const PPTExCharLevel& rChar = mpCharSheet[ nInstance ]->maCharLevel[ nLevel ]; @@ -449,7 +449,7 @@ sal_Bool PPTExStyleSheet::IsHardAttribute( sal_uInt32 nInstance, sal_uInt32 nLev case CharAttr_Embossed : nFlag = 512; break; case CharAttr_Font : return ( rChar.mnFont != nValue ); case CharAttr_AsianOrComplexFont : return ( rChar.mnAsianOrComplexFont != nValue ); - case CharAttr_Symbol : return sal_True; + case CharAttr_Symbol : return true; case CharAttr_FontHeight : return ( rChar.mnFontHeight != nValue ); case CharAttr_FontColor : return ( rChar.mnFontColor != nValue ); case CharAttr_Escapement : return ( rChar.mnEscapement != nValue ); @@ -463,7 +463,7 @@ sal_Bool PPTExStyleSheet::IsHardAttribute( sal_uInt32 nInstance, sal_uInt32 nLev else return ( ( nValue & nFlag ) != 0 ); } - return sal_True; + return true; } sal_uInt32 PPTExStyleSheet::SizeOfTxCFStyleAtom() const diff --git a/sd/source/filter/eppt/pptx-text.cxx b/sd/source/filter/eppt/pptx-text.cxx index 75effa87af83..e2cd4b66c2cb 100644 --- a/sd/source/filter/eppt/pptx-text.cxx +++ b/sd/source/filter/eppt/pptx-text.cxx @@ -59,17 +59,17 @@ PortionObj::PortionObj( const ::com::sun::star::uno::Reference< ::com::sun::star mnFont ( 0 ), mnAsianOrComplexFont( 0xffff ), mnTextSize ( 0 ), - mbLastPortion ( sal_True ), + mbLastPortion ( true ), mpText ( NULL ), mpFieldEntry ( NULL ) { mXPropSet = rXPropSet; - ImplGetPortionValues( rFontCollection, sal_False ); + ImplGetPortionValues( rFontCollection, false ); } PortionObj::PortionObj(::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & rXTextRange, - sal_Bool bLast, FontCollection& rFontCollection) + bool bLast, FontCollection& rFontCollection) : meCharColor(css::beans::PropertyState_AMBIGUOUS_VALUE) , meCharHeight(css::beans::PropertyState_AMBIGUOUS_VALUE) , meFontName(css::beans::PropertyState_AMBIGUOUS_VALUE) @@ -88,7 +88,7 @@ PortionObj::PortionObj(::com::sun::star::uno::Reference< ::com::sun::star::text: { OUString aString( rXTextRange->getString() ); OUString aURL; - sal_Bool bRTL_endingParen = sal_False; + bool bRTL_endingParen = false; mnTextSize = aString.getLength(); if ( bLast ) @@ -106,7 +106,7 @@ PortionObj::PortionObj(::com::sun::star::uno::Reference< ::com::sun::star::text: ::com::sun::star::beans::XPropertyState > ( rXTextRange, ::com::sun::star::uno::UNO_QUERY ); - sal_Bool bPropSetsValid = ( mXPropSet.is() && mXPropState.is() ); + bool bPropSetsValid = ( mXPropSet.is() && mXPropState.is() ); if ( bPropSetsValid ) nFieldType = ImplGetTextField( rXTextRange, mXPropSet, aURL ); if ( nFieldType ) @@ -118,14 +118,14 @@ PortionObj::PortionObj(::com::sun::star::uno::Reference< ::com::sun::star::text: mpFieldEntry->aFieldUrl = aURL; } } - sal_Bool bSymbol = sal_False; + bool bSymbol = false; - if ( bPropSetsValid && ImplGetPropertyValue( OUString( "CharFontCharSet" ), sal_False ) ) + if ( bPropSetsValid && ImplGetPropertyValue( OUString( "CharFontCharSet" ), false ) ) { sal_Int16 nCharset = 0; mAny >>= nCharset; if ( nCharset == ::com::sun::star::awt::CharSet::SYMBOL ) - bSymbol = sal_True; + bSymbol = true; } if ( mpFieldEntry && ( nFieldType & 0x800000 ) ) // placeholder ? { @@ -144,7 +144,7 @@ PortionObj::PortionObj(::com::sun::star::uno::Reference< ::com::sun::star::text: && rFontCollection.GetScriptDirection(aString) == com::sun::star::i18n::ScriptDirection::RIGHT_TO_LEFT) { mnTextSize++; - bRTL_endingParen = sal_True; + bRTL_endingParen = true; } mpText = new sal_uInt16[ mnTextSize ]; sal_uInt16 nChar; @@ -203,7 +203,7 @@ PortionObj::PortionObj(::com::sun::star::uno::Reference< ::com::sun::star::text: mpText[ mnTextSize - 1 ] = 0xd; if ( bPropSetsValid ) - ImplGetPortionValues( rFontCollection, sal_True ); + ImplGetPortionValues( rFontCollection, true ); } } @@ -218,7 +218,7 @@ PortionObj::~PortionObj() ImplClear(); } -void PortionObj::Write( SvStream* pStrm, sal_Bool bLast ) +void PortionObj::Write( SvStream* pStrm, bool bLast ) { sal_uInt32 nCount = mnTextSize; if ( bLast && mbLastPortion ) @@ -227,10 +227,10 @@ void PortionObj::Write( SvStream* pStrm, sal_Bool bLast ) pStrm->WriteUInt16( (sal_uInt16)mpText[ i ] ); } -void PortionObj::ImplGetPortionValues( FontCollection& rFontCollection, sal_Bool bGetPropStateValue ) +void PortionObj::ImplGetPortionValues( FontCollection& rFontCollection, bool bGetPropStateValue ) { - sal_Bool bOk = ImplGetPropertyValue( OUString( "CharFontName" ), bGetPropStateValue ); + bool bOk = ImplGetPropertyValue( OUString( "CharFontName" ), bGetPropStateValue ); meFontName = ePropState; if ( bOk ) { @@ -240,11 +240,11 @@ void PortionObj::ImplGetPortionValues( FontCollection& rFontCollection, sal_Bool if ( mnFont == nCount ) { FontCollectionEntry& rFontDesc = rFontCollection.GetLast(); - if ( ImplGetPropertyValue( OUString( "CharFontCharSet" ), sal_False ) ) + if ( ImplGetPropertyValue( OUString( "CharFontCharSet" ), false ) ) mAny >>= rFontDesc.CharSet; - if ( ImplGetPropertyValue( OUString( "CharFontFamily" ), sal_False ) ) + if ( ImplGetPropertyValue( OUString( "CharFontFamily" ), false ) ) mAny >>= rFontDesc.Family; - if ( ImplGetPropertyValue( OUString( "CharFontPitch" ), sal_False ) ) + if ( ImplGetPropertyValue( OUString( "CharFontPitch" ), false ) ) mAny >>= rFontDesc.Pitch; } } @@ -267,11 +267,11 @@ void PortionObj::ImplGetPortionValues( FontCollection& rFontCollection, sal_Bool if ( mnAsianOrComplexFont == nCount ) { FontCollectionEntry& rFontDesc = rFontCollection.GetLast(); - if ( ImplGetPropertyValue( OUString( "CharFontCharSetAsian" ), sal_False ) ) + if ( ImplGetPropertyValue( OUString( "CharFontCharSetAsian" ), false ) ) mAny >>= rFontDesc.CharSet; - if ( ImplGetPropertyValue( OUString( "CharFontFamilyAsian" ), sal_False ) ) + if ( ImplGetPropertyValue( OUString( "CharFontFamilyAsian" ), false ) ) mAny >>= rFontDesc.Family; - if ( ImplGetPropertyValue( OUString( "CharFontPitchAsian" ), sal_False ) ) + if ( ImplGetPropertyValue( OUString( "CharFontPitchAsian" ), false ) ) mAny >>= rFontDesc.Pitch; } } @@ -288,11 +288,11 @@ void PortionObj::ImplGetPortionValues( FontCollection& rFontCollection, sal_Bool if ( mnAsianOrComplexFont == nCount ) { FontCollectionEntry& rFontDesc = rFontCollection.GetLast(); - if ( ImplGetPropertyValue( OUString( "CharFontCharSetComplex" ), sal_False ) ) + if ( ImplGetPropertyValue( OUString( "CharFontCharSetComplex" ), false ) ) mAny >>= rFontDesc.CharSet; - if ( ImplGetPropertyValue( OUString( "CharFontFamilyComplex" ), sal_False ) ) + if ( ImplGetPropertyValue( OUString( "CharFontFamilyComplex" ), false ) ) mAny >>= rFontDesc.Family; - if ( ImplGetPropertyValue( OUString( "CharFontPitchComplex" ), sal_False ) ) + if ( ImplGetPropertyValue( OUString( "CharFontPitchComplex" ), false ) ) mAny >>= rFontDesc.Pitch; } } @@ -328,7 +328,7 @@ void PortionObj::ImplGetPortionValues( FontCollection& rFontCollection, sal_Bool } mnCharHeight = 24; - if ( GetPropertyValue( mAny, mXPropSet, aCharHeightName, sal_False ) ) + if ( GetPropertyValue( mAny, mXPropSet, aCharHeightName, false ) ) { float fVal(0.0); if ( mAny >>= fVal ) @@ -337,7 +337,7 @@ void PortionObj::ImplGetPortionValues( FontCollection& rFontCollection, sal_Bool meCharHeight = GetPropertyState( mXPropSet, aCharHeightName ); } } - if ( GetPropertyValue( mAny, mXPropSet, aCharWeightName, sal_False ) ) + if ( GetPropertyValue( mAny, mXPropSet, aCharWeightName, false ) ) { float fFloat(0.0); if ( mAny >>= fFloat ) @@ -348,13 +348,13 @@ void PortionObj::ImplGetPortionValues( FontCollection& rFontCollection, sal_Bool mnCharAttrHard |= 1; } } - if ( GetPropertyValue( mAny, mXPropSet, aCharLocaleName, sal_False ) ) + if ( GetPropertyValue( mAny, mXPropSet, aCharLocaleName, false ) ) { com::sun::star::lang::Locale eLocale; if ( mAny >>= eLocale ) meCharLocale = eLocale; } - if ( GetPropertyValue( mAny, mXPropSet, aCharPostureName, sal_False ) ) + if ( GetPropertyValue( mAny, mXPropSet, aCharPostureName, false ) ) { ::com::sun::star::awt::FontSlant aFS; if ( mAny >>= aFS ) @@ -390,7 +390,7 @@ void PortionObj::ImplGetPortionValues( FontCollection& rFontCollection, sal_Bool if ( ImplGetPropertyValue( OUString( "CharShadowed" ), bGetPropStateValue ) ) { - sal_Bool bBool(sal_False); + bool bBool(false); mAny >>= bBool; if ( bBool ) mnCharAttr |= 0x10; @@ -496,12 +496,12 @@ sal_uInt32 PortionObj::ImplGetTextField( ::com::sun::star::uno::Reference< ::com sal_uInt32 nRetValue = 0; sal_Int32 nFormat; ::com::sun::star::uno::Any aAny; - if ( GetPropertyValue( aAny, rXPropSet, OUString( "TextPortionType" ), sal_True ) ) + if ( GetPropertyValue( aAny, rXPropSet, OUString( "TextPortionType" ), true ) ) { OUString aTextFieldType( *(OUString*)aAny.getValue() ); if ( aTextFieldType == "TextField" ) { - if ( GetPropertyValue( aAny, rXPropSet, aTextFieldType, sal_True ) ) + if ( GetPropertyValue( aAny, rXPropSet, aTextFieldType, true ) ) { ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextField > aXTextField; if ( aAny >>= aXTextField ) @@ -517,7 +517,7 @@ sal_uInt32 PortionObj::ImplGetTextField( ::com::sun::star::uno::Reference< ::com { if ( GetPropertyValue( aAny, xFieldPropSet, OUString( "IsFix" ) ), sal_True ) { - sal_Bool bBool = sal_False; + bool bBool = false; aAny >>= bBool; if ( !bBool ) // Fixed DateFields does not exist in PPT { @@ -559,7 +559,7 @@ sal_uInt32 PortionObj::ImplGetTextField( ::com::sun::star::uno::Reference< ::com { if ( GetPropertyValue( aAny, xFieldPropSet, OUString( "IsFix" ) ), sal_True ) { - sal_Bool bBool = sal_False; + bool bBool = false; aAny >>= bBool; if ( !bBool ) { @@ -583,7 +583,7 @@ sal_uInt32 PortionObj::ImplGetTextField( ::com::sun::star::uno::Reference< ::com { if ( GetPropertyValue( aAny, xFieldPropSet, OUString( "IsFix" ) ), sal_True ) { - sal_Bool bBool = sal_False; + bool bBool = false; aAny >>= bBool; if ( !bBool ) { @@ -664,13 +664,13 @@ ParagraphObj::ParagraphObj(const ::com::sun::star::uno::Reference< ::com::sun::s { mXPropSet = rXPropSet; - bExtendedParameters = sal_False; + bExtendedParameters = false; nDepth = 0; nBulletFlags = 0; nParaFlags = 0; - ImplGetParagraphValues( rProv, sal_False ); + ImplGetParagraphValues( rProv, false ); } ParagraphObj::ParagraphObj(::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > & rXTextContent, @@ -698,7 +698,7 @@ ParagraphObj::ParagraphObj(::com::sun::star::uno::Reference< ::com::sun::star::t , mbParagraphPunctation(false) , mnBiDi(0) { - bExtendedParameters = sal_False; + bExtendedParameters = false; nDepth = 0; nBulletFlags = 0; @@ -737,7 +737,7 @@ ParagraphObj::ParagraphObj(::com::sun::star::uno::Reference< ::com::sun::star::t } } } - ImplGetParagraphValues( rProv, sal_True ); + ImplGetParagraphValues( rProv, true ); } } @@ -784,7 +784,7 @@ void ParagraphObj::CalculateGraphicBulletSize( sal_uInt16 nFontHeight ) } } -void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int16 nNumberingDepth, sal_Bool bIsBullet, sal_Bool bGetPropStateValue ) +void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int16 nNumberingDepth, bool bIsBullet, bool bGetPropStateValue ) { ::com::sun::star::uno::Any aAny; if ( GetPropertyValue( aAny, mXPropSet, OUString( "ParaLeftMargin" ) ) ) @@ -816,7 +816,7 @@ void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int1 sal_Int32 nPropertyCount = aPropertySequence.getLength(); if ( nPropertyCount ) { - bExtendedParameters = sal_True; + bExtendedParameters = true; nBulletRealSize = 100; nMappedNumType = 0; @@ -911,7 +911,7 @@ void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int1 { nBulletId = rBuProv.GetId( aUniqueId, aBuGraSize ); if ( nBulletId != 0xffff ) - bExtendedBulletsUsed = sal_True; + bExtendedBulletsUsed = true; } } } @@ -960,7 +960,7 @@ void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int1 { if ( nNumberingType != SVX_NUM_CHAR_SPECIAL ) { - bExtendedBulletsUsed = sal_True; + bExtendedBulletsUsed = true; if ( nNumberingDepth & 1 ) cBulletId = 0x2013; // defaulting bullet characters for ppt97 else if ( nNumberingDepth == 4 ) @@ -1099,10 +1099,10 @@ void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int1 nBulletOfs = 0; } -void ParagraphObj::ImplGetParagraphValues( PPTExBulletProvider& rBuProv, sal_Bool bGetPropStateValue ) +void ParagraphObj::ImplGetParagraphValues( PPTExBulletProvider& rBuProv, bool bGetPropStateValue ) { ::com::sun::star::uno::Any aAny; - if ( GetPropertyValue( aAny, mXPropSet, "NumberingLevel", sal_True ) ) + if ( GetPropertyValue( aAny, mXPropSet, "NumberingLevel", true ) ) { if ( bGetPropStateValue ) meBullet = GetPropertyState( mXPropSet, "NumberingLevel" ); @@ -1110,20 +1110,20 @@ void ParagraphObj::ImplGetParagraphValues( PPTExBulletProvider& rBuProv, sal_Boo if ( nDepth < 0 ) { - mbIsBullet = sal_False; + mbIsBullet = false; nDepth = 0; } else { if ( nDepth > 4 ) nDepth = 4; - mbIsBullet = sal_True; + mbIsBullet = true; } } else { nDepth = 0; - mbIsBullet = sal_False; + mbIsBullet = false; } ImplGetNumberingLevel( rBuProv, nDepth, mbIsBullet, bGetPropStateValue ); @@ -1158,12 +1158,12 @@ void ParagraphObj::ImplGetParagraphValues( PPTExBulletProvider& rBuProv, sal_Boo { case ::com::sun::star::style::LineSpacingMode::FIX : mnLineSpacing = (sal_Int16)(-( aLineSpacing.Height ) ); - mbFixedLineSpacing = sal_True; + mbFixedLineSpacing = true; break; case ::com::sun::star::style::LineSpacingMode::MINIMUM : case ::com::sun::star::style::LineSpacingMode::LEADING : mnLineSpacing = (sal_Int16)(-( aLineSpacing.Height ) ); - mbFixedLineSpacing = sal_False; + mbFixedLineSpacing = false; break; case ::com::sun::star::style::LineSpacingMode::PROP : @@ -1284,8 +1284,8 @@ struct ImplTextObj sal_uInt32 mnTextSize; int mnInstance; std::vector<ParagraphObj*> maList; - sal_Bool mbHasExtendedBullets; - sal_Bool mbFixedCellHeightUsed; + bool mbHasExtendedBullets; + bool mbFixedCellHeightUsed; ImplTextObj( int nInstance ); ~ImplTextObj(); @@ -1296,8 +1296,8 @@ ImplTextObj::ImplTextObj( int nInstance ) { mnTextSize = 0; mnInstance = nInstance; - mbHasExtendedBullets = sal_False; - mbFixedCellHeightUsed = sal_False; + mbHasExtendedBullets = false; + mbFixedCellHeightUsed = false; } ImplTextObj::~ImplTextObj() @@ -1327,11 +1327,11 @@ TextObj::TextObj( ::com::sun::star::uno::Reference< ::com::sun::star::text::XSim if ( aAny >>= aXParagraph ) { if ( !aXTextParagraphE->hasMoreElements() ) - aParaFlags.bLastParagraph = sal_True; + aParaFlags.bLastParagraph = true; ParagraphObj* pPara = new ParagraphObj( aXParagraph, aParaFlags, rFontCollection, rProv ); mpImplTextObj->mbHasExtendedBullets |= pPara->bExtendedBulletsUsed; mpImplTextObj->maList.push_back( pPara ); - aParaFlags.bFirstParagraph = sal_False; + aParaFlags.bFirstParagraph = false; } } } @@ -1366,7 +1366,7 @@ int TextObj::GetInstance() const return mpImplTextObj->mnInstance; } -sal_Bool TextObj::HasExtendedBullets() +bool TextObj::HasExtendedBullets() { return mpImplTextObj->mbHasExtendedBullets; } @@ -1381,12 +1381,12 @@ void FontCollectionEntry::ImplInit( const OUString& rName ) if ( !aSubstName.isEmpty() ) { Name = aSubstName; - bIsConverted = sal_True; + bIsConverted = true; } else { Name = rName; - bIsConverted = sal_False; + bIsConverted = false; } } diff --git a/sd/source/filter/eppt/text.hxx b/sd/source/filter/eppt/text.hxx index 71abbba19564..e7fe688f11b8 100644 --- a/sd/source/filter/eppt/text.hxx +++ b/sd/source/filter/eppt/text.hxx @@ -39,7 +39,7 @@ namespace style { struct TabStop; } struct SOParagraph { - sal_Bool bExtendedParameters; + bool bExtendedParameters; sal_uInt32 nParaFlags; sal_Int16 nBulletFlags; OUString sPrefix; @@ -57,10 +57,10 @@ struct SOParagraph sal_Unicode cBulletId; // if Numbering Type == CharSpecial ::com::sun::star::awt::FontDescriptor aFontDesc; - sal_Bool bExtendedBulletsUsed; + bool bExtendedBulletsUsed; sal_uInt16 nBulletId; sal_uInt32 nMappedNumType; - sal_Bool bNumberingIsNumber; + bool bNumberingIsNumber; SOParagraph() : bExtendedParameters(false) @@ -95,7 +95,7 @@ protected: css::beans::PropertyState ePropState; css::uno::Reference < css::beans::XPropertyState > mXPropState; - sal_Bool ImplGetPropertyValue( const OUString& rString, sal_Bool bGetPropertyState = sal_True ); + bool ImplGetPropertyValue( const OUString& rString, bool bGetPropertyState = true ); }; struct FieldEntry @@ -126,7 +126,7 @@ class PortionObj : public PropStateValue sal_uInt32 ImplGetTextField( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & rXTextRangeRef, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSetRef, OUString& rURL ); sal_uInt32 ImplCalculateTextPositions( sal_uInt32 nCurrentTextPosition ); - void ImplGetPortionValues( FontCollection& rFontCollection, sal_Bool bGetPropStateValue = sal_False ); + void ImplGetPortionValues( FontCollection& rFontCollection, bool bGetPropStateValue = false ); public : @@ -146,19 +146,19 @@ class PortionObj : public PropStateValue sal_Int16 mnCharEscapement; sal_uInt32 mnTextSize; - sal_Bool mbLastPortion; + bool mbLastPortion; sal_uInt16* mpText; FieldEntry* mpFieldEntry; PortionObj( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & rXTextRangeRef, - sal_Bool bLast, FontCollection& rFontCollection ); + bool bLast, FontCollection& rFontCollection ); PortionObj( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSetRef, FontCollection& rFontCollection ); PortionObj( const PortionObj& rPortionObj ); ~PortionObj(); - void Write( SvStream* pStrm, sal_Bool bLast ); + void Write( SvStream* pStrm, bool bLast ); sal_uInt32 Count() const { return mnTextSize; }; PortionObj& operator=( const PortionObj& rPortionObj ); @@ -166,10 +166,10 @@ class PortionObj : public PropStateValue struct ParaFlags { - sal_Bool bFirstParagraph : 1; - sal_Bool bLastParagraph : 1; + bool bFirstParagraph : 1; + bool bLastParagraph : 1; - ParaFlags() { bFirstParagraph = sal_True; bLastParagraph = sal_False; }; + ParaFlags() { bFirstParagraph = true; bLastParagraph = false; }; }; class ParagraphObj : public std::vector<PortionObj*>, public PropStateValue, public SOParagraph @@ -185,8 +185,8 @@ class ParagraphObj : public std::vector<PortionObj*>, public PropStateValue, pub void ImplConstruct( const ParagraphObj& rParagraphObj ); void ImplClear(); sal_uInt32 ImplCalculateTextPositions( sal_uInt32 nCurrentTextPosition ); - void ImplGetParagraphValues( PPTExBulletProvider& rBuProv, sal_Bool bGetPropStateValue = sal_False ); - void ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int16 nDepth, sal_Bool bIsBullet, sal_Bool bGetPropStateValue = sal_False ); + void ImplGetParagraphValues( PPTExBulletProvider& rBuProv, bool bGetPropStateValue = false ); + void ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int16 nDepth, bool bIsBullet, bool bGetPropStateValue = false ); public : @@ -194,9 +194,9 @@ class ParagraphObj : public std::vector<PortionObj*>, public PropStateValue, pub sal_uInt32 mnTextSize; - sal_Bool mbIsBullet; - sal_Bool mbFirstParagraph; - sal_Bool mbLastParagraph; + bool mbIsBullet; + bool mbFirstParagraph; + bool mbLastParagraph; ::com::sun::star::beans::PropertyState meBullet; ::com::sun::star::beans::PropertyState meTextAdjust; @@ -209,11 +209,11 @@ class ParagraphObj : public std::vector<PortionObj*>, public PropStateValue, pub sal_uInt16 mnTextAdjust; sal_Int16 mnLineSpacing; - sal_Bool mbFixedLineSpacing; + bool mbFixedLineSpacing; sal_Int16 mnLineSpacingTop; sal_Int16 mnLineSpacingBottom; - sal_Bool mbForbiddenRules; - sal_Bool mbParagraphPunctation; + bool mbForbiddenRules; + bool mbParagraphPunctation; sal_uInt16 mnBiDi; ParagraphObj( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > & rXTextContentRef, @@ -247,7 +247,7 @@ public : sal_uInt32 ParagraphCount() const; sal_uInt32 Count() const; int GetInstance() const; - sal_Bool HasExtendedBullets(); + bool HasExtendedBullets(); void WriteTextSpecInfo( SvStream* pStrm ); }; diff --git a/sd/source/filter/grf/sdgrffilter.cxx b/sd/source/filter/grf/sdgrffilter.cxx index e23b97c0d52f..f5c1399bf347 100644 --- a/sd/source/filter/grf/sdgrffilter.cxx +++ b/sd/source/filter/grf/sdgrffilter.cxx @@ -134,7 +134,7 @@ void SdGRFFilter_ImplInteractionHdl::handle( const com::sun::star::uno::Referenc SdGRFFilter::SdGRFFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell ) : - SdFilter( rMedium, rDocShell, sal_True ) + SdFilter( rMedium, rDocShell, true ) { } @@ -190,13 +190,13 @@ void SdGRFFilter::HandleGraphicFilterError( sal_uInt16 nFilterError, sal_uLong n -sal_Bool SdGRFFilter::Import() +bool SdGRFFilter::Import() { Graphic aGraphic; const OUString aFileName( mrMedium.GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) ); GraphicFilter& rGraphicFilter = GraphicFilter::GetGraphicFilter(); const sal_uInt16 nFilter = rGraphicFilter.GetImportFormatNumberForTypeName( mrMedium.GetFilter()->GetTypeName() ); - sal_Bool bRet = sal_False; + bool bRet = false; SvStream* pIStm = mrMedium.GetInStream(); sal_uInt16 nReturn = pIStm ? rGraphicFilter.ImportGraphic( aGraphic, aFileName, *pIStm, nFilter ) : 1; @@ -242,18 +242,18 @@ sal_Bool SdGRFFilter::Import() aPos.Y() = ( ( aPagSize.Height() - aGrfSize.Height() ) >> 1 ) + pPage->GetUppBorder(); pPage->InsertObject( new SdrGrafObj( aGraphic, Rectangle( aPos, aGrfSize ) ) ); - bRet = sal_True; + bRet = true; } return bRet; } -sal_Bool SdGRFFilter::Export() +bool SdGRFFilter::Export() { // SJ: todo: error handling, the GraphicExportFilter does not support proper errorhandling - sal_Bool bRet = sal_False; + bool bRet = false; uno::Reference< uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext(); uno::Reference< drawing::XGraphicExportFilter > xExporter = drawing::GraphicExportFilter::create( xContext ); @@ -298,14 +298,14 @@ sal_Bool SdGRFFilter::Export() OUString sFilterName( "FilterName" ); OUString sShortName( rGraphicFilter.GetExportFormatShortName( nFilter ) ); - sal_Bool bFilterNameFound = sal_False; + bool bFilterNameFound = false; sal_Int32 i, nCount; for ( i = 0, nCount = aArgs.getLength(); i < nCount; i++ ) { OUString& rStr = aArgs[ i ].Name; if ( rStr == sFilterName ) { - bFilterNameFound = sal_True; + bFilterNameFound = true; aArgs[ i ].Name = sFilterName; aArgs[ i ].Value <<= sShortName; } diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx index f6619fc68563..dd69ce4fb475 100644 --- a/sd/source/filter/html/htmlex.cxx +++ b/sd/source/filter/html/htmlex.cxx @@ -464,14 +464,14 @@ void HtmlExport::InitExportParameters( const Sequence< PropertyValue >& rParams { if( mbImpress ) { - sal_Bool temp = sal_False; + bool temp = false; pParams->Value >>= temp; mbNotes = temp; } } else if ( pParams->Name == "IsExportContentsPage" ) { - sal_Bool temp = sal_False; + bool temp = false; pParams->Value >>= temp; mbContentsPage = temp; } @@ -497,19 +497,19 @@ void HtmlExport::InitExportParameters( const Sequence< PropertyValue >& rParams } else if ( pParams->Name == "EnableDownload" ) { - sal_Bool temp = sal_False; + bool temp = false; pParams->Value >>= temp; mbDownload = temp; } else if ( pParams->Name == "SlideSound" ) { - sal_Bool temp = sal_True; + bool temp = true; pParams->Value >>= temp; mbSlideSound = temp; } else if ( pParams->Name == "HiddenSlides" ) { - sal_Bool temp = sal_True; + bool temp = true; pParams->Value >>= temp; mbHiddenSlides = temp; } @@ -550,7 +550,7 @@ void HtmlExport::InitExportParameters( const Sequence< PropertyValue >& rParams } else if ( pParams->Name == "IsUseDocumentColors" ) { - sal_Bool temp = sal_False; + bool temp = false; pParams->Value >>= temp; mbDocColors = temp; } @@ -563,7 +563,7 @@ void HtmlExport::InitExportParameters( const Sequence< PropertyValue >& rParams } else if ( pParams->Name == "KioskEndless" ) { - sal_Bool temp = sal_False; + bool temp = false; pParams->Value >>= temp; mbEndless = temp; } @@ -965,7 +965,7 @@ bool HtmlExport::SavePresentation() { uno::Sequence< beans::PropertyValue > aProperties( 2 ); aProperties[ 0 ].Name = "Overwrite"; - aProperties[ 0 ].Value <<= (sal_Bool)sal_True; + aProperties[ 0 ].Value <<= true; aProperties[ 1 ].Name = "FilterName"; aProperties[ 1 ].Value <<= OUString("impress8"); xStorable->storeToURL( aURL, aProperties ); @@ -1675,8 +1675,8 @@ bool HtmlExport::CreateHtmlForPresPages() // if necessary, convert page and object names into the // corresponding names of the html file - sal_Bool bIsMasterPage; - sal_uInt16 nPgNum = mpDoc->GetPageByName( aURL, bIsMasterPage ); + bool bIsMasterPage; + sal_uInt16 nPgNum = mpDoc->GetPageByName( aURL, bIsMasterPage ); SdrObject* pObj = NULL; if (nPgNum == SDRPAGE_NOTFOUND) @@ -1760,8 +1760,8 @@ bool HtmlExport::CreateHtmlForPresPages() { case presentation::ClickAction_BOOKMARK: { - sal_Bool bIsMasterPage; - sal_uInt16 nPgNum = mpDoc->GetPageByName( pInfo->GetBookmark(), bIsMasterPage ); + bool bIsMasterPage; + sal_uInt16 nPgNum = mpDoc->GetPageByName( pInfo->GetBookmark(), bIsMasterPage ); SdrObject* pObj = NULL; if( nPgNum == SDRPAGE_NOTFOUND ) diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx index 4d4de4672065..1407699f1b85 100644 --- a/sd/source/filter/html/pubdlg.cxx +++ b/sd/source/filter/html/pubdlg.cxx @@ -93,39 +93,39 @@ public: OUString m_aURL; // special Kiosk options - sal_Bool m_bAutoSlide; + bool m_bAutoSlide; sal_uInt32 m_nSlideDuration; - sal_Bool m_bEndless; + bool m_bEndless; // special HTML options - sal_Bool m_bContentPage; - sal_Bool m_bNotes; + bool m_bContentPage; + bool m_bNotes; // misc options sal_uInt16 m_nResolution; OUString m_aCompression; PublishingFormat m_eFormat; - sal_Bool m_bSlideSound; - sal_Bool m_bHiddenSlides; + bool m_bSlideSound; + bool m_bHiddenSlides; // title page information OUString m_aAuthor; OUString m_aEMail; OUString m_aWWW; OUString m_aMisc; - sal_Bool m_bDownload; - sal_Bool m_bCreated; // not used + bool m_bDownload; + bool m_bCreated; // not used // buttons and colorscheme sal_Int16 m_nButtonThema; - sal_Bool m_bUserAttr; + bool m_bUserAttr; Color m_aBackColor; Color m_aTextColor; Color m_aLinkColor; Color m_aVLinkColor; Color m_aALinkColor; - sal_Bool m_bUseAttribs; - sal_Bool m_bUseColor; + bool m_bUseAttribs; + bool m_bUseColor; SdPublishingDesign(); @@ -136,11 +136,11 @@ public: // load Default-settings SdPublishingDesign::SdPublishingDesign() - : m_bCreated(sal_False) + : m_bCreated(false) { m_eMode = PUBLISH_HTML; - m_bContentPage = sal_True; - m_bNotes = sal_True; + m_bContentPage = true; + m_bNotes = true; m_eFormat = FORMAT_PNG; @@ -156,12 +156,12 @@ SdPublishingDesign::SdPublishingDesign() m_aAuthor += " "; m_aAuthor += aUserOptions.GetLastName(); m_aEMail = aUserOptions.GetEmail(); - m_bDownload = sal_False; + m_bDownload = false; m_nButtonThema = -1; - m_bUserAttr = sal_False; - m_bUseAttribs = sal_True; - m_bUseColor = sal_True; + m_bUserAttr = false; + m_bUseAttribs = true; + m_bUseColor = true; m_aBackColor = COL_WHITE; m_aTextColor = COL_BLACK; @@ -171,12 +171,12 @@ SdPublishingDesign::SdPublishingDesign() m_eScript = SCRIPT_ASP; - m_bAutoSlide = sal_True; + m_bAutoSlide = true; m_nSlideDuration = 15; - m_bEndless = sal_True; + m_bEndless = true; - m_bSlideSound = sal_True; - m_bHiddenSlides = sal_False; + m_bSlideSound = true; + m_bHiddenSlides = false; } // Compares the values without paying attention to the name @@ -252,8 +252,8 @@ SvStream& operator >> (SvStream& rIn, SdPublishingDesign& rDesign) RTL_TEXTENCODING_UTF8); rIn.ReadUInt16( nTemp16 ); rDesign.m_eMode = (HtmlPublishMode)nTemp16; - rIn.ReadUChar( rDesign.m_bContentPage ); - rIn.ReadUChar( rDesign.m_bNotes ); + rIn.ReadCharAsBool( rDesign.m_bContentPage ); + rIn.ReadCharAsBool( rDesign.m_bNotes ); rIn.ReadUInt16( rDesign.m_nResolution ); rDesign.m_aCompression = read_uInt16_lenPrefixed_uInt8s_ToOUString(rIn, RTL_TEXTENCODING_UTF8); @@ -267,17 +267,17 @@ SvStream& operator >> (SvStream& rIn, SdPublishingDesign& rDesign) RTL_TEXTENCODING_UTF8); rDesign.m_aMisc = read_uInt16_lenPrefixed_uInt8s_ToOUString(rIn, RTL_TEXTENCODING_UTF8); - rIn.ReadUChar( rDesign.m_bDownload ); - rIn.ReadUChar( rDesign.m_bCreated ); // not used + rIn.ReadCharAsBool( rDesign.m_bDownload ); + rIn.ReadCharAsBool( rDesign.m_bCreated ); // not used rIn.ReadInt16( rDesign.m_nButtonThema ); - rIn.ReadUChar( rDesign.m_bUserAttr ); + rIn.ReadCharAsBool( rDesign.m_bUserAttr ); ReadColor( rIn, rDesign.m_aBackColor ); ReadColor( rIn, rDesign.m_aTextColor ); ReadColor( rIn, rDesign.m_aLinkColor ); ReadColor( rIn, rDesign.m_aVLinkColor ); ReadColor( rIn, rDesign.m_aALinkColor ); - rIn.ReadUChar( rDesign.m_bUseAttribs ); - rIn.ReadUChar( rDesign.m_bUseColor ); + rIn.ReadCharAsBool( rDesign.m_bUseAttribs ); + rIn.ReadCharAsBool( rDesign.m_bUseColor ); rIn.ReadUInt16( nTemp16 ); rDesign.m_eScript = (PublishingScript)nTemp16; @@ -286,11 +286,11 @@ SvStream& operator >> (SvStream& rIn, SdPublishingDesign& rDesign) rDesign.m_aCGI = read_uInt16_lenPrefixed_uInt8s_ToOUString(rIn, RTL_TEXTENCODING_UTF8); - rIn.ReadUChar( rDesign.m_bAutoSlide ); + rIn.ReadCharAsBool( rDesign.m_bAutoSlide ); rIn.ReadUInt32( rDesign.m_nSlideDuration ); - rIn.ReadUChar( rDesign.m_bEndless ); - rIn.ReadUChar( rDesign.m_bSlideSound ); - rIn.ReadUChar( rDesign.m_bHiddenSlides ); + rIn.ReadCharAsBool( rDesign.m_bEndless ); + rIn.ReadCharAsBool( rDesign.m_bSlideSound ); + rIn.ReadCharAsBool( rDesign.m_bHiddenSlides ); return rIn; } @@ -373,8 +373,8 @@ SdPublishingDlg::SdPublishingDlg(Window* pWindow, DocumentType eDocType) , aNextPageButton(this,SdResId(BUT_NEXT)) , aFinishButton(this,SdResId(BUT_FINISH)) , aAssistentFunc(NOOFPAGES) -, m_bButtonsDirty(sal_True) -, m_bDesignListDirty(sal_False) +, m_bButtonsDirty(true) +, m_bDesignListDirty(false) , m_pDesign(NULL) { m_bImpress = eDocType == DOCUMENT_TYPE_IMPRESS; @@ -761,13 +761,13 @@ void SdPublishingDlg::GetParameterSequence( Sequence< PropertyValue >& rParams ) aProps.push_back( aValue ); aValue.Name = "IsExportContentsPage"; - aValue.Value <<= (sal_Bool)pPage2_Content->IsChecked(); + aValue.Value <<= pPage2_Content->IsChecked(); aProps.push_back( aValue ); if(m_bImpress) { aValue.Name = "IsExportNotes"; - aValue.Value <<= (sal_Bool)pPage2_Notes->IsChecked(); + aValue.Value <<= pPage2_Notes->IsChecked(); aProps.push_back( aValue ); } @@ -800,7 +800,7 @@ void SdPublishingDlg::GetParameterSequence( Sequence< PropertyValue >& rParams ) aProps.push_back( aValue ); aValue.Name = "KioskEndless"; - aValue.Value <<= (sal_Bool)pPage2_Endless->IsChecked(); + aValue.Value <<= pPage2_Endless->IsChecked(); aProps.push_back( aValue ); } @@ -864,7 +864,7 @@ void SdPublishingDlg::GetParameterSequence( Sequence< PropertyValue >& rParams ) if( m_bImpress ) { aValue.Name = "EnableDownload"; - aValue.Value <<= (sal_Bool)pPage4_Download->IsChecked(); + aValue.Value <<= pPage4_Download->IsChecked(); aProps.push_back( aValue ); } @@ -903,7 +903,7 @@ void SdPublishingDlg::GetParameterSequence( Sequence< PropertyValue >& rParams ) if( pPage6_DocColors->IsChecked() ) { aValue.Name = "IsUseDocumentColors"; - aValue.Value <<= (sal_Bool)sal_True; + aValue.Value <<= true; aProps.push_back( aValue ); } @@ -981,7 +981,7 @@ IMPL_LINK_NOARG(SdPublishingDlg, DesignDeleteHdl) m_aDesignList.erase(iter); - m_bDesignListDirty = sal_True; + m_bDesignListDirty = true; UpdatePage(); @@ -991,7 +991,7 @@ IMPL_LINK_NOARG(SdPublishingDlg, DesignDeleteHdl) // Clickhandler for the other servertypess IMPL_LINK( SdPublishingDlg, WebServerHdl, RadioButton *, pButton ) { - sal_Bool bASP = pButton == pPage2_ASP; + bool bASP = pButton == pPage2_ASP; pPage2_ASP->Check( bASP ); pPage2_PERL->Check( !bASP ); @@ -1114,19 +1114,19 @@ IMPL_LINK_NOARG(SdPublishingDlg, FinishHdl) SdPublishingDesign* pDesign = new SdPublishingDesign(); GetDesign(pDesign); - sal_Bool bSave = sal_False; + bool bSave = false; if(pPage1_OldDesign->IsChecked() && m_pDesign) { // are there changes? if(!(*pDesign == *m_pDesign)) - bSave = sal_True; + bSave = true; } else { SdPublishingDesign aDefaultDesign; if(!(aDefaultDesign == *pDesign)) - bSave = sal_True; + bSave = true; } if(bSave) @@ -1135,10 +1135,10 @@ IMPL_LINK_NOARG(SdPublishingDlg, FinishHdl) if(m_pDesign) aName = m_pDesign->m_aDesignName; - sal_Bool bRetry; + bool bRetry; do { - bRetry = sal_False; + bRetry = false; SdDesignNameDlg aDlg(this, aName ); @@ -1166,7 +1166,7 @@ IMPL_LINK_NOARG(SdPublishingDlg, FinishHdl) if(!bRetry) { m_aDesignList.push_back(pDesign); - m_bDesignListDirty = sal_True; + m_bDesignListDirty = true; pDesign = NULL; } } @@ -1234,7 +1234,7 @@ void SdPublishingDlg::UpdatePage() pPage2_Index_txt->Show(); pPage2_Index->Show(); - sal_Bool bPerl = pPage2_PERL->IsChecked(); + bool bPerl = pPage2_PERL->IsChecked(); pPage2_Index->Enable(bPerl); pPage2_Index_txt->Enable(bPerl); pPage2_URL_txt->Enable(bPerl); @@ -1263,7 +1263,7 @@ void SdPublishingDlg::UpdatePage() pPage2_Duration_txt->Show(); pPage2_Duration->Show(); pPage2_Endless->Show(); - sal_Bool bAuto = pPage2_ChgAuto->IsChecked(); + bool bAuto = pPage2_ChgAuto->IsChecked(); pPage2_Duration->Enable(bAuto); pPage2_Endless->Enable(bAuto); } @@ -1348,7 +1348,7 @@ void SdPublishingDlg::LoadPreviewButtons() } pPage5_Buttons->SetItemHeight( nHeight ); - m_bButtonsDirty = sal_False; + m_bButtonsDirty = false; } } @@ -1508,9 +1508,9 @@ IMPL_LINK_NOARG(SdPublishingDlg, LastPageHdl) } // Load Designs -sal_Bool SdPublishingDlg::Load() +bool SdPublishingDlg::Load() { - m_bDesignListDirty = sal_False; + m_bDesignListDirty = false; INetURLObject aURL( SvtPathOptions().GetUserConfigPath() ); aURL.Append( OUString( "designs.sod" ) ); @@ -1520,13 +1520,13 @@ sal_Bool SdPublishingDlg::Load() com::sun::star::uno::Reference < com::sun::star::task::XInteractionHandler > xHandler; SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ, xHandler ); - sal_Bool bOk = pIStm && ( pIStm->GetError() == 0); + bool bOk = pIStm && ( pIStm->GetError() == 0); if( pIStm ) delete pIStm; if( !bOk ) - return sal_False; + return false; } SfxMedium aMedium( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ | STREAM_NOCREATE ); @@ -1534,13 +1534,13 @@ sal_Bool SdPublishingDlg::Load() SvStream* pStream = aMedium.GetInStream(); if( !pStream ) - return( sal_False ); + return false; sal_uInt16 aCheck; pStream->ReadUInt16( aCheck ); if(aCheck != nMagic) - return sal_False; + return false; SdIOCompat aIO(*pStream, STREAM_READ); @@ -1561,7 +1561,7 @@ sal_Bool SdPublishingDlg::Load() } // Save Designs -sal_Bool SdPublishingDlg::Save() +bool SdPublishingDlg::Save() { INetURLObject aURL( SvtPathOptions().GetUserConfigPath() ); aURL.Append( OUString( "designs.sod" ) ); @@ -1571,7 +1571,7 @@ sal_Bool SdPublishingDlg::Save() SvStream* pStream = aMedium.GetOutStream(); if( !pStream ) - return( sal_False ); + return false; sal_uInt16 aCheck = nMagic; pStream->WriteUInt16( aCheck ); diff --git a/sd/source/filter/html/sdhtmlfilter.cxx b/sd/source/filter/html/sdhtmlfilter.cxx index db809d7e99dc..6d45d9c0197e 100644 --- a/sd/source/filter/html/sdhtmlfilter.cxx +++ b/sd/source/filter/html/sdhtmlfilter.cxx @@ -43,7 +43,7 @@ // - SdPPTFilter - -SdHTMLFilter::SdHTMLFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, sal_Bool bShowProgress ) : +SdHTMLFilter::SdHTMLFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, bool bShowProgress ) : SdFilter( rMedium, rDocShell, bShowProgress ) { } @@ -56,7 +56,7 @@ SdHTMLFilter::~SdHTMLFilter() -sal_Bool SdHTMLFilter::Export() +bool SdHTMLFilter::Export() { mrMedium.Close(); mrMedium.Commit(); diff --git a/sd/source/filter/ppt/ppt97animations.cxx b/sd/source/filter/ppt/ppt97animations.cxx index 7af1c053a99c..bc5f7ad8d1bd 100644 --- a/sd/source/filter/ppt/ppt97animations.cxx +++ b/sd/source/filter/ppt/ppt97animations.cxx @@ -640,7 +640,7 @@ void Ppt97Animation::createAndSetCustomAnimationEffect( SdrObject* pObj ) // set after effect if( this->HasAfterEffect() ) { - pEffect->setHasAfterEffect( sal_True ); + pEffect->setHasAfterEffect( true ); if( this->HasAfterEffect_ChangeColor() ) pEffect->setDimColor( uno::makeAny( this->GetDimColor() ) ); else @@ -679,8 +679,8 @@ void Ppt97Animation::createAndSetCustomAnimationEffect( SdrObject* pObj ) { sal_Int32 nParagraphLevel = this->GetParagraphLevel(); double fDelaySeconds = this->GetDelayTimeInSeconds(); - sal_Bool bAnimateAssociatedShape = this->HasAnimateAssociatedShape();//or only text - sal_Bool bTextReverse = this->HasReverseOrder(); + bool bAnimateAssociatedShape = this->HasAnimateAssociatedShape();//or only text + bool bTextReverse = this->HasReverseOrder(); // now create effects for each paragraph ::sd::CustomAnimationTextGroupPtr pGroup = pMainSequence-> diff --git a/sd/source/filter/ppt/pptanimations.hxx b/sd/source/filter/ppt/pptanimations.hxx index bf9ddf2e7a44..8a6d0440d008 100644 --- a/sd/source/filter/ppt/pptanimations.hxx +++ b/sd/source/filter/ppt/pptanimations.hxx @@ -249,53 +249,53 @@ struct transition const sal_Char* mpName; sal_Int16 mnType; sal_Int16 mnSubType; - sal_Bool mbDirection; // true: default geometric direction + bool mbDirection; // true: default geometric direction static const transition* find( const OUString& rName ); - static const sal_Char* find( const sal_Int16 mnType, const sal_Int16 mnSubType, const sal_Bool bDirection ); + static const sal_Char* find( const sal_Int16 mnType, const sal_Int16 mnSubType, const bool bDirection ); }; static const transition gTransitions[] = { -{ "wipe(up)", ::com::sun::star::animations::TransitionType::BARWIPE, ::com::sun::star::animations::TransitionSubType::TOPTOBOTTOM, sal_True }, -{ "wipe(right)", ::com::sun::star::animations::TransitionType::BARWIPE, ::com::sun::star::animations::TransitionSubType::LEFTTORIGHT, sal_False }, -{ "wipe(left)", ::com::sun::star::animations::TransitionType::BARWIPE, ::com::sun::star::animations::TransitionSubType::LEFTTORIGHT, sal_True }, -{ "wipe(down)", ::com::sun::star::animations::TransitionType::BARWIPE, ::com::sun::star::animations::TransitionSubType::TOPTOBOTTOM, sal_False }, -{ "wheel(1)", ::com::sun::star::animations::TransitionType::PINWHEELWIPE, ::com::sun::star::animations::TransitionSubType::ONEBLADE, sal_True }, -{ "wheel(2)", ::com::sun::star::animations::TransitionType::PINWHEELWIPE, ::com::sun::star::animations::TransitionSubType::TWOBLADEVERTICAL, sal_True }, -{ "wheel(3)", ::com::sun::star::animations::TransitionType::PINWHEELWIPE, ::com::sun::star::animations::TransitionSubType::THREEBLADE, sal_True }, -{ "wheel(4)", ::com::sun::star::animations::TransitionType::PINWHEELWIPE, ::com::sun::star::animations::TransitionSubType::FOURBLADE, sal_True }, -{ "wheel(8)", ::com::sun::star::animations::TransitionType::PINWHEELWIPE, ::com::sun::star::animations::TransitionSubType::EIGHTBLADE, sal_True }, -{ "strips(downLeft)", ::com::sun::star::animations::TransitionType::WATERFALLWIPE, ::com::sun::star::animations::TransitionSubType::HORIZONTALRIGHT, sal_True }, -{ "strips(upLeft)", ::com::sun::star::animations::TransitionType::WATERFALLWIPE, ::com::sun::star::animations::TransitionSubType::HORIZONTALLEFT, sal_False }, -{ "strips(downRight)", ::com::sun::star::animations::TransitionType::WATERFALLWIPE, ::com::sun::star::animations::TransitionSubType::HORIZONTALLEFT, sal_True }, -{ "strips(upRight)", ::com::sun::star::animations::TransitionType::WATERFALLWIPE, ::com::sun::star::animations::TransitionSubType::HORIZONTALRIGHT, sal_False }, -{ "barn(inVertical)", ::com::sun::star::animations::TransitionType::BARNDOORWIPE, ::com::sun::star::animations::TransitionSubType::VERTICAL, sal_False }, -{ "barn(outVertical)", ::com::sun::star::animations::TransitionType::BARNDOORWIPE, ::com::sun::star::animations::TransitionSubType::VERTICAL, sal_True }, -{ "barn(inHorizontal)", ::com::sun::star::animations::TransitionType::BARNDOORWIPE, ::com::sun::star::animations::TransitionSubType::HORIZONTAL, sal_False }, -{ "barn(outHorizontal)", ::com::sun::star::animations::TransitionType::BARNDOORWIPE, ::com::sun::star::animations::TransitionSubType::HORIZONTAL, sal_True }, -{ "randombar(vertical)", ::com::sun::star::animations::TransitionType::RANDOMBARWIPE, ::com::sun::star::animations::TransitionSubType::VERTICAL, sal_True}, -{ "randombar(horizontal)", ::com::sun::star::animations::TransitionType::RANDOMBARWIPE, ::com::sun::star::animations::TransitionSubType::HORIZONTAL, sal_True }, -{ "checkerboard(down)", ::com::sun::star::animations::TransitionType::CHECKERBOARDWIPE, ::com::sun::star::animations::TransitionSubType::DOWN, sal_True}, -{ "checkerboard(across)", ::com::sun::star::animations::TransitionType::CHECKERBOARDWIPE, ::com::sun::star::animations::TransitionSubType::ACROSS, sal_True }, -{ "plus(out)", ::com::sun::star::animations::TransitionType::FOURBOXWIPE, ::com::sun::star::animations::TransitionSubType::CORNERSIN, sal_False }, -{ "plus(in)", ::com::sun::star::animations::TransitionType::FOURBOXWIPE, ::com::sun::star::animations::TransitionSubType::CORNERSIN, sal_True }, -{ "diamond(out)", ::com::sun::star::animations::TransitionType::IRISWIPE, ::com::sun::star::animations::TransitionSubType::DIAMOND, sal_True }, -{ "diamond(in)", ::com::sun::star::animations::TransitionType::IRISWIPE, ::com::sun::star::animations::TransitionSubType::DIAMOND, sal_False }, -{ "circle(out)", ::com::sun::star::animations::TransitionType::ELLIPSEWIPE, ::com::sun::star::animations::TransitionSubType::HORIZONTAL, sal_True }, -{ "circle(in)", ::com::sun::star::animations::TransitionType::ELLIPSEWIPE, ::com::sun::star::animations::TransitionSubType::HORIZONTAL, sal_False }, -{ "box(out)", ::com::sun::star::animations::TransitionType::IRISWIPE, ::com::sun::star::animations::TransitionSubType::RECTANGLE, sal_True }, -{ "box(in)", ::com::sun::star::animations::TransitionType::IRISWIPE, ::com::sun::star::animations::TransitionSubType::RECTANGLE, sal_False }, -{ "wedge", ::com::sun::star::animations::TransitionType::FANWIPE, ::com::sun::star::animations::TransitionSubType::CENTERTOP, sal_True }, -{ "blinds(vertical)", ::com::sun::star::animations::TransitionType::BLINDSWIPE, ::com::sun::star::animations::TransitionSubType::VERTICAL, sal_True }, -{ "blinds(horizontal)", ::com::sun::star::animations::TransitionType::BLINDSWIPE, ::com::sun::star::animations::TransitionSubType::HORIZONTAL, sal_True }, -{ "fade", ::com::sun::star::animations::TransitionType::FADE, ::com::sun::star::animations::TransitionSubType::CROSSFADE, sal_True }, -{ "slide(fromTop)", ::com::sun::star::animations::TransitionType::SLIDEWIPE, ::com::sun::star::animations::TransitionSubType::FROMTOP, sal_True }, -{ "slide(fromRight)", ::com::sun::star::animations::TransitionType::SLIDEWIPE, ::com::sun::star::animations::TransitionSubType::FROMRIGHT, sal_True }, -{ "slide(fromLeft)", ::com::sun::star::animations::TransitionType::SLIDEWIPE, ::com::sun::star::animations::TransitionSubType::FROMLEFT, sal_True }, -{ "slide(fromBottom)", ::com::sun::star::animations::TransitionType::SLIDEWIPE, ::com::sun::star::animations::TransitionSubType::FROMBOTTOM, sal_True }, -{ "dissolve", ::com::sun::star::animations::TransitionType::DISSOLVE, ::com::sun::star::animations::TransitionSubType::DEFAULT, sal_True }, -{ "image", ::com::sun::star::animations::TransitionType::DISSOLVE, ::com::sun::star::animations::TransitionSubType::DEFAULT, sal_True }, // TODO -{ NULL, 0, 0, sal_False } +{ "wipe(up)", ::com::sun::star::animations::TransitionType::BARWIPE, ::com::sun::star::animations::TransitionSubType::TOPTOBOTTOM, true }, +{ "wipe(right)", ::com::sun::star::animations::TransitionType::BARWIPE, ::com::sun::star::animations::TransitionSubType::LEFTTORIGHT, false }, +{ "wipe(left)", ::com::sun::star::animations::TransitionType::BARWIPE, ::com::sun::star::animations::TransitionSubType::LEFTTORIGHT, true }, +{ "wipe(down)", ::com::sun::star::animations::TransitionType::BARWIPE, ::com::sun::star::animations::TransitionSubType::TOPTOBOTTOM, false }, +{ "wheel(1)", ::com::sun::star::animations::TransitionType::PINWHEELWIPE, ::com::sun::star::animations::TransitionSubType::ONEBLADE, true }, +{ "wheel(2)", ::com::sun::star::animations::TransitionType::PINWHEELWIPE, ::com::sun::star::animations::TransitionSubType::TWOBLADEVERTICAL, true }, +{ "wheel(3)", ::com::sun::star::animations::TransitionType::PINWHEELWIPE, ::com::sun::star::animations::TransitionSubType::THREEBLADE, true }, +{ "wheel(4)", ::com::sun::star::animations::TransitionType::PINWHEELWIPE, ::com::sun::star::animations::TransitionSubType::FOURBLADE, true }, +{ "wheel(8)", ::com::sun::star::animations::TransitionType::PINWHEELWIPE, ::com::sun::star::animations::TransitionSubType::EIGHTBLADE, true }, +{ "strips(downLeft)", ::com::sun::star::animations::TransitionType::WATERFALLWIPE, ::com::sun::star::animations::TransitionSubType::HORIZONTALRIGHT, true }, +{ "strips(upLeft)", ::com::sun::star::animations::TransitionType::WATERFALLWIPE, ::com::sun::star::animations::TransitionSubType::HORIZONTALLEFT, false }, +{ "strips(downRight)", ::com::sun::star::animations::TransitionType::WATERFALLWIPE, ::com::sun::star::animations::TransitionSubType::HORIZONTALLEFT, true }, +{ "strips(upRight)", ::com::sun::star::animations::TransitionType::WATERFALLWIPE, ::com::sun::star::animations::TransitionSubType::HORIZONTALRIGHT, false }, +{ "barn(inVertical)", ::com::sun::star::animations::TransitionType::BARNDOORWIPE, ::com::sun::star::animations::TransitionSubType::VERTICAL, false }, +{ "barn(outVertical)", ::com::sun::star::animations::TransitionType::BARNDOORWIPE, ::com::sun::star::animations::TransitionSubType::VERTICAL, true }, +{ "barn(inHorizontal)", ::com::sun::star::animations::TransitionType::BARNDOORWIPE, ::com::sun::star::animations::TransitionSubType::HORIZONTAL, false }, +{ "barn(outHorizontal)", ::com::sun::star::animations::TransitionType::BARNDOORWIPE, ::com::sun::star::animations::TransitionSubType::HORIZONTAL, true }, +{ "randombar(vertical)", ::com::sun::star::animations::TransitionType::RANDOMBARWIPE, ::com::sun::star::animations::TransitionSubType::VERTICAL, true}, +{ "randombar(horizontal)", ::com::sun::star::animations::TransitionType::RANDOMBARWIPE, ::com::sun::star::animations::TransitionSubType::HORIZONTAL, true }, +{ "checkerboard(down)", ::com::sun::star::animations::TransitionType::CHECKERBOARDWIPE, ::com::sun::star::animations::TransitionSubType::DOWN, true}, +{ "checkerboard(across)", ::com::sun::star::animations::TransitionType::CHECKERBOARDWIPE, ::com::sun::star::animations::TransitionSubType::ACROSS, true }, +{ "plus(out)", ::com::sun::star::animations::TransitionType::FOURBOXWIPE, ::com::sun::star::animations::TransitionSubType::CORNERSIN, false }, +{ "plus(in)", ::com::sun::star::animations::TransitionType::FOURBOXWIPE, ::com::sun::star::animations::TransitionSubType::CORNERSIN, true }, +{ "diamond(out)", ::com::sun::star::animations::TransitionType::IRISWIPE, ::com::sun::star::animations::TransitionSubType::DIAMOND, true }, +{ "diamond(in)", ::com::sun::star::animations::TransitionType::IRISWIPE, ::com::sun::star::animations::TransitionSubType::DIAMOND, false }, +{ "circle(out)", ::com::sun::star::animations::TransitionType::ELLIPSEWIPE, ::com::sun::star::animations::TransitionSubType::HORIZONTAL, true }, +{ "circle(in)", ::com::sun::star::animations::TransitionType::ELLIPSEWIPE, ::com::sun::star::animations::TransitionSubType::HORIZONTAL, false }, +{ "box(out)", ::com::sun::star::animations::TransitionType::IRISWIPE, ::com::sun::star::animations::TransitionSubType::RECTANGLE, true }, +{ "box(in)", ::com::sun::star::animations::TransitionType::IRISWIPE, ::com::sun::star::animations::TransitionSubType::RECTANGLE, false }, +{ "wedge", ::com::sun::star::animations::TransitionType::FANWIPE, ::com::sun::star::animations::TransitionSubType::CENTERTOP, true }, +{ "blinds(vertical)", ::com::sun::star::animations::TransitionType::BLINDSWIPE, ::com::sun::star::animations::TransitionSubType::VERTICAL, true }, +{ "blinds(horizontal)", ::com::sun::star::animations::TransitionType::BLINDSWIPE, ::com::sun::star::animations::TransitionSubType::HORIZONTAL, true }, +{ "fade", ::com::sun::star::animations::TransitionType::FADE, ::com::sun::star::animations::TransitionSubType::CROSSFADE, true }, +{ "slide(fromTop)", ::com::sun::star::animations::TransitionType::SLIDEWIPE, ::com::sun::star::animations::TransitionSubType::FROMTOP, true }, +{ "slide(fromRight)", ::com::sun::star::animations::TransitionType::SLIDEWIPE, ::com::sun::star::animations::TransitionSubType::FROMRIGHT, true }, +{ "slide(fromLeft)", ::com::sun::star::animations::TransitionType::SLIDEWIPE, ::com::sun::star::animations::TransitionSubType::FROMLEFT, true }, +{ "slide(fromBottom)", ::com::sun::star::animations::TransitionType::SLIDEWIPE, ::com::sun::star::animations::TransitionSubType::FROMBOTTOM, true }, +{ "dissolve", ::com::sun::star::animations::TransitionType::DISSOLVE, ::com::sun::star::animations::TransitionSubType::DEFAULT, true }, +{ "image", ::com::sun::star::animations::TransitionType::DISSOLVE, ::com::sun::star::animations::TransitionSubType::DEFAULT, true }, // TODO +{ NULL, 0, 0, false } }; struct convert_subtype diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index 2654830fe16a..80653bc23f9d 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -154,7 +154,7 @@ SdPPTImport::SdPPTImport( SdDrawDocument* pDocument, SvStream& rDocStream, SvSto pFilter = new ImplSdPPTImport( pDocument, rStorage, rMedium, aParam ); } -sal_Bool SdPPTImport::Import() +bool SdPPTImport::Import() { return pFilter->Import(); } @@ -168,7 +168,7 @@ ImplSdPPTImport::ImplSdPPTImport( SdDrawDocument* pDocument, SvStorage& rStorage : SdrPowerPointImport(rParam, rMedium.GetBaseURL()) , mrMed(rMedium) , mrStorage(rStorage_) - , mbDocumentFound(sal_False) + , mbDocumentFound(false) , mnFilterOptions(0) , mpDoc(pDocument) , mePresChange(PRESCHANGE_MANUAL) @@ -179,7 +179,7 @@ ImplSdPPTImport::ImplSdPPTImport( SdDrawDocument* pDocument, SvStorage& rStorage { mbDocumentFound = SeekToDocument( &maDocHd ); // maDocHd = the latest DocumentHeader while ( SeekToRec( rStCtrl, PPT_PST_Document, nStreamLen, &maDocHd ) ) - mbDocumentFound = sal_True; + mbDocumentFound = true; sal_uInt32 nDggContainerOfs = 0; @@ -232,10 +232,10 @@ ImplSdPPTImport::~ImplSdPPTImport() // Import -sal_Bool ImplSdPPTImport::Import() +bool ImplSdPPTImport::Import() { if ( !bOk ) - return sal_False; + return false; pSdrModel->setLock(true); pSdrModel->EnableUndo(false); @@ -295,7 +295,7 @@ sal_Bool ImplSdPPTImport::Import() sal_uInt32 nEntryCount = 0; for ( i = 0; i < nVecCount; i++ ) { - if ( !aPropItem.Read( aUString, VT_EMPTY, sal_False ) ) + if ( !aPropItem.Read( aUString, VT_EMPTY, false ) ) break; aPropItem.ReadUInt32( nType ); if ( ( nType != VT_I4 ) && ( nType != VT_UI4 ) ) @@ -324,7 +324,7 @@ sal_Bool ImplSdPPTImport::Import() } for ( i = 0; i < nSlideTitleCount; i++ ) { - if ( !aPropItem.Read( aUString, nType, sal_False ) ) + if ( !aPropItem.Read( aUString, nType, false ) ) break; OUString aString( aUString ); @@ -419,7 +419,7 @@ sal_Bool ImplSdPPTImport::Import() for( nToken = 0; nToken < nTokenCount; nToken++ ) aStringAry[nToken] = OUStringToOString(aString.getToken( nToken, (sal_Unicode)',' ), RTL_TEXTENCODING_UTF8); - sal_Bool bDocInternalSubAddress = sal_False; + bool bDocInternalSubAddress = false; // first pass, searching for a SlideId for( nToken = 0; nToken < nTokenCount; nToken++ ) @@ -436,7 +436,7 @@ sal_Bool ImplSdPPTImport::Import() if ( nPage != PPTSLIDEPERSIST_ENTRY_NOTFOUND ) { nPageNumber = nPage; - bDocInternalSubAddress = sal_True; + bDocInternalSubAddress = true; break; } } @@ -454,7 +454,7 @@ sal_Bool ImplSdPPTImport::Import() if (pIter != maSlideNameList.end()) { nPageNumber = pIter - maSlideNameList.begin(); - bDocInternalSubAddress = sal_True; + bDocInternalSubAddress = true; } } } @@ -468,7 +468,7 @@ sal_Bool ImplSdPPTImport::Import() if ( ( nNumber & ~0xff ) == 0 ) { nPageNumber = (sal_uInt32)nNumber - 1; - bDocInternalSubAddress = sal_True; + bDocInternalSubAddress = true; break; } } @@ -557,18 +557,18 @@ sal_Bool ImplSdPPTImport::Import() SdPage* pPage = (SdPage*)MakeBlancPage( true ); if ( pPage ) { - sal_Bool bNotesMaster = (*GetPageList( eAktPageKind ) )[ nAktPageNum ]->bNotesMaster; - sal_Bool bStarDrawFiller = (*GetPageList( eAktPageKind ) )[ nAktPageNum ]->bStarDrawFiller; + bool bNotesMaster = (*GetPageList( eAktPageKind ) )[ nAktPageNum ]->bNotesMaster; + bool bStarDrawFiller = (*GetPageList( eAktPageKind ) )[ nAktPageNum ]->bStarDrawFiller; PageKind ePgKind = ( bNotesMaster ) ? PK_NOTES : PK_STANDARD; - sal_Bool bHandout = (*GetPageList( eAktPageKind ) )[ nAktPageNum ]->bHandoutMaster; + bool bHandout = (*GetPageList( eAktPageKind ) )[ nAktPageNum ]->bHandoutMaster; if ( bHandout ) ePgKind = PK_HANDOUT; pPage->SetPageKind( ePgKind ); pSdrModel->InsertMasterPage( (SdrPage*)pPage ); if ( bNotesMaster && bStarDrawFiller ) - ((SdPage*)pPage)->SetAutoLayout( AUTOLAYOUT_NOTES, sal_True ); + ((SdPage*)pPage)->SetAutoLayout( AUTOLAYOUT_NOTES, true ); if ( nMasterNum ) { boost::optional< sal_Int16 > oStartNumbering; @@ -628,7 +628,7 @@ sal_Bool ImplSdPPTImport::Import() sal_uInt32 nTitleInstance = TSS_TYPE_PAGETITLE; sal_uInt32 nOutlinerInstance = TSS_TYPE_BODY; const PptSlideLayoutAtom* pSlideLayout = GetSlideLayoutAtom(); - sal_Bool bSwapStyleSheet = pSlideLayout->eLayout == PPT_LAYOUT_TITLEMASTERSLIDE; + bool bSwapStyleSheet = pSlideLayout->eLayout == PPT_LAYOUT_TITLEMASTERSLIDE; if ( bSwapStyleSheet ) { nTitleInstance = TSS_TYPE_TITLE; @@ -723,7 +723,7 @@ sal_Bool ImplSdPPTImport::Import() if ( pNotesClone ) { OUString aLayoutName( ((SdPage*)pSdrModel->GetMasterPage( nAktPageNum - 1 ))->GetLayoutName() ); - ((SdPage*)pNotesClone)->SetPresentationLayout( aLayoutName, sal_False, sal_False, sal_False ); + ((SdPage*)pNotesClone)->SetPresentationLayout( aLayoutName, false, false, false ); ((SdPage*)pNotesClone)->SetLayoutName( aLayoutName ); } } @@ -742,7 +742,7 @@ sal_Bool ImplSdPPTImport::Import() if ( pObj ) pMPage->NbcInsertObject( pObj ); - sal_Bool bNewAnimationsUsed = sal_False; + bool bNewAnimationsUsed = false; ProcessData aProcessData( *(*pList)[ nAktPageNum ], (SdPage*)pMPage ); sal_uInt32 nFPosMerk = rStCtrl.Tell(); DffRecordHeader aPageHd; @@ -879,7 +879,7 @@ sal_Bool ImplSdPPTImport::Import() { for ( sal_uInt16 nPage = 0; nPage < nPageAnz; nPage++ ) { - sal_Bool bNewAnimationsUsed = sal_False; + bool bNewAnimationsUsed = false; mePresChange = PRESCHANGE_SEMIAUTO; SetPageNum( nPage, PPT_SLIDEPAGE ); @@ -978,13 +978,13 @@ sal_Bool ImplSdPPTImport::Import() pSdrModel->InsertPage( pNotesPage ); // SJ: #i29625# because of form controls, the ImportPage( pNotesPage, pMasterPersist2 ); // page must be inserted before importing SetHeaderFooterPageSettings( pNotesPage, pMasterPersist2 ); - pNotesPage->SetAutoLayout( AUTOLAYOUT_NOTES, sal_False ); + pNotesPage->SetAutoLayout( AUTOLAYOUT_NOTES, false ); } else { pNotesPage->SetPageKind( PK_NOTES ); pNotesPage->TRG_SetMasterPage(*pSdrModel->GetMasterPage(nNotesMasterNum)); - pNotesPage->SetAutoLayout( AUTOLAYOUT_NOTES, sal_True ); + pNotesPage->SetAutoLayout( AUTOLAYOUT_NOTES, true ); pSdrModel->InsertPage( pNotesPage ); SdrObject* pPageObj = pNotesPage->GetPresObj( PRESOBJ_PAGE, 1 ); if ( pPageObj ) @@ -1024,7 +1024,7 @@ sal_Bool ImplSdPPTImport::Import() ((SdPage*)pPage)->TRG_SetMasterPage( *((SdPage*)pFoundMaster) ); ((SdPage*)pPage)->SetLayoutName( ((SdPage*)pFoundMaster)->GetLayoutName() ); } - ((SdPage*)pPage)->SetAutoLayout( AUTOLAYOUT_TITLE, sal_True, sal_True ); + ((SdPage*)pPage)->SetAutoLayout( AUTOLAYOUT_TITLE, true, true ); eAktPageKind = PPT_NOTEPAGE; SdrPage* pNPage = MakeBlancPage( false ); @@ -1155,13 +1155,13 @@ sal_Bool ImplSdPPTImport::Import() break; } if ( eAutoLayout != AUTOLAYOUT_NONE ) - pPage->SetAutoLayout( eAutoLayout, sal_False ); + pPage->SetAutoLayout( eAutoLayout, false ); } } // handout master page: auto layout SdPage* pHandoutMPage = mpDoc->GetMasterSdPage( 0, PK_HANDOUT ); - pHandoutMPage->SetAutoLayout( AUTOLAYOUT_HANDOUT6, sal_True, sal_True ); + pHandoutMPage->SetAutoLayout( AUTOLAYOUT_HANDOUT6, true, true ); } sal_uInt32 nSlideCount = GetPageCount(); @@ -1179,7 +1179,7 @@ sal_Bool ImplSdPPTImport::Import() } if ( mbDocumentFound ) { - mpDoc->SetSummationOfParagraphs( sal_True ); + mpDoc->SetSummationOfParagraphs( true ); if ( pDocShell ) { ::sd::FrameView* pFrameView = mpDoc->GetFrameView( 0 ); @@ -1257,7 +1257,7 @@ sal_Bool ImplSdPPTImport::Import() sal_uInt32 nSCount = aContent.nRecLen >> 2; if ( pPageList && nSCount ) { - SdCustomShowList* pList = mpDoc->GetCustomShowList( sal_True ); + SdCustomShowList* pList = mpDoc->GetCustomShowList( true ); if ( pList ) { SdCustomShow* pSdCustomShow = new SdCustomShow( mpDoc ); @@ -1326,7 +1326,7 @@ sal_Bool ImplSdPPTImport::Import() // set the current custom show if ( !aCustomShow.isEmpty() ) { - SdCustomShowList* pList = mpDoc->GetCustomShowList( sal_False ); + SdCustomShowList* pList = mpDoc->GetCustomShowList( false ); if ( pList ) { SdCustomShow* pPtr = NULL; @@ -1465,7 +1465,7 @@ bool Ppt97AnimationStlSortHelper::operator()( const std::pair< SdrObject*, Ppt97 return false; } -void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimationsUsed ) +void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const bool bNewAnimationsUsed ) { sal_uLong nFilePosMerk = rStCtrl.Tell(); @@ -1493,8 +1493,8 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimat { sal_uLong nPageRecEnd = aPageRecHd.GetRecEndFilePos(); - sal_Bool bTryTwice = ( eAktPageKind == PPT_SLIDEPAGE ); - sal_Bool bSSSlideInfoAtom = sal_False; + bool bTryTwice = ( eAktPageKind == PPT_SLIDEPAGE ); + bool bSSSlideInfoAtom = false; while ( true ) { while ( ( rStCtrl.GetError() == 0 ) && ( rStCtrl.Tell() < nPageRecEnd ) ) @@ -1505,7 +1505,7 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimat { case PPT_PST_SSSlideInfoAtom: { - bSSSlideInfoAtom = sal_True; + bSSSlideInfoAtom = true; if ( eAktPageKind == PPT_MASTERPAGE ) { if ( pActualSlidePersist ) @@ -1755,10 +1755,10 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimat pPage->SetPresChange( mePresChange ); if ( nBuildFlags & 4 ) - pPage->SetExcluded( sal_True ); // don't show slide + pPage->SetExcluded( true ); // don't show slide if ( nBuildFlags & 16 ) { // slide with sound effect - pPage->SetSound( sal_True ); + pPage->SetSound( true ); OUString aSoundFile( ReadSound( nSoundRef ) ); pPage->SetSoundFile( aSoundFile ); } @@ -1772,9 +1772,9 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimat } aHd.SeekToEndOfRecord( rStCtrl ); } - if ( bTryTwice && ( bSSSlideInfoAtom == sal_False ) ) + if ( bTryTwice && ( bSSSlideInfoAtom == false ) ) { - bTryTwice = sal_False; + bTryTwice = false; if ( HasMasterPage( nAktPageNum, eAktPageKind ) ) { sal_uInt16 nMasterNum = GetMasterPageIndex( nAktPageNum, eAktPageKind ); @@ -1853,8 +1853,8 @@ OUString ImplSdPPTImport::ReadSound(sal_uInt32 nSoundRef) const { sal_uInt32 nDataLen = aSoundBlockRecHd.GetRecEndFilePos(); DffRecordHeader aSoundRecHd; - sal_Bool bRefStrValid = sal_False; - sal_Bool bDone = sal_False; + bool bRefStrValid = false; + bool bDone = false; while( !bDone && SeekToRec( rStCtrl, PPT_PST_Sound, nDataLen, &aSoundRecHd ) ) { @@ -1864,7 +1864,7 @@ OUString ImplSdPPTImport::ReadSound(sal_uInt32 nSoundRef) const if ( SeekToRec( rStCtrl, PPT_PST_CString, nStrLen, NULL, 2 ) ) { if ( ReadString( aRefStr ) ) - bRefStrValid = sal_True; + bRefStrValid = true; } if ( bRefStrValid ) { @@ -1874,7 +1874,7 @@ OUString ImplSdPPTImport::ReadSound(sal_uInt32 nSoundRef) const if ( SeekToRec( rStCtrl, PPT_PST_CString, nStrLen, NULL, 0 ) ) { ReadString( aRetval ); - bDone = sal_True; + bDone = true; } } } @@ -1882,7 +1882,7 @@ OUString ImplSdPPTImport::ReadSound(sal_uInt32 nSoundRef) const { // Check if this sound file already exists. // If not, it is exported to our local sound directory. - sal_Bool bSoundExists = sal_False; + bool bSoundExists = false; ::std::vector< OUString > aSoundList; GalleryExplorer::FillObjList( GALLERY_THEME_SOUNDS, aSoundList ); @@ -1895,7 +1895,7 @@ OUString ImplSdPPTImport::ReadSound(sal_uInt32 nSoundRef) const if( aURL.GetName() == aRetval ) { aRetval = aSoundList[ n ]; - bSoundExists = sal_True; + bSoundExists = true; } } @@ -2245,8 +2245,8 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj { if ( eAktPageKind == PPT_MASTERPAGE ) { - sal_Bool bCreatePlaceHolder = ( pTextObj->GetInstance() != TSS_TYPE_UNUSED ); - sal_Bool bIsHeaderFooter = ( ePresKind == PRESOBJ_HEADER) || (ePresKind == PRESOBJ_FOOTER) + bool bCreatePlaceHolder = ( pTextObj->GetInstance() != TSS_TYPE_UNUSED ); + bool bIsHeaderFooter = ( ePresKind == PRESOBJ_HEADER) || (ePresKind == PRESOBJ_FOOTER) || (ePresKind == PRESOBJ_DATETIME) || (ePresKind == PRESOBJ_SLIDENUMBER); if ( bCreatePlaceHolder && ( pTextObj->GetInstance() == TSS_TYPE_TEXT_IN_SHAPE ) ) bCreatePlaceHolder = bIsHeaderFooter; @@ -2309,8 +2309,8 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj if ( eAktPageKind == PPT_SLIDEPAGE ) { PresObjKind ePresObjKind = PRESOBJ_NONE; - sal_Bool bEmptyPresObj = sal_True; - sal_Bool bVertical = sal_False; + bool bEmptyPresObj = true; + bool bVertical = false; if ( ( pTextObj->GetShapeType() == mso_sptRectangle ) || ( pTextObj->GetShapeType() == mso_sptTextBox ) ) { //if a placeholder with some custom attribute,the pTextObj will keep those attr,whose text size is zero, @@ -2320,10 +2320,10 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj { case PPT_PLACEHOLDER_NOTESBODY : ePresObjKind = PRESOBJ_NOTES; break; case PPT_PLACEHOLDER_VERTICALTEXTTITLE : - bVertical = sal_True; // PASSTHROUGH !!! + bVertical = true; // PASSTHROUGH !!! case PPT_PLACEHOLDER_TITLE : ePresObjKind = PRESOBJ_TITLE; break; case PPT_PLACEHOLDER_VERTICALTEXTBODY : - bVertical = sal_True; // PASSTHROUGH !!! + bVertical = true; // PASSTHROUGH !!! case PPT_PLACEHOLDER_BODY : ePresObjKind = PRESOBJ_OUTLINE; break; case PPT_PLACEHOLDER_CENTEREDTITLE : ePresObjKind = PRESOBJ_TITLE; break; case PPT_PLACEHOLDER_SUBTITLE : ePresObjKind = PRESOBJ_TEXT; break; // PRESOBJ_OUTLINE @@ -2349,7 +2349,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj { if ( !pTextObj->Count() && pObj->ISA( SdrGrafObj ) ) { - bEmptyPresObj = sal_False; + bEmptyPresObj = false; switch ( nPlaceholderId ) { case PPT_PLACEHOLDER_MEDIACLIP : @@ -2369,7 +2369,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj } else { - SdrObject* pPresObj = pPage->CreatePresObj( ePresObjKind, bVertical, pText->GetLogicRect(), sal_True ); + SdrObject* pPresObj = pPage->CreatePresObj( ePresObjKind, bVertical, pText->GetLogicRect(), true ); pPresObj->SetUserCall( pPage ); SfxItemSet aSet( pSdrModel->GetItemPool() ); @@ -2534,8 +2534,8 @@ SdrObject* ImplSdPPTImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi pProcessData->pPage->InsertPresObj( pObj, PRESOBJ_PAGE ); } - sal_Bool bInhabitanceChecked = sal_False; - sal_Bool bAnimationInfoFound = sal_False; + bool bInhabitanceChecked = false; + bool bAnimationInfoFound = false; DffRecordHeader aMasterShapeHd; if ( maShapeRecords.SeekToContent( rSt, DFF_msofbtClientData, SEEK_FROM_CURRENT_AND_RESTART ) ) @@ -2592,7 +2592,7 @@ SdrObject* ImplSdPPTImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi maAnimations[pObj] = pAnimation; - bAnimationInfoFound = sal_True; + bAnimationInfoFound = true; } } } @@ -2660,7 +2660,7 @@ SdrObject* ImplSdPPTImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi if ( bInhabitanceChecked || bAnimationInfoFound ) break; - bInhabitanceChecked = sal_True; + bInhabitanceChecked = true; if ( ! ( IsProperty( DFF_Prop_hspMaster ) && SeekToShape( rSt, pData, GetPropertyValue( DFF_Prop_hspMaster ) ) ) ) break; ReadDffRecordHeader( rSt, aMasterShapeHd ); @@ -2694,7 +2694,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL ImportPPT( SdDrawDocument* pDocument, SvStream& rDocStream, SvStorage& rStorage, SfxMedium& rMedium ) { SdPPTImport* pImport = new SdPPTImport( pDocument, rDocStream, rStorage, rMedium ); - sal_Bool bRet = pImport->Import(); + bool bRet = pImport->Import(); delete pImport; diff --git a/sd/source/filter/ppt/pptin.hxx b/sd/source/filter/ppt/pptin.hxx index 2de8fd608ccf..49c7e6479b96 100644 --- a/sd/source/filter/ppt/pptin.hxx +++ b/sd/source/filter/ppt/pptin.hxx @@ -52,7 +52,7 @@ class ImplSdPPTImport : public SdrPowerPointImport // SvStream* mpPicStream; DffRecordHeader maDocHd; std::vector<OUString> maSlideNameList; - sal_Bool mbDocumentFound; + bool mbDocumentFound; sal_uInt32 mnFilterOptions; SdDrawDocument* mpDoc; PresChange mePresChange; @@ -61,7 +61,7 @@ class ImplSdPPTImport : public SdrPowerPointImport tAnimationMap maAnimations; void SetHeaderFooterPageSettings( SdPage* pPage, const PptSlidePersistEntry* pMasterPersist ); - void ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimationsUsed ); + void ImportPageEffect( SdPage* pPage, const bool bNewAnimationsUsed ); void FillSdAnimationInfo( SdAnimationInfo* pInfo, PptInteractiveInfoAtom* pIAtom, const OUString& aMacroName ); @@ -77,7 +77,7 @@ public: ImplSdPPTImport( SdDrawDocument* pDoc, SvStorage& rStorage, SfxMedium& rMed, PowerPointImportParam& ); virtual ~ImplSdPPTImport(); - sal_Bool Import(); + bool Import(); virtual bool ReadFormControl( SotStorageRef& rSrc1, com::sun::star::uno::Reference< com::sun::star::form::XFormComponent > & rFormComp ) const SAL_OVERRIDE; }; @@ -90,7 +90,7 @@ class SdPPTImport SdPPTImport( SdDrawDocument* pDoc, SvStream& rDocStream, SvStorage& rStorage, SfxMedium& rMed ); ~SdPPTImport(); - sal_Bool Import(); + bool Import(); }; #endif // INCLUDED_SD_SOURCE_FILTER_PPT_PPTIN_HXX diff --git a/sd/source/filter/ppt/pptinanimations.cxx b/sd/source/filter/ppt/pptinanimations.cxx index 3b8c73d6c09a..3f1e1418ebc0 100644 --- a/sd/source/filter/ppt/pptinanimations.cxx +++ b/sd/source/filter/ppt/pptinanimations.cxx @@ -761,7 +761,7 @@ bool AnimationImporter::convertAnimationNode( const Reference< XAnimationNode >& NamedValue* pLastValue = pValue; sal_Int32 nLength = aUserData.getLength(), nRemoved = 0; - sal_Bool bAfterEffect = false; + bool bAfterEffect = false; sal_Int32 nMasterRel = 0; for( ; nLength--; pValue++ ) { @@ -1104,7 +1104,7 @@ static OUString getConvertedSubType( sal_Int16 nPresetClass, sal_Int32 nPresetId void AnimationImporter::fillNode( Reference< XAnimationNode >& xNode, const AnimationNode& rNode, const PropertySet& rSet ) { - sal_Bool bAfterEffect = false; + bool bAfterEffect = false; // attribute Restart if( rNode.mnRestart ) @@ -1368,9 +1368,9 @@ void AnimationImporter::fillNode( Reference< XAnimationNode >& xNode, const Anim { if( rSet.hasProperty( DFF_ANIM_DIRECTION ) ) { - sal_Bool bDirection = sal_False; + bool bDirection = false; if( rSet.getProperty( DFF_ANIM_DIRECTION ) >>= bDirection ) - xColor->setDirection( (sal_Bool)!bDirection ); + xColor->setDirection( !bDirection ); } if( rSet.hasProperty( DFF_ANIM_COLORSPACE ) ) diff --git a/sd/source/filter/ppt/propread.cxx b/sd/source/filter/ppt/propread.cxx index 955588e00ede..3972efba8cb1 100644 --- a/sd/source/filter/ppt/propread.cxx +++ b/sd/source/filter/ppt/propread.cxx @@ -74,10 +74,10 @@ static sal_Int32 lcl_getMaxSafeStrLen(sal_uInt32 nSize) return static_cast< sal_Int32 >( nSize ); } -sal_Bool PropItem::Read( OUString& rString, sal_uInt32 nStringType, sal_Bool bAlign ) +bool PropItem::Read( OUString& rString, sal_uInt32 nStringType, bool bAlign ) { sal_uInt32 i, nItemSize, nType, nItemPos; - sal_Bool bRetValue = sal_False; + bool bRetValue = false; nItemPos = Tell(); @@ -113,7 +113,7 @@ sal_Bool PropItem::Read( OUString& rString, sal_uInt32 nStringType, sal_Bool bAl } else rString = OUString(); - bRetValue = sal_True; + bRetValue = true; } else { @@ -124,7 +124,7 @@ sal_Bool PropItem::Read( OUString& rString, sal_uInt32 nStringType, sal_Bool bAl rString = OUString(pString, rtl_str_getLength(pString), mnTextEnc); else rString = OUString(); - bRetValue = sal_True; + bRetValue = true; } } delete[] pString; @@ -154,7 +154,7 @@ sal_Bool PropItem::Read( OUString& rString, sal_uInt32 nStringType, sal_Bool bAl rString = OUString(pString, lcl_getMaxSafeStrLen(nItemSize)); else rString = OUString(); - bRetValue = sal_True; + bRetValue = true; } delete[] pString; } @@ -212,7 +212,7 @@ Section::Section( const sal_uInt8* pFMTID ) -sal_Bool Section::GetProperty( sal_uInt32 nId, PropItem& rPropItem ) +bool Section::GetProperty( sal_uInt32 nId, PropItem& rPropItem ) { if ( nId ) { @@ -229,10 +229,10 @@ sal_Bool Section::GetProperty( sal_uInt32 nId, PropItem& rPropItem ) rPropItem.SetTextEncoding( mnTextEnc ); rPropItem.Write( iter->mpBuf,iter->mnSize ); rPropItem.Seek( STREAM_SEEK_TO_BEGIN ); - return sal_True; + return true; } } - return sal_False; + return false; } @@ -264,9 +264,9 @@ void Section::AddProperty( sal_uInt32 nId, const sal_uInt8* pBuf, sal_uInt32 nBu -sal_Bool Section::GetDictionary( Dictionary& rDict ) +bool Section::GetDictionary( Dictionary& rDict ) { - sal_Bool bRetValue = sal_False; + bool bRetValue = false; boost::ptr_vector<PropEntry>::iterator iter; for (iter = maEntries.begin(); iter != maEntries.end(); ++iter) @@ -313,7 +313,7 @@ sal_Bool Section::GetDictionary( Dictionary& rDict ) break; rDict.insert( std::make_pair(aString,nId) ); } - bRetValue = sal_True; + bRetValue = true; } } return bRetValue; @@ -354,7 +354,7 @@ void Section::Read( SvStorageStream *pStrm ) nVectorCount = 1; - sal_Bool bVariant = ( nPropType == VT_VARIANT ); + bool bVariant = ( nPropType == VT_VARIANT ); for ( i = 0; nPropSize && ( i < nVectorCount ); i++ ) { @@ -523,7 +523,7 @@ Section& Section::operator=( const Section& rSection ) PropRead::PropRead( SvStorage& rStorage, const OUString& rName ) : - mbStatus ( sal_False ), + mbStatus ( false ), mnByteOrder ( 0xfffe ), mnFormat ( 0 ), mnVersionLo ( 4 ), @@ -536,7 +536,7 @@ PropRead::PropRead( SvStorage& rStorage, const OUString& rName ) : { mpSvStream->SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN ); memset( mApplicationCLSID, 0, 16 ); - mbStatus = sal_True; + mbStatus = true; } } } @@ -580,7 +580,7 @@ void PropRead::Read() mpSvStream->ReadUInt32( nSections ); if ( nSections > 2 ) // sj: PowerPoint documents are containing max 2 sections { - mbStatus = sal_False; + mbStatus = false; } else for ( sal_uInt32 i = 0; i < nSections; i++ ) { diff --git a/sd/source/filter/ppt/propread.hxx b/sd/source/filter/ppt/propread.hxx index 5a623559d73b..7d2ea78f2581 100644 --- a/sd/source/filter/ppt/propread.hxx +++ b/sd/source/filter/ppt/propread.hxx @@ -123,7 +123,7 @@ public: void Clear(); void SetTextEncoding( sal_uInt16 nTextEnc ){ mnTextEnc = nTextEnc; }; - sal_Bool Read( OUString& rString, sal_uInt32 nType = VT_EMPTY, sal_Bool bDwordAlign = sal_True ); + bool Read( OUString& rString, sal_uInt32 nType = VT_EMPTY, bool bDwordAlign = true ); PropItem& operator=( PropItem& rPropItem ); using SvStream::Read; @@ -145,15 +145,15 @@ class Section Section( const Section& rSection ); Section& operator=( const Section& rSection ); - sal_Bool GetProperty( sal_uInt32 nId, PropItem& rPropItem ); - sal_Bool GetDictionary( Dictionary& rDict ); + bool GetProperty( sal_uInt32 nId, PropItem& rPropItem ); + bool GetDictionary( Dictionary& rDict ); const sal_uInt8* GetFMTID() const { return aFMTID; }; void Read( SvStorageStream* pStrm ); }; class PropRead { - sal_Bool mbStatus; + bool mbStatus; SvStorageStreamRef mpSvStream; sal_uInt16 mnByteOrder; @@ -170,7 +170,7 @@ class PropRead PropRead& operator=( const PropRead& rPropRead ); const Section* GetSection( const sal_uInt8* pFMTID ); - sal_Bool IsValid() const { return mbStatus; }; + bool IsValid() const { return mbStatus; }; void Read(); }; diff --git a/sd/source/filter/sdfilter.cxx b/sd/source/filter/sdfilter.cxx index a7df9aff0e5c..b0289f2f3eb0 100644 --- a/sd/source/filter/sdfilter.cxx +++ b/sd/source/filter/sdfilter.cxx @@ -47,7 +47,7 @@ using namespace ::com::sun::star::frame; // - SdFilter - -SdFilter::SdFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, sal_Bool bShowProgress ) +SdFilter::SdFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, bool bShowProgress ) : mxModel( rDocShell.GetModel() ) , mrMedium( rMedium ) , mrDocShell( rDocShell ) diff --git a/sd/source/filter/sdpptwrp.cxx b/sd/source/filter/sdpptwrp.cxx index be51d9c4ae8f..cfeaeebef5fb 100644 --- a/sd/source/filter/sdpptwrp.cxx +++ b/sd/source/filter/sdpptwrp.cxx @@ -66,7 +66,7 @@ extern "C" sal_Bool SaveVBA( SfxObjectShell&, SvMemoryStream*& ); // - SdPPTFilter - -SdPPTFilter::SdPPTFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, sal_Bool bShowProgress ) : +SdPPTFilter::SdPPTFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, bool bShowProgress ) : SdFilter( rMedium, rDocShell, bShowProgress ), pBas ( NULL ) { @@ -81,9 +81,9 @@ SdPPTFilter::~SdPPTFilter() -sal_Bool SdPPTFilter::Import() +bool SdPPTFilter::Import() { - sal_Bool bRet = sal_False; + bool bRet = false; SotStorageRef pStorage = new SotStorage( mrMedium.GetInStream(), false ); if( !pStorage->GetError() ) { @@ -133,12 +133,12 @@ sal_Bool SdPPTFilter::Import() -sal_Bool SdPPTFilter::Export() +bool SdPPTFilter::Export() { #ifndef DISABLE_DYNLOADING ::osl::Module* pLibrary = OpenLibrary( mrMedium.GetFilter()->GetUserData() ); #endif - sal_Bool bRet = sal_False; + bool bRet = false; #ifndef DISABLE_DYNLOADING if( pLibrary ) diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx index 53143f67e1d3..7b77d2cca04d 100644 --- a/sd/source/filter/xml/sdxmlwrp.cxx +++ b/sd/source/filter/xml/sdxmlwrp.cxx @@ -168,7 +168,7 @@ XML_SERVICES* getServices( bool bImport, bool bDraw, sal_uLong nStoreVer ) // - SdXMLWrapper - -SdXMLFilter::SdXMLFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, sal_Bool bShowProgress, SdXMLFilterMode eFilterMode, sal_uLong nStoreVer ) : +SdXMLFilter::SdXMLFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, bool bShowProgress, SdXMLFilterMode eFilterMode, sal_uLong nStoreVer ) : SdFilter( rMedium, rDocShell, bShowProgress ), meFilterMode( eFilterMode ), mnStoreVer( nStoreVer ) { } @@ -185,8 +185,8 @@ sal_Int32 ReadThroughComponent( const sal_Char* pFilterName, Sequence<Any> rFilterArguments, const OUString& rName, - sal_Bool bMustBeSuccessfull, - sal_Bool bEncrypted ) + bool bMustBeSuccessfull, + bool bEncrypted ) { DBG_ASSERT(xInputStream.is(), "input stream missing"); DBG_ASSERT(xModelComponent.is(), "document missing"); @@ -231,7 +231,7 @@ sal_Int32 ReadThroughComponent( // sax parser sends wrapped exceptions, // try to find the original one xml::sax::SAXException aSaxEx = *(xml::sax::SAXException*)(&r); - sal_Bool bTryChild = sal_True; + bool bTryChild = true; while( bTryChild ) { @@ -239,7 +239,7 @@ sal_Int32 ReadThroughComponent( if ( aSaxEx.WrappedException >>= aTmp ) aSaxEx = aTmp; else - bTryChild = sal_False; + bTryChild = false; } packages::zip::ZipIOException aBrokenPackage; @@ -327,14 +327,14 @@ sal_Int32 ReadThroughComponent( const sal_Char* pFilterName, Sequence<Any> rFilterArguments, const OUString& rName, - sal_Bool bMustBeSuccessfull ) + bool bMustBeSuccessfull ) { DBG_ASSERT(xStorage.is(), "Need storage!"); DBG_ASSERT(NULL != pStreamName, "Please, please, give me a name!"); // open stream (and set parser input) OUString sStreamName = OUString::createFromAscii(pStreamName); - sal_Bool bContainsStream = sal_False; + bool bContainsStream = false; try { bContainsStream = xStorage->isStreamElement(sStreamName); @@ -388,7 +388,7 @@ sal_Int32 ReadThroughComponent( Any aAny = xProps->getPropertyValue( "Encrypted" ); - sal_Bool bEncrypted = aAny.getValueType() == ::getBooleanCppuType() && + bool bEncrypted = aAny.getValueType() == ::getBooleanCppuType() && *(sal_Bool *)aAny.getValue(); Reference <io::XInputStream> xInputStream = xStream->getInputStream(); @@ -415,7 +415,7 @@ sal_Int32 ReadThroughComponent( -sal_Bool SdXMLFilter::Import( ErrCode& nError ) +bool SdXMLFilter::Import( ErrCode& nError ) { sal_uInt32 nRet = 0; @@ -614,26 +614,26 @@ sal_Bool SdXMLFilter::Import( ErrCode& nError ) nWarn = ReadThroughComponent( xStorage, xModelComp, "meta.xml", "Meta.xml", rxContext, pServices->mpMeta, - aEmptyArgs, aName, sal_False ); + aEmptyArgs, aName, false ); if( meFilterMode != SDXMLMODE_Organizer ) { nWarn2 = ReadThroughComponent( xStorage, xModelComp, "settings.xml", NULL, rxContext, pServices->mpSettings, - aFilterArgs, aName, sal_False ); + aFilterArgs, aName, false ); } nRet = ReadThroughComponent( xStorage, xModelComp, "styles.xml", NULL, rxContext, pServices->mpStyles, - aFilterArgs, aName, sal_True ); + aFilterArgs, aName, true ); if( !nRet && (meFilterMode != SDXMLMODE_Organizer) ) nRet = ReadThroughComponent( xStorage, xModelComp, "content.xml", "Content.xml", rxContext, pServices->mpContent, - aFilterArgs, aName, sal_True ); + aFilterArgs, aName, true ); if( !nRet ) { @@ -786,19 +786,19 @@ sal_Bool SdXMLFilter::Import( ErrCode& nError ) -sal_Bool SdXMLFilter::Export() +bool SdXMLFilter::Export() { SvXMLEmbeddedObjectHelper* pObjectHelper = NULL; SvXMLGraphicHelper* pGraphicHelper = NULL; - sal_Bool bDocRet = sal_False; + bool bDocRet = false; if( !mxModel.is() ) { SAL_WARN( "sd.filter","Got NO Model in XMLExport"); - return sal_False; + return false; } - sal_Bool bLocked = mxModel->hasControllersLocked(); + bool bLocked = mxModel->hasControllersLocked(); try { @@ -809,7 +809,7 @@ sal_Bool SdXMLFilter::Export() if( !xServiceInfo.is() || !xServiceInfo->supportsService( "com.sun.star.drawing.GenericDrawingDocument" ) ) { SAL_WARN( "sd.filter", "Model is no DrawingDocument in XMLExport" ); - return sal_False; + return false; } uno::Reference<uno::XComponentContext> xContext( ::comphelper::getProcessComponentContext() ); @@ -850,7 +850,7 @@ sal_Bool SdXMLFilter::Export() SvtSaveOptions aSaveOpt; OUString sUsePrettyPrinting("UsePrettyPrinting"); - sal_Bool bUsePrettyPrinting( aSaveOpt.IsPrettyPrinting() ); + bool bUsePrettyPrinting( aSaveOpt.IsPrettyPrinting() ); xInfoSet->setPropertyValue( sUsePrettyPrinting, makeAny( bUsePrettyPrinting ) ); const uno::Reference < embed::XStorage >& xStorage = mrMedium.GetOutputStorage(); @@ -963,12 +963,12 @@ sal_Bool SdXMLFilter::Export() DBG_ASSERT(xStream.is(), "Can't create output stream in package!"); if( !xStream.is() ) - return sal_False; + return false; xDocOut = xStream->getOutputStream(); Reference <beans::XPropertySet > xProps( xStream, uno::UNO_QUERY ); if( !xDocOut.is() || !xProps.is() ) - return sal_False; + return false; uno::Any aAny; aAny <<= OUString( "text/xml"); @@ -976,7 +976,7 @@ sal_Bool SdXMLFilter::Export() // encrypt all streams xProps->setPropertyValue( "UseCommonStoragePasswordEncryption", - uno::makeAny( (sal_Bool)sal_True ) ); + uno::makeAny( true ) ); const OUString sStreamName( "StreamName"); xInfoSet->setPropertyValue( sStreamName, Any( sDocName ) ); @@ -1024,7 +1024,7 @@ sal_Bool SdXMLFilter::Export() #else (void)e; #endif - bDocRet = sal_False; + bDocRet = false; } if ( !bLocked ) mxModel->unlockControllers(); diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx index 0088f5aa6db7..0819cede035c 100644 --- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx +++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx @@ -699,7 +699,7 @@ bool { const SolarMutexGuard aSolarGuard; uno::Reference< view::XSelectionSupplier > xSel( mxController, uno::UNO_QUERY ); - sal_Bool bRet = sal_False; + bool bRet = false; OSL_ENSURE( 0 <= nAccessibleChildIndex, "AccessibleDrawDocumentView::implIsSelected: invalid index!" ); @@ -722,7 +722,7 @@ bool { for( sal_Int32 i = 0, nCount = xShapes->getCount(); ( i < nCount ) && !bRet; ++i ) if( xShapes->getByIndex( i ) == xShape ) - bRet = sal_True; + bRet = true; } } } @@ -792,7 +792,7 @@ void if( xShape.is() ) { uno::Reference< drawing::XShapes > xShapes; - sal_Bool bFound = sal_False; + bool bFound = false; aAny = xSel->getSelection(); aAny >>= xShapes; @@ -803,7 +803,7 @@ void sal_Int32 nCount = xShapes->getCount(); for (sal_Int32 i=0; ( i < nCount ) && !bFound; ++i ) if( xShapes->getByIndex( i ) == xShape ) - bFound = sal_True; + bFound = true; } else // Create an empty selection to add the shape to. @@ -831,13 +831,13 @@ void AccessibleDrawDocumentView::Activated (void) { if (mpChildrenManager != NULL) { - sal_Bool bChange = sal_False; + bool bChange = false; // When none of the children has the focus then claim it for the // view. if ( ! mpChildrenManager->HasFocus()) { SetState (AccessibleStateType::FOCUSED); - bChange = sal_True; + bChange = true; } else ResetState (AccessibleStateType::FOCUSED); diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx index 992ba05128b4..e62bf65ffa6d 100644 --- a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx +++ b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx @@ -527,7 +527,7 @@ void AccessibleSlideSorterObject::ThrowIfDisposed (void) -sal_Bool AccessibleSlideSorterObject::IsDisposed (void) +bool AccessibleSlideSorterObject::IsDisposed (void) { return (rBHelper.bDisposed || rBHelper.bInDispose); } diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx index f36129680a17..2a51ef286616 100644 --- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx +++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx @@ -616,7 +616,7 @@ sal_Bool SAL_CALL AccessibleSlideSorterView::isAccessibleChildSelected (sal_Int3 RuntimeException, std::exception) { ThrowIfDisposed(); - sal_Bool bIsSelected = sal_False; + bool bIsSelected = false; const SolarMutexGuard aSolarGuard; AccessibleSlideSorterObject* pChild = mpImpl->GetAccessibleChild(nChildIndex); @@ -755,7 +755,7 @@ void AccessibleSlideSorterView::ThrowIfDisposed (void) -sal_Bool AccessibleSlideSorterView::IsDisposed (void) +bool AccessibleSlideSorterView::IsDisposed (void) { return (rBHelper.bDisposed || rBHelper.bInDispose); } @@ -1086,12 +1086,12 @@ IMPL_LINK_NOARG(AccessibleSlideSorterView::Implementation, FocusChangeListener) sal_Int32 nNewFocusedIndex ( mrSlideSorter.GetController().GetFocusManager().GetFocusedPageIndex()); - sal_Bool bHasFocus = mrSlideSorter.GetController().GetFocusManager().IsFocusShowing(); + bool bHasFocus = mrSlideSorter.GetController().GetFocusManager().IsFocusShowing(); if (!bHasFocus) nNewFocusedIndex = -1; // add a checker whether the focus event is sent out. Only after sent, the mnFocusedIndex should be updated. - sal_Bool bSentFocus = sal_False; + bool bSentFocus = false; if (nNewFocusedIndex != mnFocusedIndex) { if (mnFocusedIndex >= 0) @@ -1103,7 +1103,7 @@ IMPL_LINK_NOARG(AccessibleSlideSorterView::Implementation, FocusChangeListener) AccessibleEventId::STATE_CHANGED, Any(AccessibleStateType::FOCUSED), Any()); - bSentFocus = sal_True; + bSentFocus = true; } } if (nNewFocusedIndex >= 0) @@ -1115,10 +1115,10 @@ IMPL_LINK_NOARG(AccessibleSlideSorterView::Implementation, FocusChangeListener) AccessibleEventId::STATE_CHANGED, Any(), Any(AccessibleStateType::FOCUSED)); - bSentFocus = sal_True; + bSentFocus = true; } } - if (bSentFocus == sal_True) + if (bSentFocus) mnFocusedIndex = nNewFocusedIndex; } return 1; diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx index f859038f76da..420fb4bf17b9 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationDialog.cxx @@ -1130,7 +1130,7 @@ private: private: ::std::vector< OUString > maSoundList; - sal_Bool mbHasText; + bool mbHasText; const STLPropertySet* mpSet; VclFrame* mpSettings; @@ -1156,7 +1156,7 @@ private: }; CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( Window* pParent, const STLPropertySet* pSet ) -: TabPage( pParent, "EffectTab", "modules/simpress/ui/customanimationeffecttab.ui" ), mbHasText( sal_False ), mpSet(pSet ) +: TabPage( pParent, "EffectTab", "modules/simpress/ui/customanimationeffecttab.ui" ), mbHasText( false ), mpSet(pSet ) { get(mpSettings, "settings" ); get(mpFTProperty1, "prop_label1" ); @@ -1271,7 +1271,7 @@ CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( Window* pParent, con (pSet->getPropertyState( nHandleAfterEffectOnNextEffect ) != STLPropertyState_AMBIGUOUS) && (pSet->getPropertyState( nHandleDimColor ) != STLPropertyState_AMBIGUOUS)) { - sal_Bool bHasAfterEffect = sal_False; + bool bHasAfterEffect = false; pSet->getPropertyValue( nHandleHasAfterEffect ) >>= bHasAfterEffect; sal_Int32 nPos = 0; @@ -1279,7 +1279,7 @@ CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( Window* pParent, con { nPos++; - sal_Bool bAfterEffectOnNextClick = sal_False; + bool bAfterEffectOnNextClick = false; pSet->getPropertyValue( nHandleAfterEffectOnNextEffect ) >>= bAfterEffectOnNextClick; Any aDimColor( pSet->getPropertyValue( nHandleDimColor ) ); @@ -1487,9 +1487,9 @@ void CustomAnimationEffectTabPage::update( STLPropertySet* pSet ) sal_Int32 nPos = mpLBAfterEffect->GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) { - sal_Bool bAfterEffect = nPos != 0; + bool bAfterEffect = nPos != 0; - sal_Bool bOldAfterEffect = sal_False; + bool bOldAfterEffect = false; if(mpSet->getPropertyState( nHandleHasAfterEffect ) != STLPropertyState_AMBIGUOUS) mpSet->getPropertyValue( nHandleHasAfterEffect ) >>= bOldAfterEffect; @@ -1513,8 +1513,8 @@ void CustomAnimationEffectTabPage::update( STLPropertySet* pSet ) (mpSet->getPropertyValue( nHandleDimColor ) != aDimColor) ) pSet->setPropertyValue( nHandleDimColor, makeAny( aDimColor ) ); - sal_Bool bAfterEffectOnNextEffect = nPos != 2 ? sal_True : sal_False; - sal_Bool bOldAfterEffectOnNextEffect = !bAfterEffectOnNextEffect; + bool bAfterEffectOnNextEffect = nPos != 2 ? sal_True : sal_False; + bool bOldAfterEffectOnNextEffect = !bAfterEffectOnNextEffect; if( mpSet->getPropertyState( nHandleAfterEffectOnNextEffect ) != STLPropertyState_AMBIGUOUS) mpSet->getPropertyValue( nHandleAfterEffectOnNextEffect ) >>= bOldAfterEffectOnNextEffect; @@ -1572,7 +1572,7 @@ void CustomAnimationEffectTabPage::update( STLPropertySet* pSet ) else if( nPos == 1 ) { // this means stop sound - aNewSoundURL = makeAny( (sal_Bool)sal_True ); + aNewSoundURL = makeAny( true ); } else { @@ -1876,7 +1876,7 @@ CustomAnimationDurationTabPage::CustomAnimationDurationTabPage(Window* pParent, Reference< XPropertySet > xSet( xShape, UNO_QUERY ); if( xSet.is() && xSet->getPropertySetInfo()->hasPropertyByName( aStrIsEmptyPresObj ) ) { - sal_Bool bIsEmpty = sal_False; + bool bIsEmpty = false; xSet->getPropertyValue( aStrIsEmptyPresObj ) >>= bIsEmpty; if( bIsEmpty ) continue; @@ -2132,7 +2132,7 @@ CustomAnimationTextAnimTabPage::CustomAnimationTextAnimTabPage(Window* pParent, maCBXAnimateForm->SetState( TRISTATE_INDET ); if( pSet->getPropertyState( nHandleAnimateForm ) != STLPropertyState_AMBIGUOUS ) { - sal_Bool bAnimateForm = sal_False; + bool bAnimateForm = false; if( pSet->getPropertyValue( nHandleAnimateForm ) >>= bAnimateForm ) { maCBXAnimateForm->Check( bAnimateForm ); @@ -2146,7 +2146,7 @@ CustomAnimationTextAnimTabPage::CustomAnimationTextAnimTabPage(Window* pParent, maCBXReverse->SetState( TRISTATE_INDET ); if( pSet->getPropertyState( nHandleTextReverse ) != STLPropertyState_AMBIGUOUS ) { - sal_Bool bTextReverse = sal_False; + bool bTextReverse = false; if( pSet->getPropertyValue( nHandleTextReverse ) >>= bTextReverse ) { maCBXReverse->Check( bTextReverse ); @@ -2187,8 +2187,8 @@ void CustomAnimationTextAnimTabPage::update( STLPropertySet* pSet ) if( nPos > 0 ) { - sal_Bool bTextReverse = maCBXReverse->IsChecked(); - sal_Bool bOldTextReverse = !bTextReverse; + bool bTextReverse = maCBXReverse->IsChecked(); + bool bOldTextReverse = !bTextReverse; if(mpSet->getPropertyState( nHandleTextReverse ) != STLPropertyState_AMBIGUOUS) mpSet->getPropertyValue( nHandleTextReverse ) >>= bOldTextReverse; @@ -2213,8 +2213,8 @@ void CustomAnimationTextAnimTabPage::update( STLPropertySet* pSet ) //If this control is disabled, we should ignore its value if (maCBXAnimateForm->IsEnabled()) { - sal_Bool bAnimateForm = maCBXAnimateForm->IsChecked(); - sal_Bool bOldAnimateForm = !bAnimateForm; + bool bAnimateForm = maCBXAnimateForm->IsChecked(); + bool bOldAnimateForm = !bAnimateForm; if(mpSet->getPropertyState( nHandleAnimateForm ) != STLPropertyState_AMBIGUOUS) mpSet->getPropertyValue( nHandleAnimateForm ) >>= bOldAnimateForm; @@ -2267,7 +2267,7 @@ CustomAnimationDialog::CustomAnimationDialog(Window* pParent, STLPropertySet* pS mpDurationTabPage = new CustomAnimationDurationTabPage( mpTabControl, mpSet ); mpTabControl->SetTabPage( mnTimingId, mpDurationTabPage ); - sal_Bool bHasText = sal_False; + bool bHasText = false; if( pSet->getPropertyState( nHandleHasText ) != STLPropertyState_AMBIGUOUS ) pSet->getPropertyValue( nHandleHasText ) >>= bHasText; @@ -2318,8 +2318,8 @@ STLPropertySet* CustomAnimationDialog::createDefaultSet() STLPropertySet* pSet = new STLPropertySet(); pSet->setPropertyDefaultValue( nHandleMaxParaDepth, makeAny( (sal_Int32)-1 ) ); - pSet->setPropertyDefaultValue( nHandleHasAfterEffect, makeAny( (sal_Bool)sal_False ) ); - pSet->setPropertyDefaultValue( nHandleAfterEffectOnNextEffect, makeAny( (sal_Bool)sal_False ) ); + pSet->setPropertyDefaultValue( nHandleHasAfterEffect, makeAny( false ) ); + pSet->setPropertyDefaultValue( nHandleAfterEffectOnNextEffect, makeAny( false ) ); pSet->setPropertyDefaultValue( nHandleDimColor, aEmpty ); pSet->setPropertyDefaultValue( nHandleIterateType, makeAny( (sal_Int16)0 ) ); pSet->setPropertyDefaultValue( nHandleIterateInterval, makeAny( (double)0.0 ) ); diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index 38ad91a3d148..5a6967c5a439 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -670,7 +670,7 @@ void CustomAnimationPane::updateControls() mpPBMoveDown->Enable(bEnableDown); SdOptions* pOptions = SD_MOD()->GetSdOptions(DOCUMENT_TYPE_IMPRESS); - mpCBAutoPreview->Check( pOptions->IsPreviewChangedEffects() == sal_True ); + mpCBAutoPreview->Check( pOptions->IsPreviewChangedEffects() ); updateMotionPathTags(); } @@ -1012,7 +1012,7 @@ bool CustomAnimationPane::setProperty1Value( sal_Int32 nType, CustomAnimationEff return bEffectChanged; } -static sal_Bool hasVisibleShape( const Reference< XShape >& xShape ) +static bool hasVisibleShape( const Reference< XShape >& xShape ) { try { @@ -1037,7 +1037,7 @@ static sal_Bool hasVisibleShape( const Reference< XShape >& xShape ) catch( Exception& ) { } - return sal_True; + return true; } STLPropertySet* CustomAnimationPane::createSelectionSet() @@ -1089,7 +1089,7 @@ STLPropertySet* CustomAnimationPane::createSelectionSet() addValue( pSet, nHandlePresetId, makeAny( pEffect->getPresetId() ) ); - addValue( pSet, nHandleHasText, makeAny( (sal_Bool)pEffect->hasText() ) ); + addValue( pSet, nHandleHasText, makeAny( pEffect->hasText() ) ); addValue( pSet, nHandleHasVisibleShape, Any( hasVisibleShape( pEffect->getTargetShape() ) ) ); @@ -1103,7 +1103,7 @@ STLPropertySet* CustomAnimationPane::createSelectionSet() } else if( pEffect->getCommand() == EffectCommands::STOPAUDIO ) { - aSoundSource = makeAny( (sal_Bool)sal_True ); + aSoundSource = makeAny( true ); } addValue( pSet, nHandleSoundURL, aSoundSource ); @@ -1113,9 +1113,9 @@ STLPropertySet* CustomAnimationPane::createSelectionSet() pTextGroup = pEffectSequence->findGroup( nGroupId ); addValue( pSet, nHandleTextGrouping, makeAny( pTextGroup.get() ? pTextGroup->getTextGrouping() : (sal_Int32)-1 ) ); - addValue( pSet, nHandleAnimateForm, makeAny( pTextGroup.get() ? (sal_Bool)pTextGroup->getAnimateForm() : sal_True ) ); + addValue( pSet, nHandleAnimateForm, makeAny( pTextGroup.get() ? pTextGroup->getAnimateForm() : true ) ); addValue( pSet, nHandleTextGroupingAuto, makeAny( pTextGroup.get() ? pTextGroup->getTextGroupingAuto() : (double)-1.0 ) ); - addValue( pSet, nHandleTextReverse, makeAny( pTextGroup.get() ? (sal_Bool)pTextGroup->getTextReverse() : sal_False ) ); + addValue( pSet, nHandleTextReverse, makeAny( pTextGroup.get() && pTextGroup->getTextReverse() ) ); if( pEffectSequence->getSequenceType() == EffectNodeType::INTERACTIVE_SEQUENCE ) { @@ -1277,7 +1277,7 @@ void CustomAnimationPane::changeSelection( STLPropertySet* pResultSet, STLProper if( pResultSet->getPropertyState( nHandleHasAfterEffect ) == STLPropertyState_DIRECT ) { - sal_Bool bHasAfterEffect = sal_False; + bool bHasAfterEffect = false; if( pResultSet->getPropertyValue( nHandleHasAfterEffect ) >>= bHasAfterEffect ) { if( pEffect->hasAfterEffect() != bHasAfterEffect ) @@ -1290,8 +1290,9 @@ void CustomAnimationPane::changeSelection( STLPropertySet* pResultSet, STLProper if( pResultSet->getPropertyState( nHandleAfterEffectOnNextEffect ) == STLPropertyState_DIRECT ) { - sal_Bool bAfterEffectOnNextEffect = sal_False; - if( (pResultSet->getPropertyValue( nHandleAfterEffectOnNextEffect ) >>= bAfterEffectOnNextEffect) && ((pEffect->IsAfterEffectOnNext() ? sal_True : sal_False) != bAfterEffectOnNextEffect) ) + bool bAfterEffectOnNextEffect = false; + if( (pResultSet->getPropertyValue( nHandleAfterEffectOnNextEffect ) >>= bAfterEffectOnNextEffect) + && (pEffect->IsAfterEffectOnNext() != bAfterEffectOnNextEffect) ) { pEffect->setAfterEffectOnNext( bAfterEffectOnNextEffect ); bChanged = true; @@ -1332,7 +1333,7 @@ void CustomAnimationPane::changeSelection( STLPropertySet* pResultSet, STLProper if( pResultSet->getPropertyState( nHandleAutoReverse ) == STLPropertyState_DIRECT ) { - sal_Bool bAutoReverse = sal_False; + bool bAutoReverse = false; pResultSet->getPropertyValue( nHandleAutoReverse ) >>= bAutoReverse; if( pEffect->getAutoReverse() != bAutoReverse ) { @@ -1411,7 +1412,7 @@ void CustomAnimationPane::changeSelection( STLPropertySet* pResultSet, STLProper // above sal_Int32 nTextGrouping = 0; - sal_Bool bAnimateForm = sal_True, bTextReverse = sal_False; + bool bAnimateForm = true, bTextReverse = false; double fTextGroupingAuto = -1.0; if( bHasTextGrouping ) @@ -1768,7 +1769,7 @@ void CustomAnimationPane::onChange( bool bCreate ) Reference< XShape > xShape( (*aIter), UNO_QUERY ); if( xShape.is() && !hasVisibleShape( xShape ) ) { - mpMainSequence->createTextGroup( pCreated, 1, -1.0, sal_False, sal_False ); + mpMainSequence->createTextGroup( pCreated, 1, -1.0, false, false ); } } diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx index a3f18bf1c678..2e7f4db1f3e4 100644 --- a/sd/source/ui/animations/SlideTransitionPane.cxx +++ b/sd/source/ui/animations/SlideTransitionPane.cxx @@ -73,7 +73,7 @@ struct TransitionEffect TransitionEffect() : mnType( 0 ), mnSubType( 0 ), - mbDirection( sal_True ), + mbDirection( true ), mnFadeColor( 0 ) { init(); @@ -108,7 +108,7 @@ struct TransitionEffect mfDuration = 2.0; mfTime = 0.0; mePresChange = PRESCHANGE_MANUAL; - mbSoundOn = sal_False; + mbSoundOn = false; mbLoopSound = false; mbStopSound = false; @@ -160,7 +160,7 @@ struct TransitionEffect if( mbStopSound ) { rOutPage.SetStopSound( true ); - rOutPage.SetSound( sal_False ); + rOutPage.SetSound( false ); } else { @@ -199,14 +199,14 @@ struct TransitionEffect // effect sal_Int16 mnType; sal_Int16 mnSubType; - sal_Bool mbDirection; + bool mbDirection; sal_Int32 mnFadeColor; // other settings double mfDuration; double mfTime; PresChange mePresChange; - sal_Bool mbSoundOn; + bool mbSoundOn; OUString maSound; bool mbLoopSound; bool mbStopSound; @@ -661,7 +661,7 @@ void SlideTransitionPane::updateControls() } SdOptions* pOptions = SD_MOD()->GetSdOptions(DOCUMENT_TYPE_IMPRESS); - mpCB_AUTO_PREVIEW->Check( pOptions->IsPreviewTransitions() == sal_True ); + mpCB_AUTO_PREVIEW->Check( pOptions->IsPreviewTransitions() ); mbUpdatingControls = false; diff --git a/sd/source/ui/animations/motionpathtag.cxx b/sd/source/ui/animations/motionpathtag.cxx index d35bf1063043..c2d5c14f5684 100644 --- a/sd/source/ui/animations/motionpathtag.cxx +++ b/sd/source/ui/animations/motionpathtag.cxx @@ -656,7 +656,7 @@ bool MotionPathTag::OnTabHandles( const KeyEvent& rKEvt ) if(rKEvt.GetKeyCode().IsMod1() || rKEvt.GetKeyCode().IsMod2()) { const SdrHdlList& rHdlList = mrView.GetHdlList(); - sal_Bool bForward(!rKEvt.GetKeyCode().IsShift()); + bool bForward(!rKEvt.GetKeyCode().IsShift()); ((SdrHdlList&)rHdlList).TravelFocusHdl(bForward); @@ -788,7 +788,7 @@ bool MotionPathTag::OnMove( const KeyEvent& rKEvt ) if(mrView.IsDragObj()) { bool bWasNoSnap = mrView.GetDragStat().IsNoSnap(); - sal_Bool bWasSnapEnabled = mrView.IsSnapEnabled(); + bool bWasSnapEnabled = mrView.IsSnapEnabled(); // switch snapping off if(!bWasNoSnap) @@ -847,9 +847,9 @@ sal_uLong MotionPathTag::GetMarkedPointCount() const -sal_Bool MotionPathTag::MarkPoint(SdrHdl& rHdl, sal_Bool bUnmark ) +bool MotionPathTag::MarkPoint(SdrHdl& rHdl, bool bUnmark ) { - sal_Bool bRet=sal_False; + bool bRet=false; if( mpPathObj && mrView.IsPointMarkable( rHdl ) && (rHdl.GetKind() != HDL_SMARTTAG) ) { SmartHdl* pSmartHdl = dynamic_cast< SmartHdl* >( &rHdl ); @@ -859,7 +859,7 @@ sal_Bool MotionPathTag::MarkPoint(SdrHdl& rHdl, sal_Bool bUnmark ) if (mrView.MarkPointHelper(&rHdl,mpMark,bUnmark)) { mrView.MarkListHasChanged(); - bRet=sal_True; + bRet=true; } } } @@ -868,9 +868,9 @@ sal_Bool MotionPathTag::MarkPoint(SdrHdl& rHdl, sal_Bool bUnmark ) -sal_Bool MotionPathTag::MarkPoints(const Rectangle* pRect, sal_Bool bUnmark ) +bool MotionPathTag::MarkPoints(const Rectangle* pRect, bool bUnmark ) { - sal_Bool bChgd=sal_False; + bool bChgd=false; if( mpPathObj && isSelected() ) { @@ -879,13 +879,13 @@ sal_Bool MotionPathTag::MarkPoints(const Rectangle* pRect, sal_Bool bUnmark ) { SmartHdl* pHdl = dynamic_cast< SmartHdl* >( mrView.GetHdl( sal::static_int_cast< sal_uLong >( nHdlNum-- ) ) ); - if( pHdl && (pHdl->getTag().get() == this) && mrView.IsPointMarkable(*pHdl) && (pHdl->IsSelected() ? 1 : 0)==bUnmark) + if( pHdl && (pHdl->getTag().get() == this) && mrView.IsPointMarkable(*pHdl) && pHdl->IsSelected() == bUnmark) { Point aPos(pHdl->GetPos()); if( pRect==NULL || pRect->IsInside(aPos)) { if( mrView.MarkPointHelper(pHdl,mpMark,bUnmark) ) - bChgd=sal_True; + bChgd=true; } } } @@ -1021,8 +1021,8 @@ void MotionPathTag::addCustomHandles( SdrHdlList& rHandlerList ) { sal_uLong nCount = rHandlerList.GetHdlCount(); - sal_Bool bWdt0=aRect.Left()==aRect.Right(); - sal_Bool bHgt0=aRect.Top()==aRect.Bottom(); + bool bWdt0=aRect.Left()==aRect.Right(); + bool bHgt0=aRect.Top()==aRect.Bottom(); if (bWdt0 && bHgt0) { rHandlerList.AddHdl(new SmartHdl( xThis, mpPathObj, aRect.TopLeft(),HDL_UPLFT)); diff --git a/sd/source/ui/animations/motionpathtag.hxx b/sd/source/ui/animations/motionpathtag.hxx index faa883bef6c1..b8356069b1a1 100644 --- a/sd/source/ui/animations/motionpathtag.hxx +++ b/sd/source/ui/animations/motionpathtag.hxx @@ -52,9 +52,9 @@ public: // callbacks from sdr view virtual sal_uLong GetMarkablePointCount() const SAL_OVERRIDE; virtual sal_uLong GetMarkedPointCount() const SAL_OVERRIDE; - virtual sal_Bool MarkPoint(SdrHdl& rHdl, sal_Bool bUnmark=sal_False) SAL_OVERRIDE; + virtual bool MarkPoint(SdrHdl& rHdl, bool bUnmark=false) SAL_OVERRIDE; virtual void CheckPossibilities() SAL_OVERRIDE; - virtual sal_Bool MarkPoints(const Rectangle* pRect, sal_Bool bUnmark) SAL_OVERRIDE; + virtual bool MarkPoints(const Rectangle* pRect, bool bUnmark) SAL_OVERRIDE; const CustomAnimationEffectPtr& getEffect() const { return mpEffect; } diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx index aa94bdda6c88..18e7c9e31d62 100644 --- a/sd/source/ui/annotations/annotationmanager.cxx +++ b/sd/source/ui/annotations/annotationmanager.cxx @@ -189,7 +189,7 @@ AnnotationManagerImpl::AnnotationManagerImpl( ViewShellBase& rViewShellBase ) { SdOptions* pOptions = SD_MOD()->GetSdOptions(mpDoc->GetDocumentType()); if( pOptions ) - mbShowAnnotations = pOptions->IsShowComments() == sal_True; + mbShowAnnotations = pOptions->IsShowComments(); } diff --git a/sd/source/ui/annotations/annotationtag.cxx b/sd/source/ui/annotations/annotationtag.cxx index c0cbf57c5c1e..e460d80efd12 100644 --- a/sd/source/ui/annotations/annotationtag.cxx +++ b/sd/source/ui/annotations/annotationtag.cxx @@ -491,17 +491,17 @@ sal_uLong AnnotationTag::GetMarkedPointCount() const -sal_Bool AnnotationTag::MarkPoint(SdrHdl& /*rHdl*/, sal_Bool /*bUnmark*/ ) +bool AnnotationTag::MarkPoint(SdrHdl& /*rHdl*/, bool /*bUnmark*/ ) { - sal_Bool bRet=sal_False; + bool bRet=false; return bRet; } -sal_Bool AnnotationTag::MarkPoints(const Rectangle* /*pRect*/, sal_Bool /*bUnmark*/ ) +bool AnnotationTag::MarkPoints(const Rectangle* /*pRect*/, bool /*bUnmark*/ ) { - sal_Bool bChgd=sal_False; + bool bChgd=false; return bChgd; } diff --git a/sd/source/ui/annotations/annotationtag.hxx b/sd/source/ui/annotations/annotationtag.hxx index aed68740d33a..8006922db4c8 100644 --- a/sd/source/ui/annotations/annotationtag.hxx +++ b/sd/source/ui/annotations/annotationtag.hxx @@ -52,9 +52,9 @@ public: // callbacks from sdr view virtual sal_uLong GetMarkablePointCount() const SAL_OVERRIDE; virtual sal_uLong GetMarkedPointCount() const SAL_OVERRIDE; - virtual sal_Bool MarkPoint(SdrHdl& rHdl, sal_Bool bUnmark=sal_False) SAL_OVERRIDE; + virtual bool MarkPoint(SdrHdl& rHdl, bool bUnmark=false) SAL_OVERRIDE; virtual void CheckPossibilities() SAL_OVERRIDE; - virtual sal_Bool MarkPoints(const Rectangle* pRect, sal_Bool bUnmark) SAL_OVERRIDE; + virtual bool MarkPoints(const Rectangle* pRect, bool bUnmark) SAL_OVERRIDE; void Move( int nDX, int nDY ); bool OnMove( const KeyEvent& rKEvt ); diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx index f6277e0fc818..a6e3dd80bb7a 100644 --- a/sd/source/ui/app/optsitem.cxx +++ b/sd/source/ui/app/optsitem.cxx @@ -82,7 +82,7 @@ Sequence< Any > SdOptionsItem::GetProperties( const Sequence< OUString >& rNames -sal_Bool SdOptionsItem::PutProperties( const Sequence< OUString >& rNames, const Sequence< Any>& rValues ) +bool SdOptionsItem::PutProperties( const Sequence< OUString >& rNames, const Sequence< Any>& rValues ) { return ConfigItem::PutProperties( rNames, rValues ); } @@ -121,12 +121,12 @@ void SdOptionsGeneric::Init() const { const Any* pValues = aValues.getConstArray(); - pThis->EnableModify( sal_False ); + pThis->EnableModify( false ); pThis->mbInit = pThis->ReadData( pValues ); - pThis->EnableModify( sal_True ); + pThis->EnableModify( true ); } else - pThis->mbInit = sal_True; + pThis->mbInit = true; } } @@ -198,26 +198,26 @@ bool SdOptionsGeneric::isMetricSystem() |* \************************************************************************/ -SdOptionsLayout::SdOptionsLayout( sal_uInt16 nConfigId, sal_Bool bUseConfig ) : +SdOptionsLayout::SdOptionsLayout( sal_uInt16 nConfigId, bool bUseConfig ) : SdOptionsGeneric( nConfigId, bUseConfig ? ( ( SDCFG_DRAW == nConfigId ) ? B2U( "Office.Draw/Layout" ) : B2U( "Office.Impress/Layout" ) ) : OUString() ), - bRuler( sal_True ), - bMoveOutline( sal_True ), - bDragStripes( sal_False ), - bHandlesBezier( sal_False ), - bHelplines( sal_True ), + bRuler( true ), + bMoveOutline( true ), + bDragStripes( false ), + bHandlesBezier( false ), + bHelplines( true ), nMetric((sal_uInt16)(isMetricSystem() ? FUNIT_CM : FUNIT_INCH)), nDefTab( 1250 ) { - EnableModify( sal_True ); + EnableModify( true ); } -sal_Bool SdOptionsLayout::operator==( const SdOptionsLayout& rOpt ) const +bool SdOptionsLayout::operator==( const SdOptionsLayout& rOpt ) const { return( IsRulerVisible() == rOpt.IsRulerVisible() && IsMoveOutline() == rOpt.IsMoveOutline() && @@ -266,7 +266,7 @@ void SdOptionsLayout::GetPropNameArray( const char**& ppNames, sal_uLong& rCount -sal_Bool SdOptionsLayout::ReadData( const Any* pValues ) +bool SdOptionsLayout::ReadData( const Any* pValues ) { if( pValues[0].hasValue() ) SetRulerVisible( *(sal_Bool*) pValues[ 0 ].getValue() ); if( pValues[1].hasValue() ) SetHandlesBezier( *(sal_Bool*) pValues[ 1 ].getValue() ); @@ -276,12 +276,12 @@ sal_Bool SdOptionsLayout::ReadData( const Any* pValues ) if( pValues[5].hasValue() ) SetMetric( (sal_uInt16) *(sal_Int32*) pValues[ 5 ].getValue() ); if( pValues[6].hasValue() ) SetDefTab( (sal_uInt16) *(sal_Int32*) pValues[ 6 ].getValue() ); - return sal_True; + return true; } -sal_Bool SdOptionsLayout::WriteData( Any* pValues ) const +bool SdOptionsLayout::WriteData( Any* pValues ) const { pValues[ 0 ] <<= IsRulerVisible(); pValues[ 1 ] <<= IsHandlesBezier(); @@ -291,7 +291,7 @@ sal_Bool SdOptionsLayout::WriteData( Any* pValues ) const pValues[ 5 ] <<= (sal_Int32) GetMetric(); pValues[ 6 ] <<= (sal_Int32) GetDefTab(); - return sal_True; + return true; } /************************************************************************* @@ -302,7 +302,7 @@ sal_Bool SdOptionsLayout::WriteData( Any* pValues ) const SdOptionsLayoutItem::SdOptionsLayoutItem( sal_uInt16 _nWhich ) : SfxPoolItem ( _nWhich ) -, maOptionsLayout ( 0, sal_False ) +, maOptionsLayout ( 0, false ) { } @@ -310,7 +310,7 @@ SdOptionsLayoutItem::SdOptionsLayoutItem( sal_uInt16 _nWhich ) SdOptionsLayoutItem::SdOptionsLayoutItem( sal_uInt16 _nWhich, SdOptions* pOpts, ::sd::FrameView* pView ) : SfxPoolItem ( _nWhich ) -, maOptionsLayout ( 0, sal_False ) +, maOptionsLayout ( 0, false ) { if( pOpts ) { @@ -375,19 +375,19 @@ void SdOptionsLayoutItem::SetOptions( SdOptions* pOpts ) const |* \************************************************************************/ -SdOptionsContents::SdOptionsContents( sal_uInt16 nConfigId, sal_Bool bUseConfig ) : +SdOptionsContents::SdOptionsContents( sal_uInt16 nConfigId, bool bUseConfig ) : SdOptionsGeneric( nConfigId, bUseConfig ? ( ( SDCFG_DRAW == nConfigId ) ? B2U( "Office.Draw/Content" ) : B2U( "Office.Impress/Content" ) ) : OUString() ) { - EnableModify( sal_True ); + EnableModify( true ); } -sal_Bool SdOptionsContents::operator==(const SdOptionsContents&) const +bool SdOptionsContents::operator==(const SdOptionsContents&) const { return true; } @@ -410,22 +410,22 @@ void SdOptionsContents::GetPropNameArray( const char**& ppNames, sal_uLong& rCou -sal_Bool SdOptionsContents::ReadData(const Any*) +bool SdOptionsContents::ReadData(const Any*) { - return sal_True; + return true; } -sal_Bool SdOptionsContents::WriteData( Any* pValues ) const +bool SdOptionsContents::WriteData( Any* pValues ) const { //#i80528# no draft anymore - pValues[ 0 ] <<= (sal_Bool)false; - pValues[ 1 ] <<= (sal_Bool)false; - pValues[ 2 ] <<= (sal_Bool)false; - pValues[ 3 ] <<= (sal_Bool)false; + pValues[ 0 ] <<= false; + pValues[ 1 ] <<= false; + pValues[ 2 ] <<= false; + pValues[ 3 ] <<= false; - return sal_True; + return true; } /************************************************************************* @@ -436,7 +436,7 @@ sal_Bool SdOptionsContents::WriteData( Any* pValues ) const SdOptionsContentsItem::SdOptionsContentsItem(sal_uInt16 _nWhich, SdOptions*, ::sd::FrameView*) : SfxPoolItem ( _nWhich ) -, maOptionsContents ( 0, sal_False ) +, maOptionsContents ( 0, false ) { } @@ -468,7 +468,7 @@ void SdOptionsContentsItem::SetOptions(SdOptions*) const |* \************************************************************************/ -SdOptionsMisc::SdOptionsMisc( sal_uInt16 nConfigId, sal_Bool bUseConfig ) : +SdOptionsMisc::SdOptionsMisc( sal_uInt16 nConfigId, bool bUseConfig ) : SdOptionsGeneric( nConfigId, bUseConfig ? ( ( SDCFG_DRAW == nConfigId ) ? B2U( "Office.Draw/Misc" ) : @@ -476,26 +476,26 @@ SdOptionsMisc::SdOptionsMisc( sal_uInt16 nConfigId, sal_Bool bUseConfig ) : OUString() ), nDefaultObjectSizeWidth(8000), nDefaultObjectSizeHeight(5000), - bStartWithTemplate( sal_False ), - bMarkedHitMovesAlways( sal_True ), - bMoveOnlyDragging( sal_False ), - bCrookNoContortion( sal_False ), + bStartWithTemplate( false ), + bMarkedHitMovesAlways( true ), + bMoveOnlyDragging( false ), + bCrookNoContortion( false ), bQuickEdit( GetConfigId() != SDCFG_DRAW ), - bMasterPageCache( sal_True ), - bDragWithCopy( sal_False ), - bPickThrough( sal_True ), - bDoubleClickTextEdit( sal_True ), - bClickChangeRotation( sal_False ), - bEnableSdremote( sal_False ), - bEnablePresenterScreen( sal_True), - bSolidDragging( sal_True ), - bSummationOfParagraphs( sal_False ), - bShowUndoDeleteWarning( sal_True ), - bSlideshowRespectZOrder( sal_True ), - bShowComments( sal_True ), - bPreviewNewEffects( sal_True ), - bPreviewChangedEffects( sal_False ), - bPreviewTransitions( sal_True ), + bMasterPageCache( true ), + bDragWithCopy( false ), + bPickThrough( true ), + bDoubleClickTextEdit( true ), + bClickChangeRotation( false ), + bEnableSdremote( false ), + bEnablePresenterScreen( true), + bSolidDragging( true ), + bSummationOfParagraphs( false ), + bShowUndoDeleteWarning( true ), + bSlideshowRespectZOrder( true ), + bShowComments( true ), + bPreviewNewEffects( true ), + bPreviewChangedEffects( false ), + bPreviewTransitions( true ), mnDisplay( 0 ), mnPenColor( 0xff0000 ), mnPenWidth( 150.0 ), @@ -504,12 +504,12 @@ SdOptionsMisc::SdOptionsMisc( sal_uInt16 nConfigId, sal_Bool bUseConfig ) : // formatting. mnPrinterIndependentLayout (1) { - EnableModify( sal_True ); + EnableModify( true ); } -sal_Bool SdOptionsMisc::operator==( const SdOptionsMisc& rOpt ) const +bool SdOptionsMisc::operator==( const SdOptionsMisc& rOpt ) const { return( IsStartWithTemplate() == rOpt.IsStartWithTemplate() && IsMarkedHitMovesAlways() == rOpt.IsMarkedHitMovesAlways() && @@ -588,7 +588,7 @@ void SdOptionsMisc::GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) -sal_Bool SdOptionsMisc::ReadData( const Any* pValues ) +bool SdOptionsMisc::ReadData( const Any* pValues ) { if( pValues[0].hasValue() ) SetMarkedHitMovesAlways( *(sal_Bool*) pValues[ 0 ].getValue() ); if( pValues[1].hasValue() ) SetCrookNoContortion( *(sal_Bool*) pValues[ 1 ].getValue() ); @@ -644,12 +644,12 @@ sal_Bool SdOptionsMisc::ReadData( const Any* pValues ) SetEnablePresenterScreen( *(sal_Bool*) pValues[ 25 ].getValue() ); } - return sal_True; + return true; } -sal_Bool SdOptionsMisc::WriteData( Any* pValues ) const +bool SdOptionsMisc::WriteData( Any* pValues ) const { pValues[ 0 ] <<= IsMarkedHitMovesAlways(); pValues[ 1 ] <<= IsCrookNoContortion(); @@ -665,7 +665,7 @@ sal_Bool SdOptionsMisc::WriteData( Any* pValues ) const pValues[ 10 ] <<= GetDefaultObjectSizeWidth(); pValues[ 11 ] <<= GetDefaultObjectSizeHeight(); pValues[ 12 ] <<= GetPrinterIndependentLayout(); - pValues[ 13 ] <<= (sal_Bool)IsShowComments(); + pValues[ 13 ] <<= IsShowComments(); // just for Impress if( GetConfigId() == SDCFG_IMPRESS ) @@ -687,7 +687,7 @@ sal_Bool SdOptionsMisc::WriteData( Any* pValues ) const pValues[ 25 ] <<= IsEnablePresenterScreen(); } - return sal_True; + return true; } /************************************************************************* @@ -698,7 +698,7 @@ sal_Bool SdOptionsMisc::WriteData( Any* pValues ) const SdOptionsMiscItem::SdOptionsMiscItem( sal_uInt16 _nWhich ) : SfxPoolItem ( _nWhich ) -, maOptionsMisc ( 0, sal_False ) +, maOptionsMisc ( 0, false ) { } @@ -706,7 +706,7 @@ SdOptionsMiscItem::SdOptionsMiscItem( sal_uInt16 _nWhich ) SdOptionsMiscItem::SdOptionsMiscItem( sal_uInt16 _nWhich, SdOptions* pOpts, ::sd::FrameView* pView ) : SfxPoolItem ( _nWhich ) -, maOptionsMisc ( 0, sal_False ) +, maOptionsMisc ( 0, false ) { if( pOpts ) { @@ -741,7 +741,7 @@ SdOptionsMiscItem::SdOptionsMiscItem( sal_uInt16 _nWhich, SdOptions* pOpts, ::sd maOptionsMisc.SetMasterPagePaintCaching( pView->IsMasterPagePaintCaching() ); maOptionsMisc.SetDragWithCopy( pView->IsDragWithCopy() ); - maOptionsMisc.SetPickThrough( (sal_Bool)pView->GetModel()->IsPickThroughTransparentTextFrames() ); + maOptionsMisc.SetPickThrough( pView->GetModel()->IsPickThroughTransparentTextFrames() ); maOptionsMisc.SetDoubleClickTextEdit( pView->IsDoubleClickTextEdit() ); maOptionsMisc.SetClickChangeRotation( pView->IsClickChangeRotation() ); maOptionsMisc.SetSolidDragging( pView->IsSolidDragging() ); @@ -821,30 +821,30 @@ void SdOptionsMiscItem::SetOptions( SdOptions* pOpts ) const |* \************************************************************************/ -SdOptionsSnap::SdOptionsSnap( sal_uInt16 nConfigId, sal_Bool bUseConfig ) : +SdOptionsSnap::SdOptionsSnap( sal_uInt16 nConfigId, bool bUseConfig ) : SdOptionsGeneric( nConfigId, bUseConfig ? ( ( SDCFG_DRAW == nConfigId ) ? B2U( "Office.Draw/Snap" ) : B2U( "Office.Impress/Snap" ) ) : OUString() ), - bSnapHelplines( sal_True ), - bSnapBorder( sal_True ), - bSnapFrame( sal_False ), - bSnapPoints( sal_False ), - bOrtho( sal_False ), - bBigOrtho( sal_True ), - bRotate( sal_False ), + bSnapHelplines( true ), + bSnapBorder( true ), + bSnapFrame( false ), + bSnapPoints( false ), + bOrtho( false ), + bBigOrtho( true ), + bRotate( false ), nSnapArea( 5 ), nAngle( 1500 ), nBezAngle( 1500 ) { - EnableModify( sal_True ); + EnableModify( true ); } -sal_Bool SdOptionsSnap::operator==( const SdOptionsSnap& rOpt ) const +bool SdOptionsSnap::operator==( const SdOptionsSnap& rOpt ) const { return( IsSnapHelplines() == rOpt.IsSnapHelplines() && IsSnapBorder() == rOpt.IsSnapBorder() && @@ -882,7 +882,7 @@ void SdOptionsSnap::GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) -sal_Bool SdOptionsSnap::ReadData( const Any* pValues ) +bool SdOptionsSnap::ReadData( const Any* pValues ) { if( pValues[0].hasValue() ) SetSnapHelplines( *(sal_Bool*) pValues[ 0 ].getValue() ); if( pValues[1].hasValue() ) SetSnapBorder( *(sal_Bool*)pValues[ 1 ].getValue() ); @@ -895,12 +895,12 @@ sal_Bool SdOptionsSnap::ReadData( const Any* pValues ) if( pValues[8].hasValue() ) SetAngle( (sal_Int16) *(sal_Int32*) pValues[ 8 ].getValue() ); if( pValues[9].hasValue() ) SetEliminatePolyPointLimitAngle( (sal_Int16) *(sal_Int32*) pValues[ 9 ].getValue() ); - return sal_True; + return true; } -sal_Bool SdOptionsSnap::WriteData( Any* pValues ) const +bool SdOptionsSnap::WriteData( Any* pValues ) const { pValues[ 0 ] <<= IsSnapHelplines(); pValues[ 1 ] <<= IsSnapBorder(); @@ -913,7 +913,7 @@ sal_Bool SdOptionsSnap::WriteData( Any* pValues ) const pValues[ 8 ] <<= (sal_Int32) GetAngle(); pValues[ 9 ] <<= (sal_Int32) GetEliminatePolyPointLimitAngle(); - return sal_True; + return true; } /************************************************************************* @@ -924,7 +924,7 @@ sal_Bool SdOptionsSnap::WriteData( Any* pValues ) const SdOptionsSnapItem::SdOptionsSnapItem( sal_uInt16 _nWhich ) : SfxPoolItem ( _nWhich ) -, maOptionsSnap ( 0, sal_False ) +, maOptionsSnap ( 0, false ) { } @@ -932,7 +932,7 @@ SdOptionsSnapItem::SdOptionsSnapItem( sal_uInt16 _nWhich ) SdOptionsSnapItem::SdOptionsSnapItem( sal_uInt16 _nWhich, SdOptions* pOpts, ::sd::FrameView* pView ) : SfxPoolItem ( _nWhich ) -, maOptionsSnap ( 0, sal_False ) +, maOptionsSnap ( 0, false ) { if( pView ) { @@ -1004,7 +1004,7 @@ void SdOptionsSnapItem::SetOptions( SdOptions* pOpts ) const |* \************************************************************************/ -SdOptionsZoom::SdOptionsZoom( sal_uInt16 nConfigId, sal_Bool bUseConfig ) : +SdOptionsZoom::SdOptionsZoom( sal_uInt16 nConfigId, bool bUseConfig ) : SdOptionsGeneric( nConfigId, ( bUseConfig && ( SDCFG_DRAW == nConfigId ) ) ? B2U( "Office.Draw/Zoom" ) : OUString() ), @@ -1012,12 +1012,12 @@ SdOptionsZoom::SdOptionsZoom( sal_uInt16 nConfigId, sal_Bool bUseConfig ) : nY( 1 ) { - EnableModify( sal_True ); + EnableModify( true ); } -sal_Bool SdOptionsZoom::operator==( const SdOptionsZoom& rOpt ) const +bool SdOptionsZoom::operator==( const SdOptionsZoom& rOpt ) const { sal_Int32 nX1, nX2, nY1, nY2; @@ -1044,7 +1044,7 @@ void SdOptionsZoom::GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) -sal_Bool SdOptionsZoom::ReadData( const Any* pValues ) +bool SdOptionsZoom::ReadData( const Any* pValues ) { sal_Int32 x = 1, y = 1; @@ -1053,12 +1053,12 @@ sal_Bool SdOptionsZoom::ReadData( const Any* pValues ) SetScale( x, y ); - return sal_True; + return true; } -sal_Bool SdOptionsZoom::WriteData( Any* pValues ) const +bool SdOptionsZoom::WriteData( Any* pValues ) const { sal_Int32 x, y; @@ -1067,7 +1067,7 @@ sal_Bool SdOptionsZoom::WriteData( Any* pValues ) const pValues[ 0 ] <<= (sal_Int32) x; pValues[ 1 ] <<= (sal_Int32) y; - return sal_True; + return true; } /************************************************************************* @@ -1076,16 +1076,16 @@ sal_Bool SdOptionsZoom::WriteData( Any* pValues ) const |* \************************************************************************/ -SdOptionsGrid::SdOptionsGrid( sal_uInt16 nConfigId, sal_Bool bUseConfig ) : +SdOptionsGrid::SdOptionsGrid( sal_uInt16 nConfigId, bool bUseConfig ) : SdOptionsGeneric( nConfigId, bUseConfig ? ( ( SDCFG_DRAW == nConfigId ) ? B2U( "Office.Draw/Grid" ) : B2U( "Office.Impress/Grid" ) ) : OUString() ) { - EnableModify( sal_False ); + EnableModify( false ); SetDefaults(); - EnableModify( sal_True ); + EnableModify( true ); } @@ -1114,7 +1114,7 @@ void SdOptionsGrid::SetDefaults() -sal_Bool SdOptionsGrid::operator==( const SdOptionsGrid& rOpt ) const +bool SdOptionsGrid::operator==( const SdOptionsGrid& rOpt ) const { return( GetFldDrawX() == rOpt.GetFldDrawX() && GetFldDivisionX() == rOpt.GetFldDivisionX() && @@ -1172,7 +1172,7 @@ void SdOptionsGrid::GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) -sal_Bool SdOptionsGrid::ReadData( const Any* pValues ) +bool SdOptionsGrid::ReadData( const Any* pValues ) { if( pValues[0].hasValue() ) SetFldDrawX( *(sal_Int32*) pValues[ 0 ].getValue() ); if( pValues[1].hasValue() ) SetFldDrawY( *(sal_Int32*) pValues[ 1 ].getValue() ); @@ -1196,12 +1196,12 @@ sal_Bool SdOptionsGrid::ReadData( const Any* pValues ) if( pValues[8].hasValue() ) SetGridVisible( *(sal_Bool*) pValues[ 8 ].getValue() ); if( pValues[9].hasValue() ) SetEqualGrid( *(sal_Bool*) pValues[ 9 ].getValue() ); - return sal_True; + return true; } -sal_Bool SdOptionsGrid::WriteData( Any* pValues ) const +bool SdOptionsGrid::WriteData( Any* pValues ) const { pValues[ 0 ] <<= (sal_Int32) GetFldDrawX(); pValues[ 1 ] <<= (sal_Int32) GetFldDrawY(); @@ -1214,7 +1214,7 @@ sal_Bool SdOptionsGrid::WriteData( Any* pValues ) const pValues[ 8 ] <<= IsGridVisible(); pValues[ 9 ] <<= IsEqualGrid(); - return sal_True; + return true; } /************************************************************************* @@ -1275,40 +1275,40 @@ void SdOptionsGridItem::SetOptions( SdOptions* pOpts ) const |* \************************************************************************/ -SdOptionsPrint::SdOptionsPrint( sal_uInt16 nConfigId, sal_Bool bUseConfig ) : +SdOptionsPrint::SdOptionsPrint( sal_uInt16 nConfigId, bool bUseConfig ) : SdOptionsGeneric( nConfigId, bUseConfig ? ( ( SDCFG_DRAW == nConfigId ) ? B2U( "Office.Draw/Print" ) : B2U( "Office.Impress/Print" ) ) : OUString() ), - bDraw( sal_True ), - bNotes( sal_False ), - bHandout( sal_False ), - bOutline( sal_False ), - bDate( sal_False ), - bTime( sal_False ), - bPagename( sal_False ), - bHiddenPages( sal_True ), - bPagesize( sal_False ), - bPagetile( sal_False ), - bWarningPrinter( sal_True ), - bWarningSize( sal_False ), - bWarningOrientation( sal_False ), - bBooklet( sal_False ), - bFront( sal_True ), - bBack( sal_True ), - bCutPage( sal_False ), - bPaperbin( sal_False ), - mbHandoutHorizontal( sal_True ), + bDraw( true ), + bNotes( false ), + bHandout( false ), + bOutline( false ), + bDate( false ), + bTime( false ), + bPagename( false ), + bHiddenPages( true ), + bPagesize( false ), + bPagetile( false ), + bWarningPrinter( true ), + bWarningSize( false ), + bWarningOrientation( false ), + bBooklet( false ), + bFront( true ), + bBack( true ), + bCutPage( false ), + bPaperbin( false ), + mbHandoutHorizontal( true ), mnHandoutPages( 6 ), nQuality( 0 ) { - EnableModify( sal_True ); + EnableModify( true ); } -sal_Bool SdOptionsPrint::operator==( const SdOptionsPrint& rOpt ) const +bool SdOptionsPrint::operator==( const SdOptionsPrint& rOpt ) const { return( IsDraw() == rOpt.IsDraw() && IsNotes() == rOpt.IsNotes() && @@ -1394,7 +1394,7 @@ void SdOptionsPrint::GetPropNameArray( const char**& ppNames, sal_uLong& rCount -sal_Bool SdOptionsPrint::ReadData( const Any* pValues ) +bool SdOptionsPrint::ReadData( const Any* pValues ) { if( pValues[0].hasValue() ) SetDate( *(sal_Bool*) pValues[ 0 ].getValue() ); if( pValues[1].hasValue() ) SetTime( *(sal_Bool*) pValues[ 1 ].getValue() ); @@ -1419,12 +1419,12 @@ sal_Bool SdOptionsPrint::ReadData( const Any* pValues ) if( pValues[16].hasValue() ) SetHandoutPages( (sal_uInt16)*(sal_Int32*) pValues[16].getValue() ); } - return sal_True; + return true; } -sal_Bool SdOptionsPrint::WriteData( Any* pValues ) const +bool SdOptionsPrint::WriteData( Any* pValues ) const { pValues[ 0 ] <<= IsDate(); pValues[ 1 ] <<= IsTime(); @@ -1449,7 +1449,7 @@ sal_Bool SdOptionsPrint::WriteData( Any* pValues ) const pValues[ 16 ] <<= GetHandoutPages(); } - return sal_True; + return true; } /************************************************************************* @@ -1460,7 +1460,7 @@ sal_Bool SdOptionsPrint::WriteData( Any* pValues ) const SdOptionsPrintItem::SdOptionsPrintItem( sal_uInt16 _nWhich ) : SfxPoolItem ( _nWhich ) -, maOptionsPrint ( 0, sal_False ) +, maOptionsPrint ( 0, false ) { } @@ -1468,7 +1468,7 @@ SdOptionsPrintItem::SdOptionsPrintItem( sal_uInt16 _nWhich ) SdOptionsPrintItem::SdOptionsPrintItem( sal_uInt16 _nWhich, SdOptions* pOpts, ::sd::FrameView* ) : SfxPoolItem ( _nWhich ) -, maOptionsPrint ( 0, sal_False ) +, maOptionsPrint ( 0, false ) { if( pOpts ) { @@ -1545,13 +1545,13 @@ void SdOptionsPrintItem::SetOptions( SdOptions* pOpts ) const \************************************************************************/ SdOptions::SdOptions( sal_uInt16 nConfigId ) : - SdOptionsLayout( nConfigId, sal_True ), - SdOptionsContents( nConfigId, sal_True ), - SdOptionsMisc( nConfigId, sal_True ), - SdOptionsSnap( nConfigId, sal_True ), - SdOptionsZoom( nConfigId, sal_True ), - SdOptionsGrid( nConfigId, sal_True ), - SdOptionsPrint( nConfigId, sal_True ) + SdOptionsLayout( nConfigId, true ), + SdOptionsContents( nConfigId, true ), + SdOptionsMisc( nConfigId, true ), + SdOptionsSnap( nConfigId, true ), + SdOptionsZoom( nConfigId, true ), + SdOptionsGrid( nConfigId, true ), + SdOptionsPrint( nConfigId, true ) { } diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx index 2466c84279c6..15b157801e11 100644 --- a/sd/source/ui/app/sdmod.cxx +++ b/sd/source/ui/app/sdmod.cxx @@ -77,7 +77,7 @@ SdModule::SdModule(SfxObjectFactory* pFact1, SfxObjectFactory* pFact2 ) pDrawOptions(NULL), pSearchItem(NULL), pNumberFormatter( NULL ), - bWaterCan(sal_False), + bWaterCan(false), mpResourceContainer(new ::sd::SdGlobalResourceContainer()) { SetName( OUString( "StarDraw" ) ); // Do not translate! diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx index 143c41dd3e99..21fec2bd80e2 100644 --- a/sd/source/ui/app/sdmod1.cxx +++ b/sd/source/ui/app/sdmod1.cxx @@ -114,7 +114,7 @@ void SdModule::Execute(SfxRequest& rReq) if( pSet && SFX_ITEM_SET == pSet->GetItemState( SID_AUTOSPELL_CHECK, false, &pItem ) ) { - sal_Bool bOnlineSpelling = ( (const SfxBoolItem*) pItem )->GetValue(); + bool bOnlineSpelling = ( (const SfxBoolItem*) pItem )->GetValue(); // save at document: ::sd::DrawDocShell* pDocSh = PTR_CAST(::sd::DrawDocShell, SfxObjectShell::Current()); if( pDocSh ) @@ -212,7 +212,7 @@ void SdModule::Execute(SfxRequest& rReq) case SID_OPENHYPERLINK: case SID_OPENDOC: { - sal_Bool bIntercept = sal_False; + bool bIntercept = false; ::sd::DrawDocShell* pDocShell = PTR_CAST(::sd::DrawDocShell, SfxObjectShell::Current()); if (pDocShell) { @@ -226,7 +226,7 @@ void SdModule::Execute(SfxRequest& rReq) // from a shape interaction. if (rReq.GetArgs() == NULL) { - bIntercept = sal_True; + bIntercept = true; } } } @@ -270,7 +270,7 @@ void SdModule::OutlineToImpress (SfxRequest& rRequest) SfxObjectShellLock xDocShell; ::sd::DrawDocShell* pDocSh; xDocShell = pDocSh = new ::sd::DrawDocShell( - SFX_CREATE_MODE_STANDARD, sal_False); + SFX_CREATE_MODE_STANDARD, false); if(pDocSh) { pDocSh->DoInitNew(NULL); @@ -571,10 +571,10 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq ) if( pPilotDlg.get() && pPilotDlg->Execute()==RET_OK ) { const OUString aDocPath( pPilotDlg->GetDocPath()); - const sal_Bool bIsDocEmpty = pPilotDlg->IsDocEmpty(); + const bool bIsDocEmpty = pPilotDlg->IsDocEmpty(); // So that you can open the document without AutoLayout-Dialog - pOpt->SetStartWithTemplate(sal_False); + pOpt->SetStartWithTemplate(false); if(bNewDocDirect && !pPilotDlg->GetStartWithFlag()) bStartWithTemplate = false; @@ -728,7 +728,7 @@ SfxFrame* SdModule::CreateEmptyDocument( DocumentType eDocType, const Reference< SfxObjectShellLock xDocShell; ::sd::DrawDocShell* pNewDocSh; - xDocShell = pNewDocSh = new ::sd::DrawDocShell(SFX_CREATE_MODE_STANDARD,sal_False,eDocType); + xDocShell = pNewDocSh = new ::sd::DrawDocShell(SFX_CREATE_MODE_STANDARD,false,eDocType); if(pNewDocSh) { pNewDocSh->DoInitNew(NULL); @@ -767,7 +767,7 @@ void SdModule::ChangeMedium( ::sd::DrawDocShell* pDocShell, SfxViewFrame* pViewF case OUTPUT_PAGE: case OUTPUT_OVERHEAD: { - SfxPrinter* pPrinter = pDocShell->GetPrinter(sal_True); + SfxPrinter* pPrinter = pDocShell->GetPrinter(true); if( pPrinter && pPrinter->IsValid()) { @@ -846,7 +846,7 @@ void SdModule::ChangeMedium( ::sd::DrawDocShell* pDocShell, SfxViewFrame* pViewF break; } - sal_Bool bScaleAll = sal_True; + bool bScaleAll = true; sal_uInt16 nPageCnt = pDoc->GetMasterSdPageCount(PK_STANDARD); sal_uInt16 i; SdPage* pPage; @@ -896,7 +896,7 @@ void SdModule::ChangeMedium( ::sd::DrawDocShell* pDocShell, SfxViewFrame* pViewF } SdPage* pHandoutPage = pDoc->GetSdPage(0, PK_HANDOUT); - pHandoutPage->CreateTitleAndLayout(sal_True); + pHandoutPage->CreateTitleAndLayout(true); if( (eMedium != OUTPUT_ORIGINAL) && pViewFrame && pViewFrame->GetDispatcher()) { diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx index 750b27beef06..928b05577cb0 100644 --- a/sd/source/ui/app/sdmod2.cxx +++ b/sd/source/ui/app/sdmod2.cxx @@ -507,9 +507,9 @@ SfxItemSet* SdModule::CreateItemSet( sal_uInt16 nSlot ) void SdModule::ApplyItemSet( sal_uInt16 nSlot, const SfxItemSet& rSet ) { const SfxPoolItem* pItem = NULL; - sal_Bool bNewDefTab = sal_False; - sal_Bool bNewPrintOptions = sal_False; - sal_Bool bMiscOptions = sal_False; + bool bNewDefTab = false; + bool bNewPrintOptions = false; + bool bMiscOptions = false; ::sd::DrawDocShell* pDocSh = PTR_CAST(::sd::DrawDocShell, SfxObjectShell::Current() ); SdDrawDocument* pDoc = NULL; @@ -559,7 +559,7 @@ void SdModule::ApplyItemSet( sal_uInt16 nSlot, const SfxItemSet& rSet ) nDefTab = ( (SfxUInt16Item*) pItem )->GetValue(); pOptions->SetDefTab( nDefTab ); - bNewDefTab = sal_True; + bNewDefTab = true; } // Scale @@ -595,7 +595,7 @@ void SdModule::ApplyItemSet( sal_uInt16 nSlot, const SfxItemSet& rSet ) false, (const SfxPoolItem**) &pMiscItem )) { pMiscItem->SetOptions( pOptions ); - bMiscOptions = sal_True; + bMiscOptions = true; } // Snap @@ -632,7 +632,7 @@ void SdModule::ApplyItemSet( sal_uInt16 nSlot, const SfxItemSet& rSet ) aPrintSet.Put( SfxBoolItem( SID_PRINTER_NOTFOUND_WARN, aPrintItem.GetOptionsPrint().IsWarningPrinter() ) ); aPrintSet.Put( aFlagItem ); - bNewPrintOptions = sal_True; + bNewPrintOptions = true; } // Only if also the document type matches... @@ -640,7 +640,7 @@ void SdModule::ApplyItemSet( sal_uInt16 nSlot, const SfxItemSet& rSet ) { if( bNewPrintOptions ) { - pDocSh->GetPrinter(sal_True)->SetOptions( aPrintSet ); + pDocSh->GetPrinter(true)->SetOptions( aPrintSet ); } // set DefTab at Model @@ -649,11 +649,11 @@ void SdModule::ApplyItemSet( sal_uInt16 nSlot, const SfxItemSet& rSet ) SdDrawDocument* pDocument = pDocSh->GetDoc(); pDocument->SetDefaultTabulator( nDefTab ); - ::sd::Outliner* pOutl = pDocument->GetOutliner( sal_False ); + ::sd::Outliner* pOutl = pDocument->GetOutliner( false ); if( pOutl ) pOutl->SetDefTab( nDefTab ); - ::sd::Outliner* pInternalOutl = pDocument->GetInternalOutliner( sal_False ); + ::sd::Outliner* pInternalOutl = pDocument->GetInternalOutliner( false ); if( pInternalOutl ) pInternalOutl->SetDefTab( nDefTab ); } @@ -667,13 +667,13 @@ void SdModule::ApplyItemSet( sal_uInt16 nSlot, const SfxItemSet& rSet ) SdrOutliner& rOutl = pDocument->GetDrawOutliner(); nCntrl = rOutl.GetControlWord() &~ EE_CNTRL_ULSPACESUMMATION; rOutl.SetControlWord( nCntrl | nSum ); - ::sd::Outliner* pOutl = pDocument->GetOutliner( sal_False ); + ::sd::Outliner* pOutl = pDocument->GetOutliner( false ); if( pOutl ) { nCntrl = pOutl->GetControlWord() &~ EE_CNTRL_ULSPACESUMMATION; pOutl->SetControlWord( nCntrl | nSum ); } - pOutl = pDocument->GetInternalOutliner( sal_False ); + pOutl = pDocument->GetInternalOutliner( false ); if( pOutl ) { nCntrl = pOutl->GetControlWord() &~ EE_CNTRL_ULSPACESUMMATION; diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx index d155f5c7e84f..77997dc97467 100644 --- a/sd/source/ui/app/sdxfer.cxx +++ b/sd/source/ui/app/sdxfer.cxx @@ -76,7 +76,7 @@ using namespace ::com::sun::star::datatransfer::clipboard; #define SDTRANSFER_OBJECTTYPE_DRAWMODEL 0x00000001 #define SDTRANSFER_OBJECTTYPE_DRAWOLE 0x00000002 -SdTransferable::SdTransferable( SdDrawDocument* pSrcDoc, ::sd::View* pWorkView, sal_Bool bInitOnGetData ) +SdTransferable::SdTransferable( SdDrawDocument* pSrcDoc, ::sd::View* pWorkView, bool bInitOnGetData ) : mpPageDocShell( NULL ) , mpOLEDataHelper( NULL ) , mpObjDesc( NULL ) @@ -89,12 +89,12 @@ SdTransferable::SdTransferable( SdDrawDocument* pSrcDoc, ::sd::View* pWorkView, , mpBookmark( NULL ) , mpGraphic( NULL ) , mpImageMap( NULL ) -, mbInternalMove( sal_False ) -, mbOwnDocument( sal_False ) -, mbOwnView( sal_False ) +, mbInternalMove( false ) +, mbOwnDocument( false ) +, mbOwnView( false ) , mbLateInit( bInitOnGetData ) -, mbPageTransferable( sal_False ) -, mbPageTransferablePersistent( sal_False ) +, mbPageTransferable( false ) +, mbPageTransferablePersistent( false ) , mbIsUnoObj( false ) , maUserData() { @@ -253,7 +253,7 @@ void SdTransferable::CreateData() { if( mpSdDrawDocument && !mpSdViewIntern ) { - mbOwnView = sal_True; + mbOwnView = true; SdPage* pPage = mpSdDrawDocument->GetSdPage(0, PK_STANDARD); @@ -287,7 +287,7 @@ void SdTransferable::CreateData() if( !maDocShellRef.Is() ) { OSL_FAIL( "SdTransferable::CreateData(), failed to create a model with persist, clipboard operation will fail for OLE objects!" ); - mbOwnDocument = sal_True; + mbOwnDocument = true; } // Use dimension of source page @@ -339,9 +339,9 @@ void SdTransferable::CreateData() } } -static sal_Bool lcl_HasOnlyControls( SdrModel* pModel ) +static bool lcl_HasOnlyControls( SdrModel* pModel ) { - sal_Bool bOnlyControls = sal_False; // default if there are no objects + bool bOnlyControls = false; // default if there are no objects if ( pModel ) { @@ -352,12 +352,12 @@ static sal_Bool lcl_HasOnlyControls( SdrModel* pModel ) SdrObject* pObj = aIter.Next(); if ( pObj ) { - bOnlyControls = sal_True; // only set if there are any objects at all + bOnlyControls = true; // only set if there are any objects at all while ( pObj ) { if (!pObj->ISA(SdrUnoObj)) { - bOnlyControls = sal_False; + bOnlyControls = false; break; } pObj = aIter.Next(); @@ -554,9 +554,9 @@ bool SdTransferable::GetData( const DataFlavor& rFlavor ) maDocShellRef = new ::sd::DrawDocShell( mpSdDrawDocumentIntern, SFX_CREATE_MODE_EMBEDDED, - sal_True, + true, mpSdDrawDocumentIntern->GetDocumentType()); - mbOwnDocument = sal_False; + mbOwnDocument = false; maDocShellRef->DoInitNew( NULL ); } @@ -581,7 +581,7 @@ bool SdTransferable::WriteObject( SotStorageStreamRef& rxOStm, void* pObject, sa { try { - static const sal_Bool bDontBurnInStyleSheet = ( getenv( "AVOID_BURN_IN_FOR_GALLERY_THEME" ) != NULL ); + static const bool bDontBurnInStyleSheet = ( getenv( "AVOID_BURN_IN_FOR_GALLERY_THEME" ) != NULL ); SdDrawDocument* pDoc = (SdDrawDocument*) pObject; if ( !bDontBurnInStyleSheet ) pDoc->BurnInStyleSheetAttributes(); @@ -678,7 +678,7 @@ void SdTransferable::SetObjectDescriptor( const TransferableObjectDescriptor& rO PrepareOLE( rObjDesc ); } -void SdTransferable::SetPageBookmarks( const std::vector<OUString> &rPageBookmarks, sal_Bool bPersistent ) +void SdTransferable::SetPageBookmarks( const std::vector<OUString> &rPageBookmarks, bool bPersistent ) { if( mpSourceDoc ) { @@ -694,8 +694,8 @@ void SdTransferable::SetPageBookmarks( const std::vector<OUString> &rPageBookmar if( bPersistent ) { mpSdDrawDocument->CreateFirstPages(mpSourceDoc); - mpSdDrawDocument->InsertBookmarkAsPage( rPageBookmarks, NULL, sal_False, sal_True, 1, sal_True, - mpSourceDoc->GetDocSh(), sal_True, sal_True, sal_False ); + mpSdDrawDocument->InsertBookmarkAsPage( rPageBookmarks, NULL, false, true, 1, true, + mpSourceDoc->GetDocSh(), true, true, false ); } else { @@ -715,7 +715,7 @@ void SdTransferable::SetPageBookmarks( const std::vector<OUString> &rPageBookmar // set flags for page transferable; if ( mbPageTransferablePersistent == sal_False ), // don't offer any formats => it's just for internal purposes - mbPageTransferable = sal_True; + mbPageTransferable = true; mbPageTransferablePersistent = bPersistent; } } @@ -810,7 +810,7 @@ void SdTransferable::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) } } -sal_Bool SdTransferable::SetTableRTF( SdDrawDocument* pModel, const DataFlavor& rFlavor) +bool SdTransferable::SetTableRTF( SdDrawDocument* pModel, const DataFlavor& rFlavor) { if ( pModel ) { @@ -827,7 +827,7 @@ sal_Bool SdTransferable::SetTableRTF( SdDrawDocument* pModel, const DataFlavor& } } - return sal_False; + return false; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/app/tbxww.cxx b/sd/source/ui/app/tbxww.cxx index 5669e44a9c16..a736f881ed94 100644 --- a/sd/source/ui/app/tbxww.cxx +++ b/sd/source/ui/app/tbxww.cxx @@ -199,7 +199,7 @@ void SdTbxControl::StateChanged( sal_uInt16 nSId, /*-------------------------------------------------------------------------*/ -sal_Bool SdTbxControl::IsCheckable( sal_uInt16 nSId ) +bool SdTbxControl::IsCheckable( sal_uInt16 nSId ) { switch( nSId ) { @@ -305,9 +305,9 @@ sal_Bool SdTbxControl::IsCheckable( sal_uInt16 nSId ) case SID_CONNECTOR_LINES_CIRCLE_END: case SID_CONNECTOR_LINES_CIRCLES: - return( sal_True ); + return true; } - return( sal_False ); + return false; } diff --git a/sd/source/ui/dlg/LayerTabBar.cxx b/sd/source/ui/dlg/LayerTabBar.cxx index 5877251bbfbc..c6c9b0b0dde2 100644 --- a/sd/source/ui/dlg/LayerTabBar.cxx +++ b/sd/source/ui/dlg/LayerTabBar.cxx @@ -82,7 +82,7 @@ void LayerTabBar::Select() void LayerTabBar::MouseButtonDown(const MouseEvent& rMEvt) { - sal_Bool bSetPageID=sal_False; + bool bSetPageID=false; if (rMEvt.IsLeft() && !rMEvt.IsMod1() && !rMEvt.IsMod2()) { @@ -94,14 +94,14 @@ void LayerTabBar::MouseButtonDown(const MouseEvent& rMEvt) SfxDispatcher* pDispatcher = pDrViewSh->GetViewFrame()->GetDispatcher(); pDispatcher->Execute(SID_INSERTLAYER, SFX_CALLMODE_SYNCHRON); - bSetPageID=sal_True; + bSetPageID=true; } else if (rMEvt.IsShift()) { // Toggle between layer visible / hidden OUString aName(GetPageText(aLayerId)); SdrPageView* pPV = pDrViewSh->GetView()->GetSdrPageView(); - sal_Bool bVisible = pPV->IsLayerVisible(aName); + bool bVisible = pPV->IsLayerVisible(aName); pPV->SetLayerVisible(aName, !bVisible); pDrViewSh->ResetActualLayer(); } @@ -176,7 +176,7 @@ void LayerTabBar::Command(const CommandEvent& rCEvt) long LayerTabBar::StartRenaming() { - sal_Bool bOK = sal_True; + bool bOK = true; OUString aLayerName = GetPageText( GetEditPageId() ); OUString aLayoutLayer = SD_RESSTR(STR_LAYER_LAYOUT); OUString aControlsLayer = SD_RESSTR(STR_LAYER_CONTROLS); @@ -189,7 +189,7 @@ long LayerTabBar::StartRenaming() aLayerName == aBackgroundLayer || aLayerName == aBackgroundObjLayer ) { // It is not allowed to change this names - bOK = sal_False; + bOK = false; } else { @@ -201,12 +201,12 @@ long LayerTabBar::StartRenaming() } } - return(bOK); + return bOK ? 1 : 0; } long LayerTabBar::AllowRenaming() { - sal_Bool bOK = sal_True; + bool bOK = true; // Check if names already exists ::sd::View* pView = pDrViewSh->GetView(); @@ -222,7 +222,7 @@ long LayerTabBar::AllowRenaming() WarningBox aWarningBox( &pDrViewSh->GetViewFrame()->GetWindow(), WinBits( WB_OK ), SD_RESSTR( STR_WARN_NAME_DUPLICATE ) ); aWarningBox.Execute(); - bOK = sal_False; + bOK = false; } if (bOK) @@ -238,11 +238,11 @@ long LayerTabBar::AllowRenaming() aNewName == aBackgroundLayer || aNewName == aBackgroundObjLayer ) { // It is not allowed to use his names - bOK = sal_False; + bOK = false; } } - return(bOK); + return bOK ? 1 : 0; } void LayerTabBar::EndRenaming() diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx b/sd/source/ui/dlg/PhotoAlbumDialog.cxx index 25c7554a5132..3e9c5e7d7669 100644 --- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx +++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx @@ -627,7 +627,7 @@ Reference< drawing::XDrawPage > SdPhotoAlbumDialog::appendNewSlide(AutoLayout aL Reference< container::XIndexAccess > xIndexAccess( xDrawPages, uno::UNO_QUERY ); xSlide = xDrawPages->insertNewByIndex( xIndexAccess->getCount() ); SdPage* pSlide = pDoc->GetSdPage( pDoc->GetSdPageCount(PK_STANDARD)-1, PK_STANDARD); - pSlide->SetAutoLayout(aLayout, sal_True); // Set the layout here + pSlide->SetAutoLayout(aLayout, true); // Set the layout here return xSlide; } diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx index 203b53b5c77e..7313b9ce4e06 100644 --- a/sd/source/ui/dlg/animobjs.cxx +++ b/sd/source/ui/dlg/animobjs.cxx @@ -161,8 +161,8 @@ AnimationWindow::AnimationWindow( SfxBindings* pInBindings, pWin ( pParent ), m_nCurrentFrame ( EMPTY_FRAMELIST ), - bMovie ( sal_False ), - bAllObjects ( sal_False ), + bMovie ( false ), + bAllObjects ( false ), pBindings ( pInBindings ) { @@ -248,7 +248,7 @@ IMPL_LINK_NOARG(AnimationWindow, ClickFirstHdl) IMPL_LINK_NOARG(AnimationWindow, ClickStopHdl) { - bMovie = sal_False; + bMovie = false; return( 0L ); } @@ -258,15 +258,15 @@ IMPL_LINK( AnimationWindow, ClickPlayHdl, void *, p ) { ScopeLockGuard aGuard( maPlayLock ); - bMovie = sal_True; - sal_Bool bDisableCtrls = sal_False; + bMovie = true; + bool bDisableCtrls = false; size_t const nCount = m_FrameList.size(); - sal_Bool bReverse = p == &aBtnReverse; + bool bReverse = p == &aBtnReverse; // it is difficult to find it later on - sal_Bool bRbtGroupEnabled = aRbtGroup.IsEnabled(); - sal_Bool bBtnGetAllObjectsEnabled = aBtnGetAllObjects.IsEnabled(); - sal_Bool bBtnGetOneObjectEnabled = aBtnGetOneObject.IsEnabled(); + bool bRbtGroupEnabled = aRbtGroup.IsEnabled(); + bool bBtnGetAllObjectsEnabled = aBtnGetAllObjects.IsEnabled(); + bool bBtnGetOneObjectEnabled = aBtnGetOneObject.IsEnabled(); // calculate overall time Time aTime( 0 ); @@ -289,7 +289,7 @@ IMPL_LINK( AnimationWindow, ClickPlayHdl, void *, p ) SfxProgress* pProgress = NULL; if( nFullTime >= 1000 ) { - bDisableCtrls = sal_True; + bDisableCtrls = true; aBtnStop.Enable(); aBtnStop.Update(); OUString aStr("Animator:"); // here we should think about something smart @@ -298,7 +298,7 @@ IMPL_LINK( AnimationWindow, ClickPlayHdl, void *, p ) sal_uLong nTmpTime = 0; size_t i = 0; - sal_Bool bCount = i < nCount; + bool bCount = i < nCount; if( bReverse ) { i = nCount - 1; @@ -353,7 +353,7 @@ IMPL_LINK( AnimationWindow, ClickPlayHdl, void *, p ) } // to re-enable the controls - bMovie = sal_False; + bMovie = false; if (nCount > 0) { assert(i == m_nCurrentFrame); @@ -854,7 +854,7 @@ void AnimationWindow::AddObj (::sd::View& rView ) { // If it is ONE animation object or one group object, which was // 'individually taken', we insert the objects separately - sal_Bool bAnimObj = sal_False; + bool bAnimObj = false; if( nMarkCount == 1 ) { SdrMark* pMark = rMarkList.GetMark(0); @@ -907,7 +907,7 @@ void AnimationWindow::AddObj (::sd::View& rView ) // if a animated GIF is taken, only such one can be created aRbtBitmap.Check(); aRbtGroup.Enable( false ); - bAnimObj = sal_True; + bAnimObj = true; } } else if( bAllObjects || ( pAnimInfo && pAnimInfo->mbIsMovie ) ) @@ -935,7 +935,7 @@ void AnimationWindow::AddObj (::sd::View& rView ) // Clone pPage->InsertObject(pSnapShot->Clone(), m_nCurrentFrame); } - bAnimObj = sal_True; + bAnimObj = true; } } // also one single animated object @@ -985,7 +985,7 @@ void AnimationWindow::AddObj (::sd::View& rView ) pPage->InsertObject(pObject->Clone(), m_nCurrentFrame); } - bAnimObj = sal_True; // that we don't change again + bAnimObj = true; // that we don't change again } else { diff --git a/sd/source/ui/dlg/brkdlg.cxx b/sd/source/ui/dlg/brkdlg.cxx index 8ec335b679ed..abd5886a6b6f 100644 --- a/sd/source/ui/dlg/brkdlg.cxx +++ b/sd/source/ui/dlg/brkdlg.cxx @@ -62,7 +62,7 @@ BreakDlg::BreakDlg( pProgrInfo->Init( nSumActionCount*3, nObjCount ); pDrView = _pDrView; - bCancel = sal_False; + bCancel = false; } BreakDlg::~BreakDlg() @@ -74,7 +74,7 @@ BreakDlg::~BreakDlg() // Control-Handler for cancel button IMPL_LINK_NOARG(BreakDlg, CancelButtonHdl) { - bCancel = sal_True; + bCancel = true; m_pBtnCancel->Disable(); return( 0L ); } diff --git a/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx index 7c83709e77da..cf6ee4af57e2 100644 --- a/sd/source/ui/dlg/custsdlg.cxx +++ b/sd/source/ui/dlg/custsdlg.cxx @@ -37,7 +37,7 @@ SdCustomShowDlg::SdCustomShowDlg( Window* pWindow, rDoc ( rDrawDoc ), pCustomShowList ( NULL ), pCustomShow ( NULL ), - bModified ( sal_False ) + bModified ( false ) { get( m_pBtnNew, "new" ); get( m_pBtnEdit, "edit" ); @@ -91,7 +91,7 @@ void SdCustomShowDlg::CheckState() { sal_Int32 nPos = m_pLbCustomShows->GetSelectEntryPos(); - sal_Bool bEnable = nPos != LISTBOX_ENTRY_NOTFOUND; + bool bEnable = nPos != LISTBOX_ENTRY_NOTFOUND; m_pBtnEdit->Enable( bEnable ); m_pBtnRemove->Enable( bEnable ); m_pBtnCopy->Enable( bEnable ); @@ -117,7 +117,7 @@ IMPL_LINK( SdCustomShowDlg, ClickButtonHdl, void *, p ) if( pCustomShow ) { if( !pCustomShowList ) - pCustomShowList = rDoc.GetCustomShowList( sal_True ); + pCustomShowList = rDoc.GetCustomShowList( true ); pCustomShowList->push_back( pCustomShow ); pCustomShowList->Last(); @@ -126,7 +126,7 @@ IMPL_LINK( SdCustomShowDlg, ClickButtonHdl, void *, p ) } if( aDlg.IsModified() ) - bModified = sal_True; + bModified = true; } else if( pCustomShow ) DELETEZ( pCustomShow ); @@ -152,7 +152,7 @@ IMPL_LINK( SdCustomShowDlg, ClickButtonHdl, void *, p ) m_pLbCustomShows->SelectEntryPos( nPos ); } if( aDlg.IsModified() ) - bModified = sal_True; + bModified = true; } } } @@ -166,7 +166,7 @@ IMPL_LINK( SdCustomShowDlg, ClickButtonHdl, void *, p ) pCustomShowList->erase( pCustomShowList->begin() + nPos ); m_pLbCustomShows->RemoveEntry( nPos ); m_pLbCustomShows->SelectEntryPos( nPos == 0 ? nPos : nPos - 1 ); - bModified = sal_True; + bModified = true; } } // copy CustomShow @@ -194,17 +194,17 @@ IMPL_LINK( SdCustomShowDlg, ClickButtonHdl, void *, p ) } // check name... - sal_Bool bDifferent = sal_False; + bool bDifferent = false; //long nPosToSelect = pCustomShowList->GetCurPos(); while( !bDifferent ) { - bDifferent = sal_True; + bDifferent = true; for( pCustomShow = (SdCustomShow*) pCustomShowList->First(); pCustomShow != NULL && bDifferent; pCustomShow = (SdCustomShow*) pCustomShowList->Next() ) { if( aStr == pCustomShow->GetName() ) - bDifferent = sal_False; + bDifferent = false; } if( !bDifferent ) { @@ -226,7 +226,7 @@ IMPL_LINK( SdCustomShowDlg, ClickButtonHdl, void *, p ) m_pLbCustomShows->SelectEntry( pShow->GetName() ); - bModified = sal_True; + bModified = true; } } else if( p == m_pLbCustomShows ) @@ -235,11 +235,11 @@ IMPL_LINK( SdCustomShowDlg, ClickButtonHdl, void *, p ) if( nPos != LISTBOX_ENTRY_NOTFOUND ) pCustomShowList->Seek( nPos ); - bModified = sal_True; + bModified = true; } else if( p == m_pCbxUseCustomShow ) { - bModified = sal_True; + bModified = true; } CheckState(); @@ -256,7 +256,7 @@ IMPL_LINK_NOARG(SdCustomShowDlg, StartShowHdl) } // CheckState -sal_Bool SdCustomShowDlg::IsCustomShow() const +bool SdCustomShowDlg::IsCustomShow() const { return( m_pCbxUseCustomShow->IsEnabled() && m_pCbxUseCustomShow->IsChecked() ); } @@ -267,7 +267,7 @@ SdDefineCustomShowDlg::SdDefineCustomShowDlg( Window* pWindow, ModalDialog ( pWindow, "DefineCustomSlideShow", "modules/simpress/ui/definecustomslideshow.ui" ), rDoc ( rDrawDoc ), rpCustomShow ( rpCS ), - bModified ( sal_False ) + bModified ( false ) { get( m_pEdtName, "customname" ); get( m_pLbPages, "pages" ); @@ -343,10 +343,10 @@ SdDefineCustomShowDlg::~SdDefineCustomShowDlg() // CheckState void SdDefineCustomShowDlg::CheckState() { - sal_Bool bPages = m_pLbPages->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND; + bool bPages = m_pLbPages->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND; //sal_Bool bCSPages = aLbCustomPages.GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND; - sal_Bool bCSPages = m_pLbCustomPages->FirstSelected() != NULL; - sal_Bool bCount = m_pLbCustomPages->GetEntryCount() > 0; + bool bCSPages = m_pLbCustomPages->FirstSelected() != NULL; + bool bCount = m_pLbCustomPages->GetEntryCount() > 0; m_pBtnOK->Enable( bCount ); m_pBtnAdd->Enable( bPages ); @@ -380,7 +380,7 @@ IMPL_LINK( SdDefineCustomShowDlg, ClickButtonHdl, void *, p ) if( nPosCP != TREELIST_APPEND ) nPosCP++; } - bModified = sal_True; + bModified = true; } } else if( p == m_pBtnRemove ) @@ -391,12 +391,12 @@ IMPL_LINK( SdDefineCustomShowDlg, ClickButtonHdl, void *, p ) sal_uLong nPos = m_pLbCustomPages->GetModel()->GetAbsPos( pEntry ); m_pLbCustomPages->GetModel()->Remove( m_pLbCustomPages->GetModel()->GetEntryAtAbsPos( nPos ) ); - bModified = sal_True; + bModified = true; } } else if( p == m_pEdtName ) { - bModified = sal_True; + bModified = true; } CheckState(); @@ -410,14 +410,14 @@ IMPL_LINK( SdDefineCustomShowDlg, ClickButtonHdl, void *, p ) */ void SdDefineCustomShowDlg::CheckCustomShow() { - sal_Bool bDifferent = sal_False; + bool bDifferent = false; SvTreeListEntry* pEntry = NULL; // compare count if( rpCustomShow->PagesVector().size() != m_pLbCustomPages->GetEntryCount() ) { rpCustomShow->PagesVector().clear(); - bDifferent = sal_True; + bDifferent = true; } // compare page pointer @@ -431,7 +431,7 @@ void SdDefineCustomShowDlg::CheckCustomShow() if( *it1 != pEntry->GetUserData() ) { rpCustomShow->PagesVector().clear(); - bDifferent = sal_True; + bDifferent = true; } } } @@ -447,7 +447,7 @@ void SdDefineCustomShowDlg::CheckCustomShow() pPage = (SdPage*) pEntry->GetUserData(); rpCustomShow->PagesVector().push_back( pPage ); } - bModified = sal_True; + bModified = true; } // compare name and set name if necessary @@ -455,7 +455,7 @@ void SdDefineCustomShowDlg::CheckCustomShow() if( rpCustomShow->GetName() != aStr ) { rpCustomShow->SetName( aStr ); - bModified = sal_True; + bModified = true; } } @@ -463,7 +463,7 @@ void SdDefineCustomShowDlg::CheckCustomShow() IMPL_LINK_NOARG(SdDefineCustomShowDlg, OKHdl) { // check name... - sal_Bool bDifferent = sal_True; + bool bDifferent = true; SdCustomShowList* pCustomShowList = rDoc.GetCustomShowList(); if( pCustomShowList ) { @@ -476,7 +476,7 @@ IMPL_LINK_NOARG(SdDefineCustomShowDlg, OKHdl) pCustomShow = pCustomShowList->Next() ) { if( aName == pCustomShow->GetName() && aName != aOldName ) - bDifferent = sal_False; + bDifferent = false; } pCustomShowList->Seek( nPosToSelect ); } diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx index 3baf0d0a6586..4868054c0d36 100644 --- a/sd/source/ui/dlg/dlgass.cxx +++ b/sd/source/ui/dlg/dlgass.cxx @@ -137,7 +137,7 @@ private: class AssistentDlgImpl : public SfxListener { public: - AssistentDlgImpl( ::Window* pWindow, const Link& rFinishLink, sal_Bool bAutoPilot ); + AssistentDlgImpl( ::Window* pWindow, const Link& rFinishLink, bool bAutoPilot ); virtual ~AssistentDlgImpl(); /// Local mutex used to serialize concurrent method calls. @@ -155,7 +155,7 @@ public: /** Flag that is set to sal_True after the recently used files have been scanned. */ - sal_Bool mbRecentDocumentsReady; + bool mbRecentDocumentsReady; /** When the list of templates has not been scanned already this is done when this method is called. That includes requesting the whole list @@ -180,13 +180,13 @@ public: /** Flag that is set to sal_True after the impress templates have been scanned. */ - sal_Bool mbTemplatesReady; + bool mbTemplatesReady; /** Flag used to prevent nested or concurrent calls to the <member>UpdatePreview</memember> method. A <TRUE/> value indicates that a preview update is currently active. */ - sal_Bool mbPreviewUpdating; + bool mbPreviewUpdating; ::Window* mpWindow; @@ -216,7 +216,7 @@ public: TemplateDir* mpLayoutRegion; // preview - sal_Bool mbUserDataDirty; + bool mbUserDataDirty; Timer maPrevTimer; Timer maEffectPrevTimer; Timer maUpdatePageListTimer; @@ -228,11 +228,11 @@ public: bool mbPreview; sal_uInt16 mnShowPage; - sal_Bool mbDocPreview; + bool mbDocPreview; OUString maPageListFile; - void UpdatePreview( sal_Bool bDocPreview ); + void UpdatePreview( bool bDocPreview ); void UpdatePageList(); void UpdateUserData(); @@ -347,15 +347,15 @@ public: -AssistentDlgImpl::AssistentDlgImpl( ::Window* pWindow, const Link& rFinishLink, sal_Bool bAutoPilot ) : +AssistentDlgImpl::AssistentDlgImpl( ::Window* pWindow, const Link& rFinishLink, bool bAutoPilot ) : mpTemplateRegion(NULL), mpLayoutRegion(NULL), - mbUserDataDirty(sal_False), + mbUserDataDirty(false), xDocShell (NULL), mpWindowUpdater (new WindowUpdater()), mbPreview(true), mnShowPage(0), - mbDocPreview(sal_False), + mbDocPreview(false), maAssistentFunc(5), maPreviewFlag(pWindow,SdResId(CB_PREVIEW)), maStartWithFlag(pWindow,SdResId(CB_STARTWITH)), @@ -369,9 +369,9 @@ AssistentDlgImpl::AssistentDlgImpl( ::Window* pWindow, const Link& rFinishLink, maOpenStr(SdResId(STR_OPEN)) { maPageListFile = "?"; - mbRecentDocumentsReady = sal_False; - mbTemplatesReady = sal_False; - mbPreviewUpdating = sal_False; + mbRecentDocumentsReady = false; + mbTemplatesReady = false; + mbPreviewUpdating = false; mpWindow = pWindow; @@ -613,7 +613,7 @@ AssistentDlgImpl::AssistentDlgImpl( ::Window* pWindow, const Link& rFinishLink, mpWindowUpdater->RegisterWindow (&maPreview); - UpdatePreview( sal_True ); + UpdatePreview( true ); //check whether we should start with a template document initialy and preselect it const OUString aServiceName( "com.sun.star.presentation.PresentationDocument" ); @@ -825,10 +825,10 @@ void AssistentDlgImpl::ScanDocmenu (void) } } } - mbRecentDocumentsReady = sal_True; + mbRecentDocumentsReady = true; try { - UpdatePreview(sal_True); + UpdatePreview(true); } catch (uno::RuntimeException& ) { @@ -849,7 +849,7 @@ void AssistentDlgImpl::ProvideTemplates (void) try { - UpdatePreview(sal_True); + UpdatePreview(true); } catch (uno::RuntimeException& ) { @@ -920,7 +920,7 @@ void AssistentDlgImpl::TemplateScanDone ( SelectLayoutRegion (mpPage2RegionLB->GetSelectEntry()); // Make the changes visible. - mbTemplatesReady = sal_True; + mbTemplatesReady = true; if (mpWindow) UpdatePage(); } @@ -1016,7 +1016,7 @@ OUString AssistentDlgImpl::GetLayoutFileName() SfxObjectShellLock AssistentDlgImpl::GetDocument() { - UpdatePreview(sal_False); // but load completely + UpdatePreview(false); // but load completely UpdatePageList(); SfxObjectShell* pShell = xDocShell; @@ -1026,7 +1026,7 @@ SfxObjectShellLock AssistentDlgImpl::GetDocument() if(pDoc) { const sal_uInt16 nPageCount = pDoc->GetSdPageCount(PK_STANDARD); - sal_Bool bKiosk = mpPage3PresTypeKioskRB->IsChecked(); + bool bKiosk = mpPage3PresTypeKioskRB->IsChecked(); double fNewTime = (double)mpPage3PresTimeTMF->GetTime().GetMSFromTime() / 1000.0; if(bKiosk) { @@ -1150,7 +1150,7 @@ void AssistentDlgImpl::UpdatePage() if(GetStartType() != ST_TEMPLATE) maNextPageButton.Enable(false); - sal_Bool bKiosk = mpPage3PresTypeKioskRB->IsChecked(); + bool bKiosk = mpPage3PresTypeKioskRB->IsChecked(); mpPage3PresTimeFT->Enable(bKiosk); mpPage3BreakFT->Enable(bKiosk); mpPage3PresTimeTMF->Enable(bKiosk); @@ -1221,7 +1221,7 @@ IMPL_LINK_NOARG(AssistentDlgImpl, PreviewFlagHdl) if( maPreviewFlag.IsChecked() != mbPreview ) { mbPreview = maPreviewFlag.IsChecked(); - UpdatePreview(sal_True); + UpdatePreview(true); } return 0; } @@ -1254,7 +1254,7 @@ IMPL_LINK_NOARG(AssistentDlgImpl, PageSelectHdl) if( mnShowPage != nPage ) { mnShowPage = nPage; - UpdatePreview(sal_False); + UpdatePreview(false); } return 0; @@ -1268,7 +1268,7 @@ IMPL_LINK_NOARG(AssistentDlgImpl, UpdatePageListHdl) IMPL_LINK_NOARG(AssistentDlgImpl, UpdatePreviewHdl) { - UpdatePreview( sal_True ); + UpdatePreview( true ); return 0; } @@ -1325,7 +1325,7 @@ IMPL_LINK_NOARG(AssistentDlgImpl, PresTypeHdl) maNextPageButton.Enable(false); } - sal_Bool bKiosk = mpPage3PresTypeKioskRB->IsChecked(); + bool bKiosk = mpPage3PresTypeKioskRB->IsChecked(); mpPage3PresTimeFT->Enable(bKiosk); mpPage3BreakFT->Enable(bKiosk); mpPage3PresTimeTMF->Enable(bKiosk); @@ -1336,7 +1336,7 @@ IMPL_LINK_NOARG(AssistentDlgImpl, PresTypeHdl) IMPL_LINK_NOARG(AssistentDlgImpl, UpdateUserDataHdl) { - mbUserDataDirty = sal_True; + mbUserDataDirty = true; OUString aTopic = mpPage4AskTopicEDT->GetText(); OUString aName = mpPage4AskNameEDT->GetText(); OUString aInfo = mpPage4AskInfoEDT->GetText(); @@ -1409,7 +1409,7 @@ void AssistentDlgImpl::UpdateUserData() if (pPage && (!aTopic.isEmpty() || !aName.isEmpty() || !aInfo.isEmpty())) { if( pPage->GetAutoLayout() == AUTOLAYOUT_NONE ) - pPage->SetAutoLayout(AUTOLAYOUT_TITLE, sal_True); + pPage->SetAutoLayout(AUTOLAYOUT_TITLE, true); SdrTextObj* pObj; @@ -1452,13 +1452,13 @@ void AssistentDlgImpl::UpdateUserData() } } - mbUserDataDirty = sal_False; + mbUserDataDirty = false; } void AssistentDlgImpl::UpdatePageList() { if(mbDocPreview || !mbPreview) - UpdatePreview(sal_False); + UpdatePreview(false); else if(maPageListFile == maDocFile) return; @@ -1474,20 +1474,20 @@ void AssistentDlgImpl::UpdatePageList() mpPage5PageListCT->Fill(pDoc); } -void AssistentDlgImpl::UpdatePreview( sal_Bool bDocPreview ) +void AssistentDlgImpl::UpdatePreview( bool bDocPreview ) { // Guard against multiple concurrent execution to this method caused either // by calls from different threads or recursion. ::osl::MutexGuard aGuard (maMutex); if (mbPreviewUpdating) return; - mbPreviewUpdating = sal_True; + mbPreviewUpdating = true; if(!mbPreview && bDocPreview) { maPreview.Invalidate(); maPreview.SetObjectShell(0); - mbPreviewUpdating = sal_False; + mbPreviewUpdating = false; return; } @@ -1496,7 +1496,7 @@ void AssistentDlgImpl::UpdatePreview( sal_Bool bDocPreview ) SfxApplication *pSfxApp = SFX_APP(); sal_uLong lErr; - sal_Bool bChangeMaster = !aLayoutFile.isEmpty(); + bool bChangeMaster = !aLayoutFile.isEmpty(); if (aDocFile.isEmpty()) { @@ -1506,15 +1506,15 @@ void AssistentDlgImpl::UpdatePreview( sal_Bool bDocPreview ) CloseDocShell(); DrawDocShell* pNewDocSh; - xDocShell = pNewDocSh = new DrawDocShell(SFX_CREATE_MODE_STANDARD, sal_False); + xDocShell = pNewDocSh = new DrawDocShell(SFX_CREATE_MODE_STANDARD, false); pNewDocSh->DoInitNew(NULL); SdDrawDocument* pDoc = pNewDocSh->GetDoc(); pDoc->CreateFirstPages(); pDoc->StopWorkStartupDelay(); - mbDocPreview = sal_False; + mbDocPreview = false; maDocFile = aDocFile; - mbUserDataDirty = sal_True; + mbUserDataDirty = true; } else bChangeMaster = !aLayoutFile.isEmpty() && (maLayoutFile != aLayoutFile); @@ -1528,10 +1528,10 @@ void AssistentDlgImpl::UpdatePreview( sal_Bool bDocPreview ) ::svl::IUndoManager* pUndoMgr = pDocShell?pDocShell->GetUndoManager():NULL; if(pUndoMgr) pUndoMgr->Undo(); - mbUserDataDirty = sal_True; + mbUserDataDirty = true; } else - bChangeMaster = sal_False; + bChangeMaster = false; } else { @@ -1575,7 +1575,7 @@ void AssistentDlgImpl::UpdatePreview( sal_Bool bDocPreview ) mnShowPage = 0; mbDocPreview = bDocPreview; maDocFile = aDocFile; - mbUserDataDirty = sal_True; + mbUserDataDirty = true; } if(bChangeMaster && (aLayoutFile != maDocFile)) @@ -1612,14 +1612,14 @@ void AssistentDlgImpl::UpdatePreview( sal_Bool bDocPreview ) if( pDoc && pLayoutDoc ) { - pDoc->SetMasterPage(0, OUString(), pLayoutDoc, sal_True, sal_False ); + pDoc->SetMasterPage(0, OUString(), pLayoutDoc, true, false ); } else { OSL_FAIL("sd::AssistentDlgImpl::UpdatePreview(), no document for preview?"); } - mbUserDataDirty = sal_True; + mbUserDataDirty = true; } maLayoutFile = aLayoutFile; @@ -1633,7 +1633,7 @@ void AssistentDlgImpl::UpdatePreview( sal_Bool bDocPreview ) maPreview.SetObjectShell( xDocShell, mnShowPage ); } - mbPreviewUpdating = sal_False; + mbPreviewUpdating = false; } void AssistentDlgImpl::SavePassword( SfxObjectShellLock xDoc, const OUString& rPath ) @@ -1819,7 +1819,7 @@ Image AssistentDlgImpl::GetUiIconForCommand (const OUString& sCommandURL) -AssistentDlg::AssistentDlg(Window* pParent, sal_Bool bAutoPilot) : +AssistentDlg::AssistentDlg(Window* pParent, bool bAutoPilot) : ModalDialog(pParent,SdResId(DLG_ASS)) { Link aFinishLink = LINK(this,AssistentDlg, FinishHdl); @@ -1894,7 +1894,7 @@ OutputType AssistentDlg::GetOutputMedium() const return OUTPUT_ORIGINAL; } -sal_Bool AssistentDlg::IsSummary() const +bool AssistentDlg::IsSummary() const { return mpImpl->mpPage5SummaryCB->IsChecked(); } @@ -1909,12 +1909,12 @@ OUString AssistentDlg::GetDocPath() const return mpImpl->GetDocFileName(); } -sal_Bool AssistentDlg::GetStartWithFlag() const +bool AssistentDlg::GetStartWithFlag() const { return !mpImpl->maStartWithFlag.IsChecked(); } -sal_Bool AssistentDlg::IsDocEmpty() const +bool AssistentDlg::IsDocEmpty() const { return mpImpl->GetDocFileName().isEmpty() && mpImpl->GetLayoutFileName().isEmpty(); diff --git a/sd/source/ui/dlg/dlgassim.cxx b/sd/source/ui/dlg/dlgassim.cxx index ac43e960cca2..a2283ce3d0e9 100644 --- a/sd/source/ui/dlg/dlgassim.cxx +++ b/sd/source/ui/dlg/dlgassim.cxx @@ -183,10 +183,10 @@ sal_uInt16 SdPageListControl::GetSelectedPage() return nPage; } -sal_Bool SdPageListControl::IsPageChecked( sal_uInt16 nPage ) +bool SdPageListControl::IsPageChecked( sal_uInt16 nPage ) { SvTreeListEntry* pEntry = GetModel()->GetEntry(nPage); - return pEntry?(sal_Bool)(GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED): sal_False; + return pEntry && (GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED); } void SdPageListControl::DataChanged( const DataChangedEvent& rDCEvt ) diff --git a/sd/source/ui/dlg/dlgassim.hxx b/sd/source/ui/dlg/dlgassim.hxx index 2b8ab976cb92..11c888a13377 100644 --- a/sd/source/ui/dlg/dlgassim.hxx +++ b/sd/source/ui/dlg/dlgassim.hxx @@ -39,7 +39,7 @@ public: void Clear(); sal_uInt16 GetSelectedPage(); - sal_Bool IsPageChecked( sal_uInt16 nPage ); + bool IsPageChecked( sal_uInt16 nPage ); DECL_LINK( CheckButtonClickHdl, void * ); diff --git a/sd/source/ui/dlg/dlgctrls.cxx b/sd/source/ui/dlg/dlgctrls.cxx index 84c1d34a0712..07608e3309b1 100644 --- a/sd/source/ui/dlg/dlgctrls.cxx +++ b/sd/source/ui/dlg/dlgctrls.cxx @@ -85,7 +85,7 @@ void FadeEffectLB::applySelected( SdPage* pSlide ) const { pSlide->setTransitionType( 0 ); pSlide->setTransitionSubtype( 0 ); - pSlide->setTransitionDirection( sal_True ); + pSlide->setTransitionDirection( true ); pSlide->setTransitionFadeColor( 0 ); } } diff --git a/sd/source/ui/dlg/dlgolbul.cxx b/sd/source/ui/dlg/dlgolbul.cxx index 1dfdc3de2094..73d6de45cda7 100644 --- a/sd/source/ui/dlg/dlgolbul.cxx +++ b/sd/source/ui/dlg/dlgolbul.cxx @@ -63,7 +63,7 @@ OutlineBulletDlg::OutlineBulletDlg( pOutputSet = new SfxItemSet( *pAttr ); pOutputSet->ClearItem(); - sal_Bool bOutliner = sal_False; + bool bOutliner = false; // special treatment if a title object is selected if( pView ) @@ -79,10 +79,10 @@ OutlineBulletDlg::OutlineBulletDlg( switch(pObj->GetObjIdentifier()) { case OBJ_TITLETEXT: - bTitle = sal_True; + bTitle = true; break; case OBJ_OUTLINETEXT: - bOutliner = sal_True; + bOutliner = true; break; } } diff --git a/sd/source/ui/dlg/dlgpage.cxx b/sd/source/ui/dlg/dlgpage.cxx index b6eebfc51440..9f546fe47399 100644 --- a/sd/source/ui/dlg/dlgpage.cxx +++ b/sd/source/ui/dlg/dlgpage.cxx @@ -33,7 +33,7 @@ /** * Constructor of tab dialog: appends pages to the dialog */ -SdPageDlg::SdPageDlg( SfxObjectShell* pDocSh, Window* pParent, const SfxItemSet* pAttr, sal_Bool bAreaPage ) : +SdPageDlg::SdPageDlg( SfxObjectShell* pDocSh, Window* pParent, const SfxItemSet* pAttr, bool bAreaPage ) : SfxTabDialog ( pParent ,"DrawPageDialog" ,"modules/sdraw/ui/drawpagedialog.ui" diff --git a/sd/source/ui/dlg/dlgsnap.cxx b/sd/source/ui/dlg/dlgsnap.cxx index d13cd69ecd0f..5afafe381cd7 100644 --- a/sd/source/ui/dlg/dlgsnap.cxx +++ b/sd/source/ui/dlg/dlgsnap.cxx @@ -117,9 +117,9 @@ SdSnapLineDlg::SdSnapLineDlg( */ IMPL_LINK( SdSnapLineDlg, ClickHdl, Button *, pBtn ) { - if ( pBtn == m_pRbPoint ) SetInputFields(sal_True, sal_True); - else if ( pBtn == m_pRbHorz ) SetInputFields(sal_False, sal_True); - else if ( pBtn == m_pRbVert ) SetInputFields(sal_True, sal_False); + if ( pBtn == m_pRbPoint ) SetInputFields(true, true); + else if ( pBtn == m_pRbHorz ) SetInputFields(false, true); + else if ( pBtn == m_pRbVert ) SetInputFields(true, false); else if ( pBtn == m_pBtnDelete ) EndDialog(RET_SNAP_DELETE); return 0; @@ -152,7 +152,7 @@ void SdSnapLineDlg::HideRadioGroup() /** * disable X or Y input fields */ -void SdSnapLineDlg::SetInputFields(sal_Bool bEnableX, sal_Bool bEnableY) +void SdSnapLineDlg::SetInputFields(bool bEnableX, bool bEnableY) { if ( bEnableX ) { diff --git a/sd/source/ui/dlg/docprev.cxx b/sd/source/ui/dlg/docprev.cxx index ebb939dead5c..cd015cdbd285 100644 --- a/sd/source/ui/dlg/docprev.cxx +++ b/sd/source/ui/dlg/docprev.cxx @@ -61,7 +61,7 @@ void SdDocPreviewWin::SetObjectShell( SfxObjectShell* pObj, sal_uInt16 nShowPage } SdDocPreviewWin::SdDocPreviewWin( Window* pParent, const ResId& rResId ) -: Control(pParent, rResId), pMetaFile( 0 ), bInEffect(sal_False), mpObj(NULL), mnShowPage(0) +: Control(pParent, rResId), pMetaFile( 0 ), bInEffect(false), mpObj(NULL), mnShowPage(0) { SetBorderStyle( WINDOW_BORDER_MONO ); svtools::ColorConfig aColorConfig; diff --git a/sd/source/ui/dlg/filedlg.cxx b/sd/source/ui/dlg/filedlg.cxx index 5060e07679d3..452cc8fbcb07 100644 --- a/sd/source/ui/dlg/filedlg.cxx +++ b/sd/source/ui/dlg/filedlg.cxx @@ -55,8 +55,8 @@ private: css::uno::Reference< css::media::XPlayer > mxPlayer; sal_uLong mnPlaySoundEvent; - sal_Bool mbUsableSelection; - sal_Bool mbLabelPlaying; + bool mbUsableSelection; + bool mbLabelPlaying; void CheckSelectionState(); @@ -67,7 +67,7 @@ private: DECL_LINK( IsMusicStoppedHdl, void * ); public: - SdFileDialog_Imp( const short nDialogType, sal_Bool bUsableSelection ); + SdFileDialog_Imp( const short nDialogType, bool bUsableSelection ); virtual ~SdFileDialog_Imp(); ErrCode Execute(); @@ -119,7 +119,7 @@ IMPL_LINK_NOARG(SdFileDialog_Imp, PlayMusicHdl) mxControlAccess->setLabel( css::ui::dialogs::ExtendedFilePickerElementIds::PUSHBUTTON_PLAY, SD_RESSTR( STR_PLAY ) ); - mbLabelPlaying = sal_False; + mbLabelPlaying = false; } catch(const css::lang::IllegalArgumentException&) { @@ -152,7 +152,7 @@ IMPL_LINK_NOARG(SdFileDialog_Imp, PlayMusicHdl) mxControlAccess->setLabel( css::ui::dialogs::ExtendedFilePickerElementIds::PUSHBUTTON_PLAY, SD_RESSTR( STR_STOP ) ); - mbLabelPlaying = sal_True; + mbLabelPlaying = true; } catch (const css::lang::IllegalArgumentException&) { @@ -188,7 +188,7 @@ IMPL_LINK_NOARG(SdFileDialog_Imp, IsMusicStoppedHdl) { mxControlAccess->setLabel( css::ui::dialogs::ExtendedFilePickerElementIds::PUSHBUTTON_PLAY, SD_RESSTR( STR_PLAY ) ); - mbLabelPlaying = sal_False; + mbLabelPlaying = false; } catch (const css::lang::IllegalArgumentException&) { @@ -226,11 +226,11 @@ void SdFileDialog_Imp::CheckSelectionState() SdFileDialog_Imp::SdFileDialog_Imp( const short nDialogType, - sal_Bool bUsableSelection ) : + bool bUsableSelection ) : FileDialogHelper( nDialogType, 0 ), mnPlaySoundEvent( 0 ), mbUsableSelection( bUsableSelection ), - mbLabelPlaying(sal_False) + mbLabelPlaying(false) { maUpdateTimer.SetTimeoutHdl(LINK(this, SdFileDialog_Imp, IsMusicStoppedHdl)); @@ -256,7 +256,7 @@ SdFileDialog_Imp::SdFileDialog_Imp( const short nDialogType, #endif } } - else if( mbUsableSelection != sal_True ) + else if( mbUsableSelection != true ) { try { @@ -297,7 +297,7 @@ ErrCode SdFileDialog_Imp::Execute() SdOpenSoundFileDialog::SdOpenSoundFileDialog() : mpImpl( new SdFileDialog_Imp( - css::ui::dialogs::TemplateDescription::FILEOPEN_PLAY, sal_False ) ) + css::ui::dialogs::TemplateDescription::FILEOPEN_PLAY, false ) ) { OUString aDescr; aDescr = SD_RESSTR(STR_ALL_FILES); diff --git a/sd/source/ui/dlg/inspagob.cxx b/sd/source/ui/dlg/inspagob.cxx index b400ca9d68cc..8c104974e03d 100644 --- a/sd/source/ui/dlg/inspagob.cxx +++ b/sd/source/ui/dlg/inspagob.cxx @@ -105,7 +105,7 @@ std::vector<OUString> SdInsertPagesObjsDlg::GetList( const sal_uInt16 nType ) /** * is link checked */ -sal_Bool SdInsertPagesObjsDlg::IsLink() +bool SdInsertPagesObjsDlg::IsLink() { return( m_pCbxLink->IsChecked() ); } @@ -113,7 +113,7 @@ sal_Bool SdInsertPagesObjsDlg::IsLink() /** * is link checked */ -sal_Bool SdInsertPagesObjsDlg::IsRemoveUnnessesaryMasterPages() const +bool SdInsertPagesObjsDlg::IsRemoveUnnessesaryMasterPages() const { return( m_pCbxMasters->IsChecked() ); } diff --git a/sd/source/ui/dlg/morphdlg.cxx b/sd/source/ui/dlg/morphdlg.cxx index b0b5b4928d1e..b0ac4252c8fb 100644 --- a/sd/source/ui/dlg/morphdlg.cxx +++ b/sd/source/ui/dlg/morphdlg.cxx @@ -70,18 +70,18 @@ void MorphDlg::LoadSettings() SvStorageStreamRef xIStm( SD_MOD()->GetOptionStream( OUString(SD_OPTION_MORPHING) , SD_OPTION_LOAD ) ); sal_uInt16 nSteps; - sal_Bool bOrient, bAttrib; + bool bOrient, bAttrib; if( xIStm.Is() ) { SdIOCompat aCompat( *xIStm, STREAM_READ ); - xIStm->ReadUInt16( nSteps ).ReadUChar( bOrient ).ReadUChar( bAttrib ); + xIStm->ReadUInt16( nSteps ).ReadCharAsBool( bOrient ).ReadCharAsBool( bAttrib ); } else { nSteps = 16; - bOrient = bAttrib = sal_True; + bOrient = bAttrib = true; } m_pMtfSteps->SetValue( nSteps ); diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx index 76cd0f442115..82f4f65f70ee 100644 --- a/sd/source/ui/dlg/navigatr.cxx +++ b/sd/source/ui/dlg/navigatr.cxx @@ -72,7 +72,7 @@ SdNavigatorWin::SdNavigatorWin( , maTlbObjects( this, SdResId( TLB_OBJECTS ) ) , maLbDocs ( this, SdResId( LB_DOCS ) ) , mpChildWinContext( pChWinCtxt ) - , mbDocImported ( sal_False ) + , mbDocImported ( false ) // On changes of the DragType: adjust SelectionMode of TLB! , meDragType ( NAVIGATOR_DRAGTYPE_EMBEDDED ) , mpBindings ( pInBindings ) @@ -110,7 +110,7 @@ SdNavigatorWin::SdNavigatorWin( // set focus to listbox, otherwise it is in the toolbox which is only useful // for keyboard navigation maTlbObjects.GrabFocus(); - maTlbObjects.SetSdNavigatorWinFlag(sal_True); + maTlbObjects.SetSdNavigatorWinFlag(true); // DragTypeListBox maLbDocs.SetSelectHdl( LINK( this, SdNavigatorWin, SelectDocumentHdl ) ); @@ -167,10 +167,10 @@ void SdNavigatorWin::FreshTree( const SdDrawDocument* pDoc ) sd::DrawDocShell* pDocShell = pNonConstDoc->GetDocSh(); OUString aDocShName( pDocShell->GetName() ); OUString aDocName = pDocShell->GetMedium()->GetName(); - maTlbObjects.SetSaveTreeItemStateFlag(sal_True); //Added by yanjun for sym2_6385 + maTlbObjects.SetSaveTreeItemStateFlag(true); //Added by yanjun for sym2_6385 maTlbObjects.Clear(); - maTlbObjects.Fill( pDoc, sal_False, aDocName ); // Nur normale Seiten - maTlbObjects.SetSaveTreeItemStateFlag(sal_False); //Added by yanjun for sym2_6385 + maTlbObjects.Fill( pDoc, false, aDocName ); // Nur normale Seiten + maTlbObjects.SetSaveTreeItemStateFlag(false); //Added by yanjun for sym2_6385 RefreshDocumentLB(); maLbDocs.SelectEntry( aDocShName ); } @@ -207,7 +207,7 @@ void SdNavigatorWin::InitTreeLB( const SdDrawDocument* pDoc ) { OUString aDocName = pDocShell->GetMedium()->GetName(); maTlbObjects.Clear(); - maTlbObjects.Fill( pDoc, (sal_Bool) sal_False, aDocName ); // only normal pages + maTlbObjects.Fill( pDoc, false, aDocName ); // only normal pages RefreshDocumentLB(); maLbDocs.SelectEntry( aDocShName ); @@ -434,7 +434,7 @@ IMPL_LINK_NOARG(SdNavigatorWin, SelectDocumentHdl) { OUString aStrLb = maLbDocs.GetSelectEntry(); long nPos = maLbDocs.GetSelectEntryPos(); - sal_Bool bFound = sal_False; + bool bFound = false; ::sd::DrawDocShell* pDocShell = NULL; NavDocInfo* pInfo = GetDocInfo(); @@ -448,7 +448,7 @@ IMPL_LINK_NOARG(SdNavigatorWin, SelectDocumentHdl) { pDocShell = pInfo->mpDocShell; - bFound = sal_True; + bFound = true; } if( bFound ) @@ -460,7 +460,7 @@ IMPL_LINK_NOARG(SdNavigatorWin, SelectDocumentHdl) ::sd::DrawDocShell* pNCDocShell = pNonConstDoc->GetDocSh(); OUString aDocName = pNCDocShell->GetMedium()->GetName(); maTlbObjects.Clear(); - maTlbObjects.Fill( pDoc, (sal_Bool) sal_False, aDocName ); // only normal pages + maTlbObjects.Fill( pDoc, false, aDocName ); // only normal pages } } @@ -655,7 +655,7 @@ bool SdNavigatorWin::InsertFile(const OUString& rFileName) if( !maTlbObjects.IsEqualToDoc( pDropDoc ) ) { // only normal pages - maTlbObjects.Fill(pDropDoc, (sal_Bool) sal_False, maDropFileName); + maTlbObjects.Fill(pDropDoc, false, maDropFileName); RefreshDocumentLB( &maDropFileName ); } } @@ -687,7 +687,7 @@ void SdNavigatorWin::RefreshDocumentLB( const OUString* pDocName ) maLbDocs.RemoveEntry( 0 ); maLbDocs.InsertEntry( *pDocName, 0 ); - mbDocImported = sal_True; + mbDocImported = true; } else { @@ -723,7 +723,7 @@ void SdNavigatorWin::RefreshDocumentLB( const OUString* pDocName ) if( !aStr.isEmpty() ) aInfo.SetName(); else - aInfo.SetName( sal_False ); + aInfo.SetName( false ); // at the moment, we use the name of the shell again (i.e. // without path) since Koose thinks it is an error if the path // is shown in url notation! @@ -734,7 +734,7 @@ void SdNavigatorWin::RefreshDocumentLB( const OUString* pDocName ) if( pDocShell == pCurrentDocShell ) aInfo.SetActive(); else - aInfo.SetActive( sal_False ); + aInfo.SetActive( false ); maDocList.push_back( aInfo ); } @@ -746,7 +746,7 @@ void SdNavigatorWin::RefreshDocumentLB( const OUString* pDocName ) -sal_uInt16 SdNavigatorWin::GetDragTypeSdResId( NavigatorDragType eDT, sal_Bool bImage ) +sal_uInt16 SdNavigatorWin::GetDragTypeSdResId( NavigatorDragType eDT, bool bImage ) { switch( eDT ) { @@ -861,7 +861,7 @@ void SdNavigatorWin::DataChanged( const DataChangedEvent& rDCEvt ) void SdNavigatorWin::SetDragImage() { - maToolbox.SetItemImage( TBI_DRAGTYPE, maToolbox.GetImageList().GetImage( GetDragTypeSdResId( meDragType, sal_True ) ) ); + maToolbox.SetItemImage( TBI_DRAGTYPE, maToolbox.GetImageList().GetImage( GetDragTypeSdResId( meDragType, true ) ) ); } void SdNavigatorWin::ApplyImageList() diff --git a/sd/source/ui/dlg/paragr.cxx b/sd/source/ui/dlg/paragr.cxx index 7338955b0350..91f4b30ef507 100644 --- a/sd/source/ui/dlg/paragr.cxx +++ b/sd/source/ui/dlg/paragr.cxx @@ -97,8 +97,8 @@ bool SdParagraphNumTabPage::FillItemSet( SfxItemSet& rSet ) m_pNewStartNF->GetText() != m_pNewStartNF->GetSavedValue()) { mbModified = true; - sal_Bool bNewStartChecked = TRISTATE_TRUE == m_pNewStartCB->GetState(); - sal_Bool bNumberNewStartChecked = TRISTATE_TRUE == m_pNewStartNumberCB->GetState(); + bool bNewStartChecked = TRISTATE_TRUE == m_pNewStartCB->GetState(); + bool bNumberNewStartChecked = TRISTATE_TRUE == m_pNewStartNumberCB->GetState(); rSet.Put(SfxBoolItem(ATTR_NUMBER_NEWSTART, bNewStartChecked)); const sal_Int16 nStartAt = (sal_Int16)m_pNewStartNF->GetValue(); @@ -147,7 +147,7 @@ void SdParagraphNumTabPage::Reset( const SfxItemSet& rSet ) IMPL_LINK_NOARG(SdParagraphNumTabPage, ImplNewStartHdl) { - sal_Bool bEnable = m_pNewStartCB->IsChecked(); + bool bEnable = m_pNewStartCB->IsChecked(); m_pNewStartNumberCB->Enable(bEnable); m_pNewStartNF->Enable(bEnable && m_pNewStartNumberCB->IsChecked()); return 0; @@ -169,7 +169,7 @@ SdParagraphDlg::SdParagraphDlg( Window* pParent, const SfxItemSet* pAttr ) AddTabPage( "labelTP_PARA_ALIGN", RID_SVXPAGE_ALIGN_PARAGRAPH); - static const sal_Bool bShowParaNumbering = ( getenv( "SD_SHOW_NUMBERING_PAGE" ) != NULL ); + static const bool bShowParaNumbering = ( getenv( "SD_SHOW_NUMBERING_PAGE" ) != NULL ); if( bShowParaNumbering ) AddTabPage( "labelNUMBERING", SdParagraphNumTabPage::Create, SdParagraphNumTabPage::GetRanges ); else diff --git a/sd/source/ui/dlg/present.cxx b/sd/source/ui/dlg/present.cxx index 7d1f022f8760..2911984c0e2a 100644 --- a/sd/source/ui/dlg/present.cxx +++ b/sd/source/ui/dlg/present.cxx @@ -124,8 +124,8 @@ SdStartPresentationDlg::SdStartPresentationDlg( Window* pWindow, aCbxChangePage->Check( ( ( const SfxBoolItem& ) rOutAttrs.Get( ATTR_PRESENT_CHANGE_PAGE ) ).GetValue() ); aCbxAlwaysOnTop->Check( ( ( const SfxBoolItem& ) rOutAttrs.Get( ATTR_PRESENT_ALWAYS_ON_TOP ) ).GetValue() ); - const sal_Bool bEndless = ( ( const SfxBoolItem& ) rOutAttrs.Get( ATTR_PRESENT_ENDLESS ) ).GetValue(); - const sal_Bool bWindow = !( ( const SfxBoolItem& ) rOutAttrs.Get( ATTR_PRESENT_FULLSCREEN ) ).GetValue(); + const bool bEndless = ( ( const SfxBoolItem& ) rOutAttrs.Get( ATTR_PRESENT_ENDLESS ) ).GetValue(); + const bool bWindow = !( ( const SfxBoolItem& ) rOutAttrs.Get( ATTR_PRESENT_FULLSCREEN ) ).GetValue(); const long nPause = ( ( const SfxUInt32Item& ) rOutAttrs.Get( ATTR_PRESENT_PAUSE_TIMEOUT ) ).GetValue(); aTmfPause->SetTime( Time( 0, 0, nPause ) ); @@ -201,7 +201,7 @@ void SdStartPresentationDlg::InitMonitorSettings() } else { - sal_Bool bUnifiedDisplay = Application::IsUnifiedDisplay(); + bool bUnifiedDisplay = Application::IsUnifiedDisplay(); sal_Int32 nExternalIndex = Application::GetDisplayExternalScreen(); sal_Int32 nSelectedIndex (-1); diff --git a/sd/source/ui/dlg/sddlgfact.cxx b/sd/source/ui/dlg/sddlgfact.cxx index 7cfc086c016e..8ea43f36e032 100644 --- a/sd/source/ui/dlg/sddlgfact.cxx +++ b/sd/source/ui/dlg/sddlgfact.cxx @@ -73,12 +73,12 @@ void AbstractCopyDlg_Impl::GetAttr( SfxItemSet& rOutAttrs ) pDlg->GetAttr( rOutAttrs ); } -sal_Bool AbstractSdCustomShowDlg_Impl::IsModified() const +bool AbstractSdCustomShowDlg_Impl::IsModified() const { return pDlg->IsModified(); } -sal_Bool AbstractSdCustomShowDlg_Impl::IsCustomShow() const +bool AbstractSdCustomShowDlg_Impl::IsCustomShow() const { return pDlg->IsCustomShow(); } @@ -199,7 +199,7 @@ OutputType AbstractAssistentDlg_Impl::GetOutputMedium() const return pDlg->GetOutputMedium(); } -sal_Bool AbstractAssistentDlg_Impl::IsSummary() const +bool AbstractAssistentDlg_Impl::IsSummary() const { return pDlg->IsSummary(); } @@ -214,12 +214,12 @@ OUString AbstractAssistentDlg_Impl::GetDocPath() const return pDlg->GetDocPath(); } -sal_Bool AbstractAssistentDlg_Impl::GetStartWithFlag() const +bool AbstractAssistentDlg_Impl::GetStartWithFlag() const { return pDlg->GetStartWithFlag(); } -sal_Bool AbstractAssistentDlg_Impl::IsDocEmpty() const +bool AbstractAssistentDlg_Impl::IsDocEmpty() const { return pDlg->IsDocEmpty(); } @@ -254,7 +254,7 @@ void AbstractSdSnapLineDlg_Impl::HideDeleteBtn() pDlg->HideDeleteBtn(); } -void AbstractSdSnapLineDlg_Impl::SetInputFields(sal_Bool bEnableX, sal_Bool bEnableY) +void AbstractSdSnapLineDlg_Impl::SetInputFields(bool bEnableX, bool bEnableY) { pDlg->SetInputFields(bEnableX, bEnableY); } @@ -274,7 +274,7 @@ void AbstractSdInsertLayerDlg_Impl::SetHelpId( const OString& rHelpId ) pDlg->SetHelpId( rHelpId ); } -sal_Bool AbstractSdInsertPasteDlg_Impl::IsInsertBefore() const +bool AbstractSdInsertPasteDlg_Impl::IsInsertBefore() const { return pDlg->IsInsertBefore(); } @@ -289,12 +289,12 @@ std::vector<OUString> AbstractSdInsertPagesObjsDlg_Impl::GetList(const sal_uInt1 return pDlg->GetList(nType); } -sal_Bool AbstractSdInsertPagesObjsDlg_Impl::IsLink() +bool AbstractSdInsertPagesObjsDlg_Impl::IsLink() { return pDlg->IsLink(); } -sal_Bool AbstractSdInsertPagesObjsDlg_Impl::IsRemoveUnnessesaryMasterPages() const +bool AbstractSdInsertPagesObjsDlg_Impl::IsRemoveUnnessesaryMasterPages() const { return pDlg->IsRemoveUnnessesaryMasterPages(); } @@ -309,12 +309,12 @@ sal_uInt16 AbstractMorphDlg_Impl::GetFadeSteps() const return pDlg->GetFadeSteps(); } -sal_Bool AbstractMorphDlg_Impl::IsAttributeFade() const +bool AbstractMorphDlg_Impl::IsAttributeFade() const { return pDlg->IsAttributeFade(); } -sal_Bool AbstractMorphDlg_Impl::IsOrientationFade() const +bool AbstractMorphDlg_Impl::IsOrientationFade() const { return pDlg->IsOrientationFade(); } @@ -399,12 +399,12 @@ SfxAbstractTabDialog * SdAbstractDialogFactory_Impl::CreateSdTabCharDialog( ::W return new SdAbstractTabDialog_Impl( new SdCharDlg( pParent, pAttr, pDocShell ) ); } -SfxAbstractTabDialog * SdAbstractDialogFactory_Impl::CreateSdTabPageDialog( ::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell, sal_Bool bAreaPage ) +SfxAbstractTabDialog * SdAbstractDialogFactory_Impl::CreateSdTabPageDialog( ::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell, bool bAreaPage ) { return new SdAbstractTabDialog_Impl( new SdPageDlg( pDocShell, pParent, pAttr, bAreaPage ) ); } -AbstractAssistentDlg * SdAbstractDialogFactory_Impl::CreateAssistentDlg( ::Window* pParent, sal_Bool bAutoPilot) +AbstractAssistentDlg * SdAbstractDialogFactory_Impl::CreateAssistentDlg( ::Window* pParent, bool bAutoPilot) { return new AbstractAssistentDlg_Impl( new AssistentDlg( pParent, bAutoPilot ) ); } diff --git a/sd/source/ui/dlg/sddlgfact.hxx b/sd/source/ui/dlg/sddlgfact.hxx index d29ce574456c..15b91e11f1b0 100644 --- a/sd/source/ui/dlg/sddlgfact.hxx +++ b/sd/source/ui/dlg/sddlgfact.hxx @@ -65,8 +65,8 @@ class SdCustomShowDlg; class AbstractSdCustomShowDlg_Impl : public AbstractSdCustomShowDlg { DECL_ABSTDLG_BASE(AbstractSdCustomShowDlg_Impl,SdCustomShowDlg) - virtual sal_Bool IsModified() const SAL_OVERRIDE ; - virtual sal_Bool IsCustomShow() const SAL_OVERRIDE ; + virtual bool IsModified() const SAL_OVERRIDE ; + virtual bool IsCustomShow() const SAL_OVERRIDE ; }; class SfxTabDialog; @@ -117,11 +117,11 @@ class AbstractAssistentDlg_Impl : public AbstractAssistentDlg DECL_ABSTDLG_BASE(AbstractAssistentDlg_Impl,AssistentDlg) virtual SfxObjectShellLock GetDocument() SAL_OVERRIDE; virtual OutputType GetOutputMedium() const SAL_OVERRIDE; - virtual sal_Bool IsSummary() const SAL_OVERRIDE; + virtual bool IsSummary() const SAL_OVERRIDE; virtual StartType GetStartType() const SAL_OVERRIDE; virtual OUString GetDocPath() const SAL_OVERRIDE; - virtual sal_Bool GetStartWithFlag() const SAL_OVERRIDE; - virtual sal_Bool IsDocEmpty() const SAL_OVERRIDE; + virtual bool GetStartWithFlag() const SAL_OVERRIDE; + virtual bool IsDocEmpty() const SAL_OVERRIDE; virtual com::sun::star::uno::Sequence< com::sun::star::beans::NamedValue > GetPassword() SAL_OVERRIDE; }; @@ -140,7 +140,7 @@ class AbstractSdSnapLineDlg_Impl : public AbstractSdSnapLineDlg virtual void GetAttr(SfxItemSet& rOutAttrs) SAL_OVERRIDE; virtual void HideRadioGroup() SAL_OVERRIDE; virtual void HideDeleteBtn() SAL_OVERRIDE; - virtual void SetInputFields(sal_Bool bEnableX, sal_Bool bEnableY) SAL_OVERRIDE; + virtual void SetInputFields(bool bEnableX, bool bEnableY) SAL_OVERRIDE; //from class Window virtual void SetText( const OUString& rStr ) SAL_OVERRIDE; }; @@ -158,7 +158,7 @@ class SdInsertPasteDlg; class AbstractSdInsertPasteDlg_Impl : public AbstractSdInsertPasteDlg { DECL_ABSTDLG_BASE(AbstractSdInsertPasteDlg_Impl,SdInsertPasteDlg) - virtual sal_Bool IsInsertBefore() const SAL_OVERRIDE; + virtual bool IsInsertBefore() const SAL_OVERRIDE; }; class SdInsertPagesObjsDlg; @@ -167,17 +167,17 @@ class AbstractSdInsertPagesObjsDlg_Impl : public AbstractSdInsertPagesObjsDlg DECL_ABSTDLG_BASE(AbstractSdInsertPagesObjsDlg_Impl,SdInsertPagesObjsDlg) virtual ::Window * GetWindow() SAL_OVERRIDE; virtual std::vector<OUString> GetList ( const sal_uInt16 nType ) SAL_OVERRIDE; - virtual sal_Bool IsLink() SAL_OVERRIDE; - virtual sal_Bool IsRemoveUnnessesaryMasterPages() const SAL_OVERRIDE; + virtual bool IsLink() SAL_OVERRIDE; + virtual bool IsRemoveUnnessesaryMasterPages() const SAL_OVERRIDE; }; class AbstractMorphDlg_Impl : public AbstractMorphDlg { DECL_ABSTDLG_BASE(AbstractMorphDlg_Impl,::sd::MorphDlg) virtual void SaveSettings() const SAL_OVERRIDE; - virtual sal_uInt16 GetFadeSteps() const SAL_OVERRIDE; - virtual sal_Bool IsAttributeFade() const SAL_OVERRIDE ; - virtual sal_Bool IsOrientationFade() const SAL_OVERRIDE ; + virtual sal_uInt16 GetFadeSteps() const SAL_OVERRIDE; + virtual bool IsAttributeFade() const SAL_OVERRIDE ; + virtual bool IsOrientationFade() const SAL_OVERRIDE ; }; class SdStartPresentationDlg; @@ -235,8 +235,8 @@ public: virtual AbstractCopyDlg* CreateCopyDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, const rtl::Reference<XColorList> &pColTab, ::sd::View* pView ) SAL_OVERRIDE; virtual AbstractSdCustomShowDlg* CreateSdCustomShowDlg( ::Window* pWindow, SdDrawDocument& rDrawDoc ) SAL_OVERRIDE; virtual SfxAbstractTabDialog* CreateSdTabCharDialog( ::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell ) SAL_OVERRIDE; - virtual SfxAbstractTabDialog* CreateSdTabPageDialog( ::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell, sal_Bool bAreaPage = sal_True ) SAL_OVERRIDE; - virtual AbstractAssistentDlg* CreateAssistentDlg( ::Window* pParent, sal_Bool bAutoPilot) SAL_OVERRIDE; + virtual SfxAbstractTabDialog* CreateSdTabPageDialog( ::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell, bool bAreaPage = true ) SAL_OVERRIDE; + virtual AbstractAssistentDlg* CreateAssistentDlg( ::Window* pParent, bool bAutoPilot) SAL_OVERRIDE; virtual AbstractSdModifyFieldDlg* CreateSdModifyFieldDlg( ::Window* pWindow, const SvxFieldData* pInField, const SfxItemSet& rSet ) SAL_OVERRIDE; virtual AbstractSdSnapLineDlg* CreateSdSnapLineDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, ::sd::View* pView) SAL_OVERRIDE; virtual AbstractSdInsertLayerDlg* CreateSdInsertLayerDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, bool bDeletable, const OUString& aStr ) SAL_OVERRIDE; diff --git a/sd/source/ui/dlg/sdpreslt.cxx b/sd/source/ui/dlg/sdpreslt.cxx index 1ae155d848f2..b9349e0b0162 100644 --- a/sd/source/ui/dlg/sdpreslt.cxx +++ b/sd/source/ui/dlg/sdpreslt.cxx @@ -68,7 +68,7 @@ void SdPresLayoutDlg::Reset() // replace master page if( mrOutAttrs.GetItemState( ATTR_PRESLAYOUT_MASTER_PAGE, false, &pPoolItem ) == SFX_ITEM_SET ) { - sal_Bool bMasterPage = ( (const SfxBoolItem*) pPoolItem)->GetValue(); + bool bMasterPage = ( (const SfxBoolItem*) pPoolItem)->GetValue(); m_pCbxMasterPage->Enable( !bMasterPage ); m_pCbxMasterPage->Check( bMasterPage ); } @@ -101,7 +101,7 @@ void SdPresLayoutDlg::Reset() void SdPresLayoutDlg::GetAttr(SfxItemSet& rOutAttrs) { short nId = m_pVS->GetSelectItemId(); - sal_Bool bLoad = nId > mnLayoutCount; + bool bLoad = nId > mnLayoutCount; rOutAttrs.Put( SfxBoolItem( ATTR_PRESLAYOUT_LOAD, bLoad ) ); OUString aLayoutName; @@ -184,7 +184,7 @@ IMPL_LINK_NOARG(SdPresLayoutDlg, ClickLoadHdl) // Inserted update to force repaint Update(); - sal_Bool bCancel = sal_False; + bool bCancel = false; switch (nResult) { @@ -203,14 +203,14 @@ IMPL_LINK_NOARG(SdPresLayoutDlg, ClickLoadHdl) break; default: - bCancel = sal_True; + bCancel = true; } delete pDlg; if( !bCancel ) { // check if template already exists - sal_Bool bExists = sal_False; + bool bExists = false; OUString aCompareStr(maName); if (aCompareStr.isEmpty()) aCompareStr = maStrNone; @@ -221,7 +221,7 @@ IMPL_LINK_NOARG(SdPresLayoutDlg, ClickLoadHdl) { if( aCompareStr == *it ) { - bExists = sal_True; + bExists = true; // select template m_pVS->SelectItem( aPos + 1 ); } @@ -258,7 +258,7 @@ IMPL_LINK_NOARG(SdPresLayoutDlg, ClickLoadHdl) } else { - bCancel = sal_True; + bCancel = true; } pDoc->CloseBookmarkDoc(); diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index 5849589de0af..f359b8a2618b 100644 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/sd/source/ui/dlg/sdtreelb.cxx @@ -73,9 +73,9 @@ public: }; -sal_Bool SdPageObjsTLB::bIsInDrag = sal_False; +bool SdPageObjsTLB::bIsInDrag = false; -sal_Bool SdPageObjsTLB::IsInDrag() +bool SdPageObjsTLB::IsInDrag() { return bIsInDrag; } @@ -92,7 +92,7 @@ SdPageObjsTLB::SdPageObjsTransferable::SdPageObjsTransferable( ::sd::DrawDocShell& rDocShell, NavigatorDragType eDragType, const ::com::sun::star::uno::Any& rTreeListBoxData ) - : SdTransferable(rDocShell.GetDoc(), NULL, sal_True), + : SdTransferable(rDocShell.GetDoc(), NULL, true), mrParent( rParent ), maBookmark( rBookmark ), mrDocShell( rDocShell ), @@ -223,7 +223,7 @@ sal_uInt32 SdPageObjsTLB::SdPageObjsTransferable::GetListBoxDropFormatId (void) SdPageObjsTLB::SdPageObjsTLB( Window* pParentWin, const SdResId& rSdResId ) : SvTreeListBox ( pParentWin, rSdResId ) -, bisInSdNavigatorWin ( sal_False ) +, bisInSdNavigatorWin ( false ) , mpParent ( pParentWin ) , mpDoc ( NULL ) , mpBookmarkDoc ( NULL ) @@ -231,7 +231,7 @@ SdPageObjsTLB::SdPageObjsTLB( Window* pParentWin, const SdResId& rSdResId ) , mpOwnMedium ( NULL ) , maImgOle ( BitmapEx( SdResId( BMP_OLE ) ) ) , maImgGraphic ( BitmapEx( SdResId( BMP_GRAPHIC ) ) ) -, mbLinkableSelected ( sal_False ) +, mbLinkableSelected ( false ) , mpDropNavWin ( NULL ) , mpFrame ( NULL ) , mbSaveTreeItemState ( false ) @@ -262,7 +262,7 @@ SdPageObjsTLB::SdPageObjsTLB( Window* pParentWin, WinBits nStyle ) , mpOwnMedium ( NULL ) , maImgOle ( BitmapEx( SdResId( BMP_OLE ) ) ) , maImgGraphic ( BitmapEx( SdResId( BMP_GRAPHIC ) ) ) -, mbLinkableSelected ( sal_False ) +, mbLinkableSelected ( false ) , mpDropNavWin ( NULL ) , mpFrame ( NULL ) , mbSaveTreeItemState ( false ) @@ -294,7 +294,7 @@ SdPageObjsTLB::~SdPageObjsTLB() } // helper function for GetEntryAltText and GetEntryLongDescription -OUString SdPageObjsTLB::getAltLongDescText(SvTreeListEntry* pEntry , sal_Bool isAltText) const +OUString SdPageObjsTLB::getAltLongDescText(SvTreeListEntry* pEntry , bool isAltText) const { sal_uInt16 maxPages = mpDoc->GetPageCount(); sal_uInt16 pageNo; @@ -328,12 +328,12 @@ OUString SdPageObjsTLB::getAltLongDescText(SvTreeListEntry* pEntry , sal_Bool is OUString SdPageObjsTLB::GetEntryAltText( SvTreeListEntry* pEntry ) const { - return getAltLongDescText( pEntry, sal_True ); + return getAltLongDescText( pEntry, true ); } OUString SdPageObjsTLB::GetEntryLongDescription( SvTreeListEntry* pEntry ) const { - return getAltLongDescText( pEntry, sal_False); + return getAltLongDescText( pEntry, false); } void SdPageObjsTLB::MarkCurEntry( const OUString& rName ) @@ -462,9 +462,9 @@ OUString SdPageObjsTLB::GetObjectName( /** * select a entry in TreeLB */ -sal_Bool SdPageObjsTLB::SelectEntry( const OUString& rName ) +bool SdPageObjsTLB::SelectEntry( const OUString& rName ) { - sal_Bool bFound = sal_False; + bool bFound = false; if( !rName.isEmpty() ) { @@ -476,7 +476,7 @@ sal_Bool SdPageObjsTLB::SelectEntry( const OUString& rName ) aTmp = GetEntryText( pEntry ); if( aTmp == rName ) { - bFound = sal_True; + bFound = true; SetCurEntry( pEntry ); } } @@ -487,10 +487,10 @@ sal_Bool SdPageObjsTLB::SelectEntry( const OUString& rName ) /** * @return true if children of the specified string are selected */ -sal_Bool SdPageObjsTLB::HasSelectedChildren( const OUString& rName ) +bool SdPageObjsTLB::HasSelectedChildren( const OUString& rName ) { - sal_Bool bFound = sal_False; - sal_Bool bChildren = sal_False; + bool bFound = false; + bool bChildren = false; if( !rName.isEmpty() ) { @@ -502,11 +502,11 @@ sal_Bool SdPageObjsTLB::HasSelectedChildren( const OUString& rName ) aTmp = GetEntryText( pEntry ); if( aTmp == rName ) { - bFound = sal_True; - sal_Bool bExpanded = IsExpanded( pEntry ); + bFound = true; + bool bExpanded = IsExpanded( pEntry ); long nCount = GetChildSelectionCount( pEntry ); if( bExpanded && nCount > 0 ) - bChildren = sal_True; + bChildren = true; } } } @@ -517,7 +517,7 @@ sal_Bool SdPageObjsTLB::HasSelectedChildren( const OUString& rName ) /** * Fill TreeLB with pages and objects */ -void SdPageObjsTLB::Fill( const SdDrawDocument* pInDoc, sal_Bool bAllPages, +void SdPageObjsTLB::Fill( const SdDrawDocument* pInDoc, bool bAllPages, const OUString& rDocName) { OUString aSelection; @@ -529,7 +529,7 @@ void SdPageObjsTLB::Fill( const SdDrawDocument* pInDoc, sal_Bool bAllPages, mpDoc = pInDoc; maDocName = rDocName; - mbShowAllPages = (bAllPages == sal_True); + mbShowAllPages = bAllPages; mpMedium = NULL; SdPage* pPage = NULL; @@ -634,7 +634,7 @@ void SdPageObjsTLB::AddShapeList ( IM_FLAT, false /*not reverse*/); - sal_Bool bMarked=sal_False; + bool bMarked=false; if(bisInSdNavigatorWin) { Window* pWindow=NULL; @@ -851,13 +851,13 @@ bool SdPageObjsTLB::GetShowAllShapes (void) const * If a doc is provided, this will be the used doc (important by more than * one document). */ -sal_Bool SdPageObjsTLB::IsEqualToDoc( const SdDrawDocument* pInDoc ) +bool SdPageObjsTLB::IsEqualToDoc( const SdDrawDocument* pInDoc ) { if( pInDoc ) mpDoc = pInDoc; if( !mpDoc ) - return( sal_False ); + return false; SdrObject* pObj = NULL; SdPage* pPage = NULL; @@ -874,11 +874,11 @@ sal_Bool SdPageObjsTLB::IsEqualToDoc( const SdDrawDocument* pInDoc ) if( pPage->GetPageKind() == PK_STANDARD ) { if( !pEntry ) - return( sal_False ); + return false; aName = GetEntryText( pEntry ); if( pPage->GetName() != aName ) - return( sal_False ); + return false; pEntry = Next( pEntry ); @@ -896,12 +896,12 @@ sal_Bool SdPageObjsTLB::IsEqualToDoc( const SdDrawDocument* pInDoc ) if( !aObjectName.isEmpty() ) { if( !pEntry ) - return( sal_False ); + return false; aName = GetEntryText( pEntry ); if( aObjectName != aName ) - return( sal_False ); + return false; pEntry = Next( pEntry ); } @@ -1045,7 +1045,7 @@ SdDrawDocument* SdPageObjsTLB::GetBookmarkDoc(SfxMedium* pMed) if( pMed ) { // in this mode the document is also owned and controlled by this instance - mxBookmarkDocShRef = new ::sd::DrawDocShell(SFX_CREATE_MODE_STANDARD, sal_True); + mxBookmarkDocShRef = new ::sd::DrawDocShell(SFX_CREATE_MODE_STANDARD, true); if (mxBookmarkDocShRef->DoLoad(pMed)) mpBookmarkDoc = mxBookmarkDocShRef->GetDoc(); else @@ -1105,12 +1105,12 @@ void SdPageObjsTLB::SelectHdl() { SvTreeListEntry* pEntry = FirstSelected(); - mbLinkableSelected = sal_True; + mbLinkableSelected = true; while( pEntry && mbLinkableSelected ) { if( NULL == pEntry->GetUserData() ) - mbLinkableSelected = sal_False; + mbLinkableSelected = false; pEntry = NextSelected( pEntry ); } @@ -1141,7 +1141,7 @@ void SdPageObjsTLB::KeyInput( const KeyEvent& rKEvt ) { if(bisInSdNavigatorWin) { - sal_Bool bMarked=sal_False; + bool bMarked=false; SvTreeListEntry* pNewEntry = GetCurEntry(); if (!pNewEntry) return; @@ -1247,7 +1247,7 @@ void SdPageObjsTLB::DoDrag() SvTreeListBox::ReleaseMouse(); - bIsInDrag = sal_True; + bIsInDrag = true; SvLBoxDDInfo aDDInfo; memset(&aDDInfo,0,sizeof(SvLBoxDDInfo)); @@ -1324,7 +1324,7 @@ void SdPageObjsTLB::OnDragFinished( sal_uInt8 ) } mpDropNavWin = NULL; - bIsInDrag = sal_False; + bIsInDrag = false; } /** diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx index 78a8ef9a12b2..d0c5a65301b3 100644 --- a/sd/source/ui/dlg/tpaction.cxx +++ b/sd/source/ui/dlg/tpaction.cxx @@ -178,7 +178,7 @@ void SdTPAction::Construct() // fill OLE-Actionlistbox SdrOle2Obj* pOleObj = NULL; SdrGrafObj* pGrafObj = NULL; - sal_Bool bOLEAction = sal_False; + bool bOLEAction = false; if ( mpView->AreObjectsMarked() ) { @@ -205,7 +205,7 @@ void SdTPAction::Construct() } if( pGrafObj ) { - bOLEAction = sal_True; + bOLEAction = true; aVerbVector.push_back( 0 ); m_pLbOLEAction->InsertEntry( MnemonicGenerator::EraseAllMnemonicChars( SD_RESSTR( STR_EDIT_OBJ ) ) ); @@ -215,7 +215,7 @@ void SdTPAction::Construct() uno::Reference < embed::XEmbeddedObject > xObj = pOleObj->GetObjRef(); if ( xObj.is() ) { - bOLEAction = sal_True; + bOLEAction = true; uno::Sequence < embed::VerbDescriptor > aVerbs; try { @@ -267,7 +267,7 @@ void SdTPAction::Construct() bool SdTPAction::FillItemSet( SfxItemSet& rAttrs ) { - sal_Bool bModified = sal_False; + bool bModified = false; presentation::ClickAction eCA = presentation::ClickAction_NONE; if( m_pLbAction->GetSelectEntryCount() ) @@ -276,12 +276,12 @@ bool SdTPAction::FillItemSet( SfxItemSet& rAttrs ) if( m_pLbAction->GetSavedValue() != m_pLbAction->GetSelectEntryPos() ) { rAttrs.Put( SfxAllEnumItem( ATTR_ACTION, (sal_uInt16)eCA ) ); - bModified = sal_True; + bModified = true; } else rAttrs.InvalidateItem( ATTR_ACTION ); - OUString aFileName = GetEditText( sal_True ); + OUString aFileName = GetEditText( true ); if( aFileName.isEmpty() ) rAttrs.InvalidateItem( ATTR_ACTION_FILENAME ); else @@ -297,7 +297,7 @@ bool SdTPAction::FillItemSet( SfxItemSet& rAttrs ) INetURLObject::DECODE_UNAMBIGUOUS ); rAttrs.Put( SfxStringItem( ATTR_ACTION_FILENAME, aFileName ) ); - bModified = sal_True; + bModified = true; } else { @@ -388,8 +388,8 @@ void SdTPAction::UpdateTree() if( !bTreeUpdated && mpDoc && mpDoc->GetDocSh() && mpDoc->GetDocSh()->GetMedium() ) { //m_pLbTree->Clear(); - m_pLbTree->Fill( mpDoc, sal_True, mpDoc->GetDocSh()->GetMedium()->GetName() ); - bTreeUpdated = sal_True; + m_pLbTree->Fill( mpDoc, true, mpDoc->GetDocSh()->GetMedium()->GetName() ); + bTreeUpdated = true; } } @@ -399,11 +399,11 @@ void SdTPAction::OpenFileDialog() { // Soundpreview only for interaction with sound presentation::ClickAction eCA = GetActualClickAction(); - sal_Bool bSound = ( eCA == presentation::ClickAction_SOUND ); - sal_Bool bPage = ( eCA == presentation::ClickAction_BOOKMARK ); - sal_Bool bDocument = ( eCA == presentation::ClickAction_DOCUMENT || + bool bSound = ( eCA == presentation::ClickAction_SOUND ); + bool bPage = ( eCA == presentation::ClickAction_BOOKMARK ); + bool bDocument = ( eCA == presentation::ClickAction_DOCUMENT || eCA == presentation::ClickAction_PROGRAM ); - sal_Bool bMacro = ( eCA == presentation::ClickAction_MACRO ); + bool bMacro = ( eCA == presentation::ClickAction_MACRO ); if( bPage ) { @@ -700,7 +700,7 @@ IMPL_LINK_NOARG(SdTPAction, CheckFileHdl) aLastFile = aFile; m_pLbTreeDocument->Clear(); - m_pLbTreeDocument->Fill( pBookmarkDoc, sal_True, aFile ); + m_pLbTreeDocument->Fill( pBookmarkDoc, true, aFile ); mpDoc->CloseBookmarkDoc(); m_pLbTreeDocument->Show(); } @@ -806,7 +806,7 @@ void SdTPAction::SetEditText( OUString const & rStr ) -OUString SdTPAction::GetEditText( sal_Bool bFullDocDestination ) +OUString SdTPAction::GetEditText( bool bFullDocDestination ) { OUString aStr; presentation::ClickAction eCA = GetActualClickAction(); diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx index b8c4a01a75d4..98b393784efa 100644 --- a/sd/source/ui/dlg/tpoption.cxx +++ b/sd/source/ui/dlg/tpoption.cxx @@ -138,7 +138,7 @@ SdTpOptionsContents::~SdTpOptionsContents() bool SdTpOptionsContents::FillItemSet( SfxItemSet& rAttrs ) { - sal_Bool bModified = sal_False; + bool bModified = false; if( m_pCbxRuler->GetSavedValue() != TriState(m_pCbxRuler->IsChecked()) || m_pCbxMoveOutline->GetSavedValue() != TriState(m_pCbxMoveOutline->IsChecked()) || @@ -153,7 +153,7 @@ bool SdTpOptionsContents::FillItemSet( SfxItemSet& rAttrs ) aOptsItem.GetOptionsLayout().SetHandlesBezier( m_pCbxHandlesBezier->IsChecked() ); rAttrs.Put( aOptsItem ); - bModified = sal_True; + bModified = true; } return( bModified ); } @@ -366,7 +366,7 @@ int SdTpOptionsMisc::DeactivatePage( SfxItemSet* pActiveSet ) bool SdTpOptionsMisc::FillItemSet( SfxItemSet& rAttrs ) { - sal_Bool bModified = sal_False; + bool bModified = false; if( m_pCbxStartWithTemplate->GetSavedValue() != TriState(m_pCbxStartWithTemplate->IsChecked()) || m_pCbxMarkedHitMovesAlways->GetSavedValue()!= TriState(m_pCbxMarkedHitMovesAlways->IsChecked()) || @@ -396,7 +396,7 @@ bool SdTpOptionsMisc::FillItemSet( SfxItemSet& rAttrs ) : ::com::sun::star::document::PrinterIndependentLayout::ENABLED); rAttrs.Put( aOptsItem ); - bModified = sal_True; + bModified = true; } // metric @@ -406,7 +406,7 @@ bool SdTpOptionsMisc::FillItemSet( SfxItemSet& rAttrs ) sal_uInt16 nFieldUnit = (sal_uInt16)(sal_IntPtr)m_pLbMetric->GetEntryData( nMPos ); rAttrs.Put( SfxUInt16Item( GetWhich( SID_ATTR_METRIC ), (sal_uInt16)nFieldUnit ) ); - bModified |= sal_True; + bModified = true; } // tabulator space @@ -416,7 +416,7 @@ bool SdTpOptionsMisc::FillItemSet( SfxItemSet& rAttrs ) SfxMapUnit eUnit = rAttrs.GetPool()->GetMetric( nWh ); SfxUInt16Item aDef( nWh,(sal_uInt16)GetCoreValue( *m_pMtrFldTabstop, eUnit ) ); rAttrs.Put( aDef ); - bModified |= sal_True; + bModified = true; } sal_Int32 nX, nY; @@ -425,7 +425,7 @@ bool SdTpOptionsMisc::FillItemSet( SfxItemSet& rAttrs ) rAttrs.Put( SfxInt32Item( ATTR_OPTIONS_SCALE_X, nX ) ); rAttrs.Put( SfxInt32Item( ATTR_OPTIONS_SCALE_Y, nY ) ); - bModified = sal_True; + bModified = true; } return( bModified ); @@ -577,35 +577,35 @@ OUString SdTpOptionsMisc::GetScale( sal_Int32 nX, sal_Int32 nY ) -sal_Bool SdTpOptionsMisc::SetScale( const OUString& aScale, sal_Int32& rX, sal_Int32& rY ) +bool SdTpOptionsMisc::SetScale( const OUString& aScale, sal_Int32& rX, sal_Int32& rY ) { if( comphelper::string::getTokenCount(aScale, TOKEN) != 2 ) - return( sal_False ); + return false; OUString aTmp(aScale.getToken(0, TOKEN)); if (!comphelper::string::isdigitAsciiString(aTmp)) - return sal_False; + return false; rX = (long) aTmp.toInt32(); if( rX == 0 ) - return( sal_False ); + return false; aTmp = aScale.getToken(1, TOKEN); if (!comphelper::string::isdigitAsciiString(aTmp)) - return sal_False; + return false; rY = (long) aTmp.toInt32(); if( rY == 0 ) - return sal_False; + return false; - return sal_True; + return true; } void SdTpOptionsMisc::UpdateCompatibilityControls (void) { // Disable the compatibility controls by default. Enable them only when // there is at least one open document. - sal_Bool bIsEnabled = sal_False; + bool bIsEnabled = false; try { @@ -631,7 +631,7 @@ void SdTpOptionsMisc::UpdateCompatibilityControls (void) if (xModel.is()) { // There is at leas one model/document: Enable the compatibility controls. - bIsEnabled = sal_True; + bIsEnabled = true; break; } } diff --git a/sd/source/ui/dlg/vectdlg.cxx b/sd/source/ui/dlg/vectdlg.cxx index 6fdab807f8de..8026286bc483 100644 --- a/sd/source/ui/dlg/vectdlg.cxx +++ b/sd/source/ui/dlg/vectdlg.cxx @@ -303,19 +303,19 @@ void SdVectorizeDlg::LoadSettings() sal_uInt16 nLayers; sal_uInt16 nReduce; sal_uInt16 nFillHoles; - sal_Bool bFillHoles; + bool bFillHoles; if( xIStm.Is() ) { SdIOCompat aCompat( *xIStm, STREAM_READ ); - xIStm->ReadUInt16( nLayers ).ReadUInt16( nReduce ).ReadUInt16( nFillHoles ).ReadUChar( bFillHoles ); + xIStm->ReadUInt16( nLayers ).ReadUInt16( nReduce ).ReadUInt16( nFillHoles ).ReadCharAsBool( bFillHoles ); } else { nLayers = 8; nReduce = 0; nFillHoles = 32; - bFillHoles = sal_False; + bFillHoles = false; } m_pNmLayers->SetValue( nLayers ); diff --git a/sd/source/ui/docshell/docshel2.cxx b/sd/source/ui/docshell/docshel2.cxx index d16eef4e4a1a..3f97097fd14c 100644 --- a/sd/source/ui/docshell/docshel2.cxx +++ b/sd/source/ui/docshell/docshel2.cxx @@ -284,7 +284,7 @@ Bitmap DrawDocShell::GetPagePreviewBitmap(SdPage* pPage, sal_uInt16 nMaxEdgePixe * name. * @return sal_False if the user cancels the action. */ -sal_Bool DrawDocShell::CheckPageName (::Window* pWin, OUString& rName ) +bool DrawDocShell::CheckPageName (::Window* pWin, OUString& rName ) { const OUString aStrForDlg( rName ); bool bIsNameValid = IsNewPageNameValid( rName, true ); @@ -403,7 +403,7 @@ bool DrawDocShell::IsNewPageNameValid( OUString & rInOutPageName, bool bResetStr { if (!rInOutPageName.isEmpty()) { - sal_Bool bOutDummy; + bool bOutDummy; sal_uInt16 nExistingPageNum = mpDoc->GetPageByName( rInOutPageName, bOutDummy ); bCanUseNewName = ( nExistingPageNum == SDRPAGE_NOTFOUND ); } diff --git a/sd/source/ui/docshell/docshel3.cxx b/sd/source/ui/docshell/docshel3.cxx index cd45b39d2320..e03d55677e4d 100644 --- a/sd/source/ui/docshell/docshel3.cxx +++ b/sd/source/ui/docshell/docshel3.cxx @@ -257,7 +257,7 @@ void DrawDocShell::Execute( SfxRequest& rReq ) if( mpViewShell ) { rtl::Reference<FuPoor> aFunc( FuHangulHanjaConversion::Create( mpViewShell, mpViewShell->GetActiveWindow(), mpViewShell->GetView(), mpDoc, rReq ) ); - static_cast< FuHangulHanjaConversion* >( aFunc.get() )->StartConversion( LANGUAGE_KOREAN, LANGUAGE_KOREAN, NULL, i18n::TextConversionOption::CHARACTER_BY_CHARACTER, sal_True ); + static_cast< FuHangulHanjaConversion* >( aFunc.get() )->StartConversion( LANGUAGE_KOREAN, LANGUAGE_KOREAN, NULL, i18n::TextConversionOption::CHARACTER_BY_CHARACTER, true ); } } break; diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx index f929483077cc..b61aa4582ede 100644 --- a/sd/source/ui/docshell/docshel4.cxx +++ b/sd/source/ui/docshell/docshel4.cxx @@ -86,7 +86,7 @@ namespace sd { /** * Creates (if necessary) and returns a SfxPrinter */ -SfxPrinter* DrawDocShell::GetPrinter(sal_Bool bCreate) +SfxPrinter* DrawDocShell::GetPrinter(bool bCreate) { if (bCreate && !mpPrinter) { @@ -111,7 +111,7 @@ SfxPrinter* DrawDocShell::GetPrinter(sal_Bool bCreate) pSet->Put( aFlagItem ); mpPrinter = new SfxPrinter(pSet); - mbOwnPrinter = sal_True; + mbOwnPrinter = true; // set output quality sal_uInt16 nQuality = aPrintItem.GetOptionsPrint().GetOutputQuality(); @@ -151,7 +151,7 @@ void DrawDocShell::SetPrinter(SfxPrinter *pNewPrinter) } mpPrinter = pNewPrinter; - mbOwnPrinter = sal_True; + mbOwnPrinter = true; if ( mpDoc->GetPrinterIndependentLayout() == ::com::sun::star::document::PrinterIndependentLayout::DISABLED ) UpdateFontList(); UpdateRefDevice(); @@ -162,7 +162,7 @@ void DrawDocShell::UpdateFontList() delete mpFontList; OutputDevice* pRefDevice = NULL; if ( mpDoc->GetPrinterIndependentLayout() == ::com::sun::star::document::PrinterIndependentLayout::DISABLED ) - pRefDevice = GetPrinter(sal_True); + pRefDevice = GetPrinter(true); else pRefDevice = SD_MOD()->GetVirtualRefDevice(); mpFontList = new FontList( pRefDevice, NULL, false ); @@ -172,7 +172,7 @@ void DrawDocShell::UpdateFontList() Printer* DrawDocShell::GetDocumentPrinter() { - return GetPrinter(sal_False); + return GetPrinter(false); } void DrawDocShell::OnDocumentPrinterChanged(Printer* pNewPrinter) @@ -196,7 +196,7 @@ void DrawDocShell::OnDocumentPrinterChanged(Printer* pNewPrinter) SetPrinter((SfxPrinter*) pNewPrinter); // container owns printer - mbOwnPrinter = sal_False; + mbOwnPrinter = false; } } @@ -227,12 +227,12 @@ void DrawDocShell::UpdateRefDevice() } mpDoc->SetRefDevice( pRefDevice ); - ::sd::Outliner* pOutl = mpDoc->GetOutliner( sal_False ); + ::sd::Outliner* pOutl = mpDoc->GetOutliner( false ); if( pOutl ) pOutl->SetRefDevice( pRefDevice ); - ::sd::Outliner* pInternalOutl = mpDoc->GetInternalOutliner( sal_False ); + ::sd::Outliner* pInternalOutl = mpDoc->GetInternalOutliner( false ); if( pInternalOutl ) pInternalOutl->SetRefDevice( pRefDevice ); @@ -264,9 +264,9 @@ bool DrawDocShell::InitNew( const ::com::sun::star::uno::Reference< ::com::sun:: */ bool DrawDocShell::Load( SfxMedium& rMedium ) { - mbNewDocument = sal_False; + mbNewDocument = false; - sal_Bool bRet = sal_False; + bool bRet = false; bool bStartPresentation = false; ErrCode nError = ERRCODE_NONE; @@ -291,7 +291,7 @@ bool DrawDocShell::Load( SfxMedium& rMedium ) bRet = SfxObjectShell::Load( rMedium ); if( bRet ) { - bRet = SdXMLFilter( rMedium, *this, sal_True, SDXMLMODE_Normal, SotStorage::GetVersion( rMedium.GetStorage() ) ).Import( nError ); + bRet = SdXMLFilter( rMedium, *this, true, SDXMLMODE_Normal, SotStorage::GetVersion( rMedium.GetStorage() ) ).Import( nError ); } if( bRet ) @@ -343,7 +343,7 @@ bool DrawDocShell::Load( SfxMedium& rMedium ) */ bool DrawDocShell::LoadFrom( SfxMedium& rMedium ) { - mbNewDocument = sal_False; + mbNewDocument = false; WaitObject* pWait = NULL; if( mpViewShell ) @@ -355,7 +355,7 @@ bool DrawDocShell::LoadFrom( SfxMedium& rMedium ) // TODO/LATER: nobody is interested in the error code?! ErrCode nError = ERRCODE_NONE; - bool bRet = SdXMLFilter( rMedium, *this, sal_True, SDXMLMODE_Organizer, SotStorage::GetVersion( rMedium.GetStorage() ) ).Import( nError ); + bool bRet = SdXMLFilter( rMedium, *this, true, SDXMLMODE_Organizer, SotStorage::GetVersion( rMedium.GetStorage() ) ).Import( nError ); // tell SFX to change viewshell when in preview mode @@ -378,7 +378,7 @@ bool DrawDocShell::LoadFrom( SfxMedium& rMedium ) bool DrawDocShell::ImportFrom(SfxMedium &rMedium, uno::Reference<text::XTextRange> const& xInsertPosition) { - const sal_Bool bRet = SfxObjectShell::ImportFrom(rMedium, xInsertPosition); + const bool bRet = SfxObjectShell::ImportFrom(rMedium, xInsertPosition); SfxItemSet* pSet = rMedium.GetItemSet(); if( pSet ) @@ -406,7 +406,7 @@ bool DrawDocShell::ImportFrom(SfxMedium &rMedium, */ bool DrawDocShell::ConvertFrom( SfxMedium& rMedium ) { - mbNewDocument = sal_False; + mbNewDocument = false; const OUString aFilterName( rMedium.GetFilter()->GetFilterName() ); bool bRet = false; @@ -435,7 +435,7 @@ bool DrawDocShell::ConvertFrom( SfxMedium& rMedium ) || aFilterName == pFilterPowerPoint97AutoPlay) { mpDoc->StopWorkStartupDelay(); - bRet = SdPPTFilter( rMedium, *this, sal_True ).Import(); + bRet = SdPPTFilter( rMedium, *this, true ).Import(); } else if (aFilterName.indexOf("impress8") >= 0 || aFilterName.indexOf("draw8") >= 0) @@ -444,7 +444,7 @@ bool DrawDocShell::ConvertFrom( SfxMedium& rMedium ) mpDoc->CreateFirstPages(); mpDoc->StopWorkStartupDelay(); ErrCode nError = ERRCODE_NONE; - bRet = SdXMLFilter( rMedium, *this, sal_True ).Import( nError ); + bRet = SdXMLFilter( rMedium, *this, true ).Import( nError ); } else if (aFilterName.indexOf("StarOffice XML (Draw)") >= 0 || @@ -454,13 +454,13 @@ bool DrawDocShell::ConvertFrom( SfxMedium& rMedium ) mpDoc->CreateFirstPages(); mpDoc->StopWorkStartupDelay(); ErrCode nError = ERRCODE_NONE; - bRet = SdXMLFilter( rMedium, *this, sal_True, SDXMLMODE_Normal, SOFFICE_FILEFORMAT_60 ).Import( nError ); + bRet = SdXMLFilter( rMedium, *this, true, SDXMLMODE_Normal, SOFFICE_FILEFORMAT_60 ).Import( nError ); } else if( aFilterName.equals( "CGM - Computer Graphics Metafile" ) ) { mpDoc->CreateFirstPages(); mpDoc->StopWorkStartupDelay(); - bRet = SdCGMFilter( rMedium, *this, sal_True ).Import(); + bRet = SdCGMFilter( rMedium, *this, true ).Import(); } else { @@ -510,7 +510,7 @@ bool DrawDocShell::Save() // Call UpdateDocInfoForSave() before export UpdateDocInfoForSave(); - bRet = SdXMLFilter( *GetMedium(), *this, sal_True, SDXMLMODE_Normal, SotStorage::GetVersion( GetMedium()->GetStorage() ) ).Export(); + bRet = SdXMLFilter( *GetMedium(), *this, true, SDXMLMODE_Normal, SotStorage::GetVersion( GetMedium()->GetStorage() ) ).Export(); } return bRet; @@ -548,7 +548,7 @@ bool DrawDocShell::SaveAs( SfxMedium& rMedium ) { // Call UpdateDocInfoForSave() before export UpdateDocInfoForSave(); - bRet = SdXMLFilter( rMedium, *this, sal_True, SDXMLMODE_Normal, SotStorage::GetVersion( rMedium.GetStorage() ) ).Export(); + bRet = SdXMLFilter( rMedium, *this, true, SDXMLMODE_Normal, SotStorage::GetVersion( rMedium.GetStorage() ) ).Export(); } if( GetError() == ERRCODE_NONE ) @@ -572,27 +572,27 @@ bool DrawDocShell::ConvertTo( SfxMedium& rMedium ) if( aTypeName.indexOf( "graphic_HTML" ) >= 0 ) { - pFilter = new SdHTMLFilter( rMedium, *this, sal_True ); + pFilter = new SdHTMLFilter( rMedium, *this, true ); } else if( aTypeName.indexOf( "MS_PowerPoint_97" ) >= 0 ) { - pFilter = new SdPPTFilter( rMedium, *this, sal_True ); + pFilter = new SdPPTFilter( rMedium, *this, true ); ((SdPPTFilter*)pFilter)->PreSaveBasic(); } else if ( aTypeName.indexOf( "CGM_Computer_Graphics_Metafile" ) >= 0 ) { - pFilter = new SdCGMFilter( rMedium, *this, sal_True ); + pFilter = new SdCGMFilter( rMedium, *this, true ); } else if( aTypeName.indexOf( "draw8" ) >= 0 || aTypeName.indexOf( "impress8" ) >= 0 ) { - pFilter = new SdXMLFilter( rMedium, *this, sal_True ); + pFilter = new SdXMLFilter( rMedium, *this, true ); UpdateDocInfoForSave(); } else if( aTypeName.indexOf( "StarOffice_XML_Impress" ) >= 0 || aTypeName.indexOf( "StarOffice_XML_Draw" ) >= 0 ) { - pFilter = new SdXMLFilter( rMedium, *this, sal_True, SDXMLMODE_Normal, SOFFICE_FILEFORMAT_60 ); + pFilter = new SdXMLFilter( rMedium, *this, true, SDXMLMODE_Normal, SOFFICE_FILEFORMAT_60 ); UpdateDocInfoForSave(); } else @@ -627,7 +627,7 @@ bool DrawDocShell::SaveCompleted( const ::com::sun::star::uno::Reference< ::com: if( SfxObjectShell::SaveCompleted(xStorage) ) { - mpDoc->NbcSetChanged( sal_False ); + mpDoc->NbcSetChanged( false ); if( mpViewShell ) { @@ -668,16 +668,16 @@ SfxStyleSheetBasePool* DrawDocShell::GetStyleSheetPool() return( (SfxStyleSheetBasePool*) mpDoc->GetStyleSheetPool() ); } -sal_Bool DrawDocShell::GotoBookmark(const OUString& rBookmark) +bool DrawDocShell::GotoBookmark(const OUString& rBookmark) { - sal_Bool bFound = sal_False; + bool bFound = false; if (mpViewShell && mpViewShell->ISA(DrawViewShell)) { DrawViewShell* pDrawViewShell = static_cast<DrawViewShell*>(mpViewShell); ViewShellBase& rBase (mpViewShell->GetViewShellBase()); - sal_Bool bIsMasterPage = sal_False; + bool bIsMasterPage = false; sal_uInt16 nPageNumber = SDRPAGE_NOTFOUND; SdrObject* pObj = NULL; @@ -734,7 +734,7 @@ sal_Bool DrawDocShell::GotoBookmark(const OUString& rBookmark) { // Jump to the bookmarked page. This is done in three steps. - bFound = sal_True; + bFound = true; SdPage* pPage; if (bIsMasterPage) pPage = (SdPage*) mpDoc->GetMasterPage(nPageNumber); @@ -746,7 +746,7 @@ sal_Bool DrawDocShell::GotoBookmark(const OUString& rBookmark) PageKind eNewPageKind = pPage->GetPageKind(); if( (eNewPageKind != PK_STANDARD) && (mpDoc->GetDocumentType() == DOCUMENT_TYPE_DRAW) ) - return sal_False; + return false; if (eNewPageKind != pDrawViewShell->GetPageKind()) { @@ -846,11 +846,11 @@ sal_Bool DrawDocShell::GotoBookmark(const OUString& rBookmark) } //If object is marked , return true , else return false . -sal_Bool DrawDocShell::IsMarked( SdrObject* pObject ) +bool DrawDocShell::IsMarked( SdrObject* pObject ) { - sal_Bool bisMarked =sal_False; + bool bisMarked =false; - if (mpViewShell && mpViewShell->ISA(DrawViewShell)) + if (mpViewShell && mpViewShell->ISA(DrawViewShell)) { DrawViewShell* pDrViewSh = (DrawViewShell*) mpViewShell; if (pObject ) @@ -860,12 +860,13 @@ sal_Bool DrawDocShell::IsMarked( SdrObject* pObject ) } return bisMarked; } + //If object is marked , return true , else return false . -sal_Bool DrawDocShell::GetObjectIsmarked(const OUString& rBookmark) +bool DrawDocShell::GetObjectIsmarked(const OUString& rBookmark) { OSL_TRACE("GotoBookmark %s", OUStringToOString(rBookmark, RTL_TEXTENCODING_UTF8).getStr()); - sal_Bool bUnMark = sal_False; + bool bUnMark = false; if (mpViewShell && mpViewShell->ISA(DrawViewShell)) { @@ -877,8 +878,8 @@ sal_Bool DrawDocShell::GetObjectIsmarked(const OUString& rBookmark) aBookmark = rBookmark.copy( 1 ); // Ist das Bookmark eine Seite? - sal_Bool bIsMasterPage; - sal_uInt16 nPgNum = mpDoc->GetPageByName( aBookmark, bIsMasterPage ); + bool bIsMasterPage; + sal_uInt16 nPgNum = mpDoc->GetPageByName( aBookmark, bIsMasterPage ); SdrObject* pObj = NULL; if (nPgNum == SDRPAGE_NOTFOUND) @@ -967,11 +968,11 @@ sal_Bool DrawDocShell::GetObjectIsmarked(const OUString& rBookmark) return ( bUnMark); } //realize multi-selection of objects -sal_Bool DrawDocShell::GotoTreeBookmark(const OUString& rBookmark) +bool DrawDocShell::GotoTreeBookmark(const OUString& rBookmark) { OSL_TRACE("GotoBookmark %s", OUStringToOString(rBookmark, RTL_TEXTENCODING_UTF8).getStr()); - sal_Bool bFound = sal_False; + bool bFound = false; if (mpViewShell && mpViewShell->ISA(DrawViewShell)) { @@ -983,8 +984,8 @@ sal_Bool DrawDocShell::GotoTreeBookmark(const OUString& rBookmark) aBookmark = rBookmark.copy( 1 ); // Ist das Bookmark eine Seite? - sal_Bool bIsMasterPage; - sal_uInt16 nPgNum = mpDoc->GetPageByName( aBookmark, bIsMasterPage ); + bool bIsMasterPage; + sal_uInt16 nPgNum = mpDoc->GetPageByName( aBookmark, bIsMasterPage ); SdrObject* pObj = NULL; if (nPgNum == SDRPAGE_NOTFOUND) @@ -1003,7 +1004,7 @@ sal_Bool DrawDocShell::GotoTreeBookmark(const OUString& rBookmark) /********************************************************** * Zur Seite springen **********************************************************/ - bFound = sal_True; + bFound = true; SdPage* pPage = (SdPage*) mpDoc->GetPage(nPgNum); PageKind eNewPageKind = pPage->GetPageKind(); @@ -1062,7 +1063,7 @@ sal_Bool DrawDocShell::GotoTreeBookmark(const OUString& rBookmark) // Objekt einblenden und selektieren pDrViewSh->MakeVisible(pObj->GetLogicRect(), *pDrViewSh->GetActiveWindow()); - sal_Bool bUnMark = pDrViewSh->GetView()->IsObjMarked(pObj); + bool bUnMark = pDrViewSh->GetView()->IsObjMarked(pObj); pDrViewSh->GetView()->MarkObj(pObj, pDrViewSh->GetView()->GetSdrPageView(), bUnMark); } } @@ -1222,7 +1223,7 @@ const OUString DrawDocShell::getDocAccTitle() const return sRet; } -void DrawDocShell::setDocReadOnly( sal_Bool bReadOnly) +void DrawDocShell::setDocReadOnly( bool bReadOnly) { if (mpDoc ) { @@ -1230,14 +1231,14 @@ void DrawDocShell::setDocReadOnly( sal_Bool bReadOnly) } } -sal_Bool DrawDocShell::getDocReadOnly() const +bool DrawDocShell::getDocReadOnly() const { if (mpDoc) { return mpDoc->getDocReadOnly(); } - return sal_False; + return false; } } // end of namespace sd diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx index 7becd842e230..5750387505cd 100644 --- a/sd/source/ui/docshell/docshell.cxx +++ b/sd/source/ui/docshell/docshell.cxx @@ -95,7 +95,7 @@ SFX_IMPL_OBJECTFACTORY( void DrawDocShell::Construct( bool bClipboard ) { - mbInDestruction = sal_False; + mbInDestruction = false; SetSlotFilter(); // setzt Filter zurueck mbOwnDocument = mpDoc == 0; @@ -116,7 +116,7 @@ void DrawDocShell::Construct( bool bClipboard ) } DrawDocShell::DrawDocShell(SfxObjectCreateMode eMode, - sal_Bool bDataObject, + bool bDataObject, DocumentType eDocumentType) : SfxObjectShell( eMode == SFX_CREATE_MODE_INTERNAL ? SFX_CREATE_MODE_EMBEDDED : eMode), mpDoc(NULL), @@ -127,13 +127,13 @@ DrawDocShell::DrawDocShell(SfxObjectCreateMode eMode, meDocType(eDocumentType), mpFilterSIDs(0), mbSdDataObj(bDataObject), - mbOwnPrinter(sal_False), - mbNewDocument( sal_True ) + mbOwnPrinter(false), + mbNewDocument( true ) { Construct( eMode == SFX_CREATE_MODE_INTERNAL ); } -DrawDocShell::DrawDocShell( const sal_uInt64 nModelCreationFlags, sal_Bool bDataObject, DocumentType eDocumentType ) : +DrawDocShell::DrawDocShell( const sal_uInt64 nModelCreationFlags, bool bDataObject, DocumentType eDocumentType ) : SfxObjectShell( nModelCreationFlags ), mpDoc(NULL), mpUndoManager(NULL), @@ -143,14 +143,14 @@ DrawDocShell::DrawDocShell( const sal_uInt64 nModelCreationFlags, sal_Bool bData meDocType(eDocumentType), mpFilterSIDs(0), mbSdDataObj(bDataObject), - mbOwnPrinter(sal_False), - mbNewDocument( sal_True ) + mbOwnPrinter(false), + mbNewDocument( true ) { Construct( false ); } DrawDocShell::DrawDocShell(SdDrawDocument* pDoc, SfxObjectCreateMode eMode, - sal_Bool bDataObject, + bool bDataObject, DocumentType eDocumentType) : SfxObjectShell(eMode == SFX_CREATE_MODE_INTERNAL ? SFX_CREATE_MODE_EMBEDDED : eMode), mpDoc(pDoc), @@ -161,8 +161,8 @@ DrawDocShell::DrawDocShell(SdDrawDocument* pDoc, SfxObjectCreateMode eMode, meDocType(eDocumentType), mpFilterSIDs(0), mbSdDataObj(bDataObject), - mbOwnPrinter(sal_False), - mbNewDocument( sal_True ) + mbOwnPrinter(false), + mbNewDocument( true ) { Construct( eMode == SFX_CREATE_MODE_INTERNAL ); } @@ -175,7 +175,7 @@ DrawDocShell::~DrawDocShell() // may be useful in other places as well. Broadcast(SfxSimpleHint(SFX_HINT_DYING)); - mbInDestruction = sal_True; + mbInDestruction = true; SetDocShellFunction(0); @@ -225,7 +225,7 @@ void DrawDocShell::GetState(SfxItemSet &rSet) case SID_CLOSEDOC: { - sal_Bool bDisabled = sal_False; + bool bDisabled = false; if (bDisabled) { rSet.DisableItem(SID_CLOSEDOC); diff --git a/sd/source/ui/docshell/grdocsh.cxx b/sd/source/ui/docshell/grdocsh.cxx index 5a0b821addae..8f095f4cf1e8 100644 --- a/sd/source/ui/docshell/grdocsh.cxx +++ b/sd/source/ui/docshell/grdocsh.cxx @@ -54,7 +54,7 @@ void GraphicDocShell::InitInterface_Impl() SFX_IMPL_OBJECTFACTORY( GraphicDocShell, SvGlobalName(SO3_SDRAW_CLASSID_60), SFXOBJECTSHELL_STD_NORMAL, "sdraw" ) GraphicDocShell::GraphicDocShell(SfxObjectCreateMode eMode, - sal_Bool bDataObject, + bool bDataObject, DocumentType eDocType) : DrawDocShell(eMode, bDataObject, eDocType) { @@ -62,7 +62,7 @@ GraphicDocShell::GraphicDocShell(SfxObjectCreateMode eMode, } GraphicDocShell::GraphicDocShell(const sal_uInt64 nModelCreationFlags, - sal_Bool bDataObject, + bool bDataObject, DocumentType eDocType) : DrawDocShell(nModelCreationFlags, bDataObject, eDocType) { diff --git a/sd/source/ui/docshell/sdclient.cxx b/sd/source/ui/docshell/sdclient.cxx index abda2f4eb764..c75be23db533 100644 --- a/sd/source/ui/docshell/sdclient.cxx +++ b/sd/source/ui/docshell/sdclient.cxx @@ -63,8 +63,8 @@ void Client::RequestNewObjectArea( Rectangle& aObjRect ) { ::sd::View* pView = mpViewShell->GetView(); - sal_Bool bSizeProtect = sal_False; - sal_Bool bPosProtect = sal_False; + bool bSizeProtect = false; + bool bPosProtect = false; const SdrMarkList& rMarkList = pView->GetMarkedObjectList(); if (rMarkList.GetMarkCount() == 1) diff --git a/sd/source/ui/framework/factories/ViewShellWrapper.cxx b/sd/source/ui/framework/factories/ViewShellWrapper.cxx index 51c943e198f8..f4842cb3f4ee 100644 --- a/sd/source/ui/framework/factories/ViewShellWrapper.cxx +++ b/sd/source/ui/framework/factories/ViewShellWrapper.cxx @@ -218,7 +218,7 @@ sal_Bool SAL_CALL ViewShellWrapper::relocateToAnchor ( const Reference<XResource>& xResource) throw (RuntimeException, std::exception) { - sal_Bool bResult (false); + bool bResult (false); Reference<XPane> xPane (xResource, UNO_QUERY); if (xPane.is()) @@ -234,7 +234,7 @@ sal_Bool SAL_CALL ViewShellWrapper::relocateToAnchor ( ::Window* pWindow = VCLUnoHelper::GetWindow(xPane->getWindow()); if (pWindow != NULL && mpViewShell->RelocateToParentWindow(pWindow)) { - bResult = sal_True; + bResult = true; // Attach to the window of the new pane. xWindow = Reference<awt::XWindow>(xPane->getWindow(), UNO_QUERY); diff --git a/sd/source/ui/framework/module/ResourceManager.cxx b/sd/source/ui/framework/module/ResourceManager.cxx index 9c780e0b6821..82e7588aa2b1 100644 --- a/sd/source/ui/framework/module/ResourceManager.cxx +++ b/sd/source/ui/framework/module/ResourceManager.cxx @@ -103,7 +103,7 @@ void ResourceManager::AddActiveMainView ( mpActiveMainViewContainer->insert(rsMainViewURL); } -sal_Bool ResourceManager::IsResourceActive ( +bool ResourceManager::IsResourceActive ( const OUString& rsMainViewURL) { return (mpActiveMainViewContainer->find(rsMainViewURL) != mpActiveMainViewContainer->end()); diff --git a/sd/source/ui/framework/module/ResourceManager.hxx b/sd/source/ui/framework/module/ResourceManager.hxx index 4c818dd5a666..b7a321b3d73f 100644 --- a/sd/source/ui/framework/module/ResourceManager.hxx +++ b/sd/source/ui/framework/module/ResourceManager.hxx @@ -60,7 +60,7 @@ public: activate the resource managed by the called object. */ void AddActiveMainView (const OUString& rsMainViewURL); - sal_Bool IsResourceActive (const OUString& rsMainViewURL); + bool IsResourceActive (const OUString& rsMainViewURL); virtual void SaveResourceState (void); virtual void SAL_CALL disposing (void) SAL_OVERRIDE; diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx index 2fde69849f67..8c6fd275ff04 100644 --- a/sd/source/ui/framework/tools/FrameworkHelper.cxx +++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx @@ -612,7 +612,7 @@ void FrameworkHelper::HandleModeChangeSlot ( sal_uLong nSlotId, SfxRequest& rRequest) { - sal_Bool bIsActive = sal_True; + bool bIsActive = true; if ( ! mxConfigurationController.is()) return; diff --git a/sd/source/ui/func/fubullet.cxx b/sd/source/ui/func/fubullet.cxx index caa7043ef759..95e9e913a459 100644 --- a/sd/source/ui/func/fubullet.cxx +++ b/sd/source/ui/func/fubullet.cxx @@ -307,7 +307,7 @@ void FuBullet::GetSlotState( SfxItemSet& rSet, ViewShell* pViewShell, SfxViewFra const bool bTextEdit = pOLV; SvtCTLOptions aCTLOptions; - const sal_Bool bCtlEnabled = aCTLOptions.IsCTLFontEnabled(); + const bool bCtlEnabled = aCTLOptions.IsCTLFontEnabled(); if(!bTextEdit ) { diff --git a/sd/source/ui/func/fucon3d.cxx b/sd/source/ui/func/fucon3d.cxx index de697f83778a..c77d680ff1af 100644 --- a/sd/source/ui/func/fucon3d.cxx +++ b/sd/source/ui/func/fucon3d.cxx @@ -300,9 +300,9 @@ void FuConstruct3dObject::ImpPrepareBasic3DShape(E3dCompoundObject* p3DObj, E3dS pScene->SetMergedItemSetAndBroadcast(aAttr); } -sal_Bool FuConstruct3dObject::MouseButtonDown(const MouseEvent& rMEvt) +bool FuConstruct3dObject::MouseButtonDown(const MouseEvent& rMEvt) { - sal_Bool bReturn = FuConstruct::MouseButtonDown(rMEvt); + bool bReturn = FuConstruct::MouseButtonDown(rMEvt); if ( rMEvt.IsLeft() && !mpView->IsAction() ) { @@ -339,20 +339,20 @@ sal_Bool FuConstruct3dObject::MouseButtonDown(const MouseEvent& rMEvt) } -sal_Bool FuConstruct3dObject::MouseMove(const MouseEvent& rMEvt) +bool FuConstruct3dObject::MouseMove(const MouseEvent& rMEvt) { return FuConstruct::MouseMove(rMEvt); } -sal_Bool FuConstruct3dObject::MouseButtonUp(const MouseEvent& rMEvt) +bool FuConstruct3dObject::MouseButtonUp(const MouseEvent& rMEvt) { - sal_Bool bReturn = sal_False; + bool bReturn = false; if ( mpView->IsCreateObj() && rMEvt.IsLeft() ) { mpView->EndCreateObj(SDRCREATE_FORCEEND); - bReturn = sal_True; + bReturn = true; } bReturn = FuConstruct::MouseButtonUp(rMEvt) || bReturn; @@ -367,9 +367,9 @@ sal_Bool FuConstruct3dObject::MouseButtonUp(const MouseEvent& rMEvt) * Process keyboard input * @returns sal_True if a KeyEvent is being processed, sal_False otherwise */ -sal_Bool FuConstruct3dObject::KeyInput(const KeyEvent& rKEvt) +bool FuConstruct3dObject::KeyInput(const KeyEvent& rKEvt) { - return( FuConstruct::KeyInput(rKEvt) ); + return FuConstruct::KeyInput(rKEvt); } diff --git a/sd/source/ui/func/fuconarc.cxx b/sd/source/ui/func/fuconarc.cxx index fc7808abade8..ca77fbe122d8 100644 --- a/sd/source/ui/func/fuconarc.cxx +++ b/sd/source/ui/func/fuconarc.cxx @@ -104,9 +104,9 @@ void FuConstructArc::DoExecute( SfxRequest& rReq ) } -sal_Bool FuConstructArc::MouseButtonDown( const MouseEvent& rMEvt ) +bool FuConstructArc::MouseButtonDown( const MouseEvent& rMEvt ) { - sal_Bool bReturn = FuConstruct::MouseButtonDown( rMEvt ); + bool bReturn = FuConstruct::MouseButtonDown( rMEvt ); if ( rMEvt.IsLeft() && !mpView->IsAction() ) { @@ -125,22 +125,22 @@ sal_Bool FuConstructArc::MouseButtonDown( const MouseEvent& rMEvt ) pObj->SetMergedItemSet(aAttr); } - bReturn = sal_True; + bReturn = true; } return bReturn; } -sal_Bool FuConstructArc::MouseMove( const MouseEvent& rMEvt ) +bool FuConstructArc::MouseMove( const MouseEvent& rMEvt ) { return FuConstruct::MouseMove(rMEvt); } -sal_Bool FuConstructArc::MouseButtonUp( const MouseEvent& rMEvt ) +bool FuConstructArc::MouseButtonUp( const MouseEvent& rMEvt ) { - sal_Bool bReturn = sal_False; - sal_Bool bCreated = sal_False; + bool bReturn = false; + bool bCreated = false; if ( mpView->IsCreateObj() && rMEvt.IsLeft() ) { @@ -150,11 +150,11 @@ sal_Bool FuConstructArc::MouseButtonUp( const MouseEvent& rMEvt ) { if (nCount != mpView->GetSdrPageView()->GetObjList()->GetObjCount()) { - bCreated = sal_True; + bCreated = true; } } - bReturn = sal_True; + bReturn = true; } bReturn = FuConstruct::MouseButtonUp (rMEvt) || bReturn; @@ -169,10 +169,9 @@ sal_Bool FuConstructArc::MouseButtonUp( const MouseEvent& rMEvt ) * Process keyboard input * @returns sal_True if a KeyEvent is being processed, sal_False otherwise */ -sal_Bool FuConstructArc::KeyInput(const KeyEvent& rKEvt) +bool FuConstructArc::KeyInput(const KeyEvent& rKEvt) { - sal_Bool bReturn = FuConstruct::KeyInput(rKEvt); - return(bReturn); + return FuConstruct::KeyInput(rKEvt); } diff --git a/sd/source/ui/func/fuconbez.cxx b/sd/source/ui/func/fuconbez.cxx index 59b6f057d09d..b61fc5d2ca4e 100644 --- a/sd/source/ui/func/fuconbez.cxx +++ b/sd/source/ui/func/fuconbez.cxx @@ -89,9 +89,9 @@ void FuConstructBezierPolygon::DoExecute( SfxRequest& rReq ) } -sal_Bool FuConstructBezierPolygon::MouseButtonDown(const MouseEvent& rMEvt) +bool FuConstructBezierPolygon::MouseButtonDown(const MouseEvent& rMEvt) { - sal_Bool bReturn = FuConstruct::MouseButtonDown(rMEvt); + bool bReturn = FuConstruct::MouseButtonDown(rMEvt); SdrViewEvent aVEvt; SdrHitKind eHit = mpView->PickAnything(rMEvt, SDRMOUSEBUTTONDOWN, aVEvt); @@ -139,17 +139,16 @@ sal_Bool FuConstructBezierPolygon::MouseButtonDown(const MouseEvent& rMEvt) } -sal_Bool FuConstructBezierPolygon::MouseMove(const MouseEvent& rMEvt) +bool FuConstructBezierPolygon::MouseMove(const MouseEvent& rMEvt) { - sal_Bool bReturn = FuConstruct::MouseMove(rMEvt); - return(bReturn); + return FuConstruct::MouseMove(rMEvt); } -sal_Bool FuConstructBezierPolygon::MouseButtonUp(const MouseEvent& rMEvt ) +bool FuConstructBezierPolygon::MouseButtonUp(const MouseEvent& rMEvt ) { - sal_Bool bReturn = sal_False; - sal_Bool bCreated = sal_False; + bool bReturn = false; + bool bCreated = false; SdrViewEvent aVEvt; mpView->PickAnything(rMEvt, SDRMOUSEBUTTONUP, aVEvt); @@ -167,15 +166,15 @@ sal_Bool FuConstructBezierPolygon::MouseButtonUp(const MouseEvent& rMEvt ) if (aVEvt.eEvent == SDREVENT_ENDCREATE) { - bReturn = sal_True; + bReturn = true; if (nCount == (mpView->GetSdrPageView()->GetObjList()->GetObjCount() - 1)) { - bCreated = sal_True; + bCreated = true; } // trick to suppress FuDraw::DoubleClick - bMBDown = sal_False; + bMBDown = false; } @@ -228,11 +227,9 @@ sal_Bool FuConstructBezierPolygon::MouseButtonUp(const MouseEvent& rMEvt ) * Process keyboard input * @returns sal_True if a KeyEvent is being processed, sal_False otherwise */ -sal_Bool FuConstructBezierPolygon::KeyInput(const KeyEvent& rKEvt) +bool FuConstructBezierPolygon::KeyInput(const KeyEvent& rKEvt) { - sal_Bool bReturn = FuConstruct::KeyInput(rKEvt); - - return(bReturn); + return FuConstruct::KeyInput(rKEvt); } diff --git a/sd/source/ui/func/fuconcs.cxx b/sd/source/ui/func/fuconcs.cxx index c782b6c67ef1..cea7ea815b4d 100644 --- a/sd/source/ui/func/fuconcs.cxx +++ b/sd/source/ui/func/fuconcs.cxx @@ -110,9 +110,9 @@ void FuConstructCustomShape::DoExecute( SfxRequest& rReq ) } -sal_Bool FuConstructCustomShape::MouseButtonDown(const MouseEvent& rMEvt) +bool FuConstructCustomShape::MouseButtonDown(const MouseEvent& rMEvt) { - sal_Bool bReturn = FuConstruct::MouseButtonDown(rMEvt); + bool bReturn = FuConstruct::MouseButtonDown(rMEvt); if ( rMEvt.IsLeft() && !mpView->IsAction() ) { @@ -127,12 +127,12 @@ sal_Bool FuConstructCustomShape::MouseButtonDown(const MouseEvent& rMEvt) if ( pObj ) { SetAttributes( pObj ); - sal_Bool bForceFillStyle = sal_True; - sal_Bool bForceNoFillStyle = sal_False; + bool bForceFillStyle = true; + bool bForceNoFillStyle = false; if ( ((SdrObjCustomShape*)pObj)->UseNoFillStyle() ) { - bForceFillStyle = sal_False; - bForceNoFillStyle = sal_True; + bForceFillStyle = false; + bForceNoFillStyle = true; } SfxItemSet aAttr(mpDoc->GetPool()); SetStyleSheet( aAttr, pObj, bForceFillStyle, bForceNoFillStyle ); @@ -144,22 +144,22 @@ sal_Bool FuConstructCustomShape::MouseButtonDown(const MouseEvent& rMEvt) } -sal_Bool FuConstructCustomShape::MouseMove(const MouseEvent& rMEvt) +bool FuConstructCustomShape::MouseMove(const MouseEvent& rMEvt) { return FuConstruct::MouseMove(rMEvt); } -sal_Bool FuConstructCustomShape::MouseButtonUp(const MouseEvent& rMEvt) +bool FuConstructCustomShape::MouseButtonUp(const MouseEvent& rMEvt) { - sal_Bool bReturn(sal_False); + bool bReturn(false); if(mpView->IsCreateObj() && rMEvt.IsLeft()) { SdrObject* pObj = mpView->GetCreateObj(); if( pObj && mpView->EndCreateObj( SDRCREATE_FORCEEND ) ) { - bReturn = sal_True; + bReturn = true; } } bReturn = FuConstruct::MouseButtonUp (rMEvt) || bReturn; @@ -174,10 +174,9 @@ sal_Bool FuConstructCustomShape::MouseButtonUp(const MouseEvent& rMEvt) * Process keyboard input * @returns sal_True if a KeyEvent is being processed, sal_False otherwise */ -sal_Bool FuConstructCustomShape::KeyInput(const KeyEvent& rKEvt) +bool FuConstructCustomShape::KeyInput(const KeyEvent& rKEvt) { - sal_Bool bReturn = FuConstruct::KeyInput(rKEvt); - return(bReturn); + return FuConstruct::KeyInput(rKEvt); } @@ -192,7 +191,7 @@ void FuConstructCustomShape::Activate() */ void FuConstructCustomShape::SetAttributes( SdrObject* pObj ) { - sal_Bool bAttributesAppliedFromGallery = sal_False; + bool bAttributesAppliedFromGallery = false; if ( GalleryExplorer::GetSdrObjCount( GALLERY_THEME_POWERPOINT ) ) { @@ -238,7 +237,7 @@ void FuConstructCustomShape::SetAttributes( SdrObject* pObj ) double a = nAngle * F_PI18000; pObj->NbcRotate( pObj->GetSnapRect().Center(), nAngle, sin( a ), cos( a ) ); } - bAttributesAppliedFromGallery = sal_True; + bAttributesAppliedFromGallery = true; /* diff --git a/sd/source/ui/func/fuconrec.cxx b/sd/source/ui/func/fuconrec.cxx index 6c04adeeb0f0..d7c051a9c5d4 100644 --- a/sd/source/ui/func/fuconrec.cxx +++ b/sd/source/ui/func/fuconrec.cxx @@ -181,9 +181,9 @@ void FuConstructRectangle::DoExecute( SfxRequest& rReq ) } -sal_Bool FuConstructRectangle::MouseButtonDown(const MouseEvent& rMEvt) +bool FuConstructRectangle::MouseButtonDown(const MouseEvent& rMEvt) { - sal_Bool bReturn = FuConstruct::MouseButtonDown(rMEvt); + bool bReturn = FuConstruct::MouseButtonDown(rMEvt); if ( rMEvt.IsLeft() && !mpView->IsAction() ) { @@ -221,15 +221,15 @@ sal_Bool FuConstructRectangle::MouseButtonDown(const MouseEvent& rMEvt) } -sal_Bool FuConstructRectangle::MouseMove(const MouseEvent& rMEvt) +bool FuConstructRectangle::MouseMove(const MouseEvent& rMEvt) { return FuConstruct::MouseMove(rMEvt); } -sal_Bool FuConstructRectangle::MouseButtonUp(const MouseEvent& rMEvt) +bool FuConstructRectangle::MouseButtonUp(const MouseEvent& rMEvt) { - sal_Bool bReturn(sal_False); + bool bReturn(false); if(mpView->IsCreateObj() && rMEvt.IsLeft()) { @@ -261,7 +261,7 @@ sal_Bool FuConstructRectangle::MouseButtonUp(const MouseEvent& rMEvt) pObj->SetMergedItemSet(aSet); } - bReturn = sal_True; + bReturn = true; } } @@ -277,10 +277,9 @@ sal_Bool FuConstructRectangle::MouseButtonUp(const MouseEvent& rMEvt) * Process keyboard input * @returns sal_True if a KeyEvent is being processed, sal_False otherwise */ -sal_Bool FuConstructRectangle::KeyInput(const KeyEvent& rKEvt) +bool FuConstructRectangle::KeyInput(const KeyEvent& rKEvt) { - sal_Bool bReturn = FuConstruct::KeyInput(rKEvt); - return(bReturn); + return FuConstruct::KeyInput(rKEvt); } @@ -905,7 +904,7 @@ SdrObject* FuConstructRectangle::CreateDefaultObject(const sal_uInt16 nID, const { if(pObj->ISA(SdrCaptionObj)) { - sal_Bool bIsVertical(SID_DRAW_CAPTION_VERTICAL == nID); + bool bIsVertical(SID_DRAW_CAPTION_VERTICAL == nID); ((SdrTextObj*)pObj)->SetVerticalWriting(bIsVertical); diff --git a/sd/source/ui/func/fuconstr.cxx b/sd/source/ui/func/fuconstr.cxx index e8d5450bf63c..fe39c1d81e1c 100644 --- a/sd/source/ui/func/fuconstr.cxx +++ b/sd/source/ui/func/fuconstr.cxx @@ -63,19 +63,19 @@ void FuConstruct::DoExecute( SfxRequest& rReq ) } -sal_Bool FuConstruct::MouseButtonDown(const MouseEvent& rMEvt) +bool FuConstruct::MouseButtonDown(const MouseEvent& rMEvt) { - sal_Bool bReturn = FuDraw::MouseButtonDown(rMEvt); + bool bReturn = FuDraw::MouseButtonDown(rMEvt); - bMBDown = sal_True; + bMBDown = true; bSelectionChanged = false; if ( mpView->IsAction() ) { - return sal_True; + return true; } - bFirstMouseMove = sal_True; + bFirstMouseMove = true; aDragTimer.Start(); aMDPos = mpWindow->PixelToLogic( rMEvt.GetPosPixel() ); @@ -91,12 +91,12 @@ sal_Bool FuConstruct::MouseButtonDown(const MouseEvent& rMEvt) { sal_uInt16 nDrgLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); mpView->BegDragObj(aMDPos, (OutputDevice*) NULL, pHdl, nDrgLog); - bReturn = sal_True; + bReturn = true; } else if ( mpView->AreObjectsMarked() ) { mpView->UnmarkAll(); - bReturn = sal_True; + bReturn = true; } } @@ -104,14 +104,14 @@ sal_Bool FuConstruct::MouseButtonDown(const MouseEvent& rMEvt) } -sal_Bool FuConstruct::MouseMove(const MouseEvent& rMEvt) +bool FuConstruct::MouseMove(const MouseEvent& rMEvt) { FuDraw::MouseMove(rMEvt); if (aDragTimer.IsActive() ) { if( bFirstMouseMove ) - bFirstMouseMove = sal_False; + bFirstMouseMove = false; else aDragTimer.Stop(); } @@ -125,18 +125,18 @@ sal_Bool FuConstruct::MouseMove(const MouseEvent& rMEvt) mpView->MovAction(aPnt); } - return sal_True; + return true; } -sal_Bool FuConstruct::MouseButtonUp(const MouseEvent& rMEvt) +bool FuConstruct::MouseButtonUp(const MouseEvent& rMEvt) { - sal_Bool bReturn = sal_True; + bool bReturn = true; if (aDragTimer.IsActive() ) { aDragTimer.Stop(); - bIsInDragMode = sal_False; + bIsInDragMode = false; } FuDraw::MouseButtonUp(rMEvt); @@ -146,11 +146,11 @@ sal_Bool FuConstruct::MouseButtonUp(const MouseEvent& rMEvt) if ( mpView && mpView->IsDragObj() ) { FrameView* pFrameView = mpViewShell->GetFrameView(); - sal_Bool bDragWithCopy = (rMEvt.IsMod1() && pFrameView->IsDragWithCopy()); + bool bDragWithCopy = (rMEvt.IsMod1() && pFrameView->IsDragWithCopy()); if (bDragWithCopy) { - bDragWithCopy = !mpView->IsPresObjSelected(sal_False, sal_True); + bDragWithCopy = !mpView->IsPresObjSelected(false, true); } mpView->SetDragWithCopy(bDragWithCopy); @@ -162,7 +162,7 @@ sal_Bool FuConstruct::MouseButtonUp(const MouseEvent& rMEvt) } else { - bReturn = sal_False; + bReturn = false; } if ( mpView && !mpView->IsAction() ) @@ -217,7 +217,7 @@ sal_Bool FuConstruct::MouseButtonUp(const MouseEvent& rMEvt) { DoubleClick(rMEvt); } - bMBDown = sal_False; + bMBDown = false; return bReturn; } @@ -226,9 +226,9 @@ sal_Bool FuConstruct::MouseButtonUp(const MouseEvent& rMEvt) * Process keyboard input * @returns sal_True if a KeyEvent is being processed, sal_False otherwise */ -sal_Bool FuConstruct::KeyInput(const KeyEvent& rKEvt) +bool FuConstruct::KeyInput(const KeyEvent& rKEvt) { - sal_Bool bReturn = sal_False; + bool bReturn = false; if ( !bReturn ) bReturn = FuDraw::KeyInput(rKEvt); @@ -255,8 +255,8 @@ void FuConstruct::Deactivate() */ void FuConstruct::SetStyleSheet(SfxItemSet& rAttr, SdrObject* pObj) { - sal_Bool bUseFillStyle, bUseNoFillStyle; - bUseFillStyle = bUseNoFillStyle = sal_False; + bool bUseFillStyle, bUseNoFillStyle; + bUseFillStyle = bUseNoFillStyle = false; switch( nSlotId ) { @@ -275,7 +275,7 @@ void FuConstruct::SetStyleSheet(SfxItemSet& rAttr, SdrObject* pObj) case SID_DRAW_FREELINE: case SID_DRAW_BEZIER_FILL: { - bUseFillStyle = sal_True; + bUseFillStyle = true; break; } case SID_DRAW_RECT_NOFILL: @@ -323,7 +323,7 @@ void FuConstruct::SetStyleSheet(SfxItemSet& rAttr, SdrObject* pObj) case SID_DRAW_BEZIER_NOFILL: case SID_LINE_ARROW_END: { - bUseNoFillStyle = sal_True; + bUseNoFillStyle = true; break; } } @@ -331,7 +331,7 @@ void FuConstruct::SetStyleSheet(SfxItemSet& rAttr, SdrObject* pObj) } void FuConstruct::SetStyleSheet( SfxItemSet& rAttr, SdrObject* pObj, - const sal_Bool bForceFillStyle, const sal_Bool bForceNoFillStyle ) + const bool bForceFillStyle, const bool bForceNoFillStyle ) { SdPage* pPage = (SdPage*)mpView->GetSdrPageView()->GetPage(); if ( pPage->IsMasterPage() && pPage->GetPageKind() == PK_STANDARD && diff --git a/sd/source/ui/func/fuconuno.cxx b/sd/source/ui/func/fuconuno.cxx index a3de537a6530..13892f1aad16 100644 --- a/sd/source/ui/func/fuconuno.cxx +++ b/sd/source/ui/func/fuconuno.cxx @@ -83,9 +83,9 @@ void FuConstructUnoControl::DoExecute( SfxRequest& rReq ) ToolBarManager::msDrawingObjectToolBar); } -sal_Bool FuConstructUnoControl::MouseButtonDown(const MouseEvent& rMEvt) +bool FuConstructUnoControl::MouseButtonDown(const MouseEvent& rMEvt) { - sal_Bool bReturn = FuConstruct::MouseButtonDown(rMEvt); + bool bReturn = FuConstruct::MouseButtonDown(rMEvt); if ( rMEvt.IsLeft() && !mpView->IsAction() ) { @@ -93,24 +93,24 @@ sal_Bool FuConstructUnoControl::MouseButtonDown(const MouseEvent& rMEvt) mpWindow->CaptureMouse(); sal_uInt16 nDrgLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); mpView->BegCreateObj(aPnt, (OutputDevice*) NULL, nDrgLog); - bReturn = sal_True; + bReturn = true; } return bReturn; } -sal_Bool FuConstructUnoControl::MouseMove(const MouseEvent& rMEvt) +bool FuConstructUnoControl::MouseMove(const MouseEvent& rMEvt) { return FuConstruct::MouseMove(rMEvt); } -sal_Bool FuConstructUnoControl::MouseButtonUp(const MouseEvent& rMEvt) +bool FuConstructUnoControl::MouseButtonUp(const MouseEvent& rMEvt) { - sal_Bool bReturn = sal_False; + bool bReturn = false; if ( mpView->IsCreateObj() && rMEvt.IsLeft() ) { mpView->EndCreateObj(SDRCREATE_FORCEEND); - bReturn = sal_True; + bReturn = true; } bReturn = (FuConstruct::MouseButtonUp(rMEvt) || bReturn); @@ -125,10 +125,9 @@ sal_Bool FuConstructUnoControl::MouseButtonUp(const MouseEvent& rMEvt) * Process keyboard input * @returns sal_True if a KeyEvent is being processed, sal_False otherwise */ -sal_Bool FuConstructUnoControl::KeyInput(const KeyEvent& rKEvt) +bool FuConstructUnoControl::KeyInput(const KeyEvent& rKEvt) { - sal_Bool bReturn = FuConstruct::KeyInput(rKEvt); - return(bReturn); + return FuConstruct::KeyInput(rKEvt); } void FuConstructUnoControl::Activate() diff --git a/sd/source/ui/func/fucopy.cxx b/sd/source/ui/func/fucopy.cxx index d2453fcf022d..02d194f33a9e 100644 --- a/sd/source/ui/func/fucopy.cxx +++ b/sd/source/ui/func/fucopy.cxx @@ -128,7 +128,7 @@ void FuCopy::DoExecute( SfxRequest& rReq ) sal_Int32 lWidth = 0, lHeight = 0, lSizeX = 0L, lSizeY = 0L, lAngle = 0L; sal_uInt16 nNumber = 0; Color aStartColor, aEndColor; - sal_Bool bColor = sal_False; + bool bColor = false; const SfxPoolItem* pPoolItem = NULL; // Count @@ -153,22 +153,22 @@ void FuCopy::DoExecute( SfxRequest& rReq ) if( SFX_ITEM_SET == pArgs->GetItemState( ATTR_COPY_START_COLOR, true, &pPoolItem ) ) { aStartColor = ( ( const XColorItem* ) pPoolItem )->GetColorValue(); - bColor = sal_True; + bColor = true; } if( SFX_ITEM_SET == pArgs->GetItemState( ATTR_COPY_END_COLOR, true, &pPoolItem ) ) { aEndColor = ( ( const XColorItem* ) pPoolItem )->GetColorValue(); if( aStartColor == aEndColor ) - bColor = sal_False; + bColor = false; } else - bColor = sal_False; + bColor = false; // remove handles //HMHmpView->HideMarkHdl(); SfxProgress* pProgress = NULL; - sal_Bool bWaiting = sal_False; + bool bWaiting = false; if( nNumber > 1 ) { @@ -177,7 +177,7 @@ void FuCopy::DoExecute( SfxRequest& rReq ) pProgress = new SfxProgress( mpDocSh, aStr, nNumber ); mpDocSh->SetWaitCursor( true ); - bWaiting = sal_True; + bWaiting = true; } const SdrMarkList aMarkList( mpView->GetMarkedObjectList() ); diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx index f8b7e8ae3794..fdc6ea1f3219 100644 --- a/sd/source/ui/func/fudraw.cxx +++ b/sd/source/ui/func/fudraw.cxx @@ -76,10 +76,10 @@ TYPEINIT1( FuDraw, FuPoor ); FuDraw::FuDraw(ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq) : FuPoor(pViewSh, pWin, pView, pDoc, rReq) - , bMBDown(sal_False) - , bDragHelpLine(sal_False) + , bMBDown(false) + , bDragHelpLine(false) , nHelpLine(0) - , bPermanent(sal_False) + , bPermanent(false) { } @@ -88,14 +88,14 @@ FuDraw::~FuDraw() mpView->BrkAction(); } -sal_Bool FuDraw::MouseButtonDown(const MouseEvent& rMEvt) +bool FuDraw::MouseButtonDown(const MouseEvent& rMEvt) { // remember button state for creation of own MouseEvents SetMouseButtonCode(rMEvt.GetButtons()); - sal_Bool bReturn = sal_False; + bool bReturn = false; - bDragHelpLine = sal_False; + bDragHelpLine = false; aMDPos = mpWindow->PixelToLogic( rMEvt.GetPosPixel() ); @@ -105,7 +105,7 @@ sal_Bool FuDraw::MouseButtonDown(const MouseEvent& rMEvt) bool bOrtho = false; - sal_Bool bRestricted = sal_True; + bool bRestricted = true; if (mpView->IsDragObj()) { @@ -115,7 +115,7 @@ sal_Bool FuDraw::MouseButtonDown(const MouseEvent& rMEvt) if (!pHdl || (!pHdl->IsCornerHdl() && !pHdl->IsVertexHdl())) { // Move - bRestricted = sal_False; + bRestricted = false; } } @@ -192,10 +192,10 @@ sal_Bool FuDraw::MouseButtonDown(const MouseEvent& rMEvt) sal_uInt16 nHitLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() ); // look only for HelpLines when they are visible (!) - sal_Bool bHelpLine(sal_False); + bool bHelpLine(false); if(mpView->IsHlplVisible()) bHelpLine = mpView->PickHelpLine(aMDPos, nHitLog, *mpWindow, nHelpLine, pPV); - sal_Bool bHitHdl = (mpView->PickHandle(aMDPos) != NULL); + bool bHitHdl = (mpView->PickHandle(aMDPos) != NULL); if ( bHelpLine && !mpView->IsCreateObj() @@ -204,7 +204,7 @@ sal_Bool FuDraw::MouseButtonDown(const MouseEvent& rMEvt) mpWindow->CaptureMouse(); mpView->BegDragHelpLine(nHelpLine, pPV); bDragHelpLine = mpView->IsDragHelpLine(); - bReturn = sal_True; + bReturn = true; } } ForcePointer(&rMEvt); @@ -213,14 +213,14 @@ sal_Bool FuDraw::MouseButtonDown(const MouseEvent& rMEvt) } -sal_Bool FuDraw::MouseMove(const MouseEvent& rMEvt) +bool FuDraw::MouseMove(const MouseEvent& rMEvt) { FrameView* pFrameView = mpViewShell->GetFrameView(); Point aPos = mpWindow->PixelToLogic( rMEvt.GetPosPixel() ); bool bOrtho = false; - sal_Bool bRestricted = sal_True; + bool bRestricted = true; if (mpView->IsDragObj()) { @@ -230,7 +230,7 @@ sal_Bool FuDraw::MouseMove(const MouseEvent& rMEvt) if (!pHdl || (!pHdl->IsCornerHdl() && !pHdl->IsVertexHdl())) { // Move - bRestricted = sal_False; + bRestricted = false; } } @@ -308,7 +308,7 @@ sal_Bool FuDraw::MouseMove(const MouseEvent& rMEvt) mpView->MovDragHelpLine(aPos); } - sal_Bool bReturn = mpView->MouseMove(rMEvt, mpWindow); + bool bReturn = mpView->MouseMove(rMEvt, mpWindow); if (mpView->IsAction()) { @@ -323,7 +323,7 @@ sal_Bool FuDraw::MouseMove(const MouseEvent& rMEvt) } -sal_Bool FuDraw::MouseButtonUp(const MouseEvent& rMEvt) +bool FuDraw::MouseButtonUp(const MouseEvent& rMEvt) { if ( mpView->IsDragHelpLine() ) mpView->EndDragHelpLine(); @@ -352,20 +352,20 @@ sal_Bool FuDraw::MouseButtonUp(const MouseEvent& rMEvt) mpView->SetOPntSnap(pFrameView->IsOPntSnap()); mpView->SetOConSnap(pFrameView->IsOConSnap()); - bIsInDragMode = sal_False; + bIsInDragMode = false; ForcePointer(&rMEvt); FuPoor::MouseButtonUp(rMEvt); - return sal_False; + return false; } /** * Process keyboard input * @returns sal_True if a KeyEvent is being processed, sal_False otherwise */ -sal_Bool FuDraw::KeyInput(const KeyEvent& rKEvt) +bool FuDraw::KeyInput(const KeyEvent& rKEvt) { - sal_Bool bReturn = sal_False; + bool bReturn = false; switch ( rKEvt.GetKeyCode().GetCode() ) { @@ -380,7 +380,7 @@ sal_Bool FuDraw::KeyInput(const KeyEvent& rKEvt) { if (!mpDocSh->IsReadOnly()) { - if (mpView->IsPresObjSelected(sal_False, sal_True, sal_False, sal_True)) + if (mpView->IsPresObjSelected(false, true, false, true)) { InfoBox(mpWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE) ).Execute(); } @@ -403,7 +403,7 @@ sal_Bool FuDraw::KeyInput(const KeyEvent& rKEvt) mpView->DeleteMarked(); } } - bReturn = sal_True; + bReturn = true; } break; @@ -438,7 +438,7 @@ sal_Bool FuDraw::KeyInput(const KeyEvent& rKEvt) if(mpView->AreObjectsMarked()) mpView->MakeVisible(mpView->GetAllMarkedRect(), *mpWindow); - bReturn = sal_True; + bReturn = true; } } break; @@ -456,7 +456,7 @@ sal_Bool FuDraw::KeyInput(const KeyEvent& rKEvt) if(mpView->AreObjectsMarked()) mpView->MakeVisible(mpView->GetAllMarkedRect(), *mpWindow); - bReturn = sal_True; + bReturn = true; } } break; @@ -474,7 +474,7 @@ sal_Bool FuDraw::KeyInput(const KeyEvent& rKEvt) if(mpView->AreObjectsMarked()) mpView->MakeVisible(mpView->GetAllMarkedRect(), *mpWindow); - bReturn = sal_True; + bReturn = true; } } break; @@ -516,8 +516,8 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt) { Point aPnt; sal_uInt16 nModifier = 0; - sal_Bool bLeftDown = sal_False; - sal_Bool bDefPointer = sal_True; + bool bLeftDown = false; + bool bDefPointer = true; if (pMEvt) { @@ -535,7 +535,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt) if (SD_MOD()->GetWaterCan() && !mpView->PickHandle(aPnt)) { // water can mode - bDefPointer = sal_False; + bDefPointer = false; mpWindow->SetPointer(Pointer(POINTER_FILL)); } } @@ -546,7 +546,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt) if (SD_MOD()->GetWaterCan() && !pHdl) { // water can mode - bDefPointer = sal_False; + bDefPointer = false; mpWindow->SetPointer(Pointer(POINTER_FILL)); } else if (!pHdl && @@ -557,7 +557,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt) if (pMask && pMask->IsEyedropping()) { - bDefPointer = sal_False; + bDefPointer = false; mpWindow->SetPointer(Pointer(POINTER_REFHAND)); } } @@ -585,7 +585,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt) if ((pObject->ISA(E3dObject)) && (rMarkList.GetMarkCount() == 1)) { mpWindow->SetPointer(Pointer(POINTER_ROTATE)); - bDefPointer = sal_False; // Otherwise it'll be calles Joes routine and the mousepointer will reconfigurate again + bDefPointer = false; // Otherwise it'll be calles Joes routine and the mousepointer will reconfigurate again } } @@ -608,7 +608,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt) aVEvt.pObj->IsEmptyPresObj() ) { pObj = NULL; - bDefPointer = sal_False; + bDefPointer = false; mpWindow->SetPointer(Pointer(POINTER_ARROW)); } } @@ -638,14 +638,14 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt) /** * Set cursor for animaton or imagemap */ -sal_Bool FuDraw::SetPointer(SdrObject* pObj, const Point& rPos) +bool FuDraw::SetPointer(SdrObject* pObj, const Point& rPos) { - sal_Bool bSet = sal_False; + bool bSet = false; - sal_Bool bAnimationInfo = (!mpDocSh->ISA(GraphicDocShell) && + bool bAnimationInfo = (!mpDocSh->ISA(GraphicDocShell) && mpDoc->GetAnimationInfo(pObj)) ? sal_True:sal_False; - sal_Bool bImageMapInfo = sal_False; + bool bImageMapInfo = false; if (!bAnimationInfo) bImageMapInfo = mpDoc->GetIMapInfo(pObj) ? sal_True:sal_False; @@ -704,7 +704,7 @@ sal_Bool FuDraw::SetPointer(SdrObject* pObj, const Point& rPos) pInfo->meTextEffect != presentation::AnimationEffect_NONE ))))) { // Animation object - bSet = sal_True; + bSet = true; mpWindow->SetPointer(Pointer(POINTER_REFHAND)); } } @@ -714,7 +714,7 @@ sal_Bool FuDraw::SetPointer(SdrObject* pObj, const Point& rPos) /****************************************************** * ImageMap ******************************************************/ - bSet = sal_True; + bSet = true; mpWindow->SetPointer(Pointer(POINTER_REFHAND)); } } @@ -785,9 +785,9 @@ void FuDraw::DoubleClick(const MouseEvent& rMEvt) } -sal_Bool FuDraw::RequestHelp(const HelpEvent& rHEvt) +bool FuDraw::RequestHelp(const HelpEvent& rHEvt) { - sal_Bool bReturn = sal_False; + bool bReturn = false; if (Help::IsBalloonHelpEnabled() || Help::IsQuickHelpEnabled()) { @@ -828,9 +828,9 @@ sal_Bool FuDraw::RequestHelp(const HelpEvent& rHEvt) -sal_Bool FuDraw::SetHelpText(SdrObject* pObj, const Point& rPosPixel, const SdrViewEvent& rVEvt) +bool FuDraw::SetHelpText(SdrObject* pObj, const Point& rPosPixel, const SdrViewEvent& rVEvt) { - sal_Bool bSet = sal_False; + bool bSet = false; OUString aHelpText; Point aPos(mpWindow->PixelToLogic(mpWindow->ScreenToOutputPixel(rPosPixel))); @@ -968,7 +968,7 @@ sal_Bool FuDraw::SetHelpText(SdrObject* pObj, const Point& rPosPixel, const SdrV if (!aHelpText.isEmpty()) { - bSet = sal_True; + bSet = true; Rectangle aLogicPix = mpWindow->LogicToPixel(pObj->GetLogicRect()); Rectangle aScreenRect(mpWindow->OutputToScreenPixel(aLogicPix.TopLeft()), mpWindow->OutputToScreenPixel(aLogicPix.BottomRight())); diff --git a/sd/source/ui/func/fudspord.cxx b/sd/source/ui/func/fudspord.cxx index 8a93e716da41..a22b46922b24 100644 --- a/sd/source/ui/func/fudspord.cxx +++ b/sd/source/ui/func/fudspord.cxx @@ -63,16 +63,16 @@ rtl::Reference<FuPoor> FuDisplayOrder::Create( ViewShell* pViewSh, ::sd::Window* } -sal_Bool FuDisplayOrder::MouseButtonDown(const MouseEvent& rMEvt) +bool FuDisplayOrder::MouseButtonDown(const MouseEvent& rMEvt) { // remember button state for creation of own MouseEvents SetMouseButtonCode(rMEvt.GetButtons()); - return sal_True; + return true; } -sal_Bool FuDisplayOrder::MouseMove(const MouseEvent& rMEvt) +bool FuDisplayOrder::MouseMove(const MouseEvent& rMEvt) { SdrObject* pPickObj; SdrPageView* pPV; @@ -98,11 +98,11 @@ sal_Bool FuDisplayOrder::MouseMove(const MouseEvent& rMEvt) implClearOverlay(); } - return sal_True; + return true; } -sal_Bool FuDisplayOrder::MouseButtonUp(const MouseEvent& rMEvt) +bool FuDisplayOrder::MouseButtonUp(const MouseEvent& rMEvt) { // remember button state for creation of own MouseEvents SetMouseButtonCode(rMEvt.GetButtons()); @@ -124,7 +124,7 @@ sal_Bool FuDisplayOrder::MouseButtonUp(const MouseEvent& rMEvt) mpViewShell->Cancel(); - return sal_True; + return true; } diff --git a/sd/source/ui/func/fuediglu.cxx b/sd/source/ui/func/fuediglu.cxx index 51e3c32f106c..7907884476d3 100644 --- a/sd/source/ui/func/fuediglu.cxx +++ b/sd/source/ui/func/fuediglu.cxx @@ -50,7 +50,7 @@ FuEditGluePoints::FuEditGluePoints ( : FuDraw(pViewSh, pWin, pView, pDoc, rReq) //Add Shift+UP/DOWN/LEFT/RIGHT key to move the position of insert point, //and SHIFT+ENTER key to decide the position and draw the new insert point - ,bBeginInsertPoint(sal_False), + ,bBeginInsertPoint(false), oldPoint(0,0) { } @@ -82,23 +82,23 @@ FuEditGluePoints::~FuEditGluePoints() } -sal_Bool FuEditGluePoints::MouseButtonDown(const MouseEvent& rMEvt) +bool FuEditGluePoints::MouseButtonDown(const MouseEvent& rMEvt) { mpView->SetActualWin( mpWindow ); - sal_Bool bReturn = FuDraw::MouseButtonDown(rMEvt); + bool bReturn = FuDraw::MouseButtonDown(rMEvt); if (mpView->IsAction()) { if (rMEvt.IsRight()) mpView->BckAction(); - return sal_True; + return true; } if (rMEvt.IsLeft()) { - bReturn = sal_True; + bReturn = true; sal_uInt16 nHitLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() ); sal_uInt16 nDrgLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); mpWindow->CaptureMouse(); @@ -163,7 +163,7 @@ sal_Bool FuEditGluePoints::MouseButtonDown(const MouseEvent& rMEvt) mpView->UnmarkAllObj(); } - sal_Bool bMarked = sal_False; + bool bMarked = false; if (!rMEvt.IsMod1()) { @@ -205,7 +205,7 @@ sal_Bool FuEditGluePoints::MouseButtonDown(const MouseEvent& rMEvt) } -sal_Bool FuEditGluePoints::MouseMove(const MouseEvent& rMEvt) +bool FuEditGluePoints::MouseMove(const MouseEvent& rMEvt) { mpView->SetActualWin( mpWindow ); @@ -221,19 +221,19 @@ sal_Bool FuEditGluePoints::MouseMove(const MouseEvent& rMEvt) ForcePointer(&rMEvt); - return sal_True; + return true; } -sal_Bool FuEditGluePoints::MouseButtonUp(const MouseEvent& rMEvt) +bool FuEditGluePoints::MouseButtonUp(const MouseEvent& rMEvt) { mpView->SetActualWin( mpWindow ); - sal_Bool bReturn = sal_False; + bool bReturn = false; if (mpView->IsAction()) { - bReturn = sal_True; + bReturn = true; mpView->EndAction(); } @@ -265,14 +265,14 @@ sal_Bool FuEditGluePoints::MouseButtonUp(const MouseEvent& rMEvt) * Process keyboard input * @returns sal_True if a KeyEvent is being processed, sal_False otherwise */ -sal_Bool FuEditGluePoints::KeyInput(const KeyEvent& rKEvt) +bool FuEditGluePoints::KeyInput(const KeyEvent& rKEvt) { mpView->SetActualWin( mpWindow ); //Add Shift+UP/DOWN/LEFT/RIGHT key to move the position of insert point, //and SHIFT+ENTER key to decide the position and draw the new insert point - sal_Bool bReturn = sal_False; + bool bReturn = false; switch (rKEvt.GetKeyCode().GetCode()) { @@ -319,8 +319,8 @@ sal_Bool FuEditGluePoints::KeyInput(const KeyEvent& rKEvt) MouseEvent eMevt(ePoint,1,2,MOUSE_LEFT, 0); MouseMove(eMevt); oldPoint = ePoint; - bBeginInsertPoint = sal_True; - bReturn = sal_True; + bBeginInsertPoint = true; + bReturn = true; } } break; @@ -340,7 +340,7 @@ sal_Bool FuEditGluePoints::KeyInput(const KeyEvent& rKEvt) //simulate mouse button up action MouseEvent rMEvt(oldPoint+Point(0,0),1,17, MOUSE_LEFT, KEY_SHIFT); MouseButtonUp(rMEvt); - bReturn= sal_True; + bReturn= true; } } break; @@ -368,7 +368,7 @@ void FuEditGluePoints::ForcePointer(const MouseEvent* pMEvt) } } -sal_Bool FuEditGluePoints::Command(const CommandEvent& rCEvt) +bool FuEditGluePoints::Command(const CommandEvent& rCEvt) { mpView->SetActualWin( mpWindow ); return FuPoor::Command( rCEvt ); @@ -431,7 +431,7 @@ void FuEditGluePoints::ReceiveRequest(SfxRequest& rReq) { const SfxItemSet* pSet = rReq.GetArgs(); const SfxPoolItem& rItem = pSet->Get(SID_GLUE_PERCENT); - sal_Bool bPercent = ((const SfxBoolItem&) rItem).GetValue(); + bool bPercent = ((const SfxBoolItem&) rItem).GetValue(); mpView->SetMarkedGluePointsPercent(bPercent); } break; diff --git a/sd/source/ui/func/fuexpand.cxx b/sd/source/ui/func/fuexpand.cxx index 5af78118f979..8780176f2fc9 100644 --- a/sd/source/ui/func/fuexpand.cxx +++ b/sd/source/ui/func/fuexpand.cxx @@ -152,7 +152,7 @@ void FuExpandPage::DoExecute( SfxRequest& ) // use MasterPage of the current page pPage->TRG_SetMasterPage(pActualPage->TRG_GetMasterPage()); pPage->SetLayoutName(pActualPage->GetLayoutName()); - pPage->SetAutoLayout(AUTOLAYOUT_ENUM, sal_True); + pPage->SetAutoLayout(AUTOLAYOUT_ENUM, true); pPage->TRG_SetMasterPageVisibleLayers(aVisibleLayers); // notes-page @@ -175,7 +175,7 @@ void FuExpandPage::DoExecute( SfxRequest& ) // use MasterPage of the current page pNotesPage->TRG_SetMasterPage(pActualNotesPage->TRG_GetMasterPage()); pNotesPage->SetLayoutName(pActualNotesPage->GetLayoutName()); - pNotesPage->SetAutoLayout(pActualNotesPage->GetAutoLayout(), sal_True); + pNotesPage->SetAutoLayout(pActualNotesPage->GetAutoLayout(), true); pNotesPage->TRG_SetMasterPageVisibleLayers(aVisibleLayers); // create title text objects diff --git a/sd/source/ui/func/fuformatpaintbrush.cxx b/sd/source/ui/func/fuformatpaintbrush.cxx index 9966adffdc7b..cc8967fe33b5 100644 --- a/sd/source/ui/func/fuformatpaintbrush.cxx +++ b/sd/source/ui/func/fuformatpaintbrush.cxx @@ -92,7 +92,7 @@ static void unmarkimpl( SdrView* pView ) pView->UnMarkAll(); } -sal_Bool FuFormatPaintBrush::MouseButtonDown(const MouseEvent& rMEvt) +bool FuFormatPaintBrush::MouseButtonDown(const MouseEvent& rMEvt) { if(mpView&&mpWindow) { @@ -140,17 +140,17 @@ sal_Bool FuFormatPaintBrush::MouseButtonDown(const MouseEvent& rMEvt) if( aVEvt.pObj ) { sal_uInt16 nHitLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() ); - sal_Bool bToggle = sal_False; + bool bToggle = false; mpView->MarkObj(mpWindow->PixelToLogic( rMEvt.GetPosPixel() ), nHitLog, bToggle, false); - return sal_True; + return true; } } - return sal_False; + return false; } -sal_Bool FuFormatPaintBrush::MouseMove(const MouseEvent& rMEvt) +bool FuFormatPaintBrush::MouseMove(const MouseEvent& rMEvt) { - sal_Bool bReturn = sal_False; + bool bReturn = false; if( mpWindow && mpView ) { if ( mpView->IsTextEdit() ) @@ -163,7 +163,7 @@ sal_Bool FuFormatPaintBrush::MouseMove(const MouseEvent& rMEvt) sal_uInt16 nHitLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() ); SdrObject* pObj=0; SdrPageView* pPV=0; - sal_Bool bOverMarkableObject = mpView->PickObj( mpWindow->PixelToLogic( rMEvt.GetPosPixel() ),nHitLog, pObj, pPV, SDRSEARCH_PICKMARKABLE); + bool bOverMarkableObject = mpView->PickObj( mpWindow->PixelToLogic( rMEvt.GetPosPixel() ),nHitLog, pObj, pPV, SDRSEARCH_PICKMARKABLE); if(bOverMarkableObject && HasContentForThisType(pObj->GetObjInventor(),pObj->GetObjIdentifier()) ) mpWindow->SetPointer(Pointer(POINTER_FILL)); @@ -174,7 +174,7 @@ sal_Bool FuFormatPaintBrush::MouseMove(const MouseEvent& rMEvt) return bReturn; } -sal_Bool FuFormatPaintBrush::MouseButtonUp(const MouseEvent& rMEvt) +bool FuFormatPaintBrush::MouseButtonUp(const MouseEvent& rMEvt) { if( mpItemSet.get() && mpView && mpView->AreObjectsMarked() ) { @@ -196,19 +196,19 @@ sal_Bool FuFormatPaintBrush::MouseButtonUp(const MouseEvent& rMEvt) mpViewShell->GetViewFrame()->GetBindings().Invalidate(SID_FORMATPAINTBRUSH); if( mbPermanent ) - return sal_True; + return true; } implcancel(); - return sal_True; + return true; } -sal_Bool FuFormatPaintBrush::KeyInput(const KeyEvent& rKEvt) +bool FuFormatPaintBrush::KeyInput(const KeyEvent& rKEvt) { if( (rKEvt.GetKeyCode().GetCode() == KEY_ESCAPE) && mpViewShell ) { implcancel(); - return sal_True; + return true; } return FuPoor::KeyInput(rKEvt); } @@ -218,7 +218,7 @@ void FuFormatPaintBrush::Activate() mbOldIsQuickTextEditMode = mpViewShell->GetFrameView()->IsQuickEdit(); if( !mbOldIsQuickTextEditMode ) { - mpViewShell->GetFrameView()->SetQuickEdit(sal_True); + mpViewShell->GetFrameView()->SetQuickEdit(true); mpView->SetQuickTextEditMode(true); } } @@ -227,7 +227,7 @@ void FuFormatPaintBrush::Deactivate() { if( !mbOldIsQuickTextEditMode ) { - mpViewShell->GetFrameView()->SetQuickEdit(sal_False); + mpViewShell->GetFrameView()->SetQuickEdit(false); mpView->SetQuickTextEditMode(false); } } diff --git a/sd/source/ui/func/fuhhconv.cxx b/sd/source/ui/func/fuhhconv.cxx index 374ec24b0959..95532343deba 100644 --- a/sd/source/ui/func/fuhhconv.cxx +++ b/sd/source/ui/func/fuhhconv.cxx @@ -63,16 +63,16 @@ FuHangulHanjaConversion::FuHangulHanjaConversion ( SfxRequest& rReq ) : FuPoor(pViewSh, pWin, pView, pDocument, rReq), pSdOutliner(NULL), - bOwnOutliner(sal_False) + bOwnOutliner(false) { if ( mpViewShell->ISA(DrawViewShell) ) { - bOwnOutliner = sal_True; + bOwnOutliner = true; pSdOutliner = new Outliner( mpDoc, OUTLINERMODE_TEXTOBJECT ); } else if ( mpViewShell->ISA(OutlineViewShell) ) { - bOwnOutliner = sal_False; + bOwnOutliner = false; pSdOutliner = mpDoc->GetOutliner(); } @@ -101,7 +101,7 @@ rtl::Reference<FuPoor> FuHangulHanjaConversion::Create( ViewShell* pViewSh, ::sd * Search and replace */ void FuHangulHanjaConversion::StartConversion( sal_Int16 nSourceLanguage, sal_Int16 nTargetLanguage, - const Font *pTargetFont, sal_Int32 nOptions, sal_Bool bIsInteractive ) + const Font *pTargetFont, sal_Int32 nOptions, bool bIsInteractive ) { mpView->BegUndo(SD_RESSTR(STR_UNDO_HANGULHANJACONVERSION)); @@ -116,7 +116,7 @@ void FuHangulHanjaConversion::StartConversion( sal_Int16 nSourceLanguage, sal_In { pSdOutliner->EndConversion(); - bOwnOutliner = sal_True; + bOwnOutliner = true; pSdOutliner = new Outliner( mpDoc, OUTLINERMODE_TEXTOBJECT ); pSdOutliner->BeginConversion(); } @@ -125,7 +125,7 @@ void FuHangulHanjaConversion::StartConversion( sal_Int16 nSourceLanguage, sal_In pSdOutliner->EndConversion(); delete pSdOutliner; - bOwnOutliner = sal_False; + bOwnOutliner = false; pSdOutliner = mpDoc->GetOutliner(); pSdOutliner->BeginConversion(); } @@ -222,9 +222,9 @@ void FuHangulHanjaConversion::StartChineseConversion() if( RET_OK == nDialogRet ) { //get some parameters from the dialog - sal_Bool bToSimplified = sal_True; - sal_Bool bUseVariants = sal_True; - sal_Bool bCommonTerms = sal_True; + bool bToSimplified = true; + bool bUseVariants = true; + bool bCommonTerms = true; Reference< beans::XPropertySet > xProp( xDialog, UNO_QUERY ); if( xProp.is() ) { @@ -250,7 +250,7 @@ void FuHangulHanjaConversion::StartChineseConversion() DEFAULTFONT_CJK_PRESENTATION, nTargetLang, DEFAULTFONT_FLAGS_ONLYONE ); - StartConversion( nSourceLang, nTargetLang, &aTargetFont, nOptions, sal_False ); + StartConversion( nSourceLang, nTargetLang, &aTargetFont, nOptions, false ); ConvertStyles( nTargetLang, &aTargetFont ); } } diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx index 6146ba7fe268..4748442537b2 100644 --- a/sd/source/ui/func/fuinsert.cxx +++ b/sd/source/ui/func/fuinsert.cxx @@ -225,7 +225,7 @@ void FuInsertClipboard::DoExecute( SfxRequest& ) if( !mpView->InsertData( aDataHelper, mpWindow->PixelToLogic( Rectangle( Point(), mpWindow->GetOutputSizePixel() ).Center() ), - nAction, sal_False, nFormatId ) && + nAction, false, nFormatId ) && ( mpViewShell && mpViewShell->ISA( DrawViewShell ) ) ) { DrawViewShell* pDrViewSh = static_cast<DrawViewShell*>(mpViewShell); @@ -412,7 +412,7 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq ) { // insert object sal_Int64 nAspect = embed::Aspects::MSOLE_CONTENT; - sal_Bool bCreateNew = sal_False; + bool bCreateNew = false; uno::Reference < embed::XEmbeddedObject > xObj; uno::Reference < embed::XStorage > xStorage = comphelper::OStorageHelper::GetTemporaryStorage(); SvObjectServerList aServerLst; @@ -520,7 +520,7 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq ) //if( SVOBJ_MISCSTATUS_RESIZEONPRINTERCHANGE & xObj->getStatus( nAspect ) ) // aIPObj->OnDocumentPrinterChanged( mpDocSh->GetPrinter(sal_False) ); - sal_Bool bInsertNewObject = sal_True; + bool bInsertNewObject = true; Size aSize; MapUnit aMapUnit = MAP_100TH_MM; @@ -571,7 +571,7 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq ) if ( !( (SdrOle2Obj*) pObj)->GetObjRef().is() ) { // the empty OLE object gets a new IPObj - bInsertNewObject = sal_False; + bInsertNewObject = false; pObj->SetEmptyPresObj(false); ( (SdrOle2Obj*) pObj)->SetOutlinerParaObject(NULL); ( (SdrOle2Obj*) pObj)->SetObjRef(xObj); diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx index 820479638d6e..84daeec317c3 100644 --- a/sd/source/ui/func/fuinsfil.cxx +++ b/sd/source/ui/func/fuinsfil.cxx @@ -254,8 +254,8 @@ void FuInsertFile::DoExecute( SfxRequest& rReq ) SFX_APP()->GetFilterMatcher().GuessFilter( *pMedium, &pFilter, SFX_FILTER_IMPORT, SFX_FILTER_NOTINSTALLED | SFX_FILTER_EXECUTABLE ); - sal_Bool bDrawMode = mpViewShell && mpViewShell->ISA(DrawViewShell); - sal_Bool bInserted = sal_False; + bool bDrawMode = mpViewShell && mpViewShell->ISA(DrawViewShell); + bool bInserted = false; if( pFilter ) { @@ -275,19 +275,19 @@ void FuInsertFile::DoExecute( SfxRequest& rReq ) InsSDDinOlMode( pMedium ); // don't delete Medium here, ownership of pMedium has changed in this case - bInserted = sal_True; + bInserted = true; } } else { - sal_Bool bFound = ( ::std::find( aFilterVector.begin(), aFilterVector.end(), pFilter->GetMimeType() ) != aFilterVector.end() ); + bool bFound = ( ::std::find( aFilterVector.begin(), aFilterVector.end(), pFilter->GetMimeType() ) != aFilterVector.end() ); if( !bFound && ( aFilterName.indexOf( "Text" ) != -1 || aFilterName.indexOf( "Rich" ) != -1 || aFilterName.indexOf( "RTF" ) != -1 || aFilterName.indexOf( "HTML" ) != -1 ) ) { - bFound = sal_True; + bFound = true; } if( bFound ) @@ -297,7 +297,7 @@ void FuInsertFile::DoExecute( SfxRequest& rReq ) else InsTextOrRTFinOlMode(pMedium); - bInserted = sal_True; + bInserted = true; delete pMedium; } } @@ -315,16 +315,16 @@ void FuInsertFile::DoExecute( SfxRequest& rReq ) -sal_Bool FuInsertFile::InsSDDinDrMode(SfxMedium* pMedium) +bool FuInsertFile::InsSDDinDrMode(SfxMedium* pMedium) { - sal_Bool bOK = sal_False; + bool bOK = false; mpDocSh->SetWaitCursor( false ); SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create(); AbstractSdInsertPagesObjsDlg* pDlg = pFact ? pFact->CreateSdInsertPagesObjsDlg( NULL, mpDoc, pMedium, aFile ) : 0; if( !pDlg ) - return sal_False; + return false; /* Maybe a QueryBox is opened ("update links?"), therefore the dialog becomes the current DefModalDialogParent */ @@ -342,8 +342,8 @@ sal_Bool FuInsertFile::InsSDDinDrMode(SfxMedium* pMedium) /* list with page names (if NULL, then all pages) First, insert pages */ std::vector<OUString> aBookmarkList = pDlg->GetList( 1 ); // pages - sal_Bool bLink = pDlg->IsLink(); - sal_Bool bReplace = sal_False; + bool bLink = pDlg->IsLink(); + bool bReplace = false; SdPage* pPage = NULL; ::sd::View* pView = mpViewShell->GetView(); @@ -370,7 +370,7 @@ sal_Bool FuInsertFile::InsSDDinDrMode(SfxMedium* pMedium) } } - sal_Bool bNameOK; + bool bNameOK; std::vector<OUString> aExchangeList; std::vector<OUString> aObjectBookmarkList = pDlg->GetList( 2 ); // objects @@ -387,7 +387,7 @@ sal_Bool FuInsertFile::InsSDDinDrMode(SfxMedium* pMedium) if( bNameOK ) bOK = mpDoc->InsertBookmarkAsPage( aBookmarkList, &aExchangeList, bLink, bReplace, nPos, - sal_False, NULL, sal_True, sal_True, sal_False ); + false, NULL, true, true, false ); aBookmarkList.clear(); aExchangeList.clear(); @@ -686,7 +686,7 @@ void FuInsertFile::InsTextOrRTFinOlMode(SfxMedium* pMedium) -sal_Bool FuInsertFile::InsSDDinOlMode(SfxMedium* pMedium) +bool FuInsertFile::InsSDDinOlMode(SfxMedium* pMedium) { OutlineView* pOlView = static_cast<OutlineView*>(mpView); @@ -724,10 +724,10 @@ sal_Bool FuInsertFile::InsSDDinOlMode(SfxMedium* pMedium) pOutliner->SetEndMovingHdl(aOldEndMovingHdl); pOutliner->SetStatusEventHdl(aOldStatusEventHdl); - return sal_True; + return true; } else - return sal_False; + return false; } diff --git a/sd/source/ui/func/fuline.cxx b/sd/source/ui/func/fuline.cxx index 9b38b9ed9432..ee03d31a58dd 100644 --- a/sd/source/ui/func/fuline.cxx +++ b/sd/source/ui/func/fuline.cxx @@ -61,7 +61,7 @@ rtl::Reference<FuPoor> FuLine::Create( ViewShell* pViewSh, ::sd::Window* pWin, : void FuLine::DoExecute( SfxRequest& rReq ) { - sal_Bool bHasMarked = mpView->AreObjectsMarked(); + bool bHasMarked = mpView->AreObjectsMarked(); const SfxItemSet* pArgs = rReq.GetArgs(); diff --git a/sd/source/ui/func/fulinend.cxx b/sd/source/ui/func/fulinend.cxx index 01be0670ab84..304d82ff947c 100644 --- a/sd/source/ui/func/fulinend.cxx +++ b/sd/source/ui/func/fulinend.cxx @@ -98,18 +98,18 @@ void FuLineEnd::DoExecute( SfxRequest& ) long nCount = pLineEndList->Count(); long j = 1; - sal_Bool bDifferent = sal_False; + bool bDifferent = false; while( !bDifferent ) { aName = aNewName; aName += " "; aName += OUString::number(j++); - bDifferent = sal_True; + bDifferent = true; for( long i = 0; i < nCount && bDifferent; i++ ) { if( aName == pLineEndList->GetLineEnd( i )->GetName() ) - bDifferent = sal_False; + bDifferent = false; } } @@ -123,12 +123,12 @@ void FuLineEnd::DoExecute( SfxRequest& ) if( pDlg->Execute() == RET_OK ) { pDlg->GetName( aName ); - bDifferent = sal_True; + bDifferent = true; for( long i = 0; i < nCount && bDifferent; i++ ) { if( aName == pLineEndList->GetLineEnd( i )->GetName() ) - bDifferent = sal_False; + bDifferent = false; } if( bDifferent ) diff --git a/sd/source/ui/func/fumorph.cxx b/sd/source/ui/func/fumorph.cxx index 5a94f8f75c93..73a1a8f49c67 100644 --- a/sd/source/ui/func/fumorph.cxx +++ b/sd/source/ui/func/fumorph.cxx @@ -330,7 +330,7 @@ void FuMorph::ImpAddPolys( */ void FuMorph::ImpInsertPolygons( B2DPolyPolygonList_impl& rPolyPolyList3D, - sal_Bool bAttributeFade, + bool bAttributeFade, const SdrObject* pObj1, const SdrObject* pObj2 ) @@ -345,11 +345,11 @@ void FuMorph::ImpInsertPolygons( SfxItemPool* pPool = pObj1->GetObjectItemPool(); SfxItemSet aSet1( *pPool,SDRATTR_START,SDRATTR_NOTPERSIST_FIRST-1,EE_ITEMS_START,EE_ITEMS_END,0 ); SfxItemSet aSet2( aSet1 ); - sal_Bool bLineColor = sal_False; - sal_Bool bFillColor = sal_False; - sal_Bool bLineWidth = sal_False; - sal_Bool bIgnoreLine = sal_False; - sal_Bool bIgnoreFill = sal_False; + bool bLineColor = false; + bool bFillColor = false; + bool bLineWidth = false; + bool bIgnoreLine = false; + bool bIgnoreFill = false; aSet1.Put(pObj1->GetMergedItemSet()); aSet2.Put(pObj2->GetMergedItemSet()); @@ -363,7 +363,7 @@ void FuMorph::ImpInsertPolygons( { if ( ( eLineStyle1 != XLINE_NONE ) && ( eLineStyle2 != XLINE_NONE ) ) { - bLineWidth = bLineColor = sal_True; + bLineWidth = bLineColor = true; aStartLineCol = static_cast< XLineColorItem const & >( aSet1.Get(XATTR_LINECOLOR)).GetColorValue(); @@ -374,18 +374,18 @@ void FuMorph::ImpInsertPolygons( nEndLineWidth = ITEMVALUE( aSet2, XATTR_LINEWIDTH, XLineWidthItem ); } else if ( ( eLineStyle1 == XLINE_NONE ) && ( eLineStyle2 == XLINE_NONE ) ) - bIgnoreLine = sal_True; + bIgnoreLine = true; if ( ( eFillStyle1 == XFILL_SOLID ) && ( eFillStyle2 == XFILL_SOLID ) ) { - bFillColor = sal_True; + bFillColor = true; aStartFillCol = static_cast< XFillColorItem const & >( aSet1.Get(XATTR_FILLCOLOR)).GetColorValue(); aEndFillCol = static_cast< XFillColorItem const & >( aSet2.Get(XATTR_FILLCOLOR)).GetColorValue(); } else if ( ( eFillStyle1 == XFILL_NONE ) && ( eFillStyle2 == XFILL_NONE ) ) - bIgnoreFill = sal_True; + bIgnoreFill = true; } if ( pPageView ) @@ -479,7 +479,7 @@ void FuMorph::ImpInsertPolygons( /** * create morphed PolyPolygons */ -sal_Bool FuMorph::ImpMorphPolygons( +bool FuMorph::ImpMorphPolygons( const ::basegfx::B2DPolyPolygon& rPolyPoly1, const ::basegfx::B2DPolyPolygon& rPolyPoly2, const sal_uInt16 nSteps, @@ -510,7 +510,7 @@ sal_Bool FuMorph::ImpMorphPolygons( rPolyPolyList3D.push_back( pNewPolyPoly2D ); } } - return sal_True; + return true; } } // end of namespace sd diff --git a/sd/source/ui/func/fuoaprms.cxx b/sd/source/ui/func/fuoaprms.cxx index 805baed8245e..a7d087974e93 100644 --- a/sd/source/ui/func/fuoaprms.cxx +++ b/sd/source/ui/func/fuoaprms.cxx @@ -103,20 +103,20 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) presentation::AnimationEffect eEffect = presentation::AnimationEffect_NONE; presentation::AnimationEffect eTextEffect = presentation::AnimationEffect_NONE; presentation::AnimationSpeed eSpeed = presentation::AnimationSpeed_MEDIUM; - sal_Bool bActive = sal_False; - sal_Bool bFadeOut = sal_False; + bool bActive = false; + bool bFadeOut = false; Color aFadeColor = COL_LIGHTGRAY; - sal_Bool bInvisible = sal_False; - sal_Bool bSoundOn = sal_False; + bool bInvisible = false; + bool bSoundOn = false; OUString aSound; - sal_Bool bPlayFull = sal_False; + bool bPlayFull = false; presentation::ClickAction eClickAction = presentation::ClickAction_NONE; OUString aBookmark; presentation::AnimationEffect eSecondEffect = presentation::AnimationEffect_NONE; presentation::AnimationSpeed eSecondSpeed = presentation::AnimationSpeed_MEDIUM; - sal_Bool bSecondSoundOn = sal_False; - sal_Bool bSecondPlayFull = sal_False; + bool bSecondSoundOn = false; + bool bSecondPlayFull = false; SdAnimationInfo* pInfo; @@ -234,7 +234,7 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) } else { - if (nAnimationSet == ATTR_SET && bActive == sal_True) + if (nAnimationSet == ATTR_SET && bActive) nAnimationSet = ATTR_MIXED; if (nEffectSet == ATTR_SET && eEffect != presentation::AnimationEffect_NONE) @@ -246,22 +246,22 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) if (nSpeedSet == ATTR_SET) nSpeedSet = ATTR_MIXED; - if (nFadeOutSet == ATTR_SET && bFadeOut == sal_True) + if (nFadeOutSet == ATTR_SET && bFadeOut) nFadeOutSet = ATTR_MIXED; if (nFadeColorSet == ATTR_SET) nFadeColorSet = ATTR_MIXED; - if (nInvisibleSet == ATTR_SET && bInvisible == sal_True) + if (nInvisibleSet == ATTR_SET && bInvisible) nInvisibleSet = ATTR_MIXED; - if (nSoundOnSet == ATTR_SET && bSoundOn == sal_True) + if (nSoundOnSet == ATTR_SET && bSoundOn) nSoundOnSet = ATTR_MIXED; if (nSoundFileSet == ATTR_SET) nSoundFileSet = ATTR_MIXED; - if (nPlayFullSet == ATTR_SET && bPlayFull == sal_True) + if (nPlayFullSet == ATTR_SET && bPlayFull) nPlayFullSet = ATTR_MIXED; if (nClickActionSet == ATTR_SET && eClickAction != presentation::ClickAction_NONE) @@ -276,10 +276,10 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) if (nSecondSpeedSet == ATTR_SET) nSecondSpeedSet = ATTR_MIXED; - if (nSecondSoundOnSet == ATTR_SET && bSecondSoundOn == sal_True) + if (nSecondSoundOnSet == ATTR_SET && bSecondSoundOn) nSecondSoundOnSet = ATTR_MIXED; - if (nSecondPlayFullSet == ATTR_SET && bSecondPlayFull == sal_True) + if (nSecondPlayFullSet == ATTR_SET && bSecondPlayFull) nSecondPlayFullSet = ATTR_MIXED; } } @@ -683,11 +683,11 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq ) pInfo = mpDoc->GetAnimationInfo(pObject); - sal_Bool bCreated = sal_False; + bool bCreated = false; if( !pInfo ) { pInfo = SdDrawDocument::GetShapeUserData(*pObject,true); - bCreated = sal_True; + bCreated = true; } // path object for 'following curves'? diff --git a/sd/source/ui/func/fuolbull.cxx b/sd/source/ui/func/fuolbull.cxx index e3c09761a210..870d4e24b213 100644 --- a/sd/source/ui/func/fuolbull.cxx +++ b/sd/source/ui/func/fuolbull.cxx @@ -319,8 +319,8 @@ const SfxPoolItem* FuOutlineBullet::GetNumBulletItem(SfxItemSet& aNewAttr, sal_u return pTmpItem; else { - sal_Bool bOutliner = sal_False; - sal_Bool bTitle = sal_False; + bool bOutliner = false; + bool bTitle = false; if( mpView ) { @@ -335,10 +335,10 @@ const SfxPoolItem* FuOutlineBullet::GetNumBulletItem(SfxItemSet& aNewAttr, sal_u switch(pObj->GetObjIdentifier()) { case OBJ_TITLETEXT: - bTitle = sal_True; + bTitle = true; break; case OBJ_OUTLINETEXT: - bOutliner = sal_True; + bOutliner = true; break; } } diff --git a/sd/source/ui/func/fuoltext.cxx b/sd/source/ui/func/fuoltext.cxx index 626a411950c8..b9ca47444585 100644 --- a/sd/source/ui/func/fuoltext.cxx +++ b/sd/source/ui/func/fuoltext.cxx @@ -97,11 +97,11 @@ rtl::Reference<FuPoor> FuOutlineText::Create( ViewShell* pViewSh, ::sd::Window* } -sal_Bool FuOutlineText::MouseButtonDown(const MouseEvent& rMEvt) +bool FuOutlineText::MouseButtonDown(const MouseEvent& rMEvt) { mpWindow->GrabFocus(); - sal_Bool bReturn = pOutlineView->GetViewByWindow(mpWindow)->MouseButtonDown(rMEvt); + bool bReturn = pOutlineView->GetViewByWindow(mpWindow)->MouseButtonDown(rMEvt); if (bReturn) { @@ -117,9 +117,9 @@ sal_Bool FuOutlineText::MouseButtonDown(const MouseEvent& rMEvt) } -sal_Bool FuOutlineText::MouseMove(const MouseEvent& rMEvt) +bool FuOutlineText::MouseMove(const MouseEvent& rMEvt) { - sal_Bool bReturn = pOutlineView->GetViewByWindow(mpWindow)->MouseMove(rMEvt); + bool bReturn = pOutlineView->GetViewByWindow(mpWindow)->MouseMove(rMEvt); if (!bReturn) { @@ -130,9 +130,9 @@ sal_Bool FuOutlineText::MouseMove(const MouseEvent& rMEvt) } -sal_Bool FuOutlineText::MouseButtonUp(const MouseEvent& rMEvt) +bool FuOutlineText::MouseButtonUp(const MouseEvent& rMEvt) { - sal_Bool bReturn = pOutlineView->GetViewByWindow(mpWindow)->MouseButtonUp(rMEvt); + bool bReturn = pOutlineView->GetViewByWindow(mpWindow)->MouseButtonUp(rMEvt); if (bReturn) { @@ -148,7 +148,7 @@ sal_Bool FuOutlineText::MouseButtonUp(const MouseEvent& rMEvt) if( pField && pField->ISA( SvxURLField ) ) { - bReturn = sal_True; + bReturn = true; mpWindow->ReleaseMouse(); SfxStringItem aStrItem( SID_FILE_NAME, ( (SvxURLField*) pField)->GetURL() ); SfxStringItem aReferer( SID_REFERER, mpDocSh->GetMedium()->GetName() ); @@ -182,9 +182,9 @@ sal_Bool FuOutlineText::MouseButtonUp(const MouseEvent& rMEvt) * Process keyboard input * @returns sal_True if a KeyEvent is being processed, sal_False otherwise */ -sal_Bool FuOutlineText::KeyInput(const KeyEvent& rKEvt) +bool FuOutlineText::KeyInput(const KeyEvent& rKEvt) { - sal_Bool bReturn = sal_False; + bool bReturn = false; sal_uInt16 nKeyGroup = rKEvt.GetKeyCode().GetGroup(); if( !mpDocSh->IsReadOnly() || nKeyGroup == KEYGROUP_CURSOR ) diff --git a/sd/source/ui/func/fuoutl.cxx b/sd/source/ui/func/fuoutl.cxx index 23d2a3754597..c9ba61135bba 100644 --- a/sd/source/ui/func/fuoutl.cxx +++ b/sd/source/ui/func/fuoutl.cxx @@ -43,9 +43,9 @@ FuOutline::FuOutline ( /** * forward to OutlinerView */ -sal_Bool FuOutline::Command(const CommandEvent& rCEvt) +bool FuOutline::Command(const CommandEvent& rCEvt) { - sal_Bool bResult = sal_False; + bool bResult = false; OutlinerView* pOlView = static_cast<OutlineView*>(mpView)->GetViewByWindow(mpWindow); @@ -54,7 +54,7 @@ sal_Bool FuOutline::Command(const CommandEvent& rCEvt) if (pOlView) { pOlView->Command(rCEvt); // unfortunately, we do not get a return value - bResult = sal_True; + bResult = true; } return bResult; } diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx index d4c4102a9455..92776325786f 100644 --- a/sd/source/ui/func/fupage.cxx +++ b/sd/source/ui/func/fupage.cxx @@ -225,7 +225,7 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent ) bool bScale = mpDoc->GetDocumentType() != DOCUMENT_TYPE_DRAW; aNewAttr.Put( SfxBoolItem( SID_ATTR_PAGE_EXT1, bScale ? sal_True : sal_False ) ); - sal_Bool bFullSize = mpPage->IsMasterPage() ? + bool bFullSize = mpPage->IsMasterPage() ? mpPage->IsBackgroundFullSize() : ((SdPage&)mpPage->TRG_GetMasterPage()).IsBackgroundFullSize(); aNewAttr.Put( SfxBoolItem( SID_ATTR_PAGE_EXT2, bFullSize ) ); @@ -325,7 +325,7 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent ) { // if some fillstyle-items are not set in the dialog, then // try to use the items before - sal_Bool bChanges = sal_False; + bool bChanges = false; for( sal_uInt16 i=XATTR_FILL_FIRST; i<XATTR_FILL_LAST; i++ ) { if( aMergedAttr.GetItemState( i ) != SFX_ITEM_DEFAULT ) @@ -334,7 +334,7 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent ) pTempSet->Put( aMergedAttr.Get( i ) ); else if( aMergedAttr.GetItem( i ) != pTempSet->GetItem( i ) ) - bChanges = sal_True; + bChanges = true; } } @@ -489,13 +489,13 @@ void FuPage::ApplyItemSet( const SfxItemSet* pArgs ) // Set new page-attributes PageKind ePageKind = mpDrawViewShell->GetPageKind(); const SfxPoolItem* pPoolItem; - sal_Bool bSetPageSizeAndBorder = sal_False; + bool bSetPageSizeAndBorder = false; Size aNewSize(maSize); sal_Int32 nLeft = -1, nRight = -1, nUpper = -1, nLower = -1; - sal_Bool bScaleAll = sal_True; + bool bScaleAll = true; Orientation eOrientation = mpPage->GetOrientation(); SdPage* pMasterPage = mpPage->IsMasterPage() ? mpPage : &(SdPage&)(mpPage->TRG_GetMasterPage()); - sal_Bool bFullSize = pMasterPage->IsBackgroundFullSize(); + bool bFullSize = pMasterPage->IsBackgroundFullSize(); sal_uInt16 nPaperBin = mpPage->GetPaperBin(); if( pArgs->GetItemState(SID_ATTR_PAGE, true, &pPoolItem) == SFX_ITEM_SET ) @@ -506,7 +506,7 @@ void FuPage::ApplyItemSet( const SfxItemSet* pArgs ) ORIENTATION_LANDSCAPE : ORIENTATION_PORTRAIT; if( mpPage->GetOrientation() != eOrientation ) - bSetPageSizeAndBorder = sal_True; + bSetPageSizeAndBorder = true; mpDrawViewShell->ResetActualPage(); } @@ -516,7 +516,7 @@ void FuPage::ApplyItemSet( const SfxItemSet* pArgs ) aNewSize = ((const SvxSizeItem*) pPoolItem)->GetSize(); if( mpPage->GetSize() != aNewSize ) - bSetPageSizeAndBorder = sal_True; + bSetPageSizeAndBorder = true; } if( pArgs->GetItemState(mpDoc->GetPool().GetWhich(SID_ATTR_LRSPACE), @@ -526,7 +526,7 @@ void FuPage::ApplyItemSet( const SfxItemSet* pArgs ) nRight = ((const SvxLRSpaceItem*) pPoolItem)->GetRight(); if( mpPage->GetLftBorder() != nLeft || mpPage->GetRgtBorder() != nRight ) - bSetPageSizeAndBorder = sal_True; + bSetPageSizeAndBorder = true; } @@ -537,7 +537,7 @@ void FuPage::ApplyItemSet( const SfxItemSet* pArgs ) nLower = ((const SvxULSpaceItem*) pPoolItem)->GetLower(); if( mpPage->GetUppBorder() != nUpper || mpPage->GetLwrBorder() != nLower ) - bSetPageSizeAndBorder = sal_True; + bSetPageSizeAndBorder = true; } if( pArgs->GetItemState(mpDoc->GetPool().GetWhich(SID_ATTR_PAGE_EXT1), true, &pPoolItem) == SFX_ITEM_SET ) @@ -550,7 +550,7 @@ void FuPage::ApplyItemSet( const SfxItemSet* pArgs ) bFullSize = ((const SfxBoolItem*) pPoolItem)->GetValue(); if(pMasterPage->IsBackgroundFullSize() != bFullSize ) - bSetPageSizeAndBorder = sal_True; + bSetPageSizeAndBorder = true; } // Paper Bin @@ -559,18 +559,18 @@ void FuPage::ApplyItemSet( const SfxItemSet* pArgs ) nPaperBin = ((const SvxPaperBinItem*) pPoolItem)->GetValue(); if( mpPage->GetPaperBin() != nPaperBin ) - bSetPageSizeAndBorder = sal_True; + bSetPageSizeAndBorder = true; } if (nLeft == -1 && nUpper != -1) { - bSetPageSizeAndBorder = sal_True; + bSetPageSizeAndBorder = true; nLeft = mpPage->GetLftBorder(); nRight = mpPage->GetRgtBorder(); } else if (nLeft != -1 && nUpper == -1) { - bSetPageSizeAndBorder = sal_True; + bSetPageSizeAndBorder = true; nUpper = mpPage->GetUppBorder(); nLower = mpPage->GetLwrBorder(); } diff --git a/sd/source/ui/func/fuparagr.cxx b/sd/source/ui/func/fuparagr.cxx index e4250eddaa58..edc1f611b9e6 100644 --- a/sd/source/ui/func/fuparagr.cxx +++ b/sd/source/ui/func/fuparagr.cxx @@ -123,7 +123,7 @@ void FuParagraph::DoExecute( SfxRequest& rReq ) const SfxPoolItem *pItem = 0; if( SFX_ITEM_SET == pArgs->GetItemState( ATTR_NUMBER_NEWSTART, false, &pItem ) ) { - const sal_Bool bNewStart = ((SfxBoolItem*)pItem)->GetValue() ? sal_True : sal_False; + const bool bNewStart = ((SfxBoolItem*)pItem)->GetValue() ? sal_True : sal_False; pOutliner->SetParaIsNumberingRestart( eSelection.nStartPara, bNewStart ); } diff --git a/sd/source/ui/func/fupoor.cxx b/sd/source/ui/func/fupoor.cxx index fdf2086953cb..9d642e5949a7 100644 --- a/sd/source/ui/func/fupoor.cxx +++ b/sd/source/ui/func/fupoor.cxx @@ -77,11 +77,11 @@ FuPoor::FuPoor ( nSlotId( rReq.GetSlot() ), nSlotValue(0), pDialog(NULL), - bIsInDragMode(sal_False), - bNoScrollUntilInside (sal_True), - bScrollable (sal_False), - bDelayActive (sal_False), - bFirstMouseMove (sal_False), + bIsInDragMode(false), + bNoScrollUntilInside (true), + bScrollable (false), + bDelayActive (false), + bFirstMouseMove (false), // remember MouseButton state mnCode(0) { @@ -124,7 +124,7 @@ void FuPoor::Deactivate() aScrollTimer.Stop(); aDelayToScrollTimer.Stop (); bScrollable = - bDelayActive = sal_False; + bDelayActive = false; if (pDialog) { @@ -150,7 +150,7 @@ void FuPoor::ForceScroll(const Point& aPixPos) if ( bNoScrollUntilInside ) { if ( rRect.IsInside(aPos) ) - bNoScrollUntilInside = sal_False; + bNoScrollUntilInside = false; } else { @@ -194,11 +194,11 @@ IMPL_LINK_INLINE_END( FuPoor, ScrollHdl, Timer *, pTimer ) * handle keyboard events * @returns sal_True if the event was handled, sal_False otherwise */ -sal_Bool FuPoor::KeyInput(const KeyEvent& rKEvt) +bool FuPoor::KeyInput(const KeyEvent& rKEvt) { sal_uInt16 nCode = rKEvt.GetKeyCode().GetCode(); - sal_Bool bReturn = sal_False; - sal_Bool bSlideShow = SlideShow::IsRunning( mpViewShell->GetViewShellBase() ); + bool bReturn = false; + bool bSlideShow = SlideShow::IsRunning( mpViewShell->GetViewShellBase() ); switch (nCode) { @@ -251,7 +251,7 @@ sal_Bool FuPoor::KeyInput(const KeyEvent& rKEvt) } // consumed - bReturn = sal_True; + bReturn = true; } } else @@ -279,7 +279,7 @@ sal_Bool FuPoor::KeyInput(const KeyEvent& rKEvt) } // consumed - bReturn = sal_True; + bReturn = true; } } } @@ -292,7 +292,7 @@ sal_Bool FuPoor::KeyInput(const KeyEvent& rKEvt) { // do something with a selected handle? const SdrHdlList& rHdlList = mpView->GetHdlList(); - sal_Bool bForward(!rKEvt.GetKeyCode().IsShift()); + bool bForward(!rKEvt.GetKeyCode().IsShift()); ((SdrHdlList&)rHdlList).TravelFocusHdl(bForward); @@ -307,7 +307,7 @@ sal_Bool FuPoor::KeyInput(const KeyEvent& rKEvt) } // consumed - bReturn = sal_True; + bReturn = true; } } break; @@ -327,9 +327,9 @@ sal_Bool FuPoor::KeyInput(const KeyEvent& rKEvt) if (mpViewShell->ISA(DrawViewShell)) static_cast<DrawViewShell*>(mpViewShell) - ->SetZoomOnPage(sal_False); + ->SetZoomOnPage(false); - bReturn = sal_True; + bReturn = true; } } break; @@ -343,9 +343,9 @@ sal_Bool FuPoor::KeyInput(const KeyEvent& rKEvt) if (mpViewShell->ISA(DrawViewShell)) static_cast<DrawViewShell*>(mpViewShell) - ->SetZoomOnPage(sal_False); + ->SetZoomOnPage(false); - bReturn = sal_True; + bReturn = true; } } break; @@ -357,7 +357,7 @@ sal_Bool FuPoor::KeyInput(const KeyEvent& rKEvt) // zoom to page mpViewShell->GetViewFrame()->GetDispatcher()-> Execute(SID_SIZE_PAGE, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD); - bReturn = sal_True; + bReturn = true; } } break; @@ -369,7 +369,7 @@ sal_Bool FuPoor::KeyInput(const KeyEvent& rKEvt) // zoom to selected objects mpViewShell->GetViewFrame()->GetDispatcher()-> Execute(SID_SIZE_OPTIMAL, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD); - bReturn = sal_True; + bReturn = true; } } break; @@ -382,7 +382,7 @@ sal_Bool FuPoor::KeyInput(const KeyEvent& rKEvt) { // use next ZoomRect mpViewShell->SetZoomRect(pZoomList->GetNextZoomRect()); - bReturn = sal_True; + bReturn = true; } } break; @@ -395,7 +395,7 @@ sal_Bool FuPoor::KeyInput(const KeyEvent& rKEvt) { // use previous ZoomRect mpViewShell->SetZoomRect(pZoomList->GetPreviousZoomRect()); - bReturn = sal_True; + bReturn = true; } } break; @@ -408,7 +408,7 @@ sal_Bool FuPoor::KeyInput(const KeyEvent& rKEvt) { // jump to first page static_cast<DrawViewShell*>(mpViewShell)->SwitchPage(0); - bReturn = sal_True; + bReturn = true; } } break; @@ -425,7 +425,7 @@ sal_Bool FuPoor::KeyInput(const KeyEvent& rKEvt) static_cast<DrawViewShell*>(mpViewShell) ->SwitchPage(mpDoc->GetSdPageCount( pPage->GetPageKind()) - 1); - bReturn = sal_True; + bReturn = true; } } break; @@ -446,7 +446,7 @@ sal_Bool FuPoor::KeyInput(const KeyEvent& rKEvt) mpView->SdrEndTextEdit(); // Previous page. - bReturn = sal_True; + bReturn = true; SdPage* pPage = static_cast<DrawViewShell*>(mpViewShell)->GetActualPage(); sal_uInt16 nSdPage = (pPage->GetPageNum() - 1) / 2; @@ -492,7 +492,7 @@ sal_Bool FuPoor::KeyInput(const KeyEvent& rKEvt) mpView->SdrEndTextEdit(); // Next page. - bReturn = sal_True; + bReturn = true; SdPage* pPage = static_cast<DrawViewShell*>(mpViewShell)->GetActualPage(); sal_uInt16 nSdPage = (pPage->GetPageNum() - 1) / 2; @@ -579,7 +579,7 @@ sal_Bool FuPoor::KeyInput(const KeyEvent& rKEvt) } } - bReturn = sal_True; + bReturn = true; } } } @@ -626,8 +626,8 @@ sal_Bool FuPoor::KeyInput(const KeyEvent& rKEvt) const SdrHdlList& rHdlList = mpView->GetHdlList(); SdrHdl* pHdl = rHdlList.GetFocusHdl(); - sal_Bool bIsMoveOfConnectedHandle(sal_False); - sal_Bool bOldSuppress = false; + bool bIsMoveOfConnectedHandle(false); + bool bOldSuppress = false; SdrEdgeObj* pEdgeObj = 0L; if(pHdl && pHdl->GetObj() && pHdl->GetObj()->ISA(SdrEdgeObj) && 0 == pHdl->GetPolyNum()) @@ -638,14 +638,14 @@ sal_Bool FuPoor::KeyInput(const KeyEvent& rKEvt) { if(pEdgeObj->GetConnection(true).GetObject()) { - bIsMoveOfConnectedHandle = sal_True; + bIsMoveOfConnectedHandle = true; } } if(1L == pHdl->GetPointNum()) { if(pEdgeObj->GetConnection(false).GetObject()) { - bIsMoveOfConnectedHandle = sal_True; + bIsMoveOfConnectedHandle = true; } } } @@ -754,7 +754,7 @@ sal_Bool FuPoor::KeyInput(const KeyEvent& rKEvt) if(mpView->IsDragObj()) { bool bWasNoSnap = rDragStat.IsNoSnap(); - sal_Bool bWasSnapEnabled = mpView->IsSnapEnabled(); + bool bWasSnapEnabled = mpView->IsSnapEnabled(); // switch snapping off if(!bWasNoSnap) @@ -790,7 +790,7 @@ sal_Bool FuPoor::KeyInput(const KeyEvent& rKEvt) mpViewShell->ScrollLines(nX, nY); } - bReturn = sal_True; + bReturn = true; } } break; @@ -818,7 +818,7 @@ sal_Bool FuPoor::KeyInput(const KeyEvent& rKEvt) if(pObj->ISA(SdrTextObj) && pObj->HasTextEdit()) { // use common IsSimpleCharInput from the EditEngine. - sal_Bool bPrintable(EditEngine::IsSimpleCharInput(rKEvt)); + bool bPrintable(EditEngine::IsSimpleCharInput(rKEvt)); if(bPrintable) { @@ -832,7 +832,7 @@ sal_Bool FuPoor::KeyInput(const KeyEvent& rKEvt) 0L); // consumed - bReturn = sal_True; + bReturn = true; } } } @@ -883,7 +883,7 @@ sal_Bool FuPoor::KeyInput(const KeyEvent& rKEvt) 0L); // consumed - bReturn = sal_True; + bReturn = true; } } } @@ -893,9 +893,9 @@ sal_Bool FuPoor::KeyInput(const KeyEvent& rKEvt) return(bReturn); } -sal_Bool FuPoor::MouseMove(const MouseEvent& ) +bool FuPoor::MouseMove(const MouseEvent& ) { - return sal_False; + return false; } void FuPoor::SelectionHasChanged() @@ -950,7 +950,7 @@ void FuPoor::DoPasteUnformatted() { mpView->InsertData( aDataHelper, mpWindow->PixelToLogic( Rectangle( Point(), mpWindow->GetOutputSizePixel() ).Center() ), - nAction, sal_False, FORMAT_STRING); + nAction, false, FORMAT_STRING); } } } @@ -966,17 +966,17 @@ IMPL_LINK_NOARG(FuPoor, DragHdl) SdrHdl* pHdl = mpView->PickHandle(aMDPos); if ( pHdl==NULL && mpView->IsMarkedHit(aMDPos, nHitLog) - && !mpView->IsPresObjSelected(sal_False, sal_True) ) + && !mpView->IsPresObjSelected(false, true) ) { mpWindow->ReleaseMouse(); - bIsInDragMode = sal_True; + bIsInDragMode = true; mpView->StartDrag( aMDPos, mpWindow ); } } return 0; } -sal_Bool FuPoor::Command(const CommandEvent& rCEvt) +bool FuPoor::Command(const CommandEvent& rCEvt) { return( mpView->Command(rCEvt,mpWindow) ); } @@ -987,7 +987,7 @@ sal_Bool FuPoor::Command(const CommandEvent& rCEvt) IMPL_LINK_NOARG_INLINE_START(FuPoor, DelayHdl) { aDelayToScrollTimer.Stop (); - bScrollable = sal_True; + bScrollable = true; Point aPnt(mpWindow->GetPointerPosPixel()); @@ -999,33 +999,33 @@ IMPL_LINK_NOARG_INLINE_START(FuPoor, DelayHdl) } IMPL_LINK_INLINE_END( FuPoor, DelayHdl, Timer *, pTimer ) -sal_Bool FuPoor::MouseButtonUp (const MouseEvent& rMEvt) +bool FuPoor::MouseButtonUp (const MouseEvent& rMEvt) { // remember button state for creation of own MouseEvents SetMouseButtonCode(rMEvt.GetButtons()); aDelayToScrollTimer.Stop (); return bScrollable = - bDelayActive = sal_False; + bDelayActive = false; } -sal_Bool FuPoor::MouseButtonDown(const MouseEvent& rMEvt) +bool FuPoor::MouseButtonDown(const MouseEvent& rMEvt) { // remember button state for creation of own MouseEvents SetMouseButtonCode(rMEvt.GetButtons()); - return sal_False; + return false; } void FuPoor::StartDelayToScrollTimer () { - bDelayActive = sal_True; + bDelayActive = true; aDelayToScrollTimer.Start (); } -sal_Bool FuPoor::RequestHelp(const HelpEvent& rHEvt) +bool FuPoor::RequestHelp(const HelpEvent& rHEvt) { - sal_Bool bReturn = sal_False; + bool bReturn = false; SdrPageView* pPV = mpView->GetSdrPageView(); diff --git a/sd/source/ui/func/fuprlout.cxx b/sd/source/ui/func/fuprlout.cxx index 05f015109155..10f58307354e 100644 --- a/sd/source/ui/func/fuprlout.cxx +++ b/sd/source/ui/func/fuprlout.cxx @@ -86,7 +86,7 @@ void FuPresentationLayout::DoExecute( SfxRequest& rReq ) mpView->UnmarkAll(); } - sal_Bool bError = sal_False; + bool bError = false; // determine the active page sal_uInt16 nSelectedPage = SDRPAGE_NOTFOUND; @@ -108,19 +108,19 @@ void FuPresentationLayout::DoExecute( SfxRequest& rReq ) /* if we are on a master page, the changes apply for all pages and notes- pages who are using the relevant layout */ - sal_Bool bOnMaster = sal_False; + bool bOnMaster = false; if( mpViewShell && mpViewShell->ISA(DrawViewShell)) { EditMode eEditMode = static_cast<DrawViewShell*>(mpViewShell)->GetEditMode(); if (eEditMode == EM_MASTERPAGE) - bOnMaster = sal_True; + bOnMaster = true; } - sal_Bool bMasterPage = bOnMaster; - sal_Bool bCheckMasters = sal_False; + bool bMasterPage = bOnMaster; + bool bCheckMasters = false; // call dialog - sal_Bool bLoad = sal_False; // appear the new master pages? + bool bLoad = false; // appear the new master pages? OUString aFile; SfxItemSet aSet(mpDoc->GetPool(), ATTR_PRESLAYOUT_START, ATTR_PRESLAYOUT_END); @@ -169,7 +169,7 @@ void FuPresentationLayout::DoExecute( SfxRequest& rReq ) break; default: - bError = sal_True; + bError = true; } delete pDlg; } @@ -185,7 +185,7 @@ void FuPresentationLayout::DoExecute( SfxRequest& rReq ) removing a masterpage, it's possible that you are removing the current masterpage. So you have to call ResetActualPage ! */ if( mpViewShell->ISA(DrawViewShell) && !bCheckMasters ) - static_cast<DrawView*>(mpView)->BlockPageOrderChangedHint(sal_True); + static_cast<DrawView*>(mpView)->BlockPageOrderChangedHint(true); if (bLoad) { @@ -210,7 +210,7 @@ void FuPresentationLayout::DoExecute( SfxRequest& rReq ) // remove blocking if (mpViewShell->ISA(DrawViewShell) && !bCheckMasters ) - static_cast<DrawView*>(mpView)->BlockPageOrderChangedHint(sal_False); + static_cast<DrawView*>(mpView)->BlockPageOrderChangedHint(false); // if the master page was visible, show it again if (!bError && nSelectedPage != SDRPAGE_NOTFOUND) @@ -245,7 +245,7 @@ void FuPresentationLayout::DoExecute( SfxRequest& rReq ) DrawViewShell* pDrawViewSh = static_cast<DrawViewShell*>(mpViewShell); EditMode eMode = pDrawViewSh->GetEditMode(); - sal_Bool bLayer = pDrawViewSh->IsLayerModeActive(); + bool bLayer = pDrawViewSh->IsLayerModeActive(); pDrawViewSh->ChangeEditMode( eMode, !bLayer ); pDrawViewSh->ChangeEditMode( eMode, bLayer ); } diff --git a/sd/source/ui/func/fuprobjs.cxx b/sd/source/ui/func/fuprobjs.cxx index 441c0caf0a1e..a200955bb51f 100644 --- a/sd/source/ui/func/fuprobjs.cxx +++ b/sd/source/ui/func/fuprobjs.cxx @@ -77,7 +77,7 @@ void FuPresentationObjects::DoExecute( SfxRequest& ) OUString aLayoutName = ((SfxStringItem&)aSet.Get(SID_STATUS_LAYOUT)).GetValue(); DBG_ASSERT(!aLayoutName.isEmpty(), "Layout not defined"); - sal_Bool bUnique = sal_False; + bool bUnique = false; sal_Int16 nDepth, nTmp; OutlineView* pOlView = static_cast<OutlineView*>(pOutlineViewShell->GetView()); OutlinerView* pOutlinerView = pOlView->GetViewByWindow( (Window*) mpWindow ); @@ -100,16 +100,16 @@ void FuPresentationObjects::DoExecute( SfxRequest& ) if( nDepth != nTmp ) { - bUnique = sal_False; + bUnique = false; break; } if( pOutl->HasParaFlag( pPara, PARAFLAG_ISPAGE ) != bPage ) { - bUnique = sal_False; + bUnique = false; break; } - bUnique = sal_True; + bUnique = true; ++iter; } diff --git a/sd/source/ui/func/fusearch.cxx b/sd/source/ui/func/fusearch.cxx index f3c1cf22ae6d..704550c353cc 100644 --- a/sd/source/ui/func/fusearch.cxx +++ b/sd/source/ui/func/fusearch.cxx @@ -58,7 +58,7 @@ FuSearch::FuSearch ( SfxRequest& rReq ) : FuPoor(pViewSh, pWin, pView, pDoc, rReq), pSdOutliner(NULL), - bOwnOutliner(sal_False) + bOwnOutliner(false) { } @@ -75,12 +75,12 @@ void FuSearch::DoExecute( SfxRequest& ) if ( mpViewShell->ISA(DrawViewShell) ) { - bOwnOutliner = sal_True; + bOwnOutliner = true; pSdOutliner = new ::sd::Outliner( mpDoc, OUTLINERMODE_TEXTOBJECT ); } else if ( mpViewShell->ISA(OutlineViewShell) ) { - bOwnOutliner = sal_False; + bOwnOutliner = false; pSdOutliner = mpDoc->GetOutliner(); } @@ -114,7 +114,7 @@ void FuSearch::SearchAndReplace( const SvxSearchItem* pSearchItem ) { pSdOutliner->EndSpelling(); - bOwnOutliner = sal_True; + bOwnOutliner = true; pSdOutliner = new ::sd::Outliner( mpDoc, OUTLINERMODE_TEXTOBJECT ); pSdOutliner->PrepareSpelling(); } @@ -123,14 +123,14 @@ void FuSearch::SearchAndReplace( const SvxSearchItem* pSearchItem ) pSdOutliner->EndSpelling(); delete pSdOutliner; - bOwnOutliner = sal_False; + bOwnOutliner = false; pSdOutliner = mpDoc->GetOutliner(); pSdOutliner->PrepareSpelling(); } if (pSdOutliner) { - sal_Bool bEndSpelling = pSdOutliner->StartSearchAndReplace(pSearchItem); + bool bEndSpelling = pSdOutliner->StartSearchAndReplace(pSearchItem); if (bEndSpelling) { diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx index cd8630ea3fb1..82c1c45713e1 100644 --- a/sd/source/ui/func/fusel.cxx +++ b/sd/source/ui/func/fusel.cxx @@ -83,19 +83,19 @@ FuSelection::FuSelection ( SdDrawDocument* pDoc, SfxRequest& rReq) : FuDraw(pViewSh, pWin, pView, pDoc, rReq), - bTempRotation(sal_False), - bSelectionChanged(sal_False), - bHideAndAnimate(sal_False), + bTempRotation(false), + bSelectionChanged(false), + bHideAndAnimate(false), pHdl(NULL), - bSuppressChangesOfSelection(sal_False), - bMirrorSide0(sal_False), + bSuppressChangesOfSelection(false), + bMirrorSide0(false), nEditMode(SID_BEZIER_MOVE), pWaterCanCandidate(NULL) //Add Shift+UP/DOWN/LEFT/RIGHT key to move the position of insert point, //and SHIFT+ENTER key to decide the position and draw the new insert point - ,bBeginInsertPoint(sal_False), + ,bBeginInsertPoint(false), oldPoint(0,0) - ,bMovedToCenterPoint(sal_False) + ,bMovedToCenterPoint(false) { } @@ -125,28 +125,28 @@ FuSelection::~FuSelection() } } -sal_Bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt) +bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt) { // Hack for #?????# - bHideAndAnimate = sal_False; + bHideAndAnimate = false; pHdl = NULL; - sal_Bool bReturn = FuDraw::MouseButtonDown(rMEvt); - sal_Bool bWaterCan = SD_MOD()->GetWaterCan(); + bool bReturn = FuDraw::MouseButtonDown(rMEvt); + bool bWaterCan = SD_MOD()->GetWaterCan(); const bool bReadOnly = mpDocSh->IsReadOnly(); // When the right mouse button is pressed then only select objects // (and deselect others) as a preparation for showing the context // menu. const bool bSelectionOnly = rMEvt.IsRight(); - bMBDown = sal_True; - bSelectionChanged = sal_False; + bMBDown = true; + bSelectionChanged = false; if ( mpView->IsAction() ) { if ( rMEvt.IsRight() ) mpView->BckAction(); - return sal_True; + return true; } sal_uInt16 nDrgLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); @@ -173,7 +173,7 @@ sal_Bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt) long nAngle0 = GetAngle(aMDPos - mpView->GetRef1()); nAngle0 -= 27000; nAngle0 = NormAngle360(nAngle0); - bMirrorSide0 = sal_Bool (nAngle0 < 18000L); + bMirrorSide0 = nAngle0 < 18000L; if (!pHdl && mpView->Is3DRotationCreationActive()) { @@ -181,23 +181,23 @@ sal_Bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt) * If 3D-rotation bodies are about to be created, * end creation now. ******************************************************************/ - bSuppressChangesOfSelection = sal_True; + bSuppressChangesOfSelection = true; if(mpWindow) mpWindow->EnterWait(); mpView->End3DCreation(); - bSuppressChangesOfSelection = sal_False; + bSuppressChangesOfSelection = false; mpView->ResetCreationActive(); if(mpWindow) mpWindow->LeaveWait(); } - sal_Bool bTextEdit = sal_False; + bool bTextEdit = false; SdrViewEvent aVEvt; SdrHitKind eHit = mpView->PickAnything(rMEvt, SDRMOUSEBUTTONDOWN, aVEvt); if ( eHit == SDRHIT_TEXTEDITOBJ && ( mpViewShell->GetFrameView()->IsQuickEdit() || dynamic_cast< sdr::table::SdrTableObj* >( aVEvt.pObj ) != NULL ) ) { - bTextEdit = sal_True; + bTextEdit = true; } if(!bTextEdit @@ -220,20 +220,20 @@ sal_Bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt) else { // hit handle or marked object - bFirstMouseMove = sal_True; + bFirstMouseMove = true; aDragTimer.Start(); } if ( ! rMEvt.IsRight()) mpView->BegDragObj(aMDPos, (OutputDevice*) NULL, pHdl, nDrgLog); - bReturn = sal_True; + bReturn = true; } else { if (!rMEvt.IsMod2() && mpView->PickObj(aMDPos, mpView->getHitTolLog(), pObj, pPV, SDRSEARCH_PICKMACRO)) { mpView->BegMacroObj(aMDPos, nHitLog, pObj, pPV, mpWindow); - bReturn = sal_True; + bReturn = true; } else if ( bTextEdit ) { @@ -280,7 +280,7 @@ sal_Bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt) &aStrItem, &aFrameItem, &aBrowseItem, &aReferer, 0L); } - bReturn = sal_True; + bReturn = true; } else if(!rMEvt.IsMod2() && mpViewShell->ISA(DrawViewShell) @@ -320,7 +320,7 @@ sal_Bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt) { // New: double click on empty space/on obj on MasterPage, leave group mpView->LeaveOneGroup(); - bReturn = sal_True; + bReturn = true; } } } @@ -339,8 +339,8 @@ sal_Bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt) } else { - bReturn = sal_True; - sal_Bool bDeactivateOLE = sal_False; + bReturn = true; + bool bDeactivateOLE = false; if ( !rMEvt.IsShift() && !rMEvt.IsMod2() ) { @@ -351,13 +351,13 @@ sal_Bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt) if (pIPClient && pIPClient->IsObjectInPlaceActive()) { // OLE-Objekt gets deactivated in subsequent UnmarkAll() - bDeactivateOLE = sal_True; + bDeactivateOLE = true; } mpView->UnmarkAll(); } - sal_Bool bMarked = sal_False; + bool bMarked = false; if ( !rMEvt.IsMod1() && !bDeactivateOLE) { @@ -367,12 +367,12 @@ sal_Bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt) } else { - sal_Bool bToggle = sal_False; + bool bToggle = false; if (rMEvt.IsShift() && mpView->GetMarkedObjectList().GetMarkCount() > 1) { // No Toggle on single selection - bToggle = sal_True; + bToggle = true; } bMarked = mpView->MarkObj(aMDPos, nHitLog, bToggle, false); @@ -510,7 +510,7 @@ sal_Bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt) mpView->UnmarkAllObj(); } - sal_Bool bMarked = sal_False; + bool bMarked = false; if (!rMEvt.IsMod1()) { @@ -563,15 +563,15 @@ sal_Bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt) return bReturn; } -sal_Bool FuSelection::MouseMove(const MouseEvent& rMEvt) +bool FuSelection::MouseMove(const MouseEvent& rMEvt) { - sal_Bool bReturn = FuDraw::MouseMove(rMEvt); + bool bReturn = FuDraw::MouseMove(rMEvt); if (aDragTimer.IsActive()) { if(bFirstMouseMove) { - bFirstMouseMove = sal_False; + bFirstMouseMove = false; } else { @@ -601,9 +601,9 @@ sal_Bool FuSelection::MouseMove(const MouseEvent& rMEvt) return (bReturn); } -sal_Bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt) +bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt) { - sal_Bool bReturn = sal_False; + bool bReturn = false; // When the right mouse button is pressed then only select objects // (and deselect others) as a preparation for showing the context // menu. @@ -614,20 +614,20 @@ sal_Bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt) if (bHideAndAnimate) { // Animation is still running -> return immediately - bHideAndAnimate = sal_False; + bHideAndAnimate = false; pHdl = NULL; mpWindow->ReleaseMouse(); - return(sal_True); + return true; } if (aDragTimer.IsActive() ) { aDragTimer.Stop(); - bIsInDragMode = sal_False; + bIsInDragMode = false; } if( !mpView ) - return (sal_False); + return false; Point aPnt( mpWindow->PixelToLogic( rMEvt.GetPosPixel() ) ); sal_uInt16 nHitLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() ); @@ -644,11 +644,11 @@ sal_Bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt) * Object was moved ******************************************************************/ FrameView* pFrameView = mpViewShell->GetFrameView(); - sal_Bool bDragWithCopy = (rMEvt.IsMod1() && pFrameView->IsDragWithCopy()); + bool bDragWithCopy = (rMEvt.IsMod1() && pFrameView->IsDragWithCopy()); if (bDragWithCopy) { - bDragWithCopy = !mpView->IsPresObjSelected(sal_False, sal_True); + bDragWithCopy = !mpView->IsPresObjSelected(false, true); } mpView->SetDragWithCopy(bDragWithCopy); @@ -669,7 +669,7 @@ sal_Bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt) { mpView->UnmarkAllObj(); mpView->MarkObj(pObj,pPV,false,false); - return (sal_True); + return true; } /************************************************************** * Toggle between selection and rotation @@ -692,7 +692,7 @@ sal_Bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt) && ! bSelectionOnly) { - bTempRotation = sal_True; + bTempRotation = true; nSlotId = SID_OBJECT_ROTATE; Activate(); } @@ -706,9 +706,9 @@ sal_Bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt) { if (!pHdl) { - bSuppressChangesOfSelection = sal_True; + bSuppressChangesOfSelection = true; mpView->Start3DCreation(); - bSuppressChangesOfSelection = sal_False; + bSuppressChangesOfSelection = false; } else if (pHdl->GetKind() != HDL_MIRX && pHdl->GetKind() != HDL_REF1 && @@ -721,15 +721,15 @@ sal_Bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt) long nAngle1 = GetAngle(aPnt - mpView->GetRef1()); nAngle1 -= 27000; nAngle1 = NormAngle360(nAngle1); - sal_Bool bMirrorSide1 = sal_Bool (nAngle1 < 18000L); + bool bMirrorSide1 = nAngle1 < 18000L; if (bMirrorSide0 != bMirrorSide1) { - bSuppressChangesOfSelection = sal_True; + bSuppressChangesOfSelection = true; if(mpWindow) mpWindow->EnterWait(); mpView->End3DCreation(); - bSuppressChangesOfSelection = sal_False; + bSuppressChangesOfSelection = false; nSlotId = SID_OBJECT_SELECT; if(mpWindow) mpWindow->LeaveWait(); @@ -799,7 +799,7 @@ sal_Bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt) DoubleClick(rMEvt); } - bMBDown = sal_False; + bMBDown = false; ForcePointer(&rMEvt); pHdl = NULL; @@ -821,7 +821,7 @@ sal_Bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt) (pSingleObj->GetObjInventor() != SdrInventor || pSingleObj->GetObjIdentifier() == OBJ_MEASURE) ) ) { - bReturn = sal_True; + bReturn = true; ForcePointer(&rMEvt); pHdl = NULL; mpWindow->ReleaseMouse(); @@ -846,11 +846,11 @@ sal_Bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt) else if ( mpView->IsDragObj() ) { FrameView* pFrameView = mpViewShell->GetFrameView(); - sal_Bool bDragWithCopy = (rMEvt.IsMod1() && pFrameView->IsDragWithCopy()); + bool bDragWithCopy = (rMEvt.IsMod1() && pFrameView->IsDragWithCopy()); if (bDragWithCopy) { - bDragWithCopy = !mpView->IsPresObjSelected(sal_False, sal_True); + bDragWithCopy = !mpView->IsPresObjSelected(false, true); } mpView->SetDragWithCopy(bDragWithCopy); @@ -901,9 +901,9 @@ sal_Bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt) * Process keyboard input * @returns sal_True if a KeyEvent is being processed, sal_False otherwise */ -sal_Bool FuSelection::KeyInput(const KeyEvent& rKEvt) +bool FuSelection::KeyInput(const KeyEvent& rKEvt) { - sal_Bool bReturn = sal_False; + bool bReturn = false; switch (rKEvt.GetKeyCode().GetCode()) { @@ -957,8 +957,8 @@ sal_Bool FuSelection::KeyInput(const KeyEvent& rKEvt) MouseEvent eMevt(ePoint,1,2, MOUSE_LEFT, 0); MouseMove(eMevt); oldPoint = ePoint; - bMovedToCenterPoint = sal_True; - bReturn = sal_True; + bMovedToCenterPoint = true; + bReturn = true; } } break; @@ -971,16 +971,16 @@ sal_Bool FuSelection::KeyInput(const KeyEvent& rKEvt) MouseEvent aMevt(oldPoint,1,3, MOUSE_LEFT, KEY_SHIFT); MouseButtonDown(aMevt); mpWindow->CaptureMouse(); - bBeginInsertPoint = sal_True; + bBeginInsertPoint = true; } else { //simulate mouse button up action MouseEvent rMEvt(oldPoint,1,17, MOUSE_LEFT, KEY_SHIFT); MouseButtonUp(rMEvt); - bBeginInsertPoint = sal_False; + bBeginInsertPoint = false; } - bReturn= sal_True; + bReturn= true; } break; } @@ -1110,7 +1110,7 @@ void FuSelection::Activate() case SID_CONVERT_TO_3D_LATHE: { eMode = SDRDRAG_MIRROR; - bSuppressChangesOfSelection = sal_True; + bSuppressChangesOfSelection = true; if ( mpView->GetDragMode() != eMode ) mpView->SetDragMode(eMode); @@ -1118,7 +1118,7 @@ void FuSelection::Activate() if (!mpView->Is3DRotationCreationActive()) mpView->Start3DCreation(); - bSuppressChangesOfSelection = sal_False; + bSuppressChangesOfSelection = false; } break; @@ -1134,7 +1134,7 @@ void FuSelection::Activate() if (nSlotId != SID_OBJECT_ROTATE) { - bTempRotation = sal_False; + bTempRotation = false; } FuDraw::Activate(); @@ -1150,7 +1150,7 @@ void FuSelection::Deactivate() void FuSelection::SelectionHasChanged() { - bSelectionChanged = sal_True; + bSelectionChanged = true; FuDraw::SelectionHasChanged(); @@ -1193,11 +1193,11 @@ void FuSelection::SetEditMode(sal_uInt16 nMode) /** * Execute animation or interaction */ -sal_Bool FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos) +bool FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos) { - sal_Bool bAnimated = sal_False; - sal_Bool bClosed = pObj->IsClosedObj(); - sal_Bool bFilled = sal_False; + bool bAnimated = false; + bool bClosed = pObj->IsClosedObj(); + bool bFilled = false; if (bClosed) { @@ -1247,7 +1247,7 @@ sal_Bool FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos) Execute(SID_OPENDOC, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aStrItem, &aFrameItem, &aBrowseItem, &aReferer, 0L); - bAnimated = sal_True; + bAnimated = true; } } else if (!mpDocSh->ISA(GraphicDocShell) && @@ -1269,7 +1269,7 @@ sal_Bool FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos) SfxStringItem aItem(SID_NAVIGATOR_OBJECT, pInfo->GetBookmark()); mpViewShell->GetViewFrame()->GetDispatcher()-> Execute(SID_NAVIGATOR_OBJECT, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, &aItem, 0L); - bAnimated = sal_True; + bAnimated = true; } break; @@ -1289,7 +1289,7 @@ sal_Bool FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos) &aStrItem, &aFrameItem, &aBrowseItem, &aReferer, 0L); } - bAnimated = sal_True; + bAnimated = true; } break; @@ -1300,7 +1300,7 @@ sal_Bool FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos) mpViewShell->GetViewFrame()->GetDispatcher()-> Execute(SID_NAVIGATOR_PAGE, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, &aItem, 0L); - bAnimated = sal_True; + bAnimated = true; } break; @@ -1311,7 +1311,7 @@ sal_Bool FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos) mpViewShell->GetViewFrame()->GetDispatcher()-> Execute(SID_NAVIGATOR_PAGE, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, &aItem, 0L); - bAnimated = sal_True; + bAnimated = true; } break; @@ -1322,7 +1322,7 @@ sal_Bool FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos) mpViewShell->GetViewFrame()->GetDispatcher()-> Execute(SID_NAVIGATOR_PAGE, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, &aItem, 0L); - bAnimated = sal_True; + bAnimated = true; } break; @@ -1333,7 +1333,7 @@ sal_Bool FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos) mpViewShell->GetViewFrame()->GetDispatcher()-> Execute(SID_NAVIGATOR_PAGE, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, &aItem, 0L); - bAnimated = sal_True; + bAnimated = true; } break; @@ -1347,7 +1347,7 @@ sal_Bool FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos) catch( uno::Exception& ) { } - bAnimated = sal_True; + bAnimated = true; } break; @@ -1357,7 +1357,7 @@ sal_Bool FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos) mpView->UnmarkAll(); mpView->MarkObj(pObj, mpView->GetSdrPageView(), false, false); pDrViewSh->DoVerb((sal_Int16)pInfo->mnVerb); - bAnimated = sal_True; + bAnimated = true; } break; @@ -1382,7 +1382,7 @@ sal_Bool FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos) 0L ); } - bAnimated = sal_True; + bAnimated = true; } break; @@ -1403,17 +1403,17 @@ sal_Bool FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos) *pInArgs, aRet, aOutArgsIndex, aOutArgs); // Check the return value from the script - sal_Bool bTmp = sal_False; + bool bTmp = false; if ( eErr == ERRCODE_NONE && aRet.getValueType() == getCppuBooleanType() && ( aRet >>= bTmp ) && - bTmp == sal_True ) + bTmp ) { - bAnimated = sal_True; + bAnimated = true; } else { - bAnimated = sal_False; + bAnimated = false; } } else @@ -1434,7 +1434,7 @@ sal_Bool FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos) default: { - bAnimated = sal_False; + bAnimated = false; } break; } @@ -1458,7 +1458,7 @@ sal_Bool FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos) break; default: - bAnimated = sal_False; + bAnimated = false; break; } } diff --git a/sd/source/ui/func/fusldlg.cxx b/sd/source/ui/func/fusldlg.cxx index b5ac8f79fbe5..ea5333cf133d 100644 --- a/sd/source/ui/func/fusldlg.cxx +++ b/sd/source/ui/func/fusldlg.cxx @@ -115,7 +115,7 @@ void FuSlideShowDlg::DoExecute( SfxRequest& ) { OUString aPage; long nValue32; - sal_Bool bValue; + bool bValue; bool bValuesChanged = false; pDlg->GetAttr( aDlgSet ); diff --git a/sd/source/ui/func/fusnapln.cxx b/sd/source/ui/func/fusnapln.cxx index 5d77e970dac0..69e50f0f28d6 100644 --- a/sd/source/ui/func/fusnapln.cxx +++ b/sd/source/ui/func/fusnapln.cxx @@ -58,7 +58,7 @@ void FuSnapLine::DoExecute( SfxRequest& rReq ) { const SfxItemSet* pArgs = rReq.GetArgs(); sal_uInt16 nHelpLine = 0; - sal_Bool bCreateNew = sal_True; + bool bCreateNew = true; // Get index of snap line or snap point from the request. SFX_REQUEST_ARG (rReq, pHelpLineIndex, SfxUInt32Item, ID_VAL_INDEX, false); @@ -83,7 +83,7 @@ void FuSnapLine::DoExecute( SfxRequest& rReq ) // request. Determine it from the mouse position. aLinePos = static_cast<DrawViewShell*>(mpViewShell)->GetMousePos(); - static_cast<DrawViewShell*>(mpViewShell)->SetMousePosFreezed( sal_False ); + static_cast<DrawViewShell*>(mpViewShell)->SetMousePosFreezed( false ); if ( aLinePos.X() >= 0 ) @@ -126,18 +126,18 @@ void FuSnapLine::DoExecute( SfxRequest& rReq ) if ( rHelpLine.GetKind() == SDRHELPLINE_POINT ) { pDlg->SetText(SD_RESSTR(STR_SNAPDLG_SETPOINT)); - pDlg->SetInputFields(sal_True, sal_True); + pDlg->SetInputFields(true, true); } else { pDlg->SetText(SD_RESSTR(STR_SNAPDLG_SETLINE)); if ( rHelpLine.GetKind() == SDRHELPLINE_VERTICAL ) - pDlg->SetInputFields(sal_True, sal_False); + pDlg->SetInputFields(true, false); else - pDlg->SetInputFields(sal_False, sal_True); + pDlg->SetInputFields(false, true); } - bCreateNew = sal_False; + bCreateNew = false; } else pDlg->HideDeleteBtn(); diff --git a/sd/source/ui/func/fusumry.cxx b/sd/source/ui/func/fusumry.cxx index f8ef7f027cfb..a5ae8c0d8b5f 100644 --- a/sd/source/ui/func/fusumry.cxx +++ b/sd/source/ui/func/fusumry.cxx @@ -132,7 +132,7 @@ void FuSummaryPage::DoExecute( SfxRequest& ) // use MasterPage of the current page pSummaryPage->TRG_SetMasterPage(pActualPage->TRG_GetMasterPage()); pSummaryPage->SetLayoutName(pActualPage->GetLayoutName()); - pSummaryPage->SetAutoLayout(AUTOLAYOUT_ENUM, sal_True); + pSummaryPage->SetAutoLayout(AUTOLAYOUT_ENUM, true); pSummaryPage->TRG_SetMasterPageVisibleLayers(aVisibleLayers); pSummaryPage->setHeaderFooterSettings(pActualPage->getHeaderFooterSettings()); @@ -154,7 +154,7 @@ void FuSummaryPage::DoExecute( SfxRequest& ) // use MasterPage of the current page pNotesPage->TRG_SetMasterPage(pActualNotesPage->TRG_GetMasterPage()); pNotesPage->SetLayoutName(pActualNotesPage->GetLayoutName()); - pNotesPage->SetAutoLayout(pActualNotesPage->GetAutoLayout(), sal_True); + pNotesPage->SetAutoLayout(pActualNotesPage->GetAutoLayout(), true); pNotesPage->TRG_SetMasterPageVisibleLayers(aVisibleLayers); pNotesPage->setHeaderFooterSettings(pActualNotesPage->getHeaderFooterSettings()); diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx index 289bb09aced7..1dd0c403ba20 100644 --- a/sd/source/ui/func/futempl.cxx +++ b/sd/source/ui/func/futempl.cxx @@ -258,7 +258,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq ) if (pArgs && pArgs->GetItemState( nSId ) == SFX_ITEM_SET) { aStyleName = ( ( (const SfxStringItem &) pArgs->Get( nSId ) ).GetValue() ); - SD_MOD()->SetWaterCan( sal_True ); + SD_MOD()->SetWaterCan( true ); pStyleSheet = pSSPool->Find( aStyleName, (SfxStyleFamily) nFamily); } // no presentation object templates, they are only allowed implicitly @@ -272,11 +272,11 @@ void FuTemplate::DoExecute( SfxRequest& rReq ) } else - SD_MOD()->SetWaterCan( sal_False ); + SD_MOD()->SetWaterCan( false ); } else { - SD_MOD()->SetWaterCan( sal_False ); + SD_MOD()->SetWaterCan( false ); // we have to re-enable to tools-bar mpViewShell->Invalidate(); } @@ -299,7 +299,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq ) SfxAbstractTabDialog* pStdDlg = NULL; SfxAbstractTabDialog* pPresDlg = NULL; SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create(); - sal_Bool bOldDocInOtherLanguage = sal_False; + bool bOldDocInOtherLanguage = false; SfxItemSet aOriSet( pStyleSheet->GetItemSet() ); SfxStyleFamily eFamily = pStyleSheet->GetFamily(); @@ -365,7 +365,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq ) else { OSL_FAIL("StyleSheet from older version with different language"); - bOldDocInOtherLanguage = sal_True; + bOldDocInOtherLanguage = true; } if( !bOldDocInOtherLanguage ) @@ -596,7 +596,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq ) { nRetMask = pStyleSheet->GetMask(); SfxItemSet aCoreSet( mpDoc->GetPool() ); - mpView->GetAttributes( aCoreSet, sal_True ); + mpView->GetAttributes( aCoreSet, true ); // if the object had a template, this becomes parent of the new template SfxStyleSheet* pOldStyle = mpView->GetStyleSheet(); diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx index 9c48716478bf..0b925970aa8d 100644 --- a/sd/source/ui/func/futext.cxx +++ b/sd/source/ui/func/futext.cxx @@ -132,14 +132,14 @@ static sal_uInt16 SidArray[] = { TYPEINIT1( FuText, FuConstruct ); -static sal_Bool bTestText = 0; +static bool bTestText = false; /** * base class for text functions */ FuText::FuText( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ) : FuConstruct(pViewSh, pWin, pView, pDoc, rReq) -, bFirstObjCreated(sal_False) +, bFirstObjCreated(false) , bJustEndedEdit(false) , rRequest (rReq) { @@ -228,7 +228,7 @@ void FuText::DoExecute( SfxRequest& ) } } - sal_Bool bQuickDrag = sal_True; + bool bQuickDrag = true; const SfxItemSet* pArgs = rRequest.GetArgs(); @@ -241,18 +241,18 @@ void FuText::DoExecute( SfxRequest& ) && (sal_uInt16)((SfxUInt16Item&)pArgs->Get(SID_TEXTEDIT)).GetValue() == 2) { // Selection by doubleclick -> don't allow QuickDrag - bQuickDrag = sal_False; + bQuickDrag = false; } SetInEditMode(aMEvt, bQuickDrag); } -sal_Bool FuText::MouseButtonDown(const MouseEvent& rMEvt) +bool FuText::MouseButtonDown(const MouseEvent& rMEvt) { - bMBDown = sal_True; + bMBDown = true; bJustEndedEdit = false; - sal_Bool bReturn = FuDraw::MouseButtonDown(rMEvt); + bool bReturn = FuDraw::MouseButtonDown(rMEvt); mpView->SetMarkHdlWhenTextEdit(true); SdrViewEvent aVEvt; @@ -262,7 +262,7 @@ sal_Bool FuText::MouseButtonDown(const MouseEvent& rMEvt) { // hit text -> SdrView handles event if (mpView->MouseButtonDown(rMEvt, mpWindow)) - return (sal_True); + return true; } if (rMEvt.GetClicks() == 1) @@ -296,11 +296,11 @@ sal_Bool FuText::MouseButtonDown(const MouseEvent& rMEvt) if (eHit == SDRHIT_TEXTEDIT) { - SetInEditMode(rMEvt, sal_False); + SetInEditMode(rMEvt, false); } else { - sal_Bool bMacro = sal_False; + bool bMacro = false; if (bMacro && mpView->PickObj(aMDPos,mpView->getHitTolLog(),pObj,pPV,SDRSEARCH_PICKMACRO)) { @@ -339,7 +339,7 @@ sal_Bool FuText::MouseButtonDown(const MouseEvent& rMEvt) mxTextObj.reset( static_cast<SdrTextObj*>(aVEvt.pObj) ); } - SetInEditMode(rMEvt, sal_True); + SetInEditMode(rMEvt, true); } else if (aVEvt.eEvent == SDREVENT_EXECUTEURL && !rMEvt.IsMod2()) { @@ -404,7 +404,7 @@ sal_Bool FuText::MouseButtonDown(const MouseEvent& rMEvt) } // Drag object - bFirstMouseMove = sal_True; + bFirstMouseMove = true; aDragTimer.Start(); } @@ -446,7 +446,7 @@ sal_Bool FuText::MouseButtonDown(const MouseEvent& rMEvt) else if ( rMEvt.GetClicks() == 2 && !mpView->IsTextEdit() ) { MouseEvent aMEvt( mpWindow->GetPointerPosPixel() ); - SetInEditMode( aMEvt, sal_False ); + SetInEditMode( aMEvt, false ); } if (!bIsInDragMode) @@ -458,14 +458,14 @@ sal_Bool FuText::MouseButtonDown(const MouseEvent& rMEvt) return (bReturn); } -sal_Bool FuText::MouseMove(const MouseEvent& rMEvt) +bool FuText::MouseMove(const MouseEvent& rMEvt) { - sal_Bool bReturn = FuDraw::MouseMove(rMEvt); + bool bReturn = FuDraw::MouseMove(rMEvt); if (aDragTimer.IsActive() ) { if( bFirstMouseMove ) - bFirstMouseMove = sal_False; + bFirstMouseMove = false; else aDragTimer.Stop(); } @@ -592,15 +592,15 @@ void FuText::ImpSetAttributesFitCommon(SdrTextObj* pTxtObj) } } -sal_Bool FuText::MouseButtonUp(const MouseEvent& rMEvt) +bool FuText::MouseButtonUp(const MouseEvent& rMEvt) { - sal_Bool bReturn = sal_False; + bool bReturn = false; SdrObject* pObj; SdrPageView* pPV; if (aDragTimer.IsActive()) { aDragTimer.Stop(); - bIsInDragMode = sal_False; + bIsInDragMode = false; } mpViewShell->GetViewFrame()->GetBindings().Invalidate( SidArray ); @@ -608,9 +608,9 @@ sal_Bool FuText::MouseButtonUp(const MouseEvent& rMEvt) Point aPnt( mpWindow->PixelToLogic( rMEvt.GetPosPixel() ) ); if( (mpView && mpView->MouseButtonUp(rMEvt, mpWindow)) || rMEvt.GetClicks() == 2 ) - return (sal_True); // handle event from SdrView + return true; // handle event from SdrView - sal_Bool bEmptyTextObj = sal_False; + bool bEmptyTextObj = false; if (mxTextObj.is()) { @@ -624,9 +624,9 @@ sal_Bool FuText::MouseButtonUp(const MouseEvent& rMEvt) && ( rMarkList.GetMark(0)->GetMarkedSdrObj() == mxTextObj.get()) ) { if( mxTextObj.is() && !GetTextObj()->GetOutlinerParaObject() ) - bEmptyTextObj = sal_True; + bEmptyTextObj = true; else - bFirstObjCreated = sal_True; + bFirstObjCreated = true; bReset = false; } } @@ -641,11 +641,11 @@ sal_Bool FuText::MouseButtonUp(const MouseEvent& rMEvt) { // object was moved FrameView* pFrameView = mpViewShell->GetFrameView(); - sal_Bool bDragWithCopy = (rMEvt.IsMod1() && pFrameView->IsDragWithCopy()); + bool bDragWithCopy = (rMEvt.IsMod1() && pFrameView->IsDragWithCopy()); if (bDragWithCopy) { - bDragWithCopy = !mpView->IsPresObjSelected(sal_False, sal_True); + bDragWithCopy = !mpView->IsPresObjSelected(false, true); } mpView->SetDragWithCopy(bDragWithCopy); @@ -688,7 +688,7 @@ sal_Bool FuText::MouseButtonUp(const MouseEvent& rMEvt) // vertical when there was a vertical one used last time. OutlinerParaObject* pOPO = GetTextObj()->GetOutlinerParaObject(); SdrOutliner& rOutl = mxTextObj->GetModel()->GetDrawOutliner(GetTextObj()); - sal_Bool bVertical((pOPO && pOPO->IsVertical()) + bool bVertical((pOPO && pOPO->IsVertical()) || nSlotId == SID_ATTR_CHAR_VERTICAL || nSlotId == SID_TEXT_FITTOSIZE_VERTICAL); rOutl.SetVertical(bVertical); @@ -723,13 +723,13 @@ sal_Bool FuText::MouseButtonUp(const MouseEvent& rMEvt) { ImpSetAttributesFitToSize(GetTextObj()); - SetInEditMode(rMEvt, sal_False); + SetInEditMode(rMEvt, false); } else if ( nSlotId == SID_TEXT_FITTOSIZE_VERTICAL ) { ImpSetAttributesFitToSizeVertical(GetTextObj()); - SetInEditMode(rMEvt, sal_False); + SetInEditMode(rMEvt, false); } else { @@ -738,7 +738,7 @@ sal_Bool FuText::MouseButtonUp(const MouseEvent& rMEvt) // thereby the handles and the gray frame are correct mpView->AdjustMarkHdl(); mpView->PickHandle(aPnt); - SetInEditMode(rMEvt, sal_False); + SetInEditMode(rMEvt, false); } } else if ( mpView && mpView->IsAction()) @@ -774,7 +774,7 @@ sal_Bool FuText::MouseButtonUp(const MouseEvent& rMEvt) sal_uInt16 nDrgLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() ); mpView->BegCreateObj(aMDPos, (OutputDevice*) NULL, nDrgLog); - sal_Bool bSnapEnabled = mpView->IsSnapEnabled(); + bool bSnapEnabled = mpView->IsSnapEnabled(); if (bSnapEnabled) mpView->SetSnapEnabled(false); @@ -873,10 +873,10 @@ sal_Bool FuText::MouseButtonUp(const MouseEvent& rMEvt) GetTextObj()->SetMergedItemSet(aSet); GetTextObj()->SetDisableAutoWidthOnDragging(true); - SetInEditMode(rMEvt, sal_False); + SetInEditMode(rMEvt, false); } - bFirstObjCreated = sal_True; + bFirstObjCreated = true; } else { @@ -895,7 +895,7 @@ sal_Bool FuText::MouseButtonUp(const MouseEvent& rMEvt) bJustEndedEdit = false; FuPoor::cancel(); } - bMBDown = sal_False; + bMBDown = false; FuConstruct::MouseButtonUp(rMEvt); return (bReturn); } @@ -904,13 +904,13 @@ sal_Bool FuText::MouseButtonUp(const MouseEvent& rMEvt) * handle keyboard events * @returns sal_True if the event was handled, sal_False otherwise */ -sal_Bool FuText::KeyInput(const KeyEvent& rKEvt) +bool FuText::KeyInput(const KeyEvent& rKEvt) { - sal_Bool bReturn = sal_False; + bool bReturn = false; mpView->SetMarkHdlWhenTextEdit(true); KeyCode nCode = rKEvt.GetKeyCode(); - sal_Bool bShift = nCode.IsShift(); + bool bShift = nCode.IsShift(); if(mxTextObj.is()) { @@ -933,14 +933,14 @@ sal_Bool FuText::KeyInput(const KeyEvent& rKEvt) if ( mxTextObj.is() && mxTextObj->GetObjInventor() == SdrInventor && mxTextObj->GetObjIdentifier() == OBJ_TITLETEXT && rKEvt.GetKeyCode().GetCode() == KEY_RETURN ) { // title text object: always soft breaks - bShift = sal_True; + bShift = true; } sal_uInt16 nKey = nCode.GetCode(); KeyCode aKeyCode (nKey, bShift, nCode.IsMod1(), nCode.IsMod2(), nCode.IsMod3() ); KeyEvent aKEvt(rKEvt.GetCharCode(), aKeyCode); - sal_Bool bOK = sal_True; + bool bOK = true; if (mpDocSh->IsReadOnly()) { @@ -948,12 +948,12 @@ sal_Bool FuText::KeyInput(const KeyEvent& rKEvt) } if( aKeyCode.GetCode() == KEY_PAGEUP || aKeyCode.GetCode() == KEY_PAGEDOWN ) { - bOK = sal_False; // default handling in base class + bOK = false; // default handling in base class } if (bOK && mpView->KeyInput(aKEvt, mpWindow) ) { - bReturn = sal_True; + bReturn = true; mpViewShell->GetViewFrame()->GetBindings().Invalidate( SidArray ); @@ -1015,7 +1015,7 @@ void FuText::Deactivate() /** * Sets the object into the edit mode. */ -void FuText::SetInEditMode(const MouseEvent& rMEvt, sal_Bool bQuickDrag) +void FuText::SetInEditMode(const MouseEvent& rMEvt, bool bQuickDrag) { SdrPageView* pPV = mpView->GetSdrPageView(); if( mxTextObj.is() && (mxTextObj->GetPage() == pPV->GetPage()) ) @@ -1027,7 +1027,7 @@ void FuText::SetInEditMode(const MouseEvent& rMEvt, sal_Bool bQuickDrag) else mpView->SetEditMode(SDREDITMODE_EDIT); - sal_Bool bEmptyOutliner = sal_False; + bool bEmptyOutliner = false; if (!GetTextObj()->GetOutlinerParaObject() && mpView->GetTextEditOutliner()) { @@ -1040,7 +1040,7 @@ void FuText::SetInEditMode(const MouseEvent& rMEvt, sal_Bool bQuickDrag) // with only one paragraph if (pOutl->GetText(p1stPara).isEmpty()) { - bEmptyOutliner = sal_True; + bEmptyOutliner = true; } } } @@ -1077,7 +1077,7 @@ void FuText::SetInEditMode(const MouseEvent& rMEvt, sal_Bool bQuickDrag) if (mpView->SdrBeginTextEdit(pTextObj, pPV, mpWindow, true, pOutl) && mxTextObj->GetObjInventor() == SdrInventor) { - bFirstObjCreated = sal_True; + bFirstObjCreated = true; DeleteDefaultText(); OutlinerView* pOLV = mpView->GetTextEditOutlinerView(); @@ -1132,9 +1132,9 @@ void FuText::SetInEditMode(const MouseEvent& rMEvt, sal_Bool bQuickDrag) /** * Text entry is started, if necessary delete the default text. */ -sal_Bool FuText::DeleteDefaultText() +bool FuText::DeleteDefaultText() { - sal_Bool bDeleted = sal_False; + bool bDeleted = false; if ( mxTextObj.is() && mxTextObj->IsEmptyPresObj() ) { @@ -1152,7 +1152,7 @@ sal_Bool FuText::DeleteDefaultText() { ::Outliner* pOutliner = mpView->GetTextEditOutliner(); SfxStyleSheet* pSheet = pOutliner->GetStyleSheet( 0 ); - sal_Bool bIsUndoEnabled = pOutliner->IsUndoEnabled(); + bool bIsUndoEnabled = pOutliner->IsUndoEnabled(); if( bIsUndoEnabled ) pOutliner->EnableUndo(false); @@ -1166,7 +1166,7 @@ sal_Bool FuText::DeleteDefaultText() pOutliner->SetStyleSheet(0, pSheet); mxTextObj->SetEmptyPresObj(true); - bDeleted = sal_True; + bDeleted = true; } } } @@ -1174,14 +1174,14 @@ sal_Bool FuText::DeleteDefaultText() return(bDeleted); } -sal_Bool FuText::Command(const CommandEvent& rCEvt) +bool FuText::Command(const CommandEvent& rCEvt) { - return( FuPoor::Command(rCEvt) ); + return FuPoor::Command(rCEvt); } -sal_Bool FuText::RequestHelp(const HelpEvent& rHEvt) +bool FuText::RequestHelp(const HelpEvent& rHEvt) { - sal_Bool bReturn = sal_False; + bool bReturn = false; OutlinerView* pOLV = mpView->GetTextEditOutlinerView(); @@ -1270,7 +1270,7 @@ void FuText::ReceiveRequest(SfxRequest& rReq) } } - sal_Bool bQuickDrag = sal_True; + bool bQuickDrag = true; const SfxItemSet* pArgs = rReq.GetArgs(); @@ -1283,7 +1283,7 @@ void FuText::ReceiveRequest(SfxRequest& rReq) && (sal_uInt16) ((SfxUInt16Item&) pArgs->Get(SID_TEXTEDIT)).GetValue() == 2) { // selection wit double click -> do not allow QuickDrag - bQuickDrag = sal_False; + bQuickDrag = false; } SetInEditMode(aMEvt, bQuickDrag); @@ -1312,7 +1312,7 @@ SdrObject* FuText::CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rR SdrTextObj* pText = (SdrTextObj*)pObj; pText->SetLogicRect(rRectangle); - sal_Bool bVertical = (SID_ATTR_CHAR_VERTICAL == nID || SID_TEXT_FITTOSIZE_VERTICAL == nID); + bool bVertical = (SID_ATTR_CHAR_VERTICAL == nID || SID_TEXT_FITTOSIZE_VERTICAL == nID); pText->SetVerticalWriting(bVertical); ImpSetAttributesForNewTextObject(pText); diff --git a/sd/source/ui/func/fuzoom.cxx b/sd/source/ui/func/fuzoom.cxx index e5e2e770b1bb..f3bda04bfdaa 100644 --- a/sd/source/ui/func/fuzoom.cxx +++ b/sd/source/ui/func/fuzoom.cxx @@ -49,8 +49,8 @@ FuZoom::FuZoom( SdDrawDocument* pDoc, SfxRequest& rReq) : FuPoor(pViewSh, pWin, pView, pDoc, rReq), - bVisible(sal_False), - bStartDrag(sal_False) + bVisible(false), + bStartDrag(false) { } @@ -61,8 +61,8 @@ FuZoom::~FuZoom() // Hide ZoomRect mpViewShell->DrawMarkRect(aZoomRect); - bVisible = sal_False; - bStartDrag = sal_False; + bVisible = false; + bStartDrag = false; } } @@ -72,21 +72,21 @@ rtl::Reference<FuPoor> FuZoom::Create( ViewShell* pViewSh, ::sd::Window* pWin, : return xFunc; } -sal_Bool FuZoom::MouseButtonDown(const MouseEvent& rMEvt) +bool FuZoom::MouseButtonDown(const MouseEvent& rMEvt) { // remember button state for creation of own MouseEvents SetMouseButtonCode(rMEvt.GetButtons()); mpWindow->CaptureMouse(); - bStartDrag = sal_True; + bStartDrag = true; aBeginPosPix = rMEvt.GetPosPixel(); aBeginPos = mpWindow->PixelToLogic(aBeginPosPix); - return sal_True; + return true; } -sal_Bool FuZoom::MouseMove(const MouseEvent& rMEvt) +bool FuZoom::MouseMove(const MouseEvent& rMEvt) { if (bStartDrag) { @@ -125,13 +125,13 @@ sal_Bool FuZoom::MouseMove(const MouseEvent& rMEvt) mpViewShell->DrawMarkRect(aZoomRect); } - bVisible = sal_True; + bVisible = true; } return bStartDrag; } -sal_Bool FuZoom::MouseButtonUp(const MouseEvent& rMEvt) +bool FuZoom::MouseButtonUp(const MouseEvent& rMEvt) { // remember button state for creation of own MouseEvents SetMouseButtonCode(rMEvt.GetButtons()); @@ -140,7 +140,7 @@ sal_Bool FuZoom::MouseButtonUp(const MouseEvent& rMEvt) { // Hide ZoomRect mpViewShell->DrawMarkRect(aZoomRect); - bVisible = sal_False; + bVisible = false; } Point aPosPix = rMEvt.GetPosPixel(); @@ -171,11 +171,11 @@ sal_Bool FuZoom::MouseButtonUp(const MouseEvent& rMEvt) mpWindow->GetOutputSizePixel())); mpViewShell->GetZoomList()->InsertZoomRect(aVisAreaWin); - bStartDrag = sal_False; + bStartDrag = false; mpWindow->ReleaseMouse(); mpViewShell->Cancel(); - return sal_True; + return true; } void FuZoom::Activate() diff --git a/sd/source/ui/func/smarttag.cxx b/sd/source/ui/func/smarttag.cxx index e0612b0ec588..c6fc83a08d8c 100644 --- a/sd/source/ui/func/smarttag.cxx +++ b/sd/source/ui/func/smarttag.cxx @@ -125,16 +125,16 @@ sal_uLong SmartTag::GetMarkedPointCount() const -sal_Bool SmartTag::MarkPoint(SdrHdl& /*rHdl*/, sal_Bool /*bUnmark*/ ) +bool SmartTag::MarkPoint(SdrHdl& /*rHdl*/, bool /*bUnmark*/ ) { - return sal_False; + return false; } -sal_Bool SmartTag::MarkPoints(const Rectangle* /*pRect*/, sal_Bool /*bUnmark*/ ) +bool SmartTag::MarkPoints(const Rectangle* /*pRect*/, bool /*bUnmark*/ ) { - return sal_False; + return false; } @@ -358,7 +358,7 @@ bool SmartTagSet::getContext( SdrViewContext& rContext ) const // support point editing -sal_Bool SmartTagSet::HasMarkablePoints() const +bool SmartTagSet::HasMarkablePoints() const { return GetMarkablePointCount() != 0 ? sal_True : sal_False; } @@ -374,7 +374,7 @@ sal_uLong SmartTagSet::GetMarkablePointCount() const -sal_Bool SmartTagSet::HasMarkedPoints() const +bool SmartTagSet::HasMarkedPoints() const { return GetMarkedPointCount() != 0 ? sal_True : sal_False; } @@ -391,7 +391,7 @@ sal_uLong SmartTagSet::GetMarkedPointCount() const -sal_Bool SmartTagSet::IsPointMarkable(const SdrHdl& rHdl) const +bool SmartTagSet::IsPointMarkable(const SdrHdl& rHdl) const { const SmartHdl* pSmartHdl = dynamic_cast< const SmartHdl* >( &rHdl ); @@ -400,21 +400,21 @@ sal_Bool SmartTagSet::IsPointMarkable(const SdrHdl& rHdl) const -sal_Bool SmartTagSet::MarkPoint(SdrHdl& rHdl, sal_Bool bUnmark ) +bool SmartTagSet::MarkPoint(SdrHdl& rHdl, bool bUnmark ) { if( mxSelectedTag.is() ) return mxSelectedTag->MarkPoint( rHdl, bUnmark ); - return sal_False; + return false; } -sal_Bool SmartTagSet::MarkPoints(const Rectangle* pRect, sal_Bool bUnmark) +bool SmartTagSet::MarkPoints(const Rectangle* pRect, bool bUnmark) { if( mxSelectedTag.is() ) return mxSelectedTag->MarkPoints( pRect, bUnmark ); - return sal_False; + return false; } diff --git a/sd/source/ui/func/unprlout.cxx b/sd/source/ui/func/unprlout.cxx index 5d85e83fc585..a0ef9e1e4430 100644 --- a/sd/source/ui/func/unprlout.cxx +++ b/sd/source/ui/func/unprlout.cxx @@ -34,7 +34,7 @@ SdPresentationLayoutUndoAction::SdPresentationLayoutUndoAction( const OUString& aTheNewLayoutName, AutoLayout eTheOldAutoLayout, AutoLayout eTheNewAutoLayout, - sal_Bool bSet, + bool bSet, SdPage* pThePage): SdUndoAction(pTheDoc) { @@ -51,16 +51,16 @@ SdPresentationLayoutUndoAction::SdPresentationLayoutUndoAction( void SdPresentationLayoutUndoAction::Undo() { - pPage->SetPresentationLayout(aOldLayoutName, sal_True, sal_True, sal_True); + pPage->SetPresentationLayout(aOldLayoutName, true, true, true); if (bSetAutoLayout) - pPage->SetAutoLayout(eOldAutoLayout, sal_True); + pPage->SetAutoLayout(eOldAutoLayout, true); } void SdPresentationLayoutUndoAction::Redo() { pPage->SetPresentationLayout(aNewLayoutName); if (bSetAutoLayout) - pPage->SetAutoLayout(eNewAutoLayout, sal_True); + pPage->SetAutoLayout(eNewAutoLayout, true); } SdPresentationLayoutUndoAction::~SdPresentationLayoutUndoAction() diff --git a/sd/source/ui/inc/AccessibleSlideSorterObject.hxx b/sd/source/ui/inc/AccessibleSlideSorterObject.hxx index ca57b9f4a065..351c28e1b7b6 100644 --- a/sd/source/ui/inc/AccessibleSlideSorterObject.hxx +++ b/sd/source/ui/inc/AccessibleSlideSorterObject.hxx @@ -235,7 +235,7 @@ private: @return sal_True, if the object is disposed or in the course of being disposed. Otherwise, sal_False is returned. */ - sal_Bool IsDisposed (void); + bool IsDisposed (void); }; diff --git a/sd/source/ui/inc/AccessibleSlideSorterView.hxx b/sd/source/ui/inc/AccessibleSlideSorterView.hxx index 0ed08adf88bf..9139740632e1 100644 --- a/sd/source/ui/inc/AccessibleSlideSorterView.hxx +++ b/sd/source/ui/inc/AccessibleSlideSorterView.hxx @@ -318,7 +318,7 @@ private: @return sal_True, if the object is disposed or in the course of being disposed. Otherwise, sal_False is returned. */ - sal_Bool IsDisposed (void); + bool IsDisposed (void); }; } // end of namespace ::accessibility diff --git a/sd/source/ui/inc/BreakDlg.hxx b/sd/source/ui/inc/BreakDlg.hxx index ddb279acaf0e..0669795e78d5 100644 --- a/sd/source/ui/inc/BreakDlg.hxx +++ b/sd/source/ui/inc/BreakDlg.hxx @@ -63,7 +63,7 @@ private: DrawView* pDrView; - sal_Bool bCancel; + bool bCancel; Timer aTimer; SvdProgressInfo *pProgrInfo; diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx index 7f125242bb09..151ed6975889 100644 --- a/sd/source/ui/inc/DrawDocShell.hxx +++ b/sd/source/ui/inc/DrawDocShell.hxx @@ -59,18 +59,18 @@ private: public: DrawDocShell ( SfxObjectCreateMode eMode = SFX_CREATE_MODE_EMBEDDED, - sal_Bool bSdDataObj=sal_False, + bool bSdDataObj=false, DocumentType=DOCUMENT_TYPE_IMPRESS); DrawDocShell ( const sal_uInt64 nModelCreationFlags, - sal_Bool bSdDataObj=sal_False, + bool bSdDataObj=false, DocumentType=DOCUMENT_TYPE_IMPRESS); DrawDocShell ( SdDrawDocument* pDoc, SfxObjectCreateMode eMode = SFX_CREATE_MODE_EMBEDDED, - sal_Bool bSdDataObj=sal_False, + bool bSdDataObj=false, DocumentType=DOCUMENT_TYPE_IMPRESS); virtual ~DrawDocShell(); @@ -116,11 +116,11 @@ public: SdDrawDocument* GetDoc(); DocumentType GetDocumentType() const { return meDocType; } - SfxPrinter* GetPrinter(sal_Bool bCreate); + SfxPrinter* GetPrinter(bool bCreate); void SetPrinter(SfxPrinter *pNewPrinter); void UpdateFontList(); - sal_Bool IsInDestruction() const { return mbInDestruction; } + bool IsInDestruction() const { return mbInDestruction; } void CancelSearching(); @@ -131,12 +131,12 @@ public: void Disconnect(sd::ViewShell* pViewSh); void UpdateTablePointers(); - sal_Bool GotoBookmark(const OUString& rBookmark); + bool GotoBookmark(const OUString& rBookmark); //realize multi-selection of objects - sal_Bool GotoTreeBookmark(const OUString& rBookmark); - sal_Bool IsMarked( SdrObject* pObject ); - sal_Bool GetObjectIsmarked(const OUString& rBookmark); + bool GotoTreeBookmark(const OUString& rBookmark); + bool IsMarked( SdrObject* pObject ); + bool GetObjectIsmarked(const OUString& rBookmark); Bitmap GetPagePreviewBitmap(SdPage* pPage, sal_uInt16 nMaxEdgePixel); /** checks, if the given name is a valid new name for a slide @@ -154,12 +154,12 @@ public: a default name of a not-yet-existing slide (e.g. 'Slide 17'), sal_True is returned, but rName is set to an empty string. */ - sal_Bool CheckPageName(::Window* pWin, OUString& rName ); + bool CheckPageName(::Window* pWin, OUString& rName ); - void SetSlotFilter(sal_Bool bEnable = sal_False, sal_uInt16 nCount = 0, const sal_uInt16* pSIDs = NULL) { mbFilterEnable = bEnable; mnFilterCount = nCount; mpFilterSIDs = pSIDs; } + void SetSlotFilter(bool bEnable = false, sal_uInt16 nCount = 0, const sal_uInt16* pSIDs = NULL) { mbFilterEnable = bEnable; mnFilterCount = nCount; mpFilterSIDs = pSIDs; } void ApplySlotFilter() const; - sal_uInt16 GetStyleFamily() const { return mnStyleFamily; } + sal_uInt16 GetStyleFamily() const { return mnStyleFamily; } void SetStyleFamily( sal_uInt16 nSF ) { mnStyleFamily = nSF; } /** executes the SID_OPENDOC slot to let the framework open a document @@ -217,11 +217,11 @@ protected: sal_uInt16 mnStyleFamily; const sal_uInt16* mpFilterSIDs; sal_uInt16 mnFilterCount; - sal_Bool mbFilterEnable; - sal_Bool mbSdDataObj; - sal_Bool mbInDestruction; - sal_Bool mbOwnPrinter; - sal_Bool mbNewDocument; + bool mbFilterEnable; + bool mbSdDataObj; + bool mbInDestruction; + bool mbOwnPrinter; + bool mbNewDocument; bool mbOwnDocument; // if true, we own mpDoc and will delete it in our d'tor void Construct(bool bClipboard); @@ -229,8 +229,8 @@ protected: public: virtual void setDocAccTitle( const OUString& rTitle ); virtual const OUString getDocAccTitle() const; - virtual void setDocReadOnly( sal_Bool bReadOnly); - virtual sal_Bool getDocReadOnly() const; + virtual void setDocReadOnly( bool bReadOnly); + virtual bool getDocReadOnly() const; }; #ifndef SV_DECL_DRAW_DOC_SHELL_DEFINED diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx index 57d830141de5..87670c1da23b 100644 --- a/sd/source/ui/inc/DrawViewShell.hxx +++ b/sd/source/ui/inc/DrawViewShell.hxx @@ -127,7 +127,7 @@ public: void HidePage(); - virtual sal_Bool KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin) SAL_OVERRIDE; + virtual bool KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin) SAL_OVERRIDE; virtual void MouseMove(const MouseEvent& rMEvt, ::sd::Window* pWin) SAL_OVERRIDE; virtual void MouseButtonUp(const MouseEvent& rMEvt, ::sd::Window* pWin) SAL_OVERRIDE; virtual void MouseButtonDown(const MouseEvent& rMEvt, ::sd::Window* pWin) SAL_OVERRIDE; @@ -159,7 +159,7 @@ public: virtual void UIActivating( SfxInPlaceClient* ) SAL_OVERRIDE; virtual void UIDeactivated( SfxInPlaceClient* ) SAL_OVERRIDE; virtual OUString GetSelectionText( bool bCompleteWords = false ); - virtual sal_Bool HasSelection( sal_Bool bText = sal_True ) const; + virtual bool HasSelection( bool bText = true ) const; void ExecCtrl(SfxRequest& rReq); void GetCtrlState(SfxItemSet& rSet); @@ -231,13 +231,13 @@ public: const Ruler& rRuler, const MouseEvent& rMEvt); - virtual bool PrepareClose( sal_Bool bUI = sal_True ) SAL_OVERRIDE; + virtual bool PrepareClose( bool bUI = true ) SAL_OVERRIDE; PageKind GetPageKind() { return mePageKind; } Point GetMousePos() { return maMousePos; } - sal_Bool IsMousePosFreezed() { return mbMousePosFreezed; } - void SetMousePosFreezed( sal_Bool bIn ) { mbMousePosFreezed = bIn; } + bool IsMousePosFreezed() { return mbMousePosFreezed; } + void SetMousePosFreezed( bool bIn ) { mbMousePosFreezed = bIn; } EditMode GetEditMode() const { return meEditMode; } virtual SdPage* GetActualPage() SAL_OVERRIDE { return mpActualPage; } @@ -247,10 +247,10 @@ public: void ResetActualPage(); void ResetActualLayer(); - sal_Bool SwitchPage(sal_uInt16 nPage); - sal_Bool IsSwitchPageAllowed() const; + bool SwitchPage(sal_uInt16 nPage); + bool IsSwitchPageAllowed() const; - sal_Bool GotoBookmark(const OUString& rBookmark); + bool GotoBookmark(const OUString& rBookmark); //Realize multi-selection of objects, If object is marked, the //corresponding entry is set true, else the corresponding entry is set //false. @@ -262,10 +262,10 @@ public: virtual void WriteFrameViewData() SAL_OVERRIDE; virtual ErrCode DoVerb(long nVerb) SAL_OVERRIDE; - virtual sal_Bool ActivateObject(SdrOle2Obj* pObj, long nVerb) SAL_OVERRIDE; + virtual bool ActivateObject(SdrOle2Obj* pObj, long nVerb) SAL_OVERRIDE; - void SetZoomOnPage( sal_Bool bZoom = sal_True ) { mbZoomOnPage = bZoom; } - sal_Bool IsZoomOnPage() { return mbZoomOnPage; } + void SetZoomOnPage( bool bZoom = true ) { mbZoomOnPage = bZoom; } + bool IsZoomOnPage() { return mbZoomOnPage; } void CheckLineTo (SfxRequest& rReq); void SetChildWindowState( SfxItemSet& rSet ); @@ -273,7 +273,7 @@ public: void LockInput(); void UnlockInput(); - sal_Bool IsInputLocked() const { return mnLockCount > 0UL; } + bool IsInputLocked() const { return mnLockCount > 0UL; } sal_uInt16 GetCurPageId() { return( maTabControl.GetCurPageId() ); } @@ -294,8 +294,8 @@ public: virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt, DropTargetHelper& rTargetHelper, ::sd::Window* pTargetWindow, sal_uInt16 nPage, sal_uInt16 nLayer ) SAL_OVERRIDE; - virtual void WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = sal_False ) SAL_OVERRIDE; - virtual void ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = sal_False ) SAL_OVERRIDE; + virtual void WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, bool bBrowse = false ) SAL_OVERRIDE; + virtual void ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, bool bBrowse = false ) SAL_OVERRIDE; virtual void VisAreaChanged(const Rectangle& rRect) SAL_OVERRIDE; @@ -379,17 +379,17 @@ protected: SdPage* mpActualPage; Rectangle maMarkRect; Point maMousePos; - sal_Bool mbMousePosFreezed; + bool mbMousePosFreezed; TabControl maTabControl; EditMode meEditMode; PageKind mePageKind; - sal_Bool mbZoomOnPage; - sal_Bool mbIsRulerDrag; + bool mbZoomOnPage; + bool mbIsRulerDrag; sal_uLong mnLockCount; - sal_Bool mbReadOnly; + bool mbReadOnly; sal_uInt16* mpSlotArray; - static sal_Bool mbPipette; + static bool mbPipette; DECL_LINK( ClipboardChanged, TransferableDataHelper* ); DECL_LINK( TabSplitHdl, TabBar * ); @@ -399,20 +399,20 @@ protected: void DeleteActualPage(); void DeleteActualLayer(); - virtual SvxRuler* CreateHRuler(::sd::Window* pWin, sal_Bool bIsFirst) SAL_OVERRIDE; + virtual SvxRuler* CreateHRuler(::sd::Window* pWin, bool bIsFirst) SAL_OVERRIDE; virtual SvxRuler* CreateVRuler(::sd::Window* pWin) SAL_OVERRIDE; virtual void UpdateHRuler() SAL_OVERRIDE; virtual void UpdateVRuler() SAL_OVERRIDE; virtual void SetZoomFactor(const Fraction& rZoomX, const Fraction& rZoomY) SAL_OVERRIDE; void SetupPage( Size &rSize, long nLeft, long nRight, long nUpper, long nLower, - sal_Bool bSize, sal_Bool bMargin, sal_Bool bScaleAll ); + bool bSize, bool bMargin, bool bScaleAll ); - sal_uInt16 GetIdBySubId( sal_uInt16 nSId ); + sal_uInt16 GetIdBySubId( sal_uInt16 nSId ); void MapSlot( sal_uInt16 nSId ); - void UpdateToolboxImages( SfxItemSet &rSet, sal_Bool bPermanent = sal_True ); - sal_uInt16 GetMappedSlot( sal_uInt16 nSId ); - sal_uInt16 GetArrayId( sal_uInt16 nSId ); + void UpdateToolboxImages( SfxItemSet &rSet, bool bPermanent = true ); + sal_uInt16 GetMappedSlot( sal_uInt16 nSId ); + sal_uInt16 GetArrayId( sal_uInt16 nSId ); void GetMenuStateSel(SfxItemSet& rSet); @@ -459,7 +459,7 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::scanner::XScannerManager2 > mxScannerManager; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > mxScannerListener; TransferableClipboardListener* mpClipEvtLstnr; - sal_Bool mbPastePossible; + bool mbPastePossible; virtual void Notify (SfxBroadcaster& rBC, const SfxHint& rHint) SAL_OVERRIDE; diff --git a/sd/source/ui/inc/FrameView.hxx b/sd/source/ui/inc/FrameView.hxx index 739debb23452..40bdffe449bd 100644 --- a/sd/source/ui/inc/FrameView.hxx +++ b/sd/source/ui/inc/FrameView.hxx @@ -67,17 +67,17 @@ public: { maPrintableLayers = rPrintableLayers; } const SetOfByte& GetPrintableLayers() { return maPrintableLayers; } - void SetRuler(const sal_Bool bRulerOn) + void SetRuler(const bool bRulerOn) { mbRuler = bRulerOn; } - sal_Bool HasRuler() const { return mbRuler; } + bool HasRuler() const { return mbRuler; } - void SetNoColors(const sal_Bool bNoCol) + void SetNoColors(const bool bNoCol) { mbNoColors = bNoCol; } - sal_Bool IsNoColors() const { return mbNoColors; } + bool IsNoColors() const { return mbNoColors; } - void SetNoAttribs(const sal_Bool bNoAttr) + void SetNoAttribs(const bool bNoAttr) { mbNoAttribs = bNoAttr; } - sal_Bool IsNoAttribs() const { return mbNoAttribs; } + bool IsNoAttribs() const { return mbNoAttribs; } void SetVisArea(const Rectangle& rVisArea) { maVisArea = rVisArea; } @@ -116,19 +116,19 @@ public: */ EditMode GetViewShEditModeOnLoad (void) const; - void SetLayerMode(sal_Bool bMode) + void SetLayerMode(bool bMode) { mbLayerMode = bMode; } - sal_Bool IsLayerMode() const { return mbLayerMode; } + bool IsLayerMode() const { return mbLayerMode; } - void SetQuickEdit(sal_Bool bQEdit) + void SetQuickEdit(bool bQEdit) { mbQuickEdit = bQEdit; } - sal_Bool IsQuickEdit() const { return mbQuickEdit; } + bool IsQuickEdit() const { return mbQuickEdit; } - void SetDoubleClickTextEdit( sal_Bool bOn = sal_True ) { mbDoubleClickTextEdit = bOn; } - sal_Bool IsDoubleClickTextEdit() const { return mbDoubleClickTextEdit; } + void SetDoubleClickTextEdit( bool bOn = true ) { mbDoubleClickTextEdit = bOn; } + bool IsDoubleClickTextEdit() const { return mbDoubleClickTextEdit; } - void SetClickChangeRotation( sal_Bool bOn = sal_True ) { mbClickChangeRotation = bOn; } - sal_Bool IsClickChangeRotation() const { return mbClickChangeRotation; } + void SetClickChangeRotation( bool bOn = true ) { mbClickChangeRotation = bOn; } + bool IsClickChangeRotation() const { return mbClickChangeRotation; } /** Remember the type of the view shell that was (or soon will be) previously associated with this frame view. @@ -174,15 +174,15 @@ public: private: sal_uInt16 mnRefCount; - sal_Bool mbRuler; + bool mbRuler; SetOfByte maVisibleLayers; SetOfByte maLockedLayers; SetOfByte maPrintableLayers; SdrHelpLineList maStandardHelpLines; SdrHelpLineList maNotesHelpLines; SdrHelpLineList maHandoutHelpLines; - sal_Bool mbNoColors; ///< structuring mode - sal_Bool mbNoAttribs; ///< structuring mode + bool mbNoColors; ///< structuring mode + bool mbNoAttribs; ///< structuring mode Rectangle maVisArea; ///< visible area PageKind mePageKind; ///< kind of page (standard, notes, handout) sal_uInt16 mnSelectedPage; @@ -192,10 +192,10 @@ private: EditMode meNotesEditMode; ///< edit mode in notes mode (Page/MasterPage) EditMode meHandoutEditMode; ///< edit mode in handout mode (Page/MasterPage) EditMode meEditModeOnLoad; - sal_Bool mbLayerMode; ///< layer on/off - sal_Bool mbQuickEdit; ///< QuickEdit on/off - sal_Bool mbDoubleClickTextEdit; ///< text mode after double click - sal_Bool mbClickChangeRotation; ///< single click switches between selection/rotation mode + bool mbLayerMode; ///< layer on/off + bool mbQuickEdit; ///< QuickEdit on/off + bool mbDoubleClickTextEdit; ///< text mode after double click + bool mbClickChangeRotation; ///< single click switches between selection/rotation mode sal_uInt16 mnPresViewShellId; ///< ViewShell from which the presentation was started sal_uInt16 mnSlotId; ///< SlotId, which was initial mentioned sal_uInt16 mnSlidesPerRow; ///< slides per row on the slide-desk diff --git a/sd/source/ui/inc/GraphicDocShell.hxx b/sd/source/ui/inc/GraphicDocShell.hxx index 5808493f9ef3..4a18ae332b58 100644 --- a/sd/source/ui/inc/GraphicDocShell.hxx +++ b/sd/source/ui/inc/GraphicDocShell.hxx @@ -50,12 +50,12 @@ public: GraphicDocShell ( SfxObjectCreateMode eMode = SFX_CREATE_MODE_EMBEDDED, - sal_Bool bSdDataObj=sal_False, + bool bSdDataObj=false, DocumentType=DOCUMENT_TYPE_DRAW); GraphicDocShell ( const sal_uInt64 nModelCreationFlags, - sal_Bool bSdDataObj=sal_False, + bool bSdDataObj=false, DocumentType=DOCUMENT_TYPE_DRAW); virtual ~GraphicDocShell (void); diff --git a/sd/source/ui/inc/OutlineBulletDlg.hxx b/sd/source/ui/inc/OutlineBulletDlg.hxx index a17aa67ab8a4..b2fe9c50bc6e 100644 --- a/sd/source/ui/inc/OutlineBulletDlg.hxx +++ b/sd/source/ui/inc/OutlineBulletDlg.hxx @@ -51,7 +51,7 @@ private: SfxItemSet *pOutputSet; sal_uInt16 m_nOptionsId; sal_uInt16 m_nPositionId; - sal_Bool bTitle; + bool bTitle; ::sd::View *pSdView; }; diff --git a/sd/source/ui/inc/OutlineView.hxx b/sd/source/ui/inc/OutlineView.hxx index 57446826edf5..bf90ecb58a0e 100644 --- a/sd/source/ui/inc/OutlineView.hxx +++ b/sd/source/ui/inc/OutlineView.hxx @@ -113,10 +113,10 @@ public: sal_uLong GetPaperWidth(); - sal_Bool PrepareClose(sal_Bool bUI = sal_True); + bool PrepareClose(bool bUI = true); - virtual sal_Bool GetAttributes( SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr=sal_False ) const SAL_OVERRIDE; - virtual sal_Bool SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll = sal_False) SAL_OVERRIDE; + virtual bool GetAttributes( SfxItemSet& rTargetSet, bool bOnlyHardAttr = false ) const SAL_OVERRIDE; + virtual bool SetAttributes(const SfxItemSet& rSet, bool bReplaceAll = false) SAL_OVERRIDE; void FillOutliner(); void SetLinks(); @@ -186,7 +186,7 @@ private: sal_Int32 mnPagesToProcess; // for the progress bar sal_Int32 mnPagesProcessed; - sal_Bool mbFirstPaint; + bool mbFirstPaint; sal_uLong mnPaperWidth; diff --git a/sd/source/ui/inc/OutlineViewShell.hxx b/sd/source/ui/inc/OutlineViewShell.hxx index 141a1881a4cc..7aebf2279374 100644 --- a/sd/source/ui/inc/OutlineViewShell.hxx +++ b/sd/source/ui/inc/OutlineViewShell.hxx @@ -72,7 +72,7 @@ public: */ virtual void ArrangeGUIElements (void) SAL_OVERRIDE; - virtual bool PrepareClose( sal_Bool bUI = sal_True ) SAL_OVERRIDE; + virtual bool PrepareClose( bool bUI = true ) SAL_OVERRIDE; virtual long VirtHScrollHdl(ScrollBar* pHScroll) SAL_OVERRIDE; virtual long VirtVScrollHdl(ScrollBar* pVHScroll) SAL_OVERRIDE; @@ -105,7 +105,7 @@ public: virtual void SetZoom(long nZoom) SAL_OVERRIDE; virtual void SetZoomRect(const Rectangle& rZoomRect) SAL_OVERRIDE; virtual OUString GetSelectionText( bool bCompleteWords = false ); - virtual sal_Bool HasSelection( sal_Bool bText = sal_True ) const; + virtual bool HasSelection( bool bText = true ) const; void Execute(SfxRequest& rReq); @@ -113,13 +113,13 @@ public: virtual void WriteFrameViewData() SAL_OVERRIDE; virtual void Command( const CommandEvent& rCEvt, ::sd::Window* pWin ) SAL_OVERRIDE; - virtual sal_Bool KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin) SAL_OVERRIDE; + virtual bool KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin) SAL_OVERRIDE; virtual void MouseButtonUp(const MouseEvent& rMEvt, ::sd::Window* pWin) SAL_OVERRIDE; sal_uLong Read(SvStream& rInput, const OUString& rBaseURL, sal_uInt16 eFormat); - virtual void WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = sal_False ) SAL_OVERRIDE; - virtual void ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = sal_False ) SAL_OVERRIDE; + virtual void WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, bool bBrowse = false ) SAL_OVERRIDE; + virtual void ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, bool bBrowse = false ) SAL_OVERRIDE; /** this method is called when the visible area of the view from this viewshell is changed */ virtual void VisAreaChanged(const Rectangle& rRect) SAL_OVERRIDE; @@ -139,7 +139,7 @@ public: /** Update the preview to show the specified page. */ - virtual void UpdatePreview (SdPage* pPage, sal_Bool bInit = sal_False) SAL_OVERRIDE; + virtual void UpdatePreview (SdPage* pPage, bool bInit = false) SAL_OVERRIDE; virtual css::uno::Reference<css::drawing::XDrawSubController> CreateSubController (void) SAL_OVERRIDE; @@ -159,7 +159,7 @@ private: OutlineView* pOlView; SdPage* pLastPage; // Zur performanten Aufbereitung der Preview TransferableClipboardListener* pClipEvtLstnr; - sal_Bool bPastePossible; + bool bPastePossible; bool mbInitialized; void Construct (DrawDocShell* pDocSh); diff --git a/sd/source/ui/inc/PresentationViewShell.hxx b/sd/source/ui/inc/PresentationViewShell.hxx index 75a64cef95f7..8fa4fcfedf3c 100644 --- a/sd/source/ui/inc/PresentationViewShell.hxx +++ b/sd/source/ui/inc/PresentationViewShell.hxx @@ -55,7 +55,7 @@ public: virtual void Resize (void) SAL_OVERRIDE; protected: - virtual SvxRuler* CreateHRuler(::sd::Window* pWin, sal_Bool bIsFirst) SAL_OVERRIDE; + virtual SvxRuler* CreateHRuler(::sd::Window* pWin, bool bIsFirst) SAL_OVERRIDE; virtual SvxRuler* CreateVRuler(::sd::Window* pWin) SAL_OVERRIDE; private: diff --git a/sd/source/ui/inc/RemoteServer.hxx b/sd/source/ui/inc/RemoteServer.hxx index f330fcefcfeb..4773083f4964 100644 --- a/sd/source/ui/inc/RemoteServer.hxx +++ b/sd/source/ui/inc/RemoteServer.hxx @@ -65,7 +65,7 @@ namespace sd // For the control dialog SD_DLLPUBLIC static std::vector<ClientInfo*> getClients(); - SD_DLLPUBLIC static sal_Bool connectClient( ClientInfo *pClient, + SD_DLLPUBLIC static bool connectClient( ClientInfo *pClient, const OUString& aPin ); /// ensure that discoverability (eg. for Bluetooth) is enabled diff --git a/sd/source/ui/inc/Ruler.hxx b/sd/source/ui/inc/Ruler.hxx index f74000c3a4ab..b6d920f445e2 100644 --- a/sd/source/ui/inc/Ruler.hxx +++ b/sd/source/ui/inc/Ruler.hxx @@ -46,7 +46,7 @@ public: void SetNullOffset(const Point& rOffset); - sal_Bool IsHorizontal() const { return bHorz; } + bool IsHorizontal() const { return bHorz; } using ::Ruler::SetNullOffset; protected: @@ -54,7 +54,7 @@ protected: ::sd::Window* pSdWin; DrawViewShell* pDrViewShell; RulerCtrlItem* pCtrlItem; - sal_Bool bHorz; + bool bHorz; virtual void MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; virtual void MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; diff --git a/sd/source/ui/inc/SdUnoDrawView.hxx b/sd/source/ui/inc/SdUnoDrawView.hxx index 79056e4323f9..62687526a1fd 100644 --- a/sd/source/ui/inc/SdUnoDrawView.hxx +++ b/sd/source/ui/inc/SdUnoDrawView.hxx @@ -101,10 +101,10 @@ public: virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: - sal_Bool getMasterPageMode(void) const throw(); + bool getMasterPageMode(void) const throw(); void setMasterPageMode(bool MasterPageMode_) throw(); - sal_Bool getLayerMode(void) const throw(); - void setLayerMode(sal_Bool LayerMode_) throw(); + bool getLayerMode(void) const throw(); + void setLayerMode(bool LayerMode_) throw(); public: /** Return a reference to the active layer object. @return diff --git a/sd/source/ui/inc/TabControl.hxx b/sd/source/ui/inc/TabControl.hxx index 50742964ce96..cbc273b21573 100644 --- a/sd/source/ui/inc/TabControl.hxx +++ b/sd/source/ui/inc/TabControl.hxx @@ -56,7 +56,7 @@ public: protected: DrawViewShell* pDrViewSh; - sal_Bool bInternalMove; + bool bInternalMove; // TabBar virtual void Select() SAL_OVERRIDE; diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx index 234d1f363c20..da4098d5f5f3 100644 --- a/sd/source/ui/inc/View.hxx +++ b/sd/source/ui/inc/View.hxx @@ -77,8 +77,8 @@ public: void CompleteRedraw( OutputDevice* pOutDev, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0L) SAL_OVERRIDE; - virtual sal_Bool GetAttributes( SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr=sal_False ) const; - virtual sal_Bool SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll = sal_False); + virtual bool GetAttributes( SfxItemSet& rTargetSet, bool bOnlyHardAttr = false ) const; + virtual bool SetAttributes(const SfxItemSet& rSet, bool bReplaceAll = false); virtual void MarkListHasChanged() SAL_OVERRIDE; virtual void ModelHasChanged() SAL_OVERRIDE; virtual void SelectAll(); @@ -86,7 +86,7 @@ public: virtual void DoCopy(::Window* pWindow=NULL); virtual void DoPaste(::Window* pWindow=NULL); virtual void DoConnect(SdrOle2Obj* pOleObj) SAL_OVERRIDE; - virtual sal_Bool SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr = sal_False); + virtual bool SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr = false); virtual void StartDrag( const Point& rStartPos, ::Window* pWindow ); virtual void DragFinished( sal_Int8 nDropAction ); virtual sal_Int8 AcceptDrop ( @@ -113,11 +113,11 @@ public: ::com::sun::star::datatransfer::XTransferable> CreateSelectionDataObject (::sd::View*, ::Window& rWindow); - void UpdateSelectionClipboard( sal_Bool bForceDeselect ); + void UpdateSelectionClipboard( bool bForceDeselect ); - inline DrawDocShell* GetDocSh (void) const; - inline SdDrawDocument& GetDoc (void) const; - inline ViewShell* GetViewShell (void) const; + inline DrawDocShell* GetDocSh(void) const; + inline SdDrawDocument& GetDoc(void) const; + inline ViewShell* GetViewShell(void) const; virtual bool SdrBeginTextEdit(SdrObject* pObj, SdrPageView* pPV = 0L, ::Window* pWin = 0L, bool bIsNewObj = false, SdrOutliner* pGivenOutliner = 0L, OutlinerView* pGivenOutlinerView = 0L, @@ -127,8 +127,8 @@ public: bool RestoreDefaultText( SdrTextObj* pTextObj ); - sal_Bool InsertData( const TransferableDataHelper& rDataHelper, - const Point& rPos, sal_Int8& rDnDAction, sal_Bool bDrag, + bool InsertData( const TransferableDataHelper& rDataHelper, + const Point& rPos, sal_Int8& rDnDAction, bool bDrag, sal_uLong nFormat = 0, sal_uInt16 nPage = SDRPAGE_NOTFOUND, sal_uInt16 nLayer = SDRLAYER_NOTFOUND ); /** gets the metafile from the given transferable helper and insert it as a graphic shape. @param bOptimize if set to true, the metafile is analyzed and if only one bitmap action is @@ -154,18 +154,18 @@ public: bool PasteRTFTable( SotStorageStreamRef xStm, SdrPage* pPage, sal_uLong nPasteOptions ); - sal_Bool IsPresObjSelected(sal_Bool bOnPage=sal_True, sal_Bool bOnMasterPage=sal_True, sal_Bool bCheckPresObjListOnly=sal_False, sal_Bool bCheckLayoutOnly=sal_False) const; + bool IsPresObjSelected(bool bOnPage = true, bool bOnMasterPage = true, bool bCheckPresObjListOnly = false, bool bCheckLayoutOnly = false) const; void SetMarkedOriginalSize(); - sal_Bool IsMorphingAllowed() const; - sal_Bool IsVectorizeAllowed() const; + bool IsMorphingAllowed() const; + bool IsVectorizeAllowed() const; virtual SfxStyleSheet* GetStyleSheet() const; /** return parameter: pExchangeList == NULL -> all names are unique - bNameOK == sal_False -> cancel by user + bNameOK == false -> cancel by user nType == 0 -> pages nType == 1 -> objects nType == 2 -> pages and objects */ @@ -197,7 +197,7 @@ public: virtual bool IsPointMarkable(const SdrHdl& rHdl) const SAL_OVERRIDE; virtual bool MarkPoint(SdrHdl& rHdl, bool bUnmark=false) SAL_OVERRIDE; virtual void CheckPossibilities() SAL_OVERRIDE; - virtual sal_Bool MarkPoints(const ::Rectangle* pRect, sal_Bool bUnmark); + virtual bool MarkPoints(const ::Rectangle* pRect, bool bUnmark) SAL_OVERRIDE; using SdrMarkView::MarkPoints; bool ShouldToggleOn( diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx index abd4d2b0acd2..ce5ea3152fb2 100644 --- a/sd/source/ui/inc/ViewShell.hxx +++ b/sd/source/ui/inc/ViewShell.hxx @@ -179,12 +179,12 @@ public: // Mouse- & Key-Events virtual void PrePaint(); virtual void Paint (const Rectangle& rRect, ::sd::Window* pWin); - virtual sal_Bool KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin); + virtual bool KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin); virtual void MouseMove(const MouseEvent& rMEvt, ::sd::Window* pWin); virtual void MouseButtonUp(const MouseEvent& rMEvt, ::sd::Window* pWin); virtual void MouseButtonDown(const MouseEvent& rMEvt, ::sd::Window* pWin); virtual void Command(const CommandEvent& rCEvt, ::sd::Window* pWin); - virtual sal_Bool RequestHelp( const HelpEvent& rEvt, ::sd::Window* pWin ); + virtual bool RequestHelp( const HelpEvent& rEvt, ::sd::Window* pWin ); virtual bool Notify( NotifyEvent& rNEvt, ::sd::Window* pWin ); virtual bool HandleScrollCommand(const CommandEvent& rCEvt, ::sd::Window* pWin); @@ -196,8 +196,8 @@ public: const SfxPoolItem* GetNumBulletItem(SfxItemSet& aNewAttr, sal_uInt16& nNumItemId); - sal_Bool HasRuler (void); - void SetRuler(sal_Bool bRuler); + bool HasRuler (void); + void SetRuler(bool bRuler); /** Set internal values of all scroll bars that determine thumb size and position. The external values like size and position of the scroll @@ -209,13 +209,13 @@ public: virtual void SetZoom(long nZoom); virtual void SetZoomRect(const Rectangle& rZoomRect); void InitWindows(const Point& rViewOrigin, const Size& rViewSize, - const Point& rWinPos, sal_Bool bUpdate = sal_False); + const Point& rWinPos, bool bUpdate = false); void InvalidateWindows(); /** This method is still used by the OutlineViewShell to update the model according to the content of the outline view. This in turn updates the previews in the slide sorter. */ - virtual void UpdatePreview (SdPage* pPage, sal_Bool bInit = sal_False); + virtual void UpdatePreview (SdPage* pPage, bool bInit = false); void DrawMarkRect(const Rectangle& rRect) const; @@ -235,7 +235,7 @@ public: virtual void WriteUserData(OUString& rString); virtual void ReadUserData(const OUString& rString); - virtual sal_Bool ActivateObject(SdrOle2Obj* pObj, long nVerb); + virtual bool ActivateObject(SdrOle2Obj* pObj, long nVerb); /** @returns current or selected page or 0. This method @@ -262,11 +262,11 @@ public: void SetPageSizeAndBorder(PageKind ePageKind, const Size& rNewSize, long nLeft, long nRight, long nUpper, long nLower, - sal_Bool bScaleAll, Orientation eOrient, sal_uInt16 nPaperBin, - sal_Bool bBackgroundFullSize ); + bool bScaleAll, Orientation eOrient, sal_uInt16 nPaperBin, + bool bBackgroundFullSize ); - void SetStartShowWithDialog( sal_Bool bIn = sal_True ) { mbStartShowWithDialog = bIn; } - sal_Bool IsStartShowWithDialog() const { return mbStartShowWithDialog; } + void SetStartShowWithDialog( bool bIn = true ) { mbStartShowWithDialog = bIn; } + bool IsStartShowWithDialog() const { return mbStartShowWithDialog; } sal_uInt16 GetPrintedHandoutPageNum (void) const { return mnPrintedHandoutPageNum; } void SetPrintedHandoutPageNum (sal_uInt16 nPageNumber) {mnPrintedHandoutPageNum=nPageNumber; } @@ -274,7 +274,7 @@ public: sal_uInt16 GetPrintedHandoutPageCount(void) const { return mnPrintedHandoutPageCount; } void SetPrintedHandoutPageCount (sal_uInt16 nPageCount) {mnPrintedHandoutPageCount=nPageCount; } - virtual bool PrepareClose( sal_Bool bUI = sal_True ); + virtual bool PrepareClose( bool bUI = true ); void GetMenuState(SfxItemSet& rSet); @@ -283,8 +283,8 @@ public: virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt, DropTargetHelper& rTargetHelper, ::sd::Window* pTargetWindow, sal_uInt16 nPage, sal_uInt16 nLayer ); - virtual void WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = sal_False ); - virtual void ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, sal_Bool bBrowse = sal_False ); + virtual void WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, bool bBrowse = false ); + virtual void ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, bool bBrowse = false ); /** this method is called when the visible area of the view from this viewshell is changed */ virtual void VisAreaChanged(const Rectangle& rRect); @@ -415,7 +415,7 @@ public: As a result the border is adapted. */ virtual void ShowUIControls (bool bVisible = true); - sal_Bool IsPageFlipMode(void) const; + bool IsPageFlipMode(void) const; /** Set the given window as new parent window. This is not possible for all views, so the return value tells the caller if the relocation @@ -495,13 +495,13 @@ protected: Size maViewSize; Size maScrBarWH; - sal_Bool mbCenterAllowed; // will be forwarded to window + bool mbCenterAllowed; // will be forwarded to window - sal_Bool mbStartShowWithDialog; // presentation is started by dialog + bool mbStartShowWithDialog; // presentation is started by dialog sal_uInt16 mnPrintedHandoutPageNum; // Page number of the handout page that is to be printed. sal_uInt16 mnPrintedHandoutPageCount; // Page count of the handout pages that are to be printed. - //af sal_Bool bPrintDirectSelected; // Print only selected objects in direct print + //af bool bPrintDirectSelected; // Print only selected objects in direct print //afString sPageRange; // pagerange if selected objects in direct print /** Area covered by all windows, i.e. the area of the parent window @@ -525,8 +525,8 @@ protected: virtual ::svl::IUndoManager* ImpGetUndoManager (void) const; void ImpGetUndoStrings(SfxItemSet &rSet) const; void ImpGetRedoStrings(SfxItemSet &rSet) const; - void ImpSidUndo(sal_Bool bDrawViewShell, SfxRequest& rReq); - void ImpSidRedo(sal_Bool bDrawViewShell, SfxRequest& rReq); + void ImpSidUndo(bool bDrawViewShell, SfxRequest& rReq); + void ImpSidRedo(bool bDrawViewShell, SfxRequest& rReq); DECL_LINK( HScrollHdl, ScrollBar * ); DECL_LINK( VScrollHdl, ScrollBar * ); @@ -536,7 +536,7 @@ protected: virtual long VirtVScrollHdl(ScrollBar* pVScroll); // virtual functions ruler handling - virtual SvxRuler* CreateHRuler(::sd::Window* pWin, sal_Bool bIsFirst); + virtual SvxRuler* CreateHRuler(::sd::Window* pWin, bool bIsFirst); virtual SvxRuler* CreateVRuler(::sd::Window* pWin); virtual void UpdateHRuler(); virtual void UpdateVRuler(); diff --git a/sd/source/ui/inc/Window.hxx b/sd/source/ui/inc/Window.hxx index 57381e8a0949..da54789d6271 100644 --- a/sd/source/ui/inc/Window.hxx +++ b/sd/source/ui/inc/Window.hxx @@ -123,7 +123,7 @@ public: larger than the view or the value of aWinPos in this direction is -1 then the window is centered in this direction. */ - void UpdateMapOrigin (sal_Bool bInvalidate = sal_True); + void UpdateMapOrigin (bool bInvalidate = true); void UpdateMapMode (void); diff --git a/sd/source/ui/inc/animobjs.hxx b/sd/source/ui/inc/animobjs.hxx index 359b85535f76..87fea2763d84 100644 --- a/sd/source/ui/inc/animobjs.hxx +++ b/sd/source/ui/inc/animobjs.hxx @@ -140,8 +140,8 @@ private: Size aFltWinSize; Size aDisplaySize; Size aBmpSize; - sal_Bool bMovie; - sal_Bool bAllObjects; + bool bMovie; + bool bAllObjects; SfxBindings* pBindings; AnimationControllerItem* pControllerItem; diff --git a/sd/source/ui/inc/custsdlg.hxx b/sd/source/ui/inc/custsdlg.hxx index aec20d3ade36..2b0fa42f165a 100644 --- a/sd/source/ui/inc/custsdlg.hxx +++ b/sd/source/ui/inc/custsdlg.hxx @@ -50,7 +50,7 @@ private: SdDrawDocument& rDoc; SdCustomShowList* pCustomShowList; SdCustomShow* pCustomShow; - sal_Bool bModified; + bool bModified; void CheckState(); @@ -61,8 +61,8 @@ public: SdCustomShowDlg( Window* pWindow, SdDrawDocument& rDrawDoc ); virtual ~SdCustomShowDlg(); - sal_Bool IsModified() const { return( bModified ); } - sal_Bool IsCustomShow() const; + bool IsModified() const { return( bModified ); } + bool IsCustomShow() const; }; @@ -82,7 +82,7 @@ private: SdDrawDocument& rDoc; SdCustomShow*& rpCustomShow; - sal_Bool bModified; + bool bModified; OUString aOldName; void CheckState(); @@ -97,7 +97,7 @@ public: SdDrawDocument& rDrawDoc, SdCustomShow*& rpCS ); virtual ~SdDefineCustomShowDlg(); - sal_Bool IsModified() const { return( bModified ); } + bool IsModified() const { return( bModified ); } }; #endif // INCLUDED_SD_SOURCE_UI_INC_CUSTSDLG_HXX diff --git a/sd/source/ui/inc/dlgass.hxx b/sd/source/ui/inc/dlgass.hxx index f89685ce0517..028d2c9d566b 100644 --- a/sd/source/ui/inc/dlgass.hxx +++ b/sd/source/ui/inc/dlgass.hxx @@ -41,19 +41,19 @@ private: AssistentDlgImpl* mpImpl; public: - AssistentDlg(Window* pParent, sal_Bool bAutoPilot); + AssistentDlg(Window* pParent, bool bAutoPilot); virtual ~AssistentDlg(); DECL_LINK( FinishHdl, void * ); SfxObjectShellLock GetDocument(); OutputType GetOutputMedium() const; - sal_Bool IsSummary() const; + bool IsSummary() const; StartType GetStartType() const; OUString GetDocPath() const; - sal_Bool GetStartWithFlag() const; + bool GetStartWithFlag() const; - sal_Bool IsDocEmpty() const; + bool IsDocEmpty() const; com::sun::star::uno::Sequence< com::sun::star::beans::NamedValue > GetPassword(); }; diff --git a/sd/source/ui/inc/dlgpage.hxx b/sd/source/ui/inc/dlgpage.hxx index e2fdc22d5e68..1878aa3bf362 100644 --- a/sd/source/ui/inc/dlgpage.hxx +++ b/sd/source/ui/inc/dlgpage.hxx @@ -44,7 +44,7 @@ private: public: - SdPageDlg( SfxObjectShell* pDocSh, Window* pParent, const SfxItemSet* pAttr, sal_Bool bAreaPage = sal_True ); + SdPageDlg( SfxObjectShell* pDocSh, Window* pParent, const SfxItemSet* pAttr, bool bAreaPage = true ); virtual ~SdPageDlg() {}; virtual void PageCreated(sal_uInt16 nId, SfxTabPage& rPage) SAL_OVERRIDE; diff --git a/sd/source/ui/inc/dlgsnap.hxx b/sd/source/ui/inc/dlgsnap.hxx index 481adfa8f173..d6464b98e7b0 100644 --- a/sd/source/ui/inc/dlgsnap.hxx +++ b/sd/source/ui/inc/dlgsnap.hxx @@ -66,7 +66,7 @@ public: void HideRadioGroup(); void HideDeleteBtn() { m_pBtnDelete->Hide(); } - void SetInputFields(sal_Bool bEnableX, sal_Bool bEnableY); + void SetInputFields(bool bEnableX, bool bEnableY); }; diff --git a/sd/source/ui/inc/docprev.hxx b/sd/source/ui/inc/docprev.hxx index 11171969f22b..4a8efe32ac47 100644 --- a/sd/source/ui/inc/docprev.hxx +++ b/sd/source/ui/inc/docprev.hxx @@ -41,7 +41,7 @@ class SD_DLLPUBLIC SdDocPreviewWin : public Control, public SfxListener { protected: GDIMetaFile* pMetaFile; - sal_Bool bInEffect; + bool bInEffect; Link aClickHdl; SfxObjectShell* mpObj; sal_uInt16 mnShowPage; diff --git a/sd/source/ui/inc/drawview.hxx b/sd/source/ui/inc/drawview.hxx index 0a149461b8a8..026fa95720aa 100644 --- a/sd/source/ui/inc/drawview.hxx +++ b/sd/source/ui/inc/drawview.hxx @@ -45,13 +45,13 @@ public: virtual void MarkListHasChanged() SAL_OVERRIDE; void CompleteRedraw(OutputDevice* pOutDev, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0L) SAL_OVERRIDE; - virtual sal_Bool SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll = sal_False) SAL_OVERRIDE; + virtual bool SetAttributes(const SfxItemSet& rSet, bool bReplaceAll = false) SAL_OVERRIDE; virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) SAL_OVERRIDE; - void BlockPageOrderChangedHint(sal_Bool bBlock); + void BlockPageOrderChangedHint(bool bBlock); - sal_Bool SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr = sal_False) SAL_OVERRIDE; + bool SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr = false) SAL_OVERRIDE; virtual bool IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const SAL_OVERRIDE; virtual void MakeVisible(const Rectangle& rRect, ::Window& rWin) SAL_OVERRIDE; diff --git a/sd/source/ui/inc/fucon3d.hxx b/sd/source/ui/inc/fucon3d.hxx index 6ea52cbae3f6..c978ee0fbd45 100644 --- a/sd/source/ui/inc/fucon3d.hxx +++ b/sd/source/ui/inc/fucon3d.hxx @@ -39,10 +39,10 @@ public: virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; // Mouse- & Key-Events - virtual sal_Bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; - virtual sal_Bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; + virtual bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; virtual void Activate() SAL_OVERRIDE; virtual void Deactivate() SAL_OVERRIDE; diff --git a/sd/source/ui/inc/fuconarc.hxx b/sd/source/ui/inc/fuconarc.hxx index d9b2ece8b2b6..30208baf1fa7 100644 --- a/sd/source/ui/inc/fuconarc.hxx +++ b/sd/source/ui/inc/fuconarc.hxx @@ -35,10 +35,10 @@ public: virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; // Mouse- & Key-Events - virtual sal_Bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; - virtual sal_Bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; + virtual bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; virtual void Activate() SAL_OVERRIDE; virtual void Deactivate() SAL_OVERRIDE; diff --git a/sd/source/ui/inc/fuconbez.hxx b/sd/source/ui/inc/fuconbez.hxx index 15907e22a618..43aa50e64ee2 100644 --- a/sd/source/ui/inc/fuconbez.hxx +++ b/sd/source/ui/inc/fuconbez.hxx @@ -40,10 +40,10 @@ public: virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; // Mouse- & Key-Events - virtual sal_Bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; - virtual sal_Bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; + virtual bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; virtual void Activate() SAL_OVERRIDE; virtual void Deactivate() SAL_OVERRIDE; diff --git a/sd/source/ui/inc/fuconcs.hxx b/sd/source/ui/inc/fuconcs.hxx index 66b34db89e77..63c6b71a28f8 100644 --- a/sd/source/ui/inc/fuconcs.hxx +++ b/sd/source/ui/inc/fuconcs.hxx @@ -38,10 +38,10 @@ public: virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; // Mouse- & Key-Events - virtual sal_Bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; - virtual sal_Bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; + virtual bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; virtual void Activate() SAL_OVERRIDE; diff --git a/sd/source/ui/inc/fuconrec.hxx b/sd/source/ui/inc/fuconrec.hxx index 3efba9d797f4..b33f86aa60fb 100644 --- a/sd/source/ui/inc/fuconrec.hxx +++ b/sd/source/ui/inc/fuconrec.hxx @@ -42,10 +42,10 @@ public: virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; // Mouse- & Key-Events - virtual sal_Bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; - virtual sal_Bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; + virtual bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; virtual void Activate() SAL_OVERRIDE; virtual void Deactivate() SAL_OVERRIDE; diff --git a/sd/source/ui/inc/fuconstr.hxx b/sd/source/ui/inc/fuconstr.hxx index 322c58ddf4ca..26dcecd44fe1 100644 --- a/sd/source/ui/inc/fuconstr.hxx +++ b/sd/source/ui/inc/fuconstr.hxx @@ -37,10 +37,10 @@ public: virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; // Mouse- & Key-Events - virtual sal_Bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; - virtual sal_Bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; + virtual bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; virtual void Activate() SAL_OVERRIDE; virtual void Deactivate() SAL_OVERRIDE; @@ -54,7 +54,7 @@ public: // SJ: setting stylesheet, the use of a filled or unfilled style // is determinded by the parameters bUseFillStyle and bUseNoFillStyle : void SetStyleSheet( SfxItemSet& rAttr, SdrObject* pObj, - const sal_Bool bUseFillStyle, const sal_Bool bUseNoFillStyle ); + const bool bUseFillStyle, const bool bUseNoFillStyle ); protected: FuConstruct (ViewShell* pViewSh, diff --git a/sd/source/ui/inc/fuconuno.hxx b/sd/source/ui/inc/fuconuno.hxx index 5914346e9720..c8c4b386de09 100644 --- a/sd/source/ui/inc/fuconuno.hxx +++ b/sd/source/ui/inc/fuconuno.hxx @@ -38,10 +38,10 @@ public: virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; // Mouse- & Key-Events - virtual sal_Bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; - virtual sal_Bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; + virtual bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; virtual void Activate() SAL_OVERRIDE; virtual void Deactivate() SAL_OVERRIDE; diff --git a/sd/source/ui/inc/fudraw.hxx b/sd/source/ui/inc/fudraw.hxx index 2bd87360b40e..fb13e98ccc27 100644 --- a/sd/source/ui/inc/fudraw.hxx +++ b/sd/source/ui/inc/fudraw.hxx @@ -37,11 +37,11 @@ class FuDraw public: TYPEINFO_OVERRIDE(); - virtual sal_Bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; - virtual sal_Bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual sal_Bool RequestHelp(const HelpEvent& rHEvt) SAL_OVERRIDE; + virtual bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; + virtual bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool RequestHelp(const HelpEvent& rHEvt) SAL_OVERRIDE; virtual void Activate() SAL_OVERRIDE; virtual void Deactivate() SAL_OVERRIDE; @@ -50,10 +50,10 @@ public: virtual void DoubleClick(const MouseEvent& rMEvt); - sal_Bool SetPointer(SdrObject* pObj, const Point& rPos); - sal_Bool SetHelpText(SdrObject* pObj, const Point& rPos, const SdrViewEvent& rVEvt); + bool SetPointer(SdrObject* pObj, const Point& rPos); + bool SetHelpText(SdrObject* pObj, const Point& rPos, const SdrViewEvent& rVEvt); - void SetPermanent(sal_Bool bSet) { bPermanent = bSet; } + void SetPermanent(bool bSet) { bPermanent = bSet; } /** is called when the current function should be aborted. <p> This is used when a function gets a KEY_ESCAPE but can also @@ -74,10 +74,10 @@ protected: Pointer aNewPointer; Pointer aOldPointer; - sal_Bool bMBDown; - sal_Bool bDragHelpLine; + bool bMBDown; + bool bDragHelpLine; sal_uInt16 nHelpLine; - sal_Bool bPermanent; + bool bPermanent; }; diff --git a/sd/source/ui/inc/fudspord.hxx b/sd/source/ui/inc/fudspord.hxx index 8e1356a31c57..aaea29645b60 100644 --- a/sd/source/ui/inc/fudspord.hxx +++ b/sd/source/ui/inc/fudspord.hxx @@ -38,9 +38,9 @@ public: static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); // Mouse- & Key-Events - virtual sal_Bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; virtual void Activate() SAL_OVERRIDE; virtual void Deactivate() SAL_OVERRIDE; diff --git a/sd/source/ui/inc/fuediglu.hxx b/sd/source/ui/inc/fuediglu.hxx index 871b12e95503..5eb054b01771 100644 --- a/sd/source/ui/inc/fuediglu.hxx +++ b/sd/source/ui/inc/fuediglu.hxx @@ -34,11 +34,11 @@ public: virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; // Mouse- & Key-Events - virtual sal_Bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; - virtual sal_Bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual sal_Bool Command(const CommandEvent& rCEvt) SAL_OVERRIDE; + virtual bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; + virtual bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool Command(const CommandEvent& rCEvt) SAL_OVERRIDE; virtual void ReceiveRequest(SfxRequest& rReq) SAL_OVERRIDE; virtual void Activate() SAL_OVERRIDE; @@ -48,7 +48,7 @@ public: //and SHIFT+ENTER key to decide the position and draw the new insert point virtual void ForcePointer(const MouseEvent* pMEvt = NULL) SAL_OVERRIDE; private: - sal_Bool bBeginInsertPoint; + bool bBeginInsertPoint; Point oldPoint; protected: FuEditGluePoints ( diff --git a/sd/source/ui/inc/fuformatpaintbrush.hxx b/sd/source/ui/inc/fuformatpaintbrush.hxx index 1cd122b26111..41c3396b27cb 100644 --- a/sd/source/ui/inc/fuformatpaintbrush.hxx +++ b/sd/source/ui/inc/fuformatpaintbrush.hxx @@ -36,10 +36,10 @@ public: static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual sal_Bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual sal_Bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; + virtual bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; virtual void Activate() SAL_OVERRIDE; virtual void Deactivate() SAL_OVERRIDE; diff --git a/sd/source/ui/inc/fuhhconv.hxx b/sd/source/ui/inc/fuhhconv.hxx index 637dbb917c67..ee34bd6b4f5d 100644 --- a/sd/source/ui/inc/fuhhconv.hxx +++ b/sd/source/ui/inc/fuhhconv.hxx @@ -35,7 +35,7 @@ class FuHangulHanjaConversion : public FuPoor static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); 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 ); void StartChineseConversion(); @@ -47,7 +47,7 @@ class FuHangulHanjaConversion : public FuPoor virtual ~FuHangulHanjaConversion(); Outliner* pSdOutliner; - sal_Bool bOwnOutliner; + bool bOwnOutliner; private: FuHangulHanjaConversion ( diff --git a/sd/source/ui/inc/fuinsfil.hxx b/sd/source/ui/inc/fuinsfil.hxx index fac9e41a4014..ad404c174e70 100644 --- a/sd/source/ui/inc/fuinsfil.hxx +++ b/sd/source/ui/inc/fuinsfil.hxx @@ -52,9 +52,9 @@ private: OUString aFile; ///< chosen file name void InsTextOrRTFinOlMode(SfxMedium* pMedium); - sal_Bool InsSDDinOlMode(SfxMedium* pMedium); + bool InsSDDinOlMode(SfxMedium* pMedium); void InsTextOrRTFinDrMode(SfxMedium* pMedium); - sal_Bool InsSDDinDrMode(SfxMedium* pMedium); + bool InsSDDinDrMode(SfxMedium* pMedium); }; } // end of namespace sd diff --git a/sd/source/ui/inc/fumorph.hxx b/sd/source/ui/inc/fumorph.hxx index c5a85d963a26..ce591a3bb404 100644 --- a/sd/source/ui/inc/fumorph.hxx +++ b/sd/source/ui/inc/fumorph.hxx @@ -54,7 +54,7 @@ private: void ImpInsertPolygons( B2DPolyPolygonList_impl& rPolyPolyList3D, - sal_Bool bAttributeFade, + bool bAttributeFade, const SdrObject* pObj1, const SdrObject* pObj2 ); @@ -65,7 +65,7 @@ private: double fMorphingFactor ); - sal_Bool ImpMorphPolygons( + bool ImpMorphPolygons( const ::basegfx::B2DPolyPolygon& rPolyPoly1, const ::basegfx::B2DPolyPolygon& rPolyPoly2, const sal_uInt16 nSteps, diff --git a/sd/source/ui/inc/fuoltext.hxx b/sd/source/ui/inc/fuoltext.hxx index 0b6b0fece74e..9579423acc65 100644 --- a/sd/source/ui/inc/fuoltext.hxx +++ b/sd/source/ui/inc/fuoltext.hxx @@ -42,10 +42,10 @@ public: static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); - virtual sal_Bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; - virtual sal_Bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; + virtual bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; virtual void DoCut() SAL_OVERRIDE; virtual void DoCopy() SAL_OVERRIDE; diff --git a/sd/source/ui/inc/fuoutl.hxx b/sd/source/ui/inc/fuoutl.hxx index dbf764a3486c..3f02120d8993 100644 --- a/sd/source/ui/inc/fuoutl.hxx +++ b/sd/source/ui/inc/fuoutl.hxx @@ -43,7 +43,7 @@ class FuOutline public: TYPEINFO_OVERRIDE(); - virtual sal_Bool Command(const CommandEvent& rCEvt) SAL_OVERRIDE; + virtual bool Command(const CommandEvent& rCEvt) SAL_OVERRIDE; protected: FuOutline ( diff --git a/sd/source/ui/inc/fupoor.hxx b/sd/source/ui/inc/fupoor.hxx index 4f0c5140b9e2..8909694f186b 100644 --- a/sd/source/ui/inc/fupoor.hxx +++ b/sd/source/ui/inc/fupoor.hxx @@ -66,15 +66,15 @@ public: virtual void DoPasteUnformatted(); // Mouse- & Key-Events; Returnwert=sal_True: Event wurde bearbeitet - virtual sal_Bool KeyInput(const KeyEvent& rKEvt); - virtual sal_Bool MouseMove(const MouseEvent& ); - virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); + virtual bool KeyInput(const KeyEvent& rKEvt); + virtual bool MouseMove(const MouseEvent& ); + virtual bool MouseButtonUp(const MouseEvent& rMEvt); // moved from inline to *.cxx - virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); + virtual bool MouseButtonDown(const MouseEvent& rMEvt); - virtual sal_Bool Command(const CommandEvent& rCEvt); - virtual sal_Bool RequestHelp(const HelpEvent& rHEvt); + virtual bool Command(const CommandEvent& rCEvt); + virtual bool RequestHelp(const HelpEvent& rHEvt); virtual void Paint(const Rectangle&, ::sd::Window* ); virtual void ReceiveRequest(SfxRequest& rReq); @@ -88,7 +88,7 @@ public: sal_uInt16 GetSlotID() const { return( nSlotId ); } sal_uInt16 GetSlotValue() const { return( nSlotValue ); } - void SetNoScrollUntilInside(sal_Bool bNoScroll = sal_True) + void SetNoScrollUntilInside(bool bNoScroll = true) { bNoScrollUntilInside = bNoScroll; } void StartDelayToScrollTimer (); @@ -164,17 +164,17 @@ protected: Timer aDragTimer; ///< for Drag&Drop DECL_LINK(DragHdl, void *); - sal_Bool bIsInDragMode; + bool bIsInDragMode; Point aMDPos; ///< position of MouseButtonDown /// Flag to prevent auto-scrolling until one drags from outside into the window - sal_Bool bNoScrollUntilInside; + bool bNoScrollUntilInside; /// timer to delay scrolling (~ 1 sec) when dragging out of the window Timer aDelayToScrollTimer; - sal_Bool bScrollable; - sal_Bool bDelayActive; - sal_Bool bFirstMouseMove; + bool bScrollable; + bool bDelayActive; + bool bFirstMouseMove; /// member to hold state of the mouse buttons for creation of own MouseEvents (like in ScrollHdl) diff --git a/sd/source/ui/inc/fusearch.hxx b/sd/source/ui/inc/fusearch.hxx index 2f80866f521d..63cb35973e55 100644 --- a/sd/source/ui/inc/fusearch.hxx +++ b/sd/source/ui/inc/fusearch.hxx @@ -45,7 +45,7 @@ protected: virtual ~FuSearch (void); ::sd::Outliner* pSdOutliner; - sal_Bool bOwnOutliner; + bool bOwnOutliner; private: FuSearch ( diff --git a/sd/source/ui/inc/fusel.hxx b/sd/source/ui/inc/fusel.hxx index 326f69a2fdd7..1426afe4e7a3 100644 --- a/sd/source/ui/inc/fusel.hxx +++ b/sd/source/ui/inc/fusel.hxx @@ -40,10 +40,10 @@ public: virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; // Mouse- & Key-Events - virtual sal_Bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; - virtual sal_Bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; + virtual bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; virtual void Activate() SAL_OVERRIDE; virtual void Deactivate() SAL_OVERRIDE; @@ -53,7 +53,7 @@ public: void SetEditMode(sal_uInt16 nMode); sal_uInt16 GetEditMode() { return nEditMode; } - sal_Bool AnimateObj(SdrObject* pObj, const Point& rPos); + bool AnimateObj(SdrObject* pObj, const Point& rPos); /** is called when the current function should be aborted. <p> This is used when a function gets a KEY_ESCAPE but can also @@ -74,12 +74,12 @@ protected: virtual ~FuSelection(); - sal_Bool bTempRotation; - sal_Bool bSelectionChanged; - sal_Bool bHideAndAnimate; + bool bTempRotation; + bool bSelectionChanged; + bool bHideAndAnimate; SdrHdl* pHdl; - sal_Bool bSuppressChangesOfSelection; - sal_Bool bMirrorSide0; + bool bSuppressChangesOfSelection; + bool bMirrorSide0; sal_uInt16 nEditMode; ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > mxPlayer; @@ -99,10 +99,10 @@ private: SdrObject* pickObject (const Point& rTestPoint); //Add Shift+UP/DOWN/LEFT/RIGHT key to move the position of insert point, //and SHIFT+ENTER key to decide the position and draw the new insert point - sal_Bool bBeginInsertPoint; + bool bBeginInsertPoint; Point oldPoint; //let mouse cursor move - sal_Bool bMovedToCenterPoint; + bool bMovedToCenterPoint; }; } // end of namespace sd diff --git a/sd/source/ui/inc/futext.hxx b/sd/source/ui/inc/futext.hxx index 015b89fbfdc9..4a1180b8e95e 100644 --- a/sd/source/ui/inc/futext.hxx +++ b/sd/source/ui/inc/futext.hxx @@ -43,20 +43,20 @@ public: static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); virtual void DoExecute( SfxRequest& rReq ) SAL_OVERRIDE; - virtual sal_Bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; - virtual sal_Bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual sal_Bool Command(const CommandEvent& rCEvt) SAL_OVERRIDE; - virtual sal_Bool RequestHelp(const HelpEvent& rHEvt) SAL_OVERRIDE; + virtual bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; + virtual bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool Command(const CommandEvent& rCEvt) SAL_OVERRIDE; + virtual bool RequestHelp(const HelpEvent& rHEvt) SAL_OVERRIDE; virtual void ReceiveRequest(SfxRequest& rReq) SAL_OVERRIDE; virtual void DoubleClick(const MouseEvent& rMEvt) SAL_OVERRIDE; virtual void Activate() SAL_OVERRIDE; ///< activates the function virtual void Deactivate() SAL_OVERRIDE; ///< deactivates the function - void SetInEditMode(const MouseEvent& rMEvt, sal_Bool bQuickDrag); - sal_Bool DeleteDefaultText(); + void SetInEditMode(const MouseEvent& rMEvt, bool bQuickDrag); + bool DeleteDefaultText(); SdrTextObj* GetTextObj() { return static_cast< SdrTextObj* >( mxTextObj.get() ); } virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle) SAL_OVERRIDE; @@ -82,7 +82,7 @@ protected: SdrObjectWeakRef mxTextObj; Link aOldLink; - sal_Bool bFirstObjCreated; + bool bFirstObjCreated; bool bJustEndedEdit; SfxRequest& rRequest; diff --git a/sd/source/ui/inc/fuzoom.hxx b/sd/source/ui/inc/fuzoom.hxx index 9a8284b1cfe0..8f42cb0d04b1 100644 --- a/sd/source/ui/inc/fuzoom.hxx +++ b/sd/source/ui/inc/fuzoom.hxx @@ -36,9 +36,9 @@ public: static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); // Mouse- & Key-Events - virtual sal_Bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; virtual void Activate() SAL_OVERRIDE; ///< activates the function virtual void Deactivate() SAL_OVERRIDE; ///< deactivates the function @@ -50,8 +50,8 @@ protected: Point aBeginPos; Point aEndPos; Rectangle aZoomRect; - sal_Bool bVisible; - sal_Bool bStartDrag; + bool bVisible; + bool bStartDrag; Pointer aPtr; private: diff --git a/sd/source/ui/inc/inspagob.hxx b/sd/source/ui/inc/inspagob.hxx index ad1c742b5241..36ab45d44b12 100644 --- a/sd/source/ui/inc/inspagob.hxx +++ b/sd/source/ui/inc/inspagob.hxx @@ -55,8 +55,8 @@ public: std::vector<OUString> GetList ( const sal_uInt16 nType ) ; - sal_Bool IsLink(); - sal_Bool IsRemoveUnnessesaryMasterPages() const; + bool IsLink(); + bool IsRemoveUnnessesaryMasterPages() const; }; diff --git a/sd/source/ui/inc/navigatr.hxx b/sd/source/ui/inc/navigatr.hxx index 422f36f17264..b7a8e85dc831 100644 --- a/sd/source/ui/inc/navigatr.hxx +++ b/sd/source/ui/inc/navigatr.hxx @@ -67,16 +67,16 @@ public: { } - sal_Bool HasName() { return( (sal_Bool) bName ); } - sal_Bool IsActive() { return( (sal_Bool) bActive ); } + bool HasName() { return bName; } + bool IsActive() { return bActive; } - void SetName( sal_Bool bOn = sal_True ) { bName = bOn; } - void SetActive( sal_Bool bOn = sal_True ) { bActive = bOn; } + void SetName( bool bOn = true ) { bName = bOn; } + void SetActive( bool bOn = true ) { bActive = bOn; } private: friend class SdNavigatorWin; - sal_Bool bName : 1; - sal_Bool bActive : 1; + bool bName : 1; + bool bActive : 1; ::sd::DrawDocShell* mpDocShell; }; @@ -130,7 +130,7 @@ private: ::sd::NavigatorChildWindow* mpChildWinContext; Size maSize; Size maMinSize; - sal_Bool mbDocImported; + bool mbDocImported; OUString maDropFileName; NavigatorDragType meDragType; std::vector<NavDocInfo> maDocList; @@ -145,7 +145,7 @@ private: */ // bool mbShowAllShapes; - sal_uInt16 GetDragTypeSdResId( NavigatorDragType eDT, sal_Bool bImage = sal_False ); + sal_uInt16 GetDragTypeSdResId( NavigatorDragType eDT, bool bImage = false ); NavDocInfo* GetDocInfo(); DECL_LINK( GetFocusObjectsHdl, void * ); diff --git a/sd/source/ui/inc/optsitem.hxx b/sd/source/ui/inc/optsitem.hxx index e2a54d460ee5..81fc9d538498 100644 --- a/sd/source/ui/inc/optsitem.hxx +++ b/sd/source/ui/inc/optsitem.hxx @@ -67,7 +67,7 @@ public: ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > GetProperties( const ::com::sun::star::uno::Sequence< OUString >& rNames ); - sal_Bool PutProperties( const com::sun::star::uno::Sequence< OUString >& rNames, + bool PutProperties( const com::sun::star::uno::Sequence< OUString >& rNames, const com::sun::star::uno::Sequence< com::sun::star::uno::Any>& rValues ); void SetModified(); }; @@ -81,8 +81,8 @@ private: OUString maSubTree; SdOptionsItem* mpCfgItem; sal_uInt16 mnConfigId; - sal_Bool mbInit : 1; - sal_Bool mbEnableModify : 1; + bool mbInit : 1; + bool mbEnableModify : 1; SAL_DLLPRIVATE void Commit( SdOptionsItem& rCfgItem ) const; SAL_DLLPRIVATE ::com::sun::star::uno::Sequence< OUString > GetPropertyNames() const; @@ -95,8 +95,8 @@ protected: protected: virtual void GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const = 0; - virtual sal_Bool ReadData( const ::com::sun::star::uno::Any* pValues ) = 0; - virtual sal_Bool WriteData( ::com::sun::star::uno::Any* pValues ) const = 0; + virtual bool ReadData( const ::com::sun::star::uno::Any* pValues ) = 0; + virtual bool WriteData( ::com::sun::star::uno::Any* pValues ) const = 0; public: @@ -106,7 +106,7 @@ public: const OUString& GetSubTree() const { return maSubTree; } sal_uInt16 GetConfigId() const { return mnConfigId; } - void EnableModify( sal_Bool bModify ) { mbEnableModify = bModify; } + void EnableModify( bool bModify ) { mbEnableModify = bModify; } void Store(); @@ -118,39 +118,39 @@ class SD_DLLPUBLIC SdOptionsLayout : public SdOptionsGeneric { private: - sal_Bool bRuler; // Layout/Display/Ruler - sal_Bool bMoveOutline; // Layout/Display/Contur - sal_Bool bDragStripes; // Layout/Display/Guide - sal_Bool bHandlesBezier; // Layout/Display/Bezier - sal_Bool bHelplines; // Layout/Display/Helpline + bool bRuler; // Layout/Display/Ruler + bool bMoveOutline; // Layout/Display/Contur + bool bDragStripes; // Layout/Display/Guide + bool bHandlesBezier; // Layout/Display/Bezier + bool bHelplines; // Layout/Display/Helpline sal_uInt16 nMetric; // Layout/Other/MeasureUnit sal_uInt16 nDefTab; // Layout/Other/TabStop protected: virtual void GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const SAL_OVERRIDE; - virtual sal_Bool ReadData( const ::com::sun::star::uno::Any* pValues ) SAL_OVERRIDE; - virtual sal_Bool WriteData( ::com::sun::star::uno::Any* pValues ) const SAL_OVERRIDE; + virtual bool ReadData( const ::com::sun::star::uno::Any* pValues ) SAL_OVERRIDE; + virtual bool WriteData( ::com::sun::star::uno::Any* pValues ) const SAL_OVERRIDE; public: - SdOptionsLayout( sal_uInt16 nConfigId, sal_Bool bUseConfig ); + SdOptionsLayout( sal_uInt16 nConfigId, bool bUseConfig ); virtual ~SdOptionsLayout() {} - sal_Bool operator==( const SdOptionsLayout& rOpt ) const; + bool operator==( const SdOptionsLayout& rOpt ) const; - sal_Bool IsRulerVisible() const { Init(); return (sal_Bool) bRuler; } - sal_Bool IsMoveOutline() const { Init(); return (sal_Bool) bMoveOutline; } - sal_Bool IsDragStripes() const { Init(); return (sal_Bool) bDragStripes; } - sal_Bool IsHandlesBezier() const { Init(); return (sal_Bool) bHandlesBezier; } - sal_Bool IsHelplines() const { Init(); return (sal_Bool) bHelplines; } + bool IsRulerVisible() const { Init(); return bRuler; } + bool IsMoveOutline() const { Init(); return bMoveOutline; } + bool IsDragStripes() const { Init(); return bDragStripes; } + bool IsHandlesBezier() const { Init(); return bHandlesBezier; } + bool IsHelplines() const { Init(); return bHelplines; } sal_uInt16 GetMetric() const { Init(); return( ( 0xffff == nMetric ) ? (sal_uInt16)SfxModule::GetCurrentFieldUnit() : nMetric ); } sal_uInt16 GetDefTab() const { Init(); return nDefTab; } - void SetRulerVisible( sal_Bool bOn = sal_True ) { if( bRuler != bOn ) { OptionsChanged(); bRuler = bOn; } } - void SetMoveOutline( sal_Bool bOn = sal_True ) { if( bMoveOutline != bOn ) { OptionsChanged(); bMoveOutline = bOn; } } - void SetDragStripes( sal_Bool bOn = sal_True ) { if( bDragStripes != bOn ) { OptionsChanged(); bDragStripes = bOn; } } - void SetHandlesBezier( sal_Bool bOn = sal_True ) { if( bHandlesBezier != bOn ) { OptionsChanged(); bHandlesBezier = bOn; } } - void SetHelplines( sal_Bool bOn = sal_True ) { if( bHelplines != bOn ) { OptionsChanged(); bHelplines = bOn; } } + void SetRulerVisible( bool bOn = true ) { if( bRuler != bOn ) { OptionsChanged(); bRuler = bOn; } } + void SetMoveOutline( bool bOn = true ) { if( bMoveOutline != bOn ) { OptionsChanged(); bMoveOutline = bOn; } } + void SetDragStripes( bool bOn = true ) { if( bDragStripes != bOn ) { OptionsChanged(); bDragStripes = bOn; } } + void SetHandlesBezier( bool bOn = true ) { if( bHandlesBezier != bOn ) { OptionsChanged(); bHandlesBezier = bOn; } } + void SetHelplines( bool bOn = true ) { if( bHelplines != bOn ) { OptionsChanged(); bHelplines = bOn; } } void SetMetric( sal_uInt16 nInMetric ) { if( nMetric != nInMetric ) { OptionsChanged(); nMetric = nInMetric; } } void SetDefTab( sal_uInt16 nTab ) { if( nDefTab != nTab ) { OptionsChanged(); nDefTab = nTab; } } }; @@ -178,15 +178,15 @@ private: protected: virtual void GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const SAL_OVERRIDE; - virtual sal_Bool ReadData( const ::com::sun::star::uno::Any* pValues ) SAL_OVERRIDE; - virtual sal_Bool WriteData( ::com::sun::star::uno::Any* pValues ) const SAL_OVERRIDE; + virtual bool ReadData( const ::com::sun::star::uno::Any* pValues ) SAL_OVERRIDE; + virtual bool WriteData( ::com::sun::star::uno::Any* pValues ) const SAL_OVERRIDE; public: - SdOptionsContents( sal_uInt16 nConfigId, sal_Bool bUseConfig ); + SdOptionsContents( sal_uInt16 nConfigId, bool bUseConfig ); virtual ~SdOptionsContents() {} - sal_Bool operator==( const SdOptionsContents& rOpt ) const; + bool operator==( const SdOptionsContents& rOpt ) const; }; class SD_DLLPUBLIC SdOptionsContentsItem : public SfxPoolItem @@ -212,28 +212,28 @@ private: sal_uLong nDefaultObjectSizeWidth; sal_uLong nDefaultObjectSizeHeight; - sal_Bool bStartWithTemplate : 1; // Misc/NewDoc/AutoPilot - sal_Bool bMarkedHitMovesAlways : 1; // Misc/ObjectMoveable - sal_Bool bMoveOnlyDragging : 1; // Currently, not in use !!! - sal_Bool bCrookNoContortion : 1; // Misc/NoDistort - sal_Bool bQuickEdit : 1; // Misc/TextObject/QuickEditing - sal_Bool bMasterPageCache : 1; // Misc/BackgroundCache - sal_Bool bDragWithCopy : 1; // Misc/CopyWhileMoving - sal_Bool bPickThrough : 1; // Misc/TextObject/Selectable - sal_Bool bDoubleClickTextEdit : 1; // Misc/DclickTextedit - sal_Bool bClickChangeRotation : 1; // Misc/RotateClick - sal_Bool bEnableSdremote : 1; // Misc/Start/EnableSdremote - sal_Bool bEnablePresenterScreen : 1; // Misc/Start/EnablePresenterDisplay - sal_Bool bSolidDragging : 1; // Misc/ModifyWithAttributes - sal_Bool bSummationOfParagraphs : 1; // misc/SummationOfParagraphs - sal_Bool bShowUndoDeleteWarning : 1; // Misc/ShowUndoDeleteWarning + bool bStartWithTemplate : 1; // Misc/NewDoc/AutoPilot + bool bMarkedHitMovesAlways : 1; // Misc/ObjectMoveable + bool bMoveOnlyDragging : 1; // Currently, not in use !!! + bool bCrookNoContortion : 1; // Misc/NoDistort + bool bQuickEdit : 1; // Misc/TextObject/QuickEditing + bool bMasterPageCache : 1; // Misc/BackgroundCache + bool bDragWithCopy : 1; // Misc/CopyWhileMoving + bool bPickThrough : 1; // Misc/TextObject/Selectable + bool bDoubleClickTextEdit : 1; // Misc/DclickTextedit + bool bClickChangeRotation : 1; // Misc/RotateClick + bool bEnableSdremote : 1; // Misc/Start/EnableSdremote + bool bEnablePresenterScreen : 1; // Misc/Start/EnablePresenterDisplay + bool bSolidDragging : 1; // Misc/ModifyWithAttributes + bool bSummationOfParagraphs : 1; // misc/SummationOfParagraphs + bool bShowUndoDeleteWarning : 1; // Misc/ShowUndoDeleteWarning // #i75315# - sal_Bool bSlideshowRespectZOrder : 1; // Misc/SlideshowRespectZOrder - sal_Bool bShowComments : 1; // Misc/ShowComments + bool bSlideshowRespectZOrder : 1; // Misc/SlideshowRespectZOrder + bool bShowComments : 1; // Misc/ShowComments - sal_Bool bPreviewNewEffects; - sal_Bool bPreviewChangedEffects; - sal_Bool bPreviewTransitions; + bool bPreviewNewEffects; + bool bPreviewChangedEffects; + bool bPreviewTransitions; sal_Int32 mnDisplay; @@ -251,30 +251,30 @@ private: protected: virtual void GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const SAL_OVERRIDE; - virtual sal_Bool ReadData( const ::com::sun::star::uno::Any* pValues ) SAL_OVERRIDE; - virtual sal_Bool WriteData( ::com::sun::star::uno::Any* pValues ) const SAL_OVERRIDE; + virtual bool ReadData( const ::com::sun::star::uno::Any* pValues ) SAL_OVERRIDE; + virtual bool WriteData( ::com::sun::star::uno::Any* pValues ) const SAL_OVERRIDE; public: - SdOptionsMisc( sal_uInt16 nConfigId, sal_Bool bUseConfig ); + SdOptionsMisc( sal_uInt16 nConfigId, bool bUseConfig ); virtual ~SdOptionsMisc() {} - sal_Bool operator==( const SdOptionsMisc& rOpt ) const; - - sal_Bool IsStartWithTemplate() const { Init(); return (sal_Bool) bStartWithTemplate; } - sal_Bool IsMarkedHitMovesAlways() const { Init(); return (sal_Bool) bMarkedHitMovesAlways; } - sal_Bool IsMoveOnlyDragging() const { Init(); return (sal_Bool) bMoveOnlyDragging; } - sal_Bool IsCrookNoContortion() const { Init(); return (sal_Bool) bCrookNoContortion; } - sal_Bool IsQuickEdit() const { Init(); return (sal_Bool) bQuickEdit; } - sal_Bool IsMasterPagePaintCaching() const { Init(); return (sal_Bool) bMasterPageCache; } - sal_Bool IsDragWithCopy() const { Init(); return (sal_Bool) bDragWithCopy; } - sal_Bool IsPickThrough() const { Init(); return (sal_Bool) bPickThrough; } - sal_Bool IsDoubleClickTextEdit() const { Init(); return (sal_Bool) bDoubleClickTextEdit; } - sal_Bool IsClickChangeRotation() const { Init(); return (sal_Bool) bClickChangeRotation; } - sal_Bool IsEnableSdremote() const { Init(); return (sal_Bool) bEnableSdremote; } - sal_Bool IsEnablePresenterScreen() const { Init(); return (sal_Bool) bEnablePresenterScreen; } - sal_Bool IsSolidDragging() const { Init(); return (sal_Bool) bSolidDragging; } - sal_Bool IsSummationOfParagraphs() const { Init(); return bSummationOfParagraphs != 0; }; + bool operator==( const SdOptionsMisc& rOpt ) const; + + bool IsStartWithTemplate() const { Init(); return bStartWithTemplate; } + bool IsMarkedHitMovesAlways() const { Init(); return bMarkedHitMovesAlways; } + bool IsMoveOnlyDragging() const { Init(); return bMoveOnlyDragging; } + bool IsCrookNoContortion() const { Init(); return bCrookNoContortion; } + bool IsQuickEdit() const { Init(); return bQuickEdit; } + bool IsMasterPagePaintCaching() const { Init(); return bMasterPageCache; } + bool IsDragWithCopy() const { Init(); return bDragWithCopy; } + bool IsPickThrough() const { Init(); return bPickThrough; } + bool IsDoubleClickTextEdit() const { Init(); return bDoubleClickTextEdit; } + bool IsClickChangeRotation() const { Init(); return bClickChangeRotation; } + bool IsEnableSdremote() const { Init(); return bEnableSdremote; } + bool IsEnablePresenterScreen() const { Init(); return bEnablePresenterScreen; } + bool IsSolidDragging() const { Init(); return bSolidDragging; } + bool IsSummationOfParagraphs() const { Init(); return bSummationOfParagraphs; }; /** Return the currently selected printer independent layout mode. @return @@ -282,14 +282,14 @@ public: is disabled. Other values are reserved for future use. */ sal_uInt16 GetPrinterIndependentLayout() const { Init(); return mnPrinterIndependentLayout; }; - sal_Bool IsShowUndoDeleteWarning() const { Init(); return (sal_Bool) bShowUndoDeleteWarning; } - sal_Bool IsSlideshowRespectZOrder() const { Init(); return (sal_Bool) bSlideshowRespectZOrder; } + bool IsShowUndoDeleteWarning() const { Init(); return bShowUndoDeleteWarning; } + bool IsSlideshowRespectZOrder() const { Init(); return bSlideshowRespectZOrder; } sal_uLong GetDefaultObjectSizeWidth() const { Init(); return nDefaultObjectSizeWidth; } sal_uLong GetDefaultObjectSizeHeight() const { Init(); return nDefaultObjectSizeHeight; } - sal_Bool IsPreviewNewEffects() const { Init(); return bPreviewNewEffects; } - sal_Bool IsPreviewChangedEffects() const { Init(); return bPreviewChangedEffects; } - sal_Bool IsPreviewTransitions() const { Init(); return bPreviewTransitions; } + bool IsPreviewNewEffects() const { Init(); return bPreviewNewEffects; } + bool IsPreviewChangedEffects() const { Init(); return bPreviewChangedEffects; } + bool IsPreviewTransitions() const { Init(); return bPreviewTransitions; } sal_Int32 GetDisplay() const; void SetDisplay( sal_Int32 nDisplay = 0 ); @@ -300,19 +300,19 @@ public: double GetPresentationPenWidth() const { Init(); return mnPenWidth; } void SetPresentationPenWidth( double nPenWidth ) { if( mnPenWidth != nPenWidth ) { OptionsChanged(); mnPenWidth = nPenWidth; } } - void SetStartWithTemplate( sal_Bool bOn = sal_True ) { if( bStartWithTemplate != bOn ) { OptionsChanged(); bStartWithTemplate = bOn; } } - void SetMarkedHitMovesAlways( sal_Bool bOn = sal_True ) { if( bMarkedHitMovesAlways != bOn ) { OptionsChanged(); bMarkedHitMovesAlways = bOn; } } - void SetMoveOnlyDragging( sal_Bool bOn = sal_True ) { if( bMoveOnlyDragging != bOn ) { OptionsChanged(); bMoveOnlyDragging = bOn; } } - void SetCrookNoContortion( sal_Bool bOn = sal_True ) { if( bCrookNoContortion != bOn ) { OptionsChanged(); bCrookNoContortion = bOn; } } - void SetQuickEdit( sal_Bool bOn = sal_True ) { if( bQuickEdit != bOn ) { OptionsChanged(); bQuickEdit = bOn; } } - void SetMasterPagePaintCaching( sal_Bool bOn = sal_True ) { if( bMasterPageCache != bOn ) { OptionsChanged(); bMasterPageCache = bOn; } } - void SetDragWithCopy( sal_Bool bOn = sal_True ) { if( bDragWithCopy != bOn ) { OptionsChanged(); bDragWithCopy = bOn; } } - void SetPickThrough( sal_Bool bOn = sal_True ) { if( bPickThrough != bOn ) { OptionsChanged(); bPickThrough = bOn; } } - void SetDoubleClickTextEdit( sal_Bool bOn = sal_True ) { if( bDoubleClickTextEdit != bOn ) { OptionsChanged(); bDoubleClickTextEdit = bOn; } } - void SetClickChangeRotation( sal_Bool bOn = sal_True ) { if( bClickChangeRotation != bOn ) { OptionsChanged(); bClickChangeRotation = bOn; } } - void SetEnableSdremote( sal_Bool bOn = sal_True ) { if( bEnableSdremote != bOn ) { OptionsChanged(); bEnableSdremote = bOn; } } - void SetEnablePresenterScreen( sal_Bool bOn = sal_True ) { if( bEnablePresenterScreen != bOn ) { OptionsChanged(); bEnablePresenterScreen = bOn; } } - void SetSummationOfParagraphs( sal_Bool bOn = sal_True ){ if ( bOn != bSummationOfParagraphs ) { OptionsChanged(); bSummationOfParagraphs = bOn; } } + void SetStartWithTemplate( bool bOn = true ) { if( bStartWithTemplate != bOn ) { OptionsChanged(); bStartWithTemplate = bOn; } } + void SetMarkedHitMovesAlways( bool bOn = true ) { if( bMarkedHitMovesAlways != bOn ) { OptionsChanged(); bMarkedHitMovesAlways = bOn; } } + void SetMoveOnlyDragging( bool bOn = true ) { if( bMoveOnlyDragging != bOn ) { OptionsChanged(); bMoveOnlyDragging = bOn; } } + void SetCrookNoContortion( bool bOn = true ) { if( bCrookNoContortion != bOn ) { OptionsChanged(); bCrookNoContortion = bOn; } } + void SetQuickEdit( bool bOn = true ) { if( bQuickEdit != bOn ) { OptionsChanged(); bQuickEdit = bOn; } } + void SetMasterPagePaintCaching( bool bOn = true ) { if( bMasterPageCache != bOn ) { OptionsChanged(); bMasterPageCache = bOn; } } + void SetDragWithCopy( bool bOn = true ) { if( bDragWithCopy != bOn ) { OptionsChanged(); bDragWithCopy = bOn; } } + void SetPickThrough( bool bOn = true ) { if( bPickThrough != bOn ) { OptionsChanged(); bPickThrough = bOn; } } + void SetDoubleClickTextEdit( bool bOn = true ) { if( bDoubleClickTextEdit != bOn ) { OptionsChanged(); bDoubleClickTextEdit = bOn; } } + void SetClickChangeRotation( bool bOn = true ) { if( bClickChangeRotation != bOn ) { OptionsChanged(); bClickChangeRotation = bOn; } } + void SetEnableSdremote( bool bOn = true ) { if( bEnableSdremote != bOn ) { OptionsChanged(); bEnableSdremote = bOn; } } + void SetEnablePresenterScreen( bool bOn = true ) { if( bEnablePresenterScreen != bOn ) { OptionsChanged(); bEnablePresenterScreen = bOn; } } + void SetSummationOfParagraphs( bool bOn = true ){ if ( bOn != bSummationOfParagraphs ) { OptionsChanged(); bSummationOfParagraphs = bOn; } } /** Set the printer independent layout mode. @param nOn The default value is to switch printer independent layout on, @@ -320,18 +320,18 @@ public: values are reserved for future use. */ void SetPrinterIndependentLayout (sal_uInt16 nOn = 1 ){ if ( nOn != mnPrinterIndependentLayout ) { OptionsChanged(); mnPrinterIndependentLayout = nOn; } } - void SetSolidDragging( sal_Bool bOn = sal_True ) { if( bSolidDragging != bOn ) { OptionsChanged(); bSolidDragging = bOn; } } - void SetShowUndoDeleteWarning( sal_Bool bOn = sal_True ) { if( bShowUndoDeleteWarning != bOn ) { OptionsChanged(); bShowUndoDeleteWarning = bOn; } } - void SetSlideshowRespectZOrder( sal_Bool bOn = sal_True ) { if( bSlideshowRespectZOrder != bOn ) { OptionsChanged(); bSlideshowRespectZOrder = bOn; } } + void SetSolidDragging( bool bOn = true ) { if( bSolidDragging != bOn ) { OptionsChanged(); bSolidDragging = bOn; } } + void SetShowUndoDeleteWarning( bool bOn = true ) { if( bShowUndoDeleteWarning != bOn ) { OptionsChanged(); bShowUndoDeleteWarning = bOn; } } + void SetSlideshowRespectZOrder( bool bOn = true ) { if( bSlideshowRespectZOrder != bOn ) { OptionsChanged(); bSlideshowRespectZOrder = bOn; } } void SetDefaultObjectSizeWidth( sal_uLong nWidth ) { if( nDefaultObjectSizeWidth != nWidth ) { OptionsChanged(); nDefaultObjectSizeWidth = nWidth; } } void SetDefaultObjectSizeHeight( sal_uLong nHeight ) { if( nDefaultObjectSizeHeight != nHeight ) { OptionsChanged(); nDefaultObjectSizeHeight = nHeight; } } - void SetPreviewNewEffects( sal_Bool bOn ) { if( bPreviewNewEffects != bOn ) { OptionsChanged(); bPreviewNewEffects = bOn; } } - void SetPreviewChangedEffects( sal_Bool bOn ) { if( bPreviewChangedEffects != bOn ) { OptionsChanged(); bPreviewChangedEffects = bOn; } } - void SetPreviewTransitions( sal_Bool bOn ) { if( bPreviewTransitions != bOn ) { OptionsChanged(); bPreviewTransitions = bOn; } } + void SetPreviewNewEffects( bool bOn ) { if( bPreviewNewEffects != bOn ) { OptionsChanged(); bPreviewNewEffects = bOn; } } + void SetPreviewChangedEffects( bool bOn ) { if( bPreviewChangedEffects != bOn ) { OptionsChanged(); bPreviewChangedEffects = bOn; } } + void SetPreviewTransitions( bool bOn ) { if( bPreviewTransitions != bOn ) { OptionsChanged(); bPreviewTransitions = bOn; } } - sal_Bool IsShowComments() const { Init(); return bShowComments; } - void SetShowComments( sal_Bool bShow ) { if( bShowComments != bShow ) { OptionsChanged(); bShowComments = bShow; } } + bool IsShowComments() const { Init(); return bShowComments; } + void SetShowComments( bool bShow ) { if( bShowComments != bShow ) { OptionsChanged(); bShowComments = bShow; } } }; class SD_DLLPUBLIC SdOptionsMiscItem : public SfxPoolItem @@ -356,13 +356,13 @@ class SD_DLLPUBLIC SdOptionsSnap : public SdOptionsGeneric { private: - sal_Bool bSnapHelplines : 1; // Snap/Object/SnapLine - sal_Bool bSnapBorder : 1; // Snap/Object/PageMargin - sal_Bool bSnapFrame : 1; // Snap/Object/ObjectFrame - sal_Bool bSnapPoints : 1; // Snap/Object/ObjectPoint - sal_Bool bOrtho : 1; // Snap/Position/CreatingMoving - sal_Bool bBigOrtho : 1; // Snap/Position/ExtendEdges - sal_Bool bRotate : 1; // Snap/Position/Rotating + bool bSnapHelplines : 1; // Snap/Object/SnapLine + bool bSnapBorder : 1; // Snap/Object/PageMargin + bool bSnapFrame : 1; // Snap/Object/ObjectFrame + bool bSnapPoints : 1; // Snap/Object/ObjectPoint + bool bOrtho : 1; // Snap/Position/CreatingMoving + bool bBigOrtho : 1; // Snap/Position/ExtendEdges + bool bRotate : 1; // Snap/Position/Rotating sal_Int16 nSnapArea; // Snap/Object/Range sal_Int16 nAngle; // Snap/Position/RotatingValue sal_Int16 nBezAngle; // Snap/Position/PointReduction @@ -370,34 +370,34 @@ private: protected: virtual void GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const SAL_OVERRIDE; - virtual sal_Bool ReadData( const ::com::sun::star::uno::Any* pValues ) SAL_OVERRIDE; - virtual sal_Bool WriteData( ::com::sun::star::uno::Any* pValues ) const SAL_OVERRIDE; + virtual bool ReadData( const ::com::sun::star::uno::Any* pValues ) SAL_OVERRIDE; + virtual bool WriteData( ::com::sun::star::uno::Any* pValues ) const SAL_OVERRIDE; public: - SdOptionsSnap( sal_uInt16 nConfigId, sal_Bool bUseConfig ); + SdOptionsSnap( sal_uInt16 nConfigId, bool bUseConfig ); virtual ~SdOptionsSnap() {} - sal_Bool operator==( const SdOptionsSnap& rOpt ) const; + bool operator==( const SdOptionsSnap& rOpt ) const; - sal_Bool IsSnapHelplines() const { Init(); return (sal_Bool) bSnapHelplines; } - sal_Bool IsSnapBorder() const { Init(); return (sal_Bool) bSnapBorder; } - sal_Bool IsSnapFrame() const { Init(); return (sal_Bool) bSnapFrame; } - sal_Bool IsSnapPoints() const { Init(); return (sal_Bool) bSnapPoints; } - sal_Bool IsOrtho() const { Init(); return (sal_Bool) bOrtho; } - sal_Bool IsBigOrtho() const { Init(); return (sal_Bool) bBigOrtho; } - sal_Bool IsRotate() const { Init(); return (sal_Bool) bRotate; } + bool IsSnapHelplines() const { Init(); return bSnapHelplines; } + bool IsSnapBorder() const { Init(); return bSnapBorder; } + bool IsSnapFrame() const { Init(); return bSnapFrame; } + bool IsSnapPoints() const { Init(); return bSnapPoints; } + bool IsOrtho() const { Init(); return bOrtho; } + bool IsBigOrtho() const { Init(); return bBigOrtho; } + bool IsRotate() const { Init(); return bRotate; } sal_Int16 GetSnapArea() const { Init(); return nSnapArea; } sal_Int16 GetAngle() const { Init(); return nAngle; } sal_Int16 GetEliminatePolyPointLimitAngle() const { Init(); return nBezAngle; } - void SetSnapHelplines( sal_Bool bOn = sal_True ) { if( bSnapHelplines != bOn ) { OptionsChanged(); bSnapHelplines = bOn; } } - void SetSnapBorder( sal_Bool bOn = sal_True ) { if( bSnapBorder != bOn ) { OptionsChanged(); bSnapBorder = bOn; } } - void SetSnapFrame( sal_Bool bOn = sal_True ) { if( bSnapFrame != bOn ) { OptionsChanged(); bSnapFrame = bOn; } } - void SetSnapPoints( sal_Bool bOn = sal_True ) { if( bSnapPoints != bOn ) { OptionsChanged(); bSnapPoints = bOn; } } - void SetOrtho( sal_Bool bOn = sal_True ) { if( bOrtho != bOn ) { OptionsChanged(); bOrtho = bOn; } } - void SetBigOrtho( sal_Bool bOn = sal_True ) { if( bBigOrtho != bOn ) { OptionsChanged(); bBigOrtho = bOn; } } - void SetRotate( sal_Bool bOn = sal_True ) { if( bRotate != bOn ) { OptionsChanged(); bRotate = bOn; } } + void SetSnapHelplines( bool bOn = true ) { if( bSnapHelplines != bOn ) { OptionsChanged(); bSnapHelplines = bOn; } } + void SetSnapBorder( bool bOn = true ) { if( bSnapBorder != bOn ) { OptionsChanged(); bSnapBorder = bOn; } } + void SetSnapFrame( bool bOn = true ) { if( bSnapFrame != bOn ) { OptionsChanged(); bSnapFrame = bOn; } } + void SetSnapPoints( bool bOn = true ) { if( bSnapPoints != bOn ) { OptionsChanged(); bSnapPoints = bOn; } } + void SetOrtho( bool bOn = true ) { if( bOrtho != bOn ) { OptionsChanged(); bOrtho = bOn; } } + void SetBigOrtho( bool bOn = true ) { if( bBigOrtho != bOn ) { OptionsChanged(); bBigOrtho = bOn; } } + void SetRotate( bool bOn = true ) { if( bRotate != bOn ) { OptionsChanged(); bRotate = bOn; } } void SetSnapArea( sal_Int16 nIn ) { if( nSnapArea != nIn ) { OptionsChanged(); nSnapArea = nIn; } } void SetAngle( sal_Int16 nIn ) { if( nAngle != nIn ) { OptionsChanged(); nAngle = nIn; } } void SetEliminatePolyPointLimitAngle( sal_Int16 nIn ) { if( nBezAngle != nIn ) { OptionsChanged(); nBezAngle = nIn; } } @@ -430,15 +430,15 @@ private: protected: virtual void GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const SAL_OVERRIDE; - virtual sal_Bool ReadData( const ::com::sun::star::uno::Any* pValues ) SAL_OVERRIDE; - virtual sal_Bool WriteData( ::com::sun::star::uno::Any* pValues ) const SAL_OVERRIDE; + virtual bool ReadData( const ::com::sun::star::uno::Any* pValues ) SAL_OVERRIDE; + virtual bool WriteData( ::com::sun::star::uno::Any* pValues ) const SAL_OVERRIDE; public: - SdOptionsZoom( sal_uInt16 nConfigId, sal_Bool bUseConfig ); + SdOptionsZoom( sal_uInt16 nConfigId, bool bUseConfig ); virtual ~SdOptionsZoom() {} - sal_Bool operator==( const SdOptionsZoom& rOpt ) const; + bool operator==( const SdOptionsZoom& rOpt ) const; void GetScale( sal_Int32& rX, sal_Int32& rY ) const { Init(); rX = nX; rY = nY; } void SetScale( sal_Int32 nInX, sal_Int32 nInY ) { if( nX != nInX || nY != nInY ) { OptionsChanged(); nX = nInX; nY = nInY; } } @@ -449,16 +449,16 @@ class SdOptionsGrid : public SdOptionsGeneric, public SvxOptionsGrid protected: virtual void GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const SAL_OVERRIDE; - virtual sal_Bool ReadData( const ::com::sun::star::uno::Any* pValues ) SAL_OVERRIDE; - virtual sal_Bool WriteData( ::com::sun::star::uno::Any* pValues ) const SAL_OVERRIDE; + virtual bool ReadData( const ::com::sun::star::uno::Any* pValues ) SAL_OVERRIDE; + virtual bool WriteData( ::com::sun::star::uno::Any* pValues ) const SAL_OVERRIDE; public: - SdOptionsGrid( sal_uInt16 nConfigId, sal_Bool bUseConfig ); + SdOptionsGrid( sal_uInt16 nConfigId, bool bUseConfig ); virtual ~SdOptionsGrid(); void SetDefaults(); - sal_Bool operator==( const SdOptionsGrid& rOpt ) const; + bool operator==( const SdOptionsGrid& rOpt ) const; sal_uInt32 GetFldDrawX() const { Init(); return SvxOptionsGrid::GetFldDrawX(); } sal_uInt32 GetFldDivisionX() const { Init(); return SvxOptionsGrid::GetFldDivisionX(); } @@ -466,10 +466,10 @@ public: sal_uInt32 GetFldDivisionY() const { Init(); return SvxOptionsGrid::GetFldDivisionY(); } sal_uInt32 GetFldSnapX() const { Init(); return SvxOptionsGrid::GetFldSnapX(); } sal_uInt32 GetFldSnapY() const { Init(); return SvxOptionsGrid::GetFldSnapY(); } - sal_Bool IsUseGridSnap() const { Init(); return SvxOptionsGrid::GetUseGridSnap(); } - sal_Bool IsSynchronize() const { Init(); return SvxOptionsGrid::GetSynchronize(); } - sal_Bool IsGridVisible() const { Init(); return SvxOptionsGrid::GetGridVisible(); } - sal_Bool IsEqualGrid() const { Init(); return SvxOptionsGrid::GetEqualGrid(); } + bool IsUseGridSnap() const { Init(); return SvxOptionsGrid::GetUseGridSnap(); } + bool IsSynchronize() const { Init(); return SvxOptionsGrid::GetSynchronize(); } + bool IsGridVisible() const { Init(); return SvxOptionsGrid::GetGridVisible(); } + bool IsEqualGrid() const { Init(); return SvxOptionsGrid::GetEqualGrid(); } void SetFldDrawX( sal_uInt32 nSet ) { if( nSet != SvxOptionsGrid::GetFldDrawX() ) { OptionsChanged(); SvxOptionsGrid::SetFldDrawX( nSet ); } } void SetFldDivisionX( sal_uInt32 nSet ) { if( nSet != SvxOptionsGrid::GetFldDivisionX() ) { OptionsChanged(); SvxOptionsGrid::SetFldDivisionX( nSet ); } } @@ -496,83 +496,83 @@ class SD_DLLPUBLIC SdOptionsPrint : public SdOptionsGeneric { private: - sal_Bool bDraw : 1; // Print/Content/Drawing - sal_Bool bNotes : 1; // Print/Content/Note - sal_Bool bHandout : 1; // Print/Content/Handout - sal_Bool bOutline : 1; // Print/Content/Outline - sal_Bool bDate : 1; // Print/Other/Date - sal_Bool bTime : 1; // Print/Other/Time - sal_Bool bPagename : 1; // Print/Other/PageName - sal_Bool bHiddenPages : 1; // Print/Other/HiddenPage - sal_Bool bPagesize : 1; // Print/Page/PageSize - sal_Bool bPagetile : 1; // Print/Page/PageTile - sal_Bool bWarningPrinter : 1; // These flags you get - sal_Bool bWarningSize : 1; // from the common options, - sal_Bool bWarningOrientation : 1; // currently org.openoffice.Office.Common.xml (class OfaMiscCfg ; sfx2/misccfg.hxx ) - sal_Bool bBooklet : 1; // Print/Page/Booklet - sal_Bool bFront : 1; // Print/Page/BookletFront - sal_Bool bBack : 1; // Print/Page/BookletFront - sal_Bool bCutPage : 1; // NOT persistent !!! - sal_Bool bPaperbin : 1; // Print/Other/FromPrinterSetup - sal_Bool mbHandoutHorizontal : 1; // Order Page previews on Handout Pages horizontal + bool bDraw : 1; // Print/Content/Drawing + bool bNotes : 1; // Print/Content/Note + bool bHandout : 1; // Print/Content/Handout + bool bOutline : 1; // Print/Content/Outline + bool bDate : 1; // Print/Other/Date + bool bTime : 1; // Print/Other/Time + bool bPagename : 1; // Print/Other/PageName + bool bHiddenPages : 1; // Print/Other/HiddenPage + bool bPagesize : 1; // Print/Page/PageSize + bool bPagetile : 1; // Print/Page/PageTile + bool bWarningPrinter : 1; // These flags you get + bool bWarningSize : 1; // from the common options, + bool bWarningOrientation : 1; // currently org.openoffice.Office.Common.xml (class OfaMiscCfg ; sfx2/misccfg.hxx ) + bool bBooklet : 1; // Print/Page/Booklet + bool bFront : 1; // Print/Page/BookletFront + bool bBack : 1; // Print/Page/BookletFront + bool bCutPage : 1; // NOT persistent !!! + bool bPaperbin : 1; // Print/Other/FromPrinterSetup + bool mbHandoutHorizontal : 1; // Order Page previews on Handout Pages horizontal sal_uInt16 mnHandoutPages; // Number of page previews on handout page (only 1/2/4/6/9 are supported) sal_uInt16 nQuality; // Print/Other/Quality protected: virtual void GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const SAL_OVERRIDE; - virtual sal_Bool ReadData( const ::com::sun::star::uno::Any* pValues ) SAL_OVERRIDE; - virtual sal_Bool WriteData( ::com::sun::star::uno::Any* pValues ) const SAL_OVERRIDE; + virtual bool ReadData( const ::com::sun::star::uno::Any* pValues ) SAL_OVERRIDE; + virtual bool WriteData( ::com::sun::star::uno::Any* pValues ) const SAL_OVERRIDE; public: - SdOptionsPrint( sal_uInt16 nConfigId, sal_Bool bUseConfig ); + SdOptionsPrint( sal_uInt16 nConfigId, bool bUseConfig ); virtual ~SdOptionsPrint() {} - sal_Bool operator==( const SdOptionsPrint& rOpt ) const; - - sal_Bool IsDraw() const { Init(); return (sal_Bool) bDraw; } - sal_Bool IsNotes() const { Init(); return (sal_Bool) bNotes; } - sal_Bool IsHandout() const { Init(); return (sal_Bool) bHandout; } - sal_Bool IsOutline() const { Init(); return (sal_Bool) bOutline; } - sal_Bool IsDate() const { Init(); return (sal_Bool) bDate; } - sal_Bool IsTime() const { Init(); return (sal_Bool) bTime; } - sal_Bool IsPagename() const { Init(); return (sal_Bool) bPagename; } - sal_Bool IsHiddenPages() const { Init(); return (sal_Bool) bHiddenPages; } - sal_Bool IsPagesize() const { Init(); return (sal_Bool) bPagesize; } - sal_Bool IsPagetile() const { Init(); return (sal_Bool) bPagetile; } - sal_Bool IsWarningPrinter() const { Init(); return (sal_Bool) bWarningPrinter; } - sal_Bool IsWarningSize() const { Init(); return (sal_Bool) bWarningSize; } - sal_Bool IsWarningOrientation() const { Init(); return (sal_Bool) bWarningOrientation; } - sal_Bool IsBooklet() const { Init(); return (sal_Bool) bBooklet; } - sal_Bool IsFrontPage() const { Init(); return (sal_Bool) bFront; } - sal_Bool IsBackPage() const { Init(); return (sal_Bool) bBack; } - sal_Bool IsCutPage() const { Init(); return (sal_Bool) bCutPage; } - sal_Bool IsPaperbin() const { Init(); return (sal_Bool) bPaperbin; } + bool operator==( const SdOptionsPrint& rOpt ) const; + + bool IsDraw() const { Init(); return bDraw; } + bool IsNotes() const { Init(); return bNotes; } + bool IsHandout() const { Init(); return bHandout; } + bool IsOutline() const { Init(); return bOutline; } + bool IsDate() const { Init(); return bDate; } + bool IsTime() const { Init(); return bTime; } + bool IsPagename() const { Init(); return bPagename; } + bool IsHiddenPages() const { Init(); return bHiddenPages; } + bool IsPagesize() const { Init(); return bPagesize; } + bool IsPagetile() const { Init(); return bPagetile; } + bool IsWarningPrinter() const { Init(); return bWarningPrinter; } + bool IsWarningSize() const { Init(); return bWarningSize; } + bool IsWarningOrientation() const { Init(); return bWarningOrientation; } + bool IsBooklet() const { Init(); return bBooklet; } + bool IsFrontPage() const { Init(); return bFront; } + bool IsBackPage() const { Init(); return bBack; } + bool IsCutPage() const { Init(); return bCutPage; } + bool IsPaperbin() const { Init(); return bPaperbin; } sal_uInt16 GetOutputQuality() const { Init(); return nQuality; } - sal_Bool IsHandoutHorizontal() const { Init(); return mbHandoutHorizontal; } + bool IsHandoutHorizontal() const { Init(); return mbHandoutHorizontal; } sal_uInt16 GetHandoutPages() const { Init(); return mnHandoutPages; } - void SetDraw( sal_Bool bOn = sal_True ) { if( bDraw != bOn ) { OptionsChanged(); bDraw = bOn; } } - void SetNotes( sal_Bool bOn = sal_True ) { if( bNotes != bOn ) { OptionsChanged(); bNotes = bOn; } } - void SetHandout( sal_Bool bOn = sal_True ) { if( bHandout != bOn ) { OptionsChanged(); bHandout = bOn; } } - void SetOutline( sal_Bool bOn = sal_True ) { if( bOutline != bOn ) { OptionsChanged(); bOutline = bOn; } } - void SetDate( sal_Bool bOn = sal_True ) { if( bDate != bOn ) { OptionsChanged(); bDate = bOn; } } - void SetTime( sal_Bool bOn = sal_True ) { if( bTime != bOn ) { OptionsChanged(); bTime = bOn; } } - void SetPagename( sal_Bool bOn = sal_True ) { if( bPagename != bOn ) { OptionsChanged(); bPagename = bOn; } } - void SetHiddenPages( sal_Bool bOn = sal_True ) { if( bHiddenPages != bOn ) { OptionsChanged(); bHiddenPages = bOn; } } - void SetPagesize( sal_Bool bOn = sal_True ) { if( bPagesize != bOn ) { OptionsChanged(); bPagesize = bOn; } } - void SetPagetile( sal_Bool bOn = sal_True ) { if( bPagetile != bOn ) { OptionsChanged(); bPagetile = bOn; } } - void SetWarningPrinter( sal_Bool bOn = sal_True ) { if( bWarningPrinter != bOn ) { OptionsChanged(); bWarningPrinter = bOn; } } - void SetWarningSize( sal_Bool bOn = sal_True ) { if( bWarningSize != bOn ) { OptionsChanged(); bWarningSize = bOn; } } - void SetWarningOrientation( sal_Bool bOn = sal_True ) { if( bWarningOrientation != bOn ) { OptionsChanged(); bWarningOrientation = bOn; } } - void SetBooklet( sal_Bool bOn = sal_True ) { if( bBooklet != bOn ) { OptionsChanged(); bBooklet = bOn; } } - void SetFrontPage( sal_Bool bOn = sal_True ) { if( bFront != bOn ) { OptionsChanged(); bFront = bOn; } } - void SetBackPage( sal_Bool bOn = sal_True ) { if( bBack != bOn ) { OptionsChanged(); bBack = bOn; } } - void SetCutPage( sal_Bool bOn = sal_True ) { if( bCutPage != bOn ) { OptionsChanged(); bCutPage = bOn; } } - void SetPaperbin( sal_Bool bOn = sal_True ) { if( bPaperbin != bOn ) { OptionsChanged(); bPaperbin = bOn; } } + void SetDraw( bool bOn = true ) { if( bDraw != bOn ) { OptionsChanged(); bDraw = bOn; } } + void SetNotes( bool bOn = true ) { if( bNotes != bOn ) { OptionsChanged(); bNotes = bOn; } } + void SetHandout( bool bOn = true ) { if( bHandout != bOn ) { OptionsChanged(); bHandout = bOn; } } + void SetOutline( bool bOn = true ) { if( bOutline != bOn ) { OptionsChanged(); bOutline = bOn; } } + void SetDate( bool bOn = true ) { if( bDate != bOn ) { OptionsChanged(); bDate = bOn; } } + void SetTime( bool bOn = true ) { if( bTime != bOn ) { OptionsChanged(); bTime = bOn; } } + void SetPagename( bool bOn = true ) { if( bPagename != bOn ) { OptionsChanged(); bPagename = bOn; } } + void SetHiddenPages( bool bOn = true ) { if( bHiddenPages != bOn ) { OptionsChanged(); bHiddenPages = bOn; } } + void SetPagesize( bool bOn = true ) { if( bPagesize != bOn ) { OptionsChanged(); bPagesize = bOn; } } + void SetPagetile( bool bOn = true ) { if( bPagetile != bOn ) { OptionsChanged(); bPagetile = bOn; } } + void SetWarningPrinter( bool bOn = true ) { if( bWarningPrinter != bOn ) { OptionsChanged(); bWarningPrinter = bOn; } } + void SetWarningSize( bool bOn = true ) { if( bWarningSize != bOn ) { OptionsChanged(); bWarningSize = bOn; } } + void SetWarningOrientation( bool bOn = true ) { if( bWarningOrientation != bOn ) { OptionsChanged(); bWarningOrientation = bOn; } } + void SetBooklet( bool bOn = true ) { if( bBooklet != bOn ) { OptionsChanged(); bBooklet = bOn; } } + void SetFrontPage( bool bOn = true ) { if( bFront != bOn ) { OptionsChanged(); bFront = bOn; } } + void SetBackPage( bool bOn = true ) { if( bBack != bOn ) { OptionsChanged(); bBack = bOn; } } + void SetCutPage( bool bOn = true ) { if( bCutPage != bOn ) { OptionsChanged(); bCutPage = bOn; } } + void SetPaperbin( bool bOn = true ) { if( bPaperbin != bOn ) { OptionsChanged(); bPaperbin = bOn; } } void SetOutputQuality( sal_uInt16 nInQuality ) { if( nQuality != nInQuality ) { OptionsChanged(); nQuality = nInQuality; } } - void SetHandoutHorizontal( sal_Bool bHandoutHorizontal ) { if( mbHandoutHorizontal != bHandoutHorizontal ) { OptionsChanged(); mbHandoutHorizontal = bHandoutHorizontal; } } + void SetHandoutHorizontal( bool bHandoutHorizontal ) { if( mbHandoutHorizontal != bHandoutHorizontal ) { OptionsChanged(); mbHandoutHorizontal = bHandoutHorizontal; } } void SetHandoutPages( sal_uInt16 nHandoutPages ) { if( nHandoutPages != mnHandoutPages ) { OptionsChanged(); mnHandoutPages = nHandoutPages; } } }; diff --git a/sd/source/ui/inc/pubdlg.hxx b/sd/source/ui/inc/pubdlg.hxx index 36bc3ed748fb..74f11d545f2c 100644 --- a/sd/source/ui/inc/pubdlg.hxx +++ b/sd/source/ui/inc/pubdlg.hxx @@ -151,8 +151,8 @@ private: Assistent aAssistentFunc; - sal_Bool m_bImpress; - sal_Bool m_bButtonsDirty; + bool m_bImpress; + bool m_bButtonsDirty; void SetDefaults(); void CreatePages(); @@ -165,10 +165,10 @@ private: void UpdatePage(); boost::ptr_vector<SdPublishingDesign> m_aDesignList; - sal_Bool m_bDesignListDirty; + bool m_bDesignListDirty; SdPublishingDesign* m_pDesign; - sal_Bool Load(); - sal_Bool Save(); + bool Load(); + bool Save(); void GetDesign( SdPublishingDesign* pDesign ); void SetDesign( SdPublishingDesign* pDesign ); diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx index 396352b239aa..08debfa1ef97 100644 --- a/sd/source/ui/inc/sdtreelb.hxx +++ b/sd/source/ui/inc/sdtreelb.hxx @@ -60,10 +60,10 @@ class SD_DLLPUBLIC SdPageObjsTLB : public SvTreeListBox { private: - static sal_Bool SAL_DLLPRIVATE bIsInDrag; ///< static, in the case the navigator is deleted in ExecuteDrag + static bool SAL_DLLPRIVATE bIsInDrag; ///< static, in the case the navigator is deleted in ExecuteDrag // set contenttree in SdNavigatorWin - sal_Bool bisInSdNavigatorWin; + bool bisInSdNavigatorWin; public: // nested class to implement the TransferableHelper @@ -129,13 +129,13 @@ protected: SfxMedium* mpOwnMedium; Image maImgOle; Image maImgGraphic; - sal_Bool mbLinkableSelected; + bool mbLinkableSelected; OUString maDocName; ::sd::DrawDocShellRef mxBookmarkDocShRef; ///< for the loading of bookmarks SdNavigatorWin* mpDropNavWin; SfxViewFrame* mpFrame; vector<OUString> maTreeItem; - sal_Bool mbSaveTreeItemState; + bool mbSaveTreeItemState; OUString maSelectionEntryText; // DragSourceHelper @@ -190,7 +190,7 @@ public: virtual ~SdPageObjsTLB(); // helper function for GetEntryAltText and GetEntryLongDescription - OUString getAltLongDescText( SvTreeListEntry* pEntry , sal_Bool isAltText) const; + OUString getAltLongDescText( SvTreeListEntry* pEntry , bool isAltText) const; OUString GetEntryAltText( SvTreeListEntry* pEntry ) const SAL_OVERRIDE; OUString GetEntryLongDescription( SvTreeListEntry* pEntry ) const SAL_OVERRIDE; virtual void SelectHdl() SAL_OVERRIDE; @@ -199,22 +199,22 @@ public: void SetViewFrame( SfxViewFrame* pViewFrame ) { mpFrame = pViewFrame; } SfxViewFrame* GetViewFrame() const { return mpFrame; } - void Fill( const SdDrawDocument*, sal_Bool bAllPages, const OUString& rDocName ); + void Fill( const SdDrawDocument*, bool bAllPages, const OUString& rDocName ); void Fill( const SdDrawDocument*, SfxMedium* pSfxMedium, const OUString& rDocName ); void SetShowAllShapes (const bool bShowAllShapes, const bool bFill); bool GetShowAllShapes (void) const; - sal_Bool IsEqualToDoc( const SdDrawDocument* pInDoc = NULL ); - sal_Bool HasSelectedChildren( const OUString& rName ); - sal_Bool SelectEntry( const OUString& rName ); + bool IsEqualToDoc( const SdDrawDocument* pInDoc = NULL ); + bool HasSelectedChildren( const OUString& rName ); + bool SelectEntry( const OUString& rName ); OUString GetSelectEntry(); //Mark Current Entry void MarkCurEntry( const OUString& rName ); - void SetSdNavigatorWinFlag(sal_Bool isInSdNavigatorWin){bisInSdNavigatorWin =isInSdNavigatorWin;}; + void SetSdNavigatorWinFlag(bool isInSdNavigatorWin){bisInSdNavigatorWin =isInSdNavigatorWin;}; void FreshCurEntry(); void Clear(); - void SetSaveTreeItemStateFlag(sal_Bool bState){mbSaveTreeItemState = bState;} + void SetSaveTreeItemStateFlag(bool bState){mbSaveTreeItemState = bState;} void SaveExpandedTreeItemState(SvTreeListEntry* pEntry, vector<OUString>& vectTreeItem); /** return selected entries @@ -225,9 +225,9 @@ public: SdDrawDocument* GetBookmarkDoc(SfxMedium* pMedium = NULL); - sal_Bool IsLinkableSelected() const { return mbLinkableSelected; } + bool IsLinkableSelected() const { return mbLinkableSelected; } - static sal_Bool IsInDrag(); + static bool IsInDrag(); using SvTreeListBox::ExecuteDrop; using SvTreeListBox::SelectEntry; diff --git a/sd/source/ui/inc/sdxfer.hxx b/sd/source/ui/inc/sdxfer.hxx index 01a97394c652..10ebdf788dcb 100644 --- a/sd/source/ui/inc/sdxfer.hxx +++ b/sd/source/ui/inc/sdxfer.hxx @@ -42,7 +42,7 @@ class SdTransferable : public TransferableHelper, public SfxListener { public: - SdTransferable( SdDrawDocument* pSrcDoc, ::sd::View* pWorkView, sal_Bool bInitOnGetData ); + SdTransferable( SdDrawDocument* pSrcDoc, ::sd::View* pWorkView, bool bInitOnGetData ); virtual ~SdTransferable(); void SetDocShell( const SfxObjectShellRef& rRef ) { maDocShellRef = rRef; } @@ -59,18 +59,18 @@ public: void SetStartPos( const Point& rStartPos ) { maStartPos = rStartPos; } const Point& GetStartPos() const { return maStartPos; } - void SetInternalMove( sal_Bool bSet ) { mbInternalMove = bSet; } - sal_Bool IsInternalMove() const { return mbInternalMove; } + void SetInternalMove( bool bSet ) { mbInternalMove = bSet; } + bool IsInternalMove() const { return mbInternalMove; } - sal_Bool HasSourceDoc( const SdDrawDocument* pDoc ) const { return( mpSourceDoc == pDoc ); } + bool HasSourceDoc( const SdDrawDocument* pDoc ) const { return( mpSourceDoc == pDoc ); } - void SetPageBookmarks( const std::vector<OUString>& rPageBookmarks, sal_Bool bPersistent ); - sal_Bool IsPageTransferable() const { return mbPageTransferable; } - sal_Bool HasPageBookmarks() const { return( mpPageDocShell && ( !maPageBookmarks.empty() ) ); } + void SetPageBookmarks( const std::vector<OUString>& rPageBookmarks, bool bPersistent ); + bool IsPageTransferable() const { return mbPageTransferable; } + bool HasPageBookmarks() const { return( mpPageDocShell && ( !maPageBookmarks.empty() ) ); } const std::vector<OUString>& GetPageBookmarks() const { return maPageBookmarks; } ::sd::DrawDocShell* GetPageDocShell() const { return mpPageDocShell; } - sal_Bool SetTableRTF( SdDrawDocument*, const ::com::sun::star::datatransfer::DataFlavor& ); + bool SetTableRTF( SdDrawDocument*, const ::com::sun::star::datatransfer::DataFlavor& ); static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId(); static SdTransferable* getImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxData ) throw(); @@ -130,12 +130,12 @@ private: ImageMap* mpImageMap; Rectangle maVisArea; Point maStartPos; - sal_Bool mbInternalMove : 1; - sal_Bool mbOwnDocument : 1; - sal_Bool mbOwnView : 1; - sal_Bool mbLateInit : 1; - sal_Bool mbPageTransferable : 1; - sal_Bool mbPageTransferablePersistent : 1; + bool mbInternalMove : 1; + bool mbOwnDocument : 1; + bool mbOwnView : 1; + bool mbLateInit : 1; + bool mbPageTransferable : 1; + bool mbPageTransferablePersistent : 1; bool mbIsUnoObj : 1; ::std::vector<boost::shared_ptr<UserData> > maUserData; diff --git a/sd/source/ui/inc/smarttag.hxx b/sd/source/ui/inc/smarttag.hxx index a63b73fd0229..b34a47da1d5b 100644 --- a/sd/source/ui/inc/smarttag.hxx +++ b/sd/source/ui/inc/smarttag.hxx @@ -70,9 +70,9 @@ public: protected: virtual sal_uLong GetMarkablePointCount() const; virtual sal_uLong GetMarkedPointCount() const; - virtual sal_Bool MarkPoint(SdrHdl& rHdl, sal_Bool bUnmark=sal_False); + virtual bool MarkPoint(SdrHdl& rHdl, bool bUnmark=false); virtual void CheckPossibilities(); - virtual sal_Bool MarkPoints(const Rectangle* pRect, sal_Bool bUnmark); + virtual bool MarkPoints(const Rectangle* pRect, bool bUnmark); virtual void addCustomHandles( SdrHdlList& rHandlerList ); virtual void select(); @@ -131,13 +131,13 @@ public: bool getContext( SdrViewContext& rContext ) const; // support point editing - sal_Bool HasMarkablePoints() const; + bool HasMarkablePoints() const; sal_uLong GetMarkablePointCount() const; - sal_Bool HasMarkedPoints() const; + bool HasMarkedPoints() const; sal_uLong GetMarkedPointCount() const; - sal_Bool IsPointMarkable(const SdrHdl& rHdl) const; - sal_Bool MarkPoint(SdrHdl& rHdl, sal_Bool bUnmark=sal_False); - sal_Bool MarkPoints(const Rectangle* pRect, sal_Bool bUnmark); + bool IsPointMarkable(const SdrHdl& rHdl) const; + bool MarkPoint(SdrHdl& rHdl, bool bUnmark=false); + bool MarkPoints(const Rectangle* pRect, bool bUnmark); void CheckPossibilities(); diff --git a/sd/source/ui/inc/tbx_ww.hxx b/sd/source/ui/inc/tbx_ww.hxx index 3814dd2e3329..e269491edbf4 100644 --- a/sd/source/ui/inc/tbx_ww.hxx +++ b/sd/source/ui/inc/tbx_ww.hxx @@ -27,7 +27,7 @@ class SdTbxControl : public SfxToolBoxControl { private: - sal_Bool IsCheckable( sal_uInt16 nSId ); + bool IsCheckable( sal_uInt16 nSId ); public: SFX_DECL_TOOLBOX_CONTROL(); diff --git a/sd/source/ui/inc/tpaction.hxx b/sd/source/ui/inc/tpaction.hxx index fabd20a35b4f..b2d97df13848 100644 --- a/sd/source/ui/inc/tpaction.hxx +++ b/sd/source/ui/inc/tpaction.hxx @@ -75,7 +75,7 @@ private: SdDrawDocument* mpDoc; XColorListRef pColList; - sal_Bool bTreeUpdated; + bool bTreeUpdated; std::vector<com::sun::star::presentation::ClickAction> maCurrentActions; OUString aLastFile; ::std::vector< long > aVerbVector; @@ -93,7 +93,7 @@ private: void SetActualClickAction( ::com::sun::star::presentation::ClickAction eCA ); void SetActualAnimationEffect( ::com::sun::star::presentation::AnimationEffect eAE ); void SetEditText( OUString const & rStr ); - OUString GetEditText( sal_Bool bURL = sal_False ); + OUString GetEditText( bool bURL = false ); sal_uInt16 GetClickActionSdResId( ::com::sun::star::presentation::ClickAction eCA ); sal_uInt16 GetAnimationEffectSdResId( ::com::sun::star::presentation::AnimationEffect eAE ); diff --git a/sd/source/ui/inc/tpoption.hxx b/sd/source/ui/inc/tpoption.hxx index a83f416c244a..f2ede261aeb8 100644 --- a/sd/source/ui/inc/tpoption.hxx +++ b/sd/source/ui/inc/tpoption.hxx @@ -116,7 +116,7 @@ private: SfxMapUnit ePoolUnit; OUString GetScale( sal_Int32 nX, sal_Int32 nY ); - sal_Bool SetScale( const OUString& aScale, sal_Int32& rX, sal_Int32& rY ); + bool SetScale( const OUString& aScale, sal_Int32& rX, sal_Int32& rY ); DECL_LINK( SelectMetricHdl_Impl, void * ); diff --git a/sd/source/ui/inc/undopage.hxx b/sd/source/ui/inc/undopage.hxx index 1f24916d9c9e..1e3fd64e0905 100644 --- a/sd/source/ui/inc/undopage.hxx +++ b/sd/source/ui/inc/undopage.hxx @@ -41,17 +41,17 @@ class SdPageFormatUndoAction : public SdUndoAction sal_Int32 mnOldLower; Orientation meOldOrientation; sal_uInt16 mnOldPaperBin; - sal_Bool mbOldFullSize; + bool mbOldFullSize; Size maNewSize; sal_Int32 mnNewLeft; sal_Int32 mnNewRight; sal_Int32 mnNewUpper; sal_Int32 mnNewLower; - sal_Bool mbNewScale; + bool mbNewScale; Orientation meNewOrientation; sal_uInt16 mnNewPaperBin; - sal_Bool mbNewFullSize; + bool mbNewFullSize; public: TYPEINFO_OVERRIDE(); @@ -64,17 +64,17 @@ public: sal_Int32 nOldLwr, Orientation eOldOrient, sal_uInt16 nOPaperBin, - sal_Bool bOFullSize, + bool bOFullSize, const Size& rNewSz, sal_Int32 nNewLft, sal_Int32 nNewRgt, sal_Int32 nNewUpr, sal_Int32 nNewLwr, - sal_Bool bNewScl, + bool bNewScl, Orientation eNewOrient, sal_uInt16 nNPaperBin, - sal_Bool bNFullSize + bool bNFullSize ) : SdUndoAction(pDoc), mpPage (pThePage), diff --git a/sd/source/ui/inc/unmodpg.hxx b/sd/source/ui/inc/unmodpg.hxx index bf9c0d6849d7..180e99079db1 100644 --- a/sd/source/ui/inc/unmodpg.hxx +++ b/sd/source/ui/inc/unmodpg.hxx @@ -33,10 +33,10 @@ class ModifyPageUndoAction : public SdUndoAction OUString maNewName; AutoLayout meOldAutoLayout; AutoLayout meNewAutoLayout; - sal_Bool mbOldBckgrndVisible; - sal_Bool mbNewBckgrndVisible; - sal_Bool mbOldBckgrndObjsVisible; - sal_Bool mbNewBckgrndObjsVisible; + bool mbOldBckgrndVisible; + bool mbNewBckgrndVisible; + bool mbOldBckgrndObjsVisible; + bool mbNewBckgrndObjsVisible; OUString maComment; @@ -47,8 +47,8 @@ public: SdPage* pThePage, const OUString& aTheNewName, AutoLayout eTheNewAutoLayout, - sal_Bool bTheNewBckgrndVisible, - sal_Bool bTheNewBckgrndObjsVisible); + bool bTheNewBckgrndVisible, + bool bTheNewBckgrndObjsVisible); virtual ~ModifyPageUndoAction(); virtual void Undo() SAL_OVERRIDE; diff --git a/sd/source/ui/inc/unoaprms.hxx b/sd/source/ui/inc/unoaprms.hxx index b05158185c98..8d8b967d1100 100644 --- a/sd/source/ui/inc/unoaprms.hxx +++ b/sd/source/ui/inc/unoaprms.hxx @@ -34,20 +34,20 @@ class SdrObject; class SdAnimationPrmsUndoAction : public SdUndoAction { SdrObject* pObject; - sal_Bool bOldActive; - sal_Bool bNewActive; - sal_Bool bOldDimPrevious; - sal_Bool bNewDimPrevious; - sal_Bool bOldDimHide; - sal_Bool bNewDimHide; - sal_Bool bOldSoundOn; - sal_Bool bNewSoundOn; - sal_Bool bOldSecondSoundOn; - sal_Bool bNewSecondSoundOn; - sal_Bool bOldPlayFull; - sal_Bool bNewPlayFull; - sal_Bool bOldSecondPlayFull; - sal_Bool bNewSecondPlayFull; + bool bOldActive; + bool bNewActive; + bool bOldDimPrevious; + bool bNewDimPrevious; + bool bOldDimHide; + bool bNewDimHide; + bool bOldSoundOn; + bool bNewSoundOn; + bool bOldSecondSoundOn; + bool bNewSecondSoundOn; + bool bOldPlayFull; + bool bNewPlayFull; + bool bOldSecondPlayFull; + bool bNewSecondPlayFull; ::com::sun::star::presentation::AnimationEffect eOldEffect; ::com::sun::star::presentation::AnimationEffect eNewEffect; ::com::sun::star::presentation::AnimationEffect eOldTextEffect; @@ -70,25 +70,25 @@ class SdAnimationPrmsUndoAction : public SdUndoAction ::com::sun::star::presentation::ClickAction eNewClickAction; OUString aOldBookmark; OUString aNewBookmark; - sal_Bool bOldInvisibleInPres; - sal_Bool bNewInvisibleInPres; + bool bOldInvisibleInPres; + bool bNewInvisibleInPres; sal_uInt16 nOldVerb; sal_uInt16 nNewVerb; sal_uLong nOldPresOrder; sal_uLong nNewPresOrder; - sal_Bool bInfoCreated; + bool bInfoCreated; public: TYPEINFO_OVERRIDE(); SdAnimationPrmsUndoAction(SdDrawDocument* pTheDoc, SdrObject* pObj, - sal_Bool bCreated): + bool bCreated): SdUndoAction (pTheDoc), pObject (pObj), bInfoCreated (bCreated) {} - void SetActive(sal_Bool bTheOldActive, sal_Bool bTheNewActive) + void SetActive(bool bTheOldActive, bool bTheNewActive) { bOldActive = bTheOldActive; bNewActive = bTheNewActive; } void SetEffect(::com::sun::star::presentation::AnimationEffect eTheOldEffect, ::com::sun::star::presentation::AnimationEffect eTheNewEffect) { eOldEffect = eTheOldEffect; eNewEffect = eTheNewEffect; } @@ -96,19 +96,19 @@ public: { eOldTextEffect = eTheOldEffect; eNewTextEffect = eTheNewEffect; } void SetSpeed(::com::sun::star::presentation::AnimationSpeed eTheOldSpeed, ::com::sun::star::presentation::AnimationSpeed eTheNewSpeed) { eOldSpeed = eTheOldSpeed; eNewSpeed = eTheNewSpeed; } - void SetDim(sal_Bool bTheOldDim, sal_Bool bTheNewDim) + void SetDim(bool bTheOldDim, bool bTheNewDim) { bOldDimPrevious = bTheOldDim; bNewDimPrevious = bTheNewDim; } void SetDimColor(Color aTheOldDimColor, Color aTheNewDimColor) { aOldDimColor = aTheOldDimColor; aNewDimColor = aTheNewDimColor; } - void SetDimHide(sal_Bool bTheOldDimHide, sal_Bool bTheNewDimHide) + void SetDimHide(bool bTheOldDimHide, bool bTheNewDimHide) { bOldDimHide = bTheOldDimHide; bNewDimHide = bTheNewDimHide; } - void SetSoundOn(sal_Bool bTheOldSoundOn, sal_Bool bTheNewSoundOn) + void SetSoundOn(bool bTheOldSoundOn, bool bTheNewSoundOn) { bOldSoundOn = bTheOldSoundOn; bNewSoundOn = bTheNewSoundOn; } void SetSound(const OUString& aTheOldSound, const OUString& aTheNewSound) { aOldSoundFile = aTheOldSound; aNewSoundFile = aTheNewSound; } void SetBlueScreen(Color aTheOldBlueScreen, Color aTheNewBlueScreen) { aOldBlueScreen = aTheOldBlueScreen; aNewBlueScreen = aTheNewBlueScreen; } - void SetPlayFull(sal_Bool bTheOldPlayFull, sal_Bool bTheNewPlayFull) + void SetPlayFull(bool bTheOldPlayFull, bool bTheNewPlayFull) { bOldPlayFull = bTheOldPlayFull; bNewPlayFull = bTheNewPlayFull; } void SetPathObj(SdrPathObj* pTheOldPath, SdrPathObj* pTheNewPath) { pOldPathObj = pTheOldPath; pNewPathObj = pTheNewPath; } @@ -116,7 +116,7 @@ public: { eOldClickAction = eTheOldAction; eNewClickAction = eTheNewAction; } void SetBookmark(const OUString& aTheOldBookmark, const OUString& aTheNewBookmark) { aOldBookmark = aTheOldBookmark; aNewBookmark = aTheNewBookmark; } - void SetInvisibleInPres(sal_Bool bTheOldInvisibleInPres, sal_Bool bTheNewInvisibleInPres) + void SetInvisibleInPres(bool bTheOldInvisibleInPres, bool bTheNewInvisibleInPres) { bOldInvisibleInPres = bTheOldInvisibleInPres; bNewInvisibleInPres = bTheNewInvisibleInPres; } void SetVerb(sal_uInt16 nTheOldVerb, sal_uInt16 nTheNewVerb) { nOldVerb = nTheOldVerb; nNewVerb = nTheNewVerb; } @@ -124,9 +124,9 @@ public: { eOldSecondEffect = eTheOldEffect; eNewSecondEffect = eTheNewEffect; } void SetSecondSpeed(::com::sun::star::presentation::AnimationSpeed eTheOldSpeed, ::com::sun::star::presentation::AnimationSpeed eTheNewSpeed) { eOldSecondSpeed = eTheOldSpeed; eNewSecondSpeed = eTheNewSpeed; } - void SetSecondSoundOn(sal_Bool bTheOldSoundOn, sal_Bool bTheNewSoundOn) + void SetSecondSoundOn(bool bTheOldSoundOn, bool bTheNewSoundOn) { bOldSecondSoundOn = bTheOldSoundOn; bNewSecondSoundOn = bTheNewSoundOn; } - void SetSecondPlayFull(sal_Bool bTheOldPlayFull, sal_Bool bTheNewPlayFull) + void SetSecondPlayFull(bool bTheOldPlayFull, bool bTheNewPlayFull) { bOldSecondPlayFull = bTheOldPlayFull; bNewSecondPlayFull = bTheNewPlayFull; } void SetPresOrder(sal_uLong nTheOldPresOrder, sal_uLong nTheNewPresOrder) { nOldPresOrder = nTheOldPresOrder; nNewPresOrder = nTheNewPresOrder; } diff --git a/sd/source/ui/inc/unomodel.hxx b/sd/source/ui/inc/unomodel.hxx index 3e3f751346ac..bcb6e054cb38 100644 --- a/sd/source/ui/inc/unomodel.hxx +++ b/sd/source/ui/inc/unomodel.hxx @@ -90,9 +90,9 @@ private: css::uno::Reference<css::uno::XInterface> create( OUString const & aServiceSpecifier, OUString const & referer); - SdPage* InsertSdPage( sal_uInt16 nPage, sal_Bool bDuplicate = sal_False ) throw(); + SdPage* InsertSdPage( sal_uInt16 nPage, bool bDuplicate = false ) throw(); - const sal_Bool mbImpressDoc; + const bool mbImpressDoc; bool mbClipBoard; ::com::sun::star::uno::WeakReference< ::com::sun::star::drawing::XDrawPages > mxDrawPagesAccess; @@ -132,9 +132,9 @@ public: ::sd::DrawDocShell* GetDocShell() const { return mpDocShell; } SdDrawDocument* GetDoc() const { return mpDoc; } - sal_Bool IsImpressDocument() const { return mbImpressDoc; } + bool IsImpressDocument() const { return mbImpressDoc; } - void SetModified( sal_Bool bModified = sal_True ) throw(); + void SetModified( bool bModified = true ) throw(); ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XForbiddenCharacters > getForbiddenCharsTable(); diff --git a/sd/source/ui/inc/unosrch.hxx b/sd/source/ui/inc/unosrch.hxx index ad7be67c5eae..3ab929d5d24b 100644 --- a/sd/source/ui/inc/unosrch.hxx +++ b/sd/source/ui/inc/unosrch.hxx @@ -42,7 +42,7 @@ protected: ::com::sun::star::drawing::XDrawPage* mpPage; ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > Search( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > xText, SdUnoSearchReplaceDescriptor* pDescr ) throw(); - sal_Bool Search( const OUString& rText, sal_Int32& nStartPos, sal_Int32& nEndPos, SdUnoSearchReplaceDescriptor* pDescr ) throw(); + bool Search( const OUString& rText, sal_Int32& nStartPos, sal_Int32& nEndPos, SdUnoSearchReplaceDescriptor* pDescr ) throw(); ESelection GetSelection( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > xTextRange ) throw(); ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > GetShape( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > xTextRange ) throw(); ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > GetNextShape( ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > xShapes, ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xCurrentShape ) throw(); @@ -77,22 +77,22 @@ class SdUnoSearchReplaceDescriptor : public ::cppu::WeakImplHelper2< ::com::sun: protected: SvxItemPropertySet* mpPropSet; - sal_Bool mbBackwards; - sal_Bool mbCaseSensitive; - sal_Bool mbWords; + bool mbBackwards; + bool mbCaseSensitive; + bool mbWords; - sal_Bool mbReplace; + bool mbReplace; OUString maSearchStr; OUString maReplaceStr; public: - SdUnoSearchReplaceDescriptor( sal_Bool bReplace ) throw(); + SdUnoSearchReplaceDescriptor( bool bReplace ) throw(); virtual ~SdUnoSearchReplaceDescriptor() throw(); - sal_Bool IsBackwards() const throw() { return mbBackwards; } - sal_Bool IsCaseSensitive() const throw() { return mbCaseSensitive; } - sal_Bool IsWords() const throw() { return mbWords; } + bool IsBackwards() const throw() { return mbBackwards; } + bool IsCaseSensitive() const throw() { return mbCaseSensitive; } + bool IsWords() const throw() { return mbWords; } UNO3_GETIMPLEMENTATION_DECL( SdUnoSearchReplaceDescriptor ) diff --git a/sd/source/ui/inc/unprlout.hxx b/sd/source/ui/inc/unprlout.hxx index 58cb42f02380..85c36fd72a66 100644 --- a/sd/source/ui/inc/unprlout.hxx +++ b/sd/source/ui/inc/unprlout.hxx @@ -32,7 +32,7 @@ class SdPresentationLayoutUndoAction : public SdUndoAction OUString aNewLayoutName; AutoLayout eOldAutoLayout; AutoLayout eNewAutoLayout; - sal_Bool bSetAutoLayout; // sal_True: change AutoLayout + bool bSetAutoLayout; // sal_True: change AutoLayout SdPage* pPage; OUString aComment; @@ -43,7 +43,7 @@ public: const OUString& aTheNewLayoutName, AutoLayout eTheOldAutoLayout, AutoLayout eTheNewAutoLayout, - sal_Bool bSet, + bool bSet, SdPage* pThePage); virtual ~SdPresentationLayoutUndoAction(); diff --git a/sd/source/ui/inc/zoomlist.hxx b/sd/source/ui/inc/zoomlist.hxx index 9c07a2a5f9e7..db8055ab5853 100644 --- a/sd/source/ui/inc/zoomlist.hxx +++ b/sd/source/ui/inc/zoomlist.hxx @@ -37,8 +37,8 @@ public: void InsertZoomRect(const Rectangle& rRect); Rectangle GetNextZoomRect(); Rectangle GetPreviousZoomRect(); - sal_Bool IsNextPossible() const; - sal_Bool IsPreviousPossible() const; + bool IsNextPossible() const; + bool IsPreviousPossible() const; private: ViewShell* mpViewShell; diff --git a/sd/source/ui/presenter/CanvasUpdateRequester.cxx b/sd/source/ui/presenter/CanvasUpdateRequester.cxx index 16e1fd488c37..b736adc4148e 100644 --- a/sd/source/ui/presenter/CanvasUpdateRequester.cxx +++ b/sd/source/ui/presenter/CanvasUpdateRequester.cxx @@ -66,7 +66,7 @@ CanvasUpdateRequester::CanvasUpdateRequester ( const Reference<rendering::XSpriteCanvas>& rxCanvas) : mxCanvas(rxCanvas), mnUserEventId(0), - mbUpdateFlag(sal_False) + mbUpdateFlag(false) { Reference<lang::XComponent> xComponent (mxCanvas, UNO_QUERY); if (xComponent.is()) @@ -87,7 +87,7 @@ CanvasUpdateRequester::~CanvasUpdateRequester (void) -void CanvasUpdateRequester::RequestUpdate (const sal_Bool bUpdateAll) +void CanvasUpdateRequester::RequestUpdate (const bool bUpdateAll) { if (mnUserEventId == 0) { @@ -108,7 +108,7 @@ IMPL_LINK_NOARG(CanvasUpdateRequester, Callback) if (mxCanvas.is()) { mxCanvas->updateScreen(mbUpdateFlag); - mbUpdateFlag = sal_False; + mbUpdateFlag = false; } return 0; } diff --git a/sd/source/ui/presenter/CanvasUpdateRequester.hxx b/sd/source/ui/presenter/CanvasUpdateRequester.hxx index 0c3778929498..04822d876655 100644 --- a/sd/source/ui/presenter/CanvasUpdateRequester.hxx +++ b/sd/source/ui/presenter/CanvasUpdateRequester.hxx @@ -45,7 +45,7 @@ public: static ::boost::shared_ptr<CanvasUpdateRequester> Instance ( const css::uno::Reference<css::rendering::XSpriteCanvas>& rxCanvas); - void RequestUpdate (const sal_Bool bUpdateAll); + void RequestUpdate (const bool bUpdateAll); private: CanvasUpdateRequester (const css::uno::Reference<css::rendering::XSpriteCanvas>& rxCanvas); @@ -60,7 +60,7 @@ private: css::uno::Reference<css::rendering::XSpriteCanvas> mxCanvas; sal_uLong mnUserEventId; - sal_Bool mbUpdateFlag; + bool mbUpdateFlag; DECL_LINK(Callback, void*); }; diff --git a/sd/source/ui/remotecontrol/Server.cxx b/sd/source/ui/remotecontrol/Server.cxx index 529193ac1928..25045b2ccb78 100644 --- a/sd/source/ui/remotecontrol/Server.cxx +++ b/sd/source/ui/remotecontrol/Server.cxx @@ -250,7 +250,7 @@ std::vector<ClientInfo*> RemoteServer::getClients() return aClients; } -sal_Bool RemoteServer::connectClient( ClientInfo* pClient, const OUString& aPin ) +bool RemoteServer::connectClient( ClientInfo* pClient, const OUString& aPin ) { SAL_INFO( "sdremote", "RemoteServer::connectClient called" ); if ( !spServer ) diff --git a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx index b590a2b6214f..dc793a14615a 100644 --- a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx @@ -244,7 +244,7 @@ void CurrentMasterPagesSelector::ExecuteCommand (const sal_Int32 nCommandId) // Removing the precious flag so that the following call to // RemoveUnnessesaryMasterPages() will remove this master page. pMasterPage->SetPrecious(false); - mrDocument.RemoveUnnecessaryMasterPages(pMasterPage, sal_False, sal_True); + mrDocument.RemoveUnnecessaryMasterPages(pMasterPage, false, true); } } else diff --git a/sd/source/ui/sidebar/DocumentHelper.cxx b/sd/source/ui/sidebar/DocumentHelper.cxx index c4bd96c069c3..a96b55c49c2d 100644 --- a/sd/source/ui/sidebar/DocumentHelper.cxx +++ b/sd/source/ui/sidebar/DocumentHelper.cxx @@ -124,7 +124,7 @@ SdPage* DocumentHelper::CopyMasterPageToLocalDocument ( PK_STANDARD); if (pSlide == NULL) break; - pSlide->SetAutoLayout(AUTOLAYOUT_TITLE, sal_True); + pSlide->SetAutoLayout(AUTOLAYOUT_TITLE, true); // Create a copy of the master page and the associated notes // master page and insert them into our document. @@ -142,9 +142,9 @@ SdPage* DocumentHelper::CopyMasterPageToLocalDocument ( rTargetDocument.GetSdPageCount(PK_STANDARD)-1, pNewMasterPage->GetName(), &rTargetDocument, - sal_False, // Connect the new master page with the new slide but + false, // Connect the new master page with the new slide but // do not modify other (master) pages. - sal_True); + true); } while (false); @@ -391,9 +391,9 @@ SdPage* DocumentHelper::AddMasterPage ( pClonedMasterPage->GetUppBorder(), pClonedMasterPage->GetRgtBorder(), pClonedMasterPage->GetLwrBorder()); - pClonedMasterPage->ScaleObjects(aNewSize, aBorders, sal_True); + pClonedMasterPage->ScaleObjects(aNewSize, aBorders, true); pClonedMasterPage->SetSize(aNewSize); - pClonedMasterPage->CreateTitleAndLayout(sal_True); + pClonedMasterPage->CreateTitleAndLayout(true); } } @@ -443,8 +443,8 @@ void DocumentHelper::AssignMasterPageToPage ( (pPage->GetPageNum()-1)/2, rsBaseLayoutName, pDocument, - sal_False, - sal_False); + false, + false); } else { @@ -470,15 +470,15 @@ void DocumentHelper::AssignMasterPageToPage ( (pSlide->GetPageNum()-1)/2, rsBaseLayoutName, pDocument, - sal_False, - sal_False); + false, + false); } else { // 3. Replace the master page A by a copy of the given master // page B. pDocument->RemoveUnnecessaryMasterPages ( - pPage, sal_False); + pPage, false); } } } diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx index ce71491687a6..7bd90a03ccaa 100644 --- a/sd/source/ui/sidebar/LayoutMenu.cxx +++ b/sd/source/ui/sidebar/LayoutMenu.cxx @@ -544,9 +544,9 @@ SfxRequest LayoutMenu::CreateRequest ( void LayoutMenu::Fill (void) { SvtLanguageOptions aLanguageOptions; - sal_Bool bVertical = aLanguageOptions.IsVerticalTextEnabled(); + bool bVertical = aLanguageOptions.IsVerticalTextEnabled(); SdDrawDocument* pDocument = mrBase.GetDocument(); - sal_Bool bRightToLeft = (pDocument!=NULL + bool bRightToLeft = (pDocument!=NULL && pDocument->GetDefaultWritingMode() == WritingMode_RL_TB); // Get URL of the view in the center pane. diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx index 8c62476ef73d..594aaa2a7be9 100644 --- a/sd/source/ui/slideshow/slideshow.cxx +++ b/sd/source/ui/slideshow/slideshow.cxx @@ -305,7 +305,7 @@ void SAL_CALL SlideShow::setPropertyValue( const OUString& aPropertyName, const { case ATTR_PRESENT_ALL: { - sal_Bool bVal = sal_False; + bool bVal = false; if( aValue >>= bVal ) { @@ -316,14 +316,14 @@ void SAL_CALL SlideShow::setPropertyValue( const OUString& aPropertyName, const rPresSettings.mbAll = bVal; bValuesChanged = true; if( bVal ) - rPresSettings.mbCustomShow = sal_False; + rPresSettings.mbCustomShow = false; } } break; } case ATTR_PRESENT_CHANGE_PAGE: { - sal_Bool bVal = sal_False; + bool bVal = false; if( aValue >>= bVal ) { @@ -340,7 +340,7 @@ void SAL_CALL SlideShow::setPropertyValue( const OUString& aPropertyName, const case ATTR_PRESENT_ANIMATION_ALLOWED: { - sal_Bool bVal = sal_False; + bool bVal = false; if( aValue >>= bVal ) { @@ -363,7 +363,7 @@ void SAL_CALL SlideShow::setPropertyValue( const OUString& aPropertyName, const const OUString aShowName( aShow ); - SdCustomShowList* pCustomShowList = mpDoc->GetCustomShowList(sal_False); + SdCustomShowList* pCustomShowList = mpDoc->GetCustomShowList(false); if(pCustomShowList) { SdCustomShow* pCustomShow; @@ -373,7 +373,7 @@ void SAL_CALL SlideShow::setPropertyValue( const OUString& aPropertyName, const break; } - rPresSettings.mbCustomShow = sal_True; + rPresSettings.mbCustomShow = true; bValuesChanged = true; } } @@ -381,7 +381,7 @@ void SAL_CALL SlideShow::setPropertyValue( const OUString& aPropertyName, const } case ATTR_PRESENT_ENDLESS: { - sal_Bool bVal = sal_False; + bool bVal = false; if( aValue >>= bVal ) { @@ -397,7 +397,7 @@ void SAL_CALL SlideShow::setPropertyValue( const OUString& aPropertyName, const } case ATTR_PRESENT_FULLSCREEN: { - sal_Bool bVal = sal_False; + bool bVal = false; if( aValue >>= bVal ) { @@ -419,14 +419,14 @@ void SAL_CALL SlideShow::setPropertyValue( const OUString& aPropertyName, const { bValuesChanged = true; rPresSettings.maPresPage = getUiNameFromPageApiNameImpl(aPresPage); - rPresSettings.mbCustomShow = sal_False; - rPresSettings.mbAll = sal_False; + rPresSettings.mbCustomShow = false; + rPresSettings.mbAll = false; } break; } case ATTR_PRESENT_MANUEL: { - sal_Bool bVal = sal_False; + bool bVal = false; if( aValue >>= bVal ) { @@ -442,7 +442,7 @@ void SAL_CALL SlideShow::setPropertyValue( const OUString& aPropertyName, const } case ATTR_PRESENT_MOUSE: { - sal_Bool bVal = sal_False; + bool bVal = false; if( aValue >>= bVal ) { @@ -457,7 +457,7 @@ void SAL_CALL SlideShow::setPropertyValue( const OUString& aPropertyName, const } case ATTR_PRESENT_ALWAYS_ON_TOP: { - sal_Bool bVal = sal_False; + bool bVal = false; if( aValue >>= bVal ) { @@ -473,7 +473,7 @@ void SAL_CALL SlideShow::setPropertyValue( const OUString& aPropertyName, const } case ATTR_PRESENT_NAVIGATOR: { - sal_Bool bVal = sal_False; + bool bVal = false; if( aValue >>= bVal ) { @@ -489,7 +489,7 @@ void SAL_CALL SlideShow::setPropertyValue( const OUString& aPropertyName, const } case ATTR_PRESENT_PEN: { - sal_Bool bVal = sal_False; + bool bVal = false; if( aValue >>= bVal ) { @@ -519,7 +519,7 @@ void SAL_CALL SlideShow::setPropertyValue( const OUString& aPropertyName, const } case ATTR_PRESENT_SHOW_PAUSELOGO: { - sal_Bool bVal = sal_False; + bool bVal = false; if( aValue >>= bVal ) { @@ -576,14 +576,14 @@ Any SAL_CALL SlideShow::getPropertyValue( const OUString& PropertyName ) throw(U switch( pEntry ? pEntry->nWID : -1 ) { case ATTR_PRESENT_ALL: - return Any( (sal_Bool) ( !rPresSettings.mbCustomShow && rPresSettings.mbAll ) ); + return Any( !rPresSettings.mbCustomShow && rPresSettings.mbAll ); case ATTR_PRESENT_CHANGE_PAGE: - return Any( (sal_Bool) !rPresSettings.mbLockedPages ); + return Any( !rPresSettings.mbLockedPages ); case ATTR_PRESENT_ANIMATION_ALLOWED: return Any( rPresSettings.mbAnimationAllowed ); case ATTR_PRESENT_CUSTOMSHOW: { - SdCustomShowList* pList = mpDoc->GetCustomShowList(sal_False); + SdCustomShowList* pList = mpDoc->GetCustomShowList(false); SdCustomShow* pShow = (pList && rPresSettings.mbCustomShow) ? pList->GetCurObject() : NULL; OUString aShowName; @@ -1210,7 +1210,7 @@ void SlideShow::StartInPlacePresentation() if( mxController.is() ) { - sal_Bool bSuccess = sal_False; + bool bSuccess = false; if( mxCurrentSettings.get() && mxCurrentSettings->mbPreview ) { bSuccess = mxController->startPreview(mxCurrentSettings->mxStartPage, mxCurrentSettings->mxAnimationNode, mxCurrentSettings->mpParentWindow ); diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index 1ee08c395f13..1c3556f557db 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -523,7 +523,7 @@ SlideshowImpl::SlideshowImpl( const Reference< XPresentation2 >& xPresentation, , mbIsPaused(false) , mbWasPaused(false) , mbInputFreeze(false) -, mbActive(sal_False) +, mbActive(false) , maPresSettings( pDoc->getPresentationSettings() ) , mnUserPaintColor( 0x80ff0000L ) , mbUsePen(false) @@ -748,7 +748,7 @@ void SAL_CALL SlideshowImpl::disposing() // restart the custom show dialog if he started us if( mpViewShell->IsStartShowWithDialog() && getDispatcher() ) { - mpViewShell->SetStartShowWithDialog( sal_False ); + mpViewShell->SetStartShowWithDialog( false ); getDispatcher()->Execute( SID_CUSTOMSHOW_DLG, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD ); } @@ -761,7 +761,7 @@ void SAL_CALL SlideshowImpl::disposing() mpShowWindow = 0; } - setActiveXToolbarsVisible( sal_True ); + setActiveXToolbarsVisible( true ); Application::DisableNoYieldMode(); Application::RemovePostYieldListener(LINK(this, SlideshowImpl, PostYieldListener)); @@ -795,19 +795,19 @@ bool SlideshowImpl::startPreview( mxPreviewAnimationNode = xAnimationNode; meAnimationMode = ANIMATIONMODE_PREVIEW; - maPresSettings.mbAll = sal_False; - maPresSettings.mbEndless = sal_False; - maPresSettings.mbCustomShow = sal_False; - maPresSettings.mbManual = sal_False; - maPresSettings.mbMouseVisible = sal_False; - maPresSettings.mbMouseAsPen = sal_False; - maPresSettings.mbLockedPages = sal_False; - maPresSettings.mbAlwaysOnTop = sal_False; - maPresSettings.mbFullScreen = sal_False; - maPresSettings.mbAnimationAllowed = sal_True; + maPresSettings.mbAll = false; + maPresSettings.mbEndless = false; + maPresSettings.mbCustomShow = false; + maPresSettings.mbManual = false; + maPresSettings.mbMouseVisible = false; + maPresSettings.mbMouseAsPen = false; + maPresSettings.mbLockedPages = false; + maPresSettings.mbAlwaysOnTop = false; + maPresSettings.mbFullScreen = false; + maPresSettings.mbAnimationAllowed = true; maPresSettings.mnPauseTimeout = 0; - maPresSettings.mbShowPauseLogo = sal_False; - maPresSettings.mbStartWithNavigator = sal_False; + maPresSettings.mbShowPauseLogo = false; + maPresSettings.mbStartWithNavigator = false; Reference< XDrawPagesSupplier > xDrawPages( mpDoc->getUnoModel(), UNO_QUERY_THROW ); Reference< XIndexAccess > xSlides( xDrawPages->getDrawPages(), UNO_QUERY_THROW ); @@ -924,13 +924,13 @@ bool SlideshowImpl::startShow( PresentationSettingsEx* pPresSettings ) // times should be measured? if( mbRehearseTimings ) { - maPresSettings.mbEndless = sal_False; - maPresSettings.mbManual = sal_True; - maPresSettings.mbMouseVisible = sal_True; - maPresSettings.mbMouseAsPen = sal_False; + maPresSettings.mbEndless = false; + maPresSettings.mbManual = true; + maPresSettings.mbMouseVisible = true; + maPresSettings.mbMouseAsPen = false; maPresSettings.mnPauseTimeout = 0; - maPresSettings.mbShowPauseLogo = sal_False; - maPresSettings.mbStartWithNavigator = sal_False; + maPresSettings.mbShowPauseLogo = false; + maPresSettings.mbStartWithNavigator = false; } if( pStartPage ) @@ -1004,7 +1004,7 @@ bool SlideshowImpl::startShow( PresentationSettingsEx* pPresSettings ) // these Slots are forbiden in other views for this document if( mpDocSh ) { - mpDocSh->SetSlotFilter( sal_True, sizeof( pAllowed ) / sizeof( sal_uInt16 ), pAllowed ); + mpDocSh->SetSlotFilter( true, sizeof( pAllowed ) / sizeof( sal_uInt16 ), pAllowed ); mpDocSh->ApplySlotFilter(); } @@ -1058,24 +1058,24 @@ bool SlideshowImpl::startShow( PresentationSettingsEx* pPresSettings ) aProperties.push_back( beans::PropertyValue( "AdvanceOnClick" , - -1, Any( ! (maPresSettings.mbLockedPages != sal_False) ), + -1, Any( maPresSettings.mbLockedPages ), beans::PropertyState_DIRECT_VALUE ) ); aProperties.push_back( beans::PropertyValue( "ImageAnimationsAllowed" , - -1, Any( maPresSettings.mbAnimationAllowed != sal_False ), + -1, Any( maPresSettings.mbAnimationAllowed != false ), beans::PropertyState_DIRECT_VALUE ) ); - const sal_Bool bZOrderEnabled( + const bool bZOrderEnabled( SD_MOD()->GetSdOptions( mpDoc->GetDocumentType() )->IsSlideshowRespectZOrder() ); aProperties.push_back( beans::PropertyValue( "DisableAnimationZOrder" , - -1, Any( bZOrderEnabled == sal_False ), + -1, Any( bZOrderEnabled == false ), beans::PropertyState_DIRECT_VALUE ) ); aProperties.push_back( beans::PropertyValue( "ForceManualAdvance" , - -1, Any( maPresSettings.mbManual != sal_False ), + -1, Any( maPresSettings.mbManual != false ), beans::PropertyState_DIRECT_VALUE ) ); if( mbUsePen ) @@ -1104,7 +1104,7 @@ bool SlideshowImpl::startShow( PresentationSettingsEx* pPresSettings ) } - setActiveXToolbarsVisible( sal_False ); + setActiveXToolbarsVisible( false ); } catch( Exception& ) { @@ -1669,7 +1669,7 @@ void SlideshowImpl::click( const Reference< XShape >& xShape, const ::com::sun:: sal_Int32 SlideshowImpl::getSlideNumberForBookmark( const OUString& rStrBookmark ) { - sal_Bool bIsMasterPage; + bool bIsMasterPage; OUString aBookmark = getUiNameFromPageApiNameImpl( rStrBookmark ); sal_uInt16 nPgNum = mpDoc->GetPageByName( aBookmark, bIsMasterPage ); @@ -1681,7 +1681,7 @@ sal_Int32 SlideshowImpl::getSlideNumberForBookmark( const OUString& rStrBookmark if( pObj ) { nPgNum = pObj->GetPage()->GetPageNum(); - bIsMasterPage = (sal_Bool)pObj->GetPage()->IsMasterPage(); + bIsMasterPage = pObj->GetPage()->IsMasterPage(); } } @@ -2507,7 +2507,7 @@ void SlideshowImpl::createSlideList( bool bAll, const OUString& rPresSlide ) if( !rPresSlide.isEmpty() ) { sal_Int32 nSlide; - sal_Bool bTakeNextAvailable = sal_False; + bool bTakeNextAvailable = false; for( nSlide = 0, nFirstVisibleSlide = -1; ( nSlide < nSlideCount ) && ( -1 == nFirstVisibleSlide ); nSlide++ ) @@ -2517,7 +2517,7 @@ void SlideshowImpl::createSlideList( bool bAll, const OUString& rPresSlide ) if( pTestSlide->GetName() == rPresSlide ) { if( pTestSlide->IsExcluded() ) - bTakeNextAvailable = sal_True; + bTakeNextAvailable = true; else nFirstVisibleSlide = nSlide; } @@ -2683,7 +2683,7 @@ void SlideshowImpl::resize( const Size& rSize ) -void SlideshowImpl::setActiveXToolbarsVisible( sal_Bool bVisible ) +void SlideshowImpl::setActiveXToolbarsVisible( bool bVisible ) { // in case of ActiveX control the toolbars should not be visible if slide show runs in window mode // actually it runs always in window mode in case of ActiveX control @@ -2725,7 +2725,7 @@ void SAL_CALL SlideshowImpl::activate() throw (RuntimeException, std::exception) if( !mbActive && mxShow.is() ) { - mbActive = sal_True; + mbActive = true; if( ANIMATIONMODE_SHOW == meAnimationMode ) { @@ -2774,7 +2774,7 @@ IMPL_LINK_NOARG(SlideshowImpl, deactivateHdl) { if( mbActive && mxShow.is() ) { - mbActive = sal_False; + mbActive = false; pause(); @@ -2831,8 +2831,8 @@ void SlideshowImpl::receiveRequest(SfxRequest& rReq) const OUString aTarget( ((SfxStringItem&) pArgs->Get(SID_NAVIGATOR_OBJECT)).GetValue() ); // is the bookmark a Slide? - sal_Bool bIsMasterPage; - sal_uInt16 nPgNum = mpDoc->GetPageByName( aTarget, bIsMasterPage ); + bool bIsMasterPage; + sal_uInt16 nPgNum = mpDoc->GetPageByName( aTarget, bIsMasterPage ); SdrObject* pObj = NULL; if( nPgNum == SDRPAGE_NOTFOUND ) @@ -2950,7 +2950,7 @@ sal_Bool SAL_CALL SlideshowImpl::getAlwaysOnTop() throw (RuntimeException, std:: void SAL_CALL SlideshowImpl::setAlwaysOnTop( sal_Bool bAlways ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; - if( maPresSettings.mbAlwaysOnTop != bAlways ) + if( (maPresSettings.mbAlwaysOnTop ? 1 : 0) != bAlways ) { maPresSettings.mbAlwaysOnTop = bAlways; // todo, can this be changed while running? @@ -2978,7 +2978,7 @@ sal_Bool SAL_CALL SlideshowImpl::getMouseVisible() throw (RuntimeException, std: void SAL_CALL SlideshowImpl::setMouseVisible( sal_Bool bVisible ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; - if( maPresSettings.mbMouseVisible != bVisible ) + if( (maPresSettings.mbMouseVisible ? 1 : 0) != bVisible ) { maPresSettings.mbMouseVisible = bVisible; if( mpShowWindow ) @@ -3517,8 +3517,8 @@ PresentationSettingsEx::PresentationSettingsEx( const PresentationSettingsEx& r PresentationSettingsEx::PresentationSettingsEx( PresentationSettings& r ) : PresentationSettings( r ) -, mbRehearseTimings(sal_False) -, mbPreview(sal_False) +, mbRehearseTimings(false) +, mbPreview(false) , mpParentWindow(0) { } @@ -3572,8 +3572,8 @@ void PresentationSettingsEx::SetPropertyValue( const OUString& rProperty, const if( rValue >>= aPresPage ) { maPresPage = getUiNameFromPageApiNameImpl(aPresPage); - mbCustomShow = sal_False; - mbAll = sal_False; + mbCustomShow = false; + mbAll = false; return; } else diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx index 603df30f6bf2..73a481e1d8ce 100644 --- a/sd/source/ui/slideshow/slideshowimpl.hxx +++ b/sd/source/ui/slideshow/slideshowimpl.hxx @@ -91,8 +91,8 @@ class PaneHider; struct PresentationSettingsEx : public PresentationSettings { - sal_Bool mbRehearseTimings; - sal_Bool mbPreview; + bool mbRehearseTimings; + bool mbPreview; ::Window* mpParentWindow; css::uno::Reference< css::drawing::XDrawPage > mxStartPage; css::uno::Reference< css::animations::XAnimationNode > mxAnimationNode; @@ -285,7 +285,7 @@ private: void resize( const Size& rSize ); - void setActiveXToolbarsVisible( sal_Bool bVisible ); + void setActiveXToolbarsVisible( bool bVisible ); DECL_LINK(updateHdl, void *); DECL_LINK( PostYieldListener, void* ); @@ -375,7 +375,7 @@ private: bool mbIsPaused; bool mbWasPaused; // used to cache pause state during context menu bool mbInputFreeze; - sal_Bool mbActive; + bool mbActive; PresentationSettings maPresSettings; sal_Int32 mnUserPaintColor; diff --git a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx index c7927e939d76..6b148395d886 100644 --- a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx +++ b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx @@ -344,14 +344,14 @@ sal_Int32 Clipboard::PasteTransferable (sal_Int32 nInsertPosition) rModel.GetDocument()->InsertBookmarkAsPage( rBookmarkList, NULL, - sal_False, - sal_False, + false, + false, nInsertIndex, - sal_False, + false, pClipTransferable->GetPageDocShell(), - sal_True, + true, bMergeMasterPages, - sal_False); + false); } else { @@ -369,14 +369,14 @@ sal_Int32 Clipboard::PasteTransferable (sal_Int32 nInsertPosition) rModel.GetDocument()->InsertBookmarkAsPage( std::vector<OUString>(), NULL, - sal_False, - sal_False, + false, + false, nInsertIndex, - sal_False, + false, pDataDocSh, - sal_True, + true, bMergeMasterPages, - sal_False); + false); } } mrController.HandleModelChange(); @@ -457,7 +457,7 @@ void Clipboard::CreateSlideTransferable ( SdTransferable* pTransferable = TransferableData::CreateTransferable ( pDocument, NULL, - sal_False, + false, dynamic_cast<SlideSorterViewShell*>(mrSlideSorter.GetViewShell()), aRepresentatives); @@ -544,7 +544,7 @@ void Clipboard::CreateSlideTransferable ( SdDrawDocument* pTransferableDocument = rSlideSorter.GetModel().GetDocument(); if (pTransferableDocument == NULL) break; - sal_Bool bIsMasterPage = sal_False; + bool bIsMasterPage = false; const sal_uInt16 nPageIndex (pTransferableDocument->GetPageByName(sBookmark, bIsMasterPage)); if (nPageIndex == SDRPAGE_NOTFOUND) break; diff --git a/sd/source/ui/slidesorter/controller/SlsListener.cxx b/sd/source/ui/slidesorter/controller/SlsListener.cxx index 3721ed278b51..af387f3c7928 100644 --- a/sd/source/ui/slidesorter/controller/SlsListener.cxx +++ b/sd/source/ui/slidesorter/controller/SlsListener.cxx @@ -520,7 +520,7 @@ void SAL_CALL Listener::propertyChange ( } else if (rEvent.PropertyName.equals (sEditModePropertyName)) { - sal_Bool bIsMasterPageMode = sal_False; + bool bIsMasterPageMode = false; rEvent.NewValue >>= bIsMasterPageMode; mrController.ChangeEditMode ( bIsMasterPageMode ? EM_MASTERPAGE : EM_PAGE); diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx index 8207c9e301ea..8d51190da1d9 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx @@ -364,7 +364,7 @@ rtl::Reference<FuPoor> SelectionFunction::Create( -sal_Bool SelectionFunction::MouseButtonDown (const MouseEvent& rEvent) +bool SelectionFunction::MouseButtonDown (const MouseEvent& rEvent) { // remember button state for creation of own MouseEvents SetMouseButtonCode (rEvent.GetButtons()); @@ -375,22 +375,22 @@ sal_Bool SelectionFunction::MouseButtonDown (const MouseEvent& rEvent) ProcessMouseEvent(BUTTON_DOWN, rEvent); - return sal_True; + return true; } -sal_Bool SelectionFunction::MouseMove (const MouseEvent& rEvent) +bool SelectionFunction::MouseMove (const MouseEvent& rEvent) { ProcessMouseEvent(MOUSE_MOTION, rEvent); - return sal_True; + return true; } -sal_Bool SelectionFunction::MouseButtonUp (const MouseEvent& rEvent) +bool SelectionFunction::MouseButtonUp (const MouseEvent& rEvent) { mrController.GetScrollBarManager().StopAutoScroll (); @@ -399,7 +399,7 @@ sal_Bool SelectionFunction::MouseButtonUp (const MouseEvent& rEvent) mbProcessingMouseButtonDown = false; // mpWindow->ReleaseMouse(); - return sal_True; + return true; } @@ -413,13 +413,13 @@ void SelectionFunction::NotifyDragFinished (void) -sal_Bool SelectionFunction::KeyInput (const KeyEvent& rEvent) +bool SelectionFunction::KeyInput (const KeyEvent& rEvent) { view::SlideSorterView::DrawLock aDrawLock (mrSlideSorter); PageSelector::BroadcastLock aBroadcastLock (mrSlideSorter); PageSelector::UpdateLock aLock (mrSlideSorter); FocusManager& rFocusManager (mrController.GetFocusManager()); - sal_Bool bResult = sal_False; + bool bResult = false; const KeyCode& rCode (rEvent.GetKeyCode()); switch (rCode.GetCode()) @@ -444,7 +444,7 @@ sal_Bool SelectionFunction::KeyInput (const KeyEvent& rEvent) SID_INSERTPAGE, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD); } - bResult = sal_True; + bResult = true; } break; } @@ -453,7 +453,7 @@ sal_Bool SelectionFunction::KeyInput (const KeyEvent& rEvent) if ( ! rFocusManager.IsFocusShowing()) { rFocusManager.ShowFocus(); - bResult = sal_True; + bResult = true; } break; @@ -462,7 +462,7 @@ sal_Bool SelectionFunction::KeyInput (const KeyEvent& rEvent) // operation then stop that. mpModeHandler->Abort(); SwitchToNormalMode(); - bResult = sal_True; + bResult = true; break; case KEY_SPACE: @@ -476,7 +476,7 @@ sal_Bool SelectionFunction::KeyInput (const KeyEvent& rEvent) else mrController.GetPageSelector().SelectPage(pDescriptor); } - bResult = sal_True; + bResult = true; } break; @@ -484,47 +484,47 @@ sal_Bool SelectionFunction::KeyInput (const KeyEvent& rEvent) // Move the focus indicator left. case KEY_LEFT: MoveFocus(FocusManager::FMD_LEFT, rCode.IsShift(), rCode.IsMod1()); - bResult = sal_True; + bResult = true; break; // Move the focus indicator right. case KEY_RIGHT: MoveFocus(FocusManager::FMD_RIGHT, rCode.IsShift(), rCode.IsMod1()); - bResult = sal_True; + bResult = true; break; // Move the focus indicator up. case KEY_UP: MoveFocus(FocusManager::FMD_UP, rCode.IsShift(), rCode.IsMod1()); - bResult = sal_True; + bResult = true; break; // Move the focus indicator down. case KEY_DOWN: MoveFocus(FocusManager::FMD_DOWN, rCode.IsShift(), rCode.IsMod1()); - bResult = sal_True; + bResult = true; break; // Go to previous page. No wrap around. case KEY_PAGEUP: GotoNextPage(-1); - bResult = sal_True; + bResult = true; break; // Go to next page. No wrap around.. case KEY_PAGEDOWN: GotoNextPage(+1); - bResult = sal_True; + bResult = true; break; case KEY_HOME: GotoPage(0); - bResult = sal_True; + bResult = true; break; case KEY_END: GotoPage(mrSlideSorter.GetModel().GetPageCount()-1); - bResult = sal_True; + bResult = true; break; case KEY_DELETE: @@ -536,7 +536,7 @@ sal_Bool SelectionFunction::KeyInput (const KeyEvent& rEvent) mrController.GetSelectionManager()->DeleteSelectedPages(rCode.GetCode()==KEY_DELETE); mnShiftKeySelectionAnchor = -1; - bResult = sal_True; + bResult = true; } break; @@ -1137,7 +1137,7 @@ void SelectionFunction::ModeHandler::SwitchView (const model::SharedPageDescript { if (rpDescriptor.get()!=NULL && rpDescriptor->GetPage()!=NULL) { - mrSlideSorter.GetModel().GetDocument()->SetSelected(rpDescriptor->GetPage(), sal_True); + mrSlideSorter.GetModel().GetDocument()->SetSelected(rpDescriptor->GetPage(), true); pViewShell->GetFrameView()->SetSelectedPage( (rpDescriptor->GetPage()->GetPageNum()-1)/2); } diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx index 68b85dda2b0a..599917511f66 100644 --- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx @@ -412,7 +412,7 @@ void SlotManager::FuSupport (SfxRequest& rRequest) SlideSorterController::ModelChangeLock aModelLock (mrSlideSorter.GetController()); PageSelector::UpdateLock aUpdateLock (mrSlideSorter); SelectionObserver::Context aContext (mrSlideSorter); - pViewShell->ImpSidUndo (sal_False, rRequest); + pViewShell->ImpSidUndo (false, rRequest); } break; } @@ -427,7 +427,7 @@ void SlotManager::FuSupport (SfxRequest& rRequest) SlideSorterController::ModelChangeLock aModelLock (mrSlideSorter.GetController()); PageSelector::UpdateLock aUpdateLock (mrSlideSorter); SelectionObserver::Context aContext (mrSlideSorter); - pViewShell->ImpSidRedo (sal_False, rRequest); + pViewShell->ImpSidRedo (false, rRequest); } break; } @@ -625,7 +625,7 @@ void SlotManager::GetMenuState (SfxItemSet& rSet) if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_PRESENTATION ) || SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_REHEARSE_TIMINGS ) ) { - sal_Bool bDisable = sal_True; + bool bDisable = true; model::PageEnumeration aAllPages ( model::PageEnumerationProvider::CreateAllPagesEnumeration(mrSlideSorter.GetModel())); while (aAllPages.HasMoreElements()) @@ -633,7 +633,7 @@ void SlotManager::GetMenuState (SfxItemSet& rSet) SdPage* pPage = aAllPages.GetNextElement()->GetPage(); if( !pPage->IsExcluded() ) - bDisable = sal_False; + bDisable = false; } if( bDisable || pDocShell->IsPreview()) { @@ -970,7 +970,7 @@ IMPL_LINK(SlotManager, RenameSlideHdl, AbstractSvxNameDialog*, pDialog) bool SlotManager::RenameSlideFromDrawViewShell( sal_uInt16 nPageId, const OUString & rName ) { - sal_Bool bOutDummy; + bool bOutDummy; SdDrawDocument* pDocument = mrSlideSorter.GetModel().GetDocument(); if( pDocument->GetPageByName( rName, bOutDummy ) != SDRPAGE_NOTFOUND ) return false; @@ -1102,7 +1102,7 @@ void SlotManager::InsertSlide (SfxRequest& rRequest) // Create shapes for the default layout. pNewPage = pDocument->GetMasterSdPage( (sal_uInt16)(nInsertionIndex+1), PK_STANDARD); - pNewPage->CreateTitleAndLayout (sal_True,sal_True); + pNewPage->CreateTitleAndLayout (true,true); } } } @@ -1279,7 +1279,7 @@ namespace { SlideExclusionState GetSlideExclusionState (model::PageEnumeration& rPageSet) { SlideExclusionState eState (UNDEFINED); - sal_Bool bState; + bool bState; // Get toggle state of the selected pages. while (rPageSet.HasMoreElements() && eState!=MIXED) diff --git a/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx b/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx index 485198965534..c1d55ca1a998 100644 --- a/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx +++ b/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx @@ -28,7 +28,7 @@ namespace sd { namespace slidesorter { namespace controller { SdTransferable* TransferableData::CreateTransferable ( SdDrawDocument* pSrcDoc, ::sd::View* pWorkView, - sal_Bool bInitOnGetData, + bool bInitOnGetData, SlideSorterViewShell* pViewShell, const ::std::vector<Representative>& rRepresentatives) { diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx index 1feda829ac17..b400dff8f041 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx @@ -47,10 +47,10 @@ public: static rtl::Reference<FuPoor> Create( SlideSorter& rSlideSorter, SfxRequest& rRequest ); // Mouse- & Key-Events - virtual sal_Bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; - virtual sal_Bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; + virtual bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; virtual void Activate() SAL_OVERRIDE; virtual void Deactivate() SAL_OVERRIDE; diff --git a/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx b/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx index 043618301f53..ed756d864d2b 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx @@ -58,7 +58,7 @@ public: static SdTransferable* CreateTransferable ( SdDrawDocument* pSrcDoc, ::sd::View* pWorkView, - sal_Bool bInitOnGetData, + bool bInitOnGetData, SlideSorterViewShell* pViewShell, const ::std::vector<TransferableData::Representative>& rRepresentatives); diff --git a/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx b/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx index 68413f84ab33..ecaf10c4b6c9 100644 --- a/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx +++ b/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx @@ -219,7 +219,7 @@ bool PageDescriptor::SetState (const State eState, const bool bNewStateValue) // This is a state of the page and has to be handled differently // from the view-only states. if (mpPage != NULL) - if (bNewStateValue != (mpPage->IsExcluded()==sal_True)) + if (bNewStateValue != mpPage->IsExcluded()) { mpPage->SetExcluded(bNewStateValue); bModified = true; @@ -245,7 +245,7 @@ VisualState& PageDescriptor::GetVisualState (void) bool PageDescriptor::GetCoreSelection (void) { - if (mpPage!=NULL && (mpPage->IsSelected()==sal_True) != mbIsSelected) + if (mpPage!=NULL && mpPage->IsSelected() != mbIsSelected) return SetState(ST_Selected, !mbIsSelected); else return false; @@ -258,9 +258,9 @@ void PageDescriptor::SetCoreSelection (void) { if (mpPage != NULL) if (HasState(ST_Selected)) - mpPage->SetSelected(sal_True); + mpPage->SetSelected(true); else - mpPage->SetSelected(sal_False); + mpPage->SetSelected(false); else { OSL_ASSERT(mpPage!=NULL); diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx index c0211b62b5a7..d1c6f868caed 100644 --- a/sd/source/ui/table/TableDesignPane.cxx +++ b/sd/source/ui/table/TableDesignPane.cxx @@ -408,7 +408,7 @@ void TableDesignWidget::updateControls() for (sal_uInt16 i = CB_HEADER_ROW; i <= CB_BANDED_COLUMNS; ++i) { - sal_Bool bUse = gDefaults[i]; + bool bUse = gDefaults[i]; if( bHasTable ) try { mxSelectedTable->getPropertyValue( *pPropNames++ ) >>= bUse; @@ -793,7 +793,7 @@ void TableDesignWidget::FillDesignPreviewControl() aSettings.mbUseColumnBanding = m_aCheckBoxes[CB_BANDED_COLUMNS]->IsChecked(); } - sal_Bool bIsPageDark = sal_False; + bool bIsPageDark = false; if( mxView.is() ) { Reference< XPropertySet > xPageSet( mxView->getCurrentPage(), UNO_QUERY ); diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx index fa7c7d2b5b4a..a4cd1c4a1fc0 100644 --- a/sd/source/ui/unoidl/DrawController.cxx +++ b/sd/source/ui/unoidl/DrawController.cxx @@ -814,7 +814,7 @@ sal_Bool SAL_CALL DrawController::isFormDesignMode( ) throw (uno::RuntimeExcept { SolarMutexGuard aGuard; - sal_Bool bIsDesignMode = sal_True; + bool bIsDesignMode = true; FmFormShell* pFormShell = mpBase->GetFormShellManager()->GetFormShell(); if ( pFormShell ) @@ -857,7 +857,7 @@ sal_Bool DrawController::convertFastPropertyValue ( const Any& rValue) throw ( com::sun::star::lang::IllegalArgumentException) { - sal_Bool bResult = sal_False; + bool bResult = false; if (nHandle == PROPERTY_SUB_CONTROLLER) { diff --git a/sd/source/ui/unoidl/SdUnoDrawView.cxx b/sd/source/ui/unoidl/SdUnoDrawView.cxx index 1b5747e8b9dd..f167cc3e35c1 100644 --- a/sd/source/ui/unoidl/SdUnoDrawView.cxx +++ b/sd/source/ui/unoidl/SdUnoDrawView.cxx @@ -72,7 +72,7 @@ SdUnoDrawView::~SdUnoDrawView() throw() -sal_Bool SdUnoDrawView::getMasterPageMode(void) const throw() +bool SdUnoDrawView::getMasterPageMode(void) const throw() { return (mrDrawViewShell.GetEditMode() == EM_MASTERPAGE); } @@ -93,7 +93,7 @@ void SdUnoDrawView::setMasterPageMode (bool bMasterPageMode) throw() -sal_Bool SdUnoDrawView::getLayerMode(void) const throw() +bool SdUnoDrawView::getLayerMode(void) const throw() { return mrDrawViewShell.IsLayerModeActive(); } @@ -101,9 +101,9 @@ sal_Bool SdUnoDrawView::getLayerMode(void) const throw() -void SdUnoDrawView::setLayerMode (sal_Bool bLayerMode) throw() +void SdUnoDrawView::setLayerMode (bool bLayerMode) throw() { - if (mrDrawViewShell.IsLayerModeActive() != (bLayerMode==sal_True)) + if (mrDrawViewShell.IsLayerModeActive() != bLayerMode) { mrDrawViewShell.ChangeEditMode ( mrDrawViewShell.GetEditMode(), @@ -368,7 +368,7 @@ void SdUnoDrawView::setFastPropertyValue ( case DrawController::PROPERTY_MASTERPAGEMODE: { - sal_Bool bValue = sal_False; + bool bValue = false; rValue >>= bValue; setMasterPageMode( bValue ); } @@ -376,7 +376,7 @@ void SdUnoDrawView::setFastPropertyValue ( case DrawController::PROPERTY_LAYERMODE: { - sal_Bool bValue = sal_False; + bool bValue = false; rValue >>= bValue; setLayerMode( bValue ); } diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.cxx b/sd/source/ui/unoidl/UnoDocumentSettings.cxx index 2bc55c066be5..b8fbd1b50ac0 100644 --- a/sd/source/ui/unoidl/UnoDocumentSettings.cxx +++ b/sd/source/ui/unoidl/UnoDocumentSettings.cxx @@ -146,7 +146,7 @@ enum SdDocumentSettingsPropertyHandles #define MID_PRINTER 1 - PropertySetInfo * createSettingsInfoImpl( sal_Bool bIsDraw ) + PropertySetInfo * createSettingsInfoImpl( bool bIsDraw ) { static PropertyMapEntry const aImpressSettingsInfoMap[] = { @@ -405,12 +405,12 @@ throw (UnknownPropertyException, PropertyVetoException, static_cast<OWeakObject *>(this)); } - sal_Bool bValue = sal_False; + bool bValue = false; bool bOk, bChanged = false, bOptionsChanged = false; SdOptionsPrintItem aOptionsPrintItem( ATTR_OPTIONS_PRINT ); - SfxPrinter* pPrinter = pDocSh->GetPrinter( sal_False ); + SfxPrinter* pPrinter = pDocSh->GetPrinter( false ); if( pPrinter ) { SdOptionsPrintItem* pPrinterOptions = NULL; @@ -723,7 +723,7 @@ throw (UnknownPropertyException, PropertyVetoException, bOk = true; if( !aPrinterName.isEmpty() && pDocSh->GetCreateMode() != SFX_CREATE_MODE_EMBEDDED ) { - SfxPrinter *pTempPrinter = pDocSh->GetPrinter( sal_True ); + SfxPrinter *pTempPrinter = pDocSh->GetPrinter( true ); if (pTempPrinter) { SfxPrinter *pNewPrinter = new SfxPrinter( pTempPrinter->GetOptions().Clone(), aPrinterName ); @@ -775,7 +775,7 @@ throw (UnknownPropertyException, PropertyVetoException, case HANDLE_PARAGRAPHSUMMATION : { - sal_Bool bIsSummationOfParagraphs = sal_False; + bool bIsSummationOfParagraphs = false; if ( *pValues >>= bIsSummationOfParagraphs ) { bOk = true; @@ -790,13 +790,13 @@ throw (UnknownPropertyException, PropertyVetoException, SdrOutliner& rOutl = pDocument->GetDrawOutliner(); nCntrl = rOutl.GetControlWord() &~ EE_CNTRL_ULSPACESUMMATION; rOutl.SetControlWord( nCntrl | nSum ); - ::sd::Outliner* pOutl = pDocument->GetOutliner( sal_False ); + ::sd::Outliner* pOutl = pDocument->GetOutliner( false ); if( pOutl ) { nCntrl = pOutl->GetControlWord() &~ EE_CNTRL_ULSPACESUMMATION; pOutl->SetControlWord( nCntrl | nSum ); } - pOutl = pDocument->GetInternalOutliner( sal_False ); + pOutl = pDocument->GetInternalOutliner( false ); if( pOutl ) { nCntrl = pOutl->GetControlWord() &~ EE_CNTRL_ULSPACESUMMATION; @@ -818,12 +818,12 @@ throw (UnknownPropertyException, PropertyVetoException, SdDrawDocument* pDocument = pDocSh->GetDoc(); SdrOutliner& rOutl = pDocument->GetDrawOutliner(); rOutl.SetAsianCompressionMode( (sal_uInt16)nCharCompressType ); - ::sd::Outliner* pOutl = pDocument->GetOutliner( sal_False ); + ::sd::Outliner* pOutl = pDocument->GetOutliner( false ); if( pOutl ) { pOutl->SetAsianCompressionMode( (sal_uInt16)nCharCompressType ); } - pOutl = pDocument->GetInternalOutliner( sal_False ); + pOutl = pDocument->GetInternalOutliner( false ); if( pOutl ) { pOutl->SetAsianCompressionMode( (sal_uInt16)nCharCompressType ); @@ -834,7 +834,7 @@ throw (UnknownPropertyException, PropertyVetoException, } case HANDLE_ASIANPUNCT: { - sal_Bool bAsianPunct = sal_False; + bool bAsianPunct = false; if( *pValues >>= bAsianPunct ) { bOk = true; @@ -843,12 +843,12 @@ throw (UnknownPropertyException, PropertyVetoException, SdDrawDocument* pDocument = pDocSh->GetDoc(); SdrOutliner& rOutl = pDocument->GetDrawOutliner(); rOutl.SetKernAsianPunctuation( bAsianPunct ); - ::sd::Outliner* pOutl = pDocument->GetOutliner( sal_False ); + ::sd::Outliner* pOutl = pDocument->GetOutliner( false ); if( pOutl ) { pOutl->SetKernAsianPunctuation( bAsianPunct ); } - pOutl = pDocument->GetInternalOutliner( sal_False ); + pOutl = pDocument->GetInternalOutliner( false ); if( pOutl ) { pOutl->SetKernAsianPunctuation( bAsianPunct ); @@ -934,14 +934,14 @@ throw (UnknownPropertyException, PropertyVetoException, if( bOptionsChanged ) { if( !pPrinter ) - pPrinter = pDocSh->GetPrinter( sal_True ); + pPrinter = pDocSh->GetPrinter( true ); SfxItemSet aNewOptions( pPrinter->GetOptions() ); aNewOptions.Put( aOptionsPrintItem ); pPrinter->SetOptions( aNewOptions ); } if( bChanged || bOptionsChanged ) - mxModel->SetModified( sal_True ); + mxModel->SetModified( true ); } void DocumentSettings::ExtractURL( XPropertyListType t, Any* pValue ) @@ -974,7 +974,7 @@ throw (UnknownPropertyException, WrappedTargetException, RuntimeException) SdOptionsPrintItem aOptionsPrintItem( ATTR_OPTIONS_PRINT ); - SfxPrinter* pPrinter = pDocSh->GetPrinter( sal_False ); + SfxPrinter* pPrinter = pDocSh->GetPrinter( false ); if( pPrinter ) { SdOptionsPrintItem* pPrinterOptions = NULL; @@ -1016,49 +1016,49 @@ throw (UnknownPropertyException, WrappedTargetException, RuntimeException) *pValue <<= pDocSh->IsUseUserData(); break; case HANDLE_PRINTDRAWING: - *pValue <<= (sal_Bool)aPrintOpts.IsDraw(); + *pValue <<= aPrintOpts.IsDraw(); break; case HANDLE_PRINTNOTES: - *pValue <<= (sal_Bool)aPrintOpts.IsNotes(); + *pValue <<= aPrintOpts.IsNotes(); break; case HANDLE_PRINTHANDOUT: - *pValue <<= (sal_Bool)aPrintOpts.IsHandout(); + *pValue <<= aPrintOpts.IsHandout(); break; case HANDLE_PRINTOUTLINE: - *pValue <<= (sal_Bool)aPrintOpts.IsOutline(); + *pValue <<= aPrintOpts.IsOutline(); break; case HANDLE_SLIDESPERHANDOUT: *pValue <<= (sal_Int16)aPrintOpts.GetHandoutPages(); break; case HANDLE_HANDOUTHORIZONTAL: - *pValue <<= (sal_Bool)aPrintOpts.IsHandoutHorizontal(); + *pValue <<= aPrintOpts.IsHandoutHorizontal(); break; case HANDLE_PRINTPAGENAME: - *pValue <<= (sal_Bool)aPrintOpts.IsPagename(); + *pValue <<= aPrintOpts.IsPagename(); break; case HANDLE_PRINTDATE: - *pValue <<= (sal_Bool)aPrintOpts.IsDate(); + *pValue <<= aPrintOpts.IsDate(); break; case HANDLE_PRINTTIME: - *pValue <<= (sal_Bool)aPrintOpts.IsTime(); + *pValue <<= aPrintOpts.IsTime(); break; case HANDLE_PRINTHIDENPAGES: - *pValue <<= (sal_Bool)aPrintOpts.IsHiddenPages(); + *pValue <<= aPrintOpts.IsHiddenPages(); break; case HANDLE_PRINTFITPAGE: - *pValue <<= (sal_Bool)aPrintOpts.IsPagesize(); + *pValue <<= aPrintOpts.IsPagesize(); break; case HANDLE_PRINTTILEPAGE: - *pValue <<= (sal_Bool)aPrintOpts.IsPagetile(); + *pValue <<= aPrintOpts.IsPagetile(); break; case HANDLE_PRINTBOOKLET: - *pValue <<= (sal_Bool)aPrintOpts.IsBooklet(); + *pValue <<= aPrintOpts.IsBooklet(); break; case HANDLE_PRINTBOOKLETFRONT: - *pValue <<= (sal_Bool)aPrintOpts.IsFrontPage(); + *pValue <<= aPrintOpts.IsFrontPage(); break; case HANDLE_PRINTBOOKLETBACK: - *pValue <<= (sal_Bool)aPrintOpts.IsBackPage(); + *pValue <<= aPrintOpts.IsBackPage(); break; case HANDLE_PRINTQUALITY: *pValue <<= (sal_Int32)aPrintOpts.GetOutputQuality(); @@ -1084,13 +1084,13 @@ throw (UnknownPropertyException, WrappedTargetException, RuntimeException) break; case HANDLE_PRINTERNAME: { - SfxPrinter *pTempPrinter = pDocSh->GetPrinter( sal_False ); + SfxPrinter *pTempPrinter = pDocSh->GetPrinter( false ); *pValue <<= pTempPrinter ? OUString ( pTempPrinter->GetName()) : OUString(); } break; case HANDLE_PRINTERJOB: { - SfxPrinter *pTempPrinter = pDocSh->GetPrinter( sal_False ); + SfxPrinter *pTempPrinter = pDocSh->GetPrinter( false ); if (pTempPrinter) { SvMemoryStream aStream; @@ -1112,7 +1112,7 @@ throw (UnknownPropertyException, WrappedTargetException, RuntimeException) case HANDLE_PARAGRAPHSUMMATION : { - sal_Bool bIsSummationOfParagraphs = pDoc->IsSummationOfParagraphs(); + bool bIsSummationOfParagraphs = pDoc->IsSummationOfParagraphs(); *pValue <<= bIsSummationOfParagraphs; } break; @@ -1125,7 +1125,7 @@ throw (UnknownPropertyException, WrappedTargetException, RuntimeException) case HANDLE_ASIANPUNCT: { - *pValue <<= (sal_Bool)pDoc->IsKernAsianPunctuation(); + *pValue <<= pDoc->IsKernAsianPunctuation(); break; } diff --git a/sd/source/ui/unoidl/randomnode.cxx b/sd/source/ui/unoidl/randomnode.cxx index a2451abbbf78..40a1ebc4d49e 100644 --- a/sd/source/ui/unoidl/randomnode.cxx +++ b/sd/source/ui/unoidl/randomnode.cxx @@ -148,7 +148,7 @@ private: Any maBegin, maDuration, maEnd, maEndSync, maRepeatCount, maRepeatDuration, maTarget; sal_Int16 mnFill, mnFillDefault, mnRestart, mnRestartDefault; double mfAcceleration, mfDecelerate; - sal_Bool mbAutoReverse; + bool mbAutoReverse; Sequence< NamedValue > maUserData; Reference< XAnimate > mxFirstNode; @@ -231,7 +231,7 @@ void RandomAnimationNode::init( sal_Int16 nPresetClass ) mnRestartDefault = AnimationRestart::INHERIT; mfAcceleration = 0.0; mfDecelerate = 0.0; - mbAutoReverse = sal_False; + mbAutoReverse = false; } diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx index fa3cdaed6e54..706bd8aba0e0 100644 --- a/sd/source/ui/unoidl/sddetect.cxx +++ b/sd/source/ui/unoidl/sddetect.cxx @@ -118,11 +118,11 @@ OUString SAL_CALL SdFilterDetect::detect( Sequence< beans::PropertyValue >& lDes // opening as template is done when a parameter tells to do so and a template filter can be detected // (otherwise no valid filter would be found) or if the detected filter is a template filter and // there is no parameter that forbids to open as template - sal_Bool bOpenAsTemplate = sal_False; - sal_Bool bWasReadOnly = sal_False, bReadOnly = sal_False; + bool bOpenAsTemplate = false; + bool bWasReadOnly = false, bReadOnly = false; - sal_Bool bRepairPackage = sal_False; - sal_Bool bRepairAllowed = sal_False; + bool bRepairPackage = false; + bool bRepairAllowed = false; bool bDeepDetection = false; // now some parameters that can already be in the array, but may be overwritten or new inserted here @@ -486,7 +486,7 @@ OUString SAL_CALL SdFilterDetect::detect( Sequence< beans::PropertyValue >& lDes lDescriptor[nPropertyCount].Value <<= bRepairAllowed; nPropertyCount++; - bOpenAsTemplate = sal_True; + bOpenAsTemplate = true; // TODO/LATER: set progress bar that should be used } diff --git a/sd/source/ui/unoidl/unocpres.cxx b/sd/source/ui/unoidl/unocpres.cxx index dd813c5f236d..a9078a84518e 100644 --- a/sd/source/ui/unoidl/unocpres.cxx +++ b/sd/source/ui/unoidl/unocpres.cxx @@ -47,14 +47,14 @@ uno::Reference< uno::XInterface > createUnoCustomShow( SdCustomShow* pShow ) SdXCustomPresentation::SdXCustomPresentation() throw() : mpSdCustomShow(NULL), mpModel(NULL), aDisposeListeners( aDisposeContainerMutex ), - bDisposing( sal_False ) + bDisposing( false ) { } SdXCustomPresentation::SdXCustomPresentation( SdCustomShow* pShow, SdXImpressDocument* pMyModel) throw() : mpSdCustomShow(pShow), mpModel(pMyModel), aDisposeListeners( aDisposeContainerMutex ), - bDisposing( sal_False ) + bDisposing( false ) { } @@ -251,7 +251,7 @@ void SAL_CALL SdXCustomPresentation::dispose() throw(uno::RuntimeException, std: if( bDisposing ) return; // catched a recursion - bDisposing = sal_True; + bDisposing = true; uno::Reference< uno::XInterface > xSource( (cppu::OWeakObject*)this ); @@ -337,7 +337,7 @@ void SAL_CALL SdXCustomPresentationAccess::insertByName( const OUString& aName, // get the documents custom show list SdCustomShowList* pList = 0; if(mrModel.GetDoc()) - pList = mrModel.GetDoc()->GetCustomShowList(sal_True); + pList = mrModel.GetDoc()->GetCustomShowList(true); // no list, no cookies if( NULL == pList) diff --git a/sd/source/ui/unoidl/unocpres.hxx b/sd/source/ui/unoidl/unocpres.hxx index 7cb75bb3a778..d5fcb35b4016 100644 --- a/sd/source/ui/unoidl/unocpres.hxx +++ b/sd/source/ui/unoidl/unocpres.hxx @@ -48,7 +48,7 @@ private: // for xComponent ::osl::Mutex aDisposeContainerMutex; ::cppu::OInterfaceContainerHelper aDisposeListeners; - sal_Bool bDisposing; + bool bDisposing; public: SdXCustomPresentation() throw(); @@ -149,7 +149,7 @@ public: inline SdCustomShowList* SdXCustomPresentationAccess::GetCustomShowList() const throw() { if(mrModel.GetDoc()) - return mrModel.GetDoc()->GetCustomShowList(sal_False); + return mrModel.GetDoc()->GetCustomShowList(false); else return NULL; }; diff --git a/sd/source/ui/unoidl/unodoc.cxx b/sd/source/ui/unoidl/unodoc.cxx index e6ff30967a79..7dc7a3ea2e2e 100644 --- a/sd/source/ui/unoidl/unodoc.cxx +++ b/sd/source/ui/unoidl/unodoc.cxx @@ -56,7 +56,7 @@ uno::Reference< uno::XInterface > SAL_CALL SdDrawingDocument_createInstance( SfxObjectShell* pShell = new ::sd::GraphicDocShell( - _nCreationFlags, sal_False, DOCUMENT_TYPE_DRAW ); + _nCreationFlags, false, DOCUMENT_TYPE_DRAW ); return uno::Reference< uno::XInterface >( pShell->GetModel() ); } @@ -85,7 +85,7 @@ uno::Reference< uno::XInterface > SAL_CALL SdPresentationDocument_createInstance SfxObjectShell* pShell = new ::sd::DrawDocShell( - _nCreationFlags, sal_False, DOCUMENT_TYPE_IMPRESS ); + _nCreationFlags, false, DOCUMENT_TYPE_IMPRESS ); return uno::Reference< uno::XInterface >( pShell->GetModel() ); } diff --git a/sd/source/ui/unoidl/unohelp.hxx b/sd/source/ui/unoidl/unohelp.hxx index 0b54151c6265..5afa24d9d7c9 100644 --- a/sd/source/ui/unoidl/unohelp.hxx +++ b/sd/source/ui/unoidl/unohelp.hxx @@ -19,7 +19,7 @@ namespace sd { -inline sal_Bool any2bool( const ::com::sun::star::uno::Any& rAny, sal_Bool& rBool ) +inline bool any2bool( const ::com::sun::star::uno::Any& rAny, bool& rBool ) { if( rAny.getValueType() == ::getCppuBooleanType() ) { @@ -29,14 +29,14 @@ inline sal_Bool any2bool( const ::com::sun::star::uno::Any& rAny, sal_Bool& rBoo { sal_Int32 nValue = 0; if(!(rAny >>= nValue)) - return sal_False; + return false; rBool = nValue != 0; } - return sal_True; + return true; } -inline void bool2any( sal_Bool bBool, ::com::sun::star::uno::Any& rAny ) +inline void bool2any( bool bBool, ::com::sun::star::uno::Any& rAny ) { rAny.setValue( &bBool, ::getCppuBooleanType() ); } diff --git a/sd/source/ui/unoidl/unolayer.cxx b/sd/source/ui/unoidl/unolayer.cxx index a0d18fc9c91c..405251d520e5 100644 --- a/sd/source/ui/unoidl/unolayer.cxx +++ b/sd/source/ui/unoidl/unolayer.cxx @@ -192,7 +192,7 @@ void SAL_CALL SdLayer::setPropertyValue( const OUString& aPropertyName, const un { case WID_LAYER_LOCKED: { - sal_Bool bValue = sal_False; + bool bValue = false; if(!sd::any2bool( aValue, bValue )) throw lang::IllegalArgumentException(); set( LOCKED, bValue ); @@ -200,7 +200,7 @@ void SAL_CALL SdLayer::setPropertyValue( const OUString& aPropertyName, const un } case WID_LAYER_PRINTABLE: { - sal_Bool bValue = sal_False; + bool bValue = false; if(!sd::any2bool( aValue, bValue )) throw lang::IllegalArgumentException(); set( PRINTABLE, bValue ); @@ -208,7 +208,7 @@ void SAL_CALL SdLayer::setPropertyValue( const OUString& aPropertyName, const un } case WID_LAYER_VISIBLE: { - sal_Bool bValue = sal_False; + bool bValue = false; if(!sd::any2bool( aValue, bValue )) throw lang::IllegalArgumentException(); set( VISIBLE, bValue ); @@ -300,7 +300,7 @@ void SAL_CALL SdLayer::removePropertyChangeListener( const OUString& , const uno void SAL_CALL SdLayer::addVetoableChangeListener( const OUString& , const uno::Reference< beans::XVetoableChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) {} void SAL_CALL SdLayer::removeVetoableChangeListener( const OUString& , const uno::Reference< beans::XVetoableChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) {} -sal_Bool SdLayer::get( LayerAttribute what ) throw() +bool SdLayer::get( LayerAttribute what ) throw() { if(pLayer&&pLayerManager) { @@ -334,10 +334,10 @@ sal_Bool SdLayer::get( LayerAttribute what ) throw() } } } - return sal_False; //TODO: uno::Exception? + return false; //TODO: uno::Exception? } -void SdLayer::set( LayerAttribute what, sal_Bool flag ) throw() +void SdLayer::set( LayerAttribute what, bool flag ) throw() { if(pLayer&&pLayerManager) { @@ -708,7 +708,7 @@ sal_Bool SAL_CALL SdLayerManager::hasElements() throw(uno::RuntimeException, std * If something was changed at the layers, this methods takes care that the * changes are made visible in sdbcx::View. */ -void SdLayerManager::UpdateLayerView( sal_Bool modify ) const throw() +void SdLayerManager::UpdateLayerView( bool modify ) const throw() { if(mpModel->mpDocShell) { @@ -717,7 +717,7 @@ void SdLayerManager::UpdateLayerView( sal_Bool modify ) const throw() if(pDrViewSh) { - sal_Bool bLayerMode = pDrViewSh->IsLayerModeActive(); + bool bLayerMode = pDrViewSh->IsLayerModeActive(); pDrViewSh->ChangeEditMode(pDrViewSh->GetEditMode(), !bLayerMode); pDrViewSh->ChangeEditMode(pDrViewSh->GetEditMode(), bLayerMode); } @@ -753,7 +753,7 @@ namespace @return Return </True> if both pointers point to the same object. */ -sal_Bool compare_layers (uno::WeakReference<uno::XInterface> xRef, void* pSearchData) +bool compare_layers (uno::WeakReference<uno::XInterface> xRef, void* pSearchData) { uno::Reference<uno::XInterface> xLayer (xRef); if (xLayer.is()) @@ -763,10 +763,10 @@ sal_Bool compare_layers (uno::WeakReference<uno::XInterface> xRef, void* pSearch { SdrLayer* pSdrLayer = pSdLayer->GetSdrLayer (); if (pSdrLayer == static_cast<SdrLayer*>(pSearchData)) - return sal_True; + return true; } } - return sal_False; + return false; } } diff --git a/sd/source/ui/unoidl/unolayer.hxx b/sd/source/ui/unoidl/unolayer.hxx index 612d2d045950..1c1dd5b7d7e5 100644 --- a/sd/source/ui/unoidl/unolayer.hxx +++ b/sd/source/ui/unoidl/unolayer.hxx @@ -97,8 +97,8 @@ private: SdrLayer* pLayer; const SvxItemPropertySet* pPropSet; - sal_Bool get( LayerAttribute what ) throw(); - void set( LayerAttribute what, sal_Bool flag ) throw(); + bool get( LayerAttribute what ) throw(); + void set( LayerAttribute what, bool flag ) throw(); }; @@ -173,7 +173,7 @@ private: ::sd::View* GetView() const throw(); ::sd::DrawDocShell* GetDocShell() const throw() { return mpModel->mpDocShell; } - void UpdateLayerView( sal_Bool modify = sal_True ) const throw(); + void UpdateLayerView( bool modify = true ) const throw(); }; #endif diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index aa911339b30b..52ef73300ed7 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -439,7 +439,7 @@ void SdXImpressDocument::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) /****************************************************************************** * * ******************************************************************************/ -SdPage* SdXImpressDocument::InsertSdPage( sal_uInt16 nPage, sal_Bool bDuplicate ) throw() +SdPage* SdXImpressDocument::InsertSdPage( sal_uInt16 nPage, bool bDuplicate ) throw() { sal_uInt16 nPageCount = mpDoc->GetSdPageCount( PK_STANDARD ); SdrLayerAdmin& rLayerAdmin = mpDoc->GetLayerAdmin(); @@ -462,8 +462,8 @@ SdPage* SdXImpressDocument::InsertSdPage( sal_uInt16 nPage, sal_Bool bDuplicate // here we determine the page after which we should insert SdPage* pPreviousStandardPage = mpDoc->GetSdPage( std::min( (sal_uInt16)(nPageCount - 1), nPage ), PK_STANDARD ); SetOfByte aVisibleLayers = pPreviousStandardPage->TRG_GetMasterPageVisibleLayers(); - sal_Bool bIsPageBack = aVisibleLayers.IsSet( aBckgrnd ); - sal_Bool bIsPageObj = aVisibleLayers.IsSet( aBckgrndObj ); + bool bIsPageBack = aVisibleLayers.IsSet( aBckgrnd ); + bool bIsPageObj = aVisibleLayers.IsSet( aBckgrndObj ); // AutoLayouts must be ready mpDoc->StopWorkStartupDelay(); @@ -502,7 +502,7 @@ SdPage* SdXImpressDocument::InsertSdPage( sal_uInt16 nPage, sal_Bool bDuplicate // use MasterPage of the current page pStandardPage->TRG_SetMasterPage(pPreviousStandardPage->TRG_GetMasterPage()); pStandardPage->SetLayoutName( pPreviousStandardPage->GetLayoutName() ); - pStandardPage->SetAutoLayout(AUTOLAYOUT_NONE, sal_True ); + pStandardPage->SetAutoLayout(AUTOLAYOUT_NONE, true ); } aBckgrnd = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), false); @@ -538,7 +538,7 @@ SdPage* SdXImpressDocument::InsertSdPage( sal_uInt16 nPage, sal_Bool bDuplicate // use MasterPage of the current page pNotesPage->TRG_SetMasterPage(pPreviousNotesPage->TRG_GetMasterPage()); pNotesPage->SetLayoutName( pPreviousNotesPage->GetLayoutName() ); - pNotesPage->SetAutoLayout(AUTOLAYOUT_NOTES, sal_True ); + pNotesPage->SetAutoLayout(AUTOLAYOUT_NOTES, true ); } } @@ -547,7 +547,7 @@ SdPage* SdXImpressDocument::InsertSdPage( sal_uInt16 nPage, sal_Bool bDuplicate return( pStandardPage ); } -void SdXImpressDocument::SetModified( sal_Bool bModified /* = sal_True */ ) throw() +void SdXImpressDocument::SetModified( bool bModified /* = sal_True */ ) throw() { if( mpDoc ) mpDoc->SetChanged( bModified ); @@ -680,7 +680,7 @@ uno::Reference< drawing::XDrawPage > SAL_CALL SdXImpressDocument::duplicate( con SdPage* pPage = (SdPage*) pSvxPage->GetSdrPage(); sal_uInt16 nPos = pPage->GetPageNum(); nPos = ( nPos - 1 ) / 2; - pPage = InsertSdPage( nPos, sal_True ); + pPage = InsertSdPage( nPos, true ); if( pPage ) { uno::Reference< drawing::XDrawPage > xDrawPage( pPage->getUnoPage(), uno::UNO_QUERY ); @@ -1245,7 +1245,7 @@ void SAL_CALL SdXImpressDocument::setPropertyValue( const OUString& aPropertyNam break; case WID_MODEL_CONTFOCUS: { - sal_Bool bFocus = sal_False; + bool bFocus = false; if( !(aValue >>= bFocus ) ) throw lang::IllegalArgumentException(); mpDoc->SetAutoControlFocus( bFocus ); @@ -1253,7 +1253,7 @@ void SAL_CALL SdXImpressDocument::setPropertyValue( const OUString& aPropertyNam break; case WID_MODEL_DSGNMODE: { - sal_Bool bMode = sal_False; + bool bMode = false; if( !(aValue >>= bMode ) ) throw lang::IllegalArgumentException(); mpDoc->SetOpenInDesignMode( bMode ); @@ -1328,7 +1328,7 @@ uno::Any SAL_CALL SdXImpressDocument::getPropertyValue( const OUString& Property } break; case WID_MODEL_CONTFOCUS: - aAny <<= (sal_Bool)mpDoc->GetAutoControlFocus(); + aAny <<= mpDoc->GetAutoControlFocus(); break; case WID_MODEL_DSGNMODE: aAny <<= mpDoc->GetOpenInDesignMode(); @@ -1484,7 +1484,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SdXImpressDocument::getRenderer( if( NULL == mpDoc ) throw lang::DisposedException(); - sal_Bool bExportNotesPages = sal_False; + bool bExportNotesPages = false; for( sal_Int32 nProperty = 0, nPropertyCount = rxOptions.getLength(); nProperty < nPropertyCount; ++nProperty ) { if ( rxOptions[ nProperty ].Name == "ExportNotesPages" ) @@ -1521,8 +1521,8 @@ class ImplRenderPaintProc : public ::sdr::contact::ViewObjectContactRedirector vcl::PDFWriter::StructElement ImplBegStructureTag( SdrObject& rObject ); public: - sal_Bool IsVisible ( const SdrObject* pObj ) const; - sal_Bool IsPrintable( const SdrObject* pObj ) const; + bool IsVisible ( const SdrObject* pObj ) const; + bool IsPrintable( const SdrObject* pObj ) const; ImplRenderPaintProc( const SdrLayerAdmin& rLA, SdrPageView* pView, vcl::PDFExtOutDevData* pData ); virtual ~ImplRenderPaintProc(); @@ -1559,8 +1559,8 @@ sal_Int32 ImplPDFGetBookmarkPage( const OUString& rBookmark, SdDrawDocument& rDo aBookmark = rBookmark.copy( 1 ); // is the bookmark a page ? - sal_Bool bIsMasterPage; - sal_uInt16 nPgNum = rDoc.GetPageByName( aBookmark, bIsMasterPage ); + bool bIsMasterPage; + sal_uInt16 nPgNum = rDoc.GetPageByName( aBookmark, bIsMasterPage ); SdrObject* pObj = NULL; if ( nPgNum == SDRPAGE_NOTFOUND ) @@ -1743,7 +1743,7 @@ vcl::PDFWriter::StructElement ImplRenderPaintProc::ImplBegStructureTag( SdrObjec { sal_uInt32 nInventor = rObject.GetObjInventor(); sal_uInt16 nIdentifier = rObject.GetObjIdentifier(); - sal_Bool bIsTextObj = rObject.ISA( SdrTextObj ); + bool bIsTextObj = rObject.ISA( SdrTextObj ); if ( nInventor == SdrInventor ) { @@ -1802,9 +1802,9 @@ drawinglayer::primitive2d::Primitive2DSequence ImplRenderPaintProc::createRedire } } -sal_Bool ImplRenderPaintProc::IsVisible( const SdrObject* pObj ) const +bool ImplRenderPaintProc::IsVisible( const SdrObject* pObj ) const { - sal_Bool bVisible = sal_True; + bool bVisible = true; SdrLayerID nLayerId = pObj->GetLayer(); if( pSdrPageView ) { @@ -1817,9 +1817,9 @@ sal_Bool ImplRenderPaintProc::IsVisible( const SdrObject* pObj ) const } return bVisible; } -sal_Bool ImplRenderPaintProc::IsPrintable( const SdrObject* pObj ) const +bool ImplRenderPaintProc::IsPrintable( const SdrObject* pObj ) const { - sal_Bool bPrintable = sal_True; + bool bPrintable = true; SdrLayerID nLayerId = pObj->GetLayer(); if( pSdrPageView ) { @@ -1847,7 +1847,7 @@ void SAL_CALL SdXImpressDocument::render( sal_Int32 nRenderer, const uno::Any& r uno::Reference< awt::XDevice > xRenderDevice; const sal_Int32 nPageNumber = nRenderer + 1; PageKind ePageKind = PK_STANDARD; - sal_Bool bExportNotesPages = sal_False; + bool bExportNotesPages = false; for( sal_Int32 nProperty = 0, nPropertyCount = rxOptions.getLength(); nProperty < nPropertyCount; ++nProperty ) { @@ -1958,7 +1958,7 @@ void SAL_CALL SdXImpressDocument::render( sal_Int32 nRenderer, const uno::Any& r // exporting object interactions to pdf // if necessary, the master page interactions will be exported first - sal_Bool bIsBackgroundObjectsVisible = sal_False; // #i39428# IsBackgroundObjectsVisible not available for Draw + bool bIsBackgroundObjectsVisible = false; // #i39428# IsBackgroundObjectsVisible not available for Draw if ( mbImpressDoc && xPagePropSet->getPropertySetInfo()->hasPropertyByName( "IsBackgroundObjectsVisible" ) ) xPagePropSet->getPropertyValue( "IsBackgroundObjectsVisible" ) >>= bIsBackgroundObjectsVisible; if ( bIsBackgroundObjectsVisible && !pPDFExtOutDevData->GetIsExportNotesPages() ) @@ -2687,17 +2687,17 @@ uno::Reference< drawing::XDrawPage > SAL_CALL SdMasterPagesAccess::insertNewByIn const OUString aStdPrefix( SdResId(STR_LAYOUT_DEFAULT_NAME) ); OUString aPrefix( aStdPrefix ); - sal_Bool bUnique = sal_True; + bool bUnique = true; sal_Int32 i = 0; do { - bUnique = sal_True; + bUnique = true; for( sal_Int32 nMaster = 1; nMaster < nMPageCount; nMaster++ ) { SdPage* pPage = (SdPage*)mpDoc->GetMasterPage((sal_uInt16)nMaster); if( pPage && pPage->GetName() == aPrefix ) { - bUnique = sal_False; + bUnique = false; break; } } @@ -2748,7 +2748,7 @@ uno::Reference< drawing::XDrawPage > SAL_CALL SdMasterPagesAccess::insertNewByIn pRefNotesPage->GetLwrBorder() ); pMNotesPage->SetLayoutName( aLayoutName ); mpDoc->InsertMasterPage(pMNotesPage, (sal_uInt16)nInsertPos + 1); - pMNotesPage->SetAutoLayout(AUTOLAYOUT_NOTES, sal_True, sal_True); + pMNotesPage->SetAutoLayout(AUTOLAYOUT_NOTES, true, true); mpModel->SetModified(); } diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx index eac1f29d8024..f11c7660b4c6 100644 --- a/sd/source/ui/unoidl/unoobj.cxx +++ b/sd/source/ui/unoidl/unoobj.cxx @@ -201,7 +201,7 @@ static SdTypesCache gImplTypesCache; }; return aDraw_SdXShapePropertyGraphicMap_Impl; } - static const SfxItemPropertyMapEntry* lcl_ImplGetShapePropertyMap( sal_Bool bImpress, sal_Bool bGraphicObj ) + static const SfxItemPropertyMapEntry* lcl_ImplGetShapePropertyMap( bool bImpress, bool bGraphicObj ) { const SfxItemPropertyMapEntry* pRet = 0; if( bImpress ) @@ -221,7 +221,7 @@ static SdTypesCache gImplTypesCache; return pRet; } - static const SvxItemPropertySet* lcl_ImplGetShapePropertySet( sal_Bool bImpress, sal_Bool bGraphicObj ) + static const SvxItemPropertySet* lcl_ImplGetShapePropertySet( bool bImpress, bool bGraphicObj ) { const SvxItemPropertySet* pRet = 0; if( bImpress ) @@ -532,7 +532,7 @@ void SAL_CALL SdXShape::setPropertyValue( const OUString& aPropertyName, const : } case WID_ISANIMATION: { - sal_Bool bIsAnimation(sal_False); + bool bIsAnimation(false); if(!(aValue >>= bIsAnimation)) { @@ -615,7 +615,7 @@ void SAL_CALL SdXShape::setPropertyValue( const OUString& aPropertyName, const : } case WID_DIMHIDE: { - sal_Bool bDimHide = sal_False; + bool bDimHide = false; if( !(aValue >>= bDimHide) ) lang::IllegalArgumentException(); @@ -624,7 +624,7 @@ void SAL_CALL SdXShape::setPropertyValue( const OUString& aPropertyName, const : } case WID_DIMPREV: { - sal_Bool bDimPrevious = sal_False; + bool bDimPrevious = false; if( !(aValue >>= bDimPrevious) ) lang::IllegalArgumentException(); @@ -738,7 +738,7 @@ void SAL_CALL SdXShape::setPropertyValue( const OUString& aPropertyName, const : if( pEntry && mpShape->GetSdrObject() ) { - SdAnimationInfo* pInfo = GetAnimationInfo(sal_False); + SdAnimationInfo* pInfo = GetAnimationInfo(false); switch(pEntry->nWID) { @@ -755,19 +755,19 @@ void SAL_CALL SdXShape::setPropertyValue( const OUString& aPropertyName, const : aRet <<= EffectMigration::GetTextAnimationEffect( mpShape ); break; case WID_ISPRESOBJ: - aRet <<= (sal_Bool)IsPresObj(); + aRet <<= IsPresObj(); break; case WID_ISEMPTYPRESOBJ: - aRet <<= (sal_Bool)IsEmptyPresObj(); + aRet <<= IsEmptyPresObj(); break; case WID_MASTERDEPEND: - aRet <<= (sal_Bool)IsMasterDepend(); + aRet <<= IsMasterDepend(); break; case WID_SPEED: aRet <<= EffectMigration::GetAnimationSpeed( mpShape ); break; case WID_ISANIMATION: - aRet <<= (sal_Bool)( pInfo && pInfo->mbIsMovie); + aRet <<= (pInfo && pInfo->mbIsMovie); break; case WID_PLACEHOLDERTEXT: aRet <<= GetPlaceholderText(); @@ -779,7 +779,7 @@ void SAL_CALL SdXShape::setPropertyValue( const OUString& aPropertyName, const : { SdDrawDocument* pDoc = mpModel?mpModel->GetDoc():NULL; // is the bookmark a page? - sal_Bool bIsMasterPage; + bool bIsMasterPage; if(pDoc->GetPageByName( pInfo->GetBookmark(), bIsMasterPage ) != SDRPAGE_NOTFOUND) { aString = SdDrawPage::getPageApiNameFromUiName( pInfo->GetBookmark() ); @@ -808,7 +808,7 @@ void SAL_CALL SdXShape::setPropertyValue( const OUString& aPropertyName, const : aRet = ::cppu::enum2any< presentation::ClickAction >( pInfo?pInfo->meClickAction:presentation::ClickAction_NONE ); break; case WID_PLAYFULL: - aRet <<= (sal_Bool)( pInfo && pInfo->mbPlayFull ); + aRet <<= ( pInfo && pInfo->mbPlayFull ); break; case WID_SOUNDFILE: aRet <<= EffectMigration::GetSoundFile( mpShape ); @@ -885,7 +885,7 @@ void SAL_CALL SdXShape::setPropertyValue( const OUString& aPropertyName, const : } /** */ -SdAnimationInfo* SdXShape::GetAnimationInfo( sal_Bool bCreate ) const +SdAnimationInfo* SdXShape::GetAnimationInfo( bool bCreate ) const throw (std::exception) { SdAnimationInfo* pInfo = NULL; @@ -923,7 +923,7 @@ uno::Sequence< OUString > SAL_CALL SdXShape::getSupportedServiceNames() throw(:: /** checks if this is a presentation object */ -sal_Bool SdXShape::IsPresObj() const +bool SdXShape::IsPresObj() const throw (std::exception) { SdrObject* pObj = mpShape->GetSdrObject(); @@ -933,7 +933,7 @@ sal_Bool SdXShape::IsPresObj() const if(pPage) return pPage->GetPresObjKind(pObj) != PRESOBJ_NONE; } - return sal_False; + return false; } /** checks if this presentation object is empty @@ -998,7 +998,7 @@ void SdXShape::SetEmptyPresObj(bool bEmpty) if(!bEmpty) { OutlinerParaObject* pOutlinerParaObject = pObj->GetOutlinerParaObject(); - const sal_Bool bVertical = pOutlinerParaObject ? pOutlinerParaObject->IsVertical() : sal_False; + const bool bVertical = pOutlinerParaObject ? pOutlinerParaObject->IsVertical() : sal_False; // really delete SdrOutlinerObj at pObj pObj->NbcSetOutlinerParaObject(0L); @@ -1044,7 +1044,7 @@ void SdXShape::SetEmptyPresObj(bool bEmpty) OutlinerParaObject* pOutlinerParaObject = pObj->GetOutlinerParaObject(); pOutliner->SetText( *pOutlinerParaObject ); - const sal_Bool bVertical = pOutliner->IsVertical(); + const bool bVertical = pOutliner->IsVertical(); pOutliner->Clear(); pOutliner->SetVertical( bVertical ); @@ -1061,13 +1061,13 @@ void SdXShape::SetEmptyPresObj(bool bEmpty) } } -sal_Bool SdXShape::IsMasterDepend() const throw() +bool SdXShape::IsMasterDepend() const throw() { SdrObject* pObj = mpShape->GetSdrObject(); return pObj && pObj->GetUserCall() != NULL; } -void SdXShape::SetMasterDepend( sal_Bool bDepend ) throw() +void SdXShape::SetMasterDepend( bool bDepend ) throw() { if( IsMasterDepend() != bDepend ) { @@ -1214,8 +1214,8 @@ SdUnoEventsAccess::SdUnoEventsAccess( SdXShape* pShape ) throw() static void clearEventsInAnimationInfo( SdAnimationInfo* pInfo ) { pInfo->SetBookmark( "" ); - pInfo->mbSecondSoundOn = sal_False; - pInfo->mbSecondPlayFull = sal_False; + pInfo->mbSecondSoundOn = false; + pInfo->mbSecondPlayFull = false; pInfo->meClickAction = presentation::ClickAction_NONE; pInfo->meSecondEffect = presentation::AnimationEffect_NONE; pInfo->meSecondSpeed = presentation::AnimationSpeed_MEDIUM; @@ -1241,7 +1241,7 @@ void SAL_CALL SdUnoEventsAccess::replaceByName( const OUString& aName, const uno presentation::AnimationEffect eEffect = presentation::AnimationEffect_NONE; presentation::AnimationSpeed eSpeed = presentation::AnimationSpeed_MEDIUM; OUString aStrSoundURL; - sal_Bool bPlayFull = sal_False; + bool bPlayFull = false; sal_Int32 nVerb = 0; OUString aStrMacro; OUString aStrLibrary; @@ -1335,7 +1335,7 @@ void SAL_CALL SdUnoEventsAccess::replaceByName( const OUString& aName, const uno throw lang::IllegalArgumentException(); } - sal_Bool bOk = sal_False; + bool bOk = false; do { if( ( nFound & FOUND_EVENTTYPE ) == 0 ) @@ -1346,15 +1346,15 @@ void SAL_CALL SdUnoEventsAccess::replaceByName( const OUString& aName, const uno if( ( nFound & FOUND_CLICKACTION ) == 0 ) break; - SdAnimationInfo* pInfo = mpShape->GetAnimationInfo( sal_False ); + SdAnimationInfo* pInfo = mpShape->GetAnimationInfo( false ); if( presentation::ClickAction_NONE == eClickAction && NULL == pInfo ) { - bOk = sal_True; + bOk = true; break; } if( NULL == pInfo ) - pInfo = mpShape->GetAnimationInfo( sal_True ); + pInfo = mpShape->GetAnimationInfo( true ); DBG_ASSERT( pInfo, "shape animation info could not be created!" ); if( NULL == pInfo ) @@ -1373,7 +1373,7 @@ void SAL_CALL SdUnoEventsAccess::replaceByName( const OUString& aName, const uno case presentation::ClickAction_INVISIBLE: case presentation::ClickAction_STOPPRESENTATION: { - bOk = sal_True; + bOk = true; } break; @@ -1398,7 +1398,7 @@ void SAL_CALL SdUnoEventsAccess::replaceByName( const OUString& aName, const uno } pInfo->SetBookmark( aStrBookmark ); - bOk = sal_True; + bOk = true; } break; @@ -1406,7 +1406,7 @@ void SAL_CALL SdUnoEventsAccess::replaceByName( const OUString& aName, const uno if( nFound & FOUND_MACRO ) { pInfo->SetBookmark( aStrMacro ); - bOk = sal_True; + bOk = true; } break; @@ -1414,7 +1414,7 @@ void SAL_CALL SdUnoEventsAccess::replaceByName( const OUString& aName, const uno if( nFound & FOUND_VERB ) { pInfo->mnVerb = (sal_uInt16)nVerb; - bOk = sal_True; + bOk = true; } break; @@ -1425,7 +1425,7 @@ void SAL_CALL SdUnoEventsAccess::replaceByName( const OUString& aName, const uno pInfo->meSecondEffect = eEffect; pInfo->meSecondSpeed = nFound & FOUND_SPEED ? eSpeed : presentation::AnimationSpeed_MEDIUM; - bOk = sal_True; + bOk = true; // NOTE: No break here!!! @@ -1437,7 +1437,7 @@ void SAL_CALL SdUnoEventsAccess::replaceByName( const OUString& aName, const uno pInfo->mbSecondSoundOn = !aStrSoundURL.isEmpty(); pInfo->mbSecondPlayFull = nFound & FOUND_PLAYFULL ? bPlayFull : sal_False; - bOk = sal_True; + bOk = true; } break; case presentation::ClickAction_MAKE_FIXED_SIZE: @@ -1446,7 +1446,7 @@ void SAL_CALL SdUnoEventsAccess::replaceByName( const OUString& aName, const uno } else { - SdAnimationInfo* pInfo = mpShape->GetAnimationInfo( sal_True ); + SdAnimationInfo* pInfo = mpShape->GetAnimationInfo( true ); DBG_ASSERT( pInfo, "shape animation info could not be created!" ); if( NULL == pInfo ) @@ -1486,7 +1486,7 @@ void SAL_CALL SdUnoEventsAccess::replaceByName( const OUString& aName, const uno pInfo->SetBookmark( sBuffer.makeStringAndClear() ); } - bOk = sal_True; + bOk = true; } } while(false); @@ -1502,7 +1502,7 @@ uno::Any SAL_CALL SdUnoEventsAccess::getByName( const OUString& aName ) if( mpShape == NULL || aName != maStrOnClick ) throw container::NoSuchElementException(); - SdAnimationInfo* pInfo = mpShape->GetAnimationInfo( sal_False ); + SdAnimationInfo* pInfo = mpShape->GetAnimationInfo( false ); presentation::ClickAction eClickAction = presentation::ClickAction_NONE; if( pInfo ) diff --git a/sd/source/ui/unoidl/unoobj.hxx b/sd/source/ui/unoidl/unoobj.hxx index 19b906335dd4..097e866078dd 100644 --- a/sd/source/ui/unoidl/unoobj.hxx +++ b/sd/source/ui/unoidl/unoobj.hxx @@ -51,18 +51,18 @@ private: ::com::sun::star::uno::Any GetStyleSheet() const throw( ::com::sun::star::beans::UnknownPropertyException ); // Intern - SdAnimationInfo* GetAnimationInfo( sal_Bool bCreate = sal_False ) const + SdAnimationInfo* GetAnimationInfo( bool bCreate = false ) const throw (std::exception); - sal_Bool IsPresObj() const + bool IsPresObj() const throw (std::exception); - void SetPresObj( sal_Bool bPresObj ) throw(); + void SetPresObj( bool bPresObj ) throw(); bool IsEmptyPresObj() const throw(); void SetEmptyPresObj(bool bEmpty) throw (std::exception); - sal_Bool IsMasterDepend() const throw(); - void SetMasterDepend( sal_Bool bDepend ) throw(); + bool IsMasterDepend() const throw(); + void SetMasterDepend( bool bDepend ) throw(); SdrObject* GetSdrObject() const throw(); OUString GetPlaceholderText() const; diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index 75ed1d3c9266..1228c06f6a94 100644 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -101,7 +101,7 @@ enum WID_PAGE static sal_Char const sEmptyPageName[sizeof("page")] = "page"; // this function stores the property maps for draw pages in impress and draw -const SvxItemPropertySet* ImplGetDrawPagePropertySet( sal_Bool bImpress, PageKind ePageKind ) +const SvxItemPropertySet* ImplGetDrawPagePropertySet( bool bImpress, PageKind ePageKind ) { static const SfxItemPropertyMapEntry aDrawPagePropertyMap_Impl[] = { @@ -503,7 +503,7 @@ SdrObject * SdGenericDrawPage::_CreateSdrObject( const Reference< drawing::XShap } else { - pPresObj = GetPage()->CreatePresObj( eObjKind, sal_False, aRect, sal_True ); + pPresObj = GetPage()->CreatePresObj( eObjKind, false, aRect, true ); } if( pPresObj ) @@ -604,7 +604,7 @@ void SAL_CALL SdGenericDrawPage::setPropertyValue( const OUString& aPropertyName GetPage()->SetPresChange( (PresChange)nValue ); break; case WID_PAGE_LAYOUT: - GetPage()->SetAutoLayout( (AutoLayout)nValue, sal_True ); + GetPage()->SetAutoLayout( (AutoLayout)nValue, true ); break; case WID_PAGE_DURATION: GetPage()->SetTime((sal_Int32)nValue); @@ -692,10 +692,10 @@ void SAL_CALL SdGenericDrawPage::setPropertyValue( const OUString& aPropertyName } case WID_PAGE_VISIBLE : { - sal_Bool bVisible = sal_False; + bool bVisible = false; if( ! ( aValue >>= bVisible ) ) throw lang::IllegalArgumentException(); - GetPage()->SetExcluded( bVisible == sal_False ); + GetPage()->SetExcluded( bVisible == false ); break; } case WID_PAGE_SOUNDFILE : @@ -709,7 +709,7 @@ void SAL_CALL SdGenericDrawPage::setPropertyValue( const OUString& aPropertyName } else { - sal_Bool bStopSound = sal_False; + bool bStopSound = false; if( aValue >>= bStopSound ) { GetPage()->SetStopSound( bStopSound ? true : false ); @@ -722,7 +722,7 @@ void SAL_CALL SdGenericDrawPage::setPropertyValue( const OUString& aPropertyName } case WID_LOOP_SOUND: { - sal_Bool bLoop = sal_False; + bool bLoop = false; if( ! (aValue >>= bLoop) ) throw lang::IllegalArgumentException(); @@ -731,7 +731,7 @@ void SAL_CALL SdGenericDrawPage::setPropertyValue( const OUString& aPropertyName } case WID_PAGE_BACKFULL: { - sal_Bool bFullSize = sal_False; + bool bFullSize = false; if( ! ( aValue >>= bFullSize ) ) throw lang::IllegalArgumentException(); GetPage()->SetBackgroundFullSize( bFullSize ); @@ -739,7 +739,7 @@ void SAL_CALL SdGenericDrawPage::setPropertyValue( const OUString& aPropertyName } case WID_PAGE_BACKVIS: { - sal_Bool bVisible = sal_False; + bool bVisible = false; if( ! ( aValue >>= bVisible ) ) throw lang::IllegalArgumentException(); @@ -759,7 +759,7 @@ void SAL_CALL SdGenericDrawPage::setPropertyValue( const OUString& aPropertyName } case WID_PAGE_BACKOBJVIS: { - sal_Bool bVisible = sal_False; + bool bVisible = false; if( ! ( aValue >>= bVisible ) ) throw lang::IllegalArgumentException(); @@ -810,7 +810,7 @@ void SAL_CALL SdGenericDrawPage::setPropertyValue( const OUString& aPropertyName { case WID_PAGE_HEADERVISIBLE: { - sal_Bool bVisible = sal_False; + bool bVisible = false; if( ! ( aValue >>= bVisible ) ) throw lang::IllegalArgumentException(); @@ -828,7 +828,7 @@ void SAL_CALL SdGenericDrawPage::setPropertyValue( const OUString& aPropertyName } case WID_PAGE_FOOTERVISIBLE: { - sal_Bool bVisible = sal_False; + bool bVisible = false; if( ! ( aValue >>= bVisible ) ) throw lang::IllegalArgumentException(); @@ -846,7 +846,7 @@ void SAL_CALL SdGenericDrawPage::setPropertyValue( const OUString& aPropertyName } case WID_PAGE_PAGENUMBERVISIBLE: { - sal_Bool bVisible = sal_False; + bool bVisible = false; if( ! ( aValue >>= bVisible ) ) throw lang::IllegalArgumentException(); @@ -855,7 +855,7 @@ void SAL_CALL SdGenericDrawPage::setPropertyValue( const OUString& aPropertyName } case WID_PAGE_DATETIMEVISIBLE: { - sal_Bool bVisible = sal_False; + bool bVisible = false; if( ! ( aValue >>= bVisible ) ) throw lang::IllegalArgumentException(); @@ -864,7 +864,7 @@ void SAL_CALL SdGenericDrawPage::setPropertyValue( const OUString& aPropertyName } case WID_PAGE_DATETIMEFIXED: { - sal_Bool bVisible = sal_False; + bool bVisible = false; if( ! ( aValue >>= bVisible ) ) throw lang::IllegalArgumentException(); @@ -934,7 +934,7 @@ void SAL_CALL SdGenericDrawPage::setPropertyValue( const OUString& aPropertyName case WID_TRANSITION_DIRECTION: { - sal_Bool bValue = sal_False; + bool bValue = false; if( ! ( aValue >>= bValue ) ) throw lang::IllegalArgumentException(); @@ -1128,8 +1128,8 @@ Any SAL_CALL SdGenericDrawPage::getPropertyValue( const OUString& PropertyName ) case WID_PAGE_VISIBLE : { - sal_Bool bVisible = GetPage()->IsExcluded() == sal_False; - aAny <<= Any( &bVisible, ::getBooleanCppuType() ); + bool bVisible = GetPage()->IsExcluded() == false; + aAny <<= bVisible; break; } @@ -1137,7 +1137,7 @@ Any SAL_CALL SdGenericDrawPage::getPropertyValue( const OUString& PropertyName ) { if( GetPage()->IsStopSound() ) { - aAny <<= sal_True; + aAny <<= true; } else { @@ -1150,13 +1150,13 @@ Any SAL_CALL SdGenericDrawPage::getPropertyValue( const OUString& PropertyName ) } case WID_LOOP_SOUND: { - aAny <<= (sal_Bool)GetPage()->IsLoopSound(); + aAny <<= GetPage()->IsLoopSound(); break; } case WID_PAGE_BACKFULL: { - sal_Bool bFullSize = GetPage()->IsBackgroundFullSize(); - aAny = Any( &bFullSize, ::getBooleanCppuType() ); + bool bFullSize = GetPage()->IsBackgroundFullSize(); + aAny <<= bFullSize; break; } case WID_PAGE_BACKVIS: @@ -1169,11 +1169,11 @@ Any SAL_CALL SdGenericDrawPage::getPropertyValue( const OUString& PropertyName ) { SdrLayerAdmin& rLayerAdmin = pDoc->GetLayerAdmin(); SetOfByte aVisibleLayers = pPage->TRG_GetMasterPageVisibleLayers(); - aAny <<= (sal_Bool)aVisibleLayers.IsSet(rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), false)); + aAny <<= aVisibleLayers.IsSet(rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), false)); } else { - aAny <<= (sal_Bool)sal_False; + aAny <<= false; } } break; @@ -1188,11 +1188,11 @@ Any SAL_CALL SdGenericDrawPage::getPropertyValue( const OUString& PropertyName ) { SdrLayerAdmin& rLayerAdmin = pDoc->GetLayerAdmin(); SetOfByte aVisibleLayers = pPage->TRG_GetMasterPageVisibleLayers(); - aAny <<= (sal_Bool)aVisibleLayers.IsSet(rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), false)); + aAny <<= aVisibleLayers.IsSet(rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), false)); } else { - aAny <<= (sal_Bool)sal_False; + aAny <<= false; } } break; @@ -1209,11 +1209,11 @@ Any SAL_CALL SdGenericDrawPage::getPropertyValue( const OUString& PropertyName ) } case WID_PAGE_ISDARK: { - aAny <<= (sal_Bool)GetPage()->GetPageBackgroundColor().IsDark(); + aAny <<= GetPage()->GetPageBackgroundColor().IsDark(); break; } case WID_PAGE_HEADERVISIBLE: - aAny <<= (sal_Bool)GetPage()->getHeaderFooterSettings().mbHeaderVisible; + aAny <<= GetPage()->getHeaderFooterSettings().mbHeaderVisible; break; case WID_PAGE_HEADERTEXT: { @@ -1222,7 +1222,7 @@ Any SAL_CALL SdGenericDrawPage::getPropertyValue( const OUString& PropertyName ) } break; case WID_PAGE_FOOTERVISIBLE: - aAny <<= (sal_Bool)GetPage()->getHeaderFooterSettings().mbFooterVisible; + aAny <<= GetPage()->getHeaderFooterSettings().mbFooterVisible; break; case WID_PAGE_FOOTERTEXT: { @@ -1231,13 +1231,13 @@ Any SAL_CALL SdGenericDrawPage::getPropertyValue( const OUString& PropertyName ) } break; case WID_PAGE_PAGENUMBERVISIBLE: - aAny <<= (sal_Bool)GetPage()->getHeaderFooterSettings().mbSlideNumberVisible; + aAny <<= GetPage()->getHeaderFooterSettings().mbSlideNumberVisible; break; case WID_PAGE_DATETIMEVISIBLE: - aAny <<= (sal_Bool)GetPage()->getHeaderFooterSettings().mbDateTimeVisible; + aAny <<= GetPage()->getHeaderFooterSettings().mbDateTimeVisible; break; case WID_PAGE_DATETIMEFIXED: - aAny <<= (sal_Bool)GetPage()->getHeaderFooterSettings().mbDateTimeIsFixed; + aAny <<= GetPage()->getHeaderFooterSettings().mbDateTimeIsFixed; break; case WID_PAGE_DATETIMETEXT: { @@ -1770,7 +1770,7 @@ static void refreshpage( SdDrawDocument* pDoc, const PageKind ePageKind ) pDoc->SetMaxObjSize(aViewSize); - pViewSh->InitWindows(aPageOrg, aViewSize, Point(-1, -1), sal_True); + pViewSh->InitWindows(aPageOrg, aViewSize, Point(-1, -1), true); pViewSh->UpdateScrollBars(); } @@ -2076,7 +2076,7 @@ Sequence< uno::Type > SAL_CALL SdDrawPage::getTypes() throw(uno::RuntimeExceptio if( maTypeSequence.getLength() == 0 ) { const PageKind ePageKind = GetPage() ? GetPage()->GetPageKind() : PK_STANDARD; - sal_Bool bPresPage = mbIsImpressDocument && ePageKind != PK_HANDOUT; + bool bPresPage = mbIsImpressDocument && ePageKind != PK_HANDOUT; // Collect the types of this class. ::std::vector<uno::Type> aTypes; @@ -2310,7 +2310,7 @@ void SAL_CALL SdDrawPage::setName( const OUString& rName ) EditMode eMode = pDrawViewSh->GetEditMode(); if( eMode == EM_PAGE ) { - sal_Bool bLayer = pDrawViewSh->IsLayerModeActive(); + bool bLayer = pDrawViewSh->IsLayerModeActive(); pDrawViewSh->ChangeEditMode( eMode, !bLayer ); pDrawViewSh->ChangeEditMode( eMode, bLayer ); @@ -2722,7 +2722,7 @@ Sequence< uno::Type > SAL_CALL SdMasterPage::getTypes() throw(uno::RuntimeExcept if( maTypeSequence.getLength() == 0 ) { const PageKind ePageKind = GetPage() ? GetPage()->GetPageKind() : PK_STANDARD; - sal_Bool bPresPage = mbIsImpressDocument && SvxFmDrawPage::mpPage && ePageKind != PK_HANDOUT; + bool bPresPage = mbIsImpressDocument && SvxFmDrawPage::mpPage && ePageKind != PK_HANDOUT; // Collect the types of this class. ::std::vector<uno::Type> aTypes; @@ -3006,7 +3006,7 @@ void SAL_CALL SdMasterPage::setName( const OUString& rName ) if(SvxFmDrawPage::mpPage && GetPage()->GetPageKind() != PK_NOTES) { SdDrawDocument* pDoc = GetModel()->GetDoc(); - sal_Bool bOutDummy; + bool bOutDummy; OUString aNewName( rName ); // Slide Name has to be unique @@ -3029,7 +3029,7 @@ void SAL_CALL SdMasterPage::setName( const OUString& rName ) EditMode eMode = pDrawViewSh->GetEditMode(); if( eMode == EM_MASTERPAGE ) { - sal_Bool bLayer = pDrawViewSh->IsLayerModeActive(); + bool bLayer = pDrawViewSh->IsLayerModeActive(); pDrawViewSh->ChangeEditMode( eMode, !bLayer ); pDrawViewSh->ChangeEditMode( eMode, bLayer ); diff --git a/sd/source/ui/unoidl/unopage.hxx b/sd/source/ui/unoidl/unopage.hxx index 92bf1014fa6c..e2712b021e09 100644 --- a/sd/source/ui/unoidl/unopage.hxx +++ b/sd/source/ui/unoidl/unopage.hxx @@ -95,7 +95,7 @@ public: virtual ~SdGenericDrawPage() throw(); // intern - sal_Bool isValid() { return (SvxDrawPage::mpPage != NULL) && (mpModel != NULL); } + bool isValid() { return (SvxDrawPage::mpPage != NULL) && (mpModel != NULL); } SdPage* GetPage() const { return (SdPage*)SvxDrawPage::mpPage; } SdXImpressDocument* GetModel() const; diff --git a/sd/source/ui/unoidl/unosrch.cxx b/sd/source/ui/unoidl/unosrch.cxx index 99b058af89fe..65804c20701d 100644 --- a/sd/source/ui/unoidl/unosrch.cxx +++ b/sd/source/ui/unoidl/unosrch.cxx @@ -101,7 +101,7 @@ SdUnoSearchReplaceShape::~SdUnoSearchReplaceShape() throw() uno::Reference< util::XReplaceDescriptor > SAL_CALL SdUnoSearchReplaceShape::createReplaceDescriptor() throw( uno::RuntimeException, std::exception ) { - return new SdUnoSearchReplaceDescriptor(sal_True); + return new SdUnoSearchReplaceDescriptor(true); } sal_Int32 SAL_CALL SdUnoSearchReplaceShape::replaceAll( const uno::Reference< util::XSearchDescriptor >& xDesc ) @@ -199,7 +199,7 @@ sal_Int32 SAL_CALL SdUnoSearchReplaceShape::replaceAll( const uno::Reference< ut uno::Reference< ::com::sun::star::util::XSearchDescriptor > SAL_CALL SdUnoSearchReplaceShape::createSearchDescriptor( ) throw(::com::sun::star::uno::RuntimeException, std::exception) { - return new SdUnoSearchReplaceDescriptor(sal_False); + return new SdUnoSearchReplaceDescriptor(false); } uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL SdUnoSearchReplaceShape::findAll( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor >& xDesc ) @@ -627,7 +627,7 @@ uno::Reference< text::XTextRange > SdUnoSearchReplaceShape::Search( uno::Refere return uno::Reference< text::XTextRange > ( xFound, uno::UNO_QUERY ); } -sal_Bool SdUnoSearchReplaceShape::Search( const OUString& rText, sal_Int32& nStartPos, sal_Int32& nEndPos, SdUnoSearchReplaceDescriptor* pDescr ) throw() +bool SdUnoSearchReplaceShape::Search( const OUString& rText, sal_Int32& nStartPos, sal_Int32& nEndPos, SdUnoSearchReplaceDescriptor* pDescr ) throw() { OUString aSearchStr( pDescr->getSearchString() ); OUString aText( rText ); @@ -654,10 +654,10 @@ sal_Bool SdUnoSearchReplaceShape::Search( const OUString& rText, sal_Int32& nSta } } - return sal_True; + return true; } else - return sal_False; + return false; } ESelection SdUnoSearchReplaceShape::GetSelection( uno::Reference< text::XTextRange > xTextRange ) throw() @@ -706,13 +706,13 @@ uno::Reference< drawing::XShape > SdUnoSearchReplaceShape::GetShape( uno::Refer UNO3_GETIMPLEMENTATION_IMPL( SdUnoSearchReplaceDescriptor ); -SdUnoSearchReplaceDescriptor::SdUnoSearchReplaceDescriptor( sal_Bool bReplace ) throw() +SdUnoSearchReplaceDescriptor::SdUnoSearchReplaceDescriptor( bool bReplace ) throw() { mpPropSet = new SvxItemPropertySet(ImplGetSearchPropertyMap(), SdrObject::GetGlobalDrawObjectItemPool()); - mbBackwards = sal_False; - mbCaseSensitive = sal_False; - mbWords = sal_False; + mbBackwards = false; + mbCaseSensitive = false; + mbWords = false; mbReplace = bReplace; } @@ -763,7 +763,7 @@ void SAL_CALL SdUnoSearchReplaceDescriptor::setPropertyValue( const OUString& aP const SfxItemPropertySimpleEntry* pEntry = mpPropSet->getPropertyMapEntry(aPropertyName); - sal_Bool bOk = sal_False; + bool bOk = false; switch( pEntry ? pEntry->nWID : -1 ) { @@ -796,13 +796,13 @@ uno::Any SAL_CALL SdUnoSearchReplaceDescriptor::getPropertyValue( const OUString switch( pEntry ? pEntry->nWID : -1 ) { case WID_SEARCH_BACKWARDS: - aAny <<= (sal_Bool)mbBackwards; + aAny <<= mbBackwards; break; case WID_SEARCH_CASE: - aAny <<= (sal_Bool)mbCaseSensitive; + aAny <<= mbCaseSensitive; break; case WID_SEARCH_WORDS: - aAny <<= (sal_Bool)mbWords; + aAny <<= mbWords; break; default: throw beans::UnknownPropertyException(); diff --git a/sd/source/ui/unoidl/unowcntr.cxx b/sd/source/ui/unoidl/unowcntr.cxx index 7264d70f6df5..2099a94c7c25 100644 --- a/sd/source/ui/unoidl/unowcntr.cxx +++ b/sd/source/ui/unoidl/unowcntr.cxx @@ -60,7 +60,7 @@ void SvUnoWeakContainer::insert( uno::WeakReference< uno::XInterface > xRef ) th /** searches the container for a ref that returns true on the given search function */ -sal_Bool SvUnoWeakContainer::findRef( +bool SvUnoWeakContainer::findRef( uno::WeakReference< uno::XInterface >& rRef, void* pSearchData, weakref_searchfunc pSearchFunc @@ -80,12 +80,12 @@ sal_Bool SvUnoWeakContainer::findRef( if( (*pSearchFunc)( *pRef, pSearchData ) ) { rRef = *pRef; - return sal_True; + return true; } ++it; } } - return sal_False; + return false; } void SvUnoWeakContainer::dispose() diff --git a/sd/source/ui/unoidl/unowcntr.hxx b/sd/source/ui/unoidl/unowcntr.hxx index 93b93e684eaf..f78ca1743f39 100644 --- a/sd/source/ui/unoidl/unowcntr.hxx +++ b/sd/source/ui/unoidl/unowcntr.hxx @@ -23,7 +23,7 @@ #include <cppuhelper/weakref.hxx> #include <list> -typedef sal_Bool (*weakref_searchfunc)( ::com::sun::star::uno::WeakReference< ::com::sun::star::uno::XInterface > xRef, void* pSearchData ); +typedef bool (*weakref_searchfunc)( ::com::sun::star::uno::WeakReference< ::com::sun::star::uno::XInterface > xRef, void* pSearchData ); typedef ::std::list< ::com::sun::star::uno::WeakReference< ::com::sun::star::uno::XInterface >* > WeakRefList; @@ -42,7 +42,7 @@ public: /** searches the container for a ref that returns true on the given search function */ - sal_Bool findRef( ::com::sun::star::uno::WeakReference< ::com::sun::star::uno::XInterface >& rRef, void* pSearchData, weakref_searchfunc pSearchFunc ); + bool findRef( ::com::sun::star::uno::WeakReference< ::com::sun::star::uno::XInterface >& rRef, void* pSearchData, weakref_searchfunc pSearchFunc ); void dispose(); }; diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx index 6dc349df77f0..59106a7454e7 100644 --- a/sd/source/ui/view/DocumentRenderer.cxx +++ b/sd/source/ui/view/DocumentRenderer.cxx @@ -228,7 +228,7 @@ namespace { const sal_Char* pName, const bool bDefaultValue = false) const { - sal_Bool bValue = mrProperties.getBoolValue( pName, bDefaultValue ); + bool bValue = mrProperties.getBoolValue( pName, bDefaultValue ); return bValue; } @@ -1137,7 +1137,7 @@ namespace { const Rectangle aOutRect (rPrinter.GetPageOffset(), rPrinter.GetOutputSize()); Outliner* pOutliner = rDocument.GetInternalOutliner(); const sal_uInt16 nSavedOutlMode (pOutliner->GetMode()); - const sal_Bool bSavedUpdateMode (pOutliner->GetUpdateMode()); + const bool bSavedUpdateMode (pOutliner->GetUpdateMode()); const Size aSavedPaperSize (pOutliner->GetPaperSize()); pOutliner->Init(OUTLINERMODE_OUTLINEVIEW); @@ -1472,7 +1472,7 @@ private: // When in outline view then apply all pending changes to the model. if (pShell->ISA(OutlineViewShell)) - static_cast<OutlineViewShell*>(pShell)->PrepareClose (sal_False); + static_cast<OutlineViewShell*>(pShell)->PrepareClose (false); // Collect some frequently used data. if (mpOptions->IsDate()) @@ -1659,7 +1659,7 @@ private: Outliner* pOutliner = mrBase.GetDocument()->GetInternalOutliner(); pOutliner->Init(OUTLINERMODE_OUTLINEVIEW); const sal_uInt16 nSavedOutlMode (pOutliner->GetMode()); - const sal_Bool bSavedUpdateMode (pOutliner->GetUpdateMode()); + const bool bSavedUpdateMode (pOutliner->GetUpdateMode()); const Size aSavedPaperSize (pOutliner->GetPaperSize()); const MapMode aSavedMapMode (pOutliner->GetRefMapMode()); pOutliner->SetPaperSize(aOutRect.GetSize()); diff --git a/sd/source/ui/view/GraphicObjectBar.cxx b/sd/source/ui/view/GraphicObjectBar.cxx index 8248808dbd70..e66ad9863782 100644 --- a/sd/source/ui/view/GraphicObjectBar.cxx +++ b/sd/source/ui/view/GraphicObjectBar.cxx @@ -114,14 +114,14 @@ void GraphicObjectBar::Execute( SfxRequest& rReq ) void GraphicObjectBar::GetFilterState( SfxItemSet& rSet ) { const SdrMarkList& rMarkList = mpView->GetMarkedObjectList(); - sal_Bool bEnable = sal_False; + bool bEnable = false; if( rMarkList.GetMarkCount() == 1 ) { SdrObject* pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj(); if( pObj && pObj->ISA( SdrGrafObj ) && ( ( (SdrGrafObj*) pObj )->GetGraphicType() == GRAPHIC_BITMAP ) ) - bEnable = sal_True; + bEnable = true; } if( !bEnable ) diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx index 1c7104aec8dd..d7beaabd06b4 100644 --- a/sd/source/ui/view/Outliner.cxx +++ b/sd/source/ui/view/Outliner.cxx @@ -180,7 +180,7 @@ Outliner::Outliner( SdDrawDocument* pDoc, sal_uInt16 nMode ) nCntrl |= EE_CNTRL_MARKFIELDS; nCntrl |= EE_CNTRL_AUTOCORRECT; - sal_Bool bOnlineSpell = false; + bool bOnlineSpell = false; DrawDocShell* pDocSh = mpDrawDocument->GetDocSh(); @@ -322,7 +322,7 @@ void Outliner::EndSpelling (void) // When in <member>PrepareSpelling()</member> a new outline view has // been created then delete it here. - sal_Bool bViewIsDrawViewShell(pViewShell && pViewShell->ISA(DrawViewShell)); + bool bViewIsDrawViewShell(pViewShell && pViewShell->ISA(DrawViewShell)); if (bViewIsDrawViewShell) { SetStatusEventHdl(Link()); @@ -351,7 +351,7 @@ void Outliner::EndSpelling (void) if(IsModified()) { if(mpView && mpView->ISA(OutlineView)) - static_cast<OutlineView*>(mpView)->PrepareClose(sal_False); + static_cast<OutlineView*>(mpView)->PrepareClose(false); if(mpDrawDocument && !mpDrawDocument->IsChanged()) mpDrawDocument->SetChanged(true); } @@ -386,7 +386,7 @@ bool Outliner::SpellNextDocument (void) else { if (mpView->ISA(OutlineView)) - ((OutlineView*)mpView)->PrepareClose(sal_False); + ((OutlineView*)mpView)->PrepareClose(false); mpDrawDocument->GetDocSh()->SetWaitCursor( true ); Initialize (true); @@ -458,7 +458,7 @@ bool Outliner::SpellNextDocument (void) */ bool Outliner::StartSearchAndReplace (const SvxSearchItem* pSearchItem) { - sal_Bool bEndOfSearch = sal_True; + bool bEndOfSearch = true; mpDrawDocument->GetDocSh()->SetWaitCursor( true ); if (mbPrepareSpellingPending) @@ -1143,7 +1143,7 @@ bool Outliner::ShowWrapArroundDialog (void) if (bShowDialog) { // The question text depends on the search direction. - sal_Bool bImpress = mpDrawDocument!=NULL + bool bImpress = mpDrawDocument!=NULL && mpDrawDocument->GetDocumentType() == DOCUMENT_TYPE_IMPRESS; sal_uInt16 nStringId; if (mbDirectionIsForward) @@ -1235,7 +1235,7 @@ void Outliner::PrepareSpellCheck (void) } } - EnterEditMode( sal_False ); + EnterEditMode( false ); } } @@ -1349,7 +1349,7 @@ void Outliner::SetPage (EditMode eEditMode, sal_uInt16 nPageIndex) -void Outliner::EnterEditMode (sal_Bool bGrabFocus) +void Outliner::EnterEditMode (bool bGrabFocus) { OutlinerView* pOutlinerView = mpImpl->GetOutlinerView(); if (pOutlinerView != NULL) @@ -1546,10 +1546,10 @@ void Outliner::HandleChangedSelection (void) void Outliner::StartConversion( sal_Int16 nSourceLanguage, sal_Int16 nTargetLanguage, - const Font *pTargetFont, sal_Int32 nOptions, sal_Bool bIsInteractive ) + const Font *pTargetFont, sal_Int32 nOptions, bool bIsInteractive ) { ::boost::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock()); - sal_Bool bMultiDoc = pViewShell->ISA(DrawViewShell); + bool bMultiDoc = pViewShell->ISA(DrawViewShell); meMode = TEXT_CONVERSION; mbDirectionIsForward = true; diff --git a/sd/source/ui/view/ViewClipboard.cxx b/sd/source/ui/view/ViewClipboard.cxx index f7aea48e6b83..38af3dd9eecf 100644 --- a/sd/source/ui/view/ViewClipboard.cxx +++ b/sd/source/ui/view/ViewClipboard.cxx @@ -91,7 +91,7 @@ SdPage* ViewClipboard::GetFirstMasterPage (const SdTransferable& rTransferable) for ( pIter = rBookmarks.begin(); pIter != rBookmarks.end(); ++pIter ) { OUString sName (*pIter); - sal_Bool bIsMasterPage; + bool bIsMasterPage; // SdPage* GetMasterSdPage(sal_uInt16 nPgNum, PageKind ePgKind); // sal_uInt16 GetMasterSdPageCount(PageKind ePgKind) const; @@ -164,8 +164,8 @@ void ViewClipboard::AssignMasterPage ( pPage->GetPageNum() / 2, sLayoutName, pSourceDocument, - sal_False, // Exchange the master page of only the target page. - sal_False // Keep unused master pages. + false, // Exchange the master page of only the target page. + false // Keep unused master pages. ); } @@ -202,7 +202,7 @@ sal_uInt16 ViewClipboard::InsertSlides ( SdDrawDocument& rDoc = mrView.GetDoc(); sal_uInt16 nInsertPgCnt = 0; - sal_Bool bMergeMasterPages = !rTransferable.HasSourceDoc( &rDoc ); + bool bMergeMasterPages = !rTransferable.HasSourceDoc( &rDoc ); // Prepare the insertion. const std::vector<OUString> *pBookmarkList = NULL; @@ -230,7 +230,7 @@ sal_uInt16 ViewClipboard::InsertSlides ( { const SolarMutexGuard aGuard; ::sd::Window* pWin = mrView.GetViewShell()->GetActiveWindow(); - const sal_Bool bWait = pWin && pWin->IsWait(); + const bool bWait = pWin && pWin->IsWait(); if( bWait ) pWin->LeaveWait(); @@ -238,14 +238,14 @@ sal_uInt16 ViewClipboard::InsertSlides ( rDoc.InsertBookmarkAsPage( pBookmarkList ? *pBookmarkList : std::vector<OUString>(), NULL, - sal_False, - sal_False, + false, + false, nInsertPosition, (&rTransferable == SD_MOD()->pTransferDrag), pDataDocSh, - sal_True, + true, bMergeMasterPages, - sal_False); + false); if( bWait ) pWin->EnterWait(); diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index 833c12aedf81..96c15633a346 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -585,7 +585,7 @@ sal_uInt16 ViewShellBase::SetPrinter ( pNewPrinter->SetMapMode(aMap); Size aNewSize = pNewPrinter->GetOutputSize(); - sal_Bool bScaleAll = sal_False; + bool bScaleAll = false; if ( bIsAPI ) { WarningBox aWarnBox ( @@ -1292,7 +1292,7 @@ void ViewShellBase::Implementation::SetPaneVisibility ( // Determine the new visibility state. const SfxItemSet* pArguments = rRequest.GetArgs(); - sal_Bool bShowChildWindow; + bool bShowChildWindow; sal_uInt16 nSlotId = rRequest.GetSlot(); if (pArguments != NULL) bShowChildWindow = static_cast<const SfxBoolItem&>( diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx index 203f1a57854a..f1111833cf22 100644 --- a/sd/source/ui/view/ViewShellImplementation.cxx +++ b/sd/source/ui/view/ViewShellImplementation.cxx @@ -102,14 +102,14 @@ void ViewShell::Implementation::ProcessModifyPageSlot ( sal_uInt8 aBckgrnd = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), false); sal_uInt8 aBckgrndObj = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), false); SetOfByte aVisibleLayers; - sal_Bool bHandoutMode = sal_False; + bool bHandoutMode = false; SdPage* pHandoutMPage = NULL; OUString aNewName; AutoLayout aNewAutoLayout; - sal_Bool bBVisible; - sal_Bool bBObjsVisible; + bool bBVisible; + bool bBObjsVisible; const SfxItemSet* pArgs = rRequest.GetArgs(); if (pCurrentPage != NULL && pCurrentPage->TRG_HasMasterPage()) @@ -156,7 +156,7 @@ void ViewShell::Implementation::ProcessModifyPageSlot ( } if (ePageKind == PK_HANDOUT) { - bHandoutMode = sal_True; + bHandoutMode = true; pHandoutMPage = pDocument->GetMasterSdPage(0, PK_HANDOUT); } } @@ -202,7 +202,7 @@ void ViewShell::Implementation::ProcessModifyPageSlot ( } } - pCurrentPage->SetAutoLayout(aNewAutoLayout, sal_True); + pCurrentPage->SetAutoLayout(aNewAutoLayout, true); aBckgrnd = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), false); aBckgrndObj = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), false); @@ -212,17 +212,17 @@ void ViewShell::Implementation::ProcessModifyPageSlot ( } else { - pHandoutMPage->SetAutoLayout(aNewAutoLayout, sal_True); + pHandoutMPage->SetAutoLayout(aNewAutoLayout, true); } mrViewShell.GetViewFrame()->GetDispatcher()->Execute(SID_SWITCHPAGE, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD); - sal_Bool bSetModified = sal_True; + bool bSetModified = true; if (pArgs && pArgs->Count() == 1) { - bSetModified = (sal_Bool) ((SfxBoolItem&) pArgs->Get(SID_MODIFYPAGE)).GetValue(); + bSetModified = ((SfxBoolItem&) pArgs->Get(SID_MODIFYPAGE)).GetValue(); } pUndoManager->AddUndoAction( new UndoAutoLayoutPosAndSize( *pUndoPage ) ); diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx index 1fa6374a3ebd..af9f4de67806 100644 --- a/sd/source/ui/view/drawview.cxx +++ b/sd/source/ui/view/drawview.cxx @@ -128,10 +128,10 @@ void DrawView::ModelHasChanged() * rectangle of a masterpage into templates, otherwise pass on baseclass. */ -sal_Bool DrawView::SetAttributes(const SfxItemSet& rSet, - sal_Bool bReplaceAll) +bool DrawView::SetAttributes(const SfxItemSet& rSet, + bool bReplaceAll) { - sal_Bool bOk = sal_False; + bool bOk = false; // is there a masterpage edit? if ( mpDrawViewShell && mpDrawViewShell->GetEditMode() == EM_MASTERPAGE ) @@ -168,7 +168,7 @@ sal_Bool DrawView::SetAttributes(const SfxItemSet& rSet, pSheet->GetItemSet().Put(aTempSet); pSheet->Broadcast(SfxSimpleHint(SFX_HINT_DATACHANGED)); - bOk = sal_True; + bOk = true; } else if (eObjKind == OBJ_OUTLINETEXT) { @@ -241,7 +241,7 @@ sal_Bool DrawView::SetAttributes(const SfxItemSet& rSet, mpDocSh->GetUndoManager()->LeaveListAction(); - bOk = sal_True; + bOk = true; } else { @@ -281,7 +281,7 @@ sal_Bool DrawView::SetAttributes(const SfxItemSet& rSet, pSheet->GetItemSet().Put(aTempSet,false); pSheet->Broadcast(SfxSimpleHint(SFX_HINT_DATACHANGED)); - bOk = sal_True; + bOk = true; } else if (eObjKind == OBJ_OUTLINETEXT) { @@ -336,7 +336,7 @@ sal_Bool DrawView::SetAttributes(const SfxItemSet& rSet, nWhich = aWhichIter.NextWhich(); } - bOk = sal_True; + bOk = true; } } } @@ -395,7 +395,7 @@ void DrawView::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) * Lock/Unlock PageOrderChangedHint */ -void DrawView::BlockPageOrderChangedHint(sal_Bool bBlock) +void DrawView::BlockPageOrderChangedHint(bool bBlock) { if (bBlock) mnPOCHSmph++; @@ -411,19 +411,19 @@ void DrawView::BlockPageOrderChangedHint(sal_Bool bBlock) * masterpage. */ -sal_Bool DrawView::SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr) +bool DrawView::SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr) { - sal_Bool bResult = sal_True; + bool bResult = true; // is there a masterpage edit? if (mpDrawViewShell && mpDrawViewShell->GetEditMode() == EM_MASTERPAGE) { - if (IsPresObjSelected(sal_False, sal_True)) + if (IsPresObjSelected(false, true)) { InfoBox(mpDrawViewShell->GetActiveWindow(), SD_RESSTR(STR_ACTION_NOTPOSSIBLE)).Execute(); - bResult = sal_False; + bResult = false; } else { @@ -449,7 +449,7 @@ void DrawView::CompleteRedraw(OutputDevice* pOutDev, const Region& rReg, sdr::co mpVDev = NULL; } - sal_Bool bStandardPaint = sal_True; + bool bStandardPaint = true; SdDrawDocument* pDoc = mpDocShell->GetDoc(); if( pDoc && pDoc->GetDocumentType() == DOCUMENT_TYPE_IMPRESS) @@ -462,7 +462,7 @@ void DrawView::CompleteRedraw(OutputDevice* pOutDev, const Region& rReg, sdr::co { if( pShowWindow == pOutDev ) PresPaint(rReg); - bStandardPaint = sal_False; + bStandardPaint = false; } } } diff --git a/sd/source/ui/view/drtxtob.cxx b/sd/source/ui/view/drtxtob.cxx index 13b1def5845b..73852d01f7ac 100644 --- a/sd/source/ui/view/drtxtob.cxx +++ b/sd/source/ui/view/drtxtob.cxx @@ -155,8 +155,8 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet ) sal_uInt16 nWhich = aIter.FirstWhich(); SfxItemSet aAttrSet( mpView->GetDoc().GetPool() ); SvtLanguageOptions aLangOpt; - sal_Bool bDisableParagraphTextDirection = !aLangOpt.IsCTLFontEnabled(); - sal_Bool bDisableVerticalText = !aLangOpt.IsVerticalTextEnabled(); + bool bDisableParagraphTextDirection = !aLangOpt.IsCTLFontEnabled(); + bool bDisableVerticalText = !aLangOpt.IsVerticalTextEnabled(); mpView->GetAttributes( aAttrSet ); @@ -249,10 +249,10 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet ) case SID_OUTLINE_UP: case SID_OUTLINE_DOWN: { - sal_Bool bDisableLeft = sal_True; - sal_Bool bDisableRight = sal_True; - sal_Bool bDisableUp = sal_True; - sal_Bool bDisableDown = sal_True; + bool bDisableLeft = true; + bool bDisableRight = true; + bool bDisableUp = true; + bool bDisableDown = true; OutlinerView* pOLV = mpView->GetTextEditOutlinerView(); if (mpView->ISA(OutlineView)) @@ -261,7 +261,7 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet ) mpViewShell->GetActiveWindow()); } - sal_Bool bOutlineViewSh = mpViewShell->ISA(OutlineViewShell); + bool bOutlineViewSh = mpViewShell->ISA(OutlineViewShell); if (pOLV && ( pOLV->GetOutliner()->GetMode() == OUTLINERMODE_OUTLINEOBJECT || bOutlineViewSh ) ) @@ -274,7 +274,7 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet ) Paragraph* pPara = aSelList.empty() ? NULL : *(aSelList.begin()); // find out if we are a OutlineView - sal_Bool bIsOutlineView(OUTLINERMODE_OUTLINEVIEW == pOLV->GetOutliner()->GetMode()); + bool bIsOutlineView(OUTLINERMODE_OUTLINEVIEW == pOLV->GetOutliner()->GetMode()); // This is ONLY for OutlineViews if(bIsOutlineView) @@ -284,7 +284,7 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet ) if(pOutl->GetAbsPos(pPara) > 1 || ( pOutl->HasParaFlag(pPara,PARAFLAG_ISPAGE) && pOutl->GetAbsPos(pPara) > 0 ) ) { // not at top - bDisableUp = sal_False; + bDisableUp = false; } } else @@ -293,7 +293,7 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet ) if(pOutl->GetAbsPos(pPara) > 0) { // not at top - bDisableUp = sal_False; + bDisableUp = false; } } @@ -306,14 +306,14 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet ) if (nDepth > 0 || (bOutlineViewSh && (nDepth <= 0) && !pOutl->HasParaFlag( pPara, PARAFLAG_ISPAGE )) ) { // not minimum depth - bDisableLeft = sal_False; + bDisableLeft = false; } if( (nDepth < pOLV->GetOutliner()->GetMaxDepth() && ( !bOutlineViewSh || pOutl->GetAbsPos(pPara) != 0 )) || (bOutlineViewSh && (nDepth <= 0) && pOutl->HasParaFlag( pPara, PARAFLAG_ISPAGE ) && pOutl->GetAbsPos(pPara) != 0) ) { // not maximum depth and not at top - bDisableRight = sal_False; + bDisableRight = false; } } @@ -321,7 +321,7 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet ) ( pOutl->GetParagraphCount() > 1 || !bOutlineViewSh) ) { // not last paragraph - bDisableDown = sal_False; + bDisableDown = false; } // disable when first para and 2nd is not a title @@ -334,7 +334,7 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet ) && !pOutl->HasParaFlag( pOutl->GetParagraph(1), PARAFLAG_ISPAGE ) ) { // Needs to be disabled - bDisableDown = sal_True; + bDisableDown = true; } } @@ -359,13 +359,13 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet ) } else { - sal_Bool bLeftToRight = sal_True; + bool bLeftToRight = true; SdrOutliner* pOutl = mpView->GetTextEditOutliner(); if( pOutl ) { if( pOutl->IsVertical() ) - bLeftToRight = sal_False; + bLeftToRight = false; } else bLeftToRight = ( (const SvxWritingModeItem&) aAttrSet.Get( SDRATTR_TEXTDIRECTION ) ).GetValue() == com::sun::star::text::WritingMode_LR_TB; @@ -374,7 +374,7 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet ) rSet.Put( SfxBoolItem( SID_TEXTDIRECTION_TOP_TO_BOTTOM, !bLeftToRight ) ); if( !bLeftToRight ) - bDisableParagraphTextDirection = sal_True; + bDisableParagraphTextDirection = true; } } break; @@ -532,12 +532,12 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet ) { SdDrawDocument& rDoc = mpView->GetDoc(); ::com::sun::star::text::WritingMode eMode = rDoc.GetDefaultWritingMode(); - sal_Bool bIsLeftToRight(sal_False); + bool bIsLeftToRight(false); if(::com::sun::star::text::WritingMode_LR_TB == eMode || ::com::sun::star::text::WritingMode_TB_RL == eMode) { - bIsLeftToRight = sal_True; + bIsLeftToRight = true; } rSet.Put( SfxBoolItem( SID_ATTR_PARA_LEFT_TO_RIGHT, bIsLeftToRight ) ); diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx index 9008f55f840f..322e7563d7b3 100644 --- a/sd/source/ui/view/drtxtob1.cxx +++ b/sd/source/ui/view/drtxtob1.cxx @@ -541,7 +541,7 @@ void TextObjectBar::Execute( SfxRequest &rReq ) else if ( nSlot == SID_ATTR_PARA_LEFT_TO_RIGHT || nSlot == SID_ATTR_PARA_RIGHT_TO_LEFT ) { - sal_Bool bLeftToRight = nSlot == SID_ATTR_PARA_LEFT_TO_RIGHT; + bool bLeftToRight = nSlot == SID_ATTR_PARA_LEFT_TO_RIGHT; sal_uInt16 nAdjust = SVX_ADJUST_LEFT; if( SFX_ITEM_ON == aEditAttr.GetItemState(EE_PARA_JUST, true, &pPoolItem ) ) diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx index 55c6fcc3fd3b..6ceeca8a4cb3 100644 --- a/sd/source/ui/view/drviews1.cxx +++ b/sd/source/ui/view/drviews1.cxx @@ -257,7 +257,7 @@ void DrawViewShell::SelectionHasChanged (void) // Invalidate for every subshell GetViewShellBase().GetViewShellManager()->InvalidateAllSubShells(this); - mpDrawView->UpdateSelectionClipboard( sal_False ); + mpDrawView->UpdateSelectionClipboard( false ); GetViewShellBase().GetDrawController().FireSelectionChangeListener(); } @@ -269,7 +269,7 @@ void DrawViewShell::SetZoom( long nZoom ) { // Make sure that the zoom factor will not be recalculated on // following window resizings. - mbZoomOnPage = sal_False; + mbZoomOnPage = false; ViewShell::SetZoom( nZoom ); GetViewFrame()->GetBindings().Invalidate( SID_ATTR_ZOOM ); GetViewFrame()->GetBindings().Invalidate( SID_ATTR_ZOOMSLIDER ); @@ -293,7 +293,7 @@ void DrawViewShell::SetZoomRect( const Rectangle& rZoomRect ) * discover an refreshed text objext. */ -bool DrawViewShell::PrepareClose( sal_Bool bUI ) +bool DrawViewShell::PrepareClose( bool bUI ) { if ( !ViewShell::PrepareClose(bUI) ) return false; @@ -481,7 +481,7 @@ bool DrawViewShell::IsLayerModeActive (void) const * Generate horizontal ruler */ -SvxRuler* DrawViewShell::CreateHRuler (::sd::Window* pWin, sal_Bool bIsFirst) +SvxRuler* DrawViewShell::CreateHRuler (::sd::Window* pWin, bool bIsFirst) { Ruler* pRuler; WinBits aWBits; @@ -733,9 +733,9 @@ ErrCode DrawViewShell::DoVerb(long nVerb) * Activate OLE-object */ -sal_Bool DrawViewShell::ActivateObject(SdrOle2Obj* pObj, long nVerb) +bool DrawViewShell::ActivateObject(SdrOle2Obj* pObj, long nVerb) { - sal_Bool bActivated = sal_False; + bool bActivated = false; if ( !GetDocSh()->IsUIActive() ) { @@ -759,7 +759,7 @@ sal_Bool DrawViewShell::ActivateObject(SdrOle2Obj* pObj, long nVerb) void LclResetFlag (bool& rbFlag) {rbFlag = false;} -sal_Bool DrawViewShell::SwitchPage(sal_uInt16 nSelectedPage) +bool DrawViewShell::SwitchPage(sal_uInt16 nSelectedPage) { /** Under some circumstances there are nested calls to SwitchPage() and may crash the application (activation of form controls when the @@ -768,7 +768,7 @@ sal_Bool DrawViewShell::SwitchPage(sal_uInt16 nSelectedPage) would jump to the wrong page anyway.) */ if (mbIsInSwitchPage) - return sal_False; + return false; mbIsInSwitchPage = true; comphelper::ScopeGuard aGuard (::boost::bind(LclResetFlag, ::boost::ref(mbIsInSwitchPage))); @@ -780,10 +780,10 @@ sal_Bool DrawViewShell::SwitchPage(sal_uInt16 nSelectedPage) ::std::mem_fun(&DrawViewShell::SwitchPage), this, nSelectedPage)); - return sal_False; + return false; } - sal_Bool bOK = sal_False; + bool bOK = false; // With the current implementation of FuSlideShow there is a problem // when it dsplays the show in a window: When the show is stopped it @@ -812,7 +812,7 @@ sal_Bool DrawViewShell::SwitchPage(sal_uInt16 nSelectedPage) { ModifyGuard aGuard2( GetDoc() ); - bOK = sal_True; + bOK = true; if (mpActualPage) { @@ -835,7 +835,7 @@ sal_Bool DrawViewShell::SwitchPage(sal_uInt16 nSelectedPage) && sPageText == maTabControl.GetPageText(nSelectedPage+1)) { // this slide is already visible - return sal_True; + return true; } } } @@ -857,7 +857,7 @@ sal_Bool DrawViewShell::SwitchPage(sal_uInt16 nSelectedPage) && maTabControl.GetPageText(nSelectedPage+1).equals(pNewPage->GetName())) { // this slide is already visible - return sal_True; + return true; } } } @@ -906,7 +906,7 @@ sal_Bool DrawViewShell::SwitchPage(sal_uInt16 nSelectedPage) for (sal_uInt16 i = 0; i < GetDoc()->GetSdPageCount(mePageKind); i++) { // deselect all pages - GetDoc()->SetSelected( GetDoc()->GetSdPage(i, mePageKind), sal_False); + GetDoc()->SetSelected( GetDoc()->GetSdPage(i, mePageKind), false); } if (!mpActualPage) @@ -917,7 +917,7 @@ sal_Bool DrawViewShell::SwitchPage(sal_uInt16 nSelectedPage) // also select this page (mpActualPage always points at a drawing page, // never at a masterpage) - GetDoc()->SetSelected(mpActualPage, sal_True); + GetDoc()->SetSelected(mpActualPage, true); rtl::Reference< sd::SlideShow > xSlideshow( SlideShow::GetSlideShow( GetDoc() ) ); if( !xSlideshow.is() || !xSlideshow->isRunning() || ( xSlideshow->getAnimationMode() != ANIMATIONMODE_SHOW ) ) @@ -934,7 +934,7 @@ sal_Bool DrawViewShell::SwitchPage(sal_uInt16 nSelectedPage) /********************************************************************** * PAGEMODE **********************************************************************/ - GetDoc()->SetSelected(mpActualPage, sal_True); + GetDoc()->SetSelected(mpActualPage, true); SdrPageView* pPageView = mpDrawView->GetSdrPageView(); @@ -1110,7 +1110,7 @@ sal_Bool DrawViewShell::SwitchPage(sal_uInt16 nSelectedPage) * Check if page change is allowed */ -sal_Bool DrawViewShell::IsSwitchPageAllowed() const +bool DrawViewShell::IsSwitchPageAllowed() const { bool bOK = true; diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index f6a0f293de8a..7a6c14f7c935 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -331,7 +331,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) if( pItem ) { SfxItemSet aSet( GetPool(), EE_PARA_HYPHENATE, EE_PARA_HYPHENATE ); - sal_Bool bValue = ( (const SfxBoolItem*) pItem)->GetValue(); + bool bValue = ( (const SfxBoolItem*) pItem)->GetValue(); aSet.Put( SfxBoolItem( EE_PARA_HYPHENATE, bValue ) ); mpDrawView->SetAttributes( aSet ); } @@ -339,7 +339,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) { OSL_FAIL(" no value for hyphenation!"); SfxItemSet aSet( GetPool(), EE_PARA_HYPHENATE, EE_PARA_HYPHENATE ); - sal_Bool bValue = sal_True; + bool bValue = true; aSet.Put( SfxBoolItem( EE_PARA_HYPHENATE, bValue ) ); mpDrawView->SetAttributes( aSet ); } @@ -379,7 +379,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) // Create shapes for the default layout. SdPage* pMasterPage = GetDoc()->GetMasterSdPage( nIndex, PK_STANDARD); - pMasterPage->CreateTitleAndLayout (sal_True,sal_True); + pMasterPage->CreateTitleAndLayout (true,true); } } @@ -505,7 +505,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) Size aSize (pWidth->GetValue (), pHeight->GetValue ()); - SetupPage (aSize, 0, 0, 0, 0, sal_True, sal_False, pScaleAll->GetValue ()); + SetupPage (aSize, 0, 0, 0, 0, true, false, pScaleAll->GetValue ()); rReq.Ignore (); break; } @@ -533,7 +533,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) SetupPage (aEmptySize, pLeft->GetValue (), pRight->GetValue (), pUpper->GetValue (), pLower->GetValue (), - sal_False, sal_True, pScaleAll->GetValue ()); + false, true, pScaleAll->GetValue ()); rReq.Ignore (); break; } @@ -602,7 +602,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) case SID_ATTR_ZOOM: { const SfxItemSet* pArgs = rReq.GetArgs(); - mbZoomOnPage = sal_False; + mbZoomOnPage = false; if ( pArgs ) { @@ -834,7 +834,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) } pSet = new SfxItemSet( GetPool(), EE_ITEMS_START, EE_ITEMS_END ); - mpDrawView->SetAttributes( *pSet, sal_True ); + mpDrawView->SetAttributes( *pSet, true ); } else { @@ -862,7 +862,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) } pSet = new SfxItemSet( GetPool() ); - mpDrawView->SetAttributes( *pSet, sal_True ); + mpDrawView->SetAttributes( *pSet, true ); sal_uLong j = 0; @@ -933,7 +933,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) FuPoor::HITPIX, 0 ) ).Width(); sal_uInt16 nHelpLine; - mbMousePosFreezed = sal_False; + mbMousePosFreezed = false; if( mpDrawView->PickHelpLine( aMPos, nHitLog, *GetActiveWindow(), nHelpLine, pPV) ) { @@ -1180,7 +1180,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) case SID_COPYOBJECTS: { - if ( mpDrawView->IsPresObjSelected(sal_False, sal_True) ) + if ( mpDrawView->IsPresObjSelected(false, true) ) { ::sd::Window* pWindow = GetActiveWindow(); InfoBox(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE)).Execute(); @@ -1223,7 +1223,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) case SID_ZOOM_OUT: case SID_ZOOM_PANNING: { - mbZoomOnPage = sal_False; + mbZoomOnPage = false; SetCurrentFunction( FuZoom::Create(this, GetActiveWindow(), mpDrawView, GetDoc(), rReq) ); // finishes itself, no Cancel() needed! Invalidate( SID_ZOOM_TOOLBOX ); @@ -1317,7 +1317,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) case SID_CONNECTION_NEW_ROUTING: { SfxItemSet aDefAttr( GetPool(), SDRATTR_EDGELINE1DELTA, SDRATTR_EDGELINE3DELTA ); - GetView()->SetAttributes( aDefAttr, sal_True ); // (ReplaceAll) + GetView()->SetAttributes( aDefAttr, true ); // (ReplaceAll) Cancel(); rReq.Done(); @@ -1351,7 +1351,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) case SID_TWAIN_TRANSFER: { - sal_Bool bDone = sal_False; + bool bDone = false; if( mxScannerManager.is() ) { @@ -1362,7 +1362,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) if( aContexts.getLength() ) { mxScannerManager->startScan( aContexts.getConstArray()[ 0 ], mxScannerListener ); - bDone = sal_True; + bDone = true; } } catch( ... ) @@ -1419,9 +1419,9 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) sal_uInt16 nLayer = nLayerCnt - 2 + 1; OUString aLayerName = SD_RESSTR(STR_LAYER) + OUString::number(nLayer); OUString aLayerTitle, aLayerDesc; - sal_Bool bIsVisible = sal_False; - sal_Bool bIsLocked = sal_False; - sal_Bool bIsPrintable = sal_False; + bool bIsVisible = false; + bool bIsLocked = false; + bool bIsPrintable = false; const SfxItemSet* pArgs = rReq.GetArgs(); @@ -1444,7 +1444,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) pDlg->SetHelpId( SD_MOD()->GetSlotPool()->GetSlot( SID_INSERTLAYER )->GetCommand() ); // test for already existing names - sal_Bool bLoop = sal_True; + bool bLoop = true; while( bLoop && pDlg->Execute() == RET_OK ) { pDlg->GetAttr( aNewAttr ); @@ -1461,7 +1461,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) aWarningBox.Execute(); } else - bLoop = sal_False; + bLoop = false; } if( bLoop ) // was canceled { @@ -1574,10 +1574,10 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) OUString aOldLayerTitle(aLayerTitle); OUString aOldLayerDesc(aLayerDesc); - sal_Bool bIsVisible, bIsLocked, bIsPrintable; - sal_Bool bOldIsVisible = bIsVisible = mpDrawView->IsLayerVisible(aLayerName); - sal_Bool bOldIsLocked = bIsLocked = mpDrawView->IsLayerLocked(aLayerName); - sal_Bool bOldIsPrintable = bIsPrintable = mpDrawView->IsLayerPrintable(aLayerName); + bool bIsVisible, bIsLocked, bIsPrintable; + bool bOldIsVisible = bIsVisible = mpDrawView->IsLayerVisible(aLayerName); + bool bOldIsLocked = bIsLocked = mpDrawView->IsLayerLocked(aLayerName); + bool bOldIsPrintable = bIsPrintable = mpDrawView->IsLayerPrintable(aLayerName); const SfxItemSet* pArgs = rReq.GetArgs(); @@ -1616,7 +1616,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) pDlg->SetHelpId( SD_MOD()->GetSlotPool()->GetSlot( SID_MODIFYLAYER )->GetCommand() ); // test for already existing names - sal_Bool bLoop = sal_True; + bool bLoop = true; sal_uInt16 nRet = 0; while( bLoop && ( (nRet = pDlg->Execute()) == RET_OK ) ) { @@ -1634,7 +1634,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) aWarningBox.Execute(); } else - bLoop = sal_False; + bLoop = false; } switch (nRet) { @@ -1971,7 +1971,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) // it is necessary to split the actions here SvxFieldData* pField = pDlg->GetField(); ESelection aSel = pOLV->GetSelection(); - sal_Bool bSelectionWasModified(sal_False); + bool bSelectionWasModified(false); if( pField ) { @@ -1979,7 +1979,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) if( aSel.nStartPos == aSel.nEndPos ) { - bSelectionWasModified = sal_True; + bSelectionWasModified = true; aSel.nEndPos++; pOLV->SetSelection( aSel ); } @@ -2041,7 +2041,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) case SID_GROUP: // BASIC { - if ( mpDrawView->IsPresObjSelected( sal_True, sal_True, sal_True ) ) + if ( mpDrawView->IsPresObjSelected( true, true, true ) ) { ::sd::Window* pWindow = GetActiveWindow(); InfoBox(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE)).Execute(); @@ -3170,7 +3170,7 @@ void DrawViewShell::GetStatePropPanelAttr(SfxItemSet& rSet) case SID_TABLE_VERT_NONE: case SID_TABLE_VERT_CENTER: case SID_TABLE_VERT_BOTTOM: - sal_Bool bContour = sal_False; + bool bContour = false; SfxItemState eConState = aAttrs.GetItemState( SDRATTR_TEXT_CONTOURFRAME ); if( eConState != SFX_ITEM_DONTCARE ) { @@ -3185,7 +3185,7 @@ void DrawViewShell::GetStatePropPanelAttr(SfxItemSet& rSet) if(SFX_ITEM_DONTCARE != eVState) { SdrTextVertAdjust eTVA = (SdrTextVertAdjust)((const SdrTextVertAdjustItem&)aAttrs.Get(SDRATTR_TEXT_VERTADJUST)).GetValue(); - sal_Bool bSet = (nSlotId == SID_TABLE_VERT_NONE && eTVA == SDRTEXTVERTADJUST_TOP) || + bool bSet = (nSlotId == SID_TABLE_VERT_NONE && eTVA == SDRTEXTVERTADJUST_TOP) || (nSlotId == SID_TABLE_VERT_CENTER && eTVA == SDRTEXTVERTADJUST_CENTER) || (nSlotId == SID_TABLE_VERT_BOTTOM && eTVA == SDRTEXTVERTADJUST_BOTTOM); rSet.Put(SfxBoolItem(nSlotId, bSet)); diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx index 9b076ed89541..885011dca050 100644 --- a/sd/source/ui/view/drviews3.cxx +++ b/sd/source/ui/view/drviews3.cxx @@ -894,7 +894,7 @@ void DrawViewShell::GetRulerState(SfxItemSet& rSet) maMarkRect = mpDrawView->GetAllMarkedRect(); - const sal_Bool bRTL = GetDoc() && GetDoc()->GetDefaultWritingMode() == ::com::sun::star::text::WritingMode_RL_TB; + const bool bRTL = GetDoc() && GetDoc()->GetDefaultWritingMode() == ::com::sun::star::text::WritingMode_RL_TB; rSet.Put(SfxBoolItem(SID_RULER_TEXT_RIGHT_TO_LEFT, bRTL)); if( mpDrawView->AreObjectsMarked() ) diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx index 14cffd325869..8289adeba1b4 100644 --- a/sd/source/ui/view/drviews4.cxx +++ b/sd/source/ui/view/drviews4.cxx @@ -124,9 +124,9 @@ void DrawViewShell::DeleteActualLayer() -sal_Bool DrawViewShell::KeyInput (const KeyEvent& rKEvt, ::sd::Window* pWin) +bool DrawViewShell::KeyInput (const KeyEvent& rKEvt, ::sd::Window* pWin) { - sal_Bool bRet = sal_False; + bool bRet = false; if ( !IsInputLocked() || ( rKEvt.GetKeyCode().GetCode() == KEY_ESCAPE ) ) { @@ -151,7 +151,7 @@ sal_Bool DrawViewShell::KeyInput (const KeyEvent& rKEvt, ::sd::Window* pWin) // look for a new candidate, a successor of pOldObj SdrObjListIter aIter(*pActualPage, IM_DEEPNOGROUPS); - sal_Bool bDidVisitOldObject(sal_False); + bool bDidVisitOldObject(false); while(aIter.IsMore() && !pCandidate) { @@ -171,7 +171,7 @@ sal_Bool DrawViewShell::KeyInput (const KeyEvent& rKEvt, ::sd::Window* pWin) if(pObj == pOldObj) { - bDidVisitOldObject = sal_True; + bDidVisitOldObject = true; } } } @@ -222,7 +222,7 @@ void DrawViewShell::StartRulerDrag ( if ( rRuler.GetExtraRect().IsInside(rMEvt.GetPosPixel()) ) { mpDrawView->BegSetPageOrg(aWPos); - mbIsRulerDrag = sal_True; + mbIsRulerDrag = true; } else { @@ -240,7 +240,7 @@ void DrawViewShell::StartRulerDrag ( eKind = SDRHELPLINE_VERTICAL; mpDrawView->BegDragHelpLine(aWPos, eKind); - mbIsRulerDrag = sal_True; + mbIsRulerDrag = true; } } @@ -280,7 +280,7 @@ void DrawViewShell::MouseButtonDown(const MouseEvent& rMEvt, // the contex menu is closed by VCL asynchronously which in the end // would work on deleted objects or the context menu has no parent anymore) SfxInPlaceClient* pIPClient = GetViewShell()->GetIPClient(); - sal_Bool bIsOleActive = ( pIPClient && pIPClient->IsObjectInPlaceActive() ); + bool bIsOleActive = ( pIPClient && pIPClient->IsObjectInPlaceActive() ); if ( bIsOleActive && PopupMenu::IsInExecute() ) return; @@ -309,7 +309,7 @@ void DrawViewShell::MouseMove(const MouseEvent& rMEvt, ::sd::Window* pWin) if ( !aOutputArea.IsInside(rMEvt.GetPosPixel()) ) { - sal_Bool bInsideOtherWindow = sal_False; + bool bInsideOtherWindow = false; if (mpContentWindow.get() != NULL) { @@ -318,7 +318,7 @@ void DrawViewShell::MouseMove(const MouseEvent& rMEvt, ::sd::Window* pWin) Point aPos = mpContentWindow->GetPointerPosPixel(); if ( aOutputArea.IsInside(aPos) ) - bInsideOtherWindow = sal_True; + bInsideOtherWindow = true; } if (! GetActiveWindow()->HasFocus ()) @@ -439,7 +439,7 @@ void DrawViewShell::MouseButtonUp(const MouseEvent& rMEvt, ::sd::Window* pWin) } GetActiveWindow()->ReleaseMouse(); - mbIsRulerDrag = sal_False; + mbIsRulerDrag = false; } else ViewShell::MouseButtonUp(rMEvt, pWin); @@ -457,7 +457,7 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin) // deactivate the inplace client without any problem regarding parent // windows and code on the stack. SfxInPlaceClient* pIPClient = GetViewShell()->GetIPClient(); - sal_Bool bIsOleActive = ( pIPClient && pIPClient->IsObjectInPlaceActive() ); + bool bIsOleActive = ( pIPClient && pIPClient->IsObjectInPlaceActive() ); if ( bIsOleActive && ( rCEvt.GetCommand() == COMMAND_CONTEXTMENU )) { // Deactivate OLE object @@ -485,7 +485,7 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin) if( GetActiveWindow() ) aPos = GetActiveWindow()->PixelToLogic( rCEvt.GetMousePosPixel() ); - if( !mpDrawView->InsertData( aDataHelper, aPos, nDnDAction, sal_False ) ) + if( !mpDrawView->InsertData( aDataHelper, aPos, nDnDAction, false ) ) { INetBookmark aINetBookmark( aEmptyStr, aEmptyStr ); @@ -505,7 +505,7 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin) pWin != NULL && !mpDrawView->IsAction() && !SD_MOD()->GetWaterCan() ) { sal_uInt16 nSdResId = 0; // ResourceID for popup menu - sal_Bool bGraphicShell = this->ISA(GraphicViewShell); + bool bGraphicShell = this->ISA(GraphicViewShell); // is there a snap object under the cursor? SdrPageView* pPV; @@ -564,10 +564,10 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin) SvxFieldItem aFieldItem( *pField, EE_FEATURE_FIELD ); // select field, so that it will be deleted on insert ESelection aSel = pOLV->GetSelection(); - sal_Bool bSel = sal_True; + bool bSel = true; if( aSel.nStartPos == aSel.nEndPos ) { - bSel = sal_False; + bSel = false; aSel.nEndPos++; } pOLV->SetSelection( aSel ); @@ -794,7 +794,7 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin) //open context menu at that point GetViewFrame()->GetDispatcher()->ExecutePopup(SdResId(nSdResId),GetActiveWindow(),&aMenuPos); } - mbMousePosFreezed = sal_False; + mbMousePosFreezed = false; } } else diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx index ea3623b578d9..2e98ec506d2b 100644 --- a/sd/source/ui/view/drviews5.cxx +++ b/sd/source/ui/view/drviews5.cxx @@ -127,11 +127,11 @@ void DrawViewShell::ArrangeGUIElements (void) OSL_ASSERT (GetViewShell()!=NULL); Client* pIPClient = static_cast<Client*>(GetViewShell()->GetIPClient()); - sal_Bool bClientActive = sal_False; + bool bClientActive = false; if ( pIPClient && pIPClient->IsObjectInPlaceActive() ) - bClientActive = sal_True; + bClientActive = true; - sal_Bool bInPlaceActive = GetViewFrame()->GetFrame().IsInPlace(); + bool bInPlaceActive = GetViewFrame()->GetFrame().IsInPlace(); if ( mbZoomOnPage && !bInPlaceActive && !bClientActive ) { @@ -235,7 +235,7 @@ void DrawViewShell::ReadFrameViewData(FrameView* pView) if (mpDrawView->IsSolidDragging() != pView->IsSolidDragging() ) mpDrawView->SetSolidDragging( pView->IsSolidDragging() ); - if ((mpDrawView->IsQuickTextEditMode() ? 1 : 0) != pView->IsQuickEdit()) + if (mpDrawView->IsQuickTextEditMode() != pView->IsQuickEdit()) mpDrawView->SetQuickTextEditMode( pView->IsQuickEdit() ); // #i26631# @@ -288,7 +288,7 @@ void DrawViewShell::ReadFrameViewData(FrameView* pView) } EditMode eNewEditMode = pView->GetViewShEditMode(mePageKind); - sal_Bool bNewLayerMode = pView->IsLayerMode(); + bool bNewLayerMode = pView->IsLayerMode(); if(IsLayerModeActive() && bNewLayerMode) { @@ -456,7 +456,7 @@ void DrawViewShell::Paint(const Rectangle& rRect, ::sd::Window* pWin) void DrawViewShell::SetZoomFactor(const Fraction& rZoomX, const Fraction& rZoomY) { ViewShell::SetZoomFactor(rZoomX, rZoomY); - mbZoomOnPage = sal_False; + mbZoomOnPage = false; Point aOrigin = GetActiveWindow()->GetViewOrigin(); GetActiveWindow()->SetWinViewPos(aOrigin); } @@ -471,7 +471,7 @@ void DrawViewShell::HidePage() -void DrawViewShell::WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& rSequence, sal_Bool bBrowse ) +void DrawViewShell::WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& rSequence, bool bBrowse ) { WriteFrameViewData(); @@ -480,10 +480,10 @@ void DrawViewShell::WriteUserDataSequence ( ::com::sun::star::uno::Sequence < :: const sal_Int32 nIndex = rSequence.getLength(); rSequence.realloc( nIndex + 1 ); rSequence[nIndex].Name = sUNO_View_ZoomOnPage ; - rSequence[nIndex].Value <<= (sal_Bool)mbZoomOnPage; + rSequence[nIndex].Value <<= mbZoomOnPage; } -void DrawViewShell::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& rSequence, sal_Bool bBrowse ) +void DrawViewShell::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& rSequence, bool bBrowse ) { WriteFrameViewData(); @@ -495,7 +495,7 @@ void DrawViewShell::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence { if ( pValue->Name == sUNO_View_ZoomOnPage ) { - sal_Bool bZoomPage = sal_False; + bool bZoomPage = false; if( pValue->Value >>= bZoomPage ) { mbZoomOnPage = bZoomPage; diff --git a/sd/source/ui/view/drviews6.cxx b/sd/source/ui/view/drviews6.cxx index 723bb2d4cec9..04b83a16764a 100644 --- a/sd/source/ui/view/drviews6.cxx +++ b/sd/source/ui/view/drviews6.cxx @@ -354,7 +354,7 @@ void DrawViewShell::GetBmpMaskState( SfxItemSet& rSet ) const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList(); const SdrObject* pObj = NULL; sal_uInt16 nId = SvxBmpMaskChildWindow::GetChildWindowId(); - sal_Bool bEnable = sal_False; + bool bEnable = false; if ( GetViewFrame()->HasChildWindow( nId ) ) { @@ -372,7 +372,7 @@ void DrawViewShell::GetBmpMaskState( SfxItemSet& rSet ) !((SdrGrafObj*) pObj)->IsEPS() && !mpDrawView->IsTextEdit() ) { - bEnable = sal_True; + bEnable = true; } // put value diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx index 651a37774bcc..749a0cb07889 100644 --- a/sd/source/ui/view/drviews7.cxx +++ b/sd/source/ui/view/drviews7.cxx @@ -220,7 +220,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) } ViewShell::GetMenuState(rSet); - sal_Bool bDisableVerticalText = !SvtLanguageOptions().IsVerticalTextEnabled(); + bool bDisableVerticalText = !SvtLanguageOptions().IsVerticalTextEnabled(); if ( bDisableVerticalText ) { @@ -242,7 +242,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) SetChildWindowState( rSet ); // map images of toolboxes (only zoom) - UpdateToolboxImages( rSet, sal_False ); + UpdateToolboxImages( rSet, false ); if(HasCurrentFunction()) { @@ -393,7 +393,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_PRESENTATION ) || SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_REHEARSE_TIMINGS ) ) { - sal_Bool bDisable = sal_True; + bool bDisable = true; sal_uInt16 nCount = GetDoc()->GetSdPageCount( PK_STANDARD ); for( sal_uInt16 i = 0; i < nCount && bDisable; i++ ) @@ -401,7 +401,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) SdPage* pPage = GetDoc()->GetSdPage(i, PK_STANDARD); if( !pPage->IsExcluded() ) - bDisable = sal_False; + bDisable = false; } if( bDisable || GetDocSh()->IsPreview()) @@ -622,7 +622,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) mbPastePossible = ( aDataHelper.GetFormatCount() != 0 ); } else - mbPastePossible = sal_False; + mbPastePossible = false; } if( !mbPastePossible ) @@ -754,7 +754,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) rSet.GetItemState(SID_TITLE_MASTERPAGE) == SFX_ITEM_AVAILABLE) { // Is there a page with the AutoLayout "Title"? - sal_Bool bDisable = sal_True; + bool bDisable = true; sal_uInt16 i = 0; sal_uInt16 nCount = GetDoc()->GetSdPageCount(PK_STANDARD); @@ -764,7 +764,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) if (pPage->GetAutoLayout() == AUTOLAYOUT_TITLE) { - bDisable = sal_False; + bDisable = false; } i++; @@ -805,8 +805,8 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) if (rSet.GetItemState(SID_TITLE_MASTERPAGE) == SFX_ITEM_AVAILABLE) { - sal_Bool bCheck = sal_False; - sal_Bool bDisable = sal_True; + bool bCheck = false; + bool bDisable = true; if( pPageView ) { SdPage* pMPage = dynamic_cast< SdPage* >( pPageView->GetPage() ); @@ -824,7 +824,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) if (pPage->GetAutoLayout() == AUTOLAYOUT_TITLE) { // a page does have a AutoLayout "Title" - bDisable = sal_False; + bDisable = false; SdPage& rRefMPage = (SdPage&)(pPage->TRG_GetMasterPage()); @@ -832,7 +832,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) { // a page with the AutoLayout "Title" does reference // the current master page - bCheck = sal_True; + bCheck = true; } } @@ -926,8 +926,8 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) // special treatment of for SID_OUTLINE_BULLET if objects with different // kinds of NumBullets are marked - sal_Bool bHasOutliner = sal_False; - sal_Bool bHasOther = sal_False; + bool bHasOutliner = false; + bool bHasOther = false; for(sal_uLong nNum = 0; nNum < nMarkCount; nNum++) { SdrObject* pObj = rMarkList.GetMark(nNum)->GetMarkedSdrObj(); @@ -935,13 +935,13 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) { if( pObj->GetObjIdentifier() == OBJ_OUTLINETEXT ) { - bHasOutliner = sal_True; + bHasOutliner = true; if(bHasOther) break; } else { - bHasOther = sal_True; + bHasOther = true; if(bHasOutliner) break; } @@ -1393,12 +1393,12 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) // get marklist SdrMarkList aMarkList = mpDrawView->GetMarkedObjectList(); - sal_Bool bFoundBitmap = sal_False; - sal_Bool bFoundMetafile = sal_False; - sal_Bool bFoundObjNoLine = sal_False; - sal_Bool bFoundObjNoArea = sal_False; - sal_Bool bFoundNoGraphicObj = sal_False; - sal_Bool bFoundAny = sal_False; + bool bFoundBitmap = false; + bool bFoundMetafile = false; + bool bFoundObjNoLine = false; + bool bFoundObjNoArea = false; + bool bFoundNoGraphicObj = false; + bool bFoundAny = false; bool bFoundTable = false; // const int nMarkCount = (int) aMarkList.GetMarkCount(); @@ -1419,8 +1419,8 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) case OBJ_FREELINE : case OBJ_EDGE: case OBJ_CARC : - bFoundObjNoArea = sal_True; - bFoundNoGraphicObj = sal_True; + bFoundObjNoArea = true; + bFoundNoGraphicObj = true; break; case OBJ_OLE2 : // #i118485# #i118525# Allow Line, Area and Graphic (Metafile, Bitmap) @@ -1435,14 +1435,14 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) switch(pSdrGrafObj->GetGraphicType()) { case GRAPHIC_BITMAP : - bFoundBitmap = sal_True; + bFoundBitmap = true; if(pSdrGrafObj->isEmbeddedSvg()) { bFoundMetafile = true; } break; case GRAPHIC_GDIMETAFILE : - bFoundMetafile = sal_True; + bFoundMetafile = true; break; default: break; @@ -1453,13 +1453,13 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) bFoundTable = true; break; default : - bFoundAny = sal_True; + bFoundAny = true; } } else if(nInv == E3dInventor) { // 3D objects - bFoundAny = sal_True; + bFoundAny = true; } } @@ -1498,7 +1498,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) // Menuoption: Edit->Hyperlink // Disable, if there is no hyperlink - sal_Bool bDisableEditHyperlink = sal_True; + bool bDisableEditHyperlink = true; if( mpDrawView->AreObjectsMarked() && ( mpDrawView->GetMarkedObjectList().GetMarkCount() == 1 ) ) { if( mpDrawView->IsTextEdit() ) @@ -1514,7 +1514,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) { const SvxFieldData* pField = pFieldItem->GetField(); if ( pField->ISA(SvxURLField) ) - bDisableEditHyperlink = sal_False; + bDisableEditHyperlink = false; } } } @@ -1534,7 +1534,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) uno::Reference< beans::XPropertySetInfo > xPropInfo( xPropSet->getPropertySetInfo() ); if( xPropInfo.is() && xPropInfo->hasPropertyByName( "TargetURL") ) { - bDisableEditHyperlink = sal_False; + bDisableEditHyperlink = false; } } } diff --git a/sd/source/ui/view/drviews8.cxx b/sd/source/ui/view/drviews8.cxx index 39b245033f84..70b858c2b118 100644 --- a/sd/source/ui/view/drviews8.cxx +++ b/sd/source/ui/view/drviews8.cxx @@ -100,7 +100,7 @@ void DrawViewShell::ScannerEvent( const ::com::sun::star::lang::EventObject& ) aPnt += Point( pPage->GetLftBorder(), pPage->GetUppBorder() ); Rectangle aRect( aPnt, aBmpSize ); SdrGrafObj* pGrafObj = NULL; - sal_Bool bInsertNewObject = sal_True; + bool bInsertNewObject = true; if( GetView()->AreObjectsMarked() ) { @@ -117,7 +117,7 @@ void DrawViewShell::ScannerEvent( const ::com::sun::star::lang::EventObject& ) if( pGrafObj->IsEmptyPresObj() ) { - bInsertNewObject = sal_False; + bInsertNewObject = false; pGrafObj->SetEmptyPresObj(false); pGrafObj->SetOutlinerParaObject(NULL); pGrafObj->SetGraphic( Graphic( aScanBmp ) ); diff --git a/sd/source/ui/view/drviews9.cxx b/sd/source/ui/view/drviews9.cxx index 597a3dd22adf..1d3c7986731d 100644 --- a/sd/source/ui/view/drviews9.cxx +++ b/sd/source/ui/view/drviews9.cxx @@ -128,7 +128,7 @@ void DrawViewShell::ExecGallery(SfxRequest& rReq) SdrGrafObj* pGrafObj = NULL; - sal_Bool bInsertNewObject = sal_True; + bool bInsertNewObject = true; if ( mpDrawView->AreObjectsMarked() ) { @@ -147,7 +147,7 @@ void DrawViewShell::ExecGallery(SfxRequest& rReq) if( pGrafObj->IsEmptyPresObj() ) { // the empty graphic object gets a new graphic - bInsertNewObject = sal_False; + bInsertNewObject = false; SdrGrafObj* pNewGrafObj = (SdrGrafObj*) pGrafObj->Clone(); pNewGrafObj->SetEmptyPresObj(false); diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx index e76c243e8841..5cc9d321aac1 100644 --- a/sd/source/ui/view/drviewsa.cxx +++ b/sd/source/ui/view/drviewsa.cxx @@ -77,7 +77,7 @@ using sfx2::sidebar::EnumContext; namespace sd { -sal_Bool DrawViewShell::mbPipette = sal_False; +bool DrawViewShell::mbPipette = false; // - ScannerEventListener - @@ -179,11 +179,11 @@ DrawViewShell::~DrawViewShell() if (pPage == mpActualPage) { - GetDoc()->SetSelected(pPage, sal_True); + GetDoc()->SetSelected(pPage, true); } else { - GetDoc()->SetSelected(pPage, sal_False); + GetDoc()->SetSelected(pPage, false); } } @@ -209,11 +209,11 @@ DrawViewShell::~DrawViewShell() void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind) { mpActualPage = 0; - mbMousePosFreezed = sal_False; + mbMousePosFreezed = false; mbReadOnly = GetDocSh()->IsReadOnly(); mpSlotArray = 0; mpClipEvtLstnr = 0; - mbPastePossible = sal_False; + mbPastePossible = false; mbIsLayerModeActive = false; mpFrameView->Connect(); @@ -355,14 +355,14 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind) if (pDocSh->GetCreateMode() == SFX_CREATE_MODE_EMBEDDED) { - mbZoomOnPage = sal_False; + mbZoomOnPage = false; } else { - mbZoomOnPage = sal_True; + mbZoomOnPage = true; } - mbIsRulerDrag = sal_False; + mbIsRulerDrag = false; OUString aName( "DrawViewShell" ); SetName (aName); @@ -478,9 +478,9 @@ void DrawViewShell::SetupPage (Size &rSize, long nRight, long nUpper, long nLower, - sal_Bool bSize, - sal_Bool bMargin, - sal_Bool bScaleAll) + bool bSize, + bool bMargin, + bool bScaleAll) { sal_uInt16 nPageCnt = GetDoc()->GetMasterSdPageCount(mePageKind); sal_uInt16 i; @@ -552,7 +552,7 @@ void DrawViewShell::SetupPage (Size &rSize, if ( mePageKind == PK_STANDARD ) { SdPage* pHandoutPage = GetDoc()->GetSdPage(0, PK_HANDOUT); - pHandoutPage->CreateTitleAndLayout(sal_True); + pHandoutPage->CreateTitleAndLayout(true); } long nWidth = mpActualPage->GetSize().Width(); @@ -561,7 +561,7 @@ void DrawViewShell::SetupPage (Size &rSize, Point aPageOrg(nWidth, nHeight / 2); Size aSize( nWidth * 3, nHeight * 2); - InitWindows(aPageOrg, aSize, Point(-1, -1), sal_True); + InitWindows(aPageOrg, aSize, Point(-1, -1), true); Point aVisAreaPos; @@ -796,7 +796,7 @@ void DrawViewShell::Notify (SfxBroadcaster&, const SfxHint& rHint) } // Turn on design mode when document is not read-only. - if ((GetDocSh()->IsReadOnly() ? 1 : 0) != mbReadOnly ) + if (GetDocSh()->IsReadOnly() != mbReadOnly ) { mbReadOnly = GetDocSh()->IsReadOnly(); diff --git a/sd/source/ui/view/drviewsb.cxx b/sd/source/ui/view/drviewsb.cxx index eeb5b7dcb3e8..cc6383e7215b 100644 --- a/sd/source/ui/view/drviewsb.cxx +++ b/sd/source/ui/view/drviewsb.cxx @@ -67,7 +67,7 @@ namespace sd { bool DrawViewShell::RenameSlide( sal_uInt16 nPageId, const OUString & rName ) { - sal_Bool bOutDummy; + bool bOutDummy; if( GetDoc()->GetPageByName( rName, bOutDummy ) != SDRPAGE_NOTFOUND ) return false; diff --git a/sd/source/ui/view/drviewsc.cxx b/sd/source/ui/view/drviewsc.cxx index 1d38edc577ff..7b3094b15cc4 100644 --- a/sd/source/ui/view/drviewsc.cxx +++ b/sd/source/ui/view/drviewsc.cxx @@ -264,7 +264,7 @@ void DrawViewShell::MapSlot( sal_uInt16 nSId ) /** * Allows a ImageMapping via SlotArray */ -void DrawViewShell::UpdateToolboxImages( SfxItemSet &rSet, sal_Bool bPermanent ) +void DrawViewShell::UpdateToolboxImages( SfxItemSet &rSet, bool bPermanent ) { if( !bPermanent ) { diff --git a/sd/source/ui/view/drviewsd.cxx b/sd/source/ui/view/drviewsd.cxx index f89f6e318862..6ae24c353b78 100644 --- a/sd/source/ui/view/drviewsd.cxx +++ b/sd/source/ui/view/drviewsd.cxx @@ -166,7 +166,7 @@ void DrawViewShell::GetNavigatorWinState( SfxItemSet& rSet ) sal_uInt16 nCurrentPage = 0; sal_uInt16 nFirstPage = 0; sal_uInt16 nLastPage; - sal_Bool bEndless = sal_False; + bool bEndless = false; OUString aPageName; rtl::Reference< SlideShow > xSlideshow( SlideShow::GetSlideShow( GetViewShellBase() ) ); diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx index fa2ef547b534..cd643b026980 100644 --- a/sd/source/ui/view/drviewse.cxx +++ b/sd/source/ui/view/drviewse.cxx @@ -156,7 +156,7 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq) if( pFuText ) { - pFuText->SetPermanent(sal_True); + pFuText->SetPermanent(true); xFunc->ReceiveRequest( rReq ); MapSlot( nSId ); @@ -176,7 +176,7 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq) CheckLineTo (rReq); sal_uInt16 nOldSId = 0; - sal_Bool bPermanent = sal_False; + bool bPermanent = false; if( !mpDrawView ) return; @@ -214,7 +214,7 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq) (nSId == SID_TEXTEDIT || nSId == SID_ATTR_CHAR || nSId == SID_TEXT_FITTOSIZE || nSId == SID_ATTR_CHAR_VERTICAL || nSId == SID_TEXT_FITTOSIZE_VERTICAL ))) { - bPermanent = sal_True; + bPermanent = true; } GetCurrentFunction()->Deactivate(); @@ -348,13 +348,13 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq) sal_uLong i = 0; const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList(); sal_uLong nMarkCnt = rMarkList.GetMarkCount(); - sal_Bool b3DObjMarked = sal_False; + bool b3DObjMarked = false; while (i < nMarkCnt && !b3DObjMarked) { if (rMarkList.GetMark(i)->GetMarkedSdrObj()->ISA(E3dObject)) { - b3DObjMarked = sal_True; + b3DObjMarked = true; } else { @@ -739,7 +739,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) case SID_CUT: { - if ( mpDrawView->IsPresObjSelected(sal_False, sal_True, sal_False, sal_True) ) + if ( mpDrawView->IsPresObjSelected(false, true, false, true) ) { ::sd::Window* pWindow = GetActiveWindow(); InfoBox(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE) ).Execute(); @@ -761,7 +761,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) case SID_COPY: { - if ( mpDrawView->IsPresObjSelected(sal_False, sal_True, sal_False, sal_True) ) + if ( mpDrawView->IsPresObjSelected(false, true, false, true) ) { ::sd::Window* pWindow = GetActiveWindow(); InfoBox(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE) ).Execute(); @@ -814,7 +814,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) { mpDrawView->InsertData( aDataHelper, GetActiveWindow()->PixelToLogic( Rectangle( Point(), GetActiveWindow()->GetOutputSizePixel() ).Center() ), - nAction, sal_False, FORMAT_STRING); + nAction, false, FORMAT_STRING); } } @@ -842,7 +842,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) if( !mpDrawView->InsertData( aDataHelper, GetActiveWindow()->PixelToLogic( Rectangle( Point(), GetActiveWindow()->GetOutputSizePixel() ).Center() ), - nAction, sal_False, nFormat ) ) + nAction, false, nFormat ) ) { INetBookmark aINetBookmark( aEmptyStr, aEmptyStr ); @@ -873,7 +873,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) pOLV->PostKeyEvent(aKEvt); } } - else if ( mpDrawView->IsPresObjSelected(sal_False, sal_True, sal_False, sal_True) ) + else if ( mpDrawView->IsPresObjSelected(false, true, false, true) ) { ::sd::Window* pWindow = GetActiveWindow(); InfoBox(pWindow, SD_RESSTR(STR_ACTION_NOTPOSSIBLE) ).Execute(); @@ -941,7 +941,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) nSId == SID_SLIDE_MASTERPAGE) { // Is there a page with the AutoLayout "Title"? - sal_Bool bFound = sal_False; + bool bFound = false; sal_uInt16 i = 0; sal_uInt16 nCount = GetDoc()->GetSdPageCount(PK_STANDARD); @@ -951,12 +951,12 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) if (nSId == SID_TITLE_MASTERPAGE && pPage->GetAutoLayout() == AUTOLAYOUT_TITLE) { - bFound = sal_True; + bFound = true; SwitchPage((pPage->GetPageNum() - 1) / 2); } else if (nSId == SID_SLIDE_MASTERPAGE && pPage->GetAutoLayout() != AUTOLAYOUT_TITLE) { - bFound = sal_True; + bFound = true; SwitchPage((pPage->GetPageNum() - 1) / 2); } @@ -1045,7 +1045,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) const SfxItemSet* pReqArgs = rReq.GetArgs(); // Remember old ruler state - sal_Bool bOldHasRuler(HasRuler()); + bool bOldHasRuler(HasRuler()); if ( pReqArgs ) { @@ -1055,7 +1055,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) else SetRuler (!HasRuler()); // Did ruler state change? Tell that to SdOptions, too. - sal_Bool bHasRuler(HasRuler()); + bool bHasRuler(HasRuler()); if(bOldHasRuler != bHasRuler) { @@ -1119,7 +1119,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) case SID_SIZE_REAL: // BASIC { - mbZoomOnPage = sal_False; + mbZoomOnPage = false; SetZoom( 100 ); Rectangle aVisAreaWin = GetActiveWindow()->PixelToLogic( Rectangle( Point(0,0), GetActiveWindow()->GetOutputSizePixel()) ); @@ -1134,7 +1134,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) case SID_ZOOM_IN: // BASIC { - mbZoomOnPage = sal_False; + mbZoomOnPage = false; SetZoom( std::max( (long) ( GetActiveWindow()->GetZoom() / 2 ), (long) GetActiveWindow()->GetMinZoom() ) ); Rectangle aVisAreaWin = GetActiveWindow()->PixelToLogic( Rectangle( Point(0,0), GetActiveWindow()->GetOutputSizePixel()) ); @@ -1154,7 +1154,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) if (aVisAreaSize.Height()!=0 && aVisAreaSize.Width()!=0) { - mbZoomOnPage = sal_False; + mbZoomOnPage = false; SetZoomRect(aVisArea); Invalidate( SID_ZOOM_IN ); Invalidate( SID_ZOOM_OUT ); @@ -1169,7 +1169,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) // --> Is offered as object zoom in program case SID_SIZE_OPTIMAL: // BASIC { - mbZoomOnPage = sal_False; + mbZoomOnPage = false; if ( mpDrawView->AreObjectsMarked() ) { maMarkRect = mpDrawView->GetAllMarkedRect(); @@ -1199,7 +1199,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) // --> Is offered as optimal in program case SID_SIZE_ALL: // BASIC { - mbZoomOnPage = sal_False; + mbZoomOnPage = false; SdrPageView* pPageView = mpDrawView->GetSdrPageView(); if( pPageView ) @@ -1298,7 +1298,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) case SID_AUTOSPELL_CHECK: { - sal_Bool bOnlineSpell = !GetDoc()->GetOnlineSpell(); + bool bOnlineSpell = !GetDoc()->GetOnlineSpell(); GetDoc()->SetOnlineSpell(bOnlineSpell); ::Outliner* pOL = mpDrawView->GetTextEditOutliner(); @@ -1460,13 +1460,13 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) case SID_UNDO : { // moved implementation to BaseClass - ImpSidUndo(sal_True, rReq); + ImpSidUndo(true, rReq); } break; case SID_REDO : { // moved implementation to BaseClass - ImpSidRedo(sal_True, rReq); + ImpSidRedo(true, rReq); } break; @@ -1556,7 +1556,7 @@ void DrawViewShell::InsertURLField(const OUString& rURL, const OUString& rText, void DrawViewShell::InsertURLButton(const OUString& rURL, const OUString& rText, const OUString& rTarget, const Point* pPos) { - sal_Bool bNewObj = sal_True; + bool bNewObj = true; const OUString sTargetURL( ::URIHelper::SmartRel2Abs( INetURLObject( GetDocSh()->GetMedium()->GetBaseURL() ), rURL, URIHelper::GetMaybeFileHdl(), true, false, INetURLObject::WAS_ENCODED, @@ -1569,7 +1569,7 @@ void DrawViewShell::InsertURLButton(const OUString& rURL, const OUString& rText, // change first marked object if( (FmFormInventor == pMarkedObj->GetObjInventor() && pMarkedObj->GetObjIdentifier() == OBJ_FM_BUTTON) ) { - bNewObj = sal_False; + bNewObj = false; SdrUnoObj* pUnoCtrl = static_cast< SdrUnoObj* >( pMarkedObj ); @@ -1591,7 +1591,7 @@ void DrawViewShell::InsertURLButton(const OUString& rURL, const OUString& rText, else { // add url as interaction for first selected shape - bNewObj = sal_False; + bNewObj = false; SdAnimationInfo* pInfo = SdDrawDocument::GetShapeUserData(*pMarkedObj, true); pInfo->meClickAction = presentation::ClickAction_DOCUMENT; diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx index 421a50b6457a..ea10bdf6bb04 100644 --- a/sd/source/ui/view/drviewsf.cxx +++ b/sd/source/ui/view/drviewsf.cxx @@ -276,7 +276,7 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet ) SfxWhichIter aIter( rSet ); sal_uInt16 nWhich = aIter.FirstWhich(); - sal_Bool bAttr = sal_False; + bool bAttr = false; SfxAllItemSet aAllSet( *rSet.GetPool() ); while ( nWhich ) @@ -298,7 +298,7 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet ) rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_LEFT, true ) ); } - bAttr = sal_True; + bAttr = true; Invalidate(nSlotId); } @@ -315,7 +315,7 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet ) rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_CENTER, true ) ); } - bAttr = sal_True; + bAttr = true; Invalidate(nSlotId); } @@ -332,7 +332,7 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet ) rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_RIGHT, true ) ); } - bAttr = sal_True; + bAttr = true; Invalidate(nSlotId); } @@ -349,7 +349,7 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet ) rSet.Put( SfxBoolItem( SID_ATTR_PARA_ADJUST_BLOCK, true ) ); } - bAttr = sal_True; + bAttr = true; Invalidate(nSlotId); } @@ -361,7 +361,7 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet ) SvxLRSpaceItem aLRSpace = ( (const SvxLRSpaceItem&) aAttrs.Get( EE_PARA_LRSPACE ) ); aLRSpace.SetWhich(SID_ATTR_PARA_LRSPACE); rSet.Put(aLRSpace); - bAttr = sal_True; + bAttr = true; Invalidate(SID_ATTR_PARA_LRSPACE); } break; @@ -371,7 +371,7 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet ) mpDrawView->GetAttributes( aAttrs ); SvxLineSpacingItem aLineLR = ( (const SvxLineSpacingItem&) aAttrs.Get( EE_PARA_SBL ) ); rSet.Put(aLineLR); - bAttr = sal_True; + bAttr = true; Invalidate(SID_ATTR_PARA_LINESPACE); } break; @@ -382,7 +382,7 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet ) SvxULSpaceItem aULSP = ( (const SvxULSpaceItem&) aAttrs.Get( EE_PARA_ULSPACE ) ); aULSP.SetWhich(SID_ATTR_PARA_ULSPACE); rSet.Put(aULSP); - bAttr = sal_True; + bAttr = true; Invalidate(SID_ATTR_PARA_ULSPACE); } break; @@ -414,7 +414,7 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet ) case SID_SET_SUB_SCRIPT: case SID_SET_SUPER_SCRIPT: { - bAttr = sal_True; + bAttr = true; } break; @@ -424,7 +424,7 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet ) mpDrawView->GetAttributes( aAttrs ); if( aAttrs.GetItemState( EE_PARA_HYPHENATE ) >= SFX_ITEM_AVAILABLE ) { - sal_Bool bValue = ( (const SfxBoolItem&) aAttrs.Get( EE_PARA_HYPHENATE ) ).GetValue(); + bool bValue = ( (const SfxBoolItem&) aAttrs.Get( EE_PARA_HYPHENATE ) ).GetValue(); rSet.Put( SfxBoolItem( SID_HYPHENATION, bValue ) ); } } @@ -590,7 +590,7 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet ) } if ( nCount == 1 ) { - sal_Bool bBullets = sal_False; + bool bBullets = false; const SvxNumberFormat* pNumFmt = pNumRule->Get(nCurLevel); if ( pNumFmt ) { @@ -598,11 +598,11 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet ) { case SVX_NUM_CHAR_SPECIAL: case SVX_NUM_BITMAP: - bBullets = sal_True; + bBullets = true; break; default: - bBullets = sal_False; + bBullets = false; } rSet.Put(SfxUInt16Item(FN_BUL_NUM_RULE_INDEX,(sal_uInt16)0xFFFF)); @@ -635,7 +635,7 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet ) case FN_NUM_BULLET_ON: case FN_NUM_NUMBERING_ON: { - sal_Bool bEnable = sal_False; + bool bEnable = false; const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList(); const sal_uInt32 nMarkCount = rMarkList.GetMarkCount(); for (sal_uInt32 nIndex = 0; nIndex < nMarkCount; nIndex++) @@ -645,7 +645,7 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet ) { if (pTextObj->GetObjIdentifier() != OBJ_OLE2) { - bEnable = sal_True; + bEnable = true; break; } } @@ -766,9 +766,9 @@ OUString DrawViewShell::GetSelectionText(bool bCompleteWords) } -sal_Bool DrawViewShell::HasSelection(sal_Bool bText) const +bool DrawViewShell::HasSelection(bool bText) const { - sal_Bool bReturn = sal_False; + bool bReturn = false; if (bText) { @@ -776,12 +776,12 @@ sal_Bool DrawViewShell::HasSelection(sal_Bool bText) const if (pOlView && !pOlView->GetSelected().isEmpty()) { - bReturn = sal_True; + bReturn = true; } } else if (mpDrawView->GetMarkedObjectList().GetMarkCount() != 0) { - bReturn = sal_True; + bReturn = true; } return bReturn; diff --git a/sd/source/ui/view/drviewsg.cxx b/sd/source/ui/view/drviewsg.cxx index bb83db6737c8..fd6398a1ad3f 100644 --- a/sd/source/ui/view/drviewsg.cxx +++ b/sd/source/ui/view/drviewsg.cxx @@ -76,7 +76,7 @@ void DrawViewShell::ExecIMap( SfxRequest& rReq ) void DrawViewShell::GetIMapState( SfxItemSet& rSet ) { - sal_Bool bDisable = sal_True; + bool bDisable = true; if( GetViewFrame()->HasChildWindow( SvxIMapDlgChildWindow::GetChildWindowId() ) ) { @@ -92,7 +92,7 @@ void DrawViewShell::GetIMapState( SfxItemSet& rSet ) && pImageMapDialog!=NULL && ( pImageMapDialog->GetEditingObject() == (void*) pObj ) ) { - bDisable = sal_False; + bDisable = false; } } } @@ -107,7 +107,7 @@ void DrawViewShell::ExecOptionsBar( SfxRequest& rReq ) if(HasCurrentFunction(SID_PRESENTATION)) return; - sal_Bool bDefault = sal_False; + bool bDefault = false; sal_uInt16 nSlot = rReq.GetSlot(); SdOptions* pOptions = SD_MOD()->GetSdOptions(GetDoc()->GetDocumentType()); @@ -196,7 +196,7 @@ void DrawViewShell::ExecOptionsBar( SfxRequest& rReq ) break; default: - bDefault = sal_True; + bDefault = true; break; } diff --git a/sd/source/ui/view/drviewsh.cxx b/sd/source/ui/view/drviewsh.cxx index 8164a2897c55..c8e1e631ad35 100644 --- a/sd/source/ui/view/drviewsh.cxx +++ b/sd/source/ui/view/drviewsh.cxx @@ -43,9 +43,9 @@ namespace sd { -sal_Bool DrawViewShell::GotoBookmark(const OUString& rBookmark) +bool DrawViewShell::GotoBookmark(const OUString& rBookmark) { - sal_Bool bRet = sal_False; + bool bRet = false; ::sd::DrawDocShell* pDocSh = GetDocSh(); if( pDocSh ) { diff --git a/sd/source/ui/view/drviewsj.cxx b/sd/source/ui/view/drviewsj.cxx index a1bc9686f033..9b0717619ea3 100644 --- a/sd/source/ui/view/drviewsj.cxx +++ b/sd/source/ui/view/drviewsj.cxx @@ -198,7 +198,7 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet ) rSet.DisableItem( SID_CONNECTION_DLG ); else { - sal_Bool bDisable = sal_True; + bool bDisable = true; SfxItemSet aAttrSet( GetDoc()->GetPool() ); GetView()->GetAttributes( aAttrSet ); @@ -211,7 +211,7 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet ) long nVal3 = ( ( const SdrEdgeLine3DeltaItem& ) aAttrSet.Get( SDRATTR_EDGELINE3DELTA ) ).GetValue(); { if( nVal1 != 0 || nVal2 != 0 || nVal3 != 0 ) - bDisable = sal_False; + bDisable = false; } } if( bDisable ) @@ -309,16 +309,16 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet ) rSet.DisableItem( SID_MODIFY_FIELD ); { - sal_Bool bText = sal_False; - sal_Bool bLine = sal_False; - sal_Bool bGroup = sal_False; - sal_Bool bGraf = sal_False; - sal_Bool bDrawObj = sal_False; - sal_Bool b3dObj = sal_False; + bool bText = false; + bool bLine = false; + bool bGroup = false; + bool bGraf = false; + bool bDrawObj = false; + bool b3dObj = false; bool bTable = false; - sal_Bool bMeasureObj = sal_False; - sal_Bool bEdgeObj = sal_False; // Connector - sal_Bool bE3dCompoundObject = sal_False; + bool bMeasureObj = false; + bool bEdgeObj = false; // Connector + bool bE3dCompoundObject = false; for( sal_uLong i = 0; i < nMarkCount && !bText && i < 50; @@ -332,13 +332,13 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet ) { switch (nId) { - case OBJ_TEXT: bText = sal_True; break; + case OBJ_TEXT: bText = true; break; - case OBJ_LINE: bLine = sal_True; break; + case OBJ_LINE: bLine = true; break; - case OBJ_EDGE: bEdgeObj = sal_True; break; + case OBJ_EDGE: bEdgeObj = true; break; - case OBJ_MEASURE: bMeasureObj = sal_True; break; + case OBJ_MEASURE: bMeasureObj = true; break; case OBJ_RECT: case OBJ_CIRC: @@ -348,11 +348,11 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet ) case OBJ_PATHLINE: case OBJ_SECT: case OBJ_CARC: - case OBJ_CCUT: bDrawObj = sal_True; break; + case OBJ_CCUT: bDrawObj = true; break; - case OBJ_GRUP: bGroup = sal_True; break; + case OBJ_GRUP: bGroup = true; break; - case OBJ_GRAF: bGraf = sal_True; break; + case OBJ_GRAF: bGraf = true; break; case OBJ_TABLE: bTable = true; break; } @@ -360,9 +360,9 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet ) else if (nInv == E3dInventor) { if(pObj->ISA(E3dScene)) - b3dObj = sal_True; + b3dObj = true; else if(pObj->ISA(E3dCompoundObject)) - bE3dCompoundObject = sal_True; + bE3dCompoundObject = true; } } if( bLine && !bText && !bDrawObj &&!b3dObj) diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx index 855d91d5d1d7..3121d6478d5a 100644 --- a/sd/source/ui/view/frmview.cxx +++ b/sd/source/ui/view/frmview.cxx @@ -207,8 +207,8 @@ FrameView::FrameView(SdDrawDocument* pDrawDoc, FrameView* pFrameView /* = NULK * SetGridCoarse( Size( 1000, 1000 ) ); SetSnapGridWidth(Fraction(1000, 1), Fraction(1000, 1)); SetActiveLayer( SD_RESSTR(STR_LAYER_LAYOUT) ); - mbNoColors = sal_True; - mbNoAttribs = sal_False; + mbNoColors = true; + mbNoAttribs = false; maVisArea = Rectangle( Point(), Size(0, 0) ); mePageKind = PK_STANDARD; mePageKindOnLoad = PK_STANDARD; @@ -218,10 +218,10 @@ FrameView::FrameView(SdDrawDocument* pDrawDoc, FrameView* pFrameView /* = NULK * meNotesEditMode = EM_PAGE; meHandoutEditMode = EM_MASTERPAGE; SetViewShEditModeOnLoad(EM_PAGE); - mbLayerMode = sal_False; + mbLayerMode = false; SetEliminatePolyPoints(false); - mbDoubleClickTextEdit = sal_False; - mbClickChangeRotation = sal_False; + mbDoubleClickTextEdit = false; + mbClickChangeRotation = false; mnSlidesPerRow = 4; { @@ -234,15 +234,15 @@ FrameView::FrameView(SdDrawDocument* pDrawDoc, FrameView* pFrameView /* = NULK * SetViewShellTypeOnLoad (ViewShell::ST_IMPRESS); // get default for design mode - sal_Bool bInitDesignMode = pDrawDoc->GetOpenInDesignMode(); + bool bInitDesignMode = pDrawDoc->GetOpenInDesignMode(); if( pDrawDoc->OpenInDesignModeIsDefaulted() ) { - bInitDesignMode = sal_True; + bInitDesignMode = true; } SfxObjectShell* pObjShell = pDrawDoc->GetObjectShell(); if( pObjShell && pObjShell->IsReadOnly() ) - bInitDesignMode = sal_False; + bInitDesignMode = false; SetDesignMode( bInitDesignMode ); Update( SD_MOD()->GetSdOptions(pDrawDoc->GetDocumentType()) ); @@ -427,19 +427,19 @@ void FrameView::WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com: { std::vector< std::pair< OUString, Any > > aUserData; - aUserData.addValue( sUNO_View_GridIsVisible, makeAny( (sal_Bool)IsGridVisible() ) ); - aUserData.addValue( sUNO_View_GridIsFront, makeAny( (sal_Bool)IsGridFront() ) ); - aUserData.addValue( sUNO_View_IsSnapToGrid, makeAny( (sal_Bool)IsGridSnap() ) ); - aUserData.addValue( sUNO_View_IsSnapToPageMargins, makeAny( (sal_Bool)IsBordSnap() ) ); - aUserData.addValue( sUNO_View_IsSnapToSnapLines, makeAny( (sal_Bool)IsHlplSnap() ) ); - aUserData.addValue( sUNO_View_IsSnapToObjectFrame, makeAny( (sal_Bool)IsOFrmSnap() ) ); - aUserData.addValue( sUNO_View_IsSnapToObjectPoints, makeAny( (sal_Bool)IsOPntSnap() ) ); + aUserData.addValue( sUNO_View_GridIsVisible, makeAny( IsGridVisible() ) ); + aUserData.addValue( sUNO_View_GridIsFront, makeAny( IsGridFront() ) ); + aUserData.addValue( sUNO_View_IsSnapToGrid, makeAny( IsGridSnap() ) ); + aUserData.addValue( sUNO_View_IsSnapToPageMargins, makeAny( IsBordSnap() ) ); + aUserData.addValue( sUNO_View_IsSnapToSnapLines, makeAny( IsHlplSnap() ) ); + aUserData.addValue( sUNO_View_IsSnapToObjectFrame, makeAny( IsOFrmSnap() ) ); + aUserData.addValue( sUNO_View_IsSnapToObjectPoints, makeAny( IsOPntSnap() ) ); - aUserData.addValue( sUNO_View_IsPlusHandlesAlwaysVisible, makeAny( (sal_Bool)IsPlusHandlesAlwaysVisible() ) ); - aUserData.addValue( sUNO_View_IsFrameDragSingles, makeAny( (sal_Bool)IsFrameDragSingles() ) ); + aUserData.addValue( sUNO_View_IsPlusHandlesAlwaysVisible, makeAny( IsPlusHandlesAlwaysVisible() ) ); + aUserData.addValue( sUNO_View_IsFrameDragSingles, makeAny( IsFrameDragSingles() ) ); aUserData.addValue( sUNO_View_EliminatePolyPointLimitAngle, makeAny( (sal_Int32)GetEliminatePolyPointLimitAngle() ) ); - aUserData.addValue( sUNO_View_IsEliminatePolyPoints, makeAny( (sal_Bool)IsEliminatePolyPoints() ) ); + aUserData.addValue( sUNO_View_IsEliminatePolyPoints, makeAny( IsEliminatePolyPoints() ) ); Any aAny; GetVisibleLayers().QueryValue( aAny ); @@ -451,8 +451,8 @@ void FrameView::WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com: GetLockedLayers().QueryValue( aAny ); aUserData.addValue( sUNO_View_LockedLayers, aAny ); - aUserData.addValue( sUNO_View_NoAttribs, makeAny( (sal_Bool)IsNoAttribs() ) ); - aUserData.addValue( sUNO_View_NoColors, makeAny( (sal_Bool)IsNoColors() ) ); + aUserData.addValue( sUNO_View_NoAttribs, makeAny( IsNoAttribs() ) ); + aUserData.addValue( sUNO_View_NoColors, makeAny( IsNoColors() ) ); if( GetStandardHelpLines().GetCount() ) aUserData.addValue( sUNO_View_SnapLinesDrawing, makeAny( createHelpLinesString( GetStandardHelpLines() ) ) ); @@ -463,13 +463,13 @@ void FrameView::WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com: if( GetHandoutHelpLines().GetCount() ) aUserData.addValue( sUNO_View_SnapLinesHandout, makeAny( createHelpLinesString( GetHandoutHelpLines() ) ) ); - aUserData.addValue( sUNO_View_RulerIsVisible, makeAny( (sal_Bool)HasRuler() ) ); + aUserData.addValue( sUNO_View_RulerIsVisible, makeAny( HasRuler() ) ); aUserData.addValue( sUNO_View_PageKind, makeAny( (sal_Int16)GetPageKind() ) ); aUserData.addValue( sUNO_View_SelectedPage, makeAny( (sal_Int16)GetSelectedPage() ) ); - aUserData.addValue( sUNO_View_IsLayerMode, makeAny( (sal_Bool)IsLayerMode() ) ); + aUserData.addValue( sUNO_View_IsLayerMode, makeAny( IsLayerMode() ) ); - aUserData.addValue( sUNO_View_IsDoubleClickTextEdit, makeAny( (sal_Bool)IsDoubleClickTextEdit() ) ); - aUserData.addValue( sUNO_View_IsClickChangeRotation, makeAny( (sal_Bool)IsClickChangeRotation() ) ); + aUserData.addValue( sUNO_View_IsDoubleClickTextEdit, makeAny( IsDoubleClickTextEdit() ) ); + aUserData.addValue( sUNO_View_IsClickChangeRotation, makeAny( IsClickChangeRotation() ) ); aUserData.addValue( sUNO_View_SlidesPerRow, makeAny( (sal_Int16)GetSlidesPerRow() ) ); aUserData.addValue( sUNO_View_EditModeStandard, makeAny( (sal_Int32)GetViewShEditMode( PK_STANDARD ) ) ); @@ -493,7 +493,7 @@ void FrameView::WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com: aUserData.addValue( sUNO_View_GridSnapWidthXDenominator, makeAny( (sal_Int32)GetSnapGridWidthX().GetDenominator() ) ); aUserData.addValue( sUNO_View_GridSnapWidthYNumerator, makeAny( (sal_Int32)GetSnapGridWidthY().GetNumerator() ) ); aUserData.addValue( sUNO_View_GridSnapWidthYDenominator, makeAny( (sal_Int32)GetSnapGridWidthY().GetDenominator() ) ); - aUserData.addValue( sUNO_View_IsAngleSnapEnabled, makeAny( (sal_Bool)IsAngleSnapEnabled() ) ); + aUserData.addValue( sUNO_View_IsAngleSnapEnabled, makeAny( IsAngleSnapEnabled() ) ); aUserData.addValue( sUNO_View_SnapAngle, makeAny( (sal_Int32)GetSnapAngle() ) ); const sal_Int32 nOldLength = rValues.getLength(); @@ -580,7 +580,7 @@ void FrameView::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < : { const bool bImpress = dynamic_cast< SdDrawDocument* >(GetModel())->GetDocumentType() == DOCUMENT_TYPE_IMPRESS; - sal_Bool bBool = sal_False; + bool bBool = false; sal_Int32 nInt32 = 0; sal_Int16 nInt16 = 0; OUString aString; diff --git a/sd/source/ui/view/outlnvs2.cxx b/sd/source/ui/view/outlnvs2.cxx index 305b71cabd7e..9b88288176ad 100644 --- a/sd/source/ui/view/outlnvs2.cxx +++ b/sd/source/ui/view/outlnvs2.cxx @@ -573,10 +573,10 @@ void OutlineViewShell::FuTemporaryModify(SfxRequest &rReq) //pOLV->DeleteSelected(); <-- unfortunately missing! // select field, so it gets deleted on Insert ESelection aSel = pOutlinerView->GetSelection(); - sal_Bool bSel = sal_True; + bool bSel = true; if( aSel.nStartPos == aSel.nEndPos ) { - bSel = sal_False; + bSel = false; aSel.nEndPos++; } pOutlinerView->SetSelection( aSel ); diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index f8d61b0f7757..515e013dbe8a 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -132,7 +132,7 @@ TYPEINIT1( OutlineViewShell, ViewShell ); */ void OutlineViewShell::Construct(DrawDocShell* ) { - sal_Bool bModified = GetDoc()->IsChanged(); + bool bModified = GetDoc()->IsChanged(); meShellType = ST_OUTLINE; Size aSize(29700, 21000); @@ -459,7 +459,7 @@ void OutlineViewShell::FuSupport(SfxRequest &rReq) if( rReq.GetSlot() == SID_STYLE_FAMILY && rReq.GetArgs()) GetDocSh()->SetStyleFamily(((SfxUInt16Item&)rReq.GetArgs()->Get( SID_STYLE_FAMILY )).GetValue()); - sal_Bool bPreviewState = sal_False; + bool bPreviewState = false; sal_uLong nSlot = rReq.GetSlot(); boost::scoped_ptr< OutlineViewModelChangeGuard > aGuard; @@ -494,7 +494,7 @@ void OutlineViewShell::FuSupport(SfxRequest &rReq) pOlView->DoCut(); } rReq.Done(); - bPreviewState = sal_True; + bPreviewState = true; } break; @@ -509,7 +509,7 @@ void OutlineViewShell::FuSupport(SfxRequest &rReq) pOlView->DoCopy(); } rReq.Done(); - bPreviewState = sal_True; + bPreviewState = true; } break; @@ -526,7 +526,7 @@ void OutlineViewShell::FuSupport(SfxRequest &rReq) pOlView->DoPaste(); } rReq.Done(); - bPreviewState = sal_True; + bPreviewState = true; } break; @@ -546,7 +546,7 @@ void OutlineViewShell::FuSupport(SfxRequest &rReq) { pOlView->InsertData( aDataHelper, GetActiveWindow()->PixelToLogic( Rectangle( Point(), GetActiveWindow()->GetOutputSizePixel() ).Center() ), - nAction, sal_False, FORMAT_STRING); + nAction, false, FORMAT_STRING); } } @@ -573,7 +573,7 @@ void OutlineViewShell::FuSupport(SfxRequest &rReq) } } rReq.Done(); - bPreviewState = sal_True; + bPreviewState = true; } break; @@ -672,7 +672,7 @@ void OutlineViewShell::FuSupport(SfxRequest &rReq) } rReq.Done(); - bPreviewState = sal_True; + bPreviewState = true; } break; @@ -680,13 +680,13 @@ void OutlineViewShell::FuSupport(SfxRequest &rReq) case SID_UNDO : { OutlineViewPageChangesGuard aGuard2(pOlView); - ImpSidUndo(sal_False, rReq); + ImpSidUndo(false, rReq); } break; case SID_REDO : { OutlineViewPageChangesGuard aGuard2(pOlView); - ImpSidRedo(sal_False, rReq); + ImpSidRedo(false, rReq); } break; @@ -805,13 +805,13 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet ) if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_SELECTALL ) ) { sal_Int32 nParaCount = pOutl->GetParagraphCount(); - sal_Bool bDisable = nParaCount == 0; + bool bDisable = nParaCount == 0; if (!bDisable && nParaCount == 1) { OUString aTest = pOutl->GetText(pOutl->GetParagraph(0)); if (aTest.isEmpty()) { - bDisable = sal_True; + bDisable = true; } } if (bDisable) @@ -830,18 +830,18 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet ) { // Enable color view? sal_uLong nCntrl = pOutl->GetControlWord(); - sal_Bool bNoColor = sal_False; + bool bNoColor = false; if (nCntrl & EE_CNTRL_NOCOLORS) - bNoColor = sal_True; + bNoColor = true; rSet.Put( SfxBoolItem( SID_COLORVIEW, bNoColor ) ); } // Buttons of toolbar // first the selection dependent ones: COLLAPSE, EXPAND - sal_Bool bDisableCollapse = sal_True; - sal_Bool bDisableExpand = sal_True; - sal_Bool bUnique = sal_True; + bool bDisableCollapse = true; + bool bDisableExpand = true; + bool bUnique = true; OutlinerView* pOutlinerView = pOlView->GetViewByWindow(GetActiveWindow()); std::vector<Paragraph*> aSelList; @@ -863,14 +863,14 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet ) nDepth = pOutl->GetDepth( pOutl->GetAbsPos( pPara ) ); if( nDepth != nTmpDepth || bPage != pOutl->HasParaFlag( pPara, PARAFLAG_ISPAGE )) - bUnique = sal_False; + bUnique = false; if (pOutl->HasChildren(pPara)) { if (!pOutl->IsExpanded(pPara)) - bDisableExpand = sal_False; + bDisableExpand = false; else - bDisableCollapse = sal_False; + bDisableCollapse = false; } ++iter; @@ -889,7 +889,7 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet ) OUString aTest = ((SfxStringItem&)aSet.Get(SID_STATUS_LAYOUT)).GetValue(); if (aTest.isEmpty()) { - bUnique = sal_False; + bUnique = false; rSet.DisableItem(SID_PRESENTATION_TEMPLATES); } @@ -897,14 +897,14 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet ) rSet.DisableItem( SID_PRESENTATIONOBJECT ); // now the selection independent ones: COLLAPSE_ALL, EXPAND_ALL - sal_Bool bDisableCollapseAll = sal_True; - sal_Bool bDisableExpandAll = sal_True; + bool bDisableCollapseAll = true; + bool bDisableExpandAll = true; // does the selection contain something collapsable/expandable? if (!bDisableCollapse) - bDisableCollapseAll = sal_False; + bDisableCollapseAll = false; if (!bDisableExpand) - bDisableExpandAll = sal_False; + bDisableExpandAll = false; // otherwise look through all paragraphs if (bDisableCollapseAll || bDisableExpandAll) @@ -914,10 +914,10 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet ) while (pPara && (bDisableCollapseAll || bDisableExpandAll)) { if (!pOutl->IsExpanded(pPara) && pOutl->HasChildren(pPara)) - bDisableExpandAll = sal_False; + bDisableExpandAll = false; if (pOutl->IsExpanded(pPara) && pOutl->HasChildren(pPara)) - bDisableCollapseAll = sal_False; + bDisableCollapseAll = false; pPara = pOutl->GetParagraph( ++nParaPos ); } @@ -1000,7 +1000,7 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet ) if (SFX_ITEM_AVAILABLE == rSet.GetItemState(SID_EXPAND_PAGE)) { - sal_Bool bDisable = sal_True; + bool bDisable = true; sal_uInt16 i = 0; sal_uInt16 nCount = GetDoc()->GetSdPageCount(PK_STANDARD); pOlView->SetSelectedPages(); @@ -1047,7 +1047,7 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet ) if (SFX_ITEM_AVAILABLE == rSet.GetItemState(SID_SUMMARY_PAGE)) { - sal_Bool bDisable = sal_True; + bool bDisable = true; sal_uInt16 i = 0; sal_uInt16 nCount = GetDoc()->GetSdPageCount(PK_STANDARD); pOlView->SetSelectedPages(); @@ -1062,7 +1062,7 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet ) if (pObj && !pObj->IsEmptyPresObj()) { - bDisable = sal_False; + bDisable = false; } } @@ -1094,7 +1094,7 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet ) // is starting the presentation possible? if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_PRESENTATION ) ) { - sal_Bool bDisable = sal_True; + bool bDisable = true; sal_uInt16 nCount = GetDoc()->GetSdPageCount( PK_STANDARD ); for( sal_uInt16 i = 0; i < nCount && bDisable; i++ ) @@ -1102,7 +1102,7 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet ) SdPage* pPage = GetDoc()->GetSdPage(i, PK_STANDARD); if( !pPage->IsExcluded() ) - bDisable = sal_False; + bDisable = false; } if( bDisable || GetDocSh()->IsPreview()) { @@ -1170,7 +1170,7 @@ long OutlineViewShell::VirtVScrollHdl(ScrollBar* pVScroll) * PrepareClose, gets called when the Shell shall be destroyed. * Forwards the invocation to the View */ -bool OutlineViewShell::PrepareClose( sal_Bool bUI ) +bool OutlineViewShell::PrepareClose( bool bUI ) { if( !ViewShell::PrepareClose(bUI) ) return false; @@ -1301,9 +1301,9 @@ void OutlineViewShell::WriteFrameViewData() ::Outliner* pOutl = pOlView->GetOutliner(); sal_uLong nCntrl = pOutl->GetControlWord(); - sal_Bool bNoColor = sal_False; + bool bNoColor = false; if (nCntrl & EE_CNTRL_NOCOLORS) - bNoColor = sal_True; + bNoColor = true; mpFrameView->SetNoColors(bNoColor); mpFrameView->SetNoAttribs( pOutl->IsFlatMode() ); SdPage* pActualPage = pOlView->GetActualPage(); @@ -1457,9 +1457,9 @@ void OutlineViewShell::Command( const CommandEvent& rCEvt, ::sd::Window* pWin ) -sal_Bool OutlineViewShell::KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin) +bool OutlineViewShell::KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin) { - sal_Bool bReturn = sal_False; + bool bReturn = false; OutlineViewPageChangesGuard aGuard(pOlView); if (pWin == NULL && HasCurrentFunction()) @@ -1528,9 +1528,9 @@ OUString OutlineViewShell::GetSelectionText(bool bCompleteWords) /** * Is something selected? */ -sal_Bool OutlineViewShell::HasSelection(sal_Bool bText) const +bool OutlineViewShell::HasSelection(bool bText) const { - sal_Bool bReturn = sal_False; + bool bReturn = false; if (bText) { @@ -1538,7 +1538,7 @@ sal_Bool OutlineViewShell::HasSelection(sal_Bool bText) const if (pOutlinerView && !pOutlinerView->GetSelected().isEmpty()) { - bReturn = sal_True; + bReturn = true; } } @@ -1685,7 +1685,7 @@ SdPage* OutlineViewShell::GetActualPage() return pOlView->GetActualPage(); } -void OutlineViewShell::UpdatePreview( SdPage* pPage, sal_Bool ) +void OutlineViewShell::UpdatePreview( SdPage* pPage, bool ) { const bool bNewPage = pPage != pLastPage; pLastPage = pPage; @@ -1791,7 +1791,7 @@ bool OutlineViewShell::UpdateOutlineObject( SdPage* pPage, Paragraph* pPara ) OutlinerParaObject* pOPO = NULL; SdrTextObj* pTO = NULL; - sal_Bool bNewObject = sal_False; + bool bNewObject = false; sal_uInt16 eOutlinerMode = OUTLINERMODE_TITLEOBJECT; pTO = (SdrTextObj*)pPage->GetPresObj( PRESOBJ_TEXT ); @@ -1826,7 +1826,7 @@ bool OutlineViewShell::UpdateOutlineObject( SdPage* pPage, Paragraph* pPara ) if( !pTO ) { pTO = pOlView->CreateOutlineTextObject( pPage ); - bNewObject = sal_True; + bNewObject = true; } // page object, outline text in Outliner: @@ -1947,14 +1947,14 @@ sal_uLong OutlineViewShell::Read(SvStream& rInput, const OUString& rBaseURL, sal return( bRet ); } -void OutlineViewShell::WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& rSequence, sal_Bool bBrowse ) +void OutlineViewShell::WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& rSequence, bool bBrowse ) { WriteFrameViewData(); ViewShell::WriteUserDataSequence( rSequence, bBrowse ); } -void OutlineViewShell::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& rSequence, sal_Bool bBrowse ) +void OutlineViewShell::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& rSequence, bool bBrowse ) { WriteFrameViewData(); @@ -2032,8 +2032,8 @@ void OutlineViewShell::SetCurrentPage (SdPage* pPage) for (sal_uInt16 i=0; i<GetDoc()->GetSdPageCount(PK_STANDARD); i++) GetDoc()->SetSelected( GetDoc()->GetSdPage(i, PK_STANDARD), - sal_False); - GetDoc()->SetSelected (pPage, sal_True); + false); + GetDoc()->SetSelected (pPage, true); DrawController& rController(GetViewShellBase().GetDrawController()); rController.FireSelectionChangeListener(); diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx index 692a70e76554..4436bdd07003 100644 --- a/sd/source/ui/view/outlview.cxx +++ b/sd/source/ui/view/outlview.cxx @@ -90,20 +90,20 @@ TYPEINIT1( OutlineView, ::sd::View ); OutlineView::OutlineView( DrawDocShell& rDocSh, ::Window* pWindow, OutlineViewShell& rOutlineViewShell) : ::sd::View(*rDocSh.GetDoc(), pWindow, &rOutlineViewShell) , mrOutlineViewShell(rOutlineViewShell) -, mrOutliner(*mrDoc.GetOutliner(sal_True)) +, mrOutliner(*mrDoc.GetOutliner(true)) , mnPagesToProcess(0) , mnPagesProcessed(0) -, mbFirstPaint(sal_True) +, mbFirstPaint(true) , mpProgress(NULL) , maDocColor( COL_WHITE ) , maLRSpaceItem( 0, 0, 2000, 0, EE_PARA_OUTLLRSPACE ) { - sal_Bool bInitOutliner = sal_False; + bool bInitOutliner = false; if (mrOutliner.GetViewCount() == 0) { // initialize Outliner: set Reference Device - bInitOutliner = sal_True; + bInitOutliner = true; mrOutliner.Init( OUTLINERMODE_OUTLINEVIEW ); mrOutliner.SetRefDevice( SD_MOD()->GetRefDevice( rDocSh ) ); //viewsize without the width of the image and number in front @@ -225,7 +225,7 @@ void OutlineView::Paint(const Rectangle& rRect, ::sd::Window* pWin) pOlView->ShowCursor(mbFirstPaint); - mbFirstPaint = sal_False; + mbFirstPaint = false; } } @@ -242,8 +242,8 @@ void OutlineView::AdjustPosSizePixel(const Point &,const Size &,::sd::Window*) void OutlineView::AddWindowToPaintView(OutputDevice* pWin) { - sal_Bool bAdded = sal_False; - sal_Bool bValidArea = sal_False; + bool bAdded = false; + bool bValidArea = false; Rectangle aOutputArea; const Color aWhiteColor( COL_WHITE ); sal_uInt16 nView = 0; @@ -255,7 +255,7 @@ void OutlineView::AddWindowToPaintView(OutputDevice* pWin) mpOutlinerView[nView] = new OutlinerView(&mrOutliner, dynamic_cast< ::sd::Window* >(pWin)); mpOutlinerView[nView]->SetBackgroundColor( aWhiteColor ); mrOutliner.InsertView(mpOutlinerView[nView], EE_APPEND); - bAdded = sal_True; + bAdded = true; if (bValidArea) { @@ -265,7 +265,7 @@ void OutlineView::AddWindowToPaintView(OutputDevice* pWin) else if (!bValidArea) { aOutputArea = mpOutlinerView[nView]->GetOutputArea(); - bValidArea = sal_True; + bValidArea = true; } nView++; @@ -279,7 +279,7 @@ void OutlineView::AddWindowToPaintView(OutputDevice* pWin) void OutlineView::DeleteWindowFromPaintView(OutputDevice* pWin) { - sal_Bool bRemoved = sal_False; + bool bRemoved = false; sal_uInt16 nView = 0; ::Window* pWindow; @@ -294,7 +294,7 @@ void OutlineView::DeleteWindowFromPaintView(OutputDevice* pWin) mrOutliner.RemoveView( mpOutlinerView[nView] ); delete mpOutlinerView[nView]; mpOutlinerView[nView] = NULL; - bRemoved = sal_True; + bRemoved = true; } } @@ -467,11 +467,11 @@ SdPage* OutlineView::InsertSlideForParagraph( Paragraph* pPara ) if (eAutoLayout == AUTOLAYOUT_TITLE || eAutoLayout == AUTOLAYOUT_ONLY_TITLE) { - pPage->SetAutoLayout(AUTOLAYOUT_ENUM, sal_True); + pPage->SetAutoLayout(AUTOLAYOUT_ENUM, true); } else { - pPage->SetAutoLayout(pExample->GetAutoLayout(), sal_True); + pPage->SetAutoLayout(pExample->GetAutoLayout(), true); } /********************************************************************** @@ -500,7 +500,7 @@ SdPage* OutlineView::InsertSlideForParagraph( Paragraph* pPara ) pExample->GetLwrBorder() ); // create presentation objects - pNotesPage->SetAutoLayout(pExample->GetAutoLayout(), sal_True); + pNotesPage->SetAutoLayout(pExample->GetAutoLayout(), true); mrOutliner.UpdateFields(); @@ -928,7 +928,7 @@ IMPL_LINK( OutlineView, EndMovingHdl, ::Outliner *, pOutliner ) while (nPageCount) { SdPage* pPage = mrDoc.GetSdPage(nPosNewOrder, PK_STANDARD); - pPage->SetSelected(sal_False); + pPage->SetSelected(false); nPosNewOrder++; nPageCount--; } @@ -1048,7 +1048,7 @@ sal_uLong OutlineView::GetPaperWidth() } /** updates draw model with all changes from outliner model */ -sal_Bool OutlineView::PrepareClose(sal_Bool) +bool OutlineView::PrepareClose(bool) { ::sd::UndoManager* pDocUndoMgr = dynamic_cast<sd::UndoManager*>(mpDocSh->GetUndoManager()); if (pDocUndoMgr != NULL) @@ -1059,23 +1059,23 @@ sal_Bool OutlineView::PrepareClose(sal_Bool) BegUndo(SD_RESSTR(STR_UNDO_CHANGE_TITLE_AND_LAYOUT)); UpdateDocument(); EndUndo(); - mrDoc.SetSelected(GetActualPage(), sal_True); - return sal_True; + mrDoc.SetSelected(GetActualPage(), true); + return true; } /** * Set attributes of the selected text */ -sal_Bool OutlineView::SetAttributes(const SfxItemSet& rSet, sal_Bool ) +bool OutlineView::SetAttributes(const SfxItemSet& rSet, bool ) { - sal_Bool bOk = sal_False; + bool bOk = false; OutlinerView* pOlView = GetViewByWindow(mrOutlineViewShell.GetActiveWindow()); if (pOlView) { pOlView->SetAttribs(rSet); - bOk = sal_True; + bOk = true; } mrOutlineViewShell.Invalidate (SID_PREVIEW_STATE); @@ -1086,14 +1086,14 @@ sal_Bool OutlineView::SetAttributes(const SfxItemSet& rSet, sal_Bool ) /** * Get attributes of the selected text */ -sal_Bool OutlineView::GetAttributes( SfxItemSet& rTargetSet, sal_Bool ) const +bool OutlineView::GetAttributes( SfxItemSet& rTargetSet, bool ) const { OutlinerView* pOlView = GetViewByWindow( mrOutlineViewShell.GetActiveWindow()); DBG_ASSERT(pOlView, "keine OutlinerView gefunden"); rTargetSet.Put( pOlView->GetAttribs(), false ); - return sal_True; + return true; } /** creates outliner model from draw model */ @@ -1120,7 +1120,7 @@ void OutlineView::FillOutliner() OutlinerParaObject* pOPO = pTO->GetOutlinerParaObject(); if (pOPO) { - sal_Bool bVertical = pOPO->IsVertical(); + bool bVertical = pOPO->IsVertical(); pOPO->SetVertical( false ); mrOutliner.AddText(*pOPO); pOPO->SetVertical( bVertical ); @@ -1163,7 +1163,7 @@ void OutlineView::FillOutliner() if (pOPO) { sal_Int32 nParaCount1 = mrOutliner.GetParagraphCount(); - sal_Bool bVertical = pOPO->IsVertical(); + bool bVertical = pOPO->IsVertical(); pOPO->SetVertical( false ); mrOutliner.AddText(*pOPO); pOPO->SetVertical( bVertical ); @@ -1550,7 +1550,7 @@ void OutlineView::UpdateDocument() for (nPage = 0; nPage < nPageCount; nPage++) { SdPage* pPage = mrDoc.GetSdPage( (sal_uInt16)nPage, PK_STANDARD); - mrDoc.SetSelected(pPage, sal_False); + mrDoc.SetSelected(pPage, false); mrOutlineViewShell.UpdateTitleObject( pPage, pPara ); mrOutlineViewShell.UpdateOutlineObject( pPage, pPara ); @@ -1563,7 +1563,7 @@ void OutlineView::UpdateDocument() while( pPara ) { SdPage* pPage = InsertSlideForParagraph( pPara ); - mrDoc.SetSelected(pPage, sal_False); + mrDoc.SetSelected(pPage, false); mrOutlineViewShell.UpdateTitleObject( pPage, pPara ); mrOutlineViewShell.UpdateOutlineObject( pPage, pPara ); diff --git a/sd/source/ui/view/presvish.cxx b/sd/source/ui/view/presvish.cxx index b81af442b771..b9e01ef458c9 100644 --- a/sd/source/ui/view/presvish.cxx +++ b/sd/source/ui/view/presvish.cxx @@ -110,7 +110,7 @@ void PresentationViewShell::FinishInitialization( FrameView* pFrameView ) } -SvxRuler* PresentationViewShell::CreateHRuler(::sd::Window*, sal_Bool) +SvxRuler* PresentationViewShell::CreateHRuler(::sd::Window*, bool) { return NULL; } diff --git a/sd/source/ui/view/sdruler.cxx b/sd/source/ui/view/sdruler.cxx index 3a7ebd3b9ea2..e39bf32d3847 100644 --- a/sd/source/ui/view/sdruler.cxx +++ b/sd/source/ui/view/sdruler.cxx @@ -84,12 +84,12 @@ Ruler::Ruler( DrawViewShell& rViewSh, ::Window* pParent, ::sd::Window* pWin, sal if ( nWinStyle & WB_HSCROLL ) { - bHorz = sal_True; + bHorz = true; SetHelpId( HID_SD_RULER_HORIZONTAL ); } else { - bHorz = sal_False; + bHorz = false; SetHelpId( HID_SD_RULER_VERTICAL ); } } diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx index 4a7f344aa813..53e48a550ee3 100644 --- a/sd/source/ui/view/sdview.cxx +++ b/sd/source/ui/view/sdview.cxx @@ -160,7 +160,7 @@ View::~View() maSmartTags.Dispose(); // release content of selection clipboard, if we own the content - UpdateSelectionClipboard( sal_True ); + UpdateSelectionClipboard( true ); maDropErrorTimer.Stop(); maDropInsertFileTimer.Stop(); @@ -527,14 +527,14 @@ void View::MarkListHasChanged() } -sal_Bool View::SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll) +bool View::SetAttributes(const SfxItemSet& rSet, bool bReplaceAll) { - sal_Bool bOk = FmFormView::SetAttributes(rSet, bReplaceAll); + bool bOk = FmFormView::SetAttributes(rSet, bReplaceAll); return (bOk); } -sal_Bool View::GetAttributes( SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr ) const +bool View::GetAttributes( SfxItemSet& rTargetSet, bool bOnlyHardAttr ) const { return( FmFormView::GetAttributes( rTargetSet, bOnlyHardAttr ) ); } @@ -543,7 +543,7 @@ sal_Bool View::GetAttributes( SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr ) c /** * Is a presentation object selected? */ -sal_Bool View::IsPresObjSelected(sal_Bool bOnPage, sal_Bool bOnMasterPage, sal_Bool bCheckPresObjListOnly, sal_Bool bCheckLayoutOnly) const +bool View::IsPresObjSelected(bool bOnPage, bool bOnMasterPage, bool bCheckPresObjListOnly, bool bCheckLayoutOnly) const { SdrMarkList* pMarkList; @@ -565,8 +565,8 @@ sal_Bool View::IsPresObjSelected(sal_Bool bOnPage, sal_Bool bOnMasterPage, sal_B SdPage* pPage; SdrObject* pObj; - sal_Bool bSelected = sal_False; - sal_Bool bMasterPage = sal_False; + bool bSelected = false; + bool bMasterPage = false; long nMark; long nMarkMax = long(pMarkList->GetMarkCount()) - 1; @@ -590,11 +590,11 @@ sal_Bool View::IsPresObjSelected(sal_Bool bOnPage, sal_Bool bOnMasterPage, sal_B PresObjKind eKind = pPage->GetPresObjKind(pObj); if((eKind != PRESOBJ_FOOTER) && (eKind != PRESOBJ_HEADER) && (eKind != PRESOBJ_DATETIME) && (eKind != PRESOBJ_SLIDENUMBER) ) - bSelected = sal_True; + bSelected = true; } else { - bSelected = sal_True; + bSelected = true; } } } @@ -633,7 +633,7 @@ void View::ModelHasChanged() } -sal_Bool View::SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr) +bool View::SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr) { // forward to SdrView return FmFormView::SetStyleSheet(pStyleSheet, bDontRemoveHardAttr); @@ -645,7 +645,7 @@ sal_Bool View::SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHar */ static void SetSpellOptions( const SdDrawDocument& rDoc, sal_uLong& rCntrl ) { - sal_Bool bOnlineSpell = rDoc.GetOnlineSpell(); + bool bOnlineSpell = rDoc.GetOnlineSpell(); if( bOnlineSpell ) rCntrl |= EE_CNTRL_ONLINESPELLING; @@ -695,7 +695,7 @@ bool View::SdrBeginTextEdit( pOutl->SetDefaultLanguage( Application::GetSettings().GetLanguageTag().getLanguageType() ); } - sal_Bool bReturn = FmFormView::SdrBeginTextEdit( + bool bReturn = FmFormView::SdrBeginTextEdit( pObj, pPV, pWin, bIsNewObj, pOutl, pGivenOutlinerView, bDontDeleteOutliner, bOnlyOneView, bGrabFocus); @@ -739,7 +739,7 @@ SdrEndTextEditKind View::SdrEndTextEdit(bool bDontDeleteReally ) { SdrObjectWeakRef xObj( GetTextEditObject() ); - sal_Bool bDefaultTextRestored = RestoreDefaultText( dynamic_cast< SdrTextObj* >( GetTextEditObject() ) ); + bool bDefaultTextRestored = RestoreDefaultText( dynamic_cast< SdrTextObj* >( GetTextEditObject() ) ); SdrEndTextEditKind eKind = FmFormView::SdrEndTextEdit(bDontDeleteReally); @@ -823,7 +823,7 @@ void View::SetMarkedOriginalSize() { SdrUndoGroup* pUndoGroup = new SdrUndoGroup(mrDoc); sal_uLong nCount = GetMarkedObjectCount(); - sal_Bool bOK = sal_False; + bool bOK = false; for( sal_uInt32 i = 0; i < nCount; i++ ) { @@ -845,7 +845,7 @@ void View::SetMarkedOriginalSize() { MapMode aMap100( MAP_100TH_MM ); aOleSize = ((SdrOle2Obj*)pObj)->GetOrigObjSize( &aMap100 ); - bOK = sal_True; + bOK = true; } else { @@ -854,7 +854,7 @@ void View::SetMarkedOriginalSize() { awt::Size aSz = xObj->getVisualAreaSize( nAspect ); aOleSize = OutputDevice::LogicToLogic( Size( aSz.Width, aSz.Height ), aUnit, MAP_100TH_MM ); - bOK = sal_True; + bOK = true; } catch( embed::NoVisualAreaSizeException& ) {} @@ -889,7 +889,7 @@ void View::SetMarkedOriginalSize() aRect.SetSize( aSize ); pObj->SetLogicRect( aRect ); - bOK = sal_True; + bOK = true; } } } @@ -943,10 +943,10 @@ void View::DoConnect(SdrOle2Obj* pObj) } } -sal_Bool View::IsMorphingAllowed() const +bool View::IsMorphingAllowed() const { const SdrMarkList& rMarkList = GetMarkedObjectList(); - sal_Bool bRet = sal_False; + bool bRet = false; if ( rMarkList.GetMarkCount() == 2 ) { @@ -982,17 +982,17 @@ sal_Bool View::IsMorphingAllowed() const if( ( eFillStyle1 == XFILL_NONE || eFillStyle1 == XFILL_SOLID ) && ( eFillStyle2 == XFILL_NONE || eFillStyle2 == XFILL_SOLID ) ) - bRet = sal_True; + bRet = true; } } return bRet; } -sal_Bool View::IsVectorizeAllowed() const +bool View::IsVectorizeAllowed() const { const SdrMarkList& rMarkList = GetMarkedObjectList(); - sal_Bool bRet = sal_False; + bool bRet = false; if( rMarkList.GetMarkCount() == 1 ) { @@ -1002,7 +1002,7 @@ sal_Bool View::IsVectorizeAllowed() const { if(GRAPHIC_BITMAP == pObj->GetGraphicType() && !pObj->isEmbeddedSvg()) { - bRet = sal_True; + bRet = true; } } } @@ -1161,7 +1161,7 @@ bool View::MarkPoint(SdrHdl& rHdl, bool bUnmark ) return FmFormView::MarkPoint( rHdl, bUnmark ); } -sal_Bool View::MarkPoints(const Rectangle* pRect, sal_Bool bUnmark) +bool View::MarkPoints(const Rectangle* pRect, bool bUnmark) { if( maSmartTags.MarkPoints( pRect, bUnmark ) ) return true; @@ -1246,7 +1246,7 @@ bool View::ShouldToggleOn( if (!pSdrModel) return false; - sal_Bool bToggleOn = sal_False; + bool bToggleOn = false; SdrOutliner* pOutliner = SdrMakeOutliner(OUTLINERMODE_TEXTOBJECT, pSdrModel); sal_uInt32 nMarkCount = GetMarkedObjectCount(); for (sal_uInt32 nIndex = 0; nIndex < nMarkCount && !bToggleOn; nIndex++) diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx index 8300a2415fec..8b7eae3cd50e 100644 --- a/sd/source/ui/view/sdview2.cxx +++ b/sd/source/ui/view/sdview2.cxx @@ -101,7 +101,7 @@ struct SdNavigatorDropEvent : public ExecuteDropEvent { // since SdTransferable::CopyToClipboard is called, this // dynamically created object ist destroyed automatically - SdTransferable* pTransferable = new SdTransferable( &mrDoc, NULL, sal_False ); + SdTransferable* pTransferable = new SdTransferable( &mrDoc, NULL, false ); ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > xRet( pTransferable ); SD_MOD()->pTransferClip = pTransferable; @@ -166,7 +166,7 @@ struct SdNavigatorDropEvent : public ExecuteDropEvent ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > View::CreateDragDataObject( View* pWorkView, ::Window& rWindow, const Point& rDragPos ) { - SdTransferable* pTransferable = new SdTransferable( &mrDoc, pWorkView, sal_False ); + SdTransferable* pTransferable = new SdTransferable( &mrDoc, pWorkView, false ); ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > xRet( pTransferable ); SD_MOD()->pTransferDrag = pTransferable; @@ -217,7 +217,7 @@ struct SdNavigatorDropEvent : public ExecuteDropEvent ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > View::CreateSelectionDataObject( View* pWorkView, ::Window& rWindow ) { - SdTransferable* pTransferable = new SdTransferable( &mrDoc, pWorkView, sal_True ); + SdTransferable* pTransferable = new SdTransferable( &mrDoc, pWorkView, true ); ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > xRet( pTransferable ); TransferableObjectDescriptor aObjDesc; const Rectangle aMarkRect( GetAllMarkedRect() ); @@ -242,7 +242,7 @@ struct SdNavigatorDropEvent : public ExecuteDropEvent -void View::UpdateSelectionClipboard( sal_Bool bForceDeselect ) +void View::UpdateSelectionClipboard( bool bForceDeselect ) { if( mpViewSh && mpViewSh->GetActiveWindow() ) { @@ -315,7 +315,7 @@ void View::DoPaste (::Window* pWindow) // remove all hard linebreaks from the title if( pOutliner && pOutliner->GetParagraphCount() > 1 ) { - sal_Bool bOldUpdateMode = pOutliner->GetUpdateMode(); + bool bOldUpdateMode = pOutliner->GetUpdateMode(); pOutliner->SetUpdateMode( false ); @@ -353,7 +353,7 @@ void View::DoPaste (::Window* pWindow) if (pDrViewSh != NULL) { - if( !InsertData( aDataHelper, aPos, nDnDAction, sal_False ) ) + if( !InsertData( aDataHelper, aPos, nDnDAction, false ) ) { INetBookmark aINetBookmark( aEmptyStr, aEmptyStr ); @@ -459,7 +459,7 @@ void View::DragFinished( sal_Int8 nDropAction ) } if( pDragTransferable ) - pDragTransferable->SetInternalMove( sal_False ); + pDragTransferable->SetInternalMove( false ); if( bUndo ) EndUndo(); @@ -487,7 +487,7 @@ sal_Int8 View::AcceptDrop( const AcceptDropEvent& rEvt, DropTargetHelper& rTarge if( mbIsDropAllowed && !pPV->IsLayerLocked( aLayerName ) && pPV->IsLayerVisible( aLayerName ) ) { const OutlinerView* pOLV = GetTextEditOutlinerView(); - sal_Bool bIsInsideOutlinerView = sal_False; + bool bIsInsideOutlinerView = false; if( pOLV ) { @@ -502,7 +502,7 @@ sal_Int8 View::AcceptDrop( const AcceptDropEvent& rEvt, DropTargetHelper& rTarge if( aRect.IsInside( pOLV->GetWindow()->PixelToLogic( rEvt.maPosPixel ) ) ) { - bIsInsideOutlinerView = sal_True; + bIsInsideOutlinerView = true; } } @@ -535,12 +535,12 @@ sal_Int8 View::AcceptDrop( const AcceptDropEvent& rEvt, DropTargetHelper& rTarge } else { - const sal_Bool bDrawing = rTargetHelper.IsDropFormatSupported( SOT_FORMATSTR_ID_DRAWING ); - const sal_Bool bGraphic = rTargetHelper.IsDropFormatSupported( SOT_FORMATSTR_ID_SVXB ); - const sal_Bool bMtf = rTargetHelper.IsDropFormatSupported( FORMAT_GDIMETAFILE ); - const sal_Bool bBitmap = rTargetHelper.IsDropFormatSupported( FORMAT_BITMAP ); - sal_Bool bBookmark = rTargetHelper.IsDropFormatSupported( SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK ); - sal_Bool bXFillExchange = rTargetHelper.IsDropFormatSupported( SOT_FORMATSTR_ID_XFA ); + const bool bDrawing = rTargetHelper.IsDropFormatSupported( SOT_FORMATSTR_ID_DRAWING ); + const bool bGraphic = rTargetHelper.IsDropFormatSupported( SOT_FORMATSTR_ID_SVXB ); + const bool bMtf = rTargetHelper.IsDropFormatSupported( FORMAT_GDIMETAFILE ); + const bool bBitmap = rTargetHelper.IsDropFormatSupported( FORMAT_BITMAP ); + bool bBookmark = rTargetHelper.IsDropFormatSupported( SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK ); + bool bXFillExchange = rTargetHelper.IsDropFormatSupported( SOT_FORMATSTR_ID_XFA ); // check handle insert if( !nRet && ( (bXFillExchange && ( SDRDRAG_GRADIENT == GetDragMode() )) || ( SDRDRAG_TRANSPARENCE == GetDragMode() ) ) ) @@ -573,8 +573,8 @@ sal_Int8 View::AcceptDrop( const AcceptDropEvent& rEvt, DropTargetHelper& rTarge SdrPageView* pPageView = NULL; ::sd::Window* pWindow = mpViewSh->GetActiveWindow(); Point aPos( pWindow->PixelToLogic( rEvt.maPosPixel ) ); - const sal_Bool bHasPickObj = PickObj( aPos, getHitTolLog(), pPickObj, pPageView ); - sal_Bool bIsPresTarget = sal_False; + const bool bHasPickObj = PickObj( aPos, getHitTolLog(), pPickObj, pPageView ); + bool bIsPresTarget = false; if( bHasPickObj && pPickObj && ( pPickObj->IsEmptyPresObj() || pPickObj->GetUserCall() ) ) { @@ -601,18 +601,18 @@ sal_Int8 View::AcceptDrop( const AcceptDropEvent& rEvt, DropTargetHelper& rTarge nRet = nDropAction; } else - bXFillExchange = sal_False; + bXFillExchange = false; } // check normal insert if( !nRet ) { - const sal_Bool bSBAFormat = rTargetHelper.IsDropFormatSupported( SOT_FORMATSTR_ID_SVX_FORMFIELDEXCH ); - const sal_Bool bEditEngine = rTargetHelper.IsDropFormatSupported( SOT_FORMATSTR_ID_EDITENGINE ); - const sal_Bool bString = rTargetHelper.IsDropFormatSupported( FORMAT_STRING ); - const sal_Bool bRTF = rTargetHelper.IsDropFormatSupported( FORMAT_RTF ); - const sal_Bool bFile = rTargetHelper.IsDropFormatSupported( FORMAT_FILE ); - const sal_Bool bFileList = rTargetHelper.IsDropFormatSupported( FORMAT_FILE_LIST ); + const bool bSBAFormat = rTargetHelper.IsDropFormatSupported( SOT_FORMATSTR_ID_SVX_FORMFIELDEXCH ); + const bool bEditEngine = rTargetHelper.IsDropFormatSupported( SOT_FORMATSTR_ID_EDITENGINE ); + const bool bString = rTargetHelper.IsDropFormatSupported( FORMAT_STRING ); + const bool bRTF = rTargetHelper.IsDropFormatSupported( FORMAT_RTF ); + const bool bFile = rTargetHelper.IsDropFormatSupported( FORMAT_FILE ); + const bool bFileList = rTargetHelper.IsDropFormatSupported( FORMAT_FILE_LIST ); if( mpDropMarker ) { @@ -621,7 +621,7 @@ sal_Int8 View::AcceptDrop( const AcceptDropEvent& rEvt, DropTargetHelper& rTarge } if( bBookmark && bFile && ( nDropAction & DND_ACTION_MOVE ) && mpViewSh && SlideShow::IsRunning(mpViewSh->GetViewShellBase()) ) - bBookmark = sal_False; + bBookmark = false; if( bDrawing || bGraphic || bMtf || bBitmap || bBookmark || bFile || bFileList || bXFillExchange || bSBAFormat || bEditEngine || bString || bRTF ) nRet = nDropAction; @@ -669,7 +669,7 @@ sal_Int8 View::ExecuteDrop( const ExecuteDropEvent& rEvt, DropTargetHelper& rTar if( !pPV->IsLayerLocked( aActiveLayer ) ) { const OutlinerView* pOLV = GetTextEditOutlinerView(); - sal_Bool bIsInsideOutlinerView = sal_False; + bool bIsInsideOutlinerView = false; if( pOLV ) { @@ -686,7 +686,7 @@ sal_Int8 View::ExecuteDrop( const ExecuteDropEvent& rEvt, DropTargetHelper& rTar if( aRect.IsInside( aPos ) ) { - bIsInsideOutlinerView = sal_True; + bIsInsideOutlinerView = true; } } @@ -728,7 +728,7 @@ sal_Int8 View::ExecuteDrop( const ExecuteDropEvent& rEvt, DropTargetHelper& rTar } // standard insert? - if( !nRet && InsertData( aDataHelper, aPos, nDropAction, sal_True, 0, nPage, nLayer ) ) + if( !nRet && InsertData( aDataHelper, aPos, nDropAction, true, 0, nPage, nLayer ) ) nRet = nDropAction; // special insert? @@ -763,7 +763,7 @@ sal_Int8 View::ExecuteDrop( const ExecuteDropEvent& rEvt, DropTargetHelper& rTar // insert as clip action => jump OUString aBookmark( aINetBookmark.GetURL() ); SdAnimationInfo* pInfo = mrDoc.GetAnimationInfo( pPickObj ); - sal_Bool bCreated = sal_False; + bool bCreated = false; if( !aBookmark.isEmpty() ) { @@ -785,7 +785,7 @@ sal_Int8 View::ExecuteDrop( const ExecuteDropEvent& rEvt, DropTargetHelper& rTar if( !pInfo ) { pInfo = SdDrawDocument::GetShapeUserData( *pPickObj, true ); - bCreated = sal_True; + bCreated = true; } // create undo action with old and new sizes @@ -871,9 +871,9 @@ IMPL_LINK( View, ExecuteNavigatorDrop, SdNavigatorDropEvent*, pSdNavigatorDropEv /* In order t ensure unique page names, we test the ones we want to insert. If necessary. we put them into and replacement list (bNameOK == sal_False -> User canceled). */ - sal_Bool bLink = ( NAVIGATOR_DRAGTYPE_LINK == pPageObjsTransferable->GetDragType() ? sal_True : sal_False ); - sal_Bool bNameOK = GetExchangeList( aExchangeList, aBookmarkList, 2 ); - sal_Bool bReplace = sal_False; + bool bLink = ( NAVIGATOR_DRAGTYPE_LINK == pPageObjsTransferable->GetDragType() ? sal_True : sal_False ); + bool bNameOK = GetExchangeList( aExchangeList, aBookmarkList, 2 ); + bool bReplace = false; /* Since we don't know the type (page or object), we fill a list with pages and objects. @@ -882,9 +882,9 @@ IMPL_LINK( View, ExecuteNavigatorDrop, SdNavigatorDropEvent*, pSdNavigatorDropEv if( bNameOK ) { mrDoc.InsertBookmark( aBookmarkList, aExchangeList, - bLink, bReplace, nPgPos, sal_False, + bLink, bReplace, nPgPos, false, &pPageObjsTransferable->GetDocShell(), - sal_True, &aPos ); + true, &aPos ); } } @@ -959,9 +959,9 @@ typedef std::vector< SdrObject* > SdrObjectVector; void ImplProcessObjectList(SdrObject* pObj, SdrObjectVector& rVector ) { - sal_Bool bIsGroup(pObj->IsGroupObject()); + bool bIsGroup(pObj->IsGroupObject()); if(bIsGroup && pObj->ISA(E3dObject) && !pObj->ISA(E3dScene)) - bIsGroup = sal_False; + bIsGroup = false; rVector.push_back( pObj ); diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx index f588d9f32180..cd95616977a3 100644 --- a/sd/source/ui/view/sdview3.cxx +++ b/sd/source/ui/view/sdview3.cxx @@ -254,8 +254,8 @@ bool View::InsertMetaFile( TransferableDataHelper& rDataHelper, const Point& rPo return true; } -sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper, - const Point& rPos, sal_Int8& rDnDAction, sal_Bool bDrag, +bool View::InsertData( const TransferableDataHelper& rDataHelper, + const Point& rPos, sal_Int8& rDnDAction, bool bDrag, sal_uLong nFormat, sal_uInt16 nPage, sal_uInt16 nLayer ) { maDropPos = rPos; @@ -267,8 +267,8 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper, SdPage* pPage = NULL; ImageMap* pImageMap = NULL; bool bReturn = false; - sal_Bool bLink = ( ( mnAction & DND_ACTION_LINK ) != 0 ); - sal_Bool bCopy = ( ( ( mnAction & DND_ACTION_COPY ) != 0 ) || bLink ); + bool bLink = ( ( mnAction & DND_ACTION_LINK ) != 0 ); + bool bCopy = ( ( ( mnAction & DND_ACTION_COPY ) != 0 ) || bLink ); sal_uLong nPasteOptions = SDRINSERT_SETDEFLAYER; if (mpViewSh != NULL) @@ -377,7 +377,7 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper, if( !pPV->IsLayerLocked( aLayer ) ) { - pOwnData->SetInternalMove( sal_True ); + pOwnData->SetInternalMove( true ); SortMarkedObjects(); for( sal_uLong nM = 0; nM < GetMarkedObjectCount(); nM++ ) @@ -405,12 +405,12 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper, else { SdrPageView* pPV = GetSdrPageView(); - sal_Bool bDropOnTabBar = sal_True; + bool bDropOnTabBar = true; if( !pPage && pPV->GetPage()->GetPageNum() != mnDragSrcPgNum ) { pPage = (SdPage*) pPV->GetPage(); - bDropOnTabBar = sal_False; + bDropOnTabBar = false; } if( pPage ) @@ -586,7 +586,7 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper, } else { - pOwnData->SetInternalMove( sal_True ); + pOwnData->SetInternalMove( true ); MoveAllMarked( Size( maDropPos.X() - pOwnData->GetStartPos().X(), maDropPos.Y() - pOwnData->GetStartPos().Y() ), bCopy ); bReturn = true; @@ -611,7 +611,7 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper, sal_Int32 nPos = aLayout.indexOf(SD_LT_SEPARATOR); if (nPos != -1) aLayout = aLayout.copy(0, nPos); - pPage->SetPresentationLayout( aLayout, sal_False, sal_False ); + pPage->SetPresentationLayout( aLayout, false, false ); pSourceDoc->CreatingDataObj( NULL ); } else @@ -652,7 +652,7 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper, sal_Int32 nPos = aLayout.indexOf(SD_LT_SEPARATOR); if (nPos != -1) aLayout = aLayout.copy(0, nPos); - pPage->SetPresentationLayout( aLayout, sal_False, sal_False ); + pPage->SetPresentationLayout( aLayout, false, false ); } } @@ -662,7 +662,7 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper, if( aDataHelper.GetSotStorageStream( SOT_FORMATSTR_ID_DRAWING, xStm ) ) { - sal_Bool bChanged = sal_False; + bool bChanged = false; DrawDocShellRef xShell = new DrawDocShell(SFX_CREATE_MODE_INTERNAL); xShell->DoInitNew(0); @@ -731,7 +731,7 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper, { SdrObject::Free(pPickObj2 ); } - bChanged = sal_True; + bChanged = true; mnAction = DND_ACTION_COPY; } else if( ( mnAction & DND_ACTION_LINK ) && pPickObj && pObj && !pPickObj->ISA( SdrGrafObj ) && !pPickObj->ISA( SdrOle2Obj ) ) @@ -782,7 +782,7 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper, if( bUndo ) EndUndo(); - bChanged = sal_True; + bChanged = true; } } } @@ -850,7 +850,7 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper, if( mrDoc.GetDocSh() && ( mrDoc.GetDocSh()->GetClassName() == aObjDesc.maClassName ) ) { uno::Reference < embed::XStorage > xStore( ::comphelper::OStorageHelper::GetStorageFromInputStream( xStm ) ); - ::sd::DrawDocShellRef xDocShRef( new ::sd::DrawDocShell( SFX_CREATE_MODE_EMBEDDED, sal_True, mrDoc.GetDocumentType() ) ); + ::sd::DrawDocShellRef xDocShRef( new ::sd::DrawDocShell( SFX_CREATE_MODE_EMBEDDED, true, mrDoc.GetDocumentType() ) ); // mba: BaseURL doesn't make sense for clipboard functionality SfxMedium *pMedium = new SfxMedium( xStore, OUString() ); @@ -888,7 +888,7 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper, sal_Int32 nPos = aLayout.indexOf(SD_LT_SEPARATOR); if (nPos != -1) aLayout = aLayout.copy(0, nPos); - pPage->SetPresentationLayout( aLayout, sal_False, sal_False ); + pPage->SetPresentationLayout( aLayout, false, false ); } xDocShRef->DoClose(); @@ -1313,7 +1313,7 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper, Color aColor( rColItem.GetColorValue() ); OUString aName( rColItem.GetName() ); SfxItemSet aSet( mrDoc.GetPool() ); - sal_Bool bClosed = pPickObj->IsClosedObj(); + bool bClosed = pPickObj->IsClosedObj(); ::sd::Window* pWin = mpViewSh->GetActiveWindow(); sal_uInt16 nHitLog = (sal_uInt16) pWin->PixelToLogic( Size(FuPoor::HITPIX, 0 ) ).Width(); diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx index 04a3c8595ce1..2802435f4a03 100644 --- a/sd/source/ui/view/sdview4.cxx +++ b/sd/source/ui/view/sdview4.cxx @@ -196,7 +196,7 @@ SdrGrafObj* View::InsertGraphic( const Graphic& rGraphic, sal_Int8& rAction, pNewGrafObj->AdjustToMaxRect( Rectangle( Point(), aPageSize ), true ); sal_uLong nOptions = SDRINSERT_SETDEFLAYER; - sal_Bool bIsPresTarget = sal_False; + bool bIsPresTarget = false; if ((mpViewSh && mpViewSh->GetViewShell()!=NULL @@ -404,7 +404,7 @@ IMPL_LINK_NOARG(View, DropInsertFileHdl) { OUString aCurrentDropFile( *aIter ); INetURLObject aURL( aCurrentDropFile ); - sal_Bool bOK = sal_False; + bool bOK = false; if( aURL.GetProtocol() == INET_PROT_NOT_VALID ) { @@ -434,7 +434,7 @@ IMPL_LINK_NOARG(View, DropInsertFileHdl) if( aIter == maDropFileVector.begin() ) mnAction = nTempAction; - bOK = sal_True; + bOK = true; } if( !bOK ) { @@ -469,7 +469,7 @@ IMPL_LINK_NOARG(View, DropInsertFileHdl) aReq.AppendItem( aItem1 ); aReq.AppendItem( aItem2 ); FuInsertFile::Create( mpViewSh, pWin, this, &mrDoc, aReq ); - bOK = sal_True; + bOK = true; } } } diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx index a23c31c840be..3f0dca33cc0e 100644 --- a/sd/source/ui/view/sdwindow.cxx +++ b/sd/source/ui/view/sdwindow.cxx @@ -594,9 +594,9 @@ void Window::SetMinZoomAutoCalc (bool bAuto) * If aWinPos.X()/Y() == -1, then we center the corresponding position (e.g. for * initialization). */ -void Window::UpdateMapOrigin(sal_Bool bInvalidate) +void Window::UpdateMapOrigin(bool bInvalidate) { - sal_Bool bChanged = sal_False; + bool bChanged = false; const Size aWinSize = PixelToLogic(GetOutputSizePixel()); if ( mbCenterAllowed ) @@ -607,28 +607,28 @@ void Window::UpdateMapOrigin(sal_Bool bInvalidate) // resizes maWinPos.X() -= (aWinSize.Width() - maPrevSize.Width()) / 2; maWinPos.Y() -= (aWinSize.Height() - maPrevSize.Height()) / 2; - bChanged = sal_True; + bChanged = true; } if ( maWinPos.X() > maViewSize.Width() - aWinSize.Width() ) { maWinPos.X() = maViewSize.Width() - aWinSize.Width(); - bChanged = sal_True; + bChanged = true; } if ( maWinPos.Y() > maViewSize.Height() - aWinSize.Height() ) { maWinPos.Y() = maViewSize.Height() - aWinSize.Height(); - bChanged = sal_True; + bChanged = true; } if ( aWinSize.Width() > maViewSize.Width() || maWinPos.X() < 0 ) { maWinPos.X() = maViewSize.Width() / 2 - aWinSize.Width() / 2; - bChanged = sal_True; + bChanged = true; } if ( aWinSize.Height() > maViewSize.Height() || maWinPos.Y() < 0 ) { maWinPos.Y() = maViewSize.Height() / 2 - aWinSize.Height() / 2; - bChanged = sal_True; + bChanged = true; } } @@ -718,7 +718,7 @@ void Window::SetVisibleXY(double fX, double fY) maWinPos.X() = (long) (fX * maViewSize.Width()); if ( fY >= 0 ) maWinPos.Y() = (long) (fY * maViewSize.Height()); - UpdateMapOrigin(sal_False); + UpdateMapOrigin(false); Scroll(nOldX - maWinPos.X(), nOldY - maWinPos.Y(), SCROLL_CHILDREN); Update(); } @@ -916,7 +916,7 @@ void Window::DataChanged( const DataChangedEvent& rDCEvt ) { DrawDocShell* pDocSh = mpViewShell->GetDocSh(); if( pDocSh ) - pDocSh->SetPrinter( pDocSh->GetPrinter( sal_True ) ); + pDocSh->SetPrinter( pDocSh->GetPrinter( true ) ); } } @@ -931,7 +931,7 @@ void Window::DataChanged( const DataChangedEvent& rDCEvt ) { DrawDocShell* pDocSh = mpViewShell->GetDocSh(); if( pDocSh ) - pDocSh->SetPrinter( pDocSh->GetPrinter( sal_True ) ); + pDocSh->SetPrinter( pDocSh->GetPrinter( true ) ); } } diff --git a/sd/source/ui/view/tabcontr.cxx b/sd/source/ui/view/tabcontr.cxx index 77cccb63dc79..97c76b6d1932 100644 --- a/sd/source/ui/view/tabcontr.cxx +++ b/sd/source/ui/view/tabcontr.cxx @@ -81,7 +81,7 @@ TabControl::TabControl(DrawViewShell* pViewSh, Window* pParent) : DropTargetHelper( this ), RrePageID(1), pDrViewSh(pViewSh), - bInternalMove(sal_False) + bInternalMove(false) { EnableEditMode(); SetSizePixel(Size(0, 0)); @@ -164,7 +164,7 @@ void TabControl::DoubleClick() void TabControl::StartDrag( sal_Int8, const Point& ) { - bInternalMove = sal_True; + bInternalMove = true; // object is delete by reference mechanismn ( new TabControl::TabControlTransferable( *this ) )->StartDrag( this, DND_ACTION_COPYMOVE ); @@ -173,7 +173,7 @@ void TabControl::StartDrag( sal_Int8, const Point& ) void TabControl::DragFinished( sal_Int8 ) { - bInternalMove = sal_False; + bInternalMove = false; } @@ -299,7 +299,7 @@ void TabControl::Command(const CommandEvent& rCEvt) if ( nCmd == COMMAND_CONTEXTMENU ) { - sal_Bool bGraphicShell = pDrViewSh->ISA(GraphicViewShell); + bool bGraphicShell = pDrViewSh->ISA(GraphicViewShell); sal_uInt16 nResId = bGraphicShell ? RID_GRAPHIC_PAGETAB_POPUP : RID_DRAW_PAGETAB_POPUP; SfxDispatcher* pDispatcher = pDrViewSh->GetViewFrame()->GetDispatcher(); @@ -309,11 +309,11 @@ void TabControl::Command(const CommandEvent& rCEvt) long TabControl::StartRenaming() { - sal_Bool bOK = sal_False; + bool bOK = false; if (pDrViewSh->GetPageKind() == PK_STANDARD) { - bOK = sal_True; + bOK = true; ::sd::View* pView = pDrViewSh->GetView(); @@ -321,12 +321,12 @@ long TabControl::StartRenaming() pView->SdrEndTextEdit(); } - return( bOK ); + return bOK ? 1 : 0; } long TabControl::AllowRenaming() { - sal_Bool bOK = sal_True; + bool bOK = true; OUString aNewName( GetEditText() ); OUString aCompareName( GetPageText( GetEditPageId() ) ); @@ -341,10 +341,10 @@ long TabControl::AllowRenaming() } else { - bOK = sal_False; + bOK = false; } } - return( bOK ); + return bOK ? 1 : 0; } void TabControl::EndRenaming() @@ -365,7 +365,7 @@ void TabControl::ActivatePage() long TabControl::DeactivatePage() { - return pDrViewSh->IsSwitchPageAllowed(); + return pDrViewSh->IsSwitchPageAllowed() ? 1 : 0; } diff --git a/sd/source/ui/view/unmodpg.cxx b/sd/source/ui/view/unmodpg.cxx index 7775201c2c76..e7af9b07c20e 100644 --- a/sd/source/ui/view/unmodpg.cxx +++ b/sd/source/ui/view/unmodpg.cxx @@ -41,8 +41,8 @@ ModifyPageUndoAction::ModifyPageUndoAction( SdPage* pThePage, const OUString& aTheNewName, AutoLayout eTheNewAutoLayout, - sal_Bool bTheNewBckgrndVisible, - sal_Bool bTheNewBckgrndObjsVisible) + bool bTheNewBckgrndVisible, + bool bTheNewBckgrndObjsVisible) : SdUndoAction(pTheDoc) { DBG_ASSERT(pThePage, "Undo without a page???"); diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx index 7c319ba9944c..5f98d68ba8f4 100644 --- a/sd/source/ui/view/viewshe2.cxx +++ b/sd/source/ui/view/viewshe2.cxx @@ -250,7 +250,7 @@ long ViewShell::VirtVScrollHdl(ScrollBar* pVScroll) return 0; } -SvxRuler* ViewShell::CreateHRuler(::sd::Window* , sal_Bool ) +SvxRuler* ViewShell::CreateHRuler(::sd::Window* , bool ) { return NULL; } @@ -413,7 +413,7 @@ void ViewShell::SetZoomRect(const Rectangle& rZoomRect) * Initialize imaging parameters for all split windows. */ void ViewShell::InitWindows(const Point& rViewOrigin, const Size& rViewSize, - const Point& rWinPos, sal_Bool bUpdate) + const Point& rWinPos, bool bUpdate) { if (mpContentWindow.get() != NULL) { @@ -462,9 +462,9 @@ void ViewShell::DrawMarkRect(const Rectangle& rRect) const void ViewShell::SetPageSizeAndBorder(PageKind ePageKind, const Size& rNewSize, long nLeft, long nRight, - long nUpper, long nLower, sal_Bool bScaleAll, + long nUpper, long nLower, bool bScaleAll, Orientation eOrientation, sal_uInt16 nPaperBin, - sal_Bool bBackgroundFullSize) + bool bBackgroundFullSize) { SdPage* pPage = 0; SdUndoGroup* pUndoGroup = NULL; @@ -577,7 +577,7 @@ void ViewShell::SetPageSizeAndBorder(PageKind ePageKind, const Size& rNewSize, // adjust handout page to new format of the standard page if( (ePageKind == PK_STANDARD) || (ePageKind == PK_HANDOUT) ) - GetDoc()->GetSdPage(0, PK_HANDOUT)->CreateTitleAndLayout(sal_True); + GetDoc()->GetSdPage(0, PK_HANDOUT)->CreateTitleAndLayout(true); // handed over undo group to undo manager pViewShell->GetViewFrame()->GetObjectShell() @@ -589,7 +589,7 @@ void ViewShell::SetPageSizeAndBorder(PageKind ePageKind, const Size& rNewSize, Point aPageOrg = Point(nWidth, nHeight / 2); Size aViewSize = Size(nWidth * 3, nHeight * 2); - InitWindows(aPageOrg, aViewSize, Point(-1, -1), sal_True); + InitWindows(aPageOrg, aViewSize, Point(-1, -1), true); Point aVisAreaPos; @@ -669,9 +669,9 @@ void ViewShell::SetActiveWindow (::sd::Window* pWin) -sal_Bool ViewShell::RequestHelp(const HelpEvent& rHEvt, ::sd::Window*) +bool ViewShell::RequestHelp(const HelpEvent& rHEvt, ::sd::Window*) { - sal_Bool bReturn = sal_False; + bool bReturn = false; if (rHEvt.GetMode()) { @@ -730,12 +730,12 @@ void ViewShell::WriteFrameViewData() } -sal_Bool ViewShell::ActivateObject(SdrOle2Obj* pObj, long nVerb) +bool ViewShell::ActivateObject(SdrOle2Obj* pObj, long nVerb) { ErrCode aErrCode = 0; SfxErrorContext aEC(ERRCTX_SO_DOVERB, GetActiveWindow(), RID_SO_ERRCTX); - sal_Bool bAbort = sal_False; + bool bAbort = false; GetDocSh()->SetWaitCursor( true ); SfxViewShell* pViewShell = GetViewShell(); OSL_ASSERT (pViewShell!=NULL); @@ -786,7 +786,7 @@ sal_Bool ViewShell::ActivateObject(SdrOle2Obj* pObj, long nVerb) if (!xObj.is()) { - bAbort = sal_True; + bAbort = true; } } @@ -924,7 +924,7 @@ void ViewShell::WriteUserData(OUString&) /** * Switch ruler on/off */ -void ViewShell::SetRuler(sal_Bool bRuler) +void ViewShell::SetRuler(bool bRuler) { mbHasRulers = ( bRuler && !GetDocSh()->IsPreview() ); // no rulers on preview mode @@ -981,8 +981,7 @@ sal_Int8 ViewShell::ExecuteDrop ( return( pView ? pView->ExecuteDrop( rEvt, rTargetHelper, pTargetWindow, nPage, nLayer ) : DND_ACTION_NONE ); } -void ViewShell::WriteUserDataSequence ( ::com::sun::star::uno::Sequence < - ::com::sun::star::beans::PropertyValue >& rSequence, sal_Bool bBrowse) +void ViewShell::WriteUserDataSequence ( css::uno::Sequence < css::beans::PropertyValue >& rSequence, bool bBrowse) { const sal_Int32 nIndex = rSequence.getLength(); rSequence.realloc( nIndex + 1 ); @@ -1003,7 +1002,7 @@ void ViewShell::WriteUserDataSequence ( ::com::sun::star::uno::Sequence < } -void ViewShell::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& rSequence, sal_Bool bBrowse ) +void ViewShell::ReadUserDataSequence ( const css::uno::Sequence < css::beans::PropertyValue >& rSequence, bool bBrowse ) { mpFrameView->ReadUserDataSequence( rSequence, bBrowse ); } diff --git a/sd/source/ui/view/viewshe3.cxx b/sd/source/ui/view/viewshe3.cxx index 35e5751e9cf2..e5205c4c1b54 100644 --- a/sd/source/ui/view/viewshe3.cxx +++ b/sd/source/ui/view/viewshe3.cxx @@ -129,13 +129,13 @@ void ViewShell::GetMenuState( SfxItemSet &rSet ) if(SFX_ITEM_AVAILABLE == rSet.GetItemState(SID_UNDO)) { ::svl::IUndoManager* pUndoManager = ImpGetUndoManager(); - sal_Bool bActivate(sal_False); + bool bActivate(false); if(pUndoManager) { if(pUndoManager->GetUndoActionCount() != 0) { - bActivate = sal_True; + bActivate = true; } } @@ -156,13 +156,13 @@ void ViewShell::GetMenuState( SfxItemSet &rSet ) if(SFX_ITEM_AVAILABLE == rSet.GetItemState(SID_REDO)) { ::svl::IUndoManager* pUndoManager = ImpGetUndoManager(); - sal_Bool bActivate(sal_False); + bool bActivate(false); if(pUndoManager) { if(pUndoManager->GetRedoActionCount() != 0) { - bActivate = sal_True; + bActivate = true; } } @@ -216,8 +216,8 @@ SdPage* ViewShell::CreateOrDuplicatePage ( OUString aNotesPageName; AutoLayout eStandardLayout (AUTOLAYOUT_NONE); AutoLayout eNotesLayout (AUTOLAYOUT_NOTES); - sal_Bool bIsPageBack = aVisibleLayers.IsSet(aBckgrnd); - sal_Bool bIsPageObj = aVisibleLayers.IsSet(aBckgrndObj); + bool bIsPageBack = aVisibleLayers.IsSet(aBckgrnd); + bool bIsPageObj = aVisibleLayers.IsSet(aBckgrndObj); // 1. Process the arguments. const SfxItemSet* pArgs = rRequest.GetArgs(); diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx index ca89e24e3774..eaa950385de2 100644 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -113,7 +113,7 @@ private: namespace sd { -sal_Bool ViewShell::IsPageFlipMode(void) const +bool ViewShell::IsPageFlipMode(void) const { return this->ISA(DrawViewShell) && mpContentWindow.get() != NULL && mpContentWindow->GetVisibleHeight() >= 1.0; @@ -180,7 +180,7 @@ void ViewShell::construct(void) mpView = 0; mpFrameView = 0; mpZoomList = 0; - mbStartShowWithDialog = sal_False; + mbStartShowWithDialog = false; mnPrintedHandoutPageNum = 1; mnPrintedHandoutPageCount = 0; mpWindowUpdater.reset( new ::sd::WindowUpdater() ); @@ -222,7 +222,7 @@ void ViewShell::construct(void) OUString aName( "ViewShell" ); SetName (aName); - GetDoc()->StartOnlineSpelling(sal_False); + GetDoc()->StartOnlineSpelling(false); mpWindowUpdater->SetViewShell (*this); mpWindowUpdater->SetDocument (GetDoc()); @@ -341,7 +341,7 @@ void ViewShell::Activate(bool bIsMDIActivate) } if(!GetDocSh()->IsUIActive()) - UpdatePreview( GetActualPage(), sal_True ); + UpdatePreview( GetActualPage(), true ); } @@ -416,9 +416,9 @@ void ViewShell::Shutdown (void) -sal_Bool ViewShell::KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin) +bool ViewShell::KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin) { - sal_Bool bReturn(sal_False); + bool bReturn(false); if(pWin) { @@ -430,7 +430,7 @@ sal_Bool ViewShell::KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin) // give key input first to SfxViewShell to give CTRL+Key // (e.g. CTRL+SHIFT+'+', to front) priority. OSL_ASSERT (GetViewShell()!=NULL); - bReturn = (sal_Bool)GetViewShell()->KeyInput(rKEvt); + bReturn = GetViewShell()->KeyInput(rKEvt); } sal_Int32 OriCount = GetView()->GetMarkedObjectList().GetMarkCount(); @@ -458,7 +458,7 @@ sal_Bool ViewShell::KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin) } else { - bReturn = sal_True; + bReturn = true; } } } @@ -478,7 +478,7 @@ sal_Bool ViewShell::KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin) && aKeyCode.GetCode() == KEY_R) { InvalidateWindows(); - bReturn = sal_True; + bReturn = true; } } @@ -594,7 +594,7 @@ void ViewShell::MouseButtonUp(const MouseEvent& rMEvt, ::sd::Window* pWin) void ViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin) { - sal_Bool bDone = HandleScrollCommand (rCEvt, pWin); + bool bDone = HandleScrollCommand (rCEvt, pWin); if( !bDone ) { @@ -736,7 +736,7 @@ void ViewShell::SetupRulers (void) } if ( mpHorizontalRuler.get() == NULL ) { - mpHorizontalRuler.reset(CreateHRuler(GetActiveWindow(), sal_True)); + mpHorizontalRuler.reset(CreateHRuler(GetActiveWindow(), true)); if ( mpHorizontalRuler.get() != NULL ) { mpHorizontalRuler->SetWinPos(nHRulerOfs); @@ -763,8 +763,8 @@ const SfxPoolItem* ViewShell::GetNumBulletItem(SfxItemSet& aNewAttr, sal_uInt16& return pTmpItem; else { - sal_Bool bOutliner = sal_False; - sal_Bool bTitle = sal_False; + bool bOutliner = false; + bool bTitle = false; if( mpView ) { @@ -779,10 +779,10 @@ const SfxPoolItem* ViewShell::GetNumBulletItem(SfxItemSet& aNewAttr, sal_uInt16& switch(pObj->GetObjIdentifier()) { case OBJ_TITLETEXT: - bTitle = sal_True; + bTitle = true; break; case OBJ_OUTLINETEXT: - bOutliner = sal_True; + bOutliner = true; break; } } @@ -828,7 +828,7 @@ const SfxPoolItem* ViewShell::GetNumBulletItem(SfxItemSet& aNewAttr, sal_uInt16& } -sal_Bool ViewShell::HasRuler (void) +bool ViewShell::HasRuler (void) { return mbHasRulers; } @@ -1032,7 +1032,7 @@ void ViewShell::SetDefTabHRuler( sal_uInt16 nDefTab ) /** Tell the FmFormShell that the view shell is closing. Give it the oportunity to prevent that. */ -bool ViewShell::PrepareClose (sal_Bool bUI) +bool ViewShell::PrepareClose (bool bUI) { bool nResult = true; @@ -1046,7 +1046,7 @@ bool ViewShell::PrepareClose (sal_Bool bUI) -void ViewShell::UpdatePreview (SdPage*, sal_Bool ) +void ViewShell::UpdatePreview (SdPage*, bool ) { // Do nothing. After the actual preview has been removed, // OutlineViewShell::UpdatePreview() is the place where something @@ -1151,7 +1151,7 @@ void ViewShell::ImpGetRedoStrings(SfxItemSet &rSet) const -void ViewShell::ImpSidUndo(sal_Bool, SfxRequest& rReq) +void ViewShell::ImpSidUndo(bool, SfxRequest& rReq) { ::svl::IUndoManager* pUndoManager = ImpGetUndoManager(); sal_uInt16 nNumber(1); @@ -1200,7 +1200,7 @@ void ViewShell::ImpSidUndo(sal_Bool, SfxRequest& rReq) -void ViewShell::ImpSidRedo(sal_Bool, SfxRequest& rReq) +void ViewShell::ImpSidRedo(bool, SfxRequest& rReq) { ::svl::IUndoManager* pUndoManager = ImpGetUndoManager(); sal_uInt16 nNumber(1); diff --git a/sd/source/ui/view/zoomlist.cxx b/sd/source/ui/view/zoomlist.cxx index 5a995ae7b3dc..d039977d405d 100644 --- a/sd/source/ui/view/zoomlist.cxx +++ b/sd/source/ui/view/zoomlist.cxx @@ -82,14 +82,14 @@ Rectangle ZoomList::GetPreviousZoomRect() return maRectangles[mnCurPos]; } -sal_Bool ZoomList::IsNextPossible() const +bool ZoomList::IsNextPossible() const { size_t nRectCount = maRectangles.size(); return nRectCount > 0 && mnCurPos < nRectCount - 1; } -sal_Bool ZoomList::IsPreviousPossible() const +bool ZoomList::IsPreviousPossible() const { return mnCurPos > 0; } |