mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS formcelllinkage (1.12.92); FILE MERGED

Browse Source 
2003/10/01 09:18:18 fs 1.12.92.1: #i18994# merging the changes from the CWS fs002
This commit is contained in:
Oliver Bolte
2003-10-21 07:55:10 +00:00
parent 8912daf6a5
commit 160b99eeec
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
forms/source/component/Columns.cxx
View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: Columns.cxx,v $ * $RCSfile: Columns.cxx,v $
* *
* $Revision: 1.12 $ * $Revision: 1.13 $
* *
* last change: $Author: fs $ $Date: 2002-12-02 09:56:27 $ * last change: $Author: obo $ $Date: 2003-10-21 08:55:10 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@@ -90,6 +90,9 @@
#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_
#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XServiceInfo.hpp>
#endif #endif
#ifndef _DRAFTS_COM_SUN_STAR_FORM_XBINDABLEVALUE_HPP_
#include <drafts/com/sun/star/form/XBindableValue.hpp>
#endif
#ifndef _COMPHELPER_SEQUENCE_HXX_ #ifndef _COMPHELPER_SEQUENCE_HXX_
#include <comphelper/sequence.hxx> #include <comphelper/sequence.hxx>
#endif #endif
@@ -131,6 +134,7 @@ using namespace ::com::sun::star::form;
using namespace ::com::sun::star::awt; using namespace ::com::sun::star::awt;
using namespace ::com::sun::star::io; using namespace ::com::sun::star::io;
using namespace ::com::sun::star::lang; using namespace ::com::sun::star::lang;
using namespace ::drafts::com::sun::star::form;
const sal_uInt16 WIDTH = 0x0001; const sal_uInt16 WIDTH = 0x0001;
const sal_uInt16 ALIGN = 0x0002; const sal_uInt16 ALIGN = 0x0002;
@@ -263,6 +267,7 @@ Any SAL_CALL OGridColumn::queryAggregation( const Type& _rType ) throw (RuntimeE
// though our aggregate may be an XFormComponent or an XServiceInfo, we aren't anymore // though our aggregate may be an XFormComponent or an XServiceInfo, we aren't anymore
if ( _rType.equals(::getCppuType(static_cast< Reference< XFormComponent >* >(NULL))) if ( _rType.equals(::getCppuType(static_cast< Reference< XFormComponent >* >(NULL)))
|| _rType.equals(::getCppuType(static_cast< Reference< XServiceInfo >* >(NULL))) || _rType.equals(::getCppuType(static_cast< Reference< XServiceInfo >* >(NULL)))
|| _rType.equals(::getCppuType(static_cast< Reference< XBindableValue >* >(NULL)))
) )
return aReturn; return aReturn;
@@ -363,10 +368,6 @@ OGridColumn::~OGridColumn()
DBG_DTOR(OGridColumn,NULL); DBG_DTOR(OGridColumn,NULL);
} }
// XCloneable
//------------------------------------------------------------------------------
//IMPLEMENT_DEFAULT_CLONING( OGridColumn )
// XChild // XChild
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
void SAL_CALL OGridColumn::setParent(const InterfaceRef& Parent) throw(NoSupportException, RuntimeException) void SAL_CALL OGridColumn::setParent(const InterfaceRef& Parent) throw(NoSupportException, RuntimeException)