[ooo-build-commit] 2 commits - patches/dev300

[Tor Lillqvist]

 patches/dev300/calc-dp-hide-list-menu.diff          |    4 +---
 patches/dev300/calc-html-import-custom-lang-sc.diff |    4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

New commits:
commit d5ee0b16b330d7e2dc24710d4a8fd7b21a865bb2
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Aug 12 15:27:12 2009 +0300

    Adapt calc-dp-hide-list-menu.diff for dev300-m54
    
    * patches/dev300/calc-dp-hide-list-menu.diff: Adapt for dev300-m54.

diff --git a/patches/dev300/calc-dp-hide-list-menu.diff b/patches/dev300/calc-dp-hide-list-menu.diff
index 2a6d889..a438ddb 100644
--- a/patches/dev300/calc-dp-hide-list-menu.diff
+++ b/patches/dev300/calc-dp-hide-list-menu.diff
@@ -2241,14 +2241,12 @@ index a3e08cb..ed388d4 100644
      void                    InitWnd         ( PivotField* pArr, long nCount, ScDPFieldType eType );
      void                    InitFocus       ();
      void                    InitFields      ();
-diff --git sc/source/ui/view/gridwin.cxx sc/source/ui/view/gridwin.cxx
-index 3d7f3d4..078c55a 100644
 --- sc/source/ui/view/gridwin.cxx
 +++ sc/source/ui/view/gridwin.cxx
 @@ -121,6 +121,7 @@
- #include "cellsh.hxx"
  #include "tabprotection.hxx"
  #include "clipparam.hxx"
+ #include "postit.hxx"
 +#include "dpcontrol.hxx"
  
  // #114409#
commit 6e15be26fe36eadfe3aba2d1d46f5042bf21406f
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Aug 12 15:25:01 2009 +0300

    Adapt calc-html-import-custom-lang-sc.diff for dev300-m54
    
    * patches/dev300/calc-html-import-custom-lang-sc.diff: Adapt for
      dev300-m54.

diff --git a/patches/dev300/calc-html-import-custom-lang-sc.diff b/patches/dev300/calc-html-import-custom-lang-sc.diff
index b2a4733..7d0d408 100644
--- a/patches/dev300/calc-html-import-custom-lang-sc.diff
+++ b/patches/dev300/calc-html-import-custom-lang-sc.diff
@@ -686,14 +686,12 @@ index fe6cf52..0d1330e 100644
  //add for ScAutoFormatDlg begin
  
  AbstractScAutoFormatDlg * ScAbstractDialogFactory_Impl::CreateScAutoFormatDlg( Window*					pParent, //add for ScAutoFormatDlg
-diff --git sc/source/ui/attrdlg/scdlgfact.hxx sc/source/ui/attrdlg/scdlgfact.hxx
-index 4391001..4724771 100644
 --- sc/source/ui/attrdlg/scdlgfact.hxx
 +++ sc/source/ui/attrdlg/scdlgfact.hxx
 @@ -65,6 +65,7 @@ class ScStringInputDlg;
- class ScTabBgColorDlg;
  class ScImportOptionsDlg;
  class SfxTabDialog;
+ class ScSortWarningDlg;
 +class ScLangChooserDlg;
  
  #define DECL_ABSTDLG_BASE(Class,DialogClass)		\