User: hr Date: 06/06/19 20:07:23 Modified: /dba/dbaccess/source/ui/dlg/ dlgsave.cxx
Log: INTEGRATION: CWS warnings01 (1.26.50); FILE MERGED 2006/03/24 15:36:11 fs 1.26.50.1: #i57457# warning-free code (unxlngi6/.pro + unxsoli4.pro) 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&r2=1.27 Delta lines: +28 -28 --------------------- --- dlgsave.cxx 8 Sep 2005 15:00:44 -0000 1.26 +++ dlgsave.cxx 20 Jun 2006 03:07:21 -0000 1.27 @@ -96,9 +96,9 @@ ,m_aPB_HELP(this, ResId( PB_HELP)) ,m_aQryLabel(ResId(STR_QRY_LABEL)) ,m_sTblLabel(ResId(STR_TBL_LABEL)) + ,m_aName(rDefault) ,m_aExists(ResId(STR_OBJECT_EXISTS_ALREADY)) ,m_aExistsOverwrite(ResId(STR_OBJECT_EXISTS_ALREADY_OVERWRITE)) - ,m_aName(rDefault) ,m_xNames(_rxNames) ,m_xMetaData(_rxMetaData) ,m_nType(_rType) @@ -142,10 +142,10 @@ } if ( _xConnection.is() ) { - String sCatalog = _xConnection->getCatalog(); - USHORT nPos = m_aCatalog.GetEntryPos(sCatalog); + String sCurrentCatalog = _xConnection->getCatalog(); + USHORT nPos = m_aCatalog.GetEntryPos( sCurrentCatalog ); if ( nPos != COMBOBOX_ENTRY_NOTFOUND ) - m_aCatalog.SelectEntryPos(nPos); + m_aCatalog.SelectEntryPos( nPos ); } else m_aCatalog.SetText(String()); @@ -264,12 +264,12 @@ ,m_aPB_HELP(this, ResId( PB_HELP)) ,m_aQryLabel(ResId(STR_QRY_LABEL)) ,m_sTblLabel(ResId(STR_TBL_LABEL)) + ,m_aName(rDefault) ,m_aExists(ResId(STR_OBJECT_EXISTS_ALREADY)) ,m_aExistsOverwrite(ResId(STR_OBJECT_EXISTS_ALREADY_OVERWRITE)) - ,m_aName(rDefault) ,m_xNames(_rxNames) - ,m_nFlags(_nFlags) ,m_nType(CommandType::COMMAND) + ,m_nFlags(_nFlags) { implInitOnlyTitle(_sLabel); implInit(); @@ -294,13 +294,13 @@ ,m_aPB_HELP(this, ResId( PB_HELP)) ,m_aQryLabel(ResId(STR_QRY_LABEL)) ,m_sTblLabel(ResId(STR_TBL_LABEL)) + ,m_aName(rDefault) ,m_aExists(ResId(STR_OBJECT_EXISTS_ALREADY)) ,m_aExistsOverwrite(ResId(STR_OBJECT_EXISTS_ALREADY_OVERWRITE)) - ,m_aName(rDefault) + ,m_sParentURL(_sParentURL) ,m_xHierarchyNames(_rxNames) - ,m_nFlags(_nFlags) ,m_nType(CommandType::COMMAND) - ,m_sParentURL(_sParentURL) + ,m_nFlags(_nFlags) { implInitOnlyTitle(_sLabel); implInit(); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
