[Libreoffice-commits] core.git: formula/source include/formula include/svtools svtools/source

[Caolán McNamara]

 formula/source/ui/dlg/ControlHelper.hxx |   16 ++++++++--------
 formula/source/ui/dlg/funcutl.cxx       |   16 ++++++++--------
 include/formula/funcutl.hxx             |    2 +-
 include/svtools/prnsetup.hxx            |    2 +-
 svtools/source/dialogs/prnsetup.cxx     |    2 +-
 5 files changed, 19 insertions(+), 19 deletions(-)

New commits:
commit 4129130cab83eb1e7e1ebf153c914524846f7e4b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jun 7 15:35:53 2013 +0100

    XubString->OUString
    
    Change-Id: I9404ef0d53a74e09a0db9781d004fcd0c573dd78

diff --git a/formula/source/ui/dlg/ControlHelper.hxx b/formula/source/ui/dlg/ControlHelper.hxx
index 6bed4c7..c2d6c8a 100644
--- a/formula/source/ui/dlg/ControlHelper.hxx
+++ b/formula/source/ui/dlg/ControlHelper.hxx
@@ -31,13 +31,13 @@ class ValWnd : public Window
 public:
             ValWnd( Window* pParent, const ResId& rId );
 
-    void    SetValue( const String& rStrVal );
+    void    SetValue( const OUString& rStrVal );
 
 protected:
     virtual void    Paint( const Rectangle& rRect );
 
 private:
-    String      aStrValue;
+    OUString    aStrValue;
     Rectangle   aRectOut;
 };
 
@@ -142,15 +142,15 @@ public:
                                 ArgEdit*        pedArg,
                                 RefButton*  prefBtn);
 
-    void        SetArgName(const String &aArg);
-    String      GetArgName();
+    void        SetArgName(const OUString &aArg);
+    OUString    GetArgName();
     void        SetArgNameFont(const Font&);
 
-    void        SetArgVal(const String &aVal);
-    String      GetArgVal();
+    void        SetArgVal(const OUString &aVal);
+    OUString    GetArgVal();
 
-    void        SetArgSelection (const Selection& rSel );
-    void        ReplaceSelOfArg (const String& rStr );
+    void        SetArgSelection (const Selection& rSel);
+    void        ReplaceSelOfArg (const OUString& rStr);
 
     ArgEdit*    GetArgEdPtr() {return pEdArg;}
 
diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx
index 01fc78b..03e9c41 100644
--- a/formula/source/ui/dlg/funcutl.cxx
+++ b/formula/source/ui/dlg/funcutl.cxx
@@ -72,7 +72,7 @@ void ValWnd::Paint( const Rectangle& )
 
 //----------------------------------------------------------------------------
 
-void ValWnd::SetValue( const String& rStrVal )
+void ValWnd::SetValue( const OUString& rStrVal )
 {
     if ( aStrValue != rStrVal )
     {
@@ -265,7 +265,7 @@ void ArgInput::InitArgInput(FixedText*      pftArg,
 #*  Output:     ---
 #*
 #************************************************************************/
-void ArgInput::SetArgName(const String &aArg)
+void ArgInput::SetArgName(const OUString &aArg)
 {
     if(pFtArg !=NULL) pFtArg->SetText(aArg );
 }
@@ -283,7 +283,7 @@ void ArgInput::SetArgName(const String &aArg)
 #*  Output:     ---
 #*
 #************************************************************************/
-String ArgInput::GetArgName()
+OUString ArgInput::GetArgName()
 {
     String aPrivArgName;
     if(pFtArg !=NULL)
@@ -342,11 +342,11 @@ void ArgInput::SetArgSelection  (const Selection& rSel )
 #*  Output:     ---
 #*
 #************************************************************************/
-void ArgInput::SetArgVal(const String &aVal)
+void ArgInput::SetArgVal(const OUString &rVal)
 {
     if(pEdArg !=NULL)
     {
-        pEdArg ->SetRefString(aVal );
+        pEdArg ->SetRefString(rVal);
     }
 }
 
@@ -363,9 +363,9 @@ void ArgInput::SetArgVal(const String &aVal)
 #*  Output:     String
 #*
 #************************************************************************/
-String ArgInput::GetArgVal()
+OUString ArgInput::GetArgVal()
 {
-    String aResult;
+    OUString aResult;
     if(pEdArg!=NULL)
     {
         aResult=pEdArg->GetText();
@@ -877,7 +877,7 @@ RefEdit::~RefEdit()
     aTimer.Stop();
 }
 
-void RefEdit::SetRefString( const XubString& rStr )
+void RefEdit::SetRefString( const OUString& rStr )
 {
     Edit::SetText( rStr );
 }
diff --git a/include/formula/funcutl.hxx b/include/formula/funcutl.hxx
index 6676117..0d802f1 100644
--- a/include/formula/funcutl.hxx
+++ b/include/formula/funcutl.hxx
@@ -50,7 +50,7 @@ public:
                             WinBits nStyle = WB_BORDER );
     virtual             ~RefEdit();
 
-    void                SetRefString( const XubString& rStr );
+    void                SetRefString( const OUString& rStr );
 
     /**
      * Flag reference valid or invalid, which in turn changes the visual
diff --git a/include/svtools/prnsetup.hxx b/include/svtools/prnsetup.hxx
index 9999fdb..d9150cb 100644
--- a/include/svtools/prnsetup.hxx
+++ b/include/svtools/prnsetup.hxx
@@ -86,7 +86,7 @@ Printer* ImplPrnDlgListBoxSelect( ListBox* pBox, PushButton* pPropBtn,
                                   Printer* pPrinter, Printer* pTempPrinter );
 Printer* ImplPrnDlgUpdatePrinter( Printer* pPrinter, Printer* pTempPrinter );
 void ImplPrnDlgUpdateQueueInfo( ListBox* pBox, QueueInfo& rInfo );
-XubString ImplPrnDlgGetStatusText( const QueueInfo& rInfo );
+OUString ImplPrnDlgGetStatusText( const QueueInfo& rInfo );
 
 #endif // _SV_PRNSETUP_HXX_
 
diff --git a/svtools/source/dialogs/prnsetup.cxx b/svtools/source/dialogs/prnsetup.cxx
index ff289d2..df83136 100644
--- a/svtools/source/dialogs/prnsetup.cxx
+++ b/svtools/source/dialogs/prnsetup.cxx
@@ -139,7 +139,7 @@ static void ImplPrnDlgAddResString( XubString& rStr, sal_uInt16 nResId )
 
 // -----------------------------------------------------------------------
 
-XubString ImplPrnDlgGetStatusText( const QueueInfo& rInfo )
+OUString ImplPrnDlgGetStatusText( const QueueInfo& rInfo )
 {
     XubString   aStr;
     sal_uLong       nStatus = rInfo.GetStatus();