ooo-build r12298 - in trunk: . patches/dev300

[jiaojh svn gnome org]

Author: jiaojh
Date: Wed Apr 23 05:20:46 2008
New Revision: 12298
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12298&view=rev

Log:
    * patches/dev300/plus-minus-sw-navigator2.diff:
      update for build problem caused by api changed.


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/plus-minus-sw-navigator2.diff

Modified: trunk/patches/dev300/plus-minus-sw-navigator2.diff
==============================================================================
--- trunk/patches/dev300/plus-minus-sw-navigator2.diff	(original)
+++ trunk/patches/dev300/plus-minus-sw-navigator2.diff	Wed Apr 23 05:20:46 2008
@@ -1,5 +1,5 @@
---- sw/source/ui/inc/conttree.hxx.orig	2008-02-19 21:56:13.000000000 +0800
-+++ sw/source/ui/inc/conttree.hxx	2008-04-22 10:19:21.000000000 +0800
+--- sw/source/ui/inc/conttree.hxx.orig	2008-04-23 13:28:30.000000000 +0800
++++ sw/source/ui/inc/conttree.hxx	2008-04-23 13:31:34.000000000 +0800
 @@ -43,6 +43,9 @@
  #include "swcont.hxx"
  #endif
@@ -20,7 +20,7 @@
  	USHORT				nHiddenBlock;
  	USHORT 				nRootType;
 --- sw/source/ui/utlui/content.cxx.bak	2008-04-22 10:16:09.000000000 +0800
-+++ sw/source/ui/utlui/content.cxx	2008-04-22 10:19:21.000000000 +0800
++++ sw/source/ui/utlui/content.cxx	2008-04-23 13:34:07.000000000 +0800
 @@ -999,7 +999,6 @@ SwContentTree::~SwContentTree()
  /***************************************************************************
  	Drag&Drop methods
@@ -42,7 +42,7 @@
 +        sal_Int32 nPos = pContent->GetYPos();
 +        if( nPos )
 +        {
-+            key = (void*)pShell->GetOutlineNode( nPos );
++            key = (void*)pShell->getIDocumentOutlineNodesAccess()->getOutlineNode( nPos );
 +        }
 +    }
 +    return key;
@@ -100,7 +100,7 @@
 -                        SvTreeListBox::Expand(pChild);
 +                    {
 +                        sal_Int32 nPos = ((SwContent*)pChild->GetUserData())->GetYPos();
-+                        void* key = (void*)pShell->GetOutlineNode( nPos );
++                        void* key = (void*)pShell->getIDocumentOutlineNodesAccess()->getOutlineNode( nPos );
 +                        mCurrOutLineNodeMap.insert(std::map<void*, sal_Bool>::value_type( key, sal_False ) );
 +                        std::map<void*,sal_Bool>::iterator iter = mOutLineNodeMap.find( key );
 +                        if( iter != mOutLineNodeMap.end() && mOutLineNodeMap[key])
@@ -120,7 +120,7 @@
 +        {
 +            SwWrtShell* pShell = GetWrtShell();
 +            sal_Int32 nPos = ((SwContent*)pParent->GetUserData())->GetYPos();
-+            void* key = (void*)pShell->GetOutlineNode( nPos );
++            void* key = (void*)pShell->getIDocumentOutlineNodesAccess()->getOutlineNode( nPos );
 +            mOutLineNodeMap[key] = sal_True;
 +        }
  	}
@@ -144,7 +144,7 @@
 +        {
 +            SwWrtShell* pShell = GetWrtShell();
 +            sal_Int32 nPos = ((SwContent*)pParent->GetUserData())->GetYPos();
-+            void* key = (void*)pShell->GetOutlineNode( nPos );
++            void* key = (void*)pShell->getIDocumentOutlineNodesAccess()->getOutlineNode( nPos );
 +            mOutLineNodeMap[key] = sal_False;
 +        }
  			bRet = SvTreeListBox::Collapse(pParent);