ooo-build r14970 - in trunk: . patches/dev300

[tml svn gnome org]

Author: tml
Date: Tue Dec 30 11:31:21 2008
New Revision: 14970
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14970&view=rev

Log:
2008-12-30  Tor Lillqvist  <tml novell com>

	Merge from opensuse-11-1 branch, presumably needed here, too:

	* patches/dev300/layoutdialogs2-development.diff
	(toolkit/source/layout/core/container.hxx): Mark the Container
	class TOOLKIT_DLLPUBLIC so that sfx2 builds on Win32 without an
	undefined reference to public: virtual bool __thiscall
	layoutimpl::Container::emptyVisible(void).



Modified:
   trunk/ChangeLog
   trunk/patches/dev300/layoutdialogs2-development.diff

Modified: trunk/patches/dev300/layoutdialogs2-development.diff
==============================================================================
--- trunk/patches/dev300/layoutdialogs2-development.diff	(original)
+++ trunk/patches/dev300/layoutdialogs2-development.diff	Tue Dec 30 11:31:21 2008
@@ -585,6 +585,15 @@
 index 5cac33d..71fba80 100644
 --- toolkit/source/layout/core/container.hxx
 +++ toolkit/source/layout/core/container.hxx
+@@ -44,7 +44,7 @@
+ typedef ::cppu::WeakImplHelper2< css::awt::XLayoutContainer,
+                                  css::awt::XLayoutConstrains > Container_Base;
+ 
+-class Container : public Container_Base, public PropHelper, public PropHelper::Listener
++class TOOLKIT_DLLPUBLIC Container : public Container_Base, public PropHelper, public PropHelper::Listener
+ {
+     friend class ChildProps;
+ protected:
 @@ -73,6 +73,8 @@ public:
      Container();
      virtual ~Container() {}