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

[Kohei Yoshida]

 patches/dev300/cjk-character-units-fix-376788.diff |    2 +-
 patches/dev300/cjk-character-units-fix.diff        |    6 ++----
 patches/dev300/sw-auto-text-indent-zh.diff         |    6 ++----
 3 files changed, 5 insertions(+), 9 deletions(-)

New commits:
commit 5aeed6b7e46eac8a86603ed74b51b8d71a4eced2
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Mon May 24 17:19:37 2010 -0400

    More build fixes.  cjkoptions.hxx moved from svtools to svl.
    
    * patches/dev300/cjk-character-units-fix-376788.diff:
    * patches/dev300/cjk-character-units-fix.diff:
    * patches/dev300/sw-auto-text-indent-zh.diff:

diff --git a/patches/dev300/cjk-character-units-fix-376788.diff b/patches/dev300/cjk-character-units-fix-376788.diff
index 6f6d385..62c060c 100644
--- a/patches/dev300/cjk-character-units-fix-376788.diff
+++ b/patches/dev300/cjk-character-units-fix-376788.diff
@@ -112,7 +112,7 @@ index 07430ed..ee34a77 100644
  #include <editeng/colritem.hxx>
  #include <editeng/brshitem.hxx>
  #include <vcl/msgbox.hxx>
-+#include <svtools/cjkoptions.hxx>
++#include <svl/cjkoptions.hxx>
  #include <swmodule.hxx>
  #include <swtypes.hxx>
  #include <usrpref.hxx>
diff --git a/patches/dev300/cjk-character-units-fix.diff b/patches/dev300/cjk-character-units-fix.diff
index c1f5e9e..31eaee3 100644
--- a/patches/dev300/cjk-character-units-fix.diff
+++ b/patches/dev300/cjk-character-units-fix.diff
@@ -164,13 +164,11 @@ diff --git sw/source/ui/uiview/view.cxx sw/source/ui/uiview/view.cxx
 index 8a88254..58efc39 100644
 --- sw/source/ui/uiview/view.cxx
 +++ sw/source/ui/uiview/view.cxx
-@@ -116,6 +116,9 @@
+@@ -116,6 +116,7 @@
  #include <com/sun/star/document/XDocumentProperties.hpp>
  #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
  
-+#ifndef _SVTOOLS_CJKOPTIONS_HXX
-+#include <svtools/cjkoptions.hxx>
-+#endif
++#include <svl/cjkoptions.hxx>
  
  
  using namespace ::com::sun::star;
diff --git a/patches/dev300/sw-auto-text-indent-zh.diff b/patches/dev300/sw-auto-text-indent-zh.diff
index 01b84fc..8933416 100644
--- a/patches/dev300/sw-auto-text-indent-zh.diff
+++ b/patches/dev300/sw-auto-text-indent-zh.diff
@@ -96,13 +96,11 @@
      // COMPATIBILITY FLAGS END
 --- sw/source/core/text/itrcrsr.cxx.orig	2007-06-27 21:19:49.000000000 +0800
 +++ sw/source/core/text/itrcrsr.cxx	2007-09-11 14:59:33.000000000 +0800
-@@ -85,6 +85,10 @@
+@@ -85,6 +85,8 @@
  #include <pormulti.hxx> 	// SwMultiPortion
  #endif
  
-+#ifndef __SVTOOLS_CJKOPTIONS_HXX
-+#include <svtools/cjkoptions.hxx>	//SvtCJKOptions
-+#endif
++#include <svl/cjkoptions.hxx>	//SvtCJKOptions
 +
  // Nicht reentrant !!!
  // wird in GetCharRect gesetzt und im UnitUp/Down ausgewertet.