From 2dab78ee2199d70b951aee86b80aab4374cc7c4f Mon Sep 17 00:00:00 2001 From: "Chr. Rossmanith" Date: Thu, 24 Jan 2013 15:12:43 +0100 Subject: Change GetSavedValue() to return OUString removed temporarily added OUString(...GetSavedValue()...) constructs again Change-Id: I11477654d217a5ae127c1ef1b19cbff56ed052a6 --- dbaccess/source/ui/dlg/ConnectionPage.cxx | 2 +- dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx | 4 ++-- dbaccess/source/ui/dlg/TextConnectionHelper.cxx | 8 ++++---- dbaccess/source/ui/dlg/adminpages.cxx | 4 ++-- dbaccess/source/ui/dlg/detailpages.cxx | 2 +- dbaccess/source/ui/inc/FieldControls.hxx | 6 +++--- dbaccess/source/ui/misc/WCPage.cxx | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) (limited to 'dbaccess') diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx index 2076a1c46311..925ac9ecfc49 100644 --- a/dbaccess/source/ui/dlg/ConnectionPage.cxx +++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx @@ -291,7 +291,7 @@ namespace dbaui { sal_Bool bChangedSomething = sal_False; - if (m_aUserName.GetText() != OUString(m_aUserName.GetSavedValue())) + if (m_aUserName.GetText() != m_aUserName.GetSavedValue()) { _rSet.Put(SfxStringItem(DSID_USER, m_aUserName.GetText())); _rSet.Put(SfxStringItem(DSID_PASSWORD, String())); diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx index ef5cd570d584..b4150effa75e 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx @@ -182,7 +182,7 @@ DBG_NAME(OTextConnectionPageSetup) fillString(_rSet,&m_aETBaseDN,DSID_CONN_LDAP_BASEDN, bChangedSomething); fillInt32(_rSet,&m_aNFPortNumber,DSID_CONN_LDAP_PORTNUMBER,bChangedSomething); - if ( m_aETHostServer.GetText() != OUString(m_aETHostServer.GetSavedValue()) ) + if ( m_aETHostServer.GetText() != m_aETHostServer.GetSavedValue() ) { DbuTypeCollectionItem* pCollectionItem = PTR_CAST(DbuTypeCollectionItem, _rSet.GetItem(DSID_TYPECOLLECTION)); ::dbaccess::ODsnTypeCollection* pCollection = NULL; @@ -825,7 +825,7 @@ DBG_NAME(OAuthentificationPageSetup) { sal_Bool bChangedSomething = sal_False; - if (m_aETUserName.GetText() != OUString(m_aETUserName.GetSavedValue())) + if (m_aETUserName.GetText() != m_aETUserName.GetSavedValue()) { _rSet.Put(SfxStringItem(DSID_USER, m_aETUserName.GetText())); _rSet.Put(SfxStringItem(DSID_PASSWORD, String())); diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx index f979b51d4a14..05d5485eec21 100644 --- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx @@ -386,23 +386,23 @@ DBG_NAME(OTextConnectionHelper) if ( ( m_nAvailableSections & TC_SEPARATORS ) != 0 ) { - if( m_aFieldSeparator.GetText() != OUString(m_aFieldSeparator.GetSavedValue()) ) + if( m_aFieldSeparator.GetText() != m_aFieldSeparator.GetSavedValue() ) { rSet.Put( SfxStringItem(DSID_FIELDDELIMITER, GetSeparator( m_aFieldSeparator, m_aFieldSeparatorList) ) ); bChangedSomething = sal_True; } - if( m_aTextSeparator.GetText() != OUString(m_aTextSeparator.GetSavedValue()) ) + if( m_aTextSeparator.GetText() != m_aTextSeparator.GetSavedValue() ) { rSet.Put( SfxStringItem(DSID_TEXTDELIMITER, GetSeparator( m_aTextSeparator, m_aTextSeparatorList) ) ); bChangedSomething = sal_True; } - if( m_aDecimalSeparator.GetText() != OUString(m_aDecimalSeparator.GetSavedValue()) ) + if( m_aDecimalSeparator.GetText() != m_aDecimalSeparator.GetSavedValue() ) { rSet.Put( SfxStringItem(DSID_DECIMALDELIMITER, m_aDecimalSeparator.GetText().copy(0, 1) ) ); bChangedSomething = sal_True; } - if( m_aThousandsSeparator.GetText() != OUString(m_aThousandsSeparator.GetSavedValue()) ) + if( m_aThousandsSeparator.GetText() != m_aThousandsSeparator.GetSavedValue() ) { rSet.Put( SfxStringItem(DSID_THOUSANDSDELIMITER, m_aThousandsSeparator.GetText().copy(0,1) ) ); bChangedSomething = sal_True; diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx index fcdb61c091c8..46840d8ad32e 100644 --- a/dbaccess/source/ui/dlg/adminpages.cxx +++ b/dbaccess/source/ui/dlg/adminpages.cxx @@ -228,7 +228,7 @@ namespace dbaui // ----------------------------------------------------------------------- void OGenericAdministrationPage::fillInt32(SfxItemSet& _rSet,NumericField* _pEdit,sal_uInt16 _nID,sal_Bool& _bChangedSomething) { - if( (_pEdit != NULL) && (_pEdit->GetValue() != _pEdit->GetSavedValue().ToInt32()) ) + if( (_pEdit != NULL) && (_pEdit->GetValue() != _pEdit->GetSavedValue().toInt32()) ) { _rSet.Put(SfxInt32Item(_nID, static_cast(_pEdit->GetValue()))); _bChangedSomething = sal_True; @@ -237,7 +237,7 @@ namespace dbaui // ----------------------------------------------------------------------- void OGenericAdministrationPage::fillString(SfxItemSet& _rSet,Edit* _pEdit,sal_uInt16 _nID,sal_Bool& _bChangedSomething) { - if( (_pEdit != NULL) && (_pEdit->GetText() != OUString(_pEdit->GetSavedValue())) ) + if( (_pEdit != NULL) && (_pEdit->GetText() != _pEdit->GetSavedValue()) ) { _rSet.Put(SfxStringItem(_nID, _pEdit->GetText())); _bChangedSomething = sal_True; diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx index 45831a6d99c9..f79cab6d354c 100644 --- a/dbaccess/source/ui/dlg/detailpages.cxx +++ b/dbaccess/source/ui/dlg/detailpages.cxx @@ -705,7 +705,7 @@ namespace dbaui bChangedSomething |= m_aMySQLSettings.FillItemSet( _rSet ); - if ( m_aUserName.GetText() != OUString(m_aUserName.GetSavedValue()) ) + if ( m_aUserName.GetText() != m_aUserName.GetSavedValue() ) { _rSet.Put( SfxStringItem( DSID_USER, m_aUserName.GetText() ) ); _rSet.Put( SfxStringItem( DSID_PASSWORD, String())); diff --git a/dbaccess/source/ui/inc/FieldControls.hxx b/dbaccess/source/ui/inc/FieldControls.hxx index 2e1087836888..c571a111c8ca 100644 --- a/dbaccess/source/ui/inc/FieldControls.hxx +++ b/dbaccess/source/ui/inc/FieldControls.hxx @@ -48,7 +48,7 @@ namespace dbaui public: inline OPropColumnEditCtrl(Window* pParent, ::rtl::OUString& _rAllowedChars, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0); - inline sal_Bool IsModified() const { return GetText() != OUString(GetSavedValue()); } + inline sal_Bool IsModified() const { return GetText() != GetSavedValue(); } short GetPos() const { return m_nPos; } String GetHelp() const { return m_strHelpText; } @@ -80,7 +80,7 @@ namespace dbaui inline OPropEditCtrl(Window* pParent, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0); inline OPropEditCtrl(Window* pParent, sal_uInt16 nHelpId, const ResId& _rRes,short nPosition = -1); - inline sal_Bool IsModified() const { return GetText() != OUString(GetSavedValue()); } + inline sal_Bool IsModified() const { return GetText() != GetSavedValue(); } short GetPos() const { return m_nPos; } String GetHelp() const { return m_strHelpText; } @@ -115,7 +115,7 @@ namespace dbaui inline OPropNumericEditCtrl(Window* pParent, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0); inline OPropNumericEditCtrl(Window* pParent, sal_uInt16 nHelpId, const ResId& _rRes,short nPosition = -1); - inline sal_Bool IsModified() const { return GetText() != OUString(GetSavedValue()); } + inline sal_Bool IsModified() const { return GetText() != GetSavedValue(); } short GetPos() const { return m_nPos; } String GetHelp() const { return m_strHelpText; } diff --git a/dbaccess/source/ui/misc/WCPage.cxx b/dbaccess/source/ui/misc/WCPage.cxx index 5205c7ece933..cb6974176626 100644 --- a/dbaccess/source/ui/misc/WCPage.cxx +++ b/dbaccess/source/ui/misc/WCPage.cxx @@ -215,7 +215,7 @@ sal_Bool OCopyTable::LeavePage() } } - if ( !m_edTableName.GetSavedValue().Equals(m_edTableName.GetText()) ) + if ( m_edTableName.GetSavedValue() != m_edTableName.GetText() ) { // table exists and name has changed if ( m_pParent->getOperation() == CopyTableOperation::AppendData ) { -- cgit