[Libreoffice-commits] core.git: sw/source

[Matteo Casalin]

 sw/source/core/unocore/unotbl.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit f6497d620296ee24d43424c0281ef911db773760
Author: Matteo Casalin <matteo.casa...@yahoo.com>
Date:   Sat Aug 24 22:13:56 2013 +0200

    String to OUString
    
    Change-Id: Ic57557901fb45ea2c3a7b2c20a601b2be6985708
    Reviewed-on: https://gerrit.libreoffice.org/5621
    Reviewed-by: Matteo Casalin <matteo.casa...@yahoo.com>
    Tested-by: Matteo Casalin <matteo.casa...@yahoo.com>

diff --git a/sw/source/core/unocore/unotbl.cxx 
b/sw/source/core/unocore/unotbl.cxx
index 99c14d6..079f375 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();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits