[Libreoffice-commits] .: 3 commits - sc/inc sc/source
Kohei Yoshida
kohei at kemper.freedesktop.org
Sat May 28 14:18:40 PDT 2011
sc/inc/dpobject.hxx | 97 +++++++++------------
sc/source/core/data/dpobject.cxx | 129 +++++++++++++++-------------
sc/source/filter/xml/XMLExportDataPilot.cxx | 8 -
sc/source/ui/dbgui/pvfundlg.cxx | 8 -
sc/source/ui/docshell/dbdocfun.cxx | 2
sc/source/ui/docshell/docsh.cxx | 2
sc/source/ui/inc/pvfundlg.hxx | 2
sc/source/ui/unoobj/dapiuno.cxx | 17 +--
sc/source/ui/view/dbfunc3.cxx | 54 +++++------
sc/source/ui/view/gridwin.cxx | 13 +-
sc/source/ui/view/gridwin2.cxx | 20 ++--
11 files changed, 180 insertions(+), 172 deletions(-)
New commits:
commit bbf60be76a6d75520802de8341c985e674c99985
Author: Kohei Yoshida <kyoshida at novell.com>
Date: Sat May 28 17:17:33 2011 -0400
sal_Bool to bool in ScDPObject.
diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx
index 1d91a07..4bc1df9 100644
--- a/sc/inc/dpobject.hxx
+++ b/sc/inc/dpobject.hxx
@@ -99,12 +99,12 @@ private:
// cached data
com::sun::star::uno::Reference<com::sun::star::sheet::XDimensionsSupplier> xSource;
ScDPOutput* pOutput;
- sal_Bool bSettingsChanged;
- sal_Bool bAlive; // sal_False if only used to hold settings
sal_uInt16 mnAutoFormatIndex;
- sal_Bool bAllowMove;
long nHeaderRows; // page fields plus filter button
- bool mbHeaderLayout; // sal_True : grid, sal_False : standard
+ bool mbHeaderLayout:1; // true : grid, false : standard
+ bool bAllowMove:1;
+ bool bAlive:1; // false if only used to hold settings
+ bool bSettingsChanged:1;
SC_DLLPRIVATE ScDPTableData* GetTableData();
SC_DLLPRIVATE void CreateObjects();
@@ -120,8 +120,8 @@ public:
* doesn't really change the behavior of the object, but is used only for
* testing purposes.
*/
- void SetAlive(sal_Bool bSet);
- void SetAllowMove(sal_Bool bSet);
+ void SetAlive(bool bSet);
+ void SetAllowMove(bool bSet);
void InvalidateData();
void ClearSource();
@@ -153,9 +153,9 @@ public:
com::sun::star::uno::Reference<com::sun::star::sheet::XDimensionsSupplier> GetSource();
- sal_Bool IsSheetData() const;
- sal_Bool IsImportData() const { return(pImpDesc != NULL); }
- sal_Bool IsServiceData() const { return(pServDesc != NULL); }
+ bool IsSheetData() const;
+ bool IsImportData() const { return(pImpDesc != NULL); }
+ bool IsServiceData() const { return(pServDesc != NULL); }
void SetName(const ::rtl::OUString& rNew);
const ::rtl::OUString& GetName() const { return aTableName; }
@@ -171,20 +171,20 @@ public:
bool IsDimNameInUse(const ::rtl::OUString& rName) const;
::rtl::OUString GetDimName( long nDim, bool& rIsDataLayout, sal_Int32* pFlags = NULL );
- sal_Bool IsDuplicated( long nDim );
+ bool IsDuplicated( long nDim );
long GetDimCount();
void GetHeaderPositionData(const ScAddress& rPos, ::com::sun::star::sheet::DataPilotTableHeaderData& rData);
long GetHeaderDim( const ScAddress& rPos, sal_uInt16& rOrient );
- sal_Bool GetHeaderDrag( const ScAddress& rPos, sal_Bool bMouseLeft, sal_Bool bMouseTop,
- long nDragDim,
- Rectangle& rPosRect, sal_uInt16& rOrient, long& rDimPos );
- sal_Bool IsFilterButton( const ScAddress& rPos );
+ bool GetHeaderDrag( const ScAddress& rPos, bool bMouseLeft, bool bMouseTop,
+ long nDragDim,
+ Rectangle& rPosRect, sal_uInt16& rOrient, long& rDimPos );
+ bool IsFilterButton( const ScAddress& rPos );
- sal_Bool GetPivotData( ScDPGetPivotDataField& rTarget, /* returns result */
+ bool GetPivotData( ScDPGetPivotDataField& rTarget, /* returns result */
const std::vector< ScDPGetPivotDataField >& rFilters );
- sal_Bool ParseFilters( ScDPGetPivotDataField& rTarget,
+ bool ParseFilters( ScDPGetPivotDataField& rTarget,
std::vector< ScDPGetPivotDataField >& rFilters,
- const String& rFilterList );
+ const ::rtl::OUString& rFilterList );
void GetMemberResultNames( ScStrCollection& rNames, long nDimension );
@@ -192,24 +192,24 @@ public:
void ToggleDetails(const ::com::sun::star::sheet::DataPilotTableHeaderData& rElemDesc, ScDPObject* pDestObj);
- sal_Bool FillOldParam(ScPivotParam& rParam) const;
- sal_Bool FillLabelData(ScPivotParam& rParam);
+ bool FillOldParam(ScPivotParam& rParam) const;
+ bool FillLabelData(ScPivotParam& rParam);
void InitFromOldPivot(const ScPivot& rOld, ScDocument* pDoc, sal_Bool bSetSource);
- sal_Bool GetHierarchiesNA( sal_Int32 nDim, com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >& xHiers );
- sal_Bool GetHierarchies( sal_Int32 nDim, com::sun::star::uno::Sequence< rtl::OUString >& rHiers );
+ bool GetHierarchiesNA( sal_Int32 nDim, com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >& xHiers );
+ bool GetHierarchies( sal_Int32 nDim, com::sun::star::uno::Sequence< rtl::OUString >& rHiers );
sal_Int32 GetUsedHierarchy( sal_Int32 nDim );
- sal_Bool GetMembersNA( sal_Int32 nDim, com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >& xMembers );
- sal_Bool GetMembersNA( sal_Int32 nDim, sal_Int32 nHier, com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >& xMembers );
+ bool GetMembersNA( sal_Int32 nDim, com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >& xMembers );
+ bool GetMembersNA( sal_Int32 nDim, sal_Int32 nHier, com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >& xMembers );
bool GetMemberNames( sal_Int32 nDim, ::com::sun::star::uno::Sequence< ::rtl::OUString >& rNames );
bool GetMembers( sal_Int32 nDim, sal_Int32 nHier, ::std::vector<ScDPLabelData::Member>& rMembers );
void UpdateReference( UpdateRefMode eUpdateRefMode,
const ScRange& r, SCsCOL nDx, SCsROW nDy, SCsTAB nDz );
- sal_Bool RefsEqual( const ScDPObject& r ) const;
+ bool RefsEqual( const ScDPObject& r ) const;
void WriteRefsTo( ScDPObject& r ) const;
void GetPositionData(const ScAddress& rPos, ::com::sun::star::sheet::DataPilotTablePositionData& rPosData);
@@ -229,7 +229,7 @@ public:
void BuildAllDimensionMembers();
- static sal_Bool HasRegisteredSources();
+ static bool HasRegisteredSources();
static com::sun::star::uno::Sequence<rtl::OUString> GetRegisteredSources();
static com::sun::star::uno::Reference<com::sun::star::sheet::XDimensionsSupplier>
CreateSource( const ScDPServiceDesc& rDesc );
diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index a7b090e..b3feea8 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -193,12 +193,12 @@ ScDPObject::ScDPObject( ScDocument* pD ) :
pServDesc( NULL ),
mpTableData(static_cast<ScDPTableData*>(NULL)),
pOutput( NULL ),
- bSettingsChanged( false ),
- bAlive( false ),
mnAutoFormatIndex( 65535 ),
- bAllowMove( false ),
nHeaderRows( 0 ),
- mbHeaderLayout(false)
+ mbHeaderLayout(false),
+ bAllowMove(false),
+ bAlive(false),
+ bSettingsChanged(false)
{
}
@@ -213,12 +213,12 @@ ScDPObject::ScDPObject(const ScDPObject& r) :
pServDesc( NULL ),
mpTableData(static_cast<ScDPTableData*>(NULL)),
pOutput( NULL ),
- bSettingsChanged( false ),
- bAlive( false ),
mnAutoFormatIndex( r.mnAutoFormatIndex ),
- bAllowMove( false ),
nHeaderRows( r.nHeaderRows ),
- mbHeaderLayout( r.mbHeaderLayout )
+ mbHeaderLayout( r.mbHeaderLayout ),
+ bAllowMove(false),
+ bAlive(false),
+ bSettingsChanged(false)
{
if (r.pSaveData)
pSaveData = new ScDPSaveData(*r.pSaveData);
@@ -241,12 +241,12 @@ ScDPObject::~ScDPObject()
ClearSource();
}
-void ScDPObject::SetAlive(sal_Bool bSet)
+void ScDPObject::SetAlive(bool bSet)
{
bAlive = bSet;
}
-void ScDPObject::SetAllowMove(sal_Bool bSet)
+void ScDPObject::SetAllowMove(bool bSet)
{
bAllowMove = bSet;
}
@@ -353,7 +353,7 @@ void ScDPObject::WriteTempDataTo( ScDPObject& rDest ) const
rDest.nHeaderRows = nHeaderRows;
}
-sal_Bool ScDPObject::IsSheetData() const
+bool ScDPObject::IsSheetData() const
{
return ( pSheetDesc != NULL );
}
@@ -520,7 +520,7 @@ void ScDPObject::CreateObjects()
void ScDPObject::InvalidateData()
{
- bSettingsChanged = sal_True;
+ bSettingsChanged = true;
}
void ScDPObject::ClearSource()
@@ -747,7 +747,7 @@ void ScDPObject::UpdateReference( UpdateRefMode eUpdateRefMode,
}
}
-sal_Bool ScDPObject::RefsEqual( const ScDPObject& r ) const
+bool ScDPObject::RefsEqual( const ScDPObject& r ) const
{
if ( aOutRange != r.aOutRange )
return false;
@@ -763,7 +763,7 @@ sal_Bool ScDPObject::RefsEqual( const ScDPObject& r ) const
return false;
}
- return sal_True;
+ return true;
}
void ScDPObject::WriteRefsTo( ScDPObject& r ) const
@@ -882,9 +882,9 @@ OUString ScDPObject::GetDimName( long nDim, bool& rIsDataLayout, sal_Int32* pFla
return aRet;
}
-sal_Bool ScDPObject::IsDuplicated( long nDim )
+bool ScDPObject::IsDuplicated( long nDim )
{
- sal_Bool bDuplicated = false;
+ bool bDuplicated = false;
if ( xSource.is() )
{
uno::Reference<container::XNameAccess> xDimsName = xSource->getDimensions();
@@ -903,7 +903,7 @@ sal_Bool ScDPObject::IsDuplicated( long nDim )
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_ORIGINAL)) );
uno::Reference<uno::XInterface> xIntOrig;
if ( (aOrigAny >>= xIntOrig) && xIntOrig.is() )
- bDuplicated = sal_True;
+ bDuplicated = true;
}
catch(uno::Exception&)
{
@@ -1043,7 +1043,7 @@ void ScDPObject::GetHeaderPositionData(const ScAddress& rPos, DataPilotTableHead
}
// Returns sal_True on success and stores the result in rTarget
-sal_Bool ScDPObject::GetPivotData( ScDPGetPivotDataField& rTarget,
+bool ScDPObject::GetPivotData( ScDPGetPivotDataField& rTarget,
const std::vector< ScDPGetPivotDataField >& rFilters )
{
CreateOutput(); // create xSource and pOutput if not already done
@@ -1051,7 +1051,7 @@ sal_Bool ScDPObject::GetPivotData( ScDPGetPivotDataField& rTarget,
return pOutput->GetPivotData( rTarget, rFilters );
}
-sal_Bool ScDPObject::IsFilterButton( const ScAddress& rPos )
+bool ScDPObject::IsFilterButton( const ScAddress& rPos )
{
CreateOutput(); // create xSource and pOutput if not already done
@@ -1065,7 +1065,7 @@ long ScDPObject::GetHeaderDim( const ScAddress& rPos, sal_uInt16& rOrient )
return pOutput->GetHeaderDim( rPos, rOrient );
}
-sal_Bool ScDPObject::GetHeaderDrag( const ScAddress& rPos, sal_Bool bMouseLeft, sal_Bool bMouseTop, long nDragDim,
+bool ScDPObject::GetHeaderDrag( const ScAddress& rPos, bool bMouseLeft, bool bMouseTop, long nDragDim,
Rectangle& rPosRect, sal_uInt16& rOrient, long& rDimPos )
{
CreateOutput(); // create xSource and pOutput if not already done
@@ -1302,9 +1302,9 @@ bool lcl_IsAtStart( const String& rList, const String& rSearch, sal_Int32& rMatc
return false;
}
-sal_Bool ScDPObject::ParseFilters( ScDPGetPivotDataField& rTarget,
+bool ScDPObject::ParseFilters( ScDPGetPivotDataField& rTarget,
std::vector< ScDPGetPivotDataField >& rFilters,
- const String& rFilterList )
+ const OUString& rFilterList )
{
// parse the string rFilterList into parameters for GetPivotData
@@ -1863,7 +1863,7 @@ void lcl_FillOldFields(
rFields.swap(aFields);
}
-sal_Bool ScDPObject::FillOldParam(ScPivotParam& rParam) const
+bool ScDPObject::FillOldParam(ScPivotParam& rParam) const
{
((ScDPObject*)this)->CreateObjects(); // xSource is needed for field numbers
@@ -1911,7 +1911,7 @@ sal_Bool ScDPObject::FillOldParam(ScPivotParam& rParam) const
// no error
}
}
- return sal_True;
+ return true;
}
void lcl_FillLabelData( ScDPLabelData& rData, const uno::Reference< beans::XPropertySet >& xDimProp )
@@ -1958,7 +1958,7 @@ void lcl_FillLabelData( ScDPLabelData& rData, const uno::Reference< beans::XProp
}
}
-sal_Bool ScDPObject::FillLabelData(ScPivotParam& rParam)
+bool ScDPObject::FillLabelData(ScPivotParam& rParam)
{
rParam.maLabelArray.clear();
@@ -1984,8 +1984,8 @@ sal_Bool ScDPObject::FillLabelData(ScPivotParam& rParam)
if ( xDimName.is() && xDimProp.is() )
{
- sal_Bool bDuplicated = false;
- sal_Bool bData = ScUnoHelpFunctions::GetBoolProperty( xDimProp,
+ bool bDuplicated = false;
+ bool bData = ScUnoHelpFunctions::GetBoolProperty( xDimProp,
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_ISDATALAYOUT)) );
//! error checking -- is "IsDataLayoutDimension" property required??
@@ -1997,7 +1997,7 @@ sal_Bool ScDPObject::FillLabelData(ScPivotParam& rParam)
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DP_PROP_ORIGINAL)) );
uno::Reference<uno::XInterface> xIntOrig;
if ( (aOrigAny >>= xIntOrig) && xIntOrig.is() )
- bDuplicated = sal_True;
+ bDuplicated = true;
}
catch(uno::Exception&)
{
@@ -2023,12 +2023,12 @@ sal_Bool ScDPObject::FillLabelData(ScPivotParam& rParam)
}
}
- return sal_True;
+ return true;
}
-sal_Bool ScDPObject::GetHierarchiesNA( sal_Int32 nDim, uno::Reference< container::XNameAccess >& xHiers )
+bool ScDPObject::GetHierarchiesNA( sal_Int32 nDim, uno::Reference< container::XNameAccess >& xHiers )
{
- sal_Bool bRet = false;
+ bool bRet = false;
uno::Reference<container::XNameAccess> xDimsName( GetSource()->getDimensions() );
uno::Reference<container::XIndexAccess> xIntDims(new ScNameToIndexAccess( xDimsName ));
if( xIntDims.is() )
@@ -2043,14 +2043,14 @@ sal_Bool ScDPObject::GetHierarchiesNA( sal_Int32 nDim, uno::Reference< container
return bRet;
}
-sal_Bool ScDPObject::GetHierarchies( sal_Int32 nDim, uno::Sequence< rtl::OUString >& rHiers )
+bool ScDPObject::GetHierarchies( sal_Int32 nDim, uno::Sequence< rtl::OUString >& rHiers )
{
- sal_Bool bRet = false;
+ bool bRet = false;
uno::Reference< container::XNameAccess > xHiersNA;
if( GetHierarchiesNA( nDim, xHiersNA ) )
{
rHiers = xHiersNA->getElementNames();
- bRet = sal_True;
+ bRet = true;
}
return bRet;
}
@@ -2066,14 +2066,14 @@ sal_Int32 ScDPObject::GetUsedHierarchy( sal_Int32 nDim )
return nHier;
}
-sal_Bool ScDPObject::GetMembersNA( sal_Int32 nDim, uno::Reference< container::XNameAccess >& xMembers )
+bool ScDPObject::GetMembersNA( sal_Int32 nDim, uno::Reference< container::XNameAccess >& xMembers )
{
return GetMembersNA( nDim, GetUsedHierarchy( nDim ), xMembers );
}
-sal_Bool ScDPObject::GetMembersNA( sal_Int32 nDim, sal_Int32 nHier, uno::Reference< container::XNameAccess >& xMembers )
+bool ScDPObject::GetMembersNA( sal_Int32 nDim, sal_Int32 nHier, uno::Reference< container::XNameAccess >& xMembers )
{
- sal_Bool bRet = false;
+ bool bRet = false;
uno::Reference<container::XNameAccess> xDimsName( GetSource()->getDimensions() );
uno::Reference<container::XIndexAccess> xIntDims(new ScNameToIndexAccess( xDimsName ));
uno::Reference<beans::XPropertySet> xDim(xIntDims->getByIndex( nDim ), uno::UNO_QUERY);
@@ -2096,7 +2096,7 @@ sal_Bool ScDPObject::GetMembersNA( sal_Int32 nDim, sal_Int32 nHier, uno::Referen
if ( xMembSupp.is() )
{
xMembers.set(xMembSupp->getMembers());
- bRet = sal_True;
+ bRet = true;
}
}
}
@@ -2288,9 +2288,9 @@ bool ScDPObject::IsOrientationAllowed( sal_uInt16 nOrient, sal_Int32 nDimFlags )
// -----------------------------------------------------------------------
-sal_Bool ScDPObject::HasRegisteredSources()
+bool ScDPObject::HasRegisteredSources()
{
- sal_Bool bFound = false;
+ bool bFound = false;
uno::Reference<lang::XMultiServiceFactory> xManager = comphelper::getProcessServiceFactory();
uno::Reference<container::XContentEnumerationAccess> xEnAc( xManager, uno::UNO_QUERY );
@@ -2299,7 +2299,7 @@ sal_Bool ScDPObject::HasRegisteredSources()
uno::Reference<container::XEnumeration> xEnum = xEnAc->createContentEnumeration(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCDPSOURCE_SERVICE )) );
if ( xEnum.is() && xEnum->hasMoreElements() )
- bFound = sal_True;
+ bFound = true;
}
return bFound;
commit ea34eec2a84592119951f99d09bbc5e49e24efdd
Author: Kohei Yoshida <kyoshida at novell.com>
Date: Sat May 28 16:52:40 2011 -0400
String to OUString in ScDPObject.
diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx
index 7720e33..1d91a07 100644
--- a/sc/inc/dpobject.hxx
+++ b/sc/inc/dpobject.hxx
@@ -89,8 +89,8 @@ private:
ScDocument* pDoc;
// settings
ScDPSaveData* pSaveData;
- String aTableName;
- String aTableTag;
+ ::rtl::OUString aTableName;
+ ::rtl::OUString aTableTag;
ScRange aOutRange;
ScSheetSourceDesc* pSheetDesc; // for sheet data
ScImportSourceDesc* pImpDesc; // for database data
@@ -157,10 +157,10 @@ public:
sal_Bool IsImportData() const { return(pImpDesc != NULL); }
sal_Bool IsServiceData() const { return(pServDesc != NULL); }
- void SetName(const String& rNew);
- const String& GetName() const { return aTableName; }
- void SetTag(const String& rNew);
- const String& GetTag() const { return aTableTag; }
+ void SetName(const ::rtl::OUString& rNew);
+ const ::rtl::OUString& GetName() const { return aTableName; }
+ void SetTag(const ::rtl::OUString& rNew);
+ const ::rtl::OUString& GetTag() const { return aTableTag; }
/**
* Data description cell displays the description of a data dimension if
@@ -170,7 +170,7 @@ public:
bool IsDataDescriptionCell(const ScAddress& rPos);
bool IsDimNameInUse(const ::rtl::OUString& rName) const;
- String GetDimName( long nDim, sal_Bool& rIsDataLayout, sal_Int32* pFlags = NULL );
+ ::rtl::OUString GetDimName( long nDim, bool& rIsDataLayout, sal_Int32* pFlags = NULL );
sal_Bool IsDuplicated( long nDim );
long GetDimCount();
void GetHeaderPositionData(const ScAddress& rPos, ::com::sun::star::sheet::DataPilotTableHeaderData& rData);
@@ -317,7 +317,7 @@ public:
SC_DLLPUBLIC ScDPObject* operator[](size_t nIndex);
SC_DLLPUBLIC const ScDPObject* operator[](size_t nIndex) const;
- const ScDPObject* GetByName(const String& rName) const;
+ const ScDPObject* GetByName(const ::rtl::OUString& rName) const;
void DeleteOnTab( SCTAB nTab );
void UpdateReference( UpdateRefMode eUpdateRefMode,
@@ -335,7 +335,7 @@ public:
*
* @return new name for data pilot object.
*/
- String CreateNewName( sal_uInt16 nMin = 1 ) const;
+ ::rtl::OUString CreateNewName( sal_uInt16 nMin = 1 ) const;
void FreeTable(ScDPObject* pDPObj);
SC_DLLPUBLIC bool InsertNewTable(ScDPObject* pDPObj);
diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index 689699f..a7b090e 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -358,12 +358,12 @@ sal_Bool ScDPObject::IsSheetData() const
return ( pSheetDesc != NULL );
}
-void ScDPObject::SetName(const String& rNew)
+void ScDPObject::SetName(const OUString& rNew)
{
aTableName = rNew;
}
-void ScDPObject::SetTag(const String& rNew)
+void ScDPObject::SetTag(const OUString& rNew)
{
aTableTag = rNew;
}
@@ -837,10 +837,10 @@ bool ScDPObject::IsDimNameInUse(const OUString& rName) const
return false;
}
-String ScDPObject::GetDimName( long nDim, sal_Bool& rIsDataLayout, sal_Int32* pFlags )
+OUString ScDPObject::GetDimName( long nDim, bool& rIsDataLayout, sal_Int32* pFlags )
{
rIsDataLayout = false;
- String aRet;
+ OUString aRet;
if ( xSource.is() )
{
@@ -868,9 +868,9 @@ String ScDPObject::GetDimName( long nDim, sal_Bool& rIsDataLayout, sal_Int32* pF
{
}
if ( bData )
- rIsDataLayout = sal_True;
+ rIsDataLayout = true;
else
- aRet = String( aName );
+ aRet = aName;
if (pFlags)
*pFlags = ScUnoHelpFunctions::GetLongProperty( xDimProp,
@@ -2643,7 +2643,7 @@ void ScDPCollection::WriteRefsTo( ScDPCollection& r ) const
for (size_t nSrcPos = 0; nSrcPos < nSrcSize; ++nSrcPos)
{
const ScDPObject& rSrcObj = maTables[nSrcPos];
- String aName = rSrcObj.GetName();
+ const OUString& aName = rSrcObj.GetName();
bool bFound = false;
for (size_t nDestPos = 0; nDestPos < nDestSize && !bFound; ++nDestPos)
{
@@ -2683,7 +2683,7 @@ const ScDPObject* ScDPCollection::operator [](size_t nIndex) const
return &maTables[nIndex];
}
-const ScDPObject* ScDPCollection::GetByName(const String& rName) const
+const ScDPObject* ScDPCollection::GetByName(const OUString& rName) const
{
TablesType::const_iterator itr = maTables.begin(), itrEnd = maTables.end();
for (; itr != itrEnd; ++itr)
@@ -2693,16 +2693,17 @@ const ScDPObject* ScDPCollection::GetByName(const String& rName) const
return NULL;
}
-String ScDPCollection::CreateNewName( sal_uInt16 nMin ) const
+OUString ScDPCollection::CreateNewName( sal_uInt16 nMin ) const
{
- String aBase = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("DataPilot"));
- //! from Resource?
+ OUString aBase(RTL_CONSTASCII_USTRINGPARAM("DataPilot"));
size_t n = maTables.size();
for (size_t nAdd = 0; nAdd <= n; ++nAdd) // nCount+1 tries
{
- String aNewName = aBase;
- aNewName += String::CreateFromInt32( nMin + nAdd );
+ ::rtl::OUStringBuffer aBuf;
+ aBuf.append(aBase);
+ aBuf.append(static_cast<sal_Int32>(nMin + nAdd));
+ OUString aNewName = aBuf.makeStringAndClear();
bool bFound = false;
TablesType::const_iterator itr = maTables.begin(), itrEnd = maTables.end();
for (; itr != itrEnd; ++itr)
@@ -2716,7 +2717,7 @@ String ScDPCollection::CreateNewName( sal_uInt16 nMin ) const
if (!bFound)
return aNewName; // found unused Name
}
- return String(); // should not happen
+ return OUString(); // should not happen
}
void ScDPCollection::FreeTable(ScDPObject* pDPObj)
diff --git a/sc/source/ui/dbgui/pvfundlg.cxx b/sc/source/ui/dbgui/pvfundlg.cxx
index f47368c..d7e0d79 100644
--- a/sc/source/ui/dbgui/pvfundlg.cxx
+++ b/sc/source/ui/dbgui/pvfundlg.cxx
@@ -802,9 +802,9 @@ ScDPShowDetailDlg::ScDPShowDetailDlg( Window* pParent, ScDPObject& rDPObj, sal_u
long nDimCount = rDPObj.GetDimCount();
for (long nDim=0; nDim<nDimCount; nDim++)
{
- sal_Bool bIsDataLayout;
+ bool bIsDataLayout;
sal_Int32 nDimFlags = 0;
- String aName = rDPObj.GetDimName( nDim, bIsDataLayout, &nDimFlags );
+ OUString aName = rDPObj.GetDimName( nDim, bIsDataLayout, &nDimFlags );
if ( !bIsDataLayout && !rDPObj.IsDuplicated( nDim ) && ScDPObject::IsOrientationAllowed( nOrient, nDimFlags ) )
{
const ScDPSaveDimension* pDimension = pSaveData ? pSaveData->GetExistingDimensionByName(aName) : 0;
@@ -832,7 +832,7 @@ short ScDPShowDetailDlg::Execute()
return maLbDims.GetEntryCount() ? ModalDialog::Execute() : RET_CANCEL;
}
-String ScDPShowDetailDlg::GetDimensionName() const
+OUString ScDPShowDetailDlg::GetDimensionName() const
{
// Look up the internal dimension name which may be different from the
// displayed field name.
@@ -843,7 +843,7 @@ String ScDPShowDetailDlg::GetDimensionName() const
return aSelectedName;
long nDim = itr->second;
- sal_Bool bIsDataLayout = false;
+ bool bIsDataLayout = false;
return mrDPObj.GetDimName(nDim, bIsDataLayout);
}
diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx
index 0140d97..33b6377 100644
--- a/sc/source/ui/docshell/dbdocfun.cxx
+++ b/sc/source/ui/docshell/dbdocfun.cxx
@@ -1324,7 +1324,7 @@ sal_Bool ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pN
pDestObj->InvalidateData(); // before getting the new output area
// make sure the table has a name (not set by dialog)
- if ( !pDestObj->GetName().Len() )
+ if (pDestObj->GetName().isEmpty())
pDestObj->SetName( pDoc->GetDPCollection()->CreateNewName() );
bool bOverflow = false;
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 84b42f5..bcfaf45 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -377,7 +377,7 @@ void ScDocShell::AfterXMLLoading(sal_Bool bRet)
for (size_t nDP=0; nDP<nDPCount; ++nDP)
{
ScDPObject* pDPObj = (*pDPCollection)[nDP];
- if ( !pDPObj->GetName().Len() )
+ if (pDPObj->GetName().isEmpty())
pDPObj->SetName( pDPCollection->CreateNewName() );
}
}
diff --git a/sc/source/ui/inc/pvfundlg.hxx b/sc/source/ui/inc/pvfundlg.hxx
index b3a8d8d..5e554bf 100644
--- a/sc/source/ui/inc/pvfundlg.hxx
+++ b/sc/source/ui/inc/pvfundlg.hxx
@@ -230,7 +230,7 @@ public:
* be different from the name displayed in the dialog if the field
* has a layout name.
*/
- String GetDimensionName() const;
+ ::rtl::OUString GetDimensionName() const;
private:
DECL_LINK( DblClickHdl, ListBox* );
diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx
index 4595c67..1f51ac5 100644
--- a/sc/source/ui/unoobj/dapiuno.cxx
+++ b/sc/source/ui/unoobj/dapiuno.cxx
@@ -258,7 +258,7 @@ void ScDataPilotConversion::FillGroupInfo( DataPilotFieldGroupInfo& rInfo, const
//------------------------------------------------------------------------
-ScDPObject* lcl_GetDPObject( ScDocShell* pDocShell, SCTAB nTab, const String& rName )
+ScDPObject* lcl_GetDPObject( ScDocShell* pDocShell, SCTAB nTab, const OUString& rName )
{
if (pDocShell)
{
@@ -299,7 +299,7 @@ sal_Int32 lcl_GetObjectIndex( ScDPObject* pDPObj, const ScFieldIdentifier& rFiel
sal_Int32 nCount = pDPObj->GetDimCount();
for ( sal_Int32 nDim = 0; nDim < nCount; ++nDim )
{
- sal_Bool bIsDataLayout = false;
+ bool bIsDataLayout = false;
OUString aDimName( pDPObj->GetDimName( nDim, bIsDataLayout ) );
if ( rFieldId.mbDataLayout ? bIsDataLayout : (aDimName == rFieldId.maFieldName) )
return nDim;
@@ -598,7 +598,6 @@ sal_Bool SAL_CALL ScDataPilotTablesObj::hasByName( const OUString& aName )
ScDPCollection* pColl = pDoc->GetDPCollection();
if ( pColl )
{
- String aNamStr(aName);
size_t nCount = pColl->GetCount();
for (size_t i=0; i<nCount; ++i)
{
@@ -607,8 +606,8 @@ sal_Bool SAL_CALL ScDataPilotTablesObj::hasByName( const OUString& aName )
ScDPObject* pDPObj = (*pColl)[i];
if ( pDPObj->GetOutRange().aStart.Tab() == nTab &&
- pDPObj->GetName() == aNamStr )
- return sal_True;
+ pDPObj->GetName() == aName )
+ return true;
}
}
}
diff --git a/sc/source/ui/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxx
index 6ec7521..5adadaf 100644
--- a/sc/source/ui/view/dbfunc3.cxx
+++ b/sc/source/ui/view/dbfunc3.cxx
@@ -834,8 +834,8 @@ sal_Bool ScDBFunc::HasSelectionForDateGroup( ScDPNumGroupInfo& rOldInfo, sal_Int
if ( aEntries.GetCount() > 0 )
{
- sal_Bool bIsDataLayout;
- String aDimName = pDPObj->GetDimName( nSelectDimension, bIsDataLayout );
+ bool bIsDataLayout;
+ OUString aDimName = pDPObj->GetDimName( nSelectDimension, bIsDataLayout );
String aBaseDimName( aDimName );
sal_Bool bInGroupDim = false;
@@ -947,8 +947,8 @@ sal_Bool ScDBFunc::HasSelectionForNumGroup( ScDPNumGroupInfo& rOldInfo )
if ( aEntries.GetCount() > 0 )
{
- sal_Bool bIsDataLayout;
- String aDimName = pDPObj->GetDimName( nSelectDimension, bIsDataLayout );
+ bool bIsDataLayout;
+ OUString aDimName = pDPObj->GetDimName( nSelectDimension, bIsDataLayout );
sal_Bool bInGroupDim = false;
@@ -1007,8 +1007,8 @@ void ScDBFunc::DateGroupDataPilot( const ScDPNumGroupInfo& rInfo, sal_Int32 nPar
if ( aEntries.GetCount() > 0 )
{
- sal_Bool bIsDataLayout;
- String aDimName = pDPObj->GetDimName( nSelectDimension, bIsDataLayout );
+ bool bIsDataLayout;
+ OUString aDimName = pDPObj->GetDimName( nSelectDimension, bIsDataLayout );
ScDPSaveData aData( *pDPObj->GetSaveData() );
ScDPDimensionSaveData* pDimData = aData.GetDimensionData(); // created if not there
@@ -1137,8 +1137,8 @@ void ScDBFunc::NumGroupDataPilot( const ScDPNumGroupInfo& rInfo )
if ( aEntries.GetCount() > 0 )
{
- sal_Bool bIsDataLayout;
- String aDimName = pDPObj->GetDimName( nSelectDimension, bIsDataLayout );
+ bool bIsDataLayout;
+ OUString aDimName = pDPObj->GetDimName( nSelectDimension, bIsDataLayout );
ScDPSaveData aData( *pDPObj->GetSaveData() );
ScDPDimensionSaveData* pDimData = aData.GetDimensionData(); // created if not there
@@ -1181,8 +1181,8 @@ void ScDBFunc::GroupDataPilot()
if ( aEntries.GetCount() > 0 )
{
- sal_Bool bIsDataLayout;
- String aDimName = pDPObj->GetDimName( nSelectDimension, bIsDataLayout );
+ bool bIsDataLayout;
+ OUString aDimName = pDPObj->GetDimName( nSelectDimension, bIsDataLayout );
ScDPSaveData aData( *pDPObj->GetSaveData() );
ScDPDimensionSaveData* pDimData = aData.GetDimensionData(); // created if not there
@@ -1325,8 +1325,8 @@ void ScDBFunc::UngroupDataPilot()
if ( aEntries.GetCount() > 0 )
{
- sal_Bool bIsDataLayout;
- String aDimName = pDPObj->GetDimName( nSelectDimension, bIsDataLayout );
+ bool bIsDataLayout;
+ OUString aDimName = pDPObj->GetDimName( nSelectDimension, bIsDataLayout );
ScDPSaveData aData( *pDPObj->GetSaveData() );
ScDPDimensionSaveData* pDimData = aData.GetDimensionData(); // created if not there
@@ -1498,14 +1498,14 @@ void ScDBFunc::DataPilotInput( const ScAddress& rPos, const String& rString )
}
else if (nOrient == DataPilotFieldOrientation_COLUMN || nOrient == DataPilotFieldOrientation_ROW)
{
- sal_Bool bDataLayout = false;
- String aDimName = pDPObj->GetDimName(nField, bDataLayout);
+ bool bDataLayout = false;
+ OUString aDimName = pDPObj->GetDimName(nField, bDataLayout);
ScDPSaveDimension* pDim = bDataLayout ? aData.GetDataLayoutDimension() : aData.GetDimensionByName(aDimName);
if (pDim)
{
if (rString.Len())
{
- if (rString.EqualsIgnoreCaseAscii(aDimName))
+ if (rString.EqualsIgnoreCaseAscii(String(aDimName)))
{
pDim->RemoveLayoutName();
bChange = true;
@@ -1558,8 +1558,8 @@ void ScDBFunc::DataPilotInput( const ScAddress& rPos, const String& rString )
{
if ( aData.GetExistingDimensionData() && !(aPosData.Flags & MemberResultFlags::SUBTOTAL))
{
- sal_Bool bIsDataLayout;
- String aDimName = pDPObj->GetDimName( aPosData.Dimension, bIsDataLayout );
+ bool bIsDataLayout;
+ OUString aDimName = pDPObj->GetDimName( aPosData.Dimension, bIsDataLayout );
ScDPDimensionSaveData* pDimData = aData.GetDimensionData();
ScDPSaveGroupDimension* pGroupDim = pDimData->GetNamedGroupDimAcc( aDimName );
@@ -1599,8 +1599,8 @@ void ScDBFunc::DataPilotInput( const ScAddress& rPos, const String& rString )
}
else if (aPosData.Dimension >= 0 && aPosData.MemberName.getLength() > 0)
{
- sal_Bool bDataLayout = false;
- String aDimName = pDPObj->GetDimName(static_cast<long>(aPosData.Dimension), bDataLayout);
+ bool bDataLayout = false;
+ OUString aDimName = pDPObj->GetDimName(static_cast<long>(aPosData.Dimension), bDataLayout);
if (bDataLayout)
{
// data dimension
@@ -1759,13 +1759,13 @@ bool ScDBFunc::DataPilotSort( const ScAddress& rPos, bool bAscending, sal_uInt16
// Invalid dimension index. Bail out.
return false;
- sal_Bool bDataLayout;
ScDPSaveData* pSaveData = pDPObj->GetSaveData();
if (!pSaveData)
return false;
ScDPSaveData aNewSaveData(*pSaveData);
- String aDimName = pDPObj->GetDimName(nDimIndex, bDataLayout);
+ bool bDataLayout;
+ OUString aDimName = pDPObj->GetDimName(nDimIndex, bDataLayout);
ScDPSaveDimension* pSaveDim = aNewSaveData.GetDimensionByName(aDimName);
if (!pSaveDim)
return false;
@@ -1921,8 +1921,8 @@ sal_Bool ScDBFunc::DataPilotMove( const ScRange& rSource, const ScAddress& rDest
if ( bValid )
{
- sal_Bool bIsDataLayout;
- String aDimName = pDPObj->GetDimName( aDestData.Dimension, bIsDataLayout );
+ bool bIsDataLayout;
+ OUString aDimName = pDPObj->GetDimName( aDestData.Dimension, bIsDataLayout );
if ( !bIsDataLayout )
{
ScDPSaveData aData( *pDPObj->GetSaveData() );
@@ -1995,8 +1995,8 @@ sal_Bool ScDBFunc::HasSelectionForDrillDown( sal_uInt16& rOrientation )
if ( aEntries.GetCount() > 0 )
{
- sal_Bool bIsDataLayout;
- String aDimName = pDPObj->GetDimName( nSelectDimension, bIsDataLayout );
+ bool bIsDataLayout;
+ OUString aDimName = pDPObj->GetDimName( nSelectDimension, bIsDataLayout );
if ( !bIsDataLayout )
{
ScDPSaveData* pSaveData = pDPObj->GetSaveData();
@@ -2030,8 +2030,8 @@ void ScDBFunc::SetDataPilotDetails( sal_Bool bShow, const String* pNewDimensionN
if ( aEntries.GetCount() > 0 )
{
- sal_Bool bIsDataLayout;
- String aDimName = pDPObj->GetDimName( nSelectDimension, bIsDataLayout );
+ bool bIsDataLayout;
+ OUString aDimName = pDPObj->GetDimName( nSelectDimension, bIsDataLayout );
if ( !bIsDataLayout )
{
ScDPSaveData aData( *pDPObj->GetSaveData() );
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index b775369..08ccbfc 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -138,6 +138,7 @@
using namespace com::sun::star;
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::uno::Any;
+using ::rtl::OUString;
const sal_uInt8 SC_NESTEDBUTTON_NONE = 0;
const sal_uInt8 SC_NESTEDBUTTON_DOWN = 1;
@@ -556,8 +557,8 @@ void ScGridWindow::ExecPageFieldSelect( SCCOL nCol, SCROW nRow, sal_Bool bHasSel
{
ScDPSaveData aSaveData( *pDPObj->GetSaveData() );
- sal_Bool bIsDataLayout;
- String aDimName = pDPObj->GetDimName( nField, bIsDataLayout );
+ bool bIsDataLayout;
+ OUString aDimName = pDPObj->GetDimName( nField, bIsDataLayout );
if ( !bIsDataLayout )
{
ScDPSaveDimension* pDim = aSaveData.GetDimensionByName(aDimName);
@@ -644,8 +645,8 @@ void ScGridWindow::LaunchPageFieldMenu( SCCOL nCol, SCROW nRow )
// get current page from SaveData
ScDPSaveData* pSaveData = pDPObj->GetSaveData();
- sal_Bool bIsDataLayout;
- String aDimName = pDPObj->GetDimName( nField, bIsDataLayout );
+ bool bIsDataLayout;
+ OUString aDimName = pDPObj->GetDimName( nField, bIsDataLayout );
if ( pSaveData && !bIsDataLayout )
{
ScDPSaveDimension* pDim = pSaveData->GetExistingDimensionByName(aDimName);
@@ -3360,8 +3361,8 @@ sal_Int8 ScGridWindow::AcceptPrivateDrop( const AcceptDropEvent& rEvt )
if ( bValid )
{
- sal_Bool bIsDataLayout;
- String aDimName = pDPObj->GetDimName( aDestData.Dimension, bIsDataLayout );
+ bool bIsDataLayout;
+ OUString aDimName = pDPObj->GetDimName( aDestData.Dimension, bIsDataLayout );
const ScDPSaveDimension* pDim = pDPObj->GetSaveData()->GetExistingDimensionByName( aDimName );
if ( pDim )
{
diff --git a/sc/source/ui/view/gridwin2.cxx b/sc/source/ui/view/gridwin2.cxx
index 07ffb31..1c9eff2 100644
--- a/sc/source/ui/view/gridwin2.cxx
+++ b/sc/source/ui/view/gridwin2.cxx
@@ -94,9 +94,9 @@ DataPilotFieldOrientation ScGridWindow::GetDPFieldOrientation( SCCOL nCol, SCROW
long nField = pDPObj->GetHeaderDim( ScAddress( nCol-1, nRow, nTab ), nOrient );
if ( nField >= 0 && nOrient == DataPilotFieldOrientation_PAGE )
{
- sal_Bool bIsDataLayout = false;
- String aFieldName = pDPObj->GetDimName( nField, bIsDataLayout );
- if ( aFieldName.Len() && !bIsDataLayout )
+ bool bIsDataLayout = false;
+ OUString aFieldName = pDPObj->GetDimName( nField, bIsDataLayout );
+ if ( !aFieldName.isEmpty() && !bIsDataLayout )
return DataPilotFieldOrientation_PAGE;
}
}
@@ -107,9 +107,9 @@ DataPilotFieldOrientation ScGridWindow::GetDPFieldOrientation( SCCOL nCol, SCROW
long nField = pDPObj->GetHeaderDim(ScAddress(nCol, nRow, nTab), nOrient);
if (nField >= 0 && (nOrient == DataPilotFieldOrientation_COLUMN || nOrient == DataPilotFieldOrientation_ROW) )
{
- sal_Bool bIsDataLayout = false;
- String aFieldName = pDPObj->GetDimName(nField, bIsDataLayout);
- if (aFieldName.Len() && !bIsDataLayout)
+ bool bIsDataLayout = false;
+ OUString aFieldName = pDPObj->GetDimName(nField, bIsDataLayout);
+ if (!aFieldName.isEmpty() && !bIsDataLayout)
return static_cast<DataPilotFieldOrientation>(nOrient);
}
@@ -307,9 +307,9 @@ void ScGridWindow::DPTestMouse( const MouseEvent& rMEvt, sal_Bool bMove )
aPosRect, nOrient, nDimPos );
UpdateDragRect( bHasRange && bMove, aPosRect );
- sal_Bool bIsDataLayout;
+ bool bIsDataLayout;
sal_Int32 nDimFlags = 0;
- String aDimName = pDragDPObj->GetDimName( nDPField, bIsDataLayout, &nDimFlags );
+ OUString aDimName = pDragDPObj->GetDimName( nDPField, bIsDataLayout, &nDimFlags );
bool bAllowed = !bHasRange || ScDPObject::IsOrientationAllowed( nOrient, nDimFlags );
if (bMove) // set mouse pointer
@@ -558,8 +558,8 @@ void ScGridWindow::UpdateDPFromFieldPopupMenu()
aNewDPObj.BuildAllDimensionMembers();
ScDPSaveData* pSaveData = aNewDPObj.GetSaveData();
- sal_Bool bIsDataLayout;
- String aDimName = pDPObj->GetDimName(pDPData->mnDim, bIsDataLayout);
+ bool bIsDataLayout;
+ OUString aDimName = pDPObj->GetDimName(pDPData->mnDim, bIsDataLayout);
ScDPSaveDimension* pDim = pSaveData->GetDimensionByName(aDimName);
if (!pDim)
return;
commit 1bf8dd499d69b2a6c4064d025e958c2c6ee4cd61
Author: Kohei Yoshida <kyoshida at novell.com>
Date: Sat May 28 16:37:51 2011 -0400
String to rtl::OUString in ScDPServiceDesc.
diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx
index 510f308..7720e33 100644
--- a/sc/inc/dpobject.hxx
+++ b/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);
diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index e6e8bc9..689699f 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/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 ),
diff --git a/sc/source/filter/xml/XMLExportDataPilot.cxx b/sc/source/filter/xml/XMLExportDataPilot.cxx
index eee934b..79774b0 100644
--- a/sc/source/filter/xml/XMLExportDataPilot.cxx
+++ b/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);
diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx
index aad4e79..4595c67 100644
--- a/sc/source/ui/unoobj/dapiuno.cxx
+++ b/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
More information about the Libreoffice-commits
mailing list