diff options
| author | Herbert Dürr <hdu@apache.org> | 2013-12-02 16:06:37 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-12-05 10:36:14 +0000 |
| commit | 461e0f9eaf9895ecd0eba67b35a4d2cec8a5e5c5 (patch) | |
| tree | 699e319ec551d6f70786f6806b9abb0743911fa3 /toolkit | |
| parent | 78ed89cebb2a8eaa9e9c480a92426c0070f4d3b6 (diff) | |
Resolves: #i123795# variable names should not confuse vcl...
Window and cocoa NSWindow types
VCL's Window type and Cocoa's NSWindow type are quite different.
Naming variables as if they were the same introduces gratuitous
complexity especially when debugging stacks where both types are used.
The names of NSView type variables have been adjusted too.
(cherry picked from commit 5e6120c21a979c05bc6b9297035e31a47b98b785)
Conflicts:
vcl/aqua/source/app/vclnsapp.mm
vcl/aqua/source/gdi/salgdi.cxx
vcl/aqua/source/gdi/salgdiutils.cxx
vcl/aqua/source/window/salframe.cxx
vcl/aqua/source/window/salobj.cxx
vcl/inc/vcl/sysdata.hxx
vcl/source/window/syschild.cxx
vcl/source/window/window.cxx
Change-Id: Ic4143dfddfa9502a529c871ac4ce0bea413b6ce9
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/source/awt/vclxsystemdependentwindow.cxx | 2 | ||||
| -rw-r--r-- | toolkit/source/awt/vclxtopwindow.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/toolkit/source/awt/vclxsystemdependentwindow.cxx b/toolkit/source/awt/vclxsystemdependentwindow.cxx index 3e55d30ad2c7..1579c02db8c0 100644 --- a/toolkit/source/awt/vclxsystemdependentwindow.cxx +++ b/toolkit/source/awt/vclxsystemdependentwindow.cxx @@ -82,7 +82,7 @@ IMPL_XTYPEPROVIDER_END #elif (defined MACOSX) if( SystemType == ::com::sun::star::lang::SystemDependent::SYSTEM_MAC ) { - aRet <<= (sal_IntPtr)pSysData->pView; + aRet <<= (sal_IntPtr)pSysData->mpNSView; } #elif (defined ANDROID) // Nothing diff --git a/toolkit/source/awt/vclxtopwindow.cxx b/toolkit/source/awt/vclxtopwindow.cxx index 28211f9b2416..d382d3fef5e4 100644 --- a/toolkit/source/awt/vclxtopwindow.cxx +++ b/toolkit/source/awt/vclxtopwindow.cxx @@ -94,7 +94,7 @@ Sequence< Type > VCLXTopWindow_Base::getTypes() throw(RuntimeException) #elif (defined MACOSX) if( SystemType == ::com::sun::star::lang::SystemDependent::SYSTEM_MAC ) { - aRet <<= (sal_IntPtr)pSysData->pView; + aRet <<= (sal_IntPtr)pSysData->mpNSView; } #elif (defined ANDROID) // Nothing |