Related: fdo#38838 remove UniString::ToUpperAscii

things got a little out of hand and I ended up
converting quite a bit of calc to OUString

Change-Id: I056326d37ffefa8c120cb2e564d166dd9f20f216

2 files changed, 8 insertions, 11 deletions

diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 436991f49cc0..42cbbb19294d 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -331,10 +331,9 @@ void ScInputHandler::UpdateRange( sal_uInt16 nIndex, const ScRange& rNew )
 
         ScRange aJustified = rNew;
         aJustified.Justify();           // Ref in der Formel immer richtigherum anzeigen
-        String aNewStr;
         ScDocument* pDoc = pDocView->GetViewData()->GetDocument();
         const ScAddress::Details aAddrDetails( pDoc, aCursorPos );
-        aJustified.Format( aNewStr, pData->nFlags, pDoc, aAddrDetails );
+        String aNewStr(aJustified.Format(pData->nFlags, pDoc, aAddrDetails));
         ESelection aOldSel( 0, nOldStart, 0, nOldEnd );
 
         DataChanging();
@@ -2967,8 +2966,7 @@ void ScInputHandler::SetReference( const ScRange& rRef, ScDocument* pDoc )
 
         OSL_ENSURE(rRef.aStart.Tab()==rRef.aEnd.Tab(), "nStartTab!=nEndTab");
 
-        String aTmp;
-        rRef.Format( aTmp, SCA_VALID|SCA_TAB_3D, pDoc, aAddrDetails );      // immer 3d
+        String aTmp(rRef.Format(SCA_VALID|SCA_TAB_3D, pDoc, aAddrDetails));      // immer 3d
 
         SfxObjectShell* pObjSh = pDoc->GetDocumentShell();
         // #i75893# convert escaped URL of the document to something user friendly
@@ -2983,9 +2981,9 @@ void ScInputHandler::SetReference( const ScRange& rRef, ScDocument* pDoc )
     {
         if ( ( rRef.aStart.Tab() != aCursorPos.Tab() ||
                 rRef.aStart.Tab() != rRef.aEnd.Tab() ) && pDoc )
-            rRef.Format( aRefStr, SCA_VALID|SCA_TAB_3D, pDoc, aAddrDetails );
+            aRefStr = rRef.Format(SCA_VALID|SCA_TAB_3D, pDoc, aAddrDetails);
         else
-            rRef.Format( aRefStr, SCA_VALID, pDoc, aAddrDetails );
+            aRefStr = rRef.Format(SCA_VALID, pDoc, aAddrDetails);
     }
 
     if (pTableView || pTopView)
@@ -3573,10 +3571,10 @@ void ScInputHandler::NotifyChange( const ScInputHdlState* pState,
                             {
                                 ScRange r(rSPos, rEPos);
                                 nFlags |= (nFlags << 4);
-                                r.Format( aPosStr, SCA_VALID | nFlags, pDoc, aAddrDetails );
+                                aPosStr = r.Format(SCA_VALID | nFlags, pDoc, aAddrDetails);
                             }
                             else
-                                aCursorPos.Format( aPosStr, SCA_VALID | nFlags, pDoc, aAddrDetails );
+                                aPosStr = aCursorPos.Format(SCA_VALID | nFlags, pDoc, aAddrDetails);
                         }
 
                         // Disable the accessible VALUE_CHANGE event
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 4fb2ad7f01bc..8c1de6035cc7 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -2393,8 +2393,7 @@ void ScPosWnd::DoEnter()
                     {
                         ScRangeName aNewRanges( *pNames );
                         ScAddress aCursor( pViewData->GetCurX(), pViewData->GetCurY(), pViewData->GetTabNo() );
-                        String aContent;
-                        aSelection.Format( aContent, SCR_ABS_3D, pDoc, pDoc->GetAddressConvention() );
+                        OUString aContent(aSelection.Format(SCR_ABS_3D, pDoc, pDoc->GetAddressConvention()));
                         ScRangeData* pNew = new ScRangeData( pDoc, aText, aContent, aCursor );
                         if ( aNewRanges.insert(pNew) )
                         {
@@ -2420,7 +2419,7 @@ void ScPosWnd::DoEnter()
                         // be in Calc A1 format.  Convert the text.
                         ScRange aRange(0,0,pViewData->GetTabNo());
                         aRange.ParseAny(aText, pDoc, pDoc->GetAddressConvention());
-                        aRange.Format(aText, SCR_ABS_3D, pDoc, ::formula::FormulaGrammar::CONV_OOO);
+                        aText = aRange.Format(SCR_ABS_3D, pDoc, ::formula::FormulaGrammar::CONV_OOO);
                     }
 
                     SfxStringItem aPosItem( SID_CURRENTCELL, aText );