diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-20 09:48:41 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-20 09:48:41 +0200 |
commit | 2850da4f8cab294b2f897d170b35ec532e3c4d49 (patch) | |
tree | 549908e5c5b1d28ba2a6a37369201079c1209a5b /sw/inc/unotbl.hxx | |
parent | 457fe4e7e83a0fed70a07ddeb2158e02ff1bca7e (diff) | |
parent | 5f03f0c86933b1372a96d05018610205bbd43db9 (diff) |
Merge branch 'master' into feature/gnumake4
Conflicts:
starmath/JunitTest_sm_unoapi.mk
starmath/Library_sm.mk
starmath/Library_smd.mk
starmath/Makefile
starmath/prj/build.lst
starmath/prj/makefile.mk
starmath/qa/unoapi/Test.java
starmath/source/detreg.cxx
starmath/source/register.cxx
starmath/source/smdetect.cxx
sw/Library_sw.mk
sw/Library_swd.mk
sw/Library_swui.mk
sw/Library_vbaswobj.mk
sw/inc/iodetect.hxx
sw/inc/swddllapi.h
sw/source/filter/basflt/iodetect.cxx
Diffstat (limited to 'sw/inc/unotbl.hxx')
-rw-r--r-- | sw/inc/unotbl.hxx | 49 |
1 files changed, 7 insertions, 42 deletions
diff --git a/sw/inc/unotbl.hxx b/sw/inc/unotbl.hxx index b875a8798f0f..3191c0ce2690 100644 --- a/sw/inc/unotbl.hxx +++ b/sw/inc/unotbl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -64,9 +65,6 @@ class SwChartDataProvider; class SwFrmFmt; -/* -----------------------------22.09.00 11:10-------------------------------- - - ---------------------------------------------------------------------------*/ class SwChartEventListenerContainer : public SwEventListenerContainer { public: @@ -74,9 +72,7 @@ class SwChartEventListenerContainer : public SwEventListenerContainer SwEventListenerContainer(pxParentL){} void ChartDataChanged(); }; -/* --------------------------------------------------------------------------- - ---------------------------------------------------------------------------*/ typedef cppu::WeakImplHelper4 < @@ -165,7 +161,7 @@ public: virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ); - //XEnumerationAccess - frueher XParagraphEnumerationAccess + //XEnumerationAccess - was: XParagraphEnumerationAccess virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration(void) throw( ::com::sun::star::uno::RuntimeException ); //XElementAccess @@ -178,9 +174,7 @@ public: SwFrmFmt* GetFrmFmt() const { return (SwFrmFmt*)GetRegisteredIn(); } }; -/* -----------------27.06.98 15:40------------------- - * - * --------------------------------------------------*/ + class SwXTextTableRow : public cppu::WeakImplHelper2 < ::com::sun::star::beans::XPropertySet, @@ -220,9 +214,7 @@ public: const SwTableLine* GetTblRow() const {return pLine;} static SwTableLine* FindLine(SwTable* pTable, SwTableLine* pLine); }; -/* -----------------20.07.98 13:03------------------- - * - * --------------------------------------------------*/ + typedef cppu::WeakImplHelper3< ::com::sun::star::text::XTextTableCursor, ::com::sun::star::lang::XServiceInfo, @@ -235,8 +227,6 @@ class SW_DLLPUBLIC SwXTextTableCursor : public SwXTextTableCursor_Base SwDepend aCrsrDepend; const SfxItemPropertySet* m_pPropSet; - // SwUnoCrsr* GetCrsr() const { return (SwUnoCrsr*)aCrsrDepend.GetRegisteredIn(); } - protected: virtual ~SwXTextTableCursor(); public: @@ -287,9 +277,6 @@ public: SwFrmFmt* GetFrmFmt() const { return (SwFrmFmt*)GetRegisteredIn(); } }; -/*-----------------11.12.97 09:38------------------- - ---------------------------------------------------*/ struct SwRangeDescriptor { sal_Int32 nTop; @@ -337,7 +324,7 @@ public: SwXTextTable(SwFrmFmt& rFrmFmt); - static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId(); + SW_DLLPUBLIC static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId(); //XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException); @@ -423,9 +410,6 @@ public: SwFrmFmt* GetFrmFmt() const { return (SwFrmFmt*)GetRegisteredIn(); } }; -/* -----------------27.04.98 16:41------------------- - * - * --------------------------------------------------*/ class SwXCellRange : public cppu::WeakImplHelper7 < ::com::sun::star::table::XCellRange, @@ -519,9 +503,7 @@ public: sal_Bool bForceNumberResults = sal_False ) throw (::com::sun::star::uno::RuntimeException); }; -/* -----------------03.02.99 07:31------------------- - * - * --------------------------------------------------*/ + class SwXTableRows : public cppu::WeakImplHelper2 < ::com::sun::star::table::XTableRows, @@ -539,14 +521,6 @@ public: TYPEINFO(); -// automatisch auskommentiert - [getIdlClass or queryInterface] - Bitte XTypeProvider benutzen! -// virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlClass > > getIdlClasses(void) throw( ::com::sun::star::uno::RuntimeException ); - -// automatisch auskommentiert - [getIdlClass or queryInterface] - Bitte XTypeProvider benutzen! -// virtual sal_Bool queryInterface( ::com::sun::star::uno::Uik aUik, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & rOut ); - -// SMART_UNO_DECLARATION( SwXTableRows, UsrObject ); - //XIndexAccess virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); @@ -568,9 +542,6 @@ public: virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew); }; -/* -----------------03.02.99 07:31------------------- - * - * --------------------------------------------------*/ class SwXTableColumns : public cppu::WeakImplHelper2 < ::com::sun::star::table::XTableColumns, @@ -587,13 +558,6 @@ public: TYPEINFO(); -// automatisch auskommentiert - [getIdlClass or queryInterface] - Bitte XTypeProvider benutzen! -// virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlClass > > getIdlClasses(void) throw( ::com::sun::star::uno::RuntimeException ); - -// automatisch auskommentiert - [getIdlClass or queryInterface] - Bitte XTypeProvider benutzen! -// virtual sal_Bool queryInterface( ::com::sun::star::uno::Uik aUik, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & rOut ); - -// SMART_UNO_DECLARATION( SwXTableColumns, UsrObject ); //XIndexAccess virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException ); @@ -621,3 +585,4 @@ public: +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |