diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-06-25 10:07:22 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-06-25 14:19:02 +0100 |
| commit | 9928fd7fc600efa620ad7c3b78c0b0051a4fa930 (patch) | |
| tree | eacdfa435601f0762d2309d2078280eba8fc347c /sd | |
| parent | callcatcher: update list (diff) | |
| download | core-9928fd7fc600efa620ad7c3b78c0b0051a4fa930.tar.gz core-9928fd7fc600efa620ad7c3b78c0b0051a4fa930.zip | |
remove some annoying XubStrings
Change-Id: I8c34a344285b6929091788c6b7a5529b48943f94
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/toolpanel/controls/DocumentHelper.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sd/source/ui/toolpanel/controls/DocumentHelper.cxx b/sd/source/ui/toolpanel/controls/DocumentHelper.cxx index 25c60ebf92de..65ac625f1d34 100644 --- a/sd/source/ui/toolpanel/controls/DocumentHelper.cxx +++ b/sd/source/ui/toolpanel/controls/DocumentHelper.cxx @@ -523,12 +523,11 @@ SdPage* DocumentHelper::ProvideMasterPage ( SdPage* pMasterPageInDocument = NULL; // Search for a master page with the same name as the given one in // the target document. - const XubString sMasterPageLayoutName (pMasterPage->GetLayoutName()); + const rtl::OUString sMasterPageLayoutName (pMasterPage->GetLayoutName()); for (sal_uInt16 nIndex=0,nCount=rTargetDocument.GetMasterPageCount(); nIndex<nCount; ++nIndex) { SdPage* pCandidate = static_cast<SdPage*>(rTargetDocument.GetMasterPage(nIndex)); - if (pCandidate!=NULL - && sMasterPageLayoutName==pCandidate->GetLayoutName()) + if (pCandidate && sMasterPageLayoutName.equals(pCandidate->GetLayoutName())) { // The requested master page does already exist in the // target document, return it. |