diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2013-07-05 16:25:03 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2013-07-07 20:00:16 +0000 |
| commit | 009851223b5ced4ed2662af2e2ae81c0f9200e45 (patch) | |
| tree | a8ab339589ea23b98513d394eabc4f135e69ccae /sd/inc | |
| parent | 35b42a9d1282a92dbc9a7fbc51d279812070688c (diff) | |
module svl: all String and some bool and related clean-up
Change-Id: I36eb559fa58dbe75384b7119c788af0048813aed
Reviewed-on: https://gerrit.libreoffice.org/4733
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
Diffstat (limited to 'sd/inc')
| -rw-r--r-- | sd/inc/stlpool.hxx | 2 | ||||
| -rw-r--r-- | sd/inc/stlsheet.hxx | 4 | ||||
| -rw-r--r-- | sd/inc/undo/undomanager.hxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/sd/inc/stlpool.hxx b/sd/inc/stlpool.hxx index 624d5da15a02..3696a8ca5a56 100644 --- a/sd/inc/stlpool.hxx +++ b/sd/inc/stlpool.hxx @@ -125,7 +125,7 @@ protected: void CopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily eFamily ); void CopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily eFamily, SdStyleSheetVector& rCreatedSheets ); - virtual SfxStyleSheetBase* Create(const String& rName, SfxStyleFamily eFamily, sal_uInt16 nMask); + virtual SfxStyleSheetBase* Create(const OUString& rName, SfxStyleFamily eFamily, sal_uInt16 nMask); virtual SfxStyleSheetBase* Create(const SdStyleSheet& rStyle); using SfxStyleSheetPool::Create; diff --git a/sd/inc/stlsheet.hxx b/sd/inc/stlsheet.hxx index 5a9662c28747..8a596e167976 100644 --- a/sd/inc/stlsheet.hxx +++ b/sd/inc/stlsheet.hxx @@ -54,13 +54,13 @@ public: SdStyleSheet( const OUString& rDisplayName, SfxStyleSheetBasePool& rPool, SfxStyleFamily eFamily, sal_uInt16 nMask ); SdStyleSheet( const SdStyleSheet& ); - virtual bool SetParent (const String& rParentName); + virtual bool SetParent (const OUString& rParentName); virtual SfxItemSet& GetItemSet(); virtual bool IsUsed() const; virtual bool HasFollowSupport() const; virtual bool HasParentSupport() const; virtual bool HasClearParentSupport() const; - virtual bool SetName( const UniString& ); + virtual bool SetName( const OUString& ); virtual void SetHelpId( const OUString& r, sal_uLong nId ); void AdjustToFontHeight(SfxItemSet& rSet, sal_Bool bOnlyMissingItems = sal_True); diff --git a/sd/inc/undo/undomanager.hxx b/sd/inc/undo/undomanager.hxx index 14fa2d9811a4..0991c9fd55f9 100644 --- a/sd/inc/undo/undomanager.hxx +++ b/sd/inc/undo/undomanager.hxx @@ -33,7 +33,7 @@ public: virtual void EnterListAction(const OUString &rComment, const OUString& rRepeatComment, sal_uInt16 nId=0); - virtual void AddUndoAction( SfxUndoAction *pAction, sal_Bool bTryMerg=sal_False ); + virtual void AddUndoAction( SfxUndoAction *pAction, bool bTryMerg=false ); /** Set or reset the undo manager linked with the called undo manager. */ |