Kaydet (Commit) d84b9742 authored tarafından Noel Grandin's avatar Noel Grandin

convert sw/inc/swtable.hxx from String to OUString

Change-Id: I1f5c2c612589fd86567ee9d3e09ecd5bff74ce25
üst 04caa8bb
......@@ -269,7 +269,7 @@ public:
// #i80314#
// add 2nd parameter in order to control validation check in called method
// <_GetBoxNum(..)>
const SwTableBox* GetTblBox( const String& rName,
const SwTableBox* GetTblBox( const OUString& rName,
const bool bPerformValidCheck = false ) const;
// Copy selected boxes to another document.
bool MakeCopy( SwDoc*, const SwPosition&, const SwSelBoxes&,
......@@ -293,7 +293,7 @@ public:
bool IsTblComplex() const;
// Returns true if table or selection is balanced.
bool IsTblComplexForChart( const String& rSel ) const;
bool IsTblComplexForChart( const OUString& rSel ) const;
// Search all content-bearing boxes of the base line on which this box stands.
// rBoxes as a return value for immediate use.
......@@ -432,7 +432,7 @@ public:
bool bOvrTblLns=true ) const;
// Return name of this box. It is determined dynamically and
// is calculated from the position in the lines/boxes/table.
String GetName() const;
OUString GetName() const;
// Return "value" of box (for calculating in table).
double GetValue( SwTblCalcPara& rPara ) const;
......
......@@ -52,10 +52,10 @@ void SwTable::UpdateCharts() const
GetFrmFmt()->GetDoc()->UpdateCharts( GetFrmFmt()->GetName() );
}
bool SwTable::IsTblComplexForChart( const String& rSelection ) const
bool SwTable::IsTblComplexForChart( const OUString& rSelection ) const
{
const SwTableBox* pSttBox, *pEndBox;
if( 2 < rSelection.Len() )
if( 2 < rSelection.getLength() )
{
// Remove brackets at the beginning and from the end
String sBox( rSelection );
......
......@@ -1414,7 +1414,7 @@ sal_uInt16 SwTable::_GetBoxNum( OUString& rStr, sal_Bool bFirstPart,
// #i80314#
// add 2nd parameter and its handling
const SwTableBox* SwTable::GetTblBox( const String& rName,
const SwTableBox* SwTable::GetTblBox( const OUString& rName,
const bool bPerformValidCheck ) const
{
const SwTableBox* pBox = 0;
......@@ -1895,7 +1895,7 @@ void sw_GetTblBoxColStr( sal_uInt16 nCol, String& rNm )
} while( 1 );
}
String SwTableBox::GetName() const
OUString SwTableBox::GetName() const
{
if( !pSttNd ) // box without content?
{
......
......@@ -571,7 +571,7 @@ static void lcl_InspectLines(SwTableLines& rLines, std::vector<OUString*>& rAllN
for(sal_uInt16 j = 0; j < rBoxes.size(); j++)
{
SwTableBox* pBox = rBoxes[j];
if(pBox->GetName().Len() && pBox->getRowSpan() > 0 )
if(!pBox->GetName().isEmpty() && pBox->getRowSpan() > 0 )
rAllNames.push_back( new OUString(pBox->GetName()) );
SwTableLines& rBoxLines = pBox->GetTabLines();
if(!rBoxLines.empty())
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment