User: rt Date: 2008-06-06 14:03:50+0000 Modified: dba/dbaccess/source/core/dataaccess/documentdefinition.cxx
Log: INTEGRATION: CWS dba30c (1.59.4); FILE MERGED 2008/05/13 09:00:28 fs 1.59.4.4: joining changes from CWS odbmacros3 to CWS dba30c: 2008/04/13 19:17:48 fs 1.56.6.1: #i49133# support a Hidden flag 2008/04/15 13:11:28 fs 1.56.6.2: RESYNC: (1.56-1.59); FILE MERGED 2008/04/21 10:29:46 fs 1.56.6.3: #i49133# command 'storeOwn' is for compat only, command is now named 'store' 2008/05/07 08:31:33 fs 1.56.6.4: smaller default size for new forms/reports 2008/05/09 09:26:51 fs 1.56.6.5: RESYNC: (1.59-1.60); FILE MERGED 2008/05/13 06:08:39 fs 1.59.4.3: #i10000# post-resync 2008/05/09 08:24:09 oj 1.59.4.2: RESYNC: (1.59-1.60); FILE MERGED 2008/05/08 13:11:12 fs 1.59.4.1: #i87741# when loading a form, allow user interaction for the macro execution mode adjustment - just in case the form is not loaded after the database document had been plugged into a frame (which is where the user interaction would normally happen) File Changes: Directory: /dba/dbaccess/source/core/dataaccess/ ================================================ File [changed]: documentdefinition.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/documentdefinition.cxx?r1=1.60&r2=1.61 Delta lines: +29 -23 --------------------- --- documentdefinition.cxx 2008-05-05 15:50:24+0000 1.60 +++ documentdefinition.cxx 2008-06-06 14:03:45+0000 1.61 @@ -275,8 +275,8 @@ namespace css = ::com::sun::star; -#define DEFAULT_WIDTH 15000 -#define DEFAULT_HEIGHT 10000 +#define DEFAULT_WIDTH 10000 +#define DEFAULT_HEIGHT 7500 //........................................................................ namespace dbaccess { @@ -898,9 +898,14 @@ } } - bool bExecuteDBDocMacros = m_pImpl->m_pDataSource->adjustMacroMode_AutoReject(); - // Note that we don't pass an interaction handler here. If the user has not been asked/notified - // by now (i.e. during loading the whole DB document), then this won't happen anymore. + bool bExecuteDBDocMacros = m_pImpl->m_pDataSource->checkMacrosOnLoading(); + // Note that this call implies the user might be asked for the macro execution mode. + // Normally, this would happen when the database document is loaded, and subsequent calls + // will simply use the user's decision from this point in time. + // However, it is possible to programmatically load forms/reports, without actually + // loading the database document into a frame. In this case, the user will be asked + // here and now. + // #i87741# / 2008-05-05 / [EMAIL PROTECTED] // allow the command arguments to downgrade the macro execution mode, but not to upgrade // it @@ -1112,7 +1117,9 @@ dispose(); } - else if ( aCommand.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "storeOwn" ) ) ) + else if ( ( aCommand.Name.compareToAscii( "storeOwn" ) == 0 ) // compatibility + || ( aCommand.Name.compareToAscii( "store" ) == 0 ) + ) { Reference<XEmbedPersist> xPersist(m_xEmbeddedObject,UNO_QUERY); if ( xPersist.is() ) @@ -1645,9 +1652,7 @@ m_xEmbeddedObject->changeState(EmbedStates::RUNNING); if ( bSetSize ) { - ::com::sun::star::awt::Size aSize; - aSize.Width = DEFAULT_WIDTH; - aSize.Height = DEFAULT_HEIGHT; + ::com::sun::star::awt::Size aSize( DEFAULT_WIDTH, DEFAULT_HEIGHT ); m_xEmbeddedObject->setVisualAreaSize(Aspects::MSOLE_CONTENT,aSize); } @@ -1694,6 +1699,7 @@ lcl_putLoadArgs( aMediaDesc, optional_bool(), optional_bool() ); // don't put _bSuppressMacros and _bReadOnly here - if the document was already // loaded, we should not tamper with its settings. + // #i88977# / 2008-05-05 / [EMAIL PROTECTED] // #i86872# / 2008-03-13 / [EMAIL PROTECTED] aMediaDesc >>= aArgs; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
