Tag: cws_dev300_dba30c User: fs Date: 2008-05-13 09:00:31+0000 Modified: dba/dbaccess/source/core/dataaccess/documentdefinition.cxx
Log: 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 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.59.4.3&r2=1.59.4.4 Delta lines: +8 -8 ------------------- --- documentdefinition.cxx 2008-05-13 06:08:39+0000 1.59.4.3 +++ documentdefinition.cxx 2008-05-13 09:00:28+0000 1.59.4.4 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: documentdefinition.cxx,v $ - * $Revision: 1.59.4.3 $ + * $Revision: 1.59.4.4 $ * * This file is part of OpenOffice.org. * @@ -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 { @@ -1117,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() ) @@ -1650,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); } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
