String to rtl::OUString in ScDPServiceDesc.

sc/inc/dpobject.hxx

@@ -70,23 +70,16 @@ class ScDPTableData;
 
 struct ScDPServiceDesc
 {
-    String  aServiceName;
-    String  aParSource;
-    String  aParName;
-    String  aParUser;
-    String  aParPass;
-
-    ScDPServiceDesc( const String& rServ, const String& rSrc, const String& rNam,
-                        const String& rUser, const String& rPass ) :
-        aServiceName( rServ ), aParSource( rSrc ), aParName( rNam ),
-        aParUser( rUser ), aParPass( rPass ) {  }
-
-    sal_Bool operator== ( const ScDPServiceDesc& rOther ) const
-        { return aServiceName == rOther.aServiceName &&
-                 aParSource   == rOther.aParSource &&
-                 aParName     == rOther.aParName &&
-                 aParUser     == rOther.aParUser &&
-                 aParPass     == rOther.aParPass; }
+    ::rtl::OUString aServiceName;
+    ::rtl::OUString aParSource;
+    ::rtl::OUString aParName;
+    ::rtl::OUString aParUser;
+    ::rtl::OUString aParPass;
+
+    ScDPServiceDesc( const ::rtl::OUString& rServ, const ::rtl::OUString& rSrc, const ::rtl::OUString& rNam,
+                     const ::rtl::OUString& rUser, const ::rtl::OUString& rPass );
+
+    bool operator== ( const ScDPServiceDesc& rOther ) const;
 };
 
 
@@ -113,11 +106,9 @@ private:
     long                    nHeaderRows;    // page fields plus filter button
     bool                    mbHeaderLayout;  // sal_True : grid, sal_False : standard
 
-
     SC_DLLPRIVATE ScDPTableData*    GetTableData();
     SC_DLLPRIVATE void              CreateObjects();
     SC_DLLPRIVATE void              CreateOutput();
-    sal_Bool                    bRefresh;
 
 public:
     ScDPObject(ScDocument* pD);

sc/source/core/data/dpobject.cxx

@@ -167,7 +167,23 @@ sal_uInt16 lcl_GetDataGetOrientation( const uno::Reference<sheet::XDimensionsSup
     return static_cast< sal_uInt16 >( nRet );
 }
 
-// -----------------------------------------------------------------------
+ScDPServiceDesc::ScDPServiceDesc(
+    const OUString& rServ, const OUString& rSrc, const OUString& rNam,
+    const OUString& rUser, const OUString& rPass ) :
+    aServiceName( rServ ),
+    aParSource( rSrc ),
+    aParName( rNam ),
+    aParUser( rUser ),
+    aParPass( rPass ) {}
+
+bool ScDPServiceDesc::operator== ( const ScDPServiceDesc& rOther ) const
+{
+    return aServiceName == rOther.aServiceName &&
+        aParSource == rOther.aParSource &&
+        aParName == rOther.aParName &&
+        aParUser == rOther.aParUser &&
+        aParPass == rOther.aParPass;
+}
 
 ScDPObject::ScDPObject( ScDocument* pD ) :
     pDoc( pD ),

sc/source/filter/xml/XMLExportDataPilot.cxx

@@ -887,10 +887,10 @@ void ScXMLExportDataPilot::WriteDataPilots(const uno::Reference <sheet::XSpreads
         else if ((*pDPs)[i]->IsServiceData())
         {
             const ScDPServiceDesc* pServSource = (*pDPs)[i]->GetDPServiceDesc();
-            rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_NAME, rtl::OUString(pServSource->aServiceName));
-            rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_SOURCE_NAME, rtl::OUString(pServSource->aParSource));
-            rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_OBJECT_NAME, rtl::OUString(pServSource->aParName));
-            rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_USER_NAME, rtl::OUString(pServSource->aParUser));
+            rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_NAME, pServSource->aServiceName);
+            rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_SOURCE_NAME, pServSource->aParSource);
+            rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_OBJECT_NAME, pServSource->aParName);
+            rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_USER_NAME, pServSource->aParUser);
             // #i111754# leave out password attribute as long as DataPilotSource doesn't specify the content
             // rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_PASSWORD, rtl::OUString(pServSource->aParPass));
             SvXMLElementExport aElemSD(rExport, XML_NAMESPACE_TABLE, XML_SOURCE_SERVICE, sal_True, sal_True);

sc/source/ui/unoobj/dapiuno.cxx

@@ -1013,13 +1013,13 @@ Any SAL_CALL ScDataPilotDescriptorBase::getPropertyValue( const OUString& aPrope
                     uno::Sequence<beans::PropertyValue> aSeq( 4 );
                     beans::PropertyValue* pArray = aSeq.getArray();
                     pArray[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_SOURCENAME ));
-                    pArray[0].Value <<= rtl::OUString( pServiceDesc->aParSource );
+                    pArray[0].Value <<= pServiceDesc->aParSource;
                     pArray[1].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_OBJECTNAME ));
-                    pArray[1].Value <<= rtl::OUString( pServiceDesc->aParName );
+                    pArray[1].Value <<= pServiceDesc->aParName;
                     pArray[2].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_USERNAME ));
-                    pArray[2].Value <<= rtl::OUString( pServiceDesc->aParUser );
+                    pArray[2].Value <<= pServiceDesc->aParUser;
                     pArray[3].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNO_PASSWORD ));
-                    pArray[3].Value <<= rtl::OUString( pServiceDesc->aParPass );
+                    pArray[3].Value <<= pServiceDesc->aParPass;
                     aRet <<= aSeq;
                 }
                 else