diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-07-06 12:47:10 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-07-06 12:49:15 +0100 |
| commit | 2c0693606be909a0e6b78899d9c7b8f56a62dfe6 (patch) | |
| tree | 71acae5bbc2266d79f2b97b5b38f524e9208a88f /framework/inc/uielement | |
| parent | 5b2d6eb1bfba3a76cd030419b61daf335105adc0 (diff) | |
Resolves: fdo#34450 long/int mix causes 32bit LONG_MAX to be 64bit -1
long/int mix causes 32bit LONG_MAX to be interpreted as 64bit -1
Lets just use awt::Point/awt::Size throughout, which simplifies a lot of this
as well as fixing the above
Diffstat (limited to 'framework/inc/uielement')
| -rw-r--r-- | framework/inc/uielement/uielement.hxx | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/framework/inc/uielement/uielement.hxx b/framework/inc/uielement/uielement.hxx index ab8ba13fc970..501189ea91be 100644 --- a/framework/inc/uielement/uielement.hxx +++ b/framework/inc/uielement/uielement.hxx @@ -42,6 +42,8 @@ #include <com/sun/star/ui/XUIElement.hpp> #include <com/sun/star/ui/DockingArea.hpp> +#include <com/sun/star/awt/Point.hpp> +#include <com/sun/star/awt/Size.hpp> //_________________________________________________________________________________________________________________ // other includes @@ -59,24 +61,24 @@ namespace framework struct DockedData { - DockedData() : m_aPos( LONG_MAX, LONG_MAX ), + DockedData() : m_aPos( SAL_MAX_INT32, SAL_MAX_INT32 ), m_nDockedArea( ::com::sun::star::ui::DockingArea_DOCKINGAREA_TOP ), m_bLocked( false ) {} - Point m_aPos; - Size m_aSize; + com::sun::star::awt::Point m_aPos; + com::sun::star::awt::Size m_aSize; sal_Int16 m_nDockedArea; bool m_bLocked; }; struct FloatingData { - FloatingData() : m_aPos( LONG_MAX, LONG_MAX ), + FloatingData() : m_aPos( SAL_MAX_INT32, SAL_MAX_INT32 ), m_nLines( 1 ), m_bIsHorizontal( true ) {} - Point m_aPos; - Size m_aSize; + com::sun::star::awt::Point m_aPos; + com::sun::star::awt::Size m_aSize; sal_Int16 m_nLines; bool m_bIsHorizontal; }; |