diff options
| author | Noel Grandin <noel@peralex.com> | 2013-08-22 14:28:09 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-08-29 09:29:59 +0200 |
| commit | 535667982a9fc4cbb46121a975607afb6e1e87c4 (patch) | |
| tree | 167bcf2c648d19e5035121775a450206ef91d493 /include/sfx2 | |
| parent | 55235ae7676f2e332862084bde32f7b8356a7835 (diff) | |
convert includes/sfx2/tabdlg.hxx from String to OUString
Change-Id: I6aa38e2ab566316a027a9676f418f6da2100fc09
Diffstat (limited to 'include/sfx2')
| -rw-r--r-- | include/sfx2/tabdlg.hxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx index b13252856b43..c6880d39e9ae 100644 --- a/include/sfx2/tabdlg.hxx +++ b/include/sfx2/tabdlg.hxx @@ -103,7 +103,7 @@ friend class SfxTabDialogController; DECL_DLLPRIVATE_LINK(BaseFmtHdl, void *); DECL_DLLPRIVATE_LINK(UserHdl, void *); DECL_DLLPRIVATE_LINK(CancelHdl, void *); - SAL_DLLPRIVATE void Init_Impl( sal_Bool bFmtFlag, const String* pUserButtonText, const ResId* pResId ); + SAL_DLLPRIVATE void Init_Impl( sal_Bool bFmtFlag, const OUString* pUserButtonText, const ResId* pResId ); protected: virtual short Ok(); @@ -138,7 +138,7 @@ public: SfxTabDialog( Window* pParent, const ResId &rResId, const SfxItemSet * = 0, - sal_Bool bEditFmt = sal_False, const String *pUserButtonText = 0 ); + sal_Bool bEditFmt = sal_False, const OUString *pUserButtonText = 0 ); ~SfxTabDialog(); sal_uInt16 AddTabPage( const OString& rName, // Name of the label for the page in the notebook .ui @@ -156,7 +156,7 @@ public: void AddTabPage( sal_uInt16 nId, - const String &rRiderText, + const OUString &rRiderText, CreateTabPage pCreateFunc, // != 0 GetTabPageRanges pRangesFunc, // can be 0 sal_Bool bItemsOnDemand = sal_False, @@ -171,7 +171,7 @@ public: void AddTabPage( sal_uInt16 nId, sal_Bool bItemsOnDemand = sal_False); void AddTabPage( sal_uInt16 nId, - const String &rRiderText, + const OUString &rRiderText, sal_Bool bItemsOnDemand = sal_False, sal_uInt16 nPos = TAB_APPEND); void AddTabPage( sal_uInt16 nId, @@ -247,8 +247,8 @@ friend class SfxTabDialog; private: const SfxItemSet* pSet; - String aUserString; - sal_Bool bHasExchangeSupport; + OUString aUserString; + sal_Bool bHasExchangeSupport; TabPageImpl* pImpl; SAL_DLLPRIVATE void SetInputSet( const SfxItemSet* pNew ) { pSet = pNew; } @@ -292,10 +292,10 @@ public: using TabPage::DeactivatePage; virtual void ActivatePage( const SfxItemSet& ); virtual int DeactivatePage( SfxItemSet* pSet = 0 ); - void SetUserData(const String& rString) - { aUserString = rString; } - String GetUserData() { return aUserString; } - virtual void FillUserData(); + void SetUserData(const OUString& rString) + { aUserString = rString; } + OUString GetUserData() { return aUserString; } + virtual void FillUserData(); virtual sal_Bool IsReadOnly() const; virtual void PageCreated (SfxAllItemSet aSet); static const SfxPoolItem* GetItem( const SfxItemSet& rSet, sal_uInt16 nSlot, sal_Bool bDeep = sal_True ); |