Tag: cws_src680_custommeta
User: mst
Date: 2008-01-29 13:15:02+0000
Modified:
dba/dbaccess/source/ui/app/AppDetailPageHelper.cxx
dba/dbaccess/source/core/dataaccess/documentdefinition.cxx
dba/dbaccess/source/core/dataaccess/documentdefinition.hxx
Log:
- 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/ui/app/
=======================================
File [changed]: AppDetailPageHelper.cxx
Url:
http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppDetailPageHelper.cxx?r1=1.27&r2=1.27.68.1
Delta lines: +7 -5
-------------------
--- AppDetailPageHelper.cxx 2007-09-26 14:47:02+0000 1.27
+++ AppDetailPageHelper.cxx 2008-01-29 13:14:58+0000 1.27.68.1
@@ -4,9 +4,9 @@
*
* $RCSfile: AppDetailPageHelper.cxx,v $
*
- * $Revision: 1.27 $
+ * $Revision: 1.27.68.1 $
*
- * last change: $Author: hr $ $Date: 2007/09/26 14:47:02 $
+ * last change: $Author: mst $ $Date: 2008/01/29 13:14:58 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -165,7 +165,8 @@
#include <tools/debug.hxx>
#endif
-#include <com/sun/star/document/XStandaloneDocumentInfo.hpp>
+#include <com/sun/star/document/XDocumentProperties.hpp>
+
using namespace ::dbaui;
using namespace ::com::sun::star::container;
@@ -1090,7 +1091,8 @@
m_aPreview.Hide();
m_aDocumentInfo.Clear();
m_aDocumentInfo.Show();
-
Reference<document::XStandaloneDocumentInfo> xProp(aPreview,UNO_QUERY);
+
Reference<document::XDocumentProperties> xProp(
+ aPreview, UNO_QUERY);
if ( xProp.is() )
m_aDocumentInfo.fill(xProp,String());
}
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.50&r2=1.50.26.1
Delta lines: +10 -9
--------------------
--- documentdefinition.cxx 2007-11-21 15:39:30+0000 1.50
+++ documentdefinition.cxx 2008-01-29 13:14:59+0000 1.50.26.1
@@ -4,9 +4,9 @@
*
* $RCSfile: documentdefinition.cxx,v $
*
- * $Revision: 1.50 $
+ * $Revision: 1.50.26.1 $
*
- * last change: $Author: ihi $ $Date: 2007/11/21 15:39:30 $
+ * last change: $Author: mst $ $Date: 2008/01/29 13:14:59 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -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>
@@ -1042,7 +1042,7 @@
}
else if ( aCommand.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
"getdocumentinfo" ) ) )
{
- onCommandGetDocumentInfo( aRet );
+ onCommandGetDocumentProperties( aRet );
}
else if ( aCommand.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
"delete" ) ) )
{
@@ -1527,16 +1527,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& )
{
File [changed]: documentdefinition.hxx
Url:
http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/documentdefinition.hxx?r1=1.24&r2=1.24.26.1
Delta lines: +4 -4
-------------------
--- documentdefinition.hxx 2007-11-21 15:39:47+0000 1.24
+++ documentdefinition.hxx 2008-01-29 13:14:59+0000 1.24.26.1
@@ -4,9 +4,9 @@
*
* $RCSfile: documentdefinition.hxx,v $
*
- * $Revision: 1.24 $
+ * $Revision: 1.24.26.1 $
*
- * last change: $Author: ihi $ $Date: 2007/11/21 15:39:47 $
+ * last change: $Author: mst $ $Date: 2008/01/29 13:14:59 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -261,7 +261,7 @@
//- commands
//-------------------------------------------------------------------------
- void onCommandGetDocumentInfo( ::com::sun::star::uno::Any& _rInfo );
+ void onCommandGetDocumentProperties( ::com::sun::star::uno::Any& _rProps );
void onCommandInsert( const ::rtl::OUString& _sURL, const
::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >&
Environment ) throw( ::com::sun::star::uno::Exception );
void onCommandPreview( ::com::sun::star::uno::Any& _rImage );
void onCommandOpenSomething( const ::com::sun::star::uno::Any& _rArgument,
const bool _bActivate,
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
