From 2140dea1413c9ef8e6e35409a15b0a3ea7149e67 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 17 May 2019 19:39:45 +0100 Subject: split width/height to allow intercept of how width is calculated MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit in order to possibly get width on demand Change-Id: I1e6fcb6849705f2b166821516ebe72b179e00ee7 Reviewed-on: https://gerrit.libreoffice.org/72513 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- sw/source/uibase/utlui/content.cxx | 2 +- sw/source/uibase/utlui/glbltree.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'sw/source/uibase') diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx index 7ef2e0e48f93..2425ed1b079c 100644 --- a/sw/source/uibase/utlui/content.cxx +++ b/sw/source/uibase/utlui/content.cxx @@ -3031,7 +3031,7 @@ void SwContentTree::RequestHelp( const HelpEvent& rHEvt ) aPos = GetEntryPosition( pEntry ); aPos.setX( GetTabPos( pEntry, pTab ) ); - Size aSize( pItem->GetSize( this, pEntry ) ); + Size aSize(pItem->GetWidth(this, pEntry), pItem->GetHeight(this, pEntry)); if((aPos.X() + aSize.Width()) > GetSizePixel().Width()) aSize.setWidth( GetSizePixel().Width() - aPos.X() ); diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx index 13ec358cd0f7..df5d5656ab41 100644 --- a/sw/source/uibase/utlui/glbltree.cxx +++ b/sw/source/uibase/utlui/glbltree.cxx @@ -505,7 +505,7 @@ void SwGlobalTree::RequestHelp( const HelpEvent& rHEvt ) Point aEntryPos = GetEntryPosition( pEntry ); aEntryPos.setX( GetTabPos( pEntry, pTab ) ); - Size aSize( pItem->GetSize( this, pEntry ) ); + Size aSize(pItem->GetWidth(this, pEntry), pItem->GetHeight(this, pEntry)); if((aEntryPos.X() + aSize.Width()) > GetSizePixel().Width()) aSize.setWidth( GetSizePixel().Width() - aEntryPos.X() ); -- cgit