[ooo-build-commit] .: patches/dev300
Noel Power
noelp at kemper.freedesktop.org
Thu Feb 4 08:16:27 PST 2010
patches/dev300/svx-hacky-htmlselect-control-import.diff | 65 +++++++++++++---
patches/dev300/sw-import-html-controls.diff | 42 +++++-----
2 files changed, 74 insertions(+), 33 deletions(-)
New commits:
commit e2d4d086aa3ef82a69bc9a487a0d018e0f8b4d39
Author: Noel Power <noel.power at novell.com>
Date: Thu Feb 4 16:15:27 2010 +0000
fix some fuzz
* patches/dev300/svx-hacky-htmlselect-control-import.diff:
* patches/dev300/sw-import-html-controls.diff:
diff --git a/patches/dev300/svx-hacky-htmlselect-control-import.diff b/patches/dev300/svx-hacky-htmlselect-control-import.diff
index 2e1322d..9741b98 100644
--- a/patches/dev300/svx-hacky-htmlselect-control-import.diff
+++ b/patches/dev300/svx-hacky-htmlselect-control-import.diff
@@ -1,8 +1,8 @@
diff --git svx/inc/svx/msocximex.hxx svx/inc/svx/msocximex.hxx
-index c56be5f..ef28415 100644
+index 11468ac..6d37345 100644
--- svx/inc/svx/msocximex.hxx
+++ svx/inc/svx/msocximex.hxx
-@@ -1384,6 +1384,41 @@ public:
+@@ -1170,6 +1170,41 @@ public:
const com::sun::star::awt::Size& rSize );
};
@@ -44,8 +44,12 @@ index c56be5f..ef28415 100644
class HTML_TextBox : public OCX_ModernControl
{
+diff --git svx/source/msfilter/.msocximex.cxx.swp svx/source/msfilter/.msocximex.cxx.swp
+deleted file mode 100644
+index 888ee77..0000000
+Binary files svx/source/msfilter/.msocximex.cxx.swp and /dev/null differ
diff --git svx/source/msfilter/msocximex.cxx svx/source/msfilter/msocximex.cxx
-index ca53640..e00e942 100644
+index 849917d..980098a 100644
--- svx/source/msfilter/msocximex.cxx
+++ svx/source/msfilter/msocximex.cxx
@@ -98,7 +98,7 @@
@@ -57,17 +61,16 @@ index ca53640..e00e942 100644
#ifndef C2S
#define C2S(cChar) String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM(cChar))
#endif
-@@ -4642,7 +4642,8 @@ OCX_map aOCXTab[] =
- 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"}
+@@ -4130,6 +4130,8 @@ OCX_map aOCXTab[] =
+ {&OCX_ProgressBar::Create,"",
+ form::FormComponentType::CONTROL,""},
+ {&HTML_TextBox::Create,"5512D124-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 );
-@@ -6250,5 +6251,140 @@ sal_Bool HTML_TextBox::ReadFontData(SotStorageStream *pS)
+@@ -5722,7 +5724,142 @@ sal_Bool HTML_TextBox::ReadFontData(SotStorageStream *pS)
return sal_True;
}
@@ -153,7 +156,7 @@ index ca53640..e00e942 100644
+ data.SearchAndReplaceAll( String( RTL_CONSTASCII_USTRINGPARAM( "\x0D\x0A" ) ), String( RTL_CONSTASCII_USTRINGPARAM( "\x0A" ) ) );
+ std::vector< rtl::OUString > listValues;
+ std::vector< sal_Int16 > selectedIndices;
-
++
+ // Ultra hacky parser for the info
+ sal_Int32 nTokenCount = data.GetTokenCount( '\n' );
+
@@ -202,9 +205,47 @@ index ca53640..e00e942 100644
+ }
+ return sal_True;
+}
-+
+
+sal_Bool HTML_Select::ReadFontData(SotStorageStream *pS)
+{
+ return sal_True;
+}
- /* vi:set tabstop=4 shiftwidth=4 expandtab: */
+ 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 );
diff --git a/patches/dev300/sw-import-html-controls.diff b/patches/dev300/sw-import-html-controls.diff
index 9d11d06..f11fe5e 100644
--- a/patches/dev300/sw-import-html-controls.diff
+++ b/patches/dev300/sw-import-html-controls.diff
@@ -1,8 +1,8 @@
diff --git svx/inc/svx/msocximex.hxx svx/inc/svx/msocximex.hxx
-index 733304d..4024578 100644
+index d853dcd..11468ac 100644
--- svx/inc/svx/msocximex.hxx
+++ svx/inc/svx/msocximex.hxx
-@@ -1382,4 +1382,38 @@ public:
+@@ -1170,4 +1170,38 @@ public:
const com::sun::star::awt::Size& rSize );
};
@@ -42,23 +42,21 @@ index 733304d..4024578 100644
+
#endif
diff --git svx/source/msfilter/msocximex.cxx svx/source/msfilter/msocximex.cxx
-index 07662ca..e37785c 100644
+index c6adf6c..849917d 100644
--- svx/source/msfilter/msocximex.cxx
+++ svx/source/msfilter/msocximex.cxx
-@@ -4594,8 +4594,9 @@ OCX_map aOCXTab[] =
- form::FormComponentType::SCROLLBAR,"ScrollBar"},
- {&OCX_GroupBox::Create,"",
- form::FormComponentType::GROUPBOX,""},
-- {&OCX_ProgressBar::Create,"",
+@@ -4128,7 +4128,8 @@ OCX_map aOCXTab[] =
+ {&OCX_GroupBox::Create,"",
+ form::FormComponentType::GROUPBOX,""},
+ {&OCX_ProgressBar::Create,"",
- form::FormComponentType::CONTROL,""}
-+ {&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"}
++ form::FormComponentType::CONTROL,""},
++ {&HTML_TextBox::Create,"5512D124-5CC6-11CF-8d67-00aa00bdce1d", form::FormComponentType::TEXTFIELD,"TextBox"},
};
const int NO_OCX = sizeof( aOCXTab ) / sizeof( *aOCXTab );
-@@ -6105,4 +6106,103 @@ sal_Bool OCX_ProgressBar::Import(uno::Reference< beans::XPropertySet > &rPropSet
- }
+@@ -5623,6 +5624,105 @@ sal_Bool OCX_SpinButton::WriteData( SvStream& rStrm ) const
+
// ============================================================================
+
@@ -160,12 +158,14 @@ index 07662ca..e37785c 100644
+}
+
+
- /* vi:set tabstop=4 shiftwidth=4 expandtab: */
+ OCX_ScrollBar::OCX_ScrollBar()
+ {
+ sName = OUString( RTL_CONSTASCII_USTRINGPARAM( "ScrollBar" ) );
diff --git sw/source/filter/ww8/ww8par.hxx sw/source/filter/ww8/ww8par.hxx
-index d8a789d..89ab0d6 100644
+index 26d5719..5b719a2 100644
--- sw/source/filter/ww8/ww8par.hxx
+++ sw/source/filter/ww8/ww8par.hxx
-@@ -1579,6 +1579,8 @@ public: // eigentlich private, geht aber leider nur public
+@@ -1583,6 +1583,8 @@ public: // eigentlich private, geht aber leider nur public
eF_ResT Read_F_OCX(WW8FieldDesc*, String&);
eF_ResT Read_F_Hyperlink(WW8FieldDesc*, String& rStr);
eF_ResT Read_F_Shape(WW8FieldDesc* pF, String& rStr);
@@ -175,11 +175,11 @@ index d8a789d..89ab0d6 100644
void DeleteFormImpl();
diff --git sw/source/filter/ww8/ww8par3.cxx sw/source/filter/ww8/ww8par3.cxx
-index 7ce8b98..e22f257 100644
+index 7068670..9d361cd 100644
--- sw/source/filter/ww8/ww8par3.cxx
+++ sw/source/filter/ww8/ww8par3.cxx
-@@ -313,6 +313,14 @@ eF_ResT SwWW8ImplReader::Read_F_FormListBox( WW8FieldDesc* pF, String& rStr)
-
+@@ -328,6 +328,14 @@ eF_ResT SwWW8ImplReader::Read_F_FormListBox( WW8FieldDesc* pF, String& rStr)
+ }
}
+eF_ResT SwWW8ImplReader::Read_F_HTMLControl( WW8FieldDesc* pF, String& rStr)
@@ -194,10 +194,10 @@ index 7ce8b98..e22f257 100644
{
delete pFormImpl, pFormImpl = 0;
diff --git sw/source/filter/ww8/ww8par5.cxx sw/source/filter/ww8/ww8par5.cxx
-index 331dcb4..968e1b1 100644
+index 1a917fa..56ba5c9 100644
--- sw/source/filter/ww8/ww8par5.cxx
+++ sw/source/filter/ww8/ww8par5.cxx
-@@ -917,7 +917,7 @@ long SwWW8ImplReader::Read_Field(WW8PLCFManResult* pRes)
+@@ -919,7 +919,7 @@ long SwWW8ImplReader::Read_Field(WW8PLCFManResult* pRes)
&SwWW8ImplReader::Read_F_Hyperlink, // 88
0, // 89
0, // 90
More information about the ooo-build-commit
mailing list