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

[noelpwer svn gnome org]

Author: noelpwer
Date: Tue Feb 17 11:30:44 2009
New Revision: 15350
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15350&view=rev

Log:
2009-02-17  Noel Power <noel power novell com>

        * patches/dev300/apply: change comments regarding patches below
        * patches/vba/vba-word-support.diff: fix missing bit
        * patches/vba/vba-word-support-m0.diff: 



Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/vba/vba-word-support-m0.diff
   trunk/patches/vba/vba-word-support.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Feb 17 11:30:44 2009
@@ -1748,8 +1748,6 @@
 i97038-dateserial-fix.diff, Fong
 
 [ VBAObjects ]
-# vba for word support
-#vba-word-support.diff, Fong
 #vba-word-executable-option.diff, Fong
 vba-interior-object-fix.diff, n#459479, Fong
 range-defaultmethod-i98476.diff, i#98476 
@@ -1759,13 +1757,11 @@
 word-read-custom-toolbar-filter.diff, noelpwer
 
 [ VBAObjects <= dev300-m41 <= ooo310-m0 ]
+# vba for word support
 vba-word-support-m0.diff
 
 [ VBAObjects > dev300-m41 > ooo310-m0 ]
-# FIXME ooo310-m1: pmladek removed the whole hunk for sc/source/ui/vba/vbacommandbarcontrols.cxx
-#                  it needs a real update
-#                  also the counter-part vbahelper/source/vbahelper/vbacommandbarcontrols.cxx
-#                  needs an update
+# vba for word support
 vba-word-support.diff
 
 [ VBAUntested ]

Modified: trunk/patches/vba/vba-word-support-m0.diff
==============================================================================
--- trunk/patches/vba/vba-word-support-m0.diff	(original)
+++ trunk/patches/vba/vba-word-support-m0.diff	Tue Feb 17 11:30:44 2009
@@ -16195,7 +16195,7 @@
  
  SwMSDffManager::SwMSDffManager( SwWW8ImplReader& rRdr )
      : SvxMSDffManager(*rRdr.pTableStream, rRdr.GetBaseURL(), rRdr.pWwFib->fcDggInfo,
-@@ -3912,7 +3985,48 @@ ULONG SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos)
+@@ -3912,7 +3985,52 @@ ULONG SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos)
      }
      else //ordinary case
      {
@@ -16237,6 +16237,10 @@
 +
 +            StoreMacroCmds();
 +
++            // Hackly to register the document event.
++            // should be find a better solution to share the codes with Excel Workbook event. 
++            registerDocEvent( mpDocShell );
++
 +            maTracer.LeaveEnvironment(sw::log::eMacros);
 +        }
          ReadText(0, pWwFib->ccpText, MAN_MAINTEXT);

Modified: trunk/patches/vba/vba-word-support.diff
==============================================================================
--- trunk/patches/vba/vba-word-support.diff	(original)
+++ trunk/patches/vba/vba-word-support.diff	Tue Feb 17 11:30:44 2009
@@ -16194,7 +16194,7 @@
  
  SwMSDffManager::SwMSDffManager( SwWW8ImplReader& rRdr )
      : SvxMSDffManager(*rRdr.pTableStream, rRdr.GetBaseURL(), rRdr.pWwFib->fcDggInfo,
-@@ -3912,7 +3985,48 @@ ULONG SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos)
+@@ -3912,7 +3985,52 @@ ULONG SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, const SwPosition &rPos)
      }
      else //ordinary case
      {
@@ -16236,6 +16236,10 @@
 +
 +            StoreMacroCmds();
 +
++            // Hackly to register the document event.
++            // should be find a better solution to share the codes with Excel Workbook event. 
++            registerDocEvent( mpDocShell );
++
 +            maTracer.LeaveEnvironment(sw::log::eMacros);
 +        }
          ReadText(0, pWwFib->ccpText, MAN_MAINTEXT);
@@ -28490,7 +28494,7 @@
 index 0000000..2b79cff
 --- /dev/null
 +++ vbahelper/source/vbahelper/vbacommandbarcontrols.cxx
-@@ -0,0 +1,349 @@
+@@ -0,0 +1,348 @@
 +/*************************************************************************
 + *
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -28560,7 +28564,6 @@
 +        }
 +        else
 +            throw container::NoSuchElementException();
-+        return uno::Any();
 +    }
 +};
 +