diff options
author | Noel Grandin <noel@peralex.com> | 2013-10-08 15:28:31 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-10-10 09:19:01 +0200 |
commit | a415487086dd9b372fedc327c2bb5e3824baa5dc (patch) | |
tree | 561f3a231bb831f6447b80814a6931dde3a29566 /sw/source/ui/inc | |
parent | convert sw/source/ui/inc/p*.hxx from String to OUString (diff) | |
download | core-a415487086dd9b372fedc327c2bb5e3824baa5dc.tar.gz core-a415487086dd9b372fedc327c2bb5e3824baa5dc.zip |
convert sw/source/ui/inc/o*.hxx from String to OUString
Change-Id: Iabe90c2dc542c74c7bc890f6618c35d118ee10da
Diffstat (limited to 'sw/source/ui/inc')
-rw-r--r-- | sw/source/ui/inc/olmenu.hxx | 10 | ||||
-rw-r--r-- | sw/source/ui/inc/optload.hxx | 6 | ||||
-rw-r--r-- | sw/source/ui/inc/optpage.hxx | 20 | ||||
-rw-r--r-- | sw/source/ui/inc/outline.hxx | 6 |
4 files changed, 21 insertions, 21 deletions
diff --git a/sw/source/ui/inc/olmenu.hxx b/sw/source/ui/inc/olmenu.hxx index 2a56b37c1ca4..c10712ee284a 100644 --- a/sw/source/ui/inc/olmenu.hxx +++ b/sw/source/ui/inc/olmenu.hxx @@ -56,10 +56,10 @@ class SwSpellPopup : public PopupMenu std::map< sal_Int16, OUString > aLangTable_Paragraph; // std::map< sal_Int16, OUString > aLangTable_Document; - String aDicNameSingle; - bool bGrammarResults; // show grammar results? Or show spellcheck results? + OUString aDicNameSingle; + bool bGrammarResults; // show grammar results? Or show spellcheck results? - Image aInfo16; + Image aInfo16; void fillLangPopupMenu( PopupMenu *pPopupMenu, sal_uInt16 nLangStart, ::com::sun::star::uno::Sequence< OUString > aSeq, SwWrtShell* pWrtSh, @@ -71,13 +71,13 @@ public: SwSpellPopup( SwWrtShell *pWrtSh, const ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellAlternatives > &xAlt, - const String & rParaText ); + const OUString & rParaText ); SwSpellPopup( SwWrtShell *pWrtSh, const ::com::sun::star::linguistic2::ProofreadingResult &rResult, sal_Int32 nErrorInResult, const ::com::sun::star::uno::Sequence< OUString > &rSuggestions, - const String & rParaText ); + const OUString & rParaText ); sal_uInt16 Execute( const Rectangle& rPopupPos, Window* pWin ); void Execute( sal_uInt16 nId ); diff --git a/sw/source/ui/inc/optload.hxx b/sw/source/ui/inc/optload.hxx index a69dee861fcb..0e5fff175133 100644 --- a/sw/source/ui/inc/optload.hxx +++ b/sw/source/ui/inc/optload.hxx @@ -89,13 +89,13 @@ public: class SwCaptionPreview : public Window { private: - String maText; - Point maDrawPos; + OUString maText; + Point maDrawPos; public: SwCaptionPreview( Window* pParent ); SwCaptionPreview( Window* pParent, const ResId& rResId ); void Init(); - void SetPreviewText( const String& rText ); + void SetPreviewText( const OUString& rText ); virtual void Paint( const Rectangle& rRect ); }; diff --git a/sw/source/ui/inc/optpage.hxx b/sw/source/ui/inc/optpage.hxx index b2045cd39242..f1801b49c138 100644 --- a/sw/source/ui/inc/optpage.hxx +++ b/sw/source/ui/inc/optpage.hxx @@ -109,7 +109,7 @@ class SwAddPrinterTabPage : public SfxTabPage CheckBox* m_pPaperFromSetupCB; ListBox* m_pFaxLB; - String sNone; + OUString sNone; sal_Bool bAttrModified; sal_Bool bPreview; @@ -129,7 +129,7 @@ public: virtual sal_Bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); void SetFax( const std::vector<String>& ); - void SelectFax( const String& ); + void SelectFax( const OUString& ); void SetPreview(sal_Bool bPrev); virtual void PageCreated (SfxAllItemSet aSet); @@ -152,11 +152,11 @@ class SwStdFontTabPage : public SfxTabPage CheckBox* pDocOnlyCB ; PushButton* pStandardPB; - String sShellStd; - String sShellTitle; - String sShellList; - String sShellLabel; - String sShellIndex; + OUString sShellStd; + OUString sShellTitle; + OUString sShellList; + OUString sShellLabel; + OUString sShellIndex; SfxPrinter* pPrt; FontList* pFontList; @@ -181,9 +181,9 @@ class SwStdFontTabPage : public SfxTabPage sal_uInt8 nFontGroup; //fontcfg.hxx: FONT_GROUP_[STANDARD|CJK|CTL] - String sScriptWestern; - String sScriptAsian; - String sScriptComplex; + OUString sScriptWestern; + OUString sScriptAsian; + OUString sScriptComplex; DECL_LINK(StandardHdl, void *); DECL_LINK( ModifyHdl, ComboBox * ); diff --git a/sw/source/ui/inc/outline.hxx b/sw/source/ui/inc/outline.hxx index ca984ac50849..bdd3351ebf6c 100644 --- a/sw/source/ui/inc/outline.hxx +++ b/sw/source/ui/inc/outline.hxx @@ -74,7 +74,7 @@ class SwOutlineTabDialog : public SfxTabDialog ~SwOutlineTabDialog(); SwNumRule* GetNumRule() {return pNumRule;} - sal_uInt16 GetLevel(const String &rFmtName) const; + sal_uInt16 GetLevel(const OUString &rFmtName) const; OUString* GetCollNames() {return aCollNames;} static sal_uInt16 GetActNumLevel() {return nNumLevel;} @@ -95,8 +95,8 @@ class SwOutlineSettingsTabPage : public SfxTabPage NumericField* m_pStartEdit; NumberingPreview* m_pPreviewWIN; - String aNoFmtName; - String aSaveCollNames[MAXLEVEL]; + OUString aNoFmtName; + OUString aSaveCollNames[MAXLEVEL]; SwWrtShell* pSh; SwNumRule* pNumRule; OUString* pCollNames; |