Fix various C++ issues to allow building with Clang.

21 files changed, 733 insertions, 1 deletions

diff --git a/misc/openoffice3/distinfo b/misc/openoffice3/distinfo
index 7cf6d30ff9c..1e67cbb9616 100644
--- a/misc/openoffice3/distinfo
+++ b/misc/openoffice3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.34 2013/03/17 21:37:31 tsutsui Exp $
+$NetBSD: distinfo,v 1.35 2013/04/01 12:19:13 joerg Exp $
 
 SHA1 (openoffice-3.1.1/OOo_3.1.1_src_binfilter.tar.bz2) = 3b4d0d312a1bed9bdb1bbdfb172fa7361533b498
 RMD160 (openoffice-3.1.1/OOo_3.1.1_src_binfilter.tar.bz2) = 8caa064f836e531035fd551cf2d7288ca5188da0
@@ -45,24 +45,33 @@ SHA1 (patch-bf) = d2e2363e7e08d675e3a6b9356d1ffac6d10148de
 SHA1 (patch-bg) = 0eeb3e521b3d7c47efa67bf38a1ec598056ab32a
 SHA1 (patch-bh) = 39322769872a33293d9dad56b947ca2d6d5069df
 SHA1 (patch-bi) = f9d286d8dd93c7ba99fd0ca809c6dfac5e763464
+SHA1 (patch-binfilter_inc_bf__xmloff_SchXMLExportHelper.hxx) = d5ed879f453ac9aa2c471fd40131e7b1aeb6920e
 SHA1 (patch-bj) = 80685500062b9a17e16732a9a6da7a7d1d1ed1f6
 SHA1 (patch-bk) = 5a5c03a0c965edb32e95ad342f330e2b0eaf3d9c
 SHA1 (patch-bl) = 28beb128f19199a1a86965d2e2b6d42a2565224c
 SHA1 (patch-bm) = 0f7367782155c1d0f0459912aac69a1c759ad7fa
 SHA1 (patch-bn) = 6f21ecf499135b5b47ed191eca79848b4c404447
+SHA1 (patch-boost_boost__1__34__1.patch) = 3eefc23dc38d3fdd480a294ebbf4e4ccaa6da1b2
 SHA1 (patch-bq) = 2321d806bff054932f249a8b9445d790aa9eafbe
 SHA1 (patch-bs) = bea7e5fddee7056558747a6801816e2955dd0657
 SHA1 (patch-bv) = b254cdb889bf5335aafe2b35982fc5cf370207cb
 SHA1 (patch-bw) = 223963fe59b71468420a697d8ea27c153b9f37ce
 SHA1 (patch-bx) = 157878e1fb4297f118ed0bbf06009506666fbc1c
 SHA1 (patch-by) = 1612b765467e51ca7498497d38a0bb6ac694f9a6
+SHA1 (patch-canvas_source_cairo_cairo__xlib__cairo.cxx) = 365e042f7c3684d81108a1ca0fe9257684f09b85
 SHA1 (patch-ch) = d10b293b5969bc1d050a403e613a2edcebc41e14
+SHA1 (patch-chart2_source_controller_chartapiwrapper_WrappedSymbolProperties.cxx) = e8c7a60cc50f963f25ddb161b7d04089a92a71ef
+SHA1 (patch-chart2_source_controller_chartapiwrapper_WrappedSymbolProperties.hxx) = 5910719d67f31a9619fbe688ed7486b1f3d0a0c4
+SHA1 (patch-chart2_source_controller_main_ChartController.hxx) = a7280b62c6f45fcdbcd2914555c4f1bf3225a0aa
 SHA1 (patch-ci) = 4743cee1c391e04a53bd83f6ae7e58e737d08d1e
 SHA1 (patch-cj) = 45ff359ec795e5ef5c692e954d88912c74017162
 SHA1 (patch-ck) = 01925efa75759b3b8efda3ab109b0f6481f45a7f
 SHA1 (patch-cn) = d129e69d8ce9303e46f0b486e495d09c1e446444
+SHA1 (patch-comphelper_inc_comphelper_InlineContainer.hxx) = e40b95a9cc402eab8568b3f93fd78f88a373e424
+SHA1 (patch-comphelper_inc_comphelper_sequenceasvector.hxx) = f13dfc6d4b2beba47db58af712453d63ffa5132f
 SHA1 (patch-configmgr_source_treemgr_templateimpl.hxx) = d34ed7ddfcd879072993f84e44b32e52c961dffe
 SHA1 (patch-cp) = 35151ba658859c9d116ccdf44ec372c9e66435b1
+SHA1 (patch-cppuhelper_inc_cppuhelper_propertysetmixin.hxx) = d7a0896240ea0314ede4b94a8efbdc5444e4baaa
 SHA1 (patch-cq) = 6691fd7fa330db000ec5a9319bf9030b83aa593d
 SHA1 (patch-cs) = 9e9de3db4026c40f2bb20140bef0a23b1396e4bd
 SHA1 (patch-ct) = a06c5cbc543acecb4f18e858cd844302bbdb50b4
@@ -100,9 +109,20 @@ SHA1 (patch-gb) = 70c11692129ef17cf47afa8dbff25e5e41719599
 SHA1 (patch-gc) = 51c00c2fbb64c299d528c072fe68e1f9786a0fff
 SHA1 (patch-ha) = 174125037d080b5bb61c1565520d72556cd3a7e5
 SHA1 (patch-hb) = 31de8d81c05d974d58599d8ff20bd60101b4a143
+SHA1 (patch-o3tl_inc_o3tl_lazy__update.hxx) = 38e95a45b2da092c06140f58377db56f095aa2c0
 SHA1 (patch-oox_inc_oox_drawingml_chart_modelbase.hxx) = 024a3611dc6e676b0e9621623217054c70c4b930
 SHA1 (patch-oox_inc_oox_helper_containerhelper.hxx) = 3859f9c72b2fad37a5bcd9318af2198f8856878d
+SHA1 (patch-sc_inc_compressedarray.hxx) = 5a417a37545bec913b93fa86a84a3f7f15ddf938
+SHA1 (patch-sc_source_core_data_compressedarray.cxx) = f05fc5662818706afe915f6dccc55c406f2fe39e
+SHA1 (patch-sc_source_filter_inc_ftools.hxx) = b1697577c29c341ef558ce98e83a20c408c4a8be
+SHA1 (patch-sc_source_filter_inc_xeroot.hxx) = fbdc4a6d6ff3dc85b5fbcdd15cf0d47994a227c4
+SHA1 (patch-sc_source_filter_inc_xiroot.hxx) = 2b72acf9a85c967a8f2d093bfadcea4b4519bec6
+SHA1 (patch-sc_source_filter_inc_xlroot.hxx) = 975a717c0ffaf7557bd40b89e5ba510557c94135
+SHA1 (patch-sfx2_inc_sfx2_controlwrapper.hxx) = 1d445758acf6f6b4faa6eda2320044cab665398a
+SHA1 (patch-slideshow_source_inc_tools.hxx) = 2e580851452f5f36ae2b01a8ac334109ce0d39aa
 SHA1 (patch-soltools_inc_st__list.hxx) = cd76c1beaed94cbb2af63cc84d1296162677d054
+SHA1 (patch-sw_source_filter_ww8_writerhelper.hxx) = 4723162f5d62a45dd9c895d598647568037c877e
+SHA1 (patch-toolkit_inc_toolkit_helper_servicenames.hxx) = 9aba62af9408029d17f28d116403b762ef6020be
 SHA1 (patch-toolkit_source_awt_vclxdialog.cxx) = d1643bd9dab32f195dc9107fe2bcc92ebed9ba06
 SHA1 (patch-toolkit_source_awt_vclxscroller.cxx) = 95701209a9cbeab61178c845ca3956307d4362f0
 SHA1 (patch-toolkit_source_awt_vclxsplitter.cxx) = 5a03124e1484dc632c8497e9da26244e76f8b9ba
diff --git a/misc/openoffice3/patches/patch-binfilter_inc_bf__xmloff_SchXMLExportHelper.hxx b/misc/openoffice3/patches/patch-binfilter_inc_bf__xmloff_SchXMLExportHelper.hxx
new file mode 100644
index 00000000000..55b95699dd6
--- /dev/null
+++ b/misc/openoffice3/patches/patch-binfilter_inc_bf__xmloff_SchXMLExportHelper.hxx
@@ -0,0 +1,21 @@
+$NetBSD: patch-binfilter_inc_bf__xmloff_SchXMLExportHelper.hxx,v 1.1 2013/04/01 12:19:13 joerg Exp $
+
+--- binfilter/inc/bf_xmloff/SchXMLExportHelper.hxx.orig	2013-03-30 17:32:58.000000000 +0000
++++ binfilter/inc/bf_xmloff/SchXMLExportHelper.hxx
+@@ -40,6 +40,8 @@
+ #include <com/sun/star/util/XStringMapping.hpp>
+ #endif
+ 
++#include <bf_xmloff/XMLChartPropertySetMapper.hxx>
++
+ #include "queue"
+ 
+ namespace com { namespace sun { namespace star {
+@@ -66,7 +68,6 @@ namespace com { namespace sun { namespac
+ namespace binfilter {
+ 
+ class SvXMLAutoStylePoolP;
+-class XMLChartExportPropertyMapper;
+ class SvXMLExport;
+ class XMLPropertyHandlerFactory;
+ class XMLPropertySetMapper;
diff --git a/misc/openoffice3/patches/patch-boost_boost__1__34__1.patch b/misc/openoffice3/patches/patch-boost_boost__1__34__1.patch
new file mode 100644
index 00000000000..6f64c5a7b09
--- /dev/null
+++ b/misc/openoffice3/patches/patch-boost_boost__1__34__1.patch
@@ -0,0 +1,82 @@
+$NetBSD: patch-boost_boost__1__34__1.patch,v 1.1 2013/04/01 12:19:13 joerg Exp $
+
+--- boost/boost_1_34_1.patch.orig	2013-03-30 22:51:40.000000000 +0000
++++ boost/boost_1_34_1.patch
+@@ -258,3 +258,77 @@
+              return *this;
+          }
+  
++--- misc/build/boost_1_34_1/boost/function/function_template.hpp.orig	2006-09-29 17:23:28.000000000 +0000
+++++ misc/build/boost_1_34_1/boost/function/function_template.hpp
++@@ -10,6 +10,7 @@
++ // Note: this header is a header template and must NOT have multiple-inclusion
++ // protection.
++ #include <boost/function/detail/prologue.hpp>
+++#include <boost/detail/no_exceptions_support.hpp>
++ 
++ #define BOOST_FUNCTION_TEMPLATE_PARMS BOOST_PP_ENUM_PARAMS(BOOST_FUNCTION_NUM_ARGS, typename T)
++ 
++@@ -561,12 +562,13 @@ namespace boost {
++     operator=(Functor BOOST_FUNCTION_TARGET_FIX(const &) f)
++     {
++       this->clear();
++-      try {
+++      BOOST_TRY {
++         this->assign_to(f);
++-      } catch (...) {
+++      } BOOST_CATCH (...) {
++         vtable = 0;
++-        throw;
+++        BOOST_RETHROW;
++       }
+++      BOOST_CATCH_END
++       return *this;
++     }
++ 
++@@ -592,12 +594,13 @@ namespace boost {
++         return *this;
++ 
++       this->clear();
++-      try {
+++      BOOST_TRY {
++         this->assign_to_own(f);
++-      } catch (...) {
+++      } BOOST_CATCH (...) {
++         vtable = 0;
++-        throw;
+++        BOOST_RETHROW;
++       }
+++      BOOST_CATCH_END
++       return *this;
++     }
++ 
++--- misc/build/boost_1_34_1/boost/weak_ptr.hpp.orig	2013-03-30 19:19:49.000000000 +0000
+++++ misc/build/boost_1_34_1/boost/weak_ptr.hpp
++@@ -14,6 +14,7 @@
++ //
++ 
++ #include <memory> // boost.TR1 include order fix
+++#include <boost/detail/no_exceptions_support.hpp>
++ #include <boost/detail/shared_count.hpp>
++ #include <boost/shared_ptr.hpp>
++ 
++@@ -101,16 +102,14 @@ public:
++             return shared_ptr<element_type>();
++         }
++ 
++-        try
++-        {
+++        BOOST_TRY {
++             return shared_ptr<element_type>(*this);
++-        }
++-        catch(bad_weak_ptr const &)
++-        {
+++        } BOOST_CATCH (bad_weak_ptr const &) {
++             // Q: how can we get here?
++             // A: another thread may have invalidated r after the use_count test above.
++             return shared_ptr<element_type>();
++         }
+++        BOOST_CATCH_END
++ 
++ #else
++ 
diff --git a/misc/openoffice3/patches/patch-canvas_source_cairo_cairo__xlib__cairo.cxx b/misc/openoffice3/patches/patch-canvas_source_cairo_cairo__xlib__cairo.cxx
new file mode 100644
index 00000000000..61e48069d08
--- /dev/null
+++ b/misc/openoffice3/patches/patch-canvas_source_cairo_cairo__xlib__cairo.cxx
@@ -0,0 +1,14 @@
+$NetBSD: patch-canvas_source_cairo_cairo__xlib__cairo.cxx,v 1.1 2013/04/01 12:19:13 joerg Exp $
+
+--- canvas/source/cairo/cairo_xlib_cairo.cxx.orig	2013-03-30 16:59:08.000000000 +0000
++++ canvas/source/cairo/cairo_xlib_cairo.cxx
+@@ -320,7 +320,8 @@ namespace cairo
+ 
+     static X11SysData getSysData( const VirtualDevice& rVirDev )
+     {
+-        return X11SysData( &rVirDev.GetSystemGfxData() );
++        SystemGraphicsData tmp(rVirDev.GetSystemGfxData());
++        return X11SysData(&tmp);
+     }
+ 
+     SurfaceSharedPtr createSurface( const OutputDevice& rRefDevice,
diff --git a/misc/openoffice3/patches/patch-chart2_source_controller_chartapiwrapper_WrappedSymbolProperties.cxx b/misc/openoffice3/patches/patch-chart2_source_controller_chartapiwrapper_WrappedSymbolProperties.cxx
new file mode 100644
index 00000000000..f90236935d2
--- /dev/null
+++ b/misc/openoffice3/patches/patch-chart2_source_controller_chartapiwrapper_WrappedSymbolProperties.cxx
@@ -0,0 +1,17 @@
+$NetBSD: patch-chart2_source_controller_chartapiwrapper_WrappedSymbolProperties.cxx,v 1.1 2013/04/01 12:19:13 joerg Exp $
+
+--- chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx.orig	2013-03-30 18:10:05.000000000 +0000
++++ chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
+@@ -101,12 +101,6 @@ public:
+     virtual ~WrappedSymbolBitmapURLProperty();
+ };
+ 
+-// this operator is not defined by default
+-bool operator!=( const awt::Size & rSize1, const awt::Size & rSize2 )
+-{
+-    return (rSize1.Width != rSize2.Width) || (rSize1.Height != rSize2.Height);
+-}
+-
+ class WrappedSymbolSizeProperty : public WrappedSeriesOrDiagramProperty< awt::Size >
+ {
+ public:
diff --git a/misc/openoffice3/patches/patch-chart2_source_controller_chartapiwrapper_WrappedSymbolProperties.hxx b/misc/openoffice3/patches/patch-chart2_source_controller_chartapiwrapper_WrappedSymbolProperties.hxx
new file mode 100644
index 00000000000..437dbfb85e6
--- /dev/null
+++ b/misc/openoffice3/patches/patch-chart2_source_controller_chartapiwrapper_WrappedSymbolProperties.hxx
@@ -0,0 +1,25 @@
+$NetBSD: patch-chart2_source_controller_chartapiwrapper_WrappedSymbolProperties.hxx,v 1.1 2013/04/01 12:19:13 joerg Exp $
+
+--- chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.hxx.orig	2013-03-30 19:43:59.000000000 +0000
++++ chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.hxx
+@@ -36,6 +36,20 @@
+ #include <boost/shared_ptr.hpp>
+ #include <vector>
+ 
++namespace com {
++  namespace sun {
++    namespace star {
++      namespace awt {
++// this operator is not defined by default
++inline bool operator!=( const Size & rSize1, const Size & rSize2 )
++{
++    return (rSize1.Width != rSize2.Width) || (rSize1.Height != rSize2.Height);
++}
++      }
++    }
++  }
++}
++
+ //.............................................................................
+ namespace chart
+ {
diff --git a/misc/openoffice3/patches/patch-chart2_source_controller_main_ChartController.hxx b/misc/openoffice3/patches/patch-chart2_source_controller_main_ChartController.hxx
new file mode 100644
index 00000000000..fd69ab70c8f
--- /dev/null
+++ b/misc/openoffice3/patches/patch-chart2_source_controller_main_ChartController.hxx
@@ -0,0 +1,13 @@
+$NetBSD: patch-chart2_source_controller_main_ChartController.hxx,v 1.1 2013/04/01 12:19:13 joerg Exp $
+
+--- chart2/source/controller/main/ChartController.hxx.orig	2013-03-30 19:56:42.000000000 +0000
++++ chart2/source/controller/main/ChartController.hxx
+@@ -533,7 +533,7 @@ private:
+ 		        TheModel* operator->() const { return m_pTheModel; }
+ 		private:
+ 			TheModel*				m_pTheModel;
+-			mutable ::osl::Mutex&	m_rModelMutex;
++			::osl::Mutex&	m_rModelMutex;
+ 	};
+ 
+ private:
diff --git a/misc/openoffice3/patches/patch-comphelper_inc_comphelper_InlineContainer.hxx b/misc/openoffice3/patches/patch-comphelper_inc_comphelper_InlineContainer.hxx
new file mode 100644
index 00000000000..f9633f02f3c
--- /dev/null
+++ b/misc/openoffice3/patches/patch-comphelper_inc_comphelper_InlineContainer.hxx
@@ -0,0 +1,13 @@
+$NetBSD: patch-comphelper_inc_comphelper_InlineContainer.hxx,v 1.1 2013/04/01 12:19:13 joerg Exp $
+
+--- comphelper/inc/comphelper/InlineContainer.hxx.orig	2013-03-30 19:59:55.000000000 +0000
++++ comphelper/inc/comphelper/InlineContainer.hxx
+@@ -102,7 +102,7 @@ public:
+     explicit MakeSet(const T &a)
+         : ::std::set< T >()
+     {
+-        insert(this->end(), a);
++        this->insert(this->end(), a);
+     }
+     MakeSet &operator()(const T &a)
+     {
diff --git a/misc/openoffice3/patches/patch-comphelper_inc_comphelper_sequenceasvector.hxx b/misc/openoffice3/patches/patch-comphelper_inc_comphelper_sequenceasvector.hxx
new file mode 100644
index 00000000000..52d9d25420c
--- /dev/null
+++ b/misc/openoffice3/patches/patch-comphelper_inc_comphelper_sequenceasvector.hxx
@@ -0,0 +1,13 @@
+$NetBSD: patch-comphelper_inc_comphelper_sequenceasvector.hxx,v 1.1 2013/04/01 12:19:13 joerg Exp $
+
+--- comphelper/inc/comphelper/sequenceasvector.hxx.orig	2013-03-30 16:24:50.000000000 +0000
++++ comphelper/inc/comphelper/sequenceasvector.hxx
+@@ -135,7 +135,7 @@ class SequenceAsVector : public ::std::v
+             const TElementType* pSource = lSource.getConstArray();
+ 
+             for (sal_Int32 i=0; i<c; ++i)
+-                push_back(pSource[i]);
++                this->push_back(pSource[i]);
+         }
+ 
+         //---------------------------------------
diff --git a/misc/openoffice3/patches/patch-cppuhelper_inc_cppuhelper_propertysetmixin.hxx b/misc/openoffice3/patches/patch-cppuhelper_inc_cppuhelper_propertysetmixin.hxx
new file mode 100644
index 00000000000..1e840227247
--- /dev/null
+++ b/misc/openoffice3/patches/patch-cppuhelper_inc_cppuhelper_propertysetmixin.hxx
@@ -0,0 +1,12 @@
+$NetBSD: patch-cppuhelper_inc_cppuhelper_propertysetmixin.hxx,v 1.1 2013/04/01 12:19:13 joerg Exp $
+
+--- cppuhelper/inc/cppuhelper/propertysetmixin.hxx.orig	2013-03-30 15:42:48.000000000 +0000
++++ cppuhelper/inc/cppuhelper/propertysetmixin.hxx
+@@ -479,7 +479,6 @@ protected:
+ 
+ private:
+     PropertySetMixin(PropertySetMixin &); // not defined
+-    void operator =(PropertySetMixin); // not defined
+ };
+ 
+ #if defined _MSC_VER
diff --git a/misc/openoffice3/patches/patch-o3tl_inc_o3tl_lazy__update.hxx b/misc/openoffice3/patches/patch-o3tl_inc_o3tl_lazy__update.hxx
new file mode 100644
index 00000000000..41140d53ab5
--- /dev/null
+++ b/misc/openoffice3/patches/patch-o3tl_inc_o3tl_lazy__update.hxx
@@ -0,0 +1,21 @@
+$NetBSD: patch-o3tl_inc_o3tl_lazy__update.hxx,v 1.1 2013/04/01 12:19:14 joerg Exp $
+
+--- o3tl/inc/o3tl/lazy_update.hxx.orig	2013-03-30 17:02:03.000000000 +0000
++++ o3tl/inc/o3tl/lazy_update.hxx
+@@ -104,13 +104,13 @@ output( myValue.getOutValue() );
+ 
+             void               setInValue( input_type const& rIn ) { Functor::m_bCacheDirty = true; m_aInput = rIn; }
+             input_type const&  getInValue()  const                 { return m_aInput; }
+-            output_type const& getOutValue() const                 { return implUpdateValue(m_aInput); }
++            output_type const& getOutValue() const                 { return this->implUpdateValue(m_aInput); }
+         
+             input_type& operator*()  { Functor::m_bCacheDirty = true; return m_aInput;  }
+             input_type* operator->() { Functor::m_bCacheDirty = true; return &m_aInput; }
+ 
+-            output_type const& operator*() const  { return implUpdateValue(m_aInput);  }
+-            output_type const* operator->() const { return &implUpdateValue(m_aInput); }
++            output_type const& operator*() const  { return this->implUpdateValue(m_aInput);  }
++            output_type const* operator->() const { return &this->implUpdateValue(m_aInput); }
+         
+         private:
+             input_type m_aInput;
diff --git a/misc/openoffice3/patches/patch-sc_inc_compressedarray.hxx b/misc/openoffice3/patches/patch-sc_inc_compressedarray.hxx
new file mode 100644
index 00000000000..5db758c1c41
--- /dev/null
+++ b/misc/openoffice3/patches/patch-sc_inc_compressedarray.hxx
@@ -0,0 +1,27 @@
+$NetBSD: patch-sc_inc_compressedarray.hxx,v 1.1 2013/04/01 12:19:14 joerg Exp $
+
+--- sc/inc/compressedarray.hxx.orig	2013-03-30 20:02:54.000000000 +0000
++++ sc/inc/compressedarray.hxx
+@@ -553,18 +553,18 @@ public:
+ template< typename A, typename D >
+ void ScBitMaskCompressedArray<A,D>::AndValue( A nPos, const D& rValueToAnd )
+ {
+-    const D& rValue = GetValue( nPos);
++    const D& rValue = this->GetValue( nPos);
+     if ((rValue & rValueToAnd) != rValue)
+-        SetValue( nPos, rValue & rValueToAnd);
++        this->SetValue( nPos, rValue & rValueToAnd);
+ }
+ 
+ 
+ template< typename A, typename D >
+ void ScBitMaskCompressedArray<A,D>::OrValue( A nPos, const D& rValueToOr )
+ {
+-    const D& rValue = GetValue( nPos);
++    const D& rValue = this->GetValue( nPos);
+     if ((rValue | rValueToOr) != rValue)
+-        SetValue( nPos, rValue | rValueToOr);
++        this->SetValue( nPos, rValue | rValueToOr);
+ }
+ 
+ 
diff --git a/misc/openoffice3/patches/patch-sc_source_core_data_compressedarray.cxx b/misc/openoffice3/patches/patch-sc_source_core_data_compressedarray.cxx
new file mode 100644
index 00000000000..c181d5f5af5
--- /dev/null
+++ b/misc/openoffice3/patches/patch-sc_source_core_data_compressedarray.cxx
@@ -0,0 +1,163 @@
+$NetBSD: patch-sc_source_core_data_compressedarray.cxx,v 1.1 2013/04/01 12:19:14 joerg Exp $
+
+--- sc/source/core/data/compressedarray.cxx.orig	2013-03-30 20:02:28.000000000 +0000
++++ sc/source/core/data/compressedarray.cxx
+@@ -370,7 +370,7 @@ A ScCompressedArray<A,D>::GetLastUnequal
+ template< typename A, typename D >
+ unsigned long ScSummableCompressedArray<A,D>::SumValues( A nStart, A nEnd ) const
+ {
+-    size_t nIndex = Search( nStart);
++    size_t nIndex = this->Search( nStart);
+     unsigned long nSum = SumValuesContinuation( nStart, nEnd, nIndex);
+     if (nEnd > this->nMaxAccess)
+         nSum += this->pData[this->nCount-1].aValue * (nEnd - this->nMaxAccess);
+@@ -432,17 +432,17 @@ void ScBitMaskCompressedArray<A,D>::AndV
+     if (nStart > nEnd)
+         return;
+ 
+-    size_t nIndex = Search( nStart);
++    size_t nIndex = this->Search( nStart);
+     do
+     {
+         if ((this->pData[nIndex].aValue & rValueToAnd) != this->pData[nIndex].aValue)
+         {
+             A nS = ::std::max( (nIndex>0 ? this->pData[nIndex-1].nEnd+1 : 0), nStart);
+             A nE = ::std::min( this->pData[nIndex].nEnd, nEnd);
+-            SetValue( nS, nE, this->pData[nIndex].aValue & rValueToAnd);
++            this->SetValue( nS, nE, this->pData[nIndex].aValue & rValueToAnd);
+             if (nE >= nEnd)
+                 break;  // while
+-            nIndex = Search( nE + 1);
++            nIndex = this->Search( nE + 1);
+         }
+         else if (this->pData[nIndex].nEnd >= nEnd)
+             break;  // while
+@@ -459,17 +459,17 @@ void ScBitMaskCompressedArray<A,D>::OrVa
+     if (nStart > nEnd)
+         return;
+ 
+-    size_t nIndex = Search( nStart);
++    size_t nIndex = this->Search( nStart);
+     do
+     {
+         if ((this->pData[nIndex].aValue | rValueToOr) != this->pData[nIndex].aValue)
+         {
+             A nS = ::std::max( (nIndex>0 ? this->pData[nIndex-1].nEnd+1 : 0), nStart);
+             A nE = ::std::min( this->pData[nIndex].nEnd, nEnd);
+-            SetValue( nS, nE, this->pData[nIndex].aValue | rValueToOr);
++            this->SetValue( nS, nE, this->pData[nIndex].aValue | rValueToOr);
+             if (nE >= nEnd)
+                 break;  // while
+-            nIndex = Search( nE + 1);
++            nIndex = this->Search( nE + 1);
+         }
+         else if (this->pData[nIndex].nEnd >= nEnd)
+             break;  // while
+@@ -494,7 +494,7 @@ void ScBitMaskCompressedArray<A,D>::Copy
+         nRegionEnd -= nSourceDy;
+         if (nRegionEnd > nEnd)
+             nRegionEnd = nEnd;
+-        SetValue( j, nRegionEnd, rValue & rValueToAnd);
++        this->SetValue( j, nRegionEnd, rValue & rValueToAnd);
+         j = nRegionEnd;
+     }
+ }
+@@ -515,7 +515,7 @@ void ScBitMaskCompressedArray<A,D>::Copy
+         nRegionEnd -= nSourceDy;
+         if (nRegionEnd > nEnd)
+             nRegionEnd = nEnd;
+-        SetValue( j, nRegionEnd, rValue | rValueToOr);
++        this->SetValue( j, nRegionEnd, rValue | rValueToOr);
+         j = nRegionEnd;
+     }
+ }
+@@ -526,7 +526,7 @@ A ScBitMaskCompressedArray<A,D>::GetBitS
+         const D& rBitMask, const D& rMaskedCompare ) const
+ {
+     A nStart = ::std::numeric_limits<A>::max();
+-    size_t nIndex = Search( nEnd);
++    size_t nIndex = this->Search( nEnd);
+     while ((this->pData[nIndex].aValue & rBitMask) == rMaskedCompare)
+     {
+         if (nIndex > 0)
+@@ -549,7 +549,7 @@ A ScBitMaskCompressedArray<A,D>::GetBitS
+         const D& rBitMask, const D& rMaskedCompare ) const
+ {
+     A nEnd = ::std::numeric_limits<A>::max();
+-    size_t nIndex = Search( nStart);
++    size_t nIndex = this->Search( nStart);
+     while (nIndex < this->nCount && (this->pData[nIndex].aValue & rBitMask) ==
+             rMaskedCompare)
+     {
+@@ -564,7 +564,7 @@ template< typename A, typename D >
+ A ScBitMaskCompressedArray<A,D>::GetFirstForCondition( A nStart, A nEnd,
+         const D& rBitMask, const D& rMaskedCompare ) const
+ {
+-    size_t nIndex = Search( nStart);
++    size_t nIndex = this->Search( nStart);
+     do
+     {
+         if ((this->pData[nIndex].aValue & rBitMask) == rMaskedCompare)
+@@ -584,7 +584,7 @@ template< typename A, typename D >
+ A ScBitMaskCompressedArray<A,D>::GetLastForCondition( A nStart, A nEnd,
+         const D& rBitMask, const D& rMaskedCompare ) const
+ {
+-    size_t nIndex = Search( nEnd);
++    size_t nIndex = this->Search( nEnd);
+     while (1)
+     {
+         if ((this->pData[nIndex].aValue & rBitMask) == rMaskedCompare)
+@@ -608,7 +608,7 @@ A ScBitMaskCompressedArray<A,D>::CountFo
+         const D& rBitMask, const D& rMaskedCompare ) const
+ {
+     A nRet = 0;
+-    size_t nIndex = Search( nStart);
++    size_t nIndex = this->Search( nStart);
+     do
+     {
+         if ((this->pData[nIndex].aValue & rBitMask) == rMaskedCompare)
+@@ -631,7 +631,7 @@ size_t ScBitMaskCompressedArray<A,D>::Fi
+         A * pArray, size_t nArraySize ) const
+ {
+     size_t nUsed = 0;
+-    size_t nIndex = Search( nStart);
++    size_t nIndex = this->Search( nStart);
+     while (nIndex < this->nCount && nUsed < nArraySize)
+     {
+         if ((this->pData[nIndex].aValue & rBitMask) == rMaskedCompare)
+@@ -653,7 +653,7 @@ template< typename A, typename D >
+ bool ScBitMaskCompressedArray<A,D>::HasCondition( A nStart, A nEnd,
+         const D& rBitMask, const D& rMaskedCompare ) const
+ {
+-    size_t nIndex = Search( nStart);
++    size_t nIndex = this->Search( nStart);
+     do
+     {
+         if ((this->pData[nIndex].aValue & rBitMask) == rMaskedCompare)
+@@ -671,7 +671,7 @@ A ScBitMaskCompressedArray<A,D>::CountFo
+         const D& rBitMask ) const
+ {
+     A nRet = 0;
+-    size_t nIndex = Search( nStart);
++    size_t nIndex = this->Search( nStart);
+     do
+     {
+         if ((this->pData[nIndex].aValue & rBitMask) != 0)
+@@ -725,7 +725,7 @@ unsigned long ScBitMaskCompressedArray<A
+ {
+     unsigned long nSum = 0;
+     A nS = nStart;
+-    size_t nIndex1 = Search( nStart);
++    size_t nIndex1 = this->Search( nStart);
+     size_t nIndex2 = rArray.Search( nStart);
+     do
+     {
+@@ -759,7 +759,7 @@ unsigned long ScBitMaskCompressedArray<A
+ {
+     unsigned long nSum = 0;
+     A nS = nStart;
+-    size_t nIndex1 = Search( nStart);
++    size_t nIndex1 = this->Search( nStart);
+     size_t nIndex2 = rArray.Search( nStart);
+     do
+     {
diff --git a/misc/openoffice3/patches/patch-sc_source_filter_inc_ftools.hxx b/misc/openoffice3/patches/patch-sc_source_filter_inc_ftools.hxx
new file mode 100644
index 00000000000..4fc2c134157
--- /dev/null
+++ b/misc/openoffice3/patches/patch-sc_source_filter_inc_ftools.hxx
@@ -0,0 +1,21 @@
+$NetBSD: patch-sc_source_filter_inc_ftools.hxx,v 1.1 2013/04/01 12:19:14 joerg Exp $
+
+--- sc/source/filter/inc/ftools.hxx.orig	2013-03-30 20:20:33.000000000 +0000
++++ sc/source/filter/inc/ftools.hxx
+@@ -247,14 +247,14 @@ public:
+     /** Returns true, if the object accossiated to the passed key exists. */
+     inline bool         has( key_type nKey ) const
+                         {
+-                            typename map_type::const_iterator aIt = find( nKey );
++                            typename map_type::const_iterator aIt = this->find( nKey );
+                             return (aIt != this->end()) && aIt->second.is();
+                         }
+ 
+     /** Returns a reference to the object accossiated to the passed key, or 0 on error. */
+     inline ref_type     get( key_type nKey ) const
+                         {
+-                            typename map_type::const_iterator aIt = find( nKey );
++                            typename map_type::const_iterator aIt = this->find( nKey );
+                             if( aIt != this->end() ) return aIt->second;
+                             return ref_type();
+                         }
diff --git a/misc/openoffice3/patches/patch-sc_source_filter_inc_xeroot.hxx b/misc/openoffice3/patches/patch-sc_source_filter_inc_xeroot.hxx
new file mode 100644
index 00000000000..325e0fa2c1e
--- /dev/null
+++ b/misc/openoffice3/patches/patch-sc_source_filter_inc_xeroot.hxx
@@ -0,0 +1,13 @@
+$NetBSD: patch-sc_source_filter_inc_xeroot.hxx,v 1.1 2013/04/01 12:19:14 joerg Exp $
+
+--- sc/source/filter/inc/xeroot.hxx.orig	2013-03-30 20:15:20.000000000 +0000
++++ sc/source/filter/inc/xeroot.hxx
+@@ -159,7 +159,7 @@ private:
+     XclExpRootData::XclExpLinkMgrRef GetLocalLinkMgrRef() const;
+ 
+ private:
+-    mutable XclExpRootData& mrExpData;      /// Reference to the global export data struct.
++    XclExpRootData& mrExpData;      /// Reference to the global export data struct.
+ };
+ 
+ // ============================================================================
diff --git a/misc/openoffice3/patches/patch-sc_source_filter_inc_xiroot.hxx b/misc/openoffice3/patches/patch-sc_source_filter_inc_xiroot.hxx
new file mode 100644
index 00000000000..9aff24f1ac8
--- /dev/null
+++ b/misc/openoffice3/patches/patch-sc_source_filter_inc_xiroot.hxx
@@ -0,0 +1,13 @@
+$NetBSD: patch-sc_source_filter_inc_xiroot.hxx,v 1.1 2013/04/01 12:19:14 joerg Exp $
+
+--- sc/source/filter/inc/xiroot.hxx.orig	2013-03-30 20:09:09.000000000 +0000
++++ sc/source/filter/inc/xiroot.hxx
+@@ -193,7 +193,7 @@ public:
+     String              GetScAddInName( const String& rXclName ) const;
+ 
+ private:
+-    mutable XclImpRootData& mrImpData;      /// Reference to the global import data struct.
++    XclImpRootData& mrImpData;      /// Reference to the global import data struct.
+ };
+ 
+ // ============================================================================
diff --git a/misc/openoffice3/patches/patch-sc_source_filter_inc_xlroot.hxx b/misc/openoffice3/patches/patch-sc_source_filter_inc_xlroot.hxx
new file mode 100644
index 00000000000..9f781ce8bf6
--- /dev/null
+++ b/misc/openoffice3/patches/patch-sc_source_filter_inc_xlroot.hxx
@@ -0,0 +1,13 @@
+$NetBSD: patch-sc_source_filter_inc_xlroot.hxx,v 1.1 2013/04/01 12:19:14 joerg Exp $
+
+--- sc/source/filter/inc/xlroot.hxx.orig	2013-03-30 20:08:47.000000000 +0000
++++ sc/source/filter/inc/xlroot.hxx
+@@ -269,7 +269,7 @@ public:
+     inline void         IncCurrScTab() { ++mrData.mnScTab; }
+ 
+ private:
+-    mutable XclRootData& mrData;        /// Reference to the global data struct.
++    XclRootData& mrData;        /// Reference to the global data struct.
+ };
+ 
+ // ============================================================================
diff --git a/misc/openoffice3/patches/patch-sfx2_inc_sfx2_controlwrapper.hxx b/misc/openoffice3/patches/patch-sfx2_inc_sfx2_controlwrapper.hxx
new file mode 100644
index 00000000000..4fe5f9b35ce
--- /dev/null
+++ b/misc/openoffice3/patches/patch-sfx2_inc_sfx2_controlwrapper.hxx
@@ -0,0 +1,36 @@
+$NetBSD: patch-sfx2_inc_sfx2_controlwrapper.hxx,v 1.1 2013/04/01 12:19:14 joerg Exp $
+
+--- sfx2/inc/sfx2/controlwrapper.hxx.orig	2013-03-30 17:31:36.000000000 +0000
++++ sfx2/inc/sfx2/controlwrapper.hxx
+@@ -638,13 +638,13 @@ void MetricFieldWrapper< ValueT >::SetCo
+ template< typename ValueT >
+ ValueT ListBoxWrapper< ValueT >::GetControlValue() const
+ {
+-    return GetValueFromPos( this->GetControl().GetSelectEntryPos() );
++    return this->GetValueFromPos( this->GetControl().GetSelectEntryPos() );
+ }
+ 
+ template< typename ValueT >
+ void ListBoxWrapper< ValueT >::SetControlValue( ValueT nValue )
+ {
+-    USHORT nPos = GetPosFromValue( nValue );
++    USHORT nPos = this->GetPosFromValue( nValue );
+     if( nPos != this->GetNotFoundPos() )
+         this->GetControl().SelectEntryPos( nPos );
+ }
+@@ -654,13 +654,13 @@ void ListBoxWrapper< ValueT >::SetContro
+ template< typename ValueT >
+ ValueT ValueSetWrapper< ValueT >::GetControlValue() const
+ {
+-    return GetValueFromPos( this->GetControl().GetSelectItemId() );
++    return this->GetValueFromPos( this->GetControl().GetSelectItemId() );
+ }
+ 
+ template< typename ValueT >
+ void ValueSetWrapper< ValueT >::SetControlValue( ValueT nValue )
+ {
+-    USHORT nPos = GetPosFromValue( nValue );
++    USHORT nPos = this->GetPosFromValue( nValue );
+     if( nPos != this->GetNotFoundPos() )
+         this->GetControl().SelectItem( nPos );
+ }
diff --git a/misc/openoffice3/patches/patch-slideshow_source_inc_tools.hxx b/misc/openoffice3/patches/patch-slideshow_source_inc_tools.hxx
new file mode 100644
index 00000000000..65f7542fb23
--- /dev/null
+++ b/misc/openoffice3/patches/patch-slideshow_source_inc_tools.hxx
@@ -0,0 +1,37 @@
+$NetBSD: patch-slideshow_source_inc_tools.hxx,v 1.1 2013/04/01 12:19:14 joerg Exp $
+
+--- slideshow/source/inc/tools.hxx.orig	2013-03-30 17:16:12.000000000 +0000
++++ slideshow/source/inc/tools.hxx
+@@ -77,6 +77,16 @@ namespace slideshow
+         class ShapeAttributeLayer;
+ 
+         typedef ::boost::shared_ptr< GDIMetaFile > GDIMetaFileSharedPtr;
++        template <typename T>
++        inline ::std::size_t hash_value( T * const& p )
++        {
++            ::std::size_t d = static_cast< ::std::size_t >(
++                reinterpret_cast< ::std::ptrdiff_t >(p) );
++            return d + (d >> 3);
++        }
++
++        template <typename T>
++        inline ::std::size_t hash_value(::com::sun::star::uno::Reference<T> const& x );
+ 
+         // xxx todo: remove with boost::hash when 1.33 is available
+         template <typename T>
+@@ -86,14 +96,7 @@ namespace slideshow
+                 return hash_value(val);
+             }
+         };
+-        template <typename T>
+-        inline ::std::size_t hash_value( T * const& p )
+-        {
+-            ::std::size_t d = static_cast< ::std::size_t >(
+-                reinterpret_cast< ::std::ptrdiff_t >(p) );
+-            return d + (d >> 3);
+-        }
+-    
++
+         // xxx todo: shift to namespace com::sun::star::uno when
+         //           1.33 is available
+         template <typename T>
diff --git a/misc/openoffice3/patches/patch-sw_source_filter_ww8_writerhelper.hxx b/misc/openoffice3/patches/patch-sw_source_filter_ww8_writerhelper.hxx
new file mode 100644
index 00000000000..513d1d3d5eb
--- /dev/null
+++ b/misc/openoffice3/patches/patch-sw_source_filter_ww8_writerhelper.hxx
@@ -0,0 +1,15 @@
+$NetBSD: patch-sw_source_filter_ww8_writerhelper.hxx,v 1.1 2013/04/01 12:19:14 joerg Exp $
+
+--- sw/source/filter/ww8/writerhelper.hxx.orig	2013-03-30 19:42:21.000000000 +0000
++++ sw/source/filter/ww8/writerhelper.hxx
+@@ -248,8 +248,10 @@ namespace sw
+         template<class T> const T & item_cast(const SfxPoolItem &rItem)
+             throw(std::bad_cast)
+         {
++#if !defined(__GNUC__) || defined(__EXCEPTIONS__)
+             if (!rItem.IsA(STATICTYPE(T)))
+                 throw std::bad_cast();
++#endif
+             return static_cast<const T &>(rItem);
+         }
+ 
diff --git a/misc/openoffice3/patches/patch-toolkit_inc_toolkit_helper_servicenames.hxx b/misc/openoffice3/patches/patch-toolkit_inc_toolkit_helper_servicenames.hxx
new file mode 100644
index 00000000000..7892487ac35
--- /dev/null
+++ b/misc/openoffice3/patches/patch-toolkit_inc_toolkit_helper_servicenames.hxx
@@ -0,0 +1,143 @@
+$NetBSD: patch-toolkit_inc_toolkit_helper_servicenames.hxx,v 1.1 2013/04/01 12:19:14 joerg Exp $
+
+--- toolkit/inc/toolkit/helper/servicenames.hxx.orig	2013-03-30 22:15:11.000000000 +0000
++++ toolkit/inc/toolkit/helper/servicenames.hxx
+@@ -34,73 +34,73 @@
+ #include <sal/types.h>
+ #include <tools/solar.h>
+ 
+-extern const sal_Char __FAR_DATA szServiceName_Toolkit[], szServiceName2_Toolkit[];
+-extern const sal_Char __FAR_DATA szServiceName_MVCIntrospection[], szServiceName2_MVCIntrospection[];
+-extern const sal_Char __FAR_DATA szServiceName_PopupMenu[], szServiceName2_PopupMenu[];
+-extern const sal_Char __FAR_DATA szServiceName_MenuBar[], szServiceName2_MenuBar[];
+-extern const sal_Char __FAR_DATA szServiceName_Pointer[], szServiceName2_Pointer[];
+-extern const sal_Char __FAR_DATA szServiceName_UnoControlContainer[], szServiceName2_UnoControlContainer[];
+-extern const sal_Char __FAR_DATA szServiceName_UnoControlContainerModel[], szServiceName2_UnoControlContainerModel[];
+-extern const sal_Char __FAR_DATA szServiceName_TabController[], szServiceName2_TabController[];
+-extern const sal_Char __FAR_DATA szServiceName_TabControllerModel[], szServiceName2_TabControllerModel[];
+-extern const sal_Char __FAR_DATA szServiceName_UnoControlDialog[], szServiceName2_UnoControlDialog[];
+-extern const sal_Char __FAR_DATA szServiceName_UnoControlDialogModel[], szServiceName2_UnoControlDialogModel[];
+-extern const sal_Char __FAR_DATA szServiceName_UnoControlEdit[], szServiceName2_UnoControlEdit[];
+-extern const sal_Char __FAR_DATA szServiceName_UnoControlEditModel[], szServiceName2_UnoControlEditModel[];
+-extern const sal_Char __FAR_DATA szServiceName_UnoControlFileControl[], szServiceName2_UnoControlFileControl[];
+-extern const sal_Char __FAR_DATA szServiceName_UnoControlFileControlModel[], szServiceName2_UnoControlFileControlModel[];
+-extern const sal_Char __FAR_DATA szServiceName_UnoControlButton[], szServiceName2_UnoControlButton[];
+-extern const sal_Char __FAR_DATA szServiceName_UnoControlButtonModel[], szServiceName2_UnoControlButtonModel[];
+-extern const sal_Char __FAR_DATA szServiceName_UnoControlImageButton[], szServiceName2_UnoControlImageButton[];
+-extern const sal_Char __FAR_DATA szServiceName_UnoControlImageButtonModel[], szServiceName2_UnoControlImageButtonModel[];
+-extern const sal_Char __FAR_DATA szServiceName_UnoControlImageControl[], szServiceName2_UnoControlImageControl[];
+-extern const sal_Char __FAR_DATA szServiceName_UnoControlImageControlModel[], szServiceName2_UnoControlImageControlModel[];
+-extern const sal_Char __FAR_DATA szServiceName_UnoControlRadioButton[], szServiceName2_UnoControlRadioButton[];
+-extern const sal_Char __FAR_DATA szServiceName_UnoControlRadioButtonModel[], szServiceName2_UnoControlRadioButtonModel[];
+-extern const sal_Char __FAR_DATA szServiceName_UnoControlCheckBox[], szServiceName2_UnoControlCheckBox[];
+-extern const sal_Char __FAR_DATA szServiceName_UnoControlCheckBoxModel[], szServiceName2_UnoControlCheckBoxModel[];
+-extern const sal_Char __FAR_DATA szServiceName_UnoControlListBox[], szServiceName2_UnoControlListBox[];
+-extern const sal_Char __FAR_DATA szServiceName_UnoControlListBoxModel[], szServiceName2_UnoControlListBoxModel[];
+-extern const sal_Char __FAR_DATA szServiceName_UnoControlComboBox[], szServiceName2_UnoControlComboBox[];
+-extern const sal_Char __FAR_DATA szServiceName_UnoControlComboBoxModel[], szServiceName2_UnoControlComboBoxModel[];
+-extern const sal_Char __FAR_DATA szServiceName_UnoControlFixedText[], szServiceName2_UnoControlFixedText[];
+-extern const sal_Char __FAR_DATA szServiceName_UnoControlFixedTextModel[], szServiceName2_UnoControlFixedTextModel[];
+-extern const sal_Char __FAR_DATA szServiceName_UnoControlGroupBox[], szServiceName2_UnoControlGroupBox[];
+-extern const sal_Char __FAR_DATA szServiceName_UnoControlGroupBoxModel[], szServiceName2_UnoControlGroupBoxModel[];
+-extern const sal_Char __FAR_DATA szServiceName_UnoControlDateField[], szServiceName2_UnoControlDateField[];
+-extern const sal_Char __FAR_DATA szServiceName_UnoControlDateFieldModel[], szServiceName2_UnoControlDateFieldModel[];
+-extern const sal_Char __FAR_DATA szServiceName_UnoControlTimeField[], szServiceName2_UnoControlTimeField[];
+-extern const sal_Char __FAR_DATA szServiceName_UnoControlTimeFieldModel[], szServiceName2_UnoControlTimeFieldModel[];
+-extern const sal_Char __FAR_DATA szServiceName_UnoControlNumericField[], szServiceName2_UnoControlNumericField[];
+-extern const sal_Char __FAR_DATA szServiceName_UnoControlNumericFieldModel[], szServiceName2_UnoControlNumericFieldModel[];
+-extern const sal_Char __FAR_DATA szServiceName_UnoControlCurrencyField[], szServiceName2_UnoControlCurrencyField[];
+-extern const sal_Char __FAR_DATA szServiceName_UnoControlCurrencyFieldModel[], szServiceName2_UnoControlCurrencyFieldModel[];
+-extern const sal_Char __FAR_DATA szServiceName_UnoControlPatternField[], szServiceName2_UnoControlPatternField[];
+-extern const sal_Char __FAR_DATA szServiceName_UnoControlPatternFieldModel[], szServiceName2_UnoControlPatternFieldModel[];
+-extern const sal_Char __FAR_DATA szServiceName_UnoControlFormattedField[], szServiceName2_UnoControlFormattedField[];
+-extern const sal_Char __FAR_DATA szServiceName_UnoControlFormattedFieldModel[], szServiceName2_UnoControlFormattedFieldModel[];
+-extern const sal_Char __FAR_DATA szServiceName_UnoControlProgressBar[], szServiceName2_UnoControlProgressBar[];
+-extern const sal_Char __FAR_DATA szServiceName_UnoControlProgressBarModel[], szServiceName2_UnoControlProgressBarModel[];
+-extern const sal_Char __FAR_DATA szServiceName_UnoControlScrollBar[], szServiceName2_UnoControlScrollBar[];
+-extern const sal_Char __FAR_DATA szServiceName_UnoControlScrollBarModel[], szServiceName2_UnoControlScrollBarModel[];
+-extern const sal_Char __FAR_DATA szServiceName_UnoControlFixedLine[], szServiceName2_UnoControlFixedLine[];
+-extern const sal_Char __FAR_DATA szServiceName_UnoControlFixedLineModel[], szServiceName2_UnoControlFixedLineModel[];
+-extern const sal_Char __FAR_DATA szServiceName_PrinterServer[], szServiceName2_PrinterServer[];
+-extern const sal_Char __FAR_DATA szServiceName_UnoControlRoadmap[], szServiceName2_UnoControlRoadmap[];
+-extern const sal_Char __FAR_DATA szServiceName_UnoControlRoadmapModel[], szServiceName2_UnoControlRoadmapModel[];
+-
+-extern const sal_Char __FAR_DATA szServiceName_UnoSpinButtonControl[], szServiceName_UnoSpinButtonModel[];
+-
+-extern const sal_Char __FAR_DATA szServiceName_TreeControl[];
+-extern const sal_Char __FAR_DATA szServiceName_TreeControlModel[];
+-extern const sal_Char __FAR_DATA szServiceName_MutableTreeDataModel[];
+-
+-extern const sal_Char __FAR_DATA szServiceName_UnoSimpleAnimationControl[], szServiceName_UnoSimpleAnimationControlModel[];
+-extern const sal_Char __FAR_DATA szServiceName_UnoThrobberControl[], szServiceName_UnoThrobberControlModel[];
+-extern const sal_Char __FAR_DATA szServiceName_UnoControlFixedHyperlink[], szServiceName_UnoControlFixedHyperlinkModel[];
++extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_Toolkit[], szServiceName2_Toolkit[];
++extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_MVCIntrospection[], szServiceName2_MVCIntrospection[];
++extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_PopupMenu[], szServiceName2_PopupMenu[];
++extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_MenuBar[], szServiceName2_MenuBar[];
++extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_Pointer[], szServiceName2_Pointer[];
++extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlContainer[], szServiceName2_UnoControlContainer[];
++extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlContainerModel[], szServiceName2_UnoControlContainerModel[];
++extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_TabController[], szServiceName2_TabController[];
++extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_TabControllerModel[], szServiceName2_TabControllerModel[];
++extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlDialog[], szServiceName2_UnoControlDialog[];
++extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlDialogModel[], szServiceName2_UnoControlDialogModel[];
++extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlEdit[], szServiceName2_UnoControlEdit[];
++extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlEditModel[], szServiceName2_UnoControlEditModel[];
++extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlFileControl[], szServiceName2_UnoControlFileControl[];
++extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlFileControlModel[], szServiceName2_UnoControlFileControlModel[];
++extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlButton[], szServiceName2_UnoControlButton[];
++extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlButtonModel[], szServiceName2_UnoControlButtonModel[];
++extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlImageButton[], szServiceName2_UnoControlImageButton[];
++extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlImageButtonModel[], szServiceName2_UnoControlImageButtonModel[];
++extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlImageControl[], szServiceName2_UnoControlImageControl[];
++extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlImageControlModel[], szServiceName2_UnoControlImageControlModel[];
++extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlRadioButton[], szServiceName2_UnoControlRadioButton[];
++extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlRadioButtonModel[], szServiceName2_UnoControlRadioButtonModel[];
++extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlCheckBox[], szServiceName2_UnoControlCheckBox[];
++extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlCheckBoxModel[], szServiceName2_UnoControlCheckBoxModel[];
++extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlListBox[], szServiceName2_UnoControlListBox[];
++extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlListBoxModel[], szServiceName2_UnoControlListBoxModel[];
++extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlComboBox[], szServiceName2_UnoControlComboBox[];
++extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlComboBoxModel[], szServiceName2_UnoControlComboBoxModel[];
++extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlFixedText[], szServiceName2_UnoControlFixedText[];
++extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlFixedTextModel[], szServiceName2_UnoControlFixedTextModel[];
++extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlGroupBox[], szServiceName2_UnoControlGroupBox[];
++extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlGroupBoxModel[], szServiceName2_UnoControlGroupBoxModel[];
++extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlDateField[], szServiceName2_UnoControlDateField[];
++extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlDateFieldModel[], szServiceName2_UnoControlDateFieldModel[];
++extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlTimeField[], szServiceName2_UnoControlTimeField[];
++extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlTimeFieldModel[], szServiceName2_UnoControlTimeFieldModel[];
++extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlNumericField[], szServiceName2_UnoControlNumericField[];
++extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlNumericFieldModel[], szServiceName2_UnoControlNumericFieldModel[];
++extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlCurrencyField[], szServiceName2_UnoControlCurrencyField[];
++extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlCurrencyFieldModel[], szServiceName2_UnoControlCurrencyFieldModel[];
++extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlPatternField[], szServiceName2_UnoControlPatternField[];
++extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlPatternFieldModel[], szServiceName2_UnoControlPatternFieldModel[];
++extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlFormattedField[], szServiceName2_UnoControlFormattedField[];
++extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlFormattedFieldModel[], szServiceName2_UnoControlFormattedFieldModel[];
++extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlProgressBar[], szServiceName2_UnoControlProgressBar[];
++extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlProgressBarModel[], szServiceName2_UnoControlProgressBarModel[];
++extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlScrollBar[], szServiceName2_UnoControlScrollBar[];
++extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlScrollBarModel[], szServiceName2_UnoControlScrollBarModel[];
++extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlFixedLine[], szServiceName2_UnoControlFixedLine[];
++extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlFixedLineModel[], szServiceName2_UnoControlFixedLineModel[];
++extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_PrinterServer[], szServiceName2_PrinterServer[];
++extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlRoadmap[], szServiceName2_UnoControlRoadmap[];
++extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlRoadmapModel[], szServiceName2_UnoControlRoadmapModel[];
++
++extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoSpinButtonControl[], szServiceName_UnoSpinButtonModel[];
++
++extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_TreeControl[];
++extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_TreeControlModel[];
++extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_MutableTreeDataModel[];
++
++extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoSimpleAnimationControl[], szServiceName_UnoSimpleAnimationControlModel[];
++extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoThrobberControl[], szServiceName_UnoThrobberControlModel[];
++extern SAL_DLLPUBLIC_EXPORT const sal_Char __FAR_DATA szServiceName_UnoControlFixedHyperlink[], szServiceName_UnoControlFixedHyperlinkModel[];
+ 
+ // ExtUnoWrapper:
+-extern const char __FAR_DATA szServiceName_ImageProducer[], szServiceName2_ImageProducer[];
++extern SAL_DLLPUBLIC_EXPORT const char __FAR_DATA szServiceName_ImageProducer[], szServiceName2_ImageProducer[];
+ 
+ 
+