diff options
| author | Oliver Bolte <obo@openoffice.org> | 2009-03-05 12:59:42 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2009-03-05 12:59:42 +0000 |
| commit | ff4cbc080657259f22844d872e02722a804513bb (patch) | |
| tree | dc42e5b4e90e540244a4480f449e14b44555d357 /desktop/win32/source/guistdio | |
| parent | 60f04aebe63d2fb9b5f72ad681c444bd5c987214 (diff) | |
CWS-TOOLING: integrate CWS jl117_DEV300
2009-02-18 16:23:55 +0100 kso r268240 : #i98983# - auto extension fix.
2009-02-16 15:33:04 +0100 jl r267821 : #i99249# conflict resolution error, unopkg hangs
2009-02-13 15:19:16 +0100 jl r267723 : #i99068# regression: extension description from manifest.xml was not displayed
Diffstat (limited to 'desktop/win32/source/guistdio')
| -rw-r--r-- | desktop/win32/source/guistdio/guistdio.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/desktop/win32/source/guistdio/guistdio.inc b/desktop/win32/source/guistdio/guistdio.inc index c8170e694844..6ee59c891bf0 100644 --- a/desktop/win32/source/guistdio/guistdio.inc +++ b/desktop/win32/source/guistdio/guistdio.inc @@ -361,7 +361,7 @@ int _tmain( int, _TCHAR ** ) hErrorThread }; - #ifdef GUISTDIO_KEEPRUNNING + #ifdef UNOPKG dwWaitResult = WaitForMultipleObjects( elementsof(hObjects), hObjects, TRUE, INFINITE ); #else bool bDetach = false; |