diff options
author | Noel Grandin <noel@peralex.com> | 2013-10-09 12:02:55 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-10-10 09:19:04 +0200 |
commit | 6b25dd2f914a7bdd4d39e21675fcedd049192b73 (patch) | |
tree | df621ce971c31da7916392d40458a5c858130b54 /sw/source/ui/inc | |
parent | convert sw/source/ui/inc/d*.hxx from String to OUString (diff) | |
download | core-6b25dd2f914a7bdd4d39e21675fcedd049192b73.tar.gz core-6b25dd2f914a7bdd4d39e21675fcedd049192b73.zip |
convert sw/source/ui/inc/c*.hxx from String to OUString
Change-Id: I8b8c73a0ba9b1e40549c1832ed6ad5b630d4e620
Diffstat (limited to 'sw/source/ui/inc')
-rw-r--r-- | sw/source/ui/inc/caption.hxx | 32 | ||||
-rw-r--r-- | sw/source/ui/inc/cfgitems.hxx | 2 | ||||
-rw-r--r-- | sw/source/ui/inc/changedb.hxx | 2 | ||||
-rw-r--r-- | sw/source/ui/inc/content.hxx | 42 | ||||
-rw-r--r-- | sw/source/ui/inc/conttree.hxx | 28 | ||||
-rw-r--r-- | sw/source/ui/inc/convert.hxx | 2 | ||||
-rw-r--r-- | sw/source/ui/inc/cption.hxx | 6 |
7 files changed, 57 insertions, 57 deletions
diff --git a/sw/source/ui/inc/caption.hxx b/sw/source/ui/inc/caption.hxx index 3dc05c481c43..395100a5d7e4 100644 --- a/sw/source/ui/inc/caption.hxx +++ b/sw/source/ui/inc/caption.hxx @@ -30,14 +30,14 @@ private: sal_Bool bUseCaption; SwCapObjType eObjType; SvGlobalName aOleId; - String sCategory; - sal_uInt16 nNumType; - OUString sNumberSeparator; - String sCaption; - sal_uInt16 nPos; - sal_uInt16 nLevel; - String sSeparator; - String sCharacterStyle; + OUString sCategory; + sal_uInt16 nNumType; + OUString sNumberSeparator; + OUString sCaption; + sal_uInt16 nPos; + sal_uInt16 nLevel; + OUString sSeparator; + OUString sCharacterStyle; bool bIgnoreSeqOpts; // is not being saved sal_Bool bCopyAttributes; // -""- @@ -56,8 +56,8 @@ public: inline const SvGlobalName& GetOleId() const { return aOleId; } inline void SetOleId(const SvGlobalName &rId) { aOleId = rId; } - inline const String& GetCategory() const { return sCategory; } - inline void SetCategory(const String& rCat) { sCategory = rCat; } + inline const OUString& GetCategory() const { return sCategory; } + inline void SetCategory(const OUString& rCat) { sCategory = rCat; } inline sal_uInt16 GetNumType() const { return nNumType; } inline void SetNumType(const sal_uInt16 nNT) { nNumType = nNT; } @@ -65,8 +65,8 @@ public: const OUString& GetNumSeparator() const { return sNumberSeparator; } void SetNumSeparator(const OUString& rSet) {sNumberSeparator = rSet;} - inline const String& GetCaption() const { return sCaption; } - inline void SetCaption(const String& rCap) { sCaption = rCap; } + inline const OUString& GetCaption() const { return sCaption; } + inline void SetCaption(const OUString& rCap) { sCaption = rCap; } inline sal_uInt16 GetPos() const { return nPos; } inline void SetPos(const sal_uInt16 nP) { nPos = nP; } @@ -74,11 +74,11 @@ public: inline sal_uInt16 GetLevel() const { return nLevel; } inline void SetLevel(const sal_uInt16 nLvl) { nLevel = nLvl; } - inline const String& GetSeparator() const { return sSeparator; } - inline void SetSeparator(const String& rSep) { sSeparator = rSep; } + inline const OUString& GetSeparator() const { return sSeparator; } + inline void SetSeparator(const OUString& rSep) { sSeparator = rSep; } - const String& GetCharacterStyle() const { return sCharacterStyle; } - void SetCharacterStyle(const String& rStyle) + const OUString& GetCharacterStyle() const { return sCharacterStyle; } + void SetCharacterStyle(const OUString& rStyle) { sCharacterStyle = rStyle; } inline bool& IgnoreSeqOpts() { return bIgnoreSeqOpts; } diff --git a/sw/source/ui/inc/cfgitems.hxx b/sw/source/ui/inc/cfgitems.hxx index e0a21c16115e..10729e8ea350 100644 --- a/sw/source/ui/inc/cfgitems.hxx +++ b/sw/source/ui/inc/cfgitems.hxx @@ -136,7 +136,7 @@ public: virtual int operator==( const SfxPoolItem& ) const; const OUString &GetFax() const { return sFaxName; } - void SetFax( const String& rFax) { sFaxName = rFax; } + void SetFax( const OUString& rFax) { sFaxName = rFax; } sal_Bool IsPrintProspect() const { return bPrintProspect; } diff --git a/sw/source/ui/inc/changedb.hxx b/sw/source/ui/inc/changedb.hxx index baf68a790f30..85b99df8abe5 100644 --- a/sw/source/ui/inc/changedb.hxx +++ b/sw/source/ui/inc/changedb.hxx @@ -56,7 +56,7 @@ class SwChangeDBDlg: public SvxStandardDialog virtual void Apply(); void UpdateFlds(); void FillDBPopup(); - SvTreeListEntry* Insert(const String& rDBName); + SvTreeListEntry* Insert(const OUString& rDBName); void ShowDBName(const SwDBData& rDBData); public: diff --git a/sw/source/ui/inc/content.hxx b/sw/source/ui/inc/content.hxx index 4e1cbcd77052..9d8d4ddcbf64 100644 --- a/sw/source/ui/inc/content.hxx +++ b/sw/source/ui/inc/content.hxx @@ -58,7 +58,7 @@ class SwOutlineContent : public SwContent bool bIsMoveable; public: SwOutlineContent( const SwContentType* pCnt, - const String& rName, + const OUString& rName, sal_uInt16 nArrPos, sal_uInt8 nLevel, bool bMove, @@ -79,7 +79,7 @@ class SwRegionContent : public SwContent public: SwRegionContent( const SwContentType* pCnt, - const String& rName, + const OUString& rName, sal_uInt8 nLevel, long nYPos) : SwContent(pCnt, rName, nYPos), @@ -90,20 +90,20 @@ class SwRegionContent : public SwContent class SwURLFieldContent : public SwContent { - String sURL; + OUString sURL; const SwTxtINetFmt* pINetAttr; public: SwURLFieldContent( const SwContentType* pCnt, - const String& rName, - const String& rURL, + const OUString& rName, + const OUString& rURL, const SwTxtINetFmt* pAttr, long nYPos ) : SwContent( pCnt, rName, nYPos ), sURL( rURL ), pINetAttr( pAttr ) {} virtual sal_Bool IsProtect() const; - const String& GetURL() { return sURL; } + const OUString& GetURL() { return sURL; } const SwTxtINetFmt* GetINetAttr() { return pINetAttr; } }; @@ -115,13 +115,13 @@ class SwPostItContent : public SwContent bool mbPostIt; public: SwPostItContent( const SwContentType* pCnt, - const String& rName, + const OUString& rName, const SwFmtFld* pField, long nYPos ) : SwContent( pCnt, rName, nYPos ), pFld( pField ),mbPostIt(true) {} SwPostItContent( const SwContentType* pCnt, - const String& rName, + const OUString& rName, SwRedline* pRed, long nYPos ) : SwContent( pCnt, rName, nYPos ), pRedline( pRed ),mbPostIt(false) @@ -137,14 +137,14 @@ public: class SwGraphicContent : public SwContent { - String sLink; + OUString sLink; public: - SwGraphicContent(const SwContentType* pCnt, const String& rName, const String& rLink, long nYPos) + SwGraphicContent(const SwContentType* pCnt, const OUString& rName, const OUString& rLink, long nYPos) : SwContent( pCnt, rName, nYPos ), sLink( rLink ) {} virtual ~SwGraphicContent(); - const String& GetLink() const {return sLink;} + const OUString& GetLink() const {return sLink;} }; //---------------------------------------------------------------------------- @@ -152,7 +152,7 @@ class SwTOXBaseContent : public SwContent { const SwTOXBase* pBase; public: - SwTOXBaseContent(const SwContentType* pCnt, const String& rName, long nYPos, const SwTOXBase& rBase) + SwTOXBaseContent(const SwContentType* pCnt, const OUString& rName, long nYPos, const SwTOXBase& rBase) : SwContent( pCnt, rName, nYPos ), pBase(&rBase) {} virtual ~SwTOXBaseContent(); @@ -171,12 +171,12 @@ class SwContentType : public SwTypeNumber { SwWrtShell* pWrtShell; SwContentArr* pMember; // array for content - String sContentTypeName; // name of content type - String sSingleContentTypeName; // name of content type, singular - String sTypeToken; // attachment for URL - sal_uInt16 nMemberCount; // content count - sal_uInt16 nContentType; // content type's Id - sal_uInt8 nOutlineLevel; + OUString sContentTypeName; // name of content type + OUString sSingleContentTypeName; // name of content type, singular + OUString sTypeToken; // attachment for URL + sal_uInt16 nMemberCount; // content count + sal_uInt16 nContentType; // content type's Id + sal_uInt8 nOutlineLevel; bool bDataValid : 1; // bool bEdit: 1; // can this type be edited? bool bDelete: 1; // can this type be deleted? @@ -192,9 +192,9 @@ public: {return nMemberCount;}; sal_uInt16 GetType() const {return nContentType;} const SwContent* GetMember(sal_uInt16 nIndex); - const String& GetName() {return sContentTypeName;} - const String& GetSingleName() const {return sSingleContentTypeName;} - const String& GetTypeToken() const{return sTypeToken;} + const OUString& GetName() {return sContentTypeName;} + const OUString& GetSingleName() const {return sSingleContentTypeName;} + const OUString& GetTypeToken() const{return sTypeToken;} void SetOutlineLevel(sal_uInt8 nNew) { diff --git a/sw/source/ui/inc/conttree.hxx b/sw/source/ui/inc/conttree.hxx index 818144a638d0..c0cc6fdced44 100644 --- a/sw/source/ui/inc/conttree.hxx +++ b/sw/source/ui/inc/conttree.hxx @@ -49,21 +49,21 @@ class SfxObjectShell; class SwContentTree : public SvTreeListBox { ImageList aEntryImages; - String sSpace; + OUString sSpace; AutoTimer aUpdTimer; SwContentType* aActiveContentArr[CONTENT_TYPE_MAX]; SwContentType* aHiddenContentArr[CONTENT_TYPE_MAX]; - String aContextStrings[CONTEXT_COUNT + 1]; - String sRemoveIdx; - String sUpdateIdx; - String sUnprotTbl; - String sRename; - String sReadonlyIdx; - String sInvisible; - String sPostItShow; - String sPostItHide; - String sPostItDelete; + OUString aContextStrings[CONTEXT_COUNT + 1]; + OUString sRemoveIdx; + OUString sUpdateIdx; + OUString sUnprotTbl; + OUString sRename; + OUString sReadonlyIdx; + OUString sInvisible; + OUString sPostItShow; + OUString sPostItHide; + OUString sPostItDelete; SwWrtShell* pHiddenShell; // dropped Doc SwWrtShell* pActiveShell; // the active or a const. open view @@ -207,7 +207,7 @@ class SwLBoxString : public SvLBoxString public: SwLBoxString( SvTreeListEntry* pEntry, sal_uInt16 nFlags, - const String& rStr ) : SvLBoxString(pEntry,nFlags,rStr) + const OUString& rStr ) : SvLBoxString(pEntry,nFlags,rStr) { } @@ -223,7 +223,7 @@ class SwGlobalTree : public SvTreeListBox { private: AutoTimer aUpdateTimer; - String aContextStrings[GLOBAL_CONTEXT_COUNT]; + OUString aContextStrings[GLOBAL_CONTEXT_COUNT]; ImageList aEntryImages; @@ -313,7 +313,7 @@ public: void TbxMenuHdl(sal_uInt16 nTbxId, ToolBox* pBox); void InsertRegion( const SwGlblDocContent* pCont, - const String* pFileName = 0 ); + const OUString* pFileName = 0 ); void EditContent(const SwGlblDocContent* pCont ); void ShowTree(); diff --git a/sw/source/ui/inc/convert.hxx b/sw/source/ui/inc/convert.hxx index aa53428b1967..02fba96eeaf9 100644 --- a/sw/source/ui/inc/convert.hxx +++ b/sw/source/ui/inc/convert.hxx @@ -51,7 +51,7 @@ class SwConvertTableDlg: public SfxModalDialog CheckBox* mpBorderCB; PushButton* mpAutoFmtBtn; - String sConvertTextTable; + OUString sConvertTextTable; SwTableAutoFmt* pTAutoFmt; SwWrtShell* pShell; diff --git a/sw/source/ui/inc/cption.hxx b/sw/source/ui/inc/cption.hxx index 487cf26870d3..71adbdda2a17 100644 --- a/sw/source/ui/inc/cption.hxx +++ b/sw/source/ui/inc/cption.hxx @@ -85,8 +85,8 @@ class SwCaptionDialog : public SvxStandardDialog SwFldMgr *pMgr; // pointer to save the include SelectionType eType; - String sCharacterStyle; - String sObjectName; + OUString sCharacterStyle; + OUString sObjectName; bool bCopyAttributes; bool bOrderNumberingFirst; //#i61007# order of captions @@ -104,7 +104,7 @@ class SwCaptionDialog : public SvxStandardDialog void CheckButtonWidth(); void ApplyCaptionOrder(); //#i61007# order of captions - static String our_aSepTextSave; // Save caption separator text + static OUString our_aSepTextSave; // Save caption separator text public: SwCaptionDialog( Window *pParent, SwView &rV ); ~SwCaptionDialog(); |