Kaydet (Commit) 15b3fbf9 authored tarafından Noel Grandin's avatar Noel Grandin

convert sd/.../dlgass.hxx from String to OUString

Change-Id: I1602e3c5bcab59d27c96a2698185b913f5ce69a7
üst ab0806e1
......@@ -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)
......
......@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment