From 9928fd7fc600efa620ad7c3b78c0b0051a4fa930 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Mon, 25 Jun 2012 10:07:22 +0100
Subject: remove some annoying XubStrings

Change-Id: I8c34a344285b6929091788c6b7a5529b48943f94
---
 sd/source/ui/toolpanel/controls/DocumentHelper.cxx | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'sd')

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.
-- 
cgit