From fee65f9d20da80cfbc7dc516c8a7e3f4560ce23a Mon Sep 17 00:00:00 2001 From: Chris Sherlock Date: Tue, 27 May 2014 00:22:06 +1000 Subject: [PATCH] vcl: rearrange function in window.cxx Change-Id: Icb7f692cdf03a77573379257b34400f38def71ec --- vcl/source/window/window.cxx | 49 ++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 659b9e2682a8..f16e6bd6cec4 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -1182,6 +1182,31 @@ void Window::ImplInitWindowData( WindowType nType ) mbEnableRTL = Application::GetSettings().GetLayoutRTL(); // true: this outdev will be mirrored if RTL window layout (UI mirroring) is globally active } +ImplWinData* Window::ImplGetWinData() const +{ + if ( !mpWindowImpl->mpWinData ) + { + static const char* pNoNWF = getenv( "SAL_NO_NWF" ); + + ((Window*)this)->mpWindowImpl->mpWinData = new ImplWinData; + mpWindowImpl->mpWinData->mpExtOldText = NULL; + mpWindowImpl->mpWinData->mpExtOldAttrAry = NULL; + mpWindowImpl->mpWinData->mpCursorRect = NULL; + mpWindowImpl->mpWinData->mnCursorExtWidth = 0; + mpWindowImpl->mpWinData->mpCompositionCharRects = NULL; + mpWindowImpl->mpWinData->mnCompositionCharRects = 0; + mpWindowImpl->mpWinData->mpFocusRect = NULL; + mpWindowImpl->mpWinData->mpTrackRect = NULL; + mpWindowImpl->mpWinData->mnTrackFlags = 0; + mpWindowImpl->mpWinData->mnIsTopWindow = (sal_uInt16) ~0; // not initialized yet, 0/1 will indicate TopWindow (see IsTopWindow()) + mpWindowImpl->mpWinData->mbMouseOver = false; + mpWindowImpl->mpWinData->mbEnableNativeWidget = (pNoNWF && *pNoNWF) ? false : true; // true: try to draw this control with native theme API + } + + return mpWindowImpl->mpWinData; +} + + void Window::CopyDeviceArea( SalTwoRect& aPosAry, sal_uInt32 nFlags ) { if (aPosAry.mnSrcWidth == 0 || aPosAry.mnSrcHeight == 0 || aPosAry.mnDestWidth == 0 || aPosAry.mnDestHeight == 0) @@ -1263,30 +1288,6 @@ bool ImplDoTiledRendering() #endif } -ImplWinData* Window::ImplGetWinData() const -{ - if ( !mpWindowImpl->mpWinData ) - { - static const char* pNoNWF = getenv( "SAL_NO_NWF" ); - - ((Window*)this)->mpWindowImpl->mpWinData = new ImplWinData; - mpWindowImpl->mpWinData->mpExtOldText = NULL; - mpWindowImpl->mpWinData->mpExtOldAttrAry = NULL; - mpWindowImpl->mpWinData->mpCursorRect = NULL; - mpWindowImpl->mpWinData->mnCursorExtWidth = 0; - mpWindowImpl->mpWinData->mpCompositionCharRects = NULL; - mpWindowImpl->mpWinData->mnCompositionCharRects = 0; - mpWindowImpl->mpWinData->mpFocusRect = NULL; - mpWindowImpl->mpWinData->mpTrackRect = NULL; - mpWindowImpl->mpWinData->mnTrackFlags = 0; - mpWindowImpl->mpWinData->mnIsTopWindow = (sal_uInt16) ~0; // not initialized yet, 0/1 will indicate TopWindow (see IsTopWindow()) - mpWindowImpl->mpWinData->mbMouseOver = false; - mpWindowImpl->mpWinData->mbEnableNativeWidget = (pNoNWF && *pNoNWF) ? false : true; // true: try to draw this control with native theme API - } - - return mpWindowImpl->mpWinData; -} - SalGraphics* Window::ImplGetFrameGraphics() const { if ( mpWindowImpl->mpFrameWindow->mpGraphics )