diff options
author | Noel Grandin <noel@peralex.com> | 2013-10-08 14:59:26 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-10-10 09:19:00 +0200 |
commit | 3b5a0ea9bbbcee299cc0a20482671e0a13d8567c (patch) | |
tree | 1a2ea37290de6bb46c9fec6c7ba12b10ed9ecce3 /sw/source/ui/inc | |
parent | convert sw/source/ui/inc/t*.hxx from String to OUString (diff) | |
download | core-3b5a0ea9bbbcee299cc0a20482671e0a13d8567c.tar.gz core-3b5a0ea9bbbcee299cc0a20482671e0a13d8567c.zip |
convert sw/source/ui/inc/sw*.hxx from String to OUString
Change-Id: I75ee55f9a8e2b7036621adbee40b92f29029f366
Diffstat (limited to 'sw/source/ui/inc')
-rw-r--r-- | sw/source/ui/inc/swcont.hxx | 6 | ||||
-rw-r--r-- | sw/source/ui/inc/swdtflvr.hxx | 2 | ||||
-rw-r--r-- | sw/source/ui/inc/swlbox.hxx | 6 | ||||
-rw-r--r-- | sw/source/ui/inc/swuicnttab.hxx | 20 | ||||
-rw-r--r-- | sw/source/ui/inc/swuiidxmrk.hxx | 12 |
5 files changed, 23 insertions, 23 deletions
diff --git a/sw/source/ui/inc/swcont.hxx b/sw/source/ui/inc/swcont.hxx index a5daaba4012d..1f689e3e5e99 100644 --- a/sw/source/ui/inc/swcont.hxx +++ b/sw/source/ui/inc/swcont.hxx @@ -70,15 +70,15 @@ class SwTypeNumber class SwContent : public SwTypeNumber { const SwContentType* pParent; - String sContentName; + OUString sContentName; long nYPosition; sal_Bool bInvisible; public: - SwContent(const SwContentType* pCnt, const String& rName, long nYPos ); + SwContent(const SwContentType* pCnt, const OUString& rName, long nYPos ); virtual sal_Bool IsProtect() const; const SwContentType* GetParent() const {return pParent;} - const String& GetName() const {return sContentName;} + const OUString& GetName() const {return sContentName;} int operator==(const SwContent& /*rCont*/) const { // they're never equal, otherwise they'd fall out of the array diff --git a/sw/source/ui/inc/swdtflvr.hxx b/sw/source/ui/inc/swdtflvr.hxx index dbc78b081017..7e4e68c3b77e 100644 --- a/sw/source/ui/inc/swdtflvr.hxx +++ b/sw/source/ui/inc/swdtflvr.hxx @@ -163,7 +163,7 @@ public: int Copy( sal_Bool bIsCut = sal_False ); int PrepareForCopy( sal_Bool bIsCut = sal_False ); int CalculateAndCopy(); // special for Calculator - int CopyGlossary( SwTextBlocks& rGlossary, const String& rStr ); + int CopyGlossary( SwTextBlocks& rGlossary, const OUString& rStr ); // remove the DDE-Link format promise void RemoveDDELinkFormat( const Window& rWin ); diff --git a/sw/source/ui/inc/swlbox.hxx b/sw/source/ui/inc/swlbox.hxx index 1b8a02f4e12d..0ae0b7400934 100644 --- a/sw/source/ui/inc/swlbox.hxx +++ b/sw/source/ui/inc/swlbox.hxx @@ -39,15 +39,15 @@ class SW_DLLPUBLIC SwBoxEntry sal_Bool bModified : 1; sal_Bool bNew : 1; - String aName; + OUString aName; sal_uInt16 nId; public: - SwBoxEntry(const String& aName, sal_uInt16 nId=0); + SwBoxEntry(const OUString& aName, sal_uInt16 nId=0); SwBoxEntry(const SwBoxEntry& rOrg); SwBoxEntry(); - const String& GetName() const { return aName;} + const OUString& GetName() const { return aName;} }; /*-------------------------------------------------------------------- diff --git a/sw/source/ui/inc/swuicnttab.hxx b/sw/source/ui/inc/swuicnttab.hxx index 4c9c9c2ada5e..46753d73af97 100644 --- a/sw/source/ui/inc/swuicnttab.hxx +++ b/sw/source/ui/inc/swuicnttab.hxx @@ -122,7 +122,7 @@ public: void CreateOrUpdateExample( TOXTypes nTOXIndex, sal_uInt16 nPage = 0, sal_uInt16 nCurLevel = USHRT_MAX); - static sal_Bool IsNoNum(SwWrtShell& rSh, const String& rName); + static sal_Bool IsNoNum(SwWrtShell& rSh, const OUString& rName); }; class IndexEntryResource; @@ -192,11 +192,11 @@ class SwTOXSelectTabPage : public SfxTabPage IndexEntryResource* pIndexRes; - String aStyleArr[MAXLEVEL]; - String sAutoMarkURL; - String sAutoMarkType; - String sAddStyleUser; - String sAddStyleContent; + OUString aStyleArr[MAXLEVEL]; + OUString sAutoMarkURL; + OUString sAutoMarkType; + OUString sAddStyleUser; + OUString sAddStyleContent; const IndexEntrySupplierWrapper* pIndexEntryWrapper; @@ -271,7 +271,7 @@ class SwTokenWindow : public VclHBox, public VclBuilderContainer void SetActiveControl(Control* pSet); - Control* InsertItem(const String& rText, const SwFormToken& aToken); + Control* InsertItem(const OUString& rText, const SwFormToken& aToken); void AdjustPositions(); void AdjustScrolling(); void MoveControls(long nOffset); @@ -289,7 +289,7 @@ public: void SetInvalid() {bValid = sal_False;} - String GetPattern() const; + OUString GetPattern() const; void SetButtonSelectedHdl(const Link& rLink) { aButtonSelectedHdl = rLink;} @@ -299,7 +299,7 @@ public: Control* GetActiveControl() { return pActiveCtrl;} - void InsertAtSelection(const String& rText, const SwFormToken& aToken); + void InsertAtSelection(const OUString& rText, const SwFormToken& aToken); void RemoveControl(SwTOXButton* pDel, sal_Bool bInternalCall = sal_False); sal_Bool Contains(FormTokenType) const; @@ -437,7 +437,7 @@ public: const SfxItemSet& rAttrSet); void SetWrtShell(SwWrtShell& rSh); - String GetLevelHelp(sal_uInt16 nLevel) const; + OUString GetLevelHelp(sal_uInt16 nLevel) const; void PreTokenButtonRemoved(const SwFormToken& rToken); }; diff --git a/sw/source/ui/inc/swuiidxmrk.hxx b/sw/source/ui/inc/swuiidxmrk.hxx index f09254e2db94..33e310589985 100644 --- a/sw/source/ui/inc/swuiidxmrk.hxx +++ b/sw/source/ui/inc/swuiidxmrk.hxx @@ -88,7 +88,7 @@ class SwIndexMarkPane PushButton* m_pPrevBT; PushButton* m_pNextBT; - String aOrgStr; + OUString aOrgStr; sal_Bool bDel; sal_Bool bNewMark; sal_Bool bSelected; @@ -126,7 +126,7 @@ class SwIndexMarkPane //it needs to be called ones if this dialog is opened to create a new entry (in InitControls), //or otherwise it has to be called for each changed TOXMark (in UpdateDialog) void UpdateLanguageDependenciesForPhoneticReading(); - String GetDefaultPhoneticReading( const String& rText ); + OUString GetDefaultPhoneticReading( const OUString& rText ); void UpdateKeyBoxes(); @@ -147,7 +147,7 @@ public: ~SwIndexMarkPane(); void ReInitDlg(SwWrtShell& rWrtShell, SwTOXMark* pCurTOXMark = 0); - sal_Bool IsTOXType(const String& rName) + sal_Bool IsTOXType(const OUString& rName) {return LISTBOX_ENTRY_NOTFOUND != m_pTypeDCB->GetEntryPos(rName);} }; @@ -202,10 +202,10 @@ class SwAuthorMarkPane SwWrtShell* pSh; - String m_sColumnTitles[AUTH_FIELD_END]; - String m_sFields[AUTH_FIELD_END]; + OUString m_sColumnTitles[AUTH_FIELD_END]; + OUString m_sFields[AUTH_FIELD_END]; - String m_sCreatedEntry[AUTH_FIELD_END]; + OUString m_sCreatedEntry[AUTH_FIELD_END]; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > xBibAccess; |