diff options
| author | Matteo Casalin <matteo.casalin@yahoo.com> | 2013-09-22 02:10:24 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-09-26 07:13:28 +0000 |
| commit | 233c387f8962a35c8e7a85f58cf6fe4a269dee98 (patch) | |
| tree | 40f63d541063750d58cca18acb77bf106f9d6a8f /sw/source/ui/inc | |
| parent | String to OUString (diff) | |
| download | core-233c387f8962a35c8e7a85f58cf6fe4a269dee98.tar.gz core-233c387f8962a35c8e7a85f58cf6fe4a269dee98.zip | |
String to OUString
Change-Id: If5569249cc4fd5de99fdf634af1c338d02ddb84b
Reviewed-on: https://gerrit.libreoffice.org/6027
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/source/ui/inc')
| -rw-r--r-- | sw/source/ui/inc/glossary.hxx | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/sw/source/ui/inc/glossary.hxx b/sw/source/ui/inc/glossary.hxx index cb3a8b4c083a..c08f81c394ad 100644 --- a/sw/source/ui/inc/glossary.hxx +++ b/sw/source/ui/inc/glossary.hxx @@ -38,6 +38,8 @@ #include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/text/XAutoTextContainer2.hpp> +#include "rtl/ustring.hxx" + #include <actctrl.hxx> class SwGlossaryHdl; @@ -53,7 +55,7 @@ const short RET_EDIT = 100; class SwGlTreeListBox : public SvTreeListBox { - const String sReadonly; + const OUString sReadonly; SvTreeListEntry* pDragEntry; @@ -103,15 +105,15 @@ class SwGlossaryDlg : public SvxStandardDialog PushButton* m_pBibBtn; PushButton* m_pPathBtn; - String sReadonlyPath; + OUString sReadonlyPath; ::com::sun::star::uno::Reference< ::com::sun::star::text::XAutoTextContainer2 > m_xAutoText; SwOneExampleFrame* pExampleFrame; SwGlossaryHdl* pGlossaryHdl; - String sResumeGroup; - String sResumeShortName; + OUString sResumeGroup; + OUString sResumeShortName; sal_Bool bResume; @@ -140,30 +142,30 @@ class SwGlossaryDlg : public SvxStandardDialog virtual void Apply(); void Init(); - SvTreeListEntry* DoesBlockExist(const String& sBlock, const String& rShort); - void ShowAutoText(const String& rGroup, const String& rShortName); + SvTreeListEntry* DoesBlockExist(const OUString& sBlock, const OUString& rShort); + void ShowAutoText(const OUString& rGroup, const OUString& rShortName); void ResumeShowAutoText(); - sal_Bool GetResumeData(String& rGroup, String& rShortName) + sal_Bool GetResumeData(OUString& rGroup, OUString& rShortName) {rGroup = sResumeGroup; rShortName = sResumeShortName; return bResume;} - void SetResumeData(const String& rGroup, const String& rShortName) + void SetResumeData(const OUString& rGroup, const OUString& rShortName) {sResumeGroup = rGroup; sResumeShortName = rShortName; bResume = sal_True;} void ResetResumeData() {bResume = sal_False;} public: SwGlossaryDlg(SfxViewFrame* pViewFrame, SwGlossaryHdl* pGlosHdl, SwWrtShell *pWrtShell); ~SwGlossaryDlg(); - String GetCurrGrpName() const; - String GetCurrLongName() const + OUString GetCurrGrpName() const; + OUString GetCurrLongName() const { return m_pNameED->GetText(); } - String GetCurrShortName() const + OUString GetCurrShortName() const { return m_pShortNameEdit->GetText(); } static OUString GetCurrGroup(); static void SetActGroup(const OUString& rNewGroup); - static String GetExtension(); + static OUString GetExtension(); }; #endif |