From 009851223b5ced4ed2662af2e2ae81c0f9200e45 Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Fri, 5 Jul 2013 16:25:03 -0500 Subject: 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 Tested-by: Norbert Thiebaud --- include/svl/inethist.hxx | 5 ++- include/svl/itemprop.hxx | 59 +++++++++++++++++++---------------- include/svl/ondemand.hxx | 2 +- include/svl/srchitem.hxx | 17 +++++----- include/svl/style.hxx | 61 ++++++++++++++++++------------------ include/svl/svdde.hxx | 80 ++++++++++++++++++++++++------------------------ include/svl/undo.hxx | 64 +++++++++++++++++++------------------- include/svl/zforlist.hxx | 16 ++-------- 8 files changed, 147 insertions(+), 157 deletions(-) (limited to 'include/svl') diff --git a/include/svl/inethist.hxx b/include/svl/inethist.hxx index 4ee592faad16..bdf69260ff21 100644 --- a/include/svl/inethist.hxx +++ b/include/svl/inethist.hxx @@ -21,7 +21,6 @@ #include "svl/svldllapi.h" #include -#include #include #include #include @@ -86,7 +85,7 @@ public: return sal_False; } - sal_Bool QueryUrl (const String &rUrl) + sal_Bool QueryUrl (const OUString &rUrl) { INetProtocol eProto = INetURLObject::CompareProtocolScheme (rUrl); @@ -104,7 +103,7 @@ public: PutUrl_Impl (rUrl); } - void PutUrl (const String &rUrl) + void PutUrl (const OUString &rUrl) { INetProtocol eProto = INetURLObject::CompareProtocolScheme (rUrl); diff --git a/include/svl/itemprop.hxx b/include/svl/itemprop.hxx index c1b7ed68b400..46280d7fa34e 100644 --- a/include/svl/itemprop.hxx +++ b/include/svl/itemprop.hxx @@ -21,7 +21,6 @@ #include "svl/svldllapi.h" #include -#include #include #include #include @@ -35,47 +34,55 @@ struct SfxItemPropertyMapEntry { const char* pName; - sal_uInt16 nNameLen; - sal_uInt16 nWID; + sal_uInt16 nNameLen; + sal_uInt16 nWID; const com::sun::star::uno::Type* pType; long nFlags; - sal_uInt8 nMemberId; + sal_uInt8 nMemberId; }; struct SfxItemPropertySimpleEntry { - sal_uInt16 nWID; + sal_uInt16 nWID; const com::sun::star::uno::Type* pType; long nFlags; - sal_uInt8 nMemberId; + sal_uInt8 nMemberId; - SfxItemPropertySimpleEntry() : - nWID( 0 ), - pType( 0 ), - nFlags( 0 ), - nMemberId( 0 ){} + SfxItemPropertySimpleEntry() + : nWID( 0 ) + , pType( 0 ) + , nFlags( 0 ) + , nMemberId( 0 ) + { + } SfxItemPropertySimpleEntry(sal_uInt16 _nWID, const com::sun::star::uno::Type* _pType, - long _nFlags, sal_uInt8 _nMemberId) : - nWID( _nWID ), - pType( _pType ), - nFlags( _nFlags ), - nMemberId( _nMemberId ){} - - SfxItemPropertySimpleEntry( const SfxItemPropertyMapEntry* pMapEntry ) : - nWID( pMapEntry->nWID ), - pType( pMapEntry->pType ), - nFlags( pMapEntry->nFlags ), - nMemberId( pMapEntry->nMemberId ){} + long _nFlags, sal_uInt8 _nMemberId) + : nWID( _nWID ) + , pType( _pType ) + , nFlags( _nFlags ) + , nMemberId( _nMemberId ) + { + } + + SfxItemPropertySimpleEntry( const SfxItemPropertyMapEntry* pMapEntry ) + : nWID( pMapEntry->nWID ) + , pType( pMapEntry->pType ) + , nFlags( pMapEntry->nFlags ) + , nMemberId( pMapEntry->nMemberId ) + { + } }; struct SfxItemPropertyNamedEntry : public SfxItemPropertySimpleEntry { OUString sName; - SfxItemPropertyNamedEntry( const String& rName, const SfxItemPropertySimpleEntry& rSimpleEntry) : - SfxItemPropertySimpleEntry( rSimpleEntry ), - sName( rName ){} + SfxItemPropertyNamedEntry( const OUString& rName, const SfxItemPropertySimpleEntry& rSimpleEntry) + : SfxItemPropertySimpleEntry( rSimpleEntry ) + , sName( rName ) +{ +} }; typedef std::vector< SfxItemPropertyNamedEntry > PropertyEntryVector_t; @@ -92,7 +99,7 @@ public: com::sun::star::uno::Sequence< com::sun::star::beans::Property > getProperties() const; com::sun::star::beans::Property getPropertyByName( const OUString rName ) const throw( ::com::sun::star::beans::UnknownPropertyException ); - sal_Bool hasPropertyByName( const OUString& rName ) const; + bool hasPropertyByName( const OUString& rName ) const; void mergeProperties( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& rPropSeq ); PropertyEntryVector_t getPropertyEntries() const; diff --git a/include/svl/ondemand.hxx b/include/svl/ondemand.hxx index b3a2c42e11e6..d61b31f570d2 100644 --- a/include/svl/ondemand.hxx +++ b/include/svl/ondemand.hxx @@ -307,7 +307,7 @@ public: return pPtr; } - const ::utl::TransliterationWrapper* getForModule( const String& rModule, LanguageType eLang ) const + const ::utl::TransliterationWrapper* getForModule( const OUString& rModule, LanguageType eLang ) const { if ( !pPtr ) pPtr = new ::utl::TransliterationWrapper( m_xContext, nType ); diff --git a/include/svl/srchitem.hxx b/include/svl/srchitem.hxx index 5d4413ea8cab..3fb8949e2f23 100644 --- a/include/svl/srchitem.hxx +++ b/include/svl/srchitem.hxx @@ -27,7 +27,6 @@ #include #include #include -#include #include #include @@ -98,11 +97,11 @@ public: sal_uInt16 GetCommand() const { return nCommand; } void SetCommand(sal_uInt16 nNewCommand) { nCommand = nNewCommand; } - inline const String GetSearchString() const; - inline void SetSearchString(const String& rNewString); + inline const OUString GetSearchString() const; + inline void SetSearchString(const OUString& rNewString); - inline const String GetReplaceString() const; - inline void SetReplaceString(const String& rNewString); + inline const OUString GetReplaceString() const; + inline void SetReplaceString(const OUString& rNewString); inline bool GetWordOnly() const; void SetWordOnly(bool bNewWordOnly); @@ -176,22 +175,22 @@ public: inline void SetUseAsianOptions( bool bVal ) { bAsianOptions = bVal; } }; -const String SvxSearchItem::GetSearchString() const +const OUString SvxSearchItem::GetSearchString() const { return aSearchOpt.searchString; } -void SvxSearchItem::SetSearchString(const String& rNewString) +void SvxSearchItem::SetSearchString(const OUString& rNewString) { aSearchOpt.searchString = rNewString; } -const String SvxSearchItem::GetReplaceString() const +const OUString SvxSearchItem::GetReplaceString() const { return aSearchOpt.replaceString; } -void SvxSearchItem::SetReplaceString(const String& rNewString) +void SvxSearchItem::SetReplaceString(const OUString& rNewString) { aSearchOpt.replaceString = rNewString; } diff --git a/include/svl/style.hxx b/include/svl/style.hxx index af58cbc44327..c54313ec96a2 100644 --- a/include/svl/style.hxx +++ b/include/svl/style.hxx @@ -29,7 +29,6 @@ #include #include "svl/svldllapi.h" #include -#include #include #include #include @@ -82,7 +81,7 @@ protected: SfxStyleSheetBasePool* pPool; // zugehoeriger Pool SfxStyleFamily nFamily; // Familie - UniString aName, aParent, aFollow; + OUString aName, aParent, aFollow; OUString maDisplayName; OUString aHelpFile; // Name der Hilfedatei SfxItemSet* pSet; // ItemSet @@ -93,7 +92,7 @@ protected: bool bMySet; // sal_True: Set loeschen im dtor bool bHidden; - SfxStyleSheetBase( const UniString&, SfxStyleSheetBasePool*, SfxStyleFamily eFam, sal_uInt16 mask ); + SfxStyleSheetBase( const OUString&, SfxStyleSheetBasePool*, SfxStyleFamily eFam, sal_uInt16 mask ); SfxStyleSheetBase( const SfxStyleSheetBase& ); virtual ~SfxStyleSheetBase(); virtual void Load( SvStream&, sal_uInt16 ); @@ -103,10 +102,10 @@ public: TYPEINFO(); // returns the internal name of this style - virtual const UniString& GetName() const; + virtual const OUString& GetName() const; // sets the internal name of this style - virtual bool SetName( const UniString& ); + virtual bool SetName( const OUString& ); /** returns the display name of this style, it is used at the user interface. If the display name is empty, this method returns the internal name. */ @@ -115,18 +114,18 @@ public: // sets the display name of this style virtual void SetDisplayName( const OUString& ); - virtual const UniString& GetParent() const; - virtual bool SetParent( const UniString& ); - virtual const UniString& GetFollow() const; - virtual bool SetFollow( const UniString& ); + virtual const OUString& GetParent() const; + virtual bool SetParent( const OUString& ); + virtual const OUString& GetFollow() const; + virtual bool SetFollow( const OUString& ); virtual bool HasFollowSupport() const; // Default true virtual bool HasParentSupport() const; // Default true virtual bool HasClearParentSupport() const; // Default false virtual bool IsUsed() const; // Default true // Default aus dem Itemset; entweder dem uebergebenen // oder aus dem per GetItemSet() zurueckgelieferten Set - virtual UniString GetDescription(); - virtual UniString GetDescription( SfxMapUnit eMetric ); + virtual OUString GetDescription(); + virtual OUString GetDescription( SfxMapUnit eMetric ); SfxStyleSheetBasePool& GetPool() { return *pPool; } SfxStyleFamily GetFamily() const { return nFamily; } @@ -207,15 +206,15 @@ friend class SfxStyleSheetBase; private: SVL_DLLPRIVATE SfxStyleSheetIterator& GetIterator_Impl(); protected: - String aAppName; + OUString aAppName; SfxItemPool& rPool; SfxStyles aStyles; SfxStyleFamily nSearchFamily; - sal_uInt16 nMask; + sal_uInt16 nMask; SfxStyleSheetBase& Add( SfxStyleSheetBase& ); - void ChangeParent( const UniString&, const UniString&, bool bVirtual = true ); - virtual SfxStyleSheetBase* Create( const UniString&, SfxStyleFamily, sal_uInt16 ); + void ChangeParent( const OUString&, const OUString&, bool bVirtual = true ); + virtual SfxStyleSheetBase* Create( const OUString&, SfxStyleFamily, sal_uInt16 ); virtual SfxStyleSheetBase* Create( const SfxStyleSheetBase& ); virtual ~SfxStyleSheetBasePool(); @@ -224,7 +223,7 @@ public: SfxStyleSheetBasePool( SfxItemPool& ); SfxStyleSheetBasePool( const SfxStyleSheetBasePool& ); - const String& GetAppName() const { return aAppName; } + const OUString& GetAppName() const { return aAppName; } SfxItemPool& GetPool(); const SfxItemPool& GetPool() const; @@ -233,7 +232,7 @@ public: virtual sal_uInt16 Count(); virtual SfxStyleSheetBase* operator[](sal_uInt16 nIdx); - virtual SfxStyleSheetBase& Make(const UniString&, + virtual SfxStyleSheetBase& Make(const OUString&, SfxStyleFamily eFam, sal_uInt16 nMask = SFXSTYLEBIT_ALL , sal_uInt16 nPos = 0xffff); @@ -252,13 +251,13 @@ public: const SfxStyles& GetStyles(); virtual SfxStyleSheetBase* First(); virtual SfxStyleSheetBase* Next(); - virtual SfxStyleSheetBase* Find( const UniString&, SfxStyleFamily eFam, sal_uInt16 n=SFXSTYLEBIT_ALL ); + virtual SfxStyleSheetBase* Find( const OUString&, SfxStyleFamily eFam, sal_uInt16 n=SFXSTYLEBIT_ALL ); virtual bool SetParent(SfxStyleFamily eFam, - const UniString &rStyle, - const UniString &rParent); + const OUString &rStyle, + const OUString &rParent); - SfxStyleSheetBase* Find(const UniString& rStr) + SfxStyleSheetBase* Find(const OUString& rStr) { return Find(rStr, nSearchFamily, nMask); } void SetSearchMask(SfxStyleFamily eFam, sal_uInt16 n=SFXSTYLEBIT_ALL ); @@ -274,19 +273,18 @@ class SVL_DLLPUBLIC SfxStyleSheet: public SfxStyleSheetBase, public: TYPEINFO(); - SfxStyleSheet( const UniString&, const SfxStyleSheetBasePool&, SfxStyleFamily, sal_uInt16 ); + SfxStyleSheet( const OUString&, const SfxStyleSheetBasePool&, SfxStyleFamily, sal_uInt16 ); SfxStyleSheet( const SfxStyleSheet& ); virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); virtual bool isUsedByModel() const; - virtual bool SetParent( const UniString& ); + virtual bool SetParent( const OUString& ); protected: SfxStyleSheet() // do not use! needed by MSVC at compile time to satisfy ImplInheritanceHelper2 - : SfxStyleSheetBase(OUString("dummy"), - NULL, SFX_STYLE_FAMILY_ALL, 0) + : SfxStyleSheetBase(OUString("dummy"), NULL, SFX_STYLE_FAMILY_ALL, 0) { assert(false); } @@ -299,7 +297,7 @@ class SVL_DLLPUBLIC SfxStyleSheetPool: public SfxStyleSheetBasePool { protected: using SfxStyleSheetBasePool::Create; - virtual SfxStyleSheetBase* Create(const UniString&, SfxStyleFamily, sal_uInt16 mask); + virtual SfxStyleSheetBase* Create(const OUString&, SfxStyleFamily, sal_uInt16 mask); virtual SfxStyleSheetBase* Create(const SfxStyleSheet &); public: @@ -354,21 +352,20 @@ public: class SVL_DLLPUBLIC SfxStyleSheetHintExtended: public SfxStyleSheetHint { - String aName; + OUString aName; public: TYPEINFO(); - SfxStyleSheetHintExtended( - sal_uInt16, const String& rOld, - SfxStyleSheetBase& ); - const String& GetOldName() { return aName; } + SfxStyleSheetHintExtended( sal_uInt16, const OUString& rOld, + SfxStyleSheetBase& ); + const OUString& GetOldName() { return aName; } }; class SVL_DLLPUBLIC SfxUnoStyleSheet : public ::cppu::ImplInheritanceHelper2< SfxStyleSheet, ::com::sun::star::style::XStyle, ::com::sun::star::lang::XUnoTunnel > { public: - SfxUnoStyleSheet( const UniString& _rName, const SfxStyleSheetBasePool& _rPool, SfxStyleFamily _eFamily, sal_uInt16 _nMaske ); + SfxUnoStyleSheet( const OUString& _rName, const SfxStyleSheetBasePool& _rPool, SfxStyleFamily _eFamily, sal_uInt16 _nMaske ); static SfxUnoStyleSheet* getUnoStyleSheet( const ::com::sun::star::uno::Reference< ::com::sun::star::style::XStyle >& xStyle ); diff --git a/include/svl/svdde.hxx b/include/svl/svdde.hxx index 0a1d22bd7de1..7f5e7135f11d 100644 --- a/include/svl/svdde.hxx +++ b/include/svl/svdde.hxx @@ -22,7 +22,7 @@ #include "svl/svldllapi.h" #include -#include +#include #include #include @@ -67,7 +67,7 @@ class SVL_DLLPUBLIC DdeData public: DdeData(); DdeData( SAL_UNUSED_PARAMETER const void*, SAL_UNUSED_PARAMETER long, SAL_UNUSED_PARAMETER sal_uLong = FORMAT_STRING ); - DdeData( SAL_UNUSED_PARAMETER const String& ); + DdeData( SAL_UNUSED_PARAMETER const OUString& ); DdeData( const DdeData& ); ~DdeData(); @@ -90,7 +90,7 @@ class SVL_DLLPUBLIC DdeTransaction { public: virtual void Data( const DdeData* ); - virtual void Done( sal_Bool bDataValid ); + virtual void Done( bool bDataValid ); protected: DdeConnection& rDde; DdeData aDdeData; @@ -102,7 +102,7 @@ protected: Link aDone; bool bBusy; - DdeTransaction( DdeConnection&, SAL_UNUSED_PARAMETER const String&, SAL_UNUSED_PARAMETER long = 0 ); + DdeTransaction( DdeConnection&, SAL_UNUSED_PARAMETER const OUString&, SAL_UNUSED_PARAMETER long = 0 ); public: virtual ~DdeTransaction(); @@ -141,7 +141,7 @@ class SVL_DLLPUBLIC DdeLink : public DdeTransaction Link aNotify; public: - DdeLink( DdeConnection&, const String&, long = 0 ); + DdeLink( DdeConnection&, const OUString&, long = 0 ); virtual ~DdeLink(); void SetNotifyHdl( const Link& rLink ) { aNotify = rLink; } @@ -156,7 +156,7 @@ public: class SVL_DLLPUBLIC DdeWarmLink : public DdeLink { public: - DdeWarmLink( DdeConnection&, const String&, long = 0 ); + DdeWarmLink( DdeConnection&, const OUString&, long = 0 ); }; // -------------- @@ -166,7 +166,7 @@ public: class SVL_DLLPUBLIC DdeHotLink : public DdeLink { public: - DdeHotLink( DdeConnection&, const String&, long = 0 ); + DdeHotLink( DdeConnection&, const OUString&, long = 0 ); }; // -------------- @@ -176,7 +176,7 @@ public: class SVL_DLLPUBLIC DdeRequest : public DdeTransaction { public: - DdeRequest( DdeConnection&, const String&, long = 0 ); + DdeRequest( DdeConnection&, const OUString&, long = 0 ); }; // ----------- @@ -186,10 +186,10 @@ public: class SVL_DLLPUBLIC DdePoke : public DdeTransaction { public: - DdePoke( DdeConnection&, const String&, const char*, long, + DdePoke( DdeConnection&, const OUString&, const char*, long, sal_uLong = FORMAT_STRING, long = 0 ); - DdePoke( DdeConnection&, const String&, SAL_UNUSED_PARAMETER const DdeData&, long = 0 ); - DdePoke( DdeConnection&, const String&, const String&, long = 0 ); + DdePoke( DdeConnection&, const OUString&, SAL_UNUSED_PARAMETER const DdeData&, long = 0 ); + DdePoke( DdeConnection&, const OUString&, const OUString&, long = 0 ); }; // -------------- @@ -199,7 +199,7 @@ public: class SVL_DLLPUBLIC DdeExecute : public DdeTransaction { public: - DdeExecute( DdeConnection&, const String&, long = 0 ); + DdeExecute( DdeConnection&, const OUString&, long = 0 ); }; // ----------------- @@ -216,7 +216,7 @@ class SVL_DLLPUBLIC DdeConnection DdeImp* pImp; public: - DdeConnection( SAL_UNUSED_PARAMETER const String&, SAL_UNUSED_PARAMETER const String& ); + DdeConnection( SAL_UNUSED_PARAMETER const OUString&, SAL_UNUSED_PARAMETER const OUString& ); ~DdeConnection(); long GetError(); @@ -224,10 +224,10 @@ public: static const std::vector& GetConnections(); - sal_Bool IsConnected(); + bool IsConnected(); - const String& GetServiceName(); - const String& GetTopicName(); + const OUString GetServiceName(); + const OUString GetTopicName(); private: DdeConnection( const DdeConnection& ); @@ -254,7 +254,7 @@ protected: public: DdeItem( const sal_Unicode* ); - DdeItem( SAL_UNUSED_PARAMETER const String& ); + DdeItem( SAL_UNUSED_PARAMETER const OUString& ); DdeItem( const DdeItem& ); virtual ~DdeItem(); @@ -271,12 +271,12 @@ class SVL_DLLPUBLIC DdeGetPutItem : public DdeItem { public: DdeGetPutItem( const sal_Unicode* p ); - DdeGetPutItem( const String& rStr ); + DdeGetPutItem( const OUString& rStr ); DdeGetPutItem( const DdeItem& rItem ); virtual DdeData* Get( sal_uLong ); - virtual sal_Bool Put( const DdeData* ); - virtual void AdviseLoop( sal_Bool ); // AdviseLoop starten/stoppen + virtual bool Put( const DdeData* ); + virtual void AdviseLoop( bool ); // AdviseLoop starten/stoppen }; // ------------ @@ -291,15 +291,15 @@ public: virtual void Connect( sal_IntPtr ); virtual void Disconnect( sal_IntPtr ); virtual DdeData* Get( sal_uLong ); - virtual sal_Bool Put( const DdeData* ); - virtual sal_Bool Execute( const String* ); + virtual bool Put( const DdeData* ); + virtual bool Execute( const OUString* ); // evt. ein neues anlegen; return 0 -> es konnte nicht angelegt werden - virtual sal_Bool MakeItem( const OUString& rItem ); + virtual bool MakeItem( const OUString& rItem ); // es wird ein Warm-/Hot-Link eingerichtet. Return-Wert // besagt ob es geklappt hat - virtual sal_Bool StartAdviseLoop(); - virtual sal_Bool StopAdviseLoop(); + virtual bool StartAdviseLoop(); + virtual bool StopAdviseLoop(); private: friend class DdeInternal; @@ -334,8 +334,8 @@ public: void SetExecuteHdl( const Link& rLink ) { aExecLink = rLink; } const Link& GetExecuteHdl() const { return aExecLink; } - void NotifyClient( const String& ); - sal_Bool IsSystemTopic(); + void NotifyClient( const OUString& ); + bool IsSystemTopic(); void InsertItem( DdeItem* ); // fuer eigene Ableitungen! DdeItem* AddItem( const DdeItem& ); // werden kopiert ! @@ -357,18 +357,18 @@ class SVL_DLLPUBLIC DdeService friend class DdeInternal; public: - virtual sal_Bool IsBusy(); - virtual String GetHelp(); + virtual bool IsBusy(); + virtual OUString GetHelp(); // evt. ein neues anlegen; return 0 -> es konnte nicht angelegt werden - virtual sal_Bool MakeTopic( const OUString& rItem ); + virtual bool MakeTopic( const OUString& rItem ); protected: - virtual String Topics(); - virtual String Formats(); - virtual String SysItems(); - virtual String Status(); - virtual String SysTopicGet( const String& ); - virtual sal_Bool SysTopicExecute( const String* ); + virtual OUString Topics(); + virtual OUString Formats(); + virtual OUString SysItems(); + virtual OUString Status(); + virtual OUString SysTopicGet( const OUString& ); + virtual bool SysTopicExecute( const OUString* ); const DdeTopic* GetSysTopic() const { return pSysTopic; } private: @@ -379,13 +379,13 @@ private: ConvList* pConv; short nStatus; - SVL_DLLPRIVATE sal_Bool HasCbFormat( sal_uInt16 ); + SVL_DLLPRIVATE bool HasCbFormat( sal_uInt16 ); public: - DdeService( SAL_UNUSED_PARAMETER const String& ); + DdeService( SAL_UNUSED_PARAMETER const OUString& ); virtual ~DdeService(); - const OUString GetName() const; + const OUString GetName() const; short GetError() { return nStatus; } static DdeServices& GetServices(); @@ -396,7 +396,7 @@ public: void AddFormat( sal_uLong ); void RemoveFormat( sal_uLong ); - sal_Bool HasFormat( sal_uLong ); + bool HasFormat( sal_uLong ); private: // DdeService( const DdeService& ); diff --git a/include/svl/undo.hxx b/include/svl/undo.hxx index 3e59baa693db..b16775fa9848 100644 --- a/include/svl/undo.hxx +++ b/include/svl/undo.hxx @@ -65,9 +65,9 @@ public: virtual void Redo(); virtual void RedoWithContext( SfxUndoContext& i_context ); virtual void Repeat(SfxRepeatTarget&); - virtual sal_Bool CanRepeat(SfxRepeatTarget&) const; + virtual bool CanRepeat(SfxRepeatTarget&) const; - virtual sal_Bool Merge( SfxUndoAction *pNextAction ); + virtual bool Merge( SfxUndoAction *pNextAction ); virtual OUString GetComment() const; virtual OUString GetRepeatComment(SfxRepeatTarget&) const; @@ -172,13 +172,13 @@ class SVL_DLLPUBLIC SfxListUndoAction : public SfxUndoAction, public SfxUndoArra virtual void Redo(); virtual void RedoWithContext( SfxUndoContext& i_context ); virtual void Repeat(SfxRepeatTarget&); - virtual sal_Bool CanRepeat(SfxRepeatTarget&) const; + virtual bool CanRepeat(SfxRepeatTarget&) const; - virtual sal_Bool Merge( SfxUndoAction *pNextAction ); + virtual bool Merge( SfxUndoAction *pNextAction ); - virtual OUString GetComment() const; - virtual OUString GetRepeatComment(SfxRepeatTarget&) const; - virtual sal_uInt16 GetId() const; + virtual OUString GetComment() const; + virtual OUString GetRepeatComment(SfxRepeatTarget&) const; + virtual sal_uInt16 GetId() const; void SetComment(const OUString& rComment); @@ -197,14 +197,14 @@ class SVL_DLLPUBLIC SfxListUndoAction : public SfxUndoAction, public SfxUndoArra class SAL_NO_VTABLE SfxUndoListener { public: - virtual void actionUndone( const String& i_actionComment ) = 0; - virtual void actionRedone( const String& i_actionComment ) = 0; - virtual void undoActionAdded( const String& i_actionComment ) = 0; + virtual void actionUndone( const OUString& i_actionComment ) = 0; + virtual void actionRedone( const OUString& i_actionComment ) = 0; + virtual void undoActionAdded( const OUString& i_actionComment ) = 0; virtual void cleared() = 0; virtual void clearedRedo() = 0; virtual void resetAll() = 0; - virtual void listActionEntered( const String& i_comment ) = 0; - virtual void listActionLeft( const String& i_comment ) = 0; + virtual void listActionEntered( const OUString& i_comment ) = 0; + virtual void listActionLeft( const OUString& i_comment ) = 0; virtual void listActionLeftAndMerged() = 0; virtual void listActionCancelled() = 0; virtual void undoManagerDying() = 0; @@ -231,7 +231,7 @@ namespace svl virtual void SetMaxUndoActionCount( size_t nMaxUndoActionCount ) = 0; virtual size_t GetMaxUndoActionCount() const = 0; - virtual void AddUndoAction( SfxUndoAction *pAction, sal_Bool bTryMerg=sal_False ) = 0; + virtual void AddUndoAction( SfxUndoAction *pAction, bool bTryMerg=false ) = 0; virtual size_t GetUndoActionCount( bool const i_currentLevel = CurrentLevel ) const = 0; virtual sal_uInt16 GetUndoActionId() const = 0; @@ -242,8 +242,8 @@ namespace svl virtual OUString GetRedoActionComment( size_t nNo=0, bool const i_currentLevel = CurrentLevel ) const = 0; virtual SfxUndoAction* GetRedoAction( size_t nNo=0, bool const i_currentLevel = CurrentLevel ) const = 0; - virtual sal_Bool Undo() = 0; - virtual sal_Bool Redo() = 0; + virtual bool Undo() = 0; + virtual bool Redo() = 0; /** clears both the Redo and the Undo stack. @@ -272,8 +272,8 @@ namespace svl virtual size_t GetRepeatActionCount() const = 0; virtual OUString GetRepeatActionComment( SfxRepeatTarget &rTarget) const = 0; - virtual sal_Bool Repeat( SfxRepeatTarget &rTarget ) = 0; - virtual sal_Bool CanRepeat( SfxRepeatTarget &rTarget ) const = 0; + virtual bool Repeat( SfxRepeatTarget &rTarget ) = 0; + virtual bool CanRepeat( SfxRepeatTarget &rTarget ) const = 0; virtual void EnterListAction(const OUString &rComment, const OUString& rRepeatComment, sal_uInt16 nId=0) = 0; @@ -352,7 +352,7 @@ public: // IUndoManager overridables virtual void SetMaxUndoActionCount( size_t nMaxUndoActionCount ); virtual size_t GetMaxUndoActionCount() const; - virtual void AddUndoAction( SfxUndoAction *pAction, sal_Bool bTryMerg=sal_False ); + virtual void AddUndoAction( SfxUndoAction *pAction, bool bTryMerg=false ); virtual size_t GetUndoActionCount( bool const i_currentLevel = CurrentLevel ) const; virtual sal_uInt16 GetUndoActionId() const; virtual OUString GetUndoActionComment( size_t nNo=0, bool const i_currentLevel = CurrentLevel ) const; @@ -360,16 +360,16 @@ public: virtual size_t GetRedoActionCount( bool const i_currentLevel = CurrentLevel ) const; virtual OUString GetRedoActionComment( size_t nNo=0, bool const i_currentLevel = CurrentLevel ) const; virtual SfxUndoAction* GetRedoAction( size_t nNo=0, bool const i_currentLevel = CurrentLevel ) const; - virtual sal_Bool Undo(); - virtual sal_Bool Redo(); + virtual bool Undo(); + virtual bool Redo(); virtual void Clear(); virtual void ClearRedo(); virtual void Reset(); virtual bool IsDoing() const; virtual size_t GetRepeatActionCount() const; virtual OUString GetRepeatActionComment( SfxRepeatTarget &rTarget) const; - virtual sal_Bool Repeat( SfxRepeatTarget &rTarget ); - virtual sal_Bool CanRepeat( SfxRepeatTarget &rTarget ) const; + virtual bool Repeat( SfxRepeatTarget &rTarget ); + virtual bool CanRepeat( SfxRepeatTarget &rTarget ) const; virtual void EnterListAction(const OUString &rComment, const OUString& rRepeatComment, sal_uInt16 nId=0); virtual size_t LeaveListAction(); virtual size_t LeaveAndMergeListAction(); @@ -399,8 +399,8 @@ public: void RemoveOldestUndoActions( size_t const i_count ); protected: - sal_Bool UndoWithContext( SfxUndoContext& i_context ); - sal_Bool RedoWithContext( SfxUndoContext& i_context ); + bool UndoWithContext( SfxUndoContext& i_context ); + bool RedoWithContext( SfxUndoContext& i_context ); void ImplClearRedo_NoLock( bool const i_currentLevel ); @@ -426,8 +426,8 @@ private: bool ImplIsInListAction_Lock() const; void ImplEnableUndo_Lock( bool const i_enable ); - sal_Bool ImplUndo( SfxUndoContext* i_contextOrNull ); - sal_Bool ImplRedo( SfxUndoContext* i_contextOrNull ); + bool ImplUndo( SfxUndoContext* i_contextOrNull ); + bool ImplRedo( SfxUndoContext* i_contextOrNull ); friend class ::svl::undo::impl::LockGuard; }; @@ -462,19 +462,19 @@ public: virtual void Undo(); virtual void Redo(); - virtual sal_Bool CanRepeat(SfxRepeatTarget& r) const; + virtual bool CanRepeat(SfxRepeatTarget& r) const; virtual void Repeat(SfxRepeatTarget&r); - virtual OUString GetComment() const; - virtual OUString GetRepeatComment(SfxRepeatTarget&r) const; - virtual sal_uInt16 GetId() const; + virtual OUString GetComment() const; + virtual OUString GetRepeatComment(SfxRepeatTarget&r) const; + virtual sal_uInt16 GetId() const; SfxUndoAction* GetAction() const { return pAction; } protected: - ::svl::IUndoManager *pUndoManager; - SfxUndoAction *pAction; + ::svl::IUndoManager* pUndoManager; + SfxUndoAction* pAction; }; diff --git a/include/svl/zforlist.hxx b/include/svl/zforlist.hxx index 311e01369ad5..34521c8df80d 100644 --- a/include/svl/zforlist.hxx +++ b/include/svl/zforlist.hxx @@ -22,7 +22,7 @@ #include "svl/svldllapi.h" #include #include -#include +#include #include #include #include @@ -447,11 +447,6 @@ public: rNewInserted==false and rCheckPos>0 the format code has errors and/or could not be converted. */ - sal_uInt32 GetIndexPuttingAndConverting( String & rString, LanguageType eLnge, - LanguageType eSysLnge, short & rType, - bool & rNewInserted, - xub_StrLen & rCheckPos ); - sal_uInt32 GetIndexPuttingAndConverting( OUString & rString, LanguageType eLnge, LanguageType eSysLnge, short & rType, bool & rNewInserted, sal_Int32 & rCheckPos ); @@ -472,10 +467,6 @@ public: */ bool IsNumberFormat( const OUString& sString, sal_uInt32& F_Index, double& fOutNumber ); - /// Format a number according to a format index, return string and color - void GetOutputString( const double& fOutNumber, sal_uInt32 nFIndex, - String& sOutString, Color** ppColor, bool bUseStarFormat = false ); - /// Format a number according to a format index, return string and color void GetOutputString( const double& fOutNumber, sal_uInt32 nFIndex, OUString& sOutString, Color** ppColor, bool bUseStarFormat = false ); @@ -488,9 +479,6 @@ public: /** Format a number according to the standard default format matching the given format index */ - void GetInputLineString( const double& fOutNumber, - sal_uInt32 nFIndex, String& sOutString ); - void GetInputLineString( const double& fOutNumber, sal_uInt32 nFIndex, OUString& rOutString ); @@ -724,7 +712,7 @@ public: If ppEntry is not NULL and exactly one entry is found, a [$xxx-nnn] is returned, even if the format code only contains [$xxx] ! */ - bool GetNewCurrencySymbolString( sal_uInt32 nFormat, String& rSymbol, + bool GetNewCurrencySymbolString( sal_uInt32 nFormat, OUString& rSymbol, const NfCurrencyEntry** ppEntry = NULL, bool* pBank = NULL ) const; -- cgit v1.2.3