summaryrefslogtreecommitdiff
path: root/sc/inc
diff options
context:
space:
mode:
Diffstat (limited to 'sc/inc')
-rw-r--r--sc/inc/column.hxx1
-rw-r--r--sc/inc/dociter.hxx36
-rw-r--r--sc/inc/document.hxx20
-rw-r--r--sc/inc/dpobject.hxx4
-rw-r--r--sc/inc/dpsave.hxx14
-rw-r--r--sc/inc/notesuno.hxx197
-rw-r--r--sc/inc/shapeuno.hxx13
-rw-r--r--sc/inc/table.hxx1
8 files changed, 70 insertions, 216 deletions
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 36569d4efefb..87c2f59d2d98 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -110,6 +110,7 @@ private:
friend class ScDocument; // fuer FillInfo
friend class ScDocumentIterator;
friend class ScValueIterator;
+friend class ScHorizontalValueIterator;
friend class ScDBQueryDataIterator;
friend class ScColumnIterator;
friend class ScQueryCellIterator;
diff --git a/sc/inc/dociter.hxx b/sc/inc/dociter.hxx
index e61d1f0281c8..15be21b697b8 100644
--- a/sc/inc/dociter.hxx
+++ b/sc/inc/dociter.hxx
@@ -423,6 +423,7 @@ private:
SCTAB nTab;
SCCOL nStartCol;
SCCOL nEndCol;
+ SCROW nStartRow;
SCROW nEndRow;
SCROW* pNextRows;
SCSIZE* pNextIndices;
@@ -437,12 +438,47 @@ public:
ScBaseCell* GetNext( SCCOL& rCol, SCROW& rRow );
sal_Bool ReturnNext( SCCOL& rCol, SCROW& rRow );
+ /// Set a(nother) sheet and (re)init.
+ void SetTab( SCTAB nTab );
private:
void Advance();
};
+/** Row-wise value iterator. */
+class ScHorizontalValueIterator
+{
+private:
+ ScDocument *pDoc;
+ const ScAttrArray *pAttrArray;
+ ScHorizontalCellIterator *pCellIter;
+ sal_uLong nNumFormat; // for CalcAsShown
+ sal_uLong nNumFmtIndex;
+ SCTAB nEndTab;
+ SCCOL nCurCol;
+ SCROW nCurRow;
+ SCTAB nCurTab;
+ SCROW nAttrEndRow;
+ short nNumFmtType;
+ bool bNumValid;
+ bool bSubTotal;
+ bool bCalcAsShown;
+ bool bTextAsZero;
+
+public:
+
+ ScHorizontalValueIterator( ScDocument* pDocument,
+ const ScRange& rRange,
+ bool bSTotal = false,
+ bool bTextAsZero = false );
+ ~ScHorizontalValueIterator();
+ void GetCurNumFmtInfo( short& nType, sal_uLong& nIndex );
+ /// Does NOT reset rValue if no value found!
+ bool GetNext( double& rValue, sal_uInt16& rErr );
+};
+
+
//
// gibt alle Bereiche mit nicht-Default-Formatierung zurueck (horizontal)
//
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 9a83a49b8c5e..3786b6b850b0 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -49,8 +49,7 @@
// Wang Xu Ming -- 2009-8-17
// DataPilot Migration - Cache&&Performance
#include <list>
-#include "dpobject.hxx"
-#include "dptabdat.hxx"
+class ScDPTableDataCache;
// End Comments
class KeyEvent;
@@ -120,6 +119,7 @@ class ScViewOptions;
class ScStrCollection;
class TypedScStrCollection;
class ScChangeTrack;
+class ScEditEngineDefaulter;
class ScFieldEditEngine;
class ScNoteEditEngine;
struct ScConsolidateParam;
@@ -241,6 +241,7 @@ class ScDocument
{
friend class ScDocumentIterator;
friend class ScValueIterator;
+friend class ScHorizontalValueIterator;
friend class ScDBQueryDataIterator;
friend class ScCellIterator;
friend class ScQueryCellIterator;
@@ -273,7 +274,6 @@ private:
ScDPCollection* pDPCollection;
// Wang Xu Ming -- 2009-8-17
// DataPilot Migration - Cache&&Performance
- std::list<ScDPObject> m_listDPObjectsInClip;
std::list<ScDPTableDataCache*> m_listDPObjectsCaches;
// End Comments
ScChartCollection* pChartCollection;
@@ -790,6 +790,7 @@ public:
SC_DLLPUBLIC void GetString( SCCOL nCol, SCROW nRow, SCTAB nTab, String& rString );
SC_DLLPUBLIC void GetInputString( SCCOL nCol, SCROW nRow, SCTAB nTab, String& rString );
+ sal_uInt16 GetStringForFormula( const ScAddress& rPos, rtl::OUString& rString );
SC_DLLPUBLIC double GetValue( const ScAddress& );
SC_DLLPUBLIC void GetValue( SCCOL nCol, SCROW nRow, SCTAB nTab, double& rValue );
SC_DLLPUBLIC double RoundValueAsShown( double fVal, sal_uLong nFormat );
@@ -924,10 +925,10 @@ public:
selection, but the bounds of the sheet's data area
instead.
- @returns sal_True if the area passed intersected the data
- area, sal_False if not, in which case the values
+ @returns True if the area passed intersected the data
+ area, false if not, in which case the values
obtained may be out of bounds, not in order or
- unmodified. sal_True does not mean that there
+ unmodified. True does not mean that there
actually is any data within the selection.
*/
bool ShrinkToDataArea( SCTAB nTab, SCCOL& rStartCol, SCROW& rStartRow, SCCOL& rEndCol, SCROW& rEndRow ) const;
@@ -935,9 +936,9 @@ public:
/** Shrink a range to only include used data area.
@param o_bShrunk
- Out parameter, sal_True if area was shrunk, sal_False if not.
+ Out parameter, True if area was shrunk, false if not.
- @returns sal_True if there is any data, sal_False if not.
+ @returns True if there is any data, fakse if not.
*/
bool ShrinkToUsedDataArea( bool& o_bShrunk,
SCTAB nTab, SCCOL& rStartCol, SCROW& rStartRow,
@@ -1596,6 +1597,8 @@ public:
sal_Bool IsValidAsianKerning() const;
void SetAsianKerning(sal_Bool bNew);
+ void ApplyAsianEditSettings(ScEditEngineDefaulter& rEngine);
+
sal_uInt8 GetEditTextDirection(SCTAB nTab) const; // EEHorizontalTextDirection values
SC_DLLPUBLIC ScLkUpdMode GetLinkMode() const { return eLinkMode ;}
@@ -1790,7 +1793,6 @@ public:
SC_DLLPUBLIC SfxItemPool* GetEnginePool() const;
SC_DLLPUBLIC ScFieldEditEngine& GetEditEngine();
SC_DLLPUBLIC ScNoteEditEngine& GetNoteEngine();
-//UNUSED2009-05 SfxItemPool& GetNoteItemPool();
ScRefreshTimerControl* GetRefreshTimerControl() const
{ return pRefreshTimerControl; }
diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx
index e69f8e8c3a3f..8cbc6aa8e16a 100644
--- a/sc/inc/dpobject.hxx
+++ b/sc/inc/dpobject.hxx
@@ -106,7 +106,6 @@ private:
ScDPOutput* pOutput;
sal_Bool bSettingsChanged;
sal_Bool bAlive; // sal_False if only used to hold settings
- sal_uInt16 mnAutoFormatIndex;
sal_Bool bAllowMove;
long nHeaderRows; // page fields plus filter button
bool mbHeaderLayout; // sal_True : grid, sal_False : standard
@@ -150,9 +149,6 @@ public:
void SetOutRange(const ScRange& rRange);
const ScRange& GetOutRange() const { return aOutRange; }
- void SetAutoFormatIndex (const sal_uInt16 nIndex);
- sal_uInt16 GetAutoFormatIndex() const;
-
void SetHeaderLayout(bool bUseGrid);
bool GetHeaderLayout() const;
diff --git a/sc/inc/dpsave.hxx b/sc/inc/dpsave.hxx
index 8c4babc77da3..bd84e599d984 100644
--- a/sc/inc/dpsave.hxx
+++ b/sc/inc/dpsave.hxx
@@ -69,16 +69,16 @@ public:
sal_Bool operator== ( const ScDPSaveMember& r ) const;
const String& GetName() const { return aName; }
- sal_Bool HasIsVisible() const;
- SC_DLLPUBLIC void SetIsVisible(sal_Bool bSet);
- sal_Bool GetIsVisible() const { return sal_Bool(nVisibleMode); }
- sal_Bool HasShowDetails() const;
- SC_DLLPUBLIC void SetShowDetails(sal_Bool bSet);
- sal_Bool GetShowDetails() const { return sal_Bool(nShowDetailsMode); }
+ SC_DLLPUBLIC sal_Bool HasIsVisible() const;
+ SC_DLLPUBLIC void SetIsVisible(sal_Bool bSet);
+ sal_Bool GetIsVisible() const { return sal_Bool(nVisibleMode); }
+ SC_DLLPUBLIC sal_Bool HasShowDetails() const;
+ SC_DLLPUBLIC void SetShowDetails(sal_Bool bSet);
+ sal_Bool GetShowDetails() const { return sal_Bool(nShowDetailsMode); }
void SetName( const String& rNew ); // used if the source member was renamed (groups)
- SC_DLLPUBLIC void SetLayoutName( const ::rtl::OUString& rName );
+ SC_DLLPUBLIC void SetLayoutName( const ::rtl::OUString& rName );
SC_DLLPUBLIC const ::rtl::OUString* GetLayoutName() const;
void RemoveLayoutName();
diff --git a/sc/inc/notesuno.hxx b/sc/inc/notesuno.hxx
index a1648132f8e1..c7e60072698b 100644
--- a/sc/inc/notesuno.hxx
+++ b/sc/inc/notesuno.hxx
@@ -28,18 +28,14 @@
#ifndef SC_NOTESUNO_HXX
#define SC_NOTESUNO_HXX
-#include "address.hxx"
-#include <svl/lstner.hxx>
#include <com/sun/star/sheet/XSheetAnnotation.hpp>
#include <com/sun/star/sheet/XSheetAnnotationShapeSupplier.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/container/XChild.hpp>
#include <com/sun/star/text/XSimpleText.hpp>
-#include <com/sun/star/text/XTextRangeMover.hpp>
-#include <com/sun/star/drawing/XShape.hpp>
#include <cppuhelper/implbase5.hxx>
-#include <cppuhelper/implbase10.hxx>
-
+#include <svl/lstner.hxx>
+#include "address.hxx"
class ScDocShell;
class SvxUnoText;
@@ -129,193 +125,4 @@ private:
SvxUnoText* pUnoText;
};
-class ScAnnotationShapeObj : public cppu::WeakImplHelper10<
- com::sun::star::lang::XComponent,
- com::sun::star::container::XChild,
- com::sun::star::text::XText,
- com::sun::star::container::XEnumerationAccess,
- com::sun::star::text::XTextRangeMover,
- com::sun::star::drawing::XShape,
- com::sun::star::beans::XPropertySet,
- com::sun::star::beans::XMultiPropertySet,
- com::sun::star::beans::XPropertyState,
- com::sun::star::lang::XServiceInfo >,
- public SfxListener
-{
-private:
- ScDocShell* pDocShell;
- ScAddress aCellPos;
- SvxUnoText* pUnoText;
- com::sun::star::uno::Reference < com::sun::star::drawing::XShape > xShape;
-
-private:
- SvxUnoText& GetUnoText();
- com::sun::star::uno::Reference < com::sun::star::drawing::XShape > GetXShape();
-
-public:
- ScAnnotationShapeObj(ScDocShell* pDocSh, const ScAddress& rPos);
- virtual ~ScAnnotationShapeObj();
-
- virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
-
- // XChild
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL
- getParent() throw(::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference<
- ::com::sun::star::uno::XInterface >& Parent )
- throw(::com::sun::star::lang::NoSupportException,
- ::com::sun::star::uno::RuntimeException);
-
- // XElementAccess
- virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException);
-
- // XEnumerationAccess
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL
- createEnumeration( ) throw (::com::sun::star::uno::RuntimeException);
-
- // XTextRangeMover
- virtual void SAL_CALL moveTextRange( const ::com::sun::star::uno::Reference<
- ::com::sun::star::text::XTextRange >& xRange,
- ::sal_Int16 nParagraphs )
- throw (::com::sun::star::uno::RuntimeException);
-
- // XText
- virtual void SAL_CALL insertTextContent( const ::com::sun::star::uno::Reference<
- ::com::sun::star::text::XTextRange >& xRange,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::text::XTextContent >& xContent,
- ::sal_Bool bAbsorb )
- throw (::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL removeTextContent( const ::com::sun::star::uno::Reference<
- ::com::sun::star::text::XTextContent >& xContent )
- throw (::com::sun::star::container::NoSuchElementException,
- ::com::sun::star::uno::RuntimeException);
-
- // XSimpleText
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL
- createTextCursor() throw(::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL
- createTextCursorByRange( const ::com::sun::star::uno::Reference<
- ::com::sun::star::text::XTextRange >& aTextPosition )
- throw(::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL insertString( const ::com::sun::star::uno::Reference<
- ::com::sun::star::text::XTextRange >& xRange,
- const ::rtl::OUString& aString, sal_Bool bAbsorb )
- throw(::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL insertControlCharacter( const ::com::sun::star::uno::Reference<
- ::com::sun::star::text::XTextRange >& xRange,
- sal_Int16 nControlCharacter, sal_Bool bAbsorb )
- throw(::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::uno::RuntimeException);
-
- // XTextRange
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL
- getText() throw(::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL
- getStart() throw(::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL
- getEnd() throw(::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getString() throw(::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setString( const ::rtl::OUString& aString )
- throw(::com::sun::star::uno::RuntimeException);
-
- // XShapeDescriptor
- virtual ::rtl::OUString SAL_CALL getShapeType( ) throw (::com::sun::star::uno::RuntimeException);
-
- // XShape
- virtual ::com::sun::star::awt::Point SAL_CALL getPosition( ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::awt::Size SAL_CALL getSize( ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setSize( const ::com::sun::star::awt::Size& aSize )
- throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException);
-
- // XPropertyState
- virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& PropertyName )
- throw (::com::sun::star::beans::UnknownPropertyException,
- ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates(
- const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName )
- throw (::com::sun::star::beans::UnknownPropertyException,
- ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName )
- throw (::com::sun::star::beans::UnknownPropertyException,
- ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& aPropertyName )
- throw (::com::sun::star::beans::UnknownPropertyException,
- ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-
- // XPropertySet
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( )
- throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue )
- throw (::com::sun::star::beans::UnknownPropertyException,
- ::com::sun::star::beans::PropertyVetoException,
- ::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName )
- throw (::com::sun::star::beans::UnknownPropertyException,
- ::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName,
- const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener )
- throw (::com::sun::star::beans::UnknownPropertyException,
- ::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName,
- const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener )
- throw (::com::sun::star::beans::UnknownPropertyException,
- ::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName,
- const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener )
- throw (::com::sun::star::beans::UnknownPropertyException,
- ::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName,
- const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener )
- throw (::com::sun::star::beans::UnknownPropertyException,
- ::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException);
-
- // XMultiPropertySet
- virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames,
- const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues )
- throw (::com::sun::star::beans::PropertyVetoException,
- ::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues(
- const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames )
- throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames,
- const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener )
- throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference<
- ::com::sun::star::beans::XPropertiesChangeListener >& xListener )
- throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames,
- const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener )
- throw (::com::sun::star::uno::RuntimeException);
-
- // XComponent
- virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener )
- throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener )
- throw (::com::sun::star::uno::RuntimeException);
-
- // XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName()
- throw(::com::sun::star::uno::RuntimeException);
- 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()
- throw(::com::sun::star::uno::RuntimeException);
-};
-
-
#endif
-
diff --git a/sc/inc/shapeuno.hxx b/sc/inc/shapeuno.hxx
index 74ae321bd409..87eb82a3d185 100644
--- a/sc/inc/shapeuno.hxx
+++ b/sc/inc/shapeuno.hxx
@@ -36,6 +36,7 @@
#include <com/sun/star/lang/XTypeProvider.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/document/XEventsSupplier.hpp>
+#include <com/sun/star/container/XChild.hpp>
#include <cppuhelper/implbase5.hxx>
#include <cppuhelper/implbase1.hxx>
@@ -66,8 +67,11 @@ typedef ::cppu::WeakImplHelper5 < ::com::sun::star::beans::XPropertySet
> ScShapeObj_Base;
typedef ::cppu::ImplHelper1 < ::com::sun::star::text::XText
> ScShapeObj_TextBase;
+typedef ::cppu::ImplHelper1 < ::com::sun::star::container::XChild
+ > ScShapeObj_ChildBase;
class ScShapeObj :public ScShapeObj_Base
,public ScShapeObj_TextBase
+ ,public ScShapeObj_ChildBase
{
private:
::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation > mxShapeAgg;
@@ -76,7 +80,8 @@ private:
::com::sun::star::beans::XPropertyState* pShapePropertyState;
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > mxPropSetInfo;
com::sun::star::uno::Sequence< sal_Int8 >* pImplementationId;
- sal_Bool bIsTextShape;
+ bool bIsTextShape;
+ bool bIsNoteCaption;
bool bInitializedNotifier;
SdrObject* GetSdrObject() const throw();
@@ -219,6 +224,12 @@ public:
virtual void SAL_CALL setString( const ::rtl::OUString& aString )
throw(::com::sun::star::uno::RuntimeException);
+ // XChild
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent()
+ throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xParent )
+ throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException);
+
// XTypeProvider
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes()
throw(::com::sun::star::uno::RuntimeException);
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 524919da5e39..b51cc084594d 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -196,6 +196,7 @@ private:
friend class ScDocument; // fuer FillInfo
friend class ScDocumentIterator;
friend class ScValueIterator;
+friend class ScHorizontalValueIterator;
friend class ScDBQueryDataIterator;
friend class ScCellIterator;
friend class ScQueryCellIterator;