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

Kohei Yoshida kohei at kemper.freedesktop.org
Mon May 24 15:51:05 PDT 2010 

 patches/dev300/apply                                       |    8 ++++----
 patches/dev300/pptx-filter-as-a-separate-lib.diff          |    6 +++---
 patches/dev300/pptx-snapshot-at-ooxml03-creation.diff      |    4 ++--
 patches/dev300/writer-doc-comparison.diff                  |    6 +++---
 patches/dev300/writer-navigation-buttons.diff              |    2 +-
 patches/dev300/xlsx-filter-as-a-separate-lib-xls-copy.diff |    6 +++---
 6 files changed, 16 insertions(+), 16 deletions(-)

New commits:
commit efc27018f74e95d95918120c14a1208dc7d5849f
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Mon May 24 18:50:52 2010 -0400

    More build fixes.
    
    Disabled more patches & more header re-locations.
    
    * patches/dev300/apply:
    * patches/dev300/pptx-filter-as-a-separate-lib.diff:
    * patches/dev300/pptx-snapshot-at-ooxml03-creation.diff:
    * patches/dev300/writer-doc-comparison.diff:
    * patches/dev300/writer-navigation-buttons.diff:
    * patches/dev300/xlsx-filter-as-a-separate-lib-xls-copy.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 394d68b..2f5f00a 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2827,8 +2827,8 @@ sd-custom-show-fix.diff, n#355638, i#90145, thorsten
 # have Impress outline text boxes shrink font automatically when text
 # starts to overflow
 # FIXME dev300-m77 fit-list-to-size.diff, i#94086, thorsten #needs update
-fit-list-to-size-style-defaults.diff, i#94086, thorsten
-fit-list-to-size-popup.diff, i#94086, thorsten
+# FIXME dev300-m77 fit-list-to-size-style-defaults.diff, i#94086, thorsten
+# FIXME dev300-m77 fit-list-to-size-popup.diff, i#94086, thorsten
 
 # apply this patch if you need to disable vcl grabbing your mouse -
 # after applying the patch, set SAL_NO_MOUSEGRABS in your env
@@ -2972,7 +2972,7 @@ win32-interix.diff, tml
 # fix problem with calling private and protected members in layout code
 sfx2-privateprotectedpublic.diff
 # UI + core to make OLE editing optionally outplace
-optional-outplace-ole.diff, i#98970, thorsten
+# FIXME dev300-m77 optional-outplace-ole.diff, i#98970, thorsten
 # UI + core to have in-slideshow user drawing configurable (color &
 # stroke width)
 # FIXME dev300-m77 slideshow-configurable-paintoverlay.diff, i#97972, fredus #disabled
@@ -3638,7 +3638,7 @@ transogl-crossplatform.diff, ericb
 
 [ Fixes ]
 # FIXME dev300-m77 svx-sound.diff, n#515553, rodo #depends on cws-impressmedia01-backport.diff
-sd-sound.diff, n#515553, rodo
+# FIXME dev300-m77 sd-sound.diff, n#515553, rodo #depends on svx-sound.diff
 # FIXME dev300-m77 slideshow-sound.diff, n#515553, rodo #update
 sd-avoid-looping-fix.diff, thorsten
 svx-validate-paradepth.diff, thorsten
diff --git a/patches/dev300/pptx-filter-as-a-separate-lib.diff b/patches/dev300/pptx-filter-as-a-separate-lib.diff
index 69d776c..593b614 100644
--- a/patches/dev300/pptx-filter-as-a-separate-lib.diff
+++ b/patches/dev300/pptx-filter-as-a-separate-lib.diff
@@ -1654,7 +1654,7 @@ index 0000000..b07d24d
 +#include <com/sun/star/view/PaperFormat.hpp>
 +#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
 +#include <tools/zcodec.hxx>
-+#include <svx/svxenum.hxx>
++#include <editeng/svxenum.hxx>
 +#include <sot/storinfo.hxx>
 +#include <svx/msoleexp.hxx>
 +#include <vcl/virdev.hxx>
@@ -4116,7 +4116,7 @@ index 0000000..1d2f40b
 +//#ifndef _SVX_XIT_HXX
 +//#include <svx/xit.hxx>
 +//#endif
-+#include <svx/svxenum.hxx>
++#include <editeng/svxenum.hxx>
 +#include <svx/unoapi.hxx>
 +#include <svx/svdoashp.hxx>
 +#include <com/sun/star/style/VerticalAlignment.hpp>
@@ -4169,7 +4169,7 @@ index 0000000..1d2f40b
 +#include <sot/clsids.hxx>
 +#include <unotools/ucbstreamhelper.hxx>
 +#include <com/sun/star/text/FontRelief.hpp>
-+#include <svx/frmdiritem.hxx>
++#include <editeng/frmdiritem.hxx>
 +/*
 +#include <svx/outliner.hxx>
 +#include <svx/outlobj.hxx>
diff --git a/patches/dev300/pptx-snapshot-at-ooxml03-creation.diff b/patches/dev300/pptx-snapshot-at-ooxml03-creation.diff
index 9994de6..00b26c1 100644
--- a/patches/dev300/pptx-snapshot-at-ooxml03-creation.diff
+++ b/patches/dev300/pptx-snapshot-at-ooxml03-creation.diff
@@ -8175,7 +8175,7 @@ index 0000000..7b09d36
 +#include <epptdef.hxx>
 +#include <text.hxx>
 +#include <tools/color.hxx>
-+#include <svx/svxenum.hxx>
++#include <editeng/svxenum.hxx>
 +
 +using namespace ::com::sun::star;
 +
@@ -8684,7 +8684,7 @@ index 0000000..b450e33
 +
 +#include <svtools/languageoptions.hxx>
 +#include <sfx2/app.hxx>
-+#include <svx/svxenum.hxx>
++#include <editeng/svxenum.hxx>
 +#include <svx/frmdir.hxx>
 +#include <vcl/fontcvt.hxx>
 +#include <vcl/metric.hxx>
diff --git a/patches/dev300/writer-doc-comparison.diff b/patches/dev300/writer-doc-comparison.diff
index d3ea5ce..2d489f9 100644
--- a/patches/dev300/writer-doc-comparison.diff
+++ b/patches/dev300/writer-doc-comparison.diff
@@ -562,7 +562,7 @@ index 0dd9594..bccfbea 100644
  #include "tblenum.hxx"
  #include "itabenum.hxx"
  #include <tools/globname.hxx>
-+#include <svx/svxenum.hxx>
++#include <editeng/svxenum.hxx>
  class SwModuleOptions;
  
  //-----------------------------------------------------------------------------
@@ -654,7 +654,7 @@ index cd661f3..6b2f5b3 100644
  #include <fldupde.hxx>
  #include <com/sun/star/linguistic2/XLinguServiceEventListener.hpp>
  #include <com/sun/star/linguistic2/XLanguageGuessing.hpp>
-+#include <svx/svxenum.hxx>
++#include <editeng/svxenum.hxx>
  
  class SvStringsDtor;
  class Color;
@@ -2507,7 +2507,7 @@ index 2e77b27..9ff09cc 100644
  
  #include <unomid.h>
 -
-+#include <svx/svxenum.hxx>
++#include <editeng/svxenum.hxx>
  
  using namespace ::com::sun::star;
  
diff --git a/patches/dev300/writer-navigation-buttons.diff b/patches/dev300/writer-navigation-buttons.diff
index 9d8fe44..2a71a93 100644
--- a/patches/dev300/writer-navigation-buttons.diff
+++ b/patches/dev300/writer-navigation-buttons.diff
@@ -407,7 +407,7 @@ index 0000000..68b43f2
 +
 +#include "swtypes.hxx"
 +#include "pam.hxx"
-+#include <svx/svxenum.hxx>
++#include <editeng/svxenum.hxx>
 +#include <tools/gen.hxx>
 +#include "swdllapi.h"
 +
diff --git a/patches/dev300/xlsx-filter-as-a-separate-lib-xls-copy.diff b/patches/dev300/xlsx-filter-as-a-separate-lib-xls-copy.diff
index 1882194..7cb383b 100644
--- a/patches/dev300/xlsx-filter-as-a-separate-lib-xls-copy.diff
+++ b/patches/dev300/xlsx-filter-as-a-separate-lib-xls-copy.diff
@@ -17582,7 +17582,7 @@ index 0000000..b47ae57
 +#include <svtools/fltrcfg.hxx>
 +#include <svx/brshitem.hxx>
 +#include <svx/boxitem.hxx>
-+#include <svx/frmdiritem.hxx>
++#include <editeng/frmdiritem.hxx>
 +#include <svx/adjitem.hxx>
 +#include <editeng/eeitem.hxx>
 +#include <svx/msoleexp.hxx>
@@ -36463,7 +36463,7 @@ index 0000000..5e7c86d
 +#include <svx/rotmodit.hxx>
 +#include <svx/colritem.hxx>
 +#include <svx/brshitem.hxx>
-+#include <svx/frmdiritem.hxx>
++#include <editeng/frmdiritem.hxx>
 +#include <editeng/eeitem.hxx>
 +#include <svx/escpitem.hxx>
 +#include "document.hxx"
@@ -45141,7 +45141,7 @@ index 0000000..90360e9
 +#include "precompiled_sc.hxx"
 +#include "xlpage.hxx"
 +#include <sfx2/printer.hxx>
-+#include <svx/svxenum.hxx>
++#include <editeng/svxenum.hxx>
 +#include <svx/paperinf.hxx>
 +#include <vcl/svapp.hxx>
 +#include "scitems.hxx"

More information about the ooo-build-commit mailing list