sw/inc/swtable.hxx |6 +++---
sw/inc/swtblfmt.hxx |6 +++---
sw/inc/tblafmt.hxx |4 ++--
sw/inc/txtfld.hxx |4 ++--
sw/inc/undobj.hxx |2 +-
sw/inc/unochart.hxx |6 +++---
sw/inc/unosrch.hxx |4 ++--
sw/inc/unotbl.hxx |6 +++---
sw/inc/unotxdoc.hxx | 26 +-
sw/source/core/doc/docchart.cxx |4 ++--
sw/source/core/table/swtable.cxx|4 ++--
sw/source/core/undo/undobj.cxx |2 +-
sw/source/core/unocore/unochart.cxx |6 +++---
sw/source/core/unocore/unotbl.cxx |6 +++---
sw/source/ui/uno/unotxdoc.cxx | 18 +-
15 files changed, 52 insertions(+), 52 deletions(-)
New commits:
commit d84b974290c494e643a83207a9aac16fc5f683bf
Author: Noel Grandin
Date: Thu Sep 19 08:02:20 2013 +0200
convert sw/inc/swtable.hxx from String to OUString
Change-Id: I1f5c2c612589fd86567ee9d3e09ecd5bff74ce25
diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx
index 312ddd1..83c153b 100644
--- a/sw/inc/swtable.hxx
+++ b/sw/inc/swtable.hxx
@@ -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;
diff --git a/sw/source/core/doc/docchart.cxx b/sw/source/core/doc/docchart.cxx
index 9c6a68e..6eacb57 100644
--- a/sw/source/core/doc/docchart.cxx
+++ b/sw/source/core/doc/docchart.cxx
@@ -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 );
diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx
index 1091449..c424822 100644
--- a/sw/source/core/table/swtable.cxx
+++ b/sw/source/core/table/swtable.cxx
@@ -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?
{
diff --git a/sw/source/core/unocore/unotbl.cxx
b/sw/source/core/unocore/unotbl.cxx
index cb0a359..e99879a 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -571,7 +571,7 @@ static void lcl_InspectLines(SwTableLines& rLines,
std::vector& 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())
commit 04caa8bb956e8366f96acfaa9d0c271083978812
Author: Noel Grandin
Date: Wed Sep 18 14:33:25 2013 +0200
convert sw/inc/swtblfmt.hxx from String to OUString
Change-Id: I00f7fdaa33bc8b5ede2e3a7f1d1d938b62cc0646
diff --git a/sw/inc/swtblfmt.hxx b/sw/inc/swtblfmt.hxx
index a54faa49..26ea0d8 100644
--- a/sw/inc/swtblfmt.hxx
+++ b/sw/inc/swtblfmt.hxx
@@ -32,7 +32,7 @@ p