diff options
author | Noel Grandin <noel@peralex.com> | 2013-09-18 13:49:40 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-09-19 10:14:23 +0200 |
commit | 15b3fbf9385835df4636ec7f10e1d2b94754eab0 (patch) | |
tree | 6ca6f96005ec0b4f01b8542be27f25084081c21e /sd | |
parent | ab0806e183fcdc8b2e4eca2d29b877a41f3ded8b (diff) |
convert sd/.../dlgass.hxx from String to OUString
Change-Id: I1602e3c5bcab59d27c96a2698185b913f5ce69a7
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/ui/dlg/dlgass.cxx | 8 | ||||
-rw-r--r-- | sd/source/ui/inc/TemplateScanner.hxx | 12 |
2 files changed, 10 insertions, 10 deletions
diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx index 0de4bf8393c8..76833b4702ec 100644 --- a/sd/source/ui/dlg/dlgass.cxx +++ b/sd/source/ui/dlg/dlgass.cxx @@ -887,7 +887,7 @@ void AssistentDlgImpl::TemplateScanDone ( { TemplateEntry* pEntry = pDir->maEntries.front(); if (pEntry != NULL) - if (pEntry->msPath.SearchAscii("presnt") != STRING_NOTFOUND) + if (pEntry->msPath.indexOf("presnt") != -1) nFirstEntry = i; } @@ -912,7 +912,7 @@ void AssistentDlgImpl::TemplateScanDone ( { TemplateEntry* pEntry = pDir->maEntries.front(); if (pEntry != NULL) - if (pEntry->msPath.SearchAscii("layout") != STRING_NOTFOUND) + if (pEntry->msPath.indexOf("layout") != -1) nFirstEntry = i; } @@ -1361,7 +1361,7 @@ void AssistentDlgImpl::SelectTemplateRegion( const OUString& rRegion ) { TemplateDir * pDir = *I; mpTemplateRegion = *I; - if (pDir->msRegion.Equals( rRegion ) ) + if (pDir->msRegion == rRegion) { std::vector<TemplateEntry*>::iterator J; for (J=pDir->maEntries.begin(); J!=pDir->maEntries.end(); ++J) @@ -1387,7 +1387,7 @@ void AssistentDlgImpl::SelectLayoutRegion( const OUString& rRegion ) TemplateDir * pDir = *I; mpLayoutRegion = *I; - if (pDir->msRegion.Equals (rRegion)) + if (pDir->msRegion == rRegion) { std::vector<TemplateEntry*>::iterator J; for (J=pDir->maEntries.begin(); J!=pDir->maEntries.end(); ++J) diff --git a/sd/source/ui/inc/TemplateScanner.hxx b/sd/source/ui/inc/TemplateScanner.hxx index 3448b159cd94..2bc3ace2357c 100644 --- a/sd/source/ui/inc/TemplateScanner.hxx +++ b/sd/source/ui/inc/TemplateScanner.hxx @@ -50,11 +50,11 @@ namespace sd { class TemplateEntry { public: - TemplateEntry (const String& rsTitle, const String& rsPath) + TemplateEntry (const OUString& rsTitle, const OUString& rsPath) : msTitle(rsTitle), msPath(rsPath) {} - String msTitle; - String msPath; + OUString msTitle; + OUString msPath; }; @@ -80,12 +80,12 @@ private: class TemplateDir { public: - TemplateDir (const String& rsRegion, const String& rsUrl ) + TemplateDir (const OUString& rsRegion, const OUString& rsUrl ) : msRegion(rsRegion), msUrl(rsUrl), maEntries(), mbSortingEnabled(false), mpEntryCompare(NULL) {} - String msRegion; - String msUrl; + OUString msRegion; + OUString msUrl; ::std::vector<TemplateEntry*> maEntries; void EnableSorting(bool bSortingEnabled = true); |