User: obo
Date: 2008-02-26 14:37:51+0000
Modified:
dba/dbaccess/source/core/dataaccess/documentdefinition.cxx
Log:
INTEGRATION: CWS custommeta (1.50.26); FILE MERGED
2008/02/01 10:33:41 mst 1.50.26.2: RESYNC: (1.50-1.53); FILE MERGED
2008/01/29 13:14:59 mst 1.50.26.1: -
dbaccess/source/ui/app/AppDetailPageHelper.cxx:
+ adapt to ODocumentInfoPreview interface change
+ use XDocumentProperties instead of XDocumentInfo
+ incidentally, fixes bug: document information was not displayed at all
- dbaccess/source/core/dataaccess/documentdefinition.{hxx,cxx}:
+ renamed ODocumentDefinition::onCommandGetDocumentInfo to
onCommandGetDocumentProperties
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.53&r2=1.54
Delta lines: +7 -6
-------------------
--- documentdefinition.cxx 2008-01-30 08:34:38+0000 1.53
+++ documentdefinition.cxx 2008-02-26 14:37:48+0000 1.54
@@ -179,8 +179,8 @@
#ifndef _COM_SUN_STAR_SDB_DOCUMENTSAVEREQUEST_HPP_
#include <com/sun/star/sdb/DocumentSaveRequest.hpp>
#endif
-#ifndef _COM_SUN_STAR_DOCUMENT_XDOCUMENTINFOSUPPLIER_HPP_
-#include <com/sun/star/document/XDocumentInfoSupplier.hpp>
+#ifndef _COM_SUN_STAR_DOCUMENT_XDOCUMENTPROPERTIESSUPPLIER_HPP_
+#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
#endif
#ifndef _COM_SUN_STAR_DOCUMENT_MACROEXECMODE_HPP_
#include <com/sun/star/document/MacroExecMode.hpp>
@@ -1082,7 +1082,7 @@
}
else if ( aCommand.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
"getdocumentinfo" ) ) )
{
- onCommandGetDocumentInfo( aRet );
+ onCommandGetDocumentProperties( aRet );
}
else if ( aCommand.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
"delete" ) ) )
{
@@ -1680,16 +1680,17 @@
_rDefault.clear();
}
//
-----------------------------------------------------------------------------
-void ODocumentDefinition::onCommandGetDocumentInfo( Any& _rInfo )
+void ODocumentDefinition::onCommandGetDocumentProperties( Any& _rProps )
{
loadEmbeddedObjectForPreview();
if ( m_xEmbeddedObject.is() )
{
try
{
- Reference<XDocumentInfoSupplier> xDocSup(
getComponent(), UNO_QUERY );
+ Reference<XDocumentPropertiesSupplier> xDocSup(
+ getComponent(), UNO_QUERY );
if ( xDocSup.is() )
- _rInfo <<= xDocSup->getDocumentInfo();
+ _rProps <<= xDocSup->getDocumentProperties();
}
catch( const Exception& )
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
