diff options
| author | Noel Power <noel.power@novell.com> | 2010-10-13 10:51:50 +0100 |
|---|---|---|
| committer | Noel Power <noel.power@novell.com> | 2010-10-13 10:51:50 +0100 |
| commit | 6db6a43ddc5a66f41f109b7995fd83adb5d35411 (patch) | |
| tree | be01c36438a39fdebd43608355671d2e6d120108 /xmloff/inc | |
| parent | 20658054d8bd6380b4b175b552ccc1480c49d01c (diff) | |
| parent | d1a9ad8f4dc25817cea279262286cdfb421fe891 (diff) | |
Merge branch 'vba' fix conflics, trailing ws & tab issues
also removed some old headers ( which I need to add new ones for )
Conflicts:
basic/source/classes/sbunoobj.cxx
basic/source/classes/sbxmod.cxx
xmloff/inc/xmlnmspe.hxx
xmloff/inc/xmloff/xmltoken.hxx
xmlscript/inc/xmlscript/xmldlg_imexp.hxx
Diffstat (limited to 'xmloff/inc')
| -rw-r--r-- | xmloff/inc/xmlnmspe.hxx | 2 | ||||
| -rw-r--r-- | xmloff/inc/xmloff/shapeexport.hxx | 5 | ||||
| -rw-r--r-- | xmloff/inc/xmloff/xmltoken.hxx | 5 |
3 files changed, 6 insertions, 6 deletions
diff --git a/xmloff/inc/xmlnmspe.hxx b/xmloff/inc/xmlnmspe.hxx index ae194cfbf770..c8a77fea22d9 100644 --- a/xmloff/inc/xmlnmspe.hxx +++ b/xmloff/inc/xmlnmspe.hxx @@ -105,5 +105,7 @@ XML_OLD_NAMESPACE( META, 6U ) // experimental namespaces XML_NAMESPACE( FIELD, 100U ) XML_NAMESPACE( CSS3TEXT, 103U ) // CSS Text Level 3 +XML_NAMESPACE( FORMX, 101U ) // form interop extensions + #endif // _XMLOFF_XMLNMSPE_HXX diff --git a/xmloff/inc/xmloff/shapeexport.hxx b/xmloff/inc/xmloff/shapeexport.hxx index e583a208fd83..184ce69c9188 100644 --- a/xmloff/inc/xmloff/shapeexport.hxx +++ b/xmloff/inc/xmloff/shapeexport.hxx @@ -199,11 +199,6 @@ private: const rtl::OUString msStartShape; const rtl::OUString msEndShape; const rtl::OUString msOnClick; -#ifdef ISSUE66550_HLINK_FOR_SHAPES - const rtl::OUString msOnAction; - const rtl::OUString msAction; - const rtl::OUString msURL; -#endif const rtl::OUString msEventType; const rtl::OUString msPresentation; const rtl::OUString msMacroName; diff --git a/xmloff/inc/xmloff/xmltoken.hxx b/xmloff/inc/xmloff/xmltoken.hxx index 04ecfd0f6194..f3c797dd1ea6 100644 --- a/xmloff/inc/xmloff/xmltoken.hxx +++ b/xmloff/inc/xmloff/xmltoken.hxx @@ -145,10 +145,13 @@ namespace xmloff { namespace token { XML_NP_OFFICE_EXT, XML_N_OFFICE_EXT, + // jonp: 2008-09-24 Excel Interop + XML_NP_FORMX, + XML_N_FORMX, + XML_NP_TABLE_EXT, XML_N_TABLE_EXT, - XML_NP_DRAW_EXT, XML_N_DRAW_EXT, |