summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@collabora.com>2014-01-22 09:44:09 +0100
committerJan Holesovsky <kendy@collabora.com>2014-01-22 09:48:37 +0100
commit0ff31c26f3ebbad1d61c7033e946a287e3910bae (patch)
treea283f85fa940eb467a86f5c1a4159dadddf491e9
parent92414c42cdd03d4eda5dbb4fe1a95cfe1ce3e7e9 (diff)
Make the casting work on Windows too.
Fixes CppunitTest_starmath_qa_cppunit on Windows. Change-Id: I3fd73db1ebb70ac19f99bc3e337b1a8107486ae7
-rw-r--r--framework/source/services/frame.cxx7
1 files changed, 4 insertions, 3 deletions
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx
index 230707cea74b..54850af505bf 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -129,7 +129,9 @@ enum EActiveState
@devstatus ready to use
@threadsafe yes
*//*-*************************************************************************************************************/
-class Frame : // interfaces
+class Frame :
+ public ::cppu::OWeakObject , // helper implements XInterface, XWeak
+ // interfaces
public css::lang::XTypeProvider ,
public css::lang::XServiceInfo ,
public css::frame::XFrame2 ,
@@ -145,8 +147,7 @@ class Frame : // interfaces
// Order is necessary for right initialization of this class!
public ThreadHelpBase ,
public TransactionBase ,
- public PropertySetHelper , // helper implements ThreadHelpbase, TransactionBase, XPropertySet, XPropertySetInfo
- public ::cppu::OWeakObject // helper implements XInterface, XWeak
+ public PropertySetHelper // helper implements ThreadHelpbase, TransactionBase, XPropertySet, XPropertySetInfo
{
public: