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

René Engelhard rene at kemper.freedesktop.org
Fri May 21 13:02:18 PDT 2010


 patches/dev300/calc-filter-dbf-precision.diff              |    2 +-
 patches/dev300/optional-outplace-ole.diff                  |    2 +-
 patches/dev300/vosremoval-mutex.diff                       |    6 +++---
 patches/dev300/writer-doc-comparison.diff                  |    2 +-
 patches/dev300/xlsx-filter-as-a-separate-lib-xls-copy.diff |    8 ++++----
 5 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 3ae79312b58007409ab3237f0ee1307ee880fdaf
Author: Rene Engelhard <rene at debian.org>
Date:   Fri May 21 21:54:29 2010 +0200

    fix build: svtools/intitem.hxx -> svl/intitem.hxx
    
    * patches/dev300/calc-filter-dbf-precision.diff:
    * patches/dev300/optional-outplace-ole.diff:
    * patches/dev300/vosremoval-mutex.diff:
    * patches/dev300/writer-doc-comparison.diff:
    * patches/dev300/xlsx-filter-as-a-separate-lib-xls-copy.diff:

diff --git a/patches/dev300/calc-filter-dbf-precision.diff b/patches/dev300/calc-filter-dbf-precision.diff
index 34af7be..6cde924 100644
--- a/patches/dev300/calc-filter-dbf-precision.diff
+++ b/patches/dev300/calc-filter-dbf-precision.diff
@@ -46,7 +46,7 @@ index 1c30f8d..88145cf 100644
  #include "dociter.hxx"
  #include "globstr.hrc"
 +#include "svtools/zformat.hxx"
-+#include "svtools/intitem.hxx"
++#include "svl/intitem.hxx"
 +#include "patattr.hxx"
 +#include "scitems.hxx"
 +#include "docpool.hxx"
diff --git a/patches/dev300/optional-outplace-ole.diff b/patches/dev300/optional-outplace-ole.diff
index 2cc44d4..0bb2649 100644
--- a/patches/dev300/optional-outplace-ole.diff
+++ b/patches/dev300/optional-outplace-ole.diff
@@ -671,7 +671,7 @@ index 0000000..53c9bc7
 +#include <com/sun/star/awt/XWindow2.hpp>
 +#include <vcl/menu.hxx>
 +#include <svtools/rectitem.hxx>
-+#include <svtools/intitem.hxx>
++#include <svl/intitem.hxx>
 +#include <svtools/eitem.hxx>
 +#include <svtools/stritem.hxx>
 +#include <svtools/asynclink.hxx>
diff --git a/patches/dev300/vosremoval-mutex.diff b/patches/dev300/vosremoval-mutex.diff
index b85f05b..d6888c7 100644
--- a/patches/dev300/vosremoval-mutex.diff
+++ b/patches/dev300/vosremoval-mutex.diff
@@ -3876,7 +3876,7 @@ index 71ddbb9..613942c 100644
 --- binfilter/bf_sfx2/source/doc/sfx2_objmisc.cxx
 +++ binfilter/bf_sfx2/source/doc/sfx2_objmisc.cxx
 @@ -46,7 +46,7 @@
- #include <svtools/intitem.hxx>
+ #include <svl/intitem.hxx>
  #endif
  #include <bf_so3/inetbnd.hxx>
 -#include <vos/mutex.hxx>
@@ -24998,7 +24998,7 @@ index cf0f282..af1e2d6 100644
 +++ sfx2/source/doc/objmisc.cxx
 @@ -48,7 +48,7 @@
  #ifndef _SFXINTITEM_HXX //autogen
- #include <svtools/intitem.hxx>
+ #include <svl/intitem.hxx>
  #endif
 -#include <vos/mutex.hxx>
 +#include <osl/mutex.hxx>
@@ -32449,7 +32449,7 @@ index e658b00..7994887 100644
 +#include <osl/mutex.hxx>
  
  #include <svx/flditem.hxx>
- #include <svtools/intitem.hxx>
+ #include <svl/intitem.hxx>
 @@ -1590,7 +1590,7 @@ void ImpEditView::dragGestureRecognized( const ::com::sun::star::datatransfer::d
  {
      DBG_ASSERT( !pDragAndDropInfo, "dragGestureRecognized - DragAndDropInfo exist!" );
diff --git a/patches/dev300/writer-doc-comparison.diff b/patches/dev300/writer-doc-comparison.diff
index b85b522..d3ea5ce 100644
--- a/patches/dev300/writer-doc-comparison.diff
+++ b/patches/dev300/writer-doc-comparison.diff
@@ -134,7 +134,7 @@ index 0000000..470f3f7
 +#ifndef _SVX_RSIDITEM_HXX
 +#define _SVX_RSIDITEM_HXX
 +
-+#include <svtools/intitem.hxx>
++#include <svl/intitem.hxx>
 +#include <svx/svddef.hxx>
 +#include "svx/svxdllapi.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 263d981..4c5839d 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
@@ -12632,7 +12632,7 @@ index 0000000..3aa85dd
 +#include <svx/svdpage.hxx>
 +#include <svx/lrspitem.hxx>
 +#include <svx/ulspitem.hxx>
-+#include <svtools/intitem.hxx>
++#include <svl/intitem.hxx>
 +#include <svtools/zformat.hxx>
 +#include <sot/storage.hxx>
 +#include <sfx2/objsh.hxx>
@@ -13508,7 +13508,7 @@ index 0000000..b651315
 +#include <svx/ulspitem.hxx>
 +#include <svx/fhgtitem.hxx>
 +#include <svx/escpitem.hxx>
-+#include <svtools/intitem.hxx>
++#include <svl/intitem.hxx>
 +#include <svtools/zforlist.hxx>
 +#include <svtools/zformat.hxx>
 +#include <svtools/ctrltool.hxx>
@@ -31919,7 +31919,7 @@ index 0000000..7aadc8f
 +#include <svtools/itemset.hxx>
 +#include "scitems.hxx"
 +#include <svtools/eitem.hxx>
-+#include <svtools/intitem.hxx>
++#include <svl/intitem.hxx>
 +#include <svx/pageitem.hxx>
 +#include <svx/sizeitem.hxx>
 +#include <svx/lrspitem.hxx>
@@ -39330,7 +39330,7 @@ index 0000000..0e169bf
 +#include <map>
 +#include <com/sun/star/i18n/ScriptType.hpp>
 +#include "scitems.hxx"
-+#include <svtools/intitem.hxx>
++#include <svl/intitem.hxx>
 +#include "document.hxx"
 +#include "dociter.hxx"
 +#include "olinetab.hxx"


More information about the ooo-build-commit mailing list