[Libreoffice-commits] .: Branch 'libreoffice-3-3' - patches/vba

[Noel Power]

 patches/vba/vba-container-controls.diff |   21 ---------------------
 1 file changed, 21 deletions(-)

New commits:
commit 43d5f2d72889b52284b34315890053ec1bfdeab6
Author: Noel Power <noel.power at novell.com>
Date:   Mon Mar 7 18:18:59 2011 +0000

    make vba-container-controls apply again
    
    patches/vba/vba-container-controls.diff: removed modifications to oox/inc/oox/helper/graphichelper.hxx ( no longer necessary )

diff --git a/patches/vba/vba-container-controls.diff b/patches/vba/vba-container-controls.diff
index 3273d81..de05595 100644
--- a/patches/vba/vba-container-controls.diff
+++ b/patches/vba/vba-container-controls.diff
@@ -240,27 +240,6 @@ index 87cb36b..217032d 100644
      //-------------------------------------------------------------------------
  };
  
-diff --git oox/inc/oox/helper/graphichelper.hxx oox/inc/oox/helper/graphichelper.hxx
-index 221c47f..cd704e6 100644
---- oox/inc/oox/helper/graphichelper.hxx
-+++ oox/inc/oox/helper/graphichelper.hxx
-@@ -35,6 +35,7 @@
- #include <com/sun/star/uno/Reference.hxx>
- #include "oox/helper/binarystreambase.hxx"
- #include "oox/helper/storagebase.hxx"
-+#include "oox/dllapi.h"
- 
- namespace com { namespace sun { namespace star {
-     namespace awt { struct Point; }
-@@ -64,7 +65,7 @@ namespace oox {
-     resolves the graphic object from the passed URL and thus prevents it from
-     being destroyed.
-  */
--class GraphicHelper
-+class OOX_DLLPUBLIC GraphicHelper
- {
- public:
-     explicit            GraphicHelper(
 diff --git oox/inc/oox/helper/propertyset.hxx oox/inc/oox/helper/propertyset.hxx
 index e4cb5a1..d8d51ca 100644
 --- oox/inc/oox/helper/propertyset.hxx