remove last uses of XubString in sc

Change-Id: I44c42f0268b0d7c2e77ab7e807610d39b7b7ea56

include/formula/IControlReferenceHandler.hxx

@@ -28,7 +28,7 @@ namespace formula
     class FORMULA_DLLPUBLIC SAL_NO_VTABLE IControlReferenceHandler
     {
     public:
-        virtual void ShowReference(const String& _sRef) = 0;
+        virtual void ShowReference(const OUString& _sRef) = 0;
         virtual void HideReference( sal_Bool bDoneRefMode = sal_True ) = 0;
         virtual void ReleaseFocus( RefEdit* pEdit, RefButton* pButton = NULL ) = 0;
         virtual void ToggleCollapsed( RefEdit* pEdit, RefButton* pButton = NULL ) = 0;

reportdesign/source/ui/dlg/Formula.cxx

@@ -173,7 +173,7 @@ IFunctionManager* FormulaDialog::getFunctionManager()
     return m_aFunctionManager.get();
 }
 // -----------------------------------------------------------------------------
-void FormulaDialog::ShowReference(const String& /*_sRef*/)
+void FormulaDialog::ShowReference(const OUString& /*_sRef*/)
 {
 }
 // -----------------------------------------------------------------------------

reportdesign/source/ui/inc/Formula.hxx

@@ -87,7 +87,7 @@ public:
     virtual ::std::auto_ptr<formula::FormulaTokenArray> convertToTokenArray(const ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken >& _aTokenList);
 
     // IControlReferenceHandler
-    virtual void ShowReference(const String& _sRef);
+    virtual void ShowReference(const OUString& _sRef);
     virtual void HideReference( sal_Bool bDoneRefMode = sal_True );
     virtual void ReleaseFocus( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL );
     virtual void ToggleCollapsed( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL );

sc/source/ui/formdlg/formula.cxx

@@ -497,7 +497,7 @@ void ScFormulaDlg::showReference(const String& _sFormula)
 {
     ShowReference(_sFormula);
 }
-void ScFormulaDlg::ShowReference(const String& _sFormula)
+void ScFormulaDlg::ShowReference(const OUString& _sFormula)
 {
     m_aHelper.ShowReference(_sFormula);
 }

sc/source/ui/inc/anyrefdg.hxx

@@ -75,12 +75,12 @@ public:
     ScFormulaReferenceHelper(IAnyRefDialog* _pDlg,SfxBindings* _pBindings);
     ~ScFormulaReferenceHelper();
 
-    void                ShowSimpleReference( const XubString& rStr );
-    void                ShowFormulaReference( const XubString& rStr );
+    void                ShowSimpleReference(const OUString& rStr);
+    void                ShowFormulaReference(const OUString& rStr);
     bool                ParseWithNames( ScRangeList& rRanges, const String& rStr, ScDocument* pDoc );
     void                Init();
 
-    void                ShowReference( const XubString& rStr );
+    void                ShowReference(const OUString& rStr);
     void                ReleaseFocus( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL );
     void                HideReference( bool bDoneRefMode = true );
     void                RefInputStart( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL );
@@ -136,8 +136,8 @@ protected:
 
     virtual void        RefInputStart( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL );
     virtual void        RefInputDone( sal_Bool bForced = false );
-    void                ShowSimpleReference( const XubString& rStr );
-    void                ShowFormulaReference( const XubString& rStr );
+    void                ShowSimpleReference(const OUString& rStr);
+    void                ShowFormulaReference(const OUString& rStr);
 
     bool                ParseWithNames( ScRangeList& rRanges, const String& rStr, ScDocument* pDoc );
 
@@ -155,7 +155,7 @@ public:
     virtual sal_Bool        IsTableLocked() const;
     virtual sal_Bool        IsDocAllowed( SfxObjectShell* pDocSh ) const;
 
-    virtual void        ShowReference( const XubString& rStr );
+    virtual void        ShowReference(const OUString& rStr);
     virtual void        HideReference( sal_Bool bDoneRefMode = sal_True );
 
     virtual void        ToggleCollapsed( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL );

sc/source/ui/inc/formula.hxx

@@ -86,7 +86,7 @@ public:
     virtual sal_Bool    Close();
 
     // sc::IAnyRefDialog
-    virtual void ShowReference(const String& _sRef);
+    virtual void ShowReference(const OUString& _sRef);
     virtual void HideReference( sal_Bool bDoneRefMode = sal_True );
     virtual void SetReference( const ScRange& rRef, ScDocument* pD );
 

sc/source/ui/miscdlgs/anyrefdg.cxx

@@ -112,7 +112,7 @@ void ScFormulaReferenceHelper::enableInput( bool bEnable )
     }
 }
 // -----------------------------------------------------------------------------
-void ScFormulaReferenceHelper::ShowSimpleReference( const XubString& rStr )
+void ScFormulaReferenceHelper::ShowSimpleReference(const OUString& rStr)
 {
     if( bEnableColorRef )
     {
@@ -172,7 +172,7 @@ bool ScFormulaReferenceHelper::ParseWithNames( ScRangeList& rRanges, const Strin
     return !bError;
 }
 // -----------------------------------------------------------------------------
-void ScFormulaReferenceHelper::ShowFormulaReference( const XubString& rStr )
+void ScFormulaReferenceHelper::ShowFormulaReference(const OUString& rStr)
 {
     if( bEnableColorRef)
     {
@@ -251,20 +251,20 @@ void ScFormulaReferenceHelper::HideReference( bool bDoneRefMode )
     }
 }
 // -----------------------------------------------------------------------------
-void ScFormulaReferenceHelper::ShowReference( const XubString& rStr )
+void ScFormulaReferenceHelper::ShowReference(const OUString& rStr)
 {
     if( bEnableColorRef )
     {
-        if( rStr.Search('(')!=STRING_NOTFOUND ||
-            rStr.Search('+')!=STRING_NOTFOUND ||
-            rStr.Search('*')!=STRING_NOTFOUND ||
-            rStr.Search('-')!=STRING_NOTFOUND ||
-            rStr.Search('/')!=STRING_NOTFOUND ||
-            rStr.Search('&')!=STRING_NOTFOUND ||
-            rStr.Search('<')!=STRING_NOTFOUND ||
-            rStr.Search('>')!=STRING_NOTFOUND ||
-            rStr.Search('=')!=STRING_NOTFOUND ||
-            rStr.Search('^')!=STRING_NOTFOUND)
+        if( rStr.indexOf('(') != -1 ||
+            rStr.indexOf('+') != -1 ||
+            rStr.indexOf('*') != -1 ||
+            rStr.indexOf('-') != -1 ||
+            rStr.indexOf('/') != -1 ||
+            rStr.indexOf('&') != -1 ||
+            rStr.indexOf('<') != -1 ||
+            rStr.indexOf('>') != -1 ||
+            rStr.indexOf('=') != -1 ||
+            rStr.indexOf('^') != -1 )
         {
             ShowFormulaReference(rStr);
         }
@@ -1014,9 +1014,9 @@ void ScRefHandler::HideReference( sal_Bool bDoneRefMode )
     m_aHelper.HideReference( bDoneRefMode );
 }
 // -----------------------------------------------------------------------------
-void ScRefHandler::ShowReference( const XubString& rStr )
+void ScRefHandler::ShowReference(const OUString& rStr)
 {
-    m_aHelper.ShowReference( rStr );
+    m_aHelper.ShowReference(rStr);
 }
 // -----------------------------------------------------------------------------
 void ScRefHandler::ReleaseFocus( formula::RefEdit* pEdit, formula::RefButton* pButton )