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

[Kohei Yoshida]

 patches/dev300/cjk-character-units-imp.diff                |   12 +++++++-----
 patches/dev300/cjk-character-units-ui.diff                 |    2 +-
 patches/dev300/optional-outplace-ole.diff                  |    4 ++--
 patches/dev300/writer-navigation-buttons.diff              |    4 ++--
 patches/dev300/xlsx-filter-as-a-separate-lib-xls-copy.diff |    4 ++--
 patches/vba/vba-word-support.diff                          |    8 ++++----
 6 files changed, 18 insertions(+), 16 deletions(-)

New commits:
commit cfad8454a251b7cb6570956628b1d6dfdb61af36
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Fri May 21 21:30:43 2010 -0400

    Header include changes due to svx split.
    
    * patches/dev300/cjk-character-units-imp.diff:
    * patches/dev300/cjk-character-units-ui.diff:
    * patches/dev300/optional-outplace-ole.diff:
    * patches/dev300/writer-navigation-buttons.diff:
    * patches/dev300/xlsx-filter-as-a-separate-lib-xls-copy.diff:
    * patches/vba/vba-word-support.diff:

diff --git a/patches/dev300/cjk-character-units-imp.diff b/patches/dev300/cjk-character-units-imp.diff
index 15b0c67..2497652 100644
--- a/patches/dev300/cjk-character-units-imp.diff
+++ b/patches/dev300/cjk-character-units-imp.diff
@@ -184,11 +184,13 @@ diff --git svx/source/dialog/dlgutil.cxx svx/source/dialog/dlgutil.cxx
 index 5fa005d..20b02a6 100644
 --- svx/source/dialog/dlgutil.cxx
 +++ svx/source/dialog/dlgutil.cxx
-@@ -35,6 +35,7 @@
+@@ -35,6 +35,9 @@
  #include <sfx2/sfxsids.hrc>
  #include <sfx2/module.hxx>
  #include <svl/intitem.hxx>
-+#include <svtools/eitem.hxx>
++#include <svl/eitem.hxx>
++#include <sfx2/viewfrm.hxx>
++#include <sfx2/objsh.hxx>
  
  // -----------------------------------------------------------------------
  
@@ -200,7 +202,7 @@ index 5fa005d..20b02a6 100644
 +{
 +    BOOL  bUseCharUnit = FALSE;
 +    const SfxPoolItem* pItem = NULL;
-+    if ( rSet && SFX_ITEM_SET == rSet->GetItemState( SID_ATTR_APPLYCHARUNIT, FALSE, &pItem ) )
++    if ( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_APPLYCHARUNIT, FALSE, &pItem ) )
 +        bUseCharUnit = (BOOL)( (const SfxBoolItem*)pItem )->GetValue();
 +    else
 +    {
@@ -208,13 +210,13 @@ index 5fa005d..20b02a6 100644
 +        SfxViewFrame* pFrame = SfxViewFrame::Current();
 +        SfxObjectShell* pSh = NULL;
 +        if ( pFrame )
-+        pSh = pFrame->GetObjectShell();
++            pSh = pFrame->GetObjectShell();
 +        if ( pSh )  // #93209# the object shell is not always available during reload
 +        {
 +            SfxModule* pModule = pSh->GetModule();
 +            if ( pModule )
 +            {
-+                const SfxPoolItem* pItem = pModule->GetItem( SID_ATTR_APPLYCHARUNIT );
++                pItem = pModule->GetItem( SID_ATTR_APPLYCHARUNIT );
 +                if ( pItem )
 +                    bUseCharUnit = (BOOL)( (SfxBoolItem*)pItem )->GetValue();
 +            }
diff --git a/patches/dev300/cjk-character-units-ui.diff b/patches/dev300/cjk-character-units-ui.diff
index dbe5816..94d6153 100644
--- a/patches/dev300/cjk-character-units-ui.diff
+++ b/patches/dev300/cjk-character-units-ui.diff
@@ -246,7 +246,7 @@ index 956e774..3d2419a 100644
  using namespace ::com::sun::star;
  
 +#ifndef _SFXENUMITEM_HXX //autogen
-+#include <svtools/eitem.hxx>
++#include <svl/eitem.hxx>
 +#endif
 +
  /* -----------------22.10.98 15:12-------------------
diff --git a/patches/dev300/optional-outplace-ole.diff b/patches/dev300/optional-outplace-ole.diff
index 0bb2649..0f3cb5c 100644
--- a/patches/dev300/optional-outplace-ole.diff
+++ b/patches/dev300/optional-outplace-ole.diff
@@ -672,8 +672,8 @@ index 0000000..53c9bc7
 +#include <vcl/menu.hxx>
 +#include <svtools/rectitem.hxx>
 +#include <svl/intitem.hxx>
-+#include <svtools/eitem.hxx>
-+#include <svtools/stritem.hxx>
++#include <svl/eitem.hxx>
++#include <svl/stritem.hxx>
 +#include <svtools/asynclink.hxx>
 +#include <svtools/sfxecode.hxx>
 +#include <vcl/dialog.hxx>
diff --git a/patches/dev300/writer-navigation-buttons.diff b/patches/dev300/writer-navigation-buttons.diff
index 16fb140..9d8fe44 100644
--- a/patches/dev300/writer-navigation-buttons.diff
+++ b/patches/dev300/writer-navigation-buttons.diff
@@ -613,8 +613,8 @@ index 0000000..663c7eb
 +#include "cmdid.h"
 +#include <svx/svdview.hxx>
 +#include <svx/srchitem.hxx>
-+#include <svtools/eitem.hxx>
-+#include <svtools/whiter.hxx>
++#include <svl/eitem.hxx>
++#include <svl/whiter.hxx>
 +#include <svx/svdopath.hxx>
 +#include <sfx2/request.hxx>
 +#include <sfx2/dispatch.hxx>
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 4c5839d..00eac83 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
@@ -31918,7 +31918,7 @@ index 0000000..7aadc8f
 +#include "xepage.hxx"
 +#include <svtools/itemset.hxx>
 +#include "scitems.hxx"
-+#include <svtools/eitem.hxx>
++#include <svl/eitem.hxx>
 +#include <svl/intitem.hxx>
 +#include <svx/pageitem.hxx>
 +#include <svx/sizeitem.hxx>
@@ -34471,7 +34471,7 @@ index 0000000..54f6e4f
 +#include <svtools/saveopt.hxx>
 +#include <svtools/itemset.hxx>
 +#include <svtools/stritem.hxx>
-+#include <svtools/eitem.hxx>
++#include <svl/eitem.hxx>
 +#include "xecontent.hxx"
 +#include "xltracer.hxx"
 +#include "xehelper.hxx"
diff --git a/patches/vba/vba-word-support.diff b/patches/vba/vba-word-support.diff
index f296569..edcbe32 100644
--- a/patches/vba/vba-word-support.diff
+++ b/patches/vba/vba-word-support.diff
@@ -28989,10 +28989,10 @@
 +#include <sfx2/viewfrm.hxx>
 +#include <sfx2/dispatch.hxx>
 +#include <sfx2/app.hxx>
-+#include <svtools/stritem.hxx>
-+#include <svtools/eitem.hxx>
-+#include <svtools/intitem.hxx>
-+#include <svtools/itemset.hxx>
++#include <svl/stritem.hxx>
++#include <svl/eitem.hxx>
++#include <svl/intitem.hxx>
++#include <svl/itemset.hxx>
 +//#include <svtools/itempool.hxx>
 +#include <sfx2/docfac.hxx>
 +#include <sfx2/viewfac.hxx>