User: rt Date: 2007-07-06 08:16:09+0000 Modified: dba/dbaccess/source/ui/dlg/dlgsave.cxx
Log: INTEGRATION: CWS oj14 (1.26.8); FILE MERGED 2007/06/05 19:22:15 oj 1.26.8.8: merge problem 2007/06/04 18:24:05 oj 1.26.8.7: RESYNC: (1.31-1.32); FILE MERGED 2006/11/09 13:54:30 oj 1.26.8.6: wnt warnings removed 2006/11/08 13:43:43 oj 1.26.8.5: merge conflicts 2006/11/07 09:22:23 oj 1.26.8.4: RESYNC: (1.27-1.31); FILE MERGED 2006/04/25 13:02:58 oj 1.26.8.3: new include 2006/03/20 07:48:30 oj 1.26.8.2: use of module client helper 2006/01/03 07:49:09 oj 1.26.8.1: changed module client 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.32&r2=1.33 Delta lines: +226 -133 ----------------------- --- dlgsave.cxx 2007-04-26 07:59:40+0000 1.32 +++ dlgsave.cxx 2007-07-06 08:16:06+0000 1.33 @@ -48,9 +48,6 @@ #ifndef _DBU_DLG_HRC_ #include "dbu_dlg.hrc" #endif -#ifndef _DBAUI_MODULE_DBU_HXX_ -#include "moduledbu.hxx" -#endif #ifndef _COM_SUN_STAR_SDB_COMMANDTYPE_HPP_ #include <com/sun/star/sdb/CommandType.hpp> #endif @@ -69,6 +66,30 @@ #ifndef _DBA_DBACCESS_HELPID_HRC_ #include "dbaccess_helpid.hrc" #endif +#ifndef DBAUI_SQLNAMEEDIT_HXX +#include "SqlNameEdit.hxx" +#endif +#ifndef _BUTTON_HXX //autogen +#include <vcl/button.hxx> +#endif +#ifndef _FIXED_HXX //autogen +#include <vcl/fixed.hxx> +#endif +#ifndef _EDIT_HXX //autogen +#include <vcl/edit.hxx> +#endif +#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ +#include <com/sun/star/container/XNameAccess.hpp> +#endif +#ifndef _COM_SUN_STAR_CONTAINER_XHIERARCHICALNAMEACCESS_HPP_ +#include <com/sun/star/container/XHierarchicalNameAccess.hpp> +#endif +#ifndef _COM_SUN_STAR_SDBC_XDATABASEMETADATA_HPP_ +#include <com/sun/star/sdbc/XDatabaseMetaData.hpp> +#endif +#ifndef _DBAUI_MODULE_DBU_HXX_ +#include "moduledbu.hxx" +#endif #ifndef DBACCESS_SOURCE_UI_INC_OBJECTNAMECHECK_HXX #include "objectnamecheck.hxx" #endif @@ -83,6 +104,104 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::sdb; using namespace ::com::sun::star::sdbc; +namespace dbaui +{ +class OSaveAsDlgImpl +{ +public: + FixedText m_aDescription; + FixedText m_aCatalogLbl; + OSQLNameComboBox m_aCatalog; + FixedText m_aSchemaLbl; + OSQLNameComboBox m_aSchema; + FixedText m_aLabel; + OSQLNameEdit m_aTitle; + OKButton m_aPB_OK; + CancelButton m_aPB_CANCEL; + HelpButton m_aPB_HELP; + String m_aQryLabel; + String m_sTblLabel; + rtl::OUString m_sCatalog; + rtl::OUString m_sSchema; + String m_aName; + const IObjectNameCheck& + m_rObjectNameCheck; + String m_sParentURL; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData> m_xMetaData; + sal_Int32 m_nType; + sal_Int32 m_nFlags; + + OSaveAsDlgImpl( Window * pParent,const sal_Int32& _rType, + const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection, + const String& rDefault, + const IObjectNameCheck& _rObjectNameCheck, + sal_Int32 _nFlags); + OSaveAsDlgImpl( Window * pParent, + const String& rDefault, + const IObjectNameCheck& _rObjectNameCheck, + sal_Int32 _nFlags); +}; +// ----------------------------------------------------------------------------- +} // dbaui +// ----------------------------------------------------------------------------- +OSaveAsDlgImpl::OSaveAsDlgImpl( Window * _pParent, + const sal_Int32& _rType, + const Reference< XConnection>& _xConnection, + const String& rDefault, + const IObjectNameCheck& _rObjectNameCheck, + sal_Int32 _nFlags) + :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) + ,m_rObjectNameCheck( _rObjectNameCheck ) + ,m_nType(_rType) + ,m_nFlags(_nFlags) +{ + if ( _xConnection.is() ) + m_xMetaData = _xConnection->getMetaData(); + + if ( m_xMetaData.is() ) + { + ::rtl::OUString sExtraNameChars( m_xMetaData->getExtraNameCharacters() ); + m_aCatalog.setAllowedChars( sExtraNameChars ); + m_aSchema.setAllowedChars( sExtraNameChars ); + m_aTitle.setAllowedChars( sExtraNameChars ); + } +} +// ----------------------------------------------------------------------------- +OSaveAsDlgImpl::OSaveAsDlgImpl( Window * _pParent, + const String& rDefault, + const IObjectNameCheck& _rObjectNameCheck, + sal_Int32 _nFlags) + :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) + ,m_rObjectNameCheck( _rObjectNameCheck ) + ,m_nType(CommandType::COMMAND) + ,m_nFlags(_nFlags) +{ +} +// ----------------------------------------------------------------------------- using namespace ::com::sun::star::lang; //================================================================== @@ -127,121 +246,102 @@ const IObjectNameCheck& _rObjectNameCheck, sal_Int32 _nFlags) :ModalDialog( pParent, ModuleRes(DLG_SAVE_AS)) - ,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_aQryLabel(ModuleRes(STR_QRY_LABEL)) - ,m_sTblLabel(ModuleRes(STR_TBL_LABEL)) - ,m_aName(rDefault) - ,m_rObjectNameCheck( _rObjectNameCheck ) ,m_xORB( _rxORB ) - ,m_nType(_rType) - ,m_nFlags(_nFlags) { - if ( _xConnection.is() ) - m_xMetaData = _xConnection->getMetaData(); - - if ( m_xMetaData.is() ) - { - ::rtl::OUString sExtraNameChars( m_xMetaData->getExtraNameCharacters() ); - m_aCatalog.setAllowedChars( sExtraNameChars ); - m_aSchema.setAllowedChars( sExtraNameChars ); - m_aTitle.setAllowedChars( sExtraNameChars ); - } + m_pImpl = new OSaveAsDlgImpl(this,_rType,_xConnection,rDefault,_rObjectNameCheck,_nFlags); switch (_rType) { case CommandType::QUERY: - implInitOnlyTitle(m_aQryLabel); + implInitOnlyTitle(m_pImpl->m_aQryLabel); break; case CommandType::TABLE: - OSL_ENSURE( m_xMetaData.is(), "OSaveAsDlg::OSaveAsDlg: no meta data for entering table names: this will crash!" ); + OSL_ENSURE( m_pImpl->m_xMetaData.is(), "OSaveAsDlg::OSaveAsDlg: no meta data for entering table names: this will crash!" ); { - m_aLabel.SetText(m_sTblLabel); - Point aPos(m_aPB_OK.GetPosPixel()); - if ( !m_xMetaData->supportsCatalogsInTableDefinitions() ) + m_pImpl->m_aLabel.SetText(m_pImpl->m_sTblLabel); + Point aPos(m_pImpl->m_aPB_OK.GetPosPixel()); + if(m_pImpl->m_xMetaData.is() && !m_pImpl->m_xMetaData->supportsCatalogsInTableDefinitions()) { - m_aCatalogLbl.Hide(); - m_aCatalog.Hide(); + m_pImpl->m_aCatalogLbl.Hide(); + m_pImpl->m_aCatalog.Hide(); - aPos = m_aLabel.GetPosPixel(); + aPos = m_pImpl->m_aLabel.GetPosPixel(); - m_aLabel.SetPosPixel(m_aSchemaLbl.GetPosPixel()); - m_aTitle.SetPosPixel(m_aSchema.GetPosPixel()); + m_pImpl->m_aLabel.SetPosPixel(m_pImpl->m_aSchemaLbl.GetPosPixel()); + m_pImpl->m_aTitle.SetPosPixel(m_pImpl->m_aSchema.GetPosPixel()); - m_aSchemaLbl.SetPosPixel(m_aCatalogLbl.GetPosPixel()); - m_aSchema.SetPosPixel(m_aCatalog.GetPosPixel()); + m_pImpl->m_aSchemaLbl.SetPosPixel(m_pImpl->m_aCatalogLbl.GetPosPixel()); + m_pImpl->m_aSchema.SetPosPixel(m_pImpl->m_aCatalog.GetPosPixel()); } else { // now fill the catalogs - lcl_fillComboList( m_aCatalog, _xConnection, + lcl_fillComboList( m_pImpl->m_aCatalog, _xConnection, &XDatabaseMetaData::getCatalogs, _xConnection->getCatalog() ); } - if ( !m_xMetaData->supportsSchemasInTableDefinitions()) + if ( !m_pImpl->m_xMetaData->supportsSchemasInTableDefinitions()) { - m_aSchemaLbl.Hide(); - m_aSchema.Hide(); + m_pImpl->m_aSchemaLbl.Hide(); + m_pImpl->m_aSchema.Hide(); - aPos = m_aLabel.GetPosPixel(); + aPos = m_pImpl->m_aLabel.GetPosPixel(); - m_aLabel.SetPosPixel(m_aSchemaLbl.GetPosPixel()); - m_aTitle.SetPosPixel(m_aSchema.GetPosPixel()); + m_pImpl->m_aLabel.SetPosPixel(m_pImpl->m_aSchemaLbl.GetPosPixel()); + m_pImpl->m_aTitle.SetPosPixel(m_pImpl->m_aSchema.GetPosPixel()); } else { - lcl_fillComboList( m_aSchema, _xConnection, - &XDatabaseMetaData::getSchemas, m_xMetaData->getUserName() ); + lcl_fillComboList( m_pImpl->m_aSchema, _xConnection, + &XDatabaseMetaData::getSchemas, m_pImpl->m_xMetaData->getUserName() ); } - ::rtl::OUString sTable; - ::dbtools::qualifiedNameComponents( m_xMetaData, - m_aName, - m_sCatalog, - m_sSchema, + OSL_ENSURE(m_pImpl->m_xMetaData.is(),"The metadata can not be null!"); + if(m_pImpl->m_aName.Search('.') != STRING_NOTFOUND) + { + ::rtl::OUString sCatalog,sSchema,sTable; + ::dbtools::qualifiedNameComponents(m_pImpl->m_xMetaData, + m_pImpl->m_aName, + sCatalog, + sSchema, sTable, ::dbtools::eInDataManipulation); - USHORT nPos = m_aCatalog.GetEntryPos( String( m_sCatalog ) ); + USHORT nPos = m_pImpl->m_aCatalog.GetEntryPos(String(sCatalog)); if ( nPos != COMBOBOX_ENTRY_NOTFOUND ) - m_aCatalog.SelectEntryPos( nPos ); + m_pImpl->m_aCatalog.SelectEntryPos(nPos); - if ( m_sSchema.getLength() ) + if ( sSchema.getLength() ) { - nPos = m_aSchema.GetEntryPos( String( m_sSchema ) ); + nPos = m_pImpl->m_aSchema.GetEntryPos(String(sSchema)); if ( nPos != COMBOBOX_ENTRY_NOTFOUND ) - m_aSchema.SelectEntryPos( nPos ); + m_pImpl->m_aSchema.SelectEntryPos(nPos); } - m_aTitle.SetText(sTable); + m_pImpl->m_aTitle.SetText(sTable); + } + else + m_pImpl->m_aTitle.SetText(m_pImpl->m_aName); - m_aPB_OK.SetPosPixel(Point(m_aPB_OK.GetPosPixel().X(),aPos.Y())); - m_aPB_CANCEL.SetPosPixel(Point(m_aPB_CANCEL.GetPosPixel().X(),aPos.Y())); - m_aPB_HELP.SetPosPixel(Point(m_aPB_HELP.GetPosPixel().X(),aPos.Y())); + m_pImpl->m_aPB_OK.SetPosPixel(Point(m_pImpl->m_aPB_OK.GetPosPixel().X(),aPos.Y())); + m_pImpl->m_aPB_CANCEL.SetPosPixel(Point(m_pImpl->m_aPB_CANCEL.GetPosPixel().X(),aPos.Y())); + m_pImpl->m_aPB_HELP.SetPosPixel(Point(m_pImpl->m_aPB_HELP.GetPosPixel().X(),aPos.Y())); - USHORT nLength = m_xMetaData.is() ? static_cast<USHORT>(m_xMetaData->getMaxTableNameLength()) : 0; + USHORT nLength = m_pImpl->m_xMetaData.is() ? static_cast<USHORT>(m_pImpl->m_xMetaData->getMaxTableNameLength()) : 0; nLength = nLength ? nLength : EDIT_NOLIMIT; - m_aTitle.SetMaxTextLen(nLength); - m_aSchema.SetMaxTextLen(nLength); - m_aCatalog.SetMaxTextLen(nLength); + m_pImpl->m_aTitle.SetMaxTextLen(nLength); + m_pImpl->m_aSchema.SetMaxTextLen(nLength); + m_pImpl->m_aCatalog.SetMaxTextLen(nLength); sal_Bool bCheck = _xConnection.is() && isSQL92CheckEnabled(_xConnection); - m_aTitle.setCheck(bCheck); // enable non valid sql chars as well - m_aSchema.setCheck(bCheck); // enable non valid sql chars as well - m_aCatalog.setCheck(bCheck); // enable non valid sql chars as well + m_pImpl->m_aTitle.setCheck(bCheck); // enable non valid sql chars as well + m_pImpl->m_aSchema.setCheck(bCheck); // enable non valid sql chars as well + m_pImpl->m_aCatalog.setCheck(bCheck); // enable non valid sql chars as well Size aSize = GetSizePixel(); aSize.Height() = - aPos.Y() + m_aPB_OK.GetSizePixel().Height() + m_aTitle.GetSizePixel().Height() / 2; + aPos.Y() + m_pImpl->m_aPB_OK.GetSizePixel().Height() + m_pImpl->m_aTitle.GetSizePixel().Height() / 2; SetSizePixel(aSize); } break; @@ -260,40 +360,30 @@ const IObjectNameCheck& _rObjectNameCheck, sal_Int32 _nFlags) :ModalDialog( pParent, ModuleRes(DLG_SAVE_AS)) - ,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_aQryLabel(ModuleRes(STR_QRY_LABEL)) - ,m_sTblLabel(ModuleRes(STR_TBL_LABEL)) - ,m_aName(rDefault) - ,m_rObjectNameCheck( _rObjectNameCheck ) ,m_xORB( _rxORB ) - ,m_nType(CommandType::COMMAND) - ,m_nFlags(_nFlags) { + m_pImpl = new OSaveAsDlgImpl(this,rDefault,_rObjectNameCheck,_nFlags); implInitOnlyTitle(_sLabel); implInit(); } - +// ----------------------------------------------------------------------------- +OSaveAsDlg::~OSaveAsDlg() +{ + DELETEZ(m_pImpl); +} // ----------------------------------------------------------------------------- IMPL_LINK(OSaveAsDlg, ButtonClickHdl, Button *, pButton) { - if (pButton == &m_aPB_OK) + if (pButton == &m_pImpl->m_aPB_OK) { - m_aName = m_aTitle.GetText(); - ::rtl::OUString sNameToCheck( m_aName ); + m_pImpl->m_aName = m_pImpl->m_aTitle.GetText(); + + ::rtl::OUString sNameToCheck( m_pImpl->m_aName ); - if ( m_nType == CommandType::TABLE ) + if ( m_pImpl->m_nType == CommandType::TABLE ) { sNameToCheck = ::dbtools::composeTableName( - m_xMetaData, + m_pImpl->m_xMetaData, getCatalog(), getSchema(), sNameToCheck, @@ -303,11 +393,11 @@ } SQLExceptionInfo aNameError; - if ( m_rObjectNameCheck.isNameValid( sNameToCheck, aNameError ) ) + if ( m_pImpl->m_rObjectNameCheck.isNameValid( sNameToCheck, aNameError ) ) EndDialog( RET_OK ); showError( aNameError, this, m_xORB ); - m_aTitle.GrabFocus(); + m_pImpl->m_aTitle.GrabFocus(); } return 0; } @@ -315,45 +405,45 @@ IMPL_LINK(OSaveAsDlg, EditModifyHdl, Edit *, pEdit ) { - if (pEdit == &m_aTitle) - m_aPB_OK.Enable(0 != m_aTitle.GetText().Len()); + if (pEdit == &m_pImpl->m_aTitle) + m_pImpl->m_aPB_OK.Enable(0 != m_pImpl->m_aTitle.GetText().Len()); return 0; } // ----------------------------------------------------------------------------- void OSaveAsDlg::implInitOnlyTitle(const String& _rLabel) { - m_aLabel.SetText(_rLabel); - m_aCatalogLbl.Hide(); - m_aCatalog.Hide(); - m_aSchemaLbl.Hide(); - m_aSchema.Hide(); - - Point aPos(m_aSchemaLbl.GetPosPixel()); - m_aLabel.SetPosPixel(m_aCatalogLbl.GetPosPixel()); - m_aTitle.SetPosPixel(m_aCatalog.GetPosPixel()); - - m_aPB_OK.SetPosPixel(Point(m_aPB_OK.GetPosPixel().X(),aPos.Y())); - m_aPB_CANCEL.SetPosPixel(Point(m_aPB_CANCEL.GetPosPixel().X(),aPos.Y())); - m_aPB_HELP.SetPosPixel(Point(m_aPB_HELP.GetPosPixel().X(),aPos.Y())); + m_pImpl->m_aLabel.SetText(_rLabel); + m_pImpl->m_aCatalogLbl.Hide(); + m_pImpl->m_aCatalog.Hide(); + m_pImpl->m_aSchemaLbl.Hide(); + m_pImpl->m_aSchema.Hide(); + + Point aPos(m_pImpl->m_aSchemaLbl.GetPosPixel()); + m_pImpl->m_aLabel.SetPosPixel(m_pImpl->m_aCatalogLbl.GetPosPixel()); + m_pImpl->m_aTitle.SetPosPixel(m_pImpl->m_aCatalog.GetPosPixel()); + + m_pImpl->m_aPB_OK.SetPosPixel(Point(m_pImpl->m_aPB_OK.GetPosPixel().X(),aPos.Y())); + m_pImpl->m_aPB_CANCEL.SetPosPixel(Point(m_pImpl->m_aPB_CANCEL.GetPosPixel().X(),aPos.Y())); + m_pImpl->m_aPB_HELP.SetPosPixel(Point(m_pImpl->m_aPB_HELP.GetPosPixel().X(),aPos.Y())); sal_Int32 nNewHeight = - aPos.Y() + m_aPB_OK.GetSizePixel().Height() + m_aTitle.GetSizePixel().Height() / 2; + aPos.Y() + m_pImpl->m_aPB_OK.GetSizePixel().Height() + m_pImpl->m_aTitle.GetSizePixel().Height() / 2; SetSizePixel(Size(GetSizePixel().Width(), nNewHeight)); - m_aTitle.SetText(m_aName); - m_aTitle.setCheck(sal_False); // enable non valid sql chars as well + m_pImpl->m_aTitle.SetText(m_pImpl->m_aName); + m_pImpl->m_aTitle.setCheck(sal_False); // enable non valid sql chars as well } // ----------------------------------------------------------------------------- void OSaveAsDlg::implInit() { - if ( 0 == ( m_nFlags & SAD_ADDITIONAL_DESCRIPTION ) ) + if ( 0 == ( m_pImpl->m_nFlags & SAD_ADDITIONAL_DESCRIPTION ) ) { // hide the description window - m_aDescription.Hide(); + m_pImpl->m_aDescription.Hide(); // the number of pixels we have to move the other controls - sal_Int32 nMoveUp = m_aCatalog.GetPosPixel().Y() - m_aDescription.GetPosPixel().Y(); + sal_Int32 nMoveUp = m_pImpl->m_aCatalog.GetPosPixel().Y() - m_pImpl->m_aDescription.GetPosPixel().Y(); // loop to all controls and move them ... for ( Window* pChildControl = GetWindow( WINDOW_FIRSTCHILD ); @@ -361,7 +451,7 @@ pChildControl= pChildControl->GetWindow( WINDOW_NEXT ) ) { - if ( &m_aDescription != pChildControl ) + if ( &m_pImpl->m_aDescription != pChildControl ) { Point aPos = pChildControl->GetPosPixel(); aPos.Y() -= nMoveUp; @@ -375,18 +465,21 @@ SetSizePixel(aSize); } - if ( SAD_TITLE_PASTE_AS == ( m_nFlags & SAD_TITLE_PASTE_AS ) ) + if ( SAD_TITLE_PASTE_AS == ( m_pImpl->m_nFlags & SAD_TITLE_PASTE_AS ) ) SetText( String( ModuleRes( STR_TITLE_PASTE_AS ) ) ); - else if ( SAD_TITLE_RENAME == ( m_nFlags & SAD_TITLE_RENAME ) ) + else if ( SAD_TITLE_RENAME == ( m_pImpl->m_nFlags & SAD_TITLE_RENAME ) ) { SetText( String( ModuleRes( STR_TITLE_RENAME ) ) ); - m_aTitle.SetHelpId(HID_DLG_RENAME); + m_pImpl->m_aTitle.SetHelpId(HID_DLG_RENAME); } - m_aPB_OK.SetClickHdl(LINK(this,OSaveAsDlg,ButtonClickHdl)); - m_aTitle.SetModifyHdl(LINK(this,OSaveAsDlg,EditModifyHdl)); - m_aTitle.GrabFocus(); + m_pImpl->m_aPB_OK.SetClickHdl(LINK(this,OSaveAsDlg,ButtonClickHdl)); + m_pImpl->m_aTitle.SetModifyHdl(LINK(this,OSaveAsDlg,EditModifyHdl)); + m_pImpl->m_aTitle.GrabFocus(); FreeResource(); } // ----------------------------------------------------------------------------- +String OSaveAsDlg::getName() const { return m_pImpl->m_aName; } +String OSaveAsDlg::getCatalog() const { return m_pImpl->m_aCatalog.IsVisible() ? m_pImpl->m_aCatalog.GetText() : String(); } +String OSaveAsDlg::getSchema() const { return m_pImpl->m_aSchema.IsVisible() ? m_pImpl->m_aSchema.GetText() : String(); } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
