User: rt Date: 2007/04/26 00:56:57 Modified: dba/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
Log: INTEGRATION: CWS residcleanup (1.9.80); FILE MERGED 2007/02/26 22:58:46 pl 1.9.80.1: #i74635# no more ResMgr default File Changes: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: TextConnectionHelper.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/TextConnectionHelper.cxx?r1=1.9&r2=1.10 Delta lines: +28 -28 --------------------- --- TextConnectionHelper.cxx 17 Sep 2006 07:06:25 -0000 1.9 +++ TextConnectionHelper.cxx 26 Apr 2007 07:56:55 -0000 1.10 @@ -168,25 +168,25 @@ //------------------------------------------------------------------------ OTextConnectionHelper::OTextConnectionHelper( Window* pParent, sal_Bool _bWizardMode ) :Control(pParent) - ,m_aHeader (pParent, ResId(CB_AUTOHEADER)) - ,m_aLineFormat (pParent, ResId(FL_AUTOSEPARATOR2)) - ,m_aFTExtensionHeader (pParent, ResId(FT_AUTOEXTENSIONHEADER)) - ,m_aRBAccessTextFiles (pParent, ResId(RB_AUTOACCESSCTEXTFILES)) - ,m_aRBAccessCSVFiles (pParent, ResId(RB_AUTOACCESSCCSVFILES)) - ,m_aRBAccessOtherFiles (pParent, ResId(RB_AUTOACCESSOTHERS)) - ,m_aETOwnExtension (pParent, ResId(ET_AUTOOWNEXTENSION)) - ,m_aFTExtensionExample (pParent, ResId(FT_AUTOOWNEXTENSIONAPPENDIX)) - ,m_aFieldSeparatorLabel (pParent, ResId(FT_AUTOFIELDSEPARATOR)) - ,m_aFieldSeparator (pParent, ResId(CM_AUTOFIELDSEPARATOR)) - ,m_aTextSeparatorLabel (pParent, ResId(FT_AUTOTEXTSEPARATOR)) - ,m_aTextSeparator (pParent, ResId(CM_AUTOTEXTSEPARATOR)) - ,m_aDecimalSeparatorLabel (pParent, ResId(FT_AUTODECIMALSEPARATOR)) - ,m_aDecimalSeparator (pParent, ResId(CM_AUTODECIMALSEPARATOR)) - ,m_aThousandsSeparatorLabel (pParent, ResId(FT_AUTOTHOUSANDSSEPARATOR)) - ,m_aThousandsSeparator (pParent, ResId(CM_AUTOTHOUSANDSSEPARATOR)) - ,m_aFieldSeparatorList (ResId(STR_AUTOFIELDSEPARATORLIST)) - ,m_aTextSeparatorList (ResId(STR_AUTOTEXTSEPARATORLIST)) - ,m_aTextNone (ResId(STR_AUTOTEXT_FIELD_SEP_NONE)) + ,m_aHeader (pParent, ModuleRes(CB_AUTOHEADER)) + ,m_aLineFormat (pParent, ModuleRes(FL_AUTOSEPARATOR2)) + ,m_aFTExtensionHeader (pParent, ModuleRes(FT_AUTOEXTENSIONHEADER)) + ,m_aRBAccessTextFiles (pParent, ModuleRes(RB_AUTOACCESSCTEXTFILES)) + ,m_aRBAccessCSVFiles (pParent, ModuleRes(RB_AUTOACCESSCCSVFILES)) + ,m_aRBAccessOtherFiles (pParent, ModuleRes(RB_AUTOACCESSOTHERS)) + ,m_aETOwnExtension (pParent, ModuleRes(ET_AUTOOWNEXTENSION)) + ,m_aFTExtensionExample (pParent, ModuleRes(FT_AUTOOWNEXTENSIONAPPENDIX)) + ,m_aFieldSeparatorLabel (pParent, ModuleRes(FT_AUTOFIELDSEPARATOR)) + ,m_aFieldSeparator (pParent, ModuleRes(CM_AUTOFIELDSEPARATOR)) + ,m_aTextSeparatorLabel (pParent, ModuleRes(FT_AUTOTEXTSEPARATOR)) + ,m_aTextSeparator (pParent, ModuleRes(CM_AUTOTEXTSEPARATOR)) + ,m_aDecimalSeparatorLabel (pParent, ModuleRes(FT_AUTODECIMALSEPARATOR)) + ,m_aDecimalSeparator (pParent, ModuleRes(CM_AUTODECIMALSEPARATOR)) + ,m_aThousandsSeparatorLabel (pParent, ModuleRes(FT_AUTOTHOUSANDSSEPARATOR)) + ,m_aThousandsSeparator (pParent, ModuleRes(CM_AUTOTHOUSANDSSEPARATOR)) + ,m_aFieldSeparatorList (ModuleRes(STR_AUTOFIELDSEPARATORLIST)) + ,m_aTextSeparatorList (ModuleRes(STR_AUTOTEXTSEPARATORLIST)) + ,m_aTextNone (ModuleRes(STR_AUTOTEXT_FIELD_SEP_NONE)) { DBG_CTOR(OTextConnectionHelper,NULL); @@ -316,61 +316,61 @@ String aDelText(m_aFieldSeparator.GetText()); if(!aDelText.Len()) { // Kein FeldTrenner - aErrorText = String(ResId(STR_AUTODELIMITER_MISSING)); + aErrorText = String(ModuleRes(STR_AUTODELIMITER_MISSING)); aErrorText.SearchAndReplaceAscii("#1",m_aFieldSeparatorLabel.GetText()); pErrorWin = &m_aFieldSeparator; } else if (!m_aDecimalSeparator.GetText().Len()) { // kein Decimaltrenner - aErrorText = String(ResId(STR_AUTODELIMITER_MISSING)); + aErrorText = String(ModuleRes(STR_AUTODELIMITER_MISSING)); aErrorText.SearchAndReplaceAscii("#1",m_aDecimalSeparatorLabel.GetText()); pErrorWin = &m_aDecimalSeparator; } else if (m_aTextSeparator.GetText() == m_aFieldSeparator.GetText()) { // Feld und TextTrenner duerfen nicht gleich sein - aErrorText = String(ResId(STR_AUTODELIMITER_MUST_DIFFER)); + aErrorText = String(ModuleRes(STR_AUTODELIMITER_MUST_DIFFER)); aErrorText.SearchAndReplaceAscii("#1",m_aTextSeparatorLabel.GetText()); aErrorText.SearchAndReplaceAscii("#2",m_aFieldSeparatorLabel.GetText()); pErrorWin = &m_aTextSeparator; } else if (m_aDecimalSeparator.GetText() == m_aThousandsSeparator.GetText()) { // Tausender und DecimalTrenner duerfen nicht gleich sein - aErrorText = String(ResId(STR_AUTODELIMITER_MUST_DIFFER)); + aErrorText = String(ModuleRes(STR_AUTODELIMITER_MUST_DIFFER)); aErrorText.SearchAndReplaceAscii("#1",m_aDecimalSeparatorLabel.GetText()); aErrorText.SearchAndReplaceAscii("#2",m_aThousandsSeparatorLabel.GetText()); pErrorWin = &m_aDecimalSeparator; } else if (m_aFieldSeparator.GetText() == m_aThousandsSeparator.GetText()) { // Tausender und FeldTrenner duerfen nicht gleich sein - aErrorText = String(ResId(STR_AUTODELIMITER_MUST_DIFFER)); + aErrorText = String(ModuleRes(STR_AUTODELIMITER_MUST_DIFFER)); aErrorText.SearchAndReplaceAscii("#1",m_aFieldSeparatorLabel.GetText()); aErrorText.SearchAndReplaceAscii("#2",m_aThousandsSeparatorLabel.GetText()); pErrorWin = &m_aFieldSeparator; } else if (m_aFieldSeparator.GetText() == m_aDecimalSeparator.GetText()) { // Zehner und FeldTrenner duerfen nicht gleich sein - aErrorText = String(ResId(STR_AUTODELIMITER_MUST_DIFFER)); + aErrorText = String(ModuleRes(STR_AUTODELIMITER_MUST_DIFFER)); aErrorText.SearchAndReplaceAscii("#1",m_aFieldSeparatorLabel.GetText()); aErrorText.SearchAndReplaceAscii("#2",m_aDecimalSeparatorLabel.GetText()); pErrorWin = &m_aFieldSeparator; } else if (m_aTextSeparator.GetText() == m_aThousandsSeparator.GetText()) { // Tausender und TextTrenner duerfen nicht gleich sein - aErrorText = String(ResId(STR_AUTODELIMITER_MUST_DIFFER)); + aErrorText = String(ModuleRes(STR_AUTODELIMITER_MUST_DIFFER)); aErrorText.SearchAndReplaceAscii("#1",m_aTextSeparatorLabel.GetText()); aErrorText.SearchAndReplaceAscii("#2",m_aThousandsSeparatorLabel.GetText()); pErrorWin = &m_aTextSeparator; } else if (m_aTextSeparator.GetText() == m_aDecimalSeparator.GetText()) { // Zehner und TextTrenner duerfen nicht gleich sein - aErrorText = String(ResId(STR_AUTODELIMITER_MUST_DIFFER)); + aErrorText = String(ModuleRes(STR_AUTODELIMITER_MUST_DIFFER)); aErrorText.SearchAndReplaceAscii("#1",m_aTextSeparatorLabel.GetText()); aErrorText.SearchAndReplaceAscii("#2",m_aDecimalSeparatorLabel.GetText()); pErrorWin = &m_aTextSeparator; } else if ((sExtension.Search('*') != STRING_NOTFOUND) || (sExtension.Search('?') != STRING_NOTFOUND)) { - aErrorText = String(ResId(STR_AUTONO_WILDCARDS)); + aErrorText = String(ModuleRes(STR_AUTONO_WILDCARDS)); aErrorText.SearchAndReplaceAscii("#1",sExtension); pErrorWin = &m_aETOwnExtension; } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
