ooo-build r14663 - in trunk: . patches/dev300 patches/vba

[noelpwer svn gnome org]

Author: noelpwer
Date: Sat Nov 29 15:52:50 2008
New Revision: 14663
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14663&view=rev

Log:
2008-11-29  Noel Power  <noel power novell com>

        * patches/dev300/vba-sc-autoshapes-hyperlinks.diff: fix build  breakers
        * patches/vba/ObjectModule.diff:


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/vba-sc-autoshapes-hyperlinks.diff
   trunk/patches/vba/ObjectModule.diff

Modified: trunk/patches/dev300/vba-sc-autoshapes-hyperlinks.diff
==============================================================================
--- trunk/patches/dev300/vba-sc-autoshapes-hyperlinks.diff	(original)
+++ trunk/patches/dev300/vba-sc-autoshapes-hyperlinks.diff	Sat Nov 29 15:52:50 2008
@@ -214,7 +214,8 @@
  
      // macro and hyperlink
 -#ifdef ISSUE66550_HLINK_FOR_SHAPES
-     if( mbSimpleMacro && ((maMacroName.Len() > 0) || (maHyperlink.getLength() > 0)) )
+-     if( mbSimpleMacro && ((maMacroName.Len() > 0) || (maHyperlink.getLength() > 0)) )
++     if( mbSimpleMacro && ((maMacroName.Len() > 0) || (maHyperlink.Len() > 0)) )
      {
          if( ScMacroInfo* pInfo = ScDrawLayer::GetMacroInfo( &rSdrObj, TRUE ) )
 @@ -500,11 +499,6 @@ void XclImpDrawObjBase::ProcessSdrObject( SdrObject& rSdrObj ) const

Modified: trunk/patches/vba/ObjectModule.diff
==============================================================================
--- trunk/patches/vba/ObjectModule.diff	(original)
+++ trunk/patches/vba/ObjectModule.diff	Sat Nov 29 15:52:50 2008
@@ -2034,7 +2034,7 @@
          if( ScMacroInfo* pInfo = ScDrawLayer::GetMacroInfo( &rSdrObj, TRUE ) )
          {
 -            pInfo->SetMacro( XclControlHelper::GetScMacroName( maMacroName ) );
-+            pInfo->SetMacro( XclControlHelper::GetScMacroName( maMacroName ), GetDocShell() );
++            pInfo->SetMacro( XclControlHelper::GetScMacroName( maMacroName, GetDocShell() ) );
              pInfo->SetHlink( maHyperlink );
          }
      }