From e3f11c10d8cc759d01afa4b8fd8bd98c81a03119 Mon Sep 17 00:00:00 2001 From: "Chr. Rossmanith" Date: Mon, 21 Jan 2013 14:32:09 +0100 Subject: Changed SetText() / GetText() to take/return OUString replaced lots of Len() with isEmpty() Change-Id: I6b82d48245ee2a0782e05a326f7934e9357227d0 Reviewed-on: https://gerrit.libreoffice.org/1795 Reviewed-by: Michael Stahl Tested-by: Michael Stahl --- padmin/source/adddlg.cxx | 4 ++-- padmin/source/cmddlg.cxx | 4 ++-- padmin/source/newppdlg.cxx | 2 +- padmin/source/titlectrl.cxx | 2 +- padmin/source/titlectrl.hxx | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) (limited to 'padmin') diff --git a/padmin/source/adddlg.cxx b/padmin/source/adddlg.cxx index e8b5941b77bb..85372dff4a40 100644 --- a/padmin/source/adddlg.cxx +++ b/padmin/source/adddlg.cxx @@ -346,7 +346,7 @@ APNamePage::~APNamePage() bool APNamePage::check() { - return m_aNameEdt.GetText().Len(); + return !m_aNameEdt.GetText().isEmpty(); } void APNamePage::fill( PrinterInfo& rInfo ) @@ -455,7 +455,7 @@ IMPL_LINK( APCommandPage, ModifyHdl, ComboBox*, pBox ) { if( pBox == &m_aCommandBox ) { - m_pParent->enableNext( m_aCommandBox.GetText().Len() ); + m_pParent->enableNext( !m_aCommandBox.GetText().isEmpty() ); } return 0; } diff --git a/padmin/source/cmddlg.cxx b/padmin/source/cmddlg.cxx index ba0691e3122d..17e386332ab7 100644 --- a/padmin/source/cmddlg.cxx +++ b/padmin/source/cmddlg.cxx @@ -323,7 +323,7 @@ void RTSCommandPage::save() String aFeatures; sal_Int32 nIndex = 0; - String aOldPdfPath; + OUString aOldPdfPath; bool bOldFaxSwallow = false; bool bFaxSwallow = m_aFaxSwallowBox.IsChecked() ? true : false; bool bExternalDialog = m_aExternalCB.IsChecked() ? true : false; @@ -531,7 +531,7 @@ void RTSCommandPage::UpdateCommands() void RTSCommandPage::ConnectCommand() { - String aString( m_aConnectedTo.GetText().GetToken( 0, ':' ) ); + String aString( m_aConnectedTo.GetText().getToken( 0, ':' ) ); aString.AppendAscii( ": " ); aString += m_aCommandsCB.GetText(); diff --git a/padmin/source/newppdlg.cxx b/padmin/source/newppdlg.cxx index cc642ebdac1e..e99eaeb6ae04 100644 --- a/padmin/source/newppdlg.cxx +++ b/padmin/source/newppdlg.cxx @@ -82,7 +82,7 @@ PPDImportDialog::PPDImportDialog( Window* pParent ) : m_aPathBox.SetSelectHdl( LINK( this, PPDImportDialog, SelectHdl ) ); m_aPathBox.SetModifyHdl( LINK( this, PPDImportDialog, ModifyHdl ) ); - if( m_aPathBox.GetText().Len() ) + if( !m_aPathBox.GetText().isEmpty() ) Import(); } diff --git a/padmin/source/titlectrl.cxx b/padmin/source/titlectrl.cxx index 8361b7d925aa..5d2cfb50a984 100644 --- a/padmin/source/titlectrl.cxx +++ b/padmin/source/titlectrl.cxx @@ -67,7 +67,7 @@ void TitleImage::Paint( const Rectangle& ) // ----------------------------------------------------------------------- -void TitleImage::SetText( const String& rText ) +void TitleImage::SetText( const OUString& rText ) { m_aText = rText; m_bArranged = false; diff --git a/padmin/source/titlectrl.hxx b/padmin/source/titlectrl.hxx index 46586177fc12..8ed66cbe132b 100644 --- a/padmin/source/titlectrl.hxx +++ b/padmin/source/titlectrl.hxx @@ -46,8 +46,8 @@ public: void SetImage( const Image& rImage ); const Image& GetImage() const { return m_aImage; } - virtual void SetText( const String& rText ); - virtual String GetText() const { return m_aText; } + virtual void SetText( const OUString& rText ); + virtual OUString GetText() const { return m_aText; } void SetBackgroundColor( const Color& rColor ); const Color& GetBackgroundColor() const { return m_aBGColor; } -- cgit