summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorMatteo Casalin <matteo.casalin@yahoo.com>2013-08-24 22:13:56 +0200
committerMatteo Casalin <matteo.casalin@yahoo.com>2013-08-25 11:45:56 +0000
commitf6497d620296ee24d43424c0281ef911db773760 (patch)
tree30f0dac0ba802ed3ae60264bc76cbabc44dd7660 /sw
parent80dfbe76a8b04017897a5d96e5aa6038d0699ebe (diff)
String to OUString
Change-Id: Ic57557901fb45ea2c3a7b2c20a601b2be6985708 Reviewed-on: https://gerrit.libreoffice.org/5621 Reviewed-by: Matteo Casalin <matteo.casalin@yahoo.com> Tested-by: Matteo Casalin <matteo.casalin@yahoo.com>
Diffstat (limited to 'sw')
-rw-r--r--sw/source/core/unocore/unotbl.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index 99c14d6f0353..079f37567a25 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -562,7 +562,7 @@ static SwXCell* lcl_CreateXCell(SwFrmFmt* pFmt, sal_Int32 nColumn, sal_Int32 nRo
return pXCell;
}
-static void lcl_InspectLines(SwTableLines& rLines, std::vector<String*>& rAllNames)
+static void lcl_InspectLines(SwTableLines& rLines, std::vector<OUString*>& rAllNames)
{
for( sal_uInt16 i = 0; i < rLines.size(); i++ )
{
@@ -572,7 +572,7 @@ static void lcl_InspectLines(SwTableLines& rLines, std::vector<String*>& rAllNam
{
SwTableBox* pBox = rBoxes[j];
if(pBox->GetName().Len() && pBox->getRowSpan() > 0 )
- rAllNames.push_back( new String(pBox->GetName()) );
+ rAllNames.push_back( new OUString(pBox->GetName()) );
SwTableLines& rBoxLines = pBox->GetTabLines();
if(!rBoxLines.empty())
{
@@ -2251,7 +2251,7 @@ uno::Sequence< OUString > SwXTextTable::getCellNames(void) throw( uno::RuntimeEx
SwTable* pTable = SwTable::FindTable( pFmt );
// gibts an der Tabelle und an allen Boxen
SwTableLines& rTblLines = pTable->GetTabLines();
- std::vector<String*> aAllNames;
+ std::vector<OUString*> aAllNames;
lcl_InspectLines(rTblLines, aAllNames);
uno::Sequence< OUString > aRet( static_cast<sal_uInt16>(aAllNames.size()) );
OUString* pArray = aRet.getArray();