diff options
| author | Noel Grandin <noel@peralex.com> | 2013-10-09 11:33:58 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-10-10 09:19:03 +0200 |
| commit | 79f52d249fe043e6ec54be6ffa0c71a748920394 (patch) | |
| tree | 8004b449e34044d7fd8151feb4713d07e68640f6 /sw/source/ui/inc | |
| parent | 0d68db266515b68f68c38fe60300ea963370bf59 (diff) | |
convert sw/source/ui/inc/e*.hxx from String to OUString
Change-Id: I5303db6a8f99184bd4f90b53522b6696c4ce8eed
Diffstat (limited to 'sw/source/ui/inc')
| -rw-r--r-- | sw/source/ui/inc/edtwin.hxx | 8 | ||||
| -rw-r--r-- | sw/source/ui/inc/envimg.hxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/inc/envlop.hxx | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/ui/inc/edtwin.hxx b/sw/source/ui/inc/edtwin.hxx index 99cbf594a81f..86e5483c9c2a 100644 --- a/sw/source/ui/inc/edtwin.hxx +++ b/sw/source/ui/inc/edtwin.hxx @@ -67,7 +67,7 @@ friend void SizeNotify(ViewShell* pVwSh, const Size &); friend void PageNumNotify( ViewShell* pVwSh, sal_uInt16 nPhyNum, sal_uInt16 nVirtNum, - const String& rPg ); + const OUString& rPg ); static QuickHelpData* m_pQuickHlpData; @@ -89,7 +89,7 @@ friend void PageNumNotify( ViewShell* pVwSh, // timer for ANY-KeyInut question without a following KeyInputEvent Timer m_aKeyInputFlushTimer; - String m_aInBuffer; + OUString m_aInBuffer; LanguageType m_eBufferLanguage; Point m_aStartPos; Point m_aMovePos; @@ -210,7 +210,7 @@ protected: virtual OUString GetSurroundingText() const; virtual Selection GetSurroundingTextSelection() const; - void ShowAutoTextCorrectQuickHelp( const String& rWord, SvxAutoCorrCfg* pACfg, + void ShowAutoTextCorrectQuickHelp( const OUString& rWord, SvxAutoCorrCfg* pACfg, SvxAutoCorrect* pACorr, bool bFromIME = false ); /// Returns true if in header/footer area, or in the header/footer control. @@ -245,7 +245,7 @@ public: sal_Bool IsChainMode() const { return m_bChainMode; } void FlushInBuffer(); - sal_Bool IsInputSequenceCheckingRequired( const String &rText, const SwPaM& rCrsr ) const; + sal_Bool IsInputSequenceCheckingRequired( const OUString &rText, const SwPaM& rCrsr ) const; void SetApplyTemplate(const SwApplyTemplate &); SwApplyTemplate* GetApplyTemplate() const { return m_pApplyTempl; } diff --git a/sw/source/ui/inc/envimg.hxx b/sw/source/ui/inc/envimg.hxx index c9902fc6202a..fc6b6e91ee75 100644 --- a/sw/source/ui/inc/envimg.hxx +++ b/sw/source/ui/inc/envimg.hxx @@ -24,7 +24,7 @@ #include "swdllapi.h" // MakeSender ----------------------------------------------------------------- -SW_DLLPUBLIC String MakeSender(); +SW_DLLPUBLIC OUString MakeSender(); // enum ----------------------------------------------------------------------- enum SwEnvAlign diff --git a/sw/source/ui/inc/envlop.hxx b/sw/source/ui/inc/envlop.hxx index 4998b3017c47..fbd8d3805a22 100644 --- a/sw/source/ui/inc/envlop.hxx +++ b/sw/source/ui/inc/envlop.hxx @@ -90,7 +90,7 @@ class SwEnvPage : public SfxTabPage SwEnvPreview* m_pPreview; SwWrtShell* pSh; - String sActDBName; + OUString sActDBName; SwEnvPage(Window* pParent, const SfxItemSet& rSet); ~SwEnvPage(); |