summaryrefslogtreecommitdiffstats
path: root/sw/source/ui/inc
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2013-10-09 08:37:57 +0200
committerNoel Grandin <noel@peralex.com>2013-10-10 09:19:03 +0200
commite8d048259fbb2512816624782cce5e0d8a1740bc (patch)
treebf16d5479a0b44bc909b8d0b3761ae5167fbb2c0 /sw/source/ui/inc
parentconvert sw/source/ui/inc/i*.hxx from String to OUString (diff)
downloadcore-e8d048259fbb2512816624782cce5e0d8a1740bc.tar.gz
core-e8d048259fbb2512816624782cce5e0d8a1740bc.zip
convert sw/source/ui/inc/g*.hxx from String to OUString
Change-Id: I612c4f99349eea8efceb5cd83a2533f478b74d39
Diffstat (limited to 'sw/source/ui/inc')
-rw-r--r--sw/source/ui/inc/glosbib.hxx10
-rw-r--r--sw/source/ui/inc/gloslst.hxx4
-rw-r--r--sw/source/ui/inc/glshell.hxx28
3 files changed, 21 insertions, 21 deletions
diff --git a/sw/source/ui/inc/glosbib.hxx b/sw/source/ui/inc/glosbib.hxx
index c943d8fa732e..e1c95a46788a 100644
--- a/sw/source/ui/inc/glosbib.hxx
+++ b/sw/source/ui/inc/glosbib.hxx
@@ -52,9 +52,9 @@ public:
struct GlosBibUserData
{
- String sPath;
- String sGroupName;
- String sGroupTitle;
+ OUString sPath;
+ OUString sGroupName;
+ OUString sGroupTitle;
};
class SwGlossaryGroupTLB : public SvTabListBox
@@ -90,7 +90,7 @@ class SwGlossaryGroupDlg : public SvxStandardDialog
SwGlossaryHdl *pGlosHdl;
- String sCreatedGroup;
+ OUString sCreatedGroup;
sal_Bool IsDeleteAllowed(const OUString &rGroup);
@@ -108,7 +108,7 @@ public:
SwGlossaryHdl *pGlosHdl);
~SwGlossaryGroupDlg();
- const String& GetCreatedGroupName() const {return sCreatedGroup;}
+ const OUString& GetCreatedGroupName() const {return sCreatedGroup;}
};
#endif
diff --git a/sw/source/ui/inc/gloslst.hxx b/sw/source/ui/inc/gloslst.hxx
index 1c83e7d43fd1..8c9fca86bb3c 100644
--- a/sw/source/ui/inc/gloslst.hxx
+++ b/sw/source/ui/inc/gloslst.hxx
@@ -57,8 +57,8 @@ public:
~SwGlossaryList();
bool HasLongName(const OUString& rBegin, std::vector<OUString> *pLongNames);
- sal_Bool GetShortName(const String& rLongName,
- String& rShortName, String& rGroupName );
+ sal_Bool GetShortName(const OUString& rLongName,
+ OUString& rShortName, OUString& rGroupName );
sal_uInt16 GetGroupCount();
OUString GetGroupName(sal_uInt16 nPos, bool bNoPath = true);
diff --git a/sw/source/ui/inc/glshell.hxx b/sw/source/ui/inc/glshell.hxx
index abe5fac02bad..48b8a8c3fe3f 100644
--- a/sw/source/ui/inc/glshell.hxx
+++ b/sw/source/ui/inc/glshell.hxx
@@ -22,9 +22,9 @@
class SwGlosDocShell : public SwDocShell
{
- String aLongName;
- String aShortName;
- String aGroupName;
+ OUString aLongName;
+ OUString aShortName;
+ OUString aGroupName;
using SotObject::GetInterface;
@@ -41,21 +41,21 @@ public:
void Execute( SfxRequest& );
void GetState( SfxItemSet& );
- void SetLongName( const String& rLongName )
+ void SetLongName( const OUString& rLongName )
{ aLongName = rLongName; }
- void SetShortName( const String& rShortName )
+ void SetShortName( const OUString& rShortName )
{ aShortName = rShortName; }
- void SetGroupName( const String& rGroupName )
+ void SetGroupName( const OUString& rGroupName )
{ aGroupName = rGroupName; }
- const String& GetShortName(){return aShortName;}
+ const OUString& GetShortName(){return aShortName;}
};
class SwWebGlosDocShell : public SwWebDocShell
{
- String aLongName;
- String aShortName;
- String aGroupName;
+ OUString aLongName;
+ OUString aShortName;
+ OUString aGroupName;
using SotObject::GetInterface;
@@ -72,13 +72,13 @@ public:
void Execute( SfxRequest& );
void GetState( SfxItemSet& );
- void SetLongName( const String& rLongName )
+ void SetLongName( const OUString& rLongName )
{ aLongName = rLongName; }
- void SetShortName( const String& rShortName )
+ void SetShortName( const OUString& rShortName )
{ aShortName = rShortName; }
- void SetGroupName( const String& rGroupName )
+ void SetGroupName( const OUString& rGroupName )
{ aGroupName = rGroupName; }
- const String& GetShortName(){return aShortName;}
+ const OUString& GetShortName(){return aShortName;}
};
#endif