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

[Thorsten Behrens]

 patches/dev300/svx-hacky-htmlselect-control-import.diff |   36 ----------------
 1 file changed, 36 deletions(-)

New commits:
commit 53c3e25734e7a6fdca6953a06fdc491575f8a59a
Author: Thorsten Behrens <tbehrens at novell.com>
Date:   Thu Feb 4 17:27:09 2010 +0100

    Remove hunks against backup file
    
    * patches/dev300/svx-hacky-htmlselect-control-import.diff:

diff --git a/patches/dev300/svx-hacky-htmlselect-control-import.diff b/patches/dev300/svx-hacky-htmlselect-control-import.diff
index 9741b98..a34dda0 100644
--- a/patches/dev300/svx-hacky-htmlselect-control-import.diff
+++ b/patches/dev300/svx-hacky-htmlselect-control-import.diff
@@ -213,39 +213,3 @@ index 849917d..980098a 100644
  OCX_ScrollBar::OCX_ScrollBar()
  {
      sName = OUString( RTL_CONSTASCII_USTRINGPARAM( "ScrollBar" ) );
-diff --git svx/source/msfilter/msocximex.cxx.rej svx/source/msfilter/msocximex.cxx.rej
-index 57cb83b..c4794f6 100644
---- svx/source/msfilter/msocximex.cxx.rej
-+++ svx/source/msfilter/msocximex.cxx.rej
-@@ -1,20 +1,18 @@
- *************** OCX_map aOCXTab[] =
--*** 4594,4601 ****
--          form::FormComponentType::SCROLLBAR,"ScrollBar"},
--  	{&OCX_GroupBox::Create,"",
--  		form::FormComponentType::GROUPBOX,""},
---     {&OCX_ProgressBar::Create,"",
---         form::FormComponentType::CONTROL,""}
-+*** 4642,4648 ****
-+          form::FormComponentType::GROUPBOX,""},
-+      {&OCX_ProgressBar::Create,"", form::FormComponentType::CONTROL,""},
-+  	{&HTML_TextBox::Create,"5512D11A-5CC6-11CF-8d67-00aa00bdce1d", form::FormComponentType::TEXTFIELD,"TextBox"},
-+- 	{&HTML_TextBox::Create,"5512D124-5CC6-11CF-8d67-00aa00bdce1d", form::FormComponentType::TEXTFIELD,"TextBox"}
-   };
-   
-   const int NO_OCX = sizeof( aOCXTab ) / sizeof( *aOCXTab );
----- 4594,4602 ----
--          form::FormComponentType::SCROLLBAR,"ScrollBar"},
--  	{&OCX_GroupBox::Create,"",
--  		form::FormComponentType::GROUPBOX,""},
--+     {&OCX_ProgressBar::Create,"", form::FormComponentType::CONTROL,""},
--+ 	{&HTML_TextBox::Create,"5512D11A-5CC6-11CF-8d67-00aa00bdce1d", form::FormComponentType::TEXTFIELD,"TextBox"},
--+ 	{&HTML_TextBox::Create,"5512D124-5CC6-11CF-8d67-00aa00bdce1d", form::FormComponentType::TEXTFIELD,"TextBox"}
-+--- 4642,4649 ----
-+          form::FormComponentType::GROUPBOX,""},
-+      {&OCX_ProgressBar::Create,"", form::FormComponentType::CONTROL,""},
-+  	{&HTML_TextBox::Create,"5512D11A-5CC6-11CF-8d67-00aa00bdce1d", form::FormComponentType::TEXTFIELD,"TextBox"},
-++     {&HTML_Select::Create,"5512D122-5CC6-11CF-8d67-00aa00bdce1d",
-++         form::FormComponentType::LISTBOX,"ListBox"},
-   };
-   
-   const int NO_OCX = sizeof( aOCXTab ) / sizeof( *aOCXTab );