String->OUString in ScDocument and follow up

6 files changed, 17 insertions, 13 deletions

diff --git a/sc/source/ui/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxx
index 3b03dec46a73..e4c4f9e0fa96 100644
--- a/sc/source/ui/view/dbfunc3.cxx
+++ b/sc/source/ui/view/dbfunc3.cxx
@@ -2154,7 +2154,7 @@ void ScDBFunc::ShowDataPilotSourceData( ScDPObject& rDPObj, const Sequence<sheet
     String aUndo = ScGlobal::GetRscString( STR_UNDO_DOOUTLINE );
     pMgr->EnterListAction( aUndo, aUndo );
 
-    String aNewTabName;
+    rtl::OUString aNewTabName;
     pDoc->CreateValidTabName(aNewTabName);
     if ( InsertTable(aNewTabName, nNewTab) )
         PasteFromClip( IDF_ALL, pInsDoc.get() );
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index aab30fc77519..bc78aaa4c03b 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -3407,7 +3407,8 @@ sal_Int8 ScGridWindow::AcceptPrivateDrop( const AcceptDropEvent& rEvt )
         ScDocument* pThisDoc   = pViewData->GetDocument();
         if (pSourceDoc == pThisDoc)
         {
-            if ( pThisDoc->HasChartAtPoint(pViewData->GetTabNo(), PixelToLogic(aPos)) )
+            rtl::OUString aName;
+            if ( pThisDoc->HasChartAtPoint(pViewData->GetTabNo(), PixelToLogic(aPos), aName ))
             {
                 if (bDragRect)          // Rechteck loeschen
                 {
@@ -3957,8 +3958,8 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos
         }
         else                                        // move/copy block
         {
-            String aChartName;
-            if (pThisDoc->HasChartAtPoint( nThisTab, rLogicPos, &aChartName ))
+            rtl::OUString aChartName;
+            if (pThisDoc->HasChartAtPoint( nThisTab, rLogicPos, aChartName ))
             {
                 String aRangeName;
                 aSource.Format( aRangeName, SCR_ABS_3D, pThisDoc );
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index b0dba17f4507..1b732e72fbb7 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -495,12 +495,14 @@ sal_Bool ScDrawStringsVars::SetText( ScBaseCell* pCell )
 
             Color* pColor;
             sal_uLong nFormat = GetValueFormat();
+            rtl::OUString aOUString = aString;
             ScCellFormat::GetString( pCell,
-                                     nFormat, aString, &pColor,
+                                     nFormat, aOUString, &pColor,
                                      *pOutput->pDoc->GetFormatTable(),
                                      pOutput->bShowNullValues,
                                      pOutput->bShowFormulas,
                                      ftCheck );
+            aString = aOUString;
 
             if (aString.Len() > DRAWTEXT_MAX)
                 aString.Erase(DRAWTEXT_MAX);
@@ -2167,7 +2169,7 @@ bool ScOutputData::DrawEditParam::readCellContent(
     {
         sal_uLong nFormat = mpPattern->GetNumberFormat(
                                     pDoc->GetFormatTable(), mpCondSet );
-        String aString;
+        rtl::OUString aString;
         Color* pColor;
         ScCellFormat::GetString( mpCell,
                                  nFormat,aString, &pColor,
@@ -4904,7 +4906,7 @@ void ScOutputData::DrawRotated(sal_Bool bPixelToLogic)
                                 {
                                     sal_uLong nFormat = pPattern->GetNumberFormat(
                                                                 pDoc->GetFormatTable(), pCondSet );
-                                    String aString;
+                                    rtl::OUString aString;
                                     Color* pColor;
                                     ScCellFormat::GetString( pCell,
                                                              nFormat,aString, &pColor,
diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx
index 7c07e11c714f..592bc82425f5 100644
--- a/sc/source/ui/view/printfun.cxx
+++ b/sc/source/ui/view/printfun.cxx
@@ -2440,7 +2440,7 @@ sal_Bool ScPrintFunc::UpdatePages()
             nZoom = ZOOM_MIN;
     }
 
-    String aName = pDoc->GetPageStyle( nPrintTab );
+    rtl::OUString aName = pDoc->GetPageStyle( nPrintTab );
     SCTAB nTabCount = pDoc->GetTableCount();
     for (SCTAB nTab=0; nTab<nTabCount; nTab++)
         if ( nTab==nPrintTab || pDoc->GetPageStyle(nTab)==aName )
diff --git a/sc/source/ui/view/tabcont.cxx b/sc/source/ui/view/tabcont.cxx
index 18ec9bbecae3..db140e745adf 100644
--- a/sc/source/ui/view/tabcont.cxx
+++ b/sc/source/ui/view/tabcont.cxx
@@ -185,7 +185,7 @@ void ScTabControl::MouseButtonUp( const MouseEvent& rMEvt )
         ScDocument* pDoc = pViewData->GetDocument();
         if (!pDoc->IsDocEditable())
             return;
-        String aName;
+        rtl::OUString aName;
         pDoc->CreateValidTabName(aName);
         SCTAB nTabCount = pDoc->GetTableCount();
         pViewData->GetViewShell()->InsertTable(aName, nTabCount);
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index ee80993645f1..6b900e452ab3 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -2299,9 +2299,10 @@ void ScViewFunc::InsertTableLink( const String& rFile,
                                     const String& rFilter, const String& rOptions,
                                     const String& rTabName )
 {
-    String aFilterName = rFilter;
-    String aOpt = rOptions;
-    ScDocumentLoader aLoader( rFile, aFilterName, aOpt );
+    rtl::OUString aFilterName = rFilter;
+    rtl::OUString aOpt = rOptions;
+    rtl::OUString aURL = rFile;
+    ScDocumentLoader aLoader( aURL, aFilterName, aOpt );
     if (!aLoader.IsError())
     {
         ScDocShell* pSrcSh = aLoader.GetDocShell();
@@ -2754,7 +2755,7 @@ void ScViewFunc::MoveTable(
             for (size_t j = 0; j < n; ++j)
             {
                 SCTAB nRenameTab = (*pDestTabs)[j];
-                String aTabName = *pNewTabName;
+                rtl::OUString aTabName = *pNewTabName;
                 pDoc->CreateValidTabName( aTabName );
                 pDestNames->push_back(aTabName);
                 pDoc->RenameTab(nRenameTab, aTabName);