Tag: cws_src680_oj14 User: oj Date: 2007-06-05 19:22:18+0000 Log: merge problem
File Changes: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: dlgsave.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/dlgsave.cxx?r1=1.26.8.7&r2=1.26.8.8 Delta lines: +23 -23 --------------------- --- dlgsave.cxx 2007-06-04 18:24:05+0000 1.26.8.7 +++ dlgsave.cxx 2007-06-05 19:22:15+0000 1.26.8.8 @@ -4,9 +4,9 @@ * * $RCSfile: dlgsave.cxx,v $ * - * $Revision: 1.26.8.7 $ + * $Revision: 1.26.8.8 $ * - * last change: $Author: oj $ $Date: 2007/06/04 18:24:05 $ + * last change: $Author: oj $ $Date: 2007/06/05 19:22:15 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -150,16 +150,16 @@ const String& rDefault, const IObjectNameCheck& _rObjectNameCheck, sal_Int32 _nFlags) - :m_aDescription(this, ModuleRes (FT_DESCRIPTION)) - ,m_aCatalogLbl(this, ModuleRes (FT_CATALOG)) - ,m_aCatalog(this, ModuleRes (ET_CATALOG), ::rtl::OUString()) - ,m_aSchemaLbl(this, ModuleRes (FT_SCHEMA)) - ,m_aSchema(this, ModuleRes (ET_SCHEMA), ::rtl::OUString()) - ,m_aLabel(this, ModuleRes (FT_TITLE)) - ,m_aTitle(this, ModuleRes (ET_TITLE), ::rtl::OUString()) - ,m_aPB_OK(this, ModuleRes( PB_OK ) ) - ,m_aPB_CANCEL(this, ModuleRes( PB_CANCEL )) - ,m_aPB_HELP(this, ModuleRes( PB_HELP)) + :m_aDescription(_pParent, ModuleRes (FT_DESCRIPTION)) + ,m_aCatalogLbl(_pParent, ModuleRes (FT_CATALOG)) + ,m_aCatalog(_pParent, ModuleRes (ET_CATALOG), ::rtl::OUString()) + ,m_aSchemaLbl(_pParent, ModuleRes (FT_SCHEMA)) + ,m_aSchema(_pParent, ModuleRes (ET_SCHEMA), ::rtl::OUString()) + ,m_aLabel(_pParent, ModuleRes (FT_TITLE)) + ,m_aTitle(_pParent, ModuleRes (ET_TITLE), ::rtl::OUString()) + ,m_aPB_OK(_pParent, ModuleRes( PB_OK ) ) + ,m_aPB_CANCEL(_pParent, ModuleRes( PB_CANCEL )) + ,m_aPB_HELP(_pParent, ModuleRes( PB_HELP)) ,m_aQryLabel(ModuleRes(STR_QRY_LABEL)) ,m_sTblLabel(ModuleRes(STR_TBL_LABEL)) ,m_aName(rDefault) @@ -183,16 +183,16 @@ const String& rDefault, const IObjectNameCheck& _rObjectNameCheck, sal_Int32 _nFlags) - :m_aDescription(this, ModuleRes (FT_DESCRIPTION)) - ,m_aCatalogLbl(this, ModuleRes (FT_CATALOG)) - ,m_aCatalog(this, ModuleRes (ET_CATALOG)) - ,m_aSchemaLbl(this, ModuleRes (FT_SCHEMA)) - ,m_aSchema(this, ModuleRes (ET_SCHEMA)) - ,m_aLabel(this, ModuleRes (FT_TITLE)) - ,m_aTitle(this, ModuleRes (ET_TITLE)) - ,m_aPB_OK(this, ModuleRes( PB_OK ) ) - ,m_aPB_CANCEL(this, ModuleRes( PB_CANCEL )) - ,m_aPB_HELP(this, ModuleRes( PB_HELP)) + :m_aDescription(_pParent, ModuleRes (FT_DESCRIPTION)) + ,m_aCatalogLbl(_pParent, ModuleRes (FT_CATALOG)) + ,m_aCatalog(_pParent, ModuleRes (ET_CATALOG)) + ,m_aSchemaLbl(_pParent, ModuleRes (FT_SCHEMA)) + ,m_aSchema(_pParent, ModuleRes (ET_SCHEMA)) + ,m_aLabel(_pParent, ModuleRes (FT_TITLE)) + ,m_aTitle(_pParent, ModuleRes (ET_TITLE)) + ,m_aPB_OK(_pParent, ModuleRes( PB_OK ) ) + ,m_aPB_CANCEL(_pParent, ModuleRes( PB_CANCEL )) + ,m_aPB_HELP(_pParent, ModuleRes( PB_HELP)) ,m_aQryLabel(ModuleRes(STR_QRY_LABEL)) ,m_sTblLabel(ModuleRes(STR_TBL_LABEL)) ,m_aName(rDefault) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
