Replace [Uni|Xub]String with OUString in vcl
Christina Roßmanith has abandoned this change. Change subject: Replace [Uni|Xub]String with OUString in vcl .. Patch Set 1: Abandoned I6b82d48245ee2a0782e05a326f7934e9357227d0 contains this changes as a subset -- To view, visit https://gerrit.libreoffice.org/1666 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I7cbefa72010cc3e49a93db5b2cbf49cfb08061f7 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Christina Roßmanith Gerrit-Reviewer: Luboš Luňák ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Replace [Uni|Xub]String with OUString in vcl,svtools,toolkit
Christina Roßmanith has abandoned this change. Change subject: Replace [Uni|Xub]String with OUString in vcl,svtools,toolkit .. Patch Set 1: Abandoned I6b82d48245ee2a0782e05a326f7934e9357227d0 contains this changes as subset -- To view, visit https://gerrit.libreoffice.org/1667 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I9e6cd6cd6726a1377b46fea773fe5c16aa26ba70 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Christina Roßmanith Gerrit-Reviewer: Christina Roßmanith Gerrit-Reviewer: LOH KOK HOE ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Replace [Uni|Xub]String with OUString in vcl, svtools, toolkit
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1667
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/67/1667/1
Replace [Uni|Xub]String with OUString in vcl,svtools,toolkit
Change-Id: I9e6cd6cd6726a1377b46fea773fe5c16aa26ba70
---
M svtools/inc/svtools/editsyntaxhighlighter.hxx
M svtools/inc/svtools/filectrl.hxx
M svtools/inc/svtools/fmtfield.hxx
M svtools/source/brwbox/ebbcontrols.cxx
M svtools/source/contnr/DocumentInfoPreview.cxx
M svtools/source/control/filectrl.cxx
M svtools/source/control/fmtfield.cxx
M svtools/source/control/inettbc.cxx
M svtools/source/control/tabbar.cxx
M svtools/source/dialogs/addresstemplate.cxx
M svtools/source/dialogs/wizardmachine.cxx
M svtools/source/edit/editsyntaxhighlighter.cxx
M svtools/source/uno/unoiface.cxx
M toolkit/source/awt/vclxwindows.cxx
M vcl/inc/vcl/button.hxx
M vcl/inc/vcl/combobox.hxx
M vcl/inc/vcl/ctrl.hxx
M vcl/inc/vcl/edit.hxx
M vcl/inc/vcl/fixedhyper.hxx
M vcl/inc/vcl/longcurr.hxx
M vcl/inc/vcl/menu.hxx
M vcl/inc/vcl/morebtn.hxx
M vcl/inc/vcl/status.hxx
M vcl/inc/vcl/svapp.hxx
M vcl/inc/vcl/texteng.hxx
M vcl/inc/vcl/toolbox.hxx
M vcl/inc/vcl/vclmedit.hxx
M vcl/inc/vcl/window.hxx
M vcl/source/control/button.cxx
M vcl/source/control/combobox.cxx
M vcl/source/control/ctrl.cxx
M vcl/source/control/edit.cxx
M vcl/source/control/fixedhyper.cxx
M vcl/source/control/morebtn.cxx
M vcl/source/edit/texteng.cxx
M vcl/source/edit/vclmedit.cxx
M vcl/source/window/status.cxx
M vcl/source/window/window.cxx
38 files changed, 97 insertions(+), 98 deletions(-)
diff --git a/svtools/inc/svtools/editsyntaxhighlighter.hxx
b/svtools/inc/svtools/editsyntaxhighlighter.hxx
index 4648511..7f81ae6 100644
--- a/svtools/inc/svtools/editsyntaxhighlighter.hxx
+++ b/svtools/inc/svtools/editsyntaxhighlighter.hxx
@@ -44,8 +44,8 @@
~MultiLineEditSyntaxHighlight();
virtual void UpdateData();
-virtual void SetText(const String& rNewText);
-virtual void SetText( const XubString& rStr, const Selection&
rNewSelection )
+virtual void SetText(const OUString& rNewText);
+virtual void SetText( const OUString& rStr, const Selection&
rNewSelection )
{ SetText( rStr ); SetSelection( rNewSelection ); }
Color GetColorValue(TokenTypes aToken);
diff --git a/svtools/inc/svtools/filectrl.hxx b/svtools/inc/svtools/filectrl.hxx
index d1b1eee..c7fdd42 100644
--- a/svtools/inc/svtools/filectrl.hxx
+++ b/svtools/inc/svtools/filectrl.hxx
@@ -75,8 +75,8 @@
voidSetOpenDialog( sal_Bool bOpen ) { mbOpenDlg = bOpen; }
sal_BoolIsOpenDialog() const{ return mbOpenDlg; }
-voidSetText( const XubString& rStr );
-XubString GetText() const;
+voidSetText( const OUString& rStr );
+OUStringGetText() const;
rtl::OUString GetSelectedText() const { return
maEdit.GetSelected(); }
voidSetSelection( const Selection& rSelection ) {
maEdit.SetSelection( rSelection ); }
diff --git a/svtools/inc/svtools/fmtfield.hxx b/svtools/inc/svtools/fmtfield.hxx
index 368f54a..b7cbc16 100644
--- a/svtools/inc/svtools/fmtfield.hxx
+++ b/svtools/inc/svtools/fmtfield.hxx
@@ -179,8 +179,8 @@
voidTreatAsNumber(sal_Bool bDoSo) { m_bTreatAsNumber = bDoSo; }
public:
-virtual void SetText( const XubString& rStr );
-virtual void SetText( const XubString& rStr, const Selection&
rNewSelection );
+virtual void SetText( const OUString& rStr );
+virtual void SetText( const OUString& rStr, const Selection& rNewSelection
);
// die folgenden Methoden sind interesant, wenn m_bTreatAsNumber auf
sal_False sitzt
/** nehmen wir mal an, irgendjemand will das ganze schoene double-Handling
gar nicht haben, sondern
@@ -244,7 +244,7 @@
// any aspect of the current format has changed
virtual void FormatChanged(FORMAT_CHANGE_TYPE nWhat);
-void ImplSetTextImpl(const XubString& rNew, Selection* pNewSel);
+void ImplSetTextImpl(const OUString& rNew, Selection* pNewSel);
void ImplSetValue(double dValue, sal_Bool bForce);
sal_Bool ImplGetValue(double& dNewVal);
diff --git a/svtools/source/brwbox/ebbcontrols.cxx
b/svtools/source/brwbox/ebbcontrols.cxx
index 718eb67..fa081b7 100644
--- a/svtools/source/brwbox/ebbcontrols.cxx
+++ b/svtools/source/brwbox/ebbcontrols.cxx
@@ -98,7 +98,7 @@
case KEY_RIGHT:
{
Selection aSel = rBox.GetSelection();
-return !aSel && aSel.Max() == rBox.GetText().Len();
+return !aSel && aSel.Max() == rBox.GetText().getLength();
}
case KEY_HOME:
case KEY_LEFT:
@@ -129,7 +129,7 @@
//--
sal_Bool ComboBoxCellController
[PATCH] Replace [Uni|Xub]String with OUString in vcl
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1666
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/66/1666/1
Replace [Uni|Xub]String with OUString in vcl
Change-Id: I7cbefa72010cc3e49a93db5b2cbf49cfb08061f7
---
M vcl/inc/helpwin.hxx
M vcl/source/app/help.cxx
M vcl/source/app/svapp.cxx
M vcl/source/control/button.cxx
M vcl/source/control/combobox.cxx
M vcl/source/control/ctrl.cxx
M vcl/source/control/edit.cxx
M vcl/source/control/field.cxx
M vcl/source/control/field2.cxx
M vcl/source/control/longcurr.cxx
M vcl/source/control/morebtn.cxx
M vcl/source/edit/vclmedit.cxx
M vcl/source/window/floatwin.cxx
M vcl/source/window/msgbox.cxx
M vcl/source/window/toolbox2.cxx
M vcl/source/window/window.cxx
M vcl/unx/generic/app/i18n_status.cxx
17 files changed, 65 insertions(+), 65 deletions(-)
diff --git a/vcl/inc/helpwin.hxx b/vcl/inc/helpwin.hxx
index 63f91dd..6923c2b 100644
--- a/vcl/inc/helpwin.hxx
+++ b/vcl/inc/helpwin.hxx
@@ -48,7 +48,7 @@
DECL_LINK( TimerHdl, Timer* );
virtual voidPaint( const Rectangle& );
virtual voidRequestHelp( const HelpEvent& rHEvt );
-virtual String GetText() const;
+virtual OUStringGetText() const;
voidImplShow();
public:
diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx
index f9241dd..b172eb4 100644
--- a/vcl/source/app/help.cxx
+++ b/vcl/source/app/help.cxx
@@ -530,7 +530,7 @@
// ---
-XubString HelpTextWindow::GetText() const
+OUString HelpTextWindow::GetText() const
{
return maHelpText;
}
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 73530fd..9014895 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -294,16 +294,16 @@
// ---
-XubString Application::GetCommandLineParam( sal_uInt16 nParam )
+OUString Application::GetCommandLineParam( sal_uInt16 nParam )
{
-rtl::OUString aParam;
+OUString aParam;
osl_getCommandArg( nParam, &aParam.pData );
return aParam;
}
// ---
-const XubString& Application::GetAppFileName()
+const OUString& Application::GetAppFileName()
{
ImplSVData* pSVData = ImplGetSVData();
DBG_ASSERT( pSVData->maAppData.mpAppFileName, "AppFileName vor SVMain ?!"
);
@@ -314,14 +314,14 @@
* #91147# provide a fallback for people without initialized
* vcl here (like setup in responsefile mode)
*/
-static String aAppFileName;
-if( !aAppFileName.Len() )
+static OUString aAppFileName;
+if( aAppFileName.isEmpty() )
{
-rtl::OUString aExeFileName;
+OUString aExeFileName;
osl_getExecutableFile( &aExeFileName.pData );
// convert path to native file format
-rtl::OUString aNativeFileName;
+OUString aNativeFileName;
osl::FileBase::getSystemPathFromFileURL( aExeFileName, aNativeFileName
);
aAppFileName = aNativeFileName;
}
@@ -365,7 +365,7 @@
// ---
-void Application::Abort( const XubString& rErrorText )
+void Application::Abort( const OUString& rErrorText )
{
//HACK: Dump core iff --norestore command line argument is given (assuming
// this process is run by developers who are interested in cores, vs. end
@@ -373,7 +373,7 @@
bool dumpCore = false;
sal_uInt16 n = GetCommandLineParamCount();
for (sal_uInt16 i = 0; i != n; ++i) {
-if (GetCommandLineParam(i).EqualsAscii("--norestore")) {
+if (GetCommandLineParam(i) == "--norestore") {
dumpCore = true;
break;
}
@@ -1168,20 +1168,20 @@
// ---
-void Application::SetAppName( const XubString& rUniqueName )
+void Application::SetAppName( const OUString& rUniqueName )
{
ImplSVData* pSVData = ImplGetSVData();
// create if not existing
if ( !pSVData->maAppData.mpAppName )
-pSVData->maAppData.mpAppName = new XubString( rUniqueName );
+pSVData->maAppData.mpAppName = new String( rUniqueName );
else
*(pSVData->maAppData.mpAppName) = rUniqueName;
}
// ---
-XubString Application::GetAppName()
+OUString Application::GetAppName()
{
ImplSVData* pSVData = ImplGetSVData();
if ( pSVData->maAppData.mpAppName )
@@ -1192,7 +1192,7 @@
// ---
-void Application::SetDisplayName( const UniString& rName )
+void Application::SetDisplayName(
