[ooo-build-commit] .: patches/dev300

Kohei Yoshida kohei at kemper.freedesktop.org
Mon Feb 8 22:45:10 PST 2010


 patches/dev300/oox-chart-export-part1.diff |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8b852a5daa6e345bb1ea972d62c8810e2f5661c5
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Tue Feb 9 01:45:47 2010 -0500

    Revert "Fixed a build breakage in oox."
    
    This reverts commit 99c707681769a547939a6f1a627c3b6e659b7053.
    
    *sigh* drawingml.hxx is actually included in files outside of oox,
    where including "tokens.hxx" breaks their build.  Cleaner solution
    needed.  Reverting my previous commit for now.

diff --git a/patches/dev300/oox-chart-export-part1.diff b/patches/dev300/oox-chart-export-part1.diff
index bcfdbea..91cb9e7 100644
--- a/patches/dev300/oox-chart-export-part1.diff
+++ b/patches/dev300/oox-chart-export-part1.diff
@@ -226,7 +226,7 @@ index 211c90e..6569c8b 100644
  #include <com/sun/star/uno/XReference.hpp>
  #include <tools/poly.hxx>
  #include <svx/escherex.hxx>
-+#include "tokens.hxx"
++#include <oox/core/tokens.hxx>
  
  class Graphic;
  class String;


More information about the ooo-build-commit mailing list