From 07b0c01857137de7e4bd02375e7c892d622d270e Mon Sep 17 00:00:00 2001 From: Oliver Bolte Date: Mon, 2 Mar 2009 14:19:13 +0000 Subject: CWS-TOOLING: integrate CWS dr66 2009-01-22 15:51:40 +0100 dr r266730 : #i98028# moved to CWS dr66 2009-01-22 15:50:28 +0100 dr r266729 : #i98028# moved to CWS dr66 2009-01-20 16:25:49 +0100 dr r266595 : #i98282# resolve palette colors while loading chart gradients (convert back to unx lineends...) 2009-01-20 16:23:19 +0100 dr r266594 : #i98282# resolve palette colors while loading chart gradients 2009-01-19 15:43:57 +0100 dr r266507 : #i97900# move fix to CWS dr66 2009-01-19 15:40:28 +0100 dr r266506 : #i97900# move fix to CWS dr66 2009-01-19 15:20:14 +0100 dr r266505 : #i98141# correctly update note position while switching LTR/RTL mode of sheet 2009-01-06 10:28:02 +0100 dr r265899 : CWS-TOOLING: rebase CWS dr66 to trunk@265758 (milestone: DEV300:m38) 2008-11-13 13:59:02 +0100 dr r263644 : #i10000# merge problems 2008-11-13 13:25:15 +0100 dr r263639 : #i10000# merge problems 2008-11-13 13:22:58 +0100 dr r263638 : #i10000# merge problems 2008-11-13 13:22:25 +0100 dr r263637 : #i10000# merge problems 2008-11-12 13:40:46 +0100 dr r263595 : #i10000# merge problem 2008-11-12 11:34:51 +0100 dr r263583 : CWS-TOOLING: rebase CWS dr66 to trunk@263288 (milestone: DEV300:m35) 2008-11-11 16:58:11 +0100 dr r263568 : CWS-TOOLING: rebase CWS dr66 to trunk@262087 (milestone: DEV300:m33) 2008-10-27 14:38:34 +0100 dr r262675 : migrate CWS dr66 to SVN --- sc/inc/docuno.hxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sc/inc/docuno.hxx') diff --git a/sc/inc/docuno.hxx b/sc/inc/docuno.hxx index e8048a5b9618..36a152943782 100644 --- a/sc/inc/docuno.hxx +++ b/sc/inc/docuno.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: docuno.hxx,v $ - * $Revision: 1.27.32.2 $ + * $Revision: 1.27.128.1 $ * * This file is part of OpenOffice.org. * @@ -741,8 +741,8 @@ private: ScDocShell* pDocShell; SCTAB nTab; // Collection haengt am Sheet - BOOL GetAddressByIndex_Impl( ULONG nIndex, ScAddress& rPos ) const; - ScAnnotationObj* GetObjectByIndex_Impl(sal_Int32 nIndex) const; + bool GetAddressByIndex_Impl( sal_Int32 nIndex, ScAddress& rPos ) const; + ScAnnotationObj* GetObjectByIndex_Impl( sal_Int32 nIndex ) const; public: ScAnnotationsObj(ScDocShell* pDocSh, SCTAB nT); -- cgit