diff options
author | Noel Grandin <noel@peralex.com> | 2013-09-26 14:39:41 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-10-04 08:48:56 +0200 |
commit | cd41f81e8df7f092d44889d351018b163e6e828d (patch) | |
tree | 5f9df6a8f2be3ba50e5c44e69b5f8d5cdc169262 /sc/source/ui | |
parent | 9ed124caa3e60593b3db4980685c9eb013542f2f (diff) |
convert sc/source/ui/inc/p*.hxx from String to OUString
Change-Id: I80a181a9f3e9c3671493994d08ceb027b3a41b79
Diffstat (limited to 'sc/source/ui')
-rw-r--r-- | sc/source/ui/dbgui/pvfundlg.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/inc/preview.hxx | 2 | ||||
-rw-r--r-- | sc/source/ui/inc/prevwsh.hxx | 2 | ||||
-rw-r--r-- | sc/source/ui/inc/pvfundlg.hxx | 4 | ||||
-rw-r--r-- | sc/source/ui/view/preview.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/view/prevwsh.cxx | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/sc/source/ui/dbgui/pvfundlg.cxx b/sc/source/ui/dbgui/pvfundlg.cxx index f9e468bbf668..0034688f8bed 100644 --- a/sc/source/ui/dbgui/pvfundlg.cxx +++ b/sc/source/ui/dbgui/pvfundlg.cxx @@ -335,7 +335,7 @@ const OUString& ScDPFunctionDlg::GetBaseItemName(const OUString& rLayoutName) co return itr == maBaseItemNameMap.end() ? rLayoutName : itr->second; } -sal_uInt16 ScDPFunctionDlg::FindBaseItemPos( const String& rEntry, sal_uInt16 nStartPos ) const +sal_uInt16 ScDPFunctionDlg::FindBaseItemPos( const OUString& rEntry, sal_uInt16 nStartPos ) const { sal_uInt16 nPos = nStartPos; bool bFound = false; @@ -721,7 +721,7 @@ const OUString& ScDPSubtotalOptDlg::GetFieldName(const OUString& rLayoutName) co } sal_uInt16 ScDPSubtotalOptDlg::FindListBoxEntry( - const ListBox& rLBox, const String& rEntry, sal_uInt16 nStartPos ) const + const ListBox& rLBox, const OUString& rEntry, sal_uInt16 nStartPos ) const { sal_uInt16 nPos = nStartPos; bool bFound = false; diff --git a/sc/source/ui/inc/preview.hxx b/sc/source/ui/inc/preview.hxx index d88d9733e118..3032defb8390 100644 --- a/sc/source/ui/inc/preview.hxx +++ b/sc/source/ui/inc/preview.hxx @@ -137,7 +137,7 @@ public: const ScPreviewLocationData& GetLocationData(); - String GetPosString(); + OUString GetPosString(); long GetPageNo() const { return nPageNo; } sal_uInt16 GetZoom() const { return nZoom; } diff --git a/sc/source/ui/inc/prevwsh.hxx b/sc/source/ui/inc/prevwsh.hxx index c358280cce4b..daa8cad499c5 100644 --- a/sc/source/ui/inc/prevwsh.hxx +++ b/sc/source/ui/inc/prevwsh.hxx @@ -71,7 +71,7 @@ protected: virtual void InnerResizePixel( const Point &rOfs, const Size &rSize ); virtual void OuterResizePixel( const Point &rOfs, const Size &rSize ); - virtual String GetDescription() const; + virtual OUString GetDescription() const; virtual void WriteUserData(OUString &, bool bBrowse = false); virtual void ReadUserData(const OUString &, bool bBrowse = false); diff --git a/sc/source/ui/inc/pvfundlg.hxx b/sc/source/ui/inc/pvfundlg.hxx index 6efd087daadb..63cc80e79e70 100644 --- a/sc/source/ui/inc/pvfundlg.hxx +++ b/sc/source/ui/inc/pvfundlg.hxx @@ -75,7 +75,7 @@ private: const OUString& GetBaseItemName(const OUString& rLayoutName) const; /** Searches for a listbox entry, starts search at specified position. */ - sal_uInt16 FindBaseItemPos( const String& rEntry, sal_uInt16 nStartPos ) const; + sal_uInt16 FindBaseItemPos( const OUString& rEntry, sal_uInt16 nStartPos ) const; DECL_LINK( SelectHdl, ListBox* ); DECL_LINK( DblClickHdl, void* ); @@ -165,7 +165,7 @@ private: const OUString& GetFieldName(const OUString& rLayoutName) const; /** Searches for a listbox entry, starts search at specified position. */ - sal_uInt16 FindListBoxEntry( const ListBox& rLBox, const String& rEntry, sal_uInt16 nStartPos ) const; + sal_uInt16 FindListBoxEntry( const ListBox& rLBox, const OUString& rEntry, sal_uInt16 nStartPos ) const; DECL_LINK( RadioClickHdl, RadioButton* ); DECL_LINK( CheckHdl, CheckBox* ); diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx index 8ad3ec4ceff2..66850d5dd72b 100644 --- a/sc/source/ui/view/preview.cxx +++ b/sc/source/ui/view/preview.cxx @@ -652,7 +652,7 @@ void ScPreview::DataChanged(bool bNewTime) } -String ScPreview::GetPosString() +OUString ScPreview::GetPosString() { if (!bValid) { diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx index cc672da02486..b3f725a25189 100644 --- a/sc/source/ui/view/prevwsh.cxx +++ b/sc/source/ui/view/prevwsh.cxx @@ -206,7 +206,7 @@ void ScPreviewShell::InitStartTable(SCTAB nTab) //------------------------------------------------------------------ -String ScPreviewShell::GetDescription() const +OUString ScPreviewShell::GetDescription() const { return OUString(" ** Test ** "); } |