Author: hdu
Date: Fri Jan 3 12:53:52 2014
New Revision: 1555077
URL: http://svn.apache.org/r1555077
Log:
#i123963# remove type ambiguity in toolkit's VCLXDevice
Modified:
openoffice/trunk/main/toolkit/source/awt/forward.hxx
Modified: openoffice/trunk/main/toolkit/source/awt/forward.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/toolkit/source/awt/forward.hxx?rev=1555077&r1=1555076&r2=1555077&view=diff
==============================================================================
--- openoffice/trunk/main/toolkit/source/awt/forward.hxx (original)
+++ openoffice/trunk/main/toolkit/source/awt/forward.hxx Fri Jan 3 12:53:52
2014
@@ -59,11 +59,10 @@
return aReturn; \
}
-#if defined (_MSC_VER) && (_MSC_VER <= 1310)
-// Windows .Net2003 build fix
+// fix to remove a type ambiguity e.g.
+// class layoutimpl::VCLXDialog -> class VCLXWindow -> VCLXWindow_Base ->
class VCLXDevice -> ::cppu::OWeakObject
+// class layoutimpl::VCLXDialog -> class layoutimpl::Bin -> class
layoutimpl::Container -> Container_Base -> class cppu::OWeakObject
+// class layoutimpl::VCLXDialog -> class layoutimpl::Bin -> class
layoutimpl::Container -> class layoutimpl::PropHelper -> cppu::OWeakObjec
#define W3K_EXPLICIT_CAST(x) static_cast <XWindow2*> (&x)
-#else // !(defined (_MSC_VER) && (_MSC_VER <= 1310))
-#define W3K_EXPLICIT_CAST(x) x
-#endif // !(defined (_MSC_VER) && (_MSC_VER <= 1310))
#endif /* AWT_FORWARD_HXX */
