diff options
| author | Kohei Yoshida <kohei.yoshida@suse.com> | 2012-02-02 23:42:34 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@suse.com> | 2012-02-03 00:02:47 -0500 |
| commit | c827b9756f069bec82c559c0e7dee534bcee8c2e (patch) | |
| tree | be2972011cd903744c09b6971bb01fea476a56fc /sc/source/ui/miscdlgs/acredlin.cxx | |
| parent | d7c1b89abd85e6edd317f6c4eb1e86eef02df923 (diff) | |
GetDescription() now deals with rtl::OUString.
Diffstat (limited to 'sc/source/ui/miscdlgs/acredlin.cxx')
| -rw-r--r-- | sc/source/ui/miscdlgs/acredlin.cxx | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx index f3ab4db87d65..b0126304d860 100644 --- a/sc/source/ui/miscdlgs/acredlin.cxx +++ b/sc/source/ui/miscdlgs/acredlin.cxx @@ -337,23 +337,23 @@ bool ScAcceptChgDlg::IsValidAction(const ScChangeAction* pScChangeAction) ScChangeActionType eType=pScChangeAction->GetType(); String aString; - String aDesc; + rtl::OUString aDesc; String aComment = comphelper::string::remove(pScChangeAction->GetComment(), '\n'); if(eType==SC_CAT_CONTENT) { if(!pScChangeAction->IsDialogParent()) - pScChangeAction->GetDescription( aDesc, pDoc, true); + pScChangeAction->GetDescription(aDesc, pDoc, true); } else - pScChangeAction->GetDescription( aDesc, pDoc,!pScChangeAction->IsMasterDelete()); + pScChangeAction->GetDescription(aDesc, pDoc, !pScChangeAction->IsMasterDelete()); - if(aDesc.Len()>0) + if (!aDesc.isEmpty()) { aComment.AppendAscii(RTL_CONSTASCII_STRINGPARAM( " (" )); - aComment+=aDesc; - aComment+=')'; + aComment += String(aDesc); + aComment += ')'; } if(pTheView->IsValidEntry(&aUser,&aDateTime,&aComment)) @@ -395,7 +395,7 @@ SvLBoxEntry* ScAcceptChgDlg::InsertChangeAction( String aRefStr; ScChangeActionType eType=pScChangeAction->GetType(); rtl::OUStringBuffer aBuf; - String aDesc; + rtl::OUString aDesc; ScRedlinData* pNewData=new ScRedlinData; pNewData->pData=(void *)pScChangeAction; @@ -466,11 +466,11 @@ SvLBoxEntry* ScAcceptChgDlg::InsertChangeAction( String aComment = comphelper::string::remove(pScChangeAction->GetComment(), '\n'); - if(aDesc.Len()>0) + if (!aDesc.isEmpty()) { aComment.AppendAscii(RTL_CONSTASCII_STRINGPARAM( " (" )); - aComment+=aDesc; - aComment+=')'; + aComment += String(aDesc); + aComment += ')'; } aBuf.append(aComment); @@ -572,8 +572,7 @@ SvLBoxEntry* ScAcceptChgDlg::InsertFilteredAction( String aRefStr; ScChangeActionType eType=pScChangeAction->GetType(); String aString; - String aDesc; - + rtl::OUString aDesc; ScRedlinData* pNewData=new ScRedlinData; pNewData->pData=(void *)pScChangeAction; @@ -638,11 +637,11 @@ SvLBoxEntry* ScAcceptChgDlg::InsertFilteredAction( String aComment = comphelper::string::remove(pScChangeAction->GetComment(), '\n'); - if(aDesc.Len()>0) + if (!aDesc.isEmpty()) { aComment.AppendAscii(RTL_CONSTASCII_STRINGPARAM( " (" )); - aComment+=aDesc; - aComment+=')'; + aComment += String(aDesc); + aComment += ')'; } if(pTheView->IsValidComment(&aComment)) { |