From e71dd58cbb6cbcf4d032db73982239badeeabf22 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Tue, 23 Aug 2011 15:17:16 +0200 Subject: recreated tag libreoffice-3.3.0.4 which had these commits: commit 0fce58acaa20c2e3cd99690e41da991380a0a1a9 (tag: refs/tags/libreoffice-3.3.0.4, refs/remotes/origin/libreoffice-3-3-0) Author: Petr Mladek Date: Tue Jan 18 19:01:20 2011 +0100 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Version 3.3.0.4, tag libreoffice-3.3.0.4 (3.3-rc4) commit 6fc21aa74b4d2aba07d854d5d3c2f404905b40ef Author: Tor Lillqvist Date: Tue Jan 18 16:25:52 2011 +0200 Avoid GetHelpText() call which can be quite heavy GetHelpText() can cause a quite heavy sequence of file and directory lookups. See fdo#33088. As its return value here was just passed on to ShowHelpStatusText() which doesn't do anything at all, it was completely unnecessary. The GetHelpText() calls here caused the noticeable slowdown in highlighting menu items on Windows with lots of localised help files for some bundled extensions. Signed-off-by: Caolan McNamara Signed-off-by: Michael Meeks Signed-off-by: Thorsten Behrens Signed-off-by: fstrba@novell.com vcl/source/window/menu.cxx | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) commit 3c2e3b6efc81c5e34c56f0f11723ed848801be35 Author: Luboš Luňák Date: Tue Jan 18 13:11:00 2011 +0100 do not mix unrelated X11 Visuals (fdo#33108) Do not assume that there is just one generic Visual, as today's XServers are ARGB-capable and cases of both the default depth and 32bit visuals can happen. Signed-off-by: Thorsten Behrens Signed-off-by: Radek Doulik Signed-off-by: Michael Meeks vcl/unx/inc/salgdi.h | 2 +- vcl/unx/source/gdi/salgdi.cxx | 17 ++++++++--------- vcl/unx/source/gdi/salgdi3.cxx | 8 -------- 3 files changed, 9 insertions(+), 18 deletions(-) commit 1c9c9180b4105626e9242e5499b67180abf4a53c Author: Andre Fischer Date: Tue Jan 18 10:41:22 2011 +0100 calc65: #i116318# Fixed the painting of axial gradients. Signed-off-by: Thorsten Behrens (cherry picked from commit ea29f32bd5bc1a937a747bd5a1f5b37f570ed25f) Signed-off-by: Michael Meeks Signed-off-by: Petr Mladek Signed-off-by: Radek Doulik cppcanvas/source/mtfrenderer/implrenderer.cxx | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) commit 94ba0c5b10f8089dc549e9fc4f3085622cff65c4 Author: Luboš Luňák Date: Wed Nov 3 15:17:33 2010 +0100 use sane scrollbar sizes when drawing bnc#619772 leads to a crash because maximum = minimum = 0, and this strange (but for whatever reason needed) '- mnVisibleSize' hack makes maximum be -1, eventually leading to a crash vcl/unx/kde4/KDESalGraphics.cxx | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit 4831d49751fd5aa81901cfc0402311ff2d700056 Author: Petr Mladek Date: Tue Jan 11 22:59:37 2011 +0100 Branch libreoffice-3-3-0 This is 'libreoffice-3-3-0' - the stable branch for the 3.3.0 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.3.x release, please use the 'libreoffice-3-3' branch. If you want to build something cool, unstable, and risky, use master. --- vcl/source/app/timer.cxx | 78 ++++++++++++++++++++++++------------------------ 1 file changed, 39 insertions(+), 39 deletions(-) (limited to 'vcl/source/app/timer.cxx') diff --git a/vcl/source/app/timer.cxx b/vcl/source/app/timer.cxx index 7749aa8ba0de..80b1f1047e63 100644 --- a/vcl/source/app/timer.cxx +++ b/vcl/source/app/timer.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,7 +42,7 @@ // ======================================================================= -#define MAX_TIMER_PERIOD ((ULONG)0xFFFFFFFF) +#define MAX_TIMER_PERIOD ((ULONG)0xFFFFFFFF) // --------------------- // - TimeManager-Types - @@ -50,20 +50,20 @@ struct ImplTimerData { - ImplTimerData* mpNext; // Pointer to the next Instance - Timer* mpSVTimer; // Pointer to SV Timer instance - ULONG mnUpdateTime; // Last Update Time - ULONG mnTimerUpdate; // TimerCallbackProcs on stack - BOOL mbDelete; // Wurde Timer waehren Update() geloescht - BOOL mbInTimeout; // Befinden wir uns im Timeout-Handler + ImplTimerData* mpNext; // Pointer to the next Instance + Timer* mpSVTimer; // Pointer to SV Timer instance + ULONG mnUpdateTime; // Last Update Time + ULONG mnTimerUpdate; // TimerCallbackProcs on stack + BOOL mbDelete; // Wurde Timer waehren Update() geloescht + BOOL mbInTimeout; // Befinden wir uns im Timeout-Handler }; // ======================================================================= void Timer::ImplDeInitTimer() { - ImplSVData* pSVData = ImplGetSVData(); - ImplTimerData* pTimerData = pSVData->mpFirstTimerData; + ImplSVData* pSVData = ImplGetSVData(); + ImplTimerData* pTimerData = pSVData->mpFirstTimerData; if ( pTimerData ) { @@ -80,8 +80,8 @@ void Timer::ImplDeInitTimer() } while ( pTimerData ); - pSVData->mpFirstTimerData = NULL; - pSVData->mnTimerPeriod = 0; + pSVData->mpFirstTimerData = NULL; + pSVData->mnTimerPeriod = 0; delete pSVData->mpSalTimer; pSVData->mpSalTimer = NULL; } @@ -105,12 +105,12 @@ static void ImplStartTimer( ImplSVData* pSVData, ULONG nMS ) void Timer::ImplTimerCallbackProc() { - ImplSVData* pSVData = ImplGetSVData(); - ImplTimerData* pTimerData; - ImplTimerData* pPrevTimerData; - ULONG nMinPeriod = MAX_TIMER_PERIOD; - ULONG nDeltaTime; - ULONG nTime = Time::GetSystemTicks(); + ImplSVData* pSVData = ImplGetSVData(); + ImplTimerData* pTimerData; + ImplTimerData* pPrevTimerData; + ULONG nMinPeriod = MAX_TIMER_PERIOD; + ULONG nDeltaTime; + ULONG nTime = Time::GetSystemTicks(); if ( pSVData->mbNoCallTimer ) return; @@ -220,21 +220,21 @@ void Timer::ImplTimerCallbackProc() Timer::Timer() { - mpTimerData = NULL; - mnTimeout = 1; - mbAuto = FALSE; - mbActive = FALSE; + mpTimerData = NULL; + mnTimeout = 1; + mbAuto = FALSE; + mbActive = FALSE; } // ----------------------------------------------------------------------- Timer::Timer( const Timer& rTimer ) { - mpTimerData = NULL; - mnTimeout = rTimer.mnTimeout; - mbAuto = FALSE; - mbActive = FALSE; - maTimeoutHdl = rTimer.maTimeoutHdl; + mpTimerData = NULL; + mnTimeout = rTimer.mnTimeout; + mbAuto = FALSE; + mbActive = FALSE; + maTimeoutHdl = rTimer.maTimeoutHdl; if ( rTimer.IsActive() ) Start(); @@ -293,12 +293,12 @@ void Timer::Start() } // insert timer and start - mpTimerData = new ImplTimerData; - mpTimerData->mpSVTimer = this; - mpTimerData->mnUpdateTime = Time::GetSystemTicks(); - mpTimerData->mnTimerUpdate = pSVData->mnTimerUpdate; - mpTimerData->mbDelete = FALSE; - mpTimerData->mbInTimeout = FALSE; + mpTimerData = new ImplTimerData; + mpTimerData->mpSVTimer = this; + mpTimerData->mnUpdateTime = Time::GetSystemTicks(); + mpTimerData->mnTimerUpdate = pSVData->mnTimerUpdate; + mpTimerData->mbDelete = FALSE; + mpTimerData->mbInTimeout = FALSE; // !!!!! Wegen SFX hinten einordnen !!!!! ImplTimerData* pPrev = NULL; @@ -323,9 +323,9 @@ void Timer::Start() } else { - mpTimerData->mnUpdateTime = Time::GetSystemTicks(); - mpTimerData->mnTimerUpdate = pSVData->mnTimerUpdate; - mpTimerData->mbDelete = FALSE; + mpTimerData->mnUpdateTime = Time::GetSystemTicks(); + mpTimerData->mnTimerUpdate = pSVData->mnTimerUpdate; + mpTimerData->mbDelete = FALSE; } } @@ -346,9 +346,9 @@ Timer& Timer::operator=( const Timer& rTimer ) if ( IsActive() ) Stop(); - mbActive = FALSE; - mnTimeout = rTimer.mnTimeout; - maTimeoutHdl = rTimer.maTimeoutHdl; + mbActive = FALSE; + mnTimeout = rTimer.mnTimeout; + maTimeoutHdl = rTimer.maTimeoutHdl; if ( rTimer.IsActive() ) Start(); -- cgit v1.2.3