diff options
| author | Oliver Bolte <obo@openoffice.org> | 2008-10-10 13:02:43 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2008-10-10 13:02:43 +0000 |
| commit | a3458db24dc4688fcca14242917ec3bd62a6adcb (patch) | |
| tree | b902384544d6fb83961786eae1fdc3554475ce1e /desktop | |
| parent | 7f0a1dea69541e73a8a38da7906a65aad63c8902 (diff) | |
CWS-TOOLING: integrate CWS cmcfixes49
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/app/officeipcthread.cxx | 4 | ||||
| -rw-r--r-- | desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx | 6 | ||||
| -rw-r--r-- | desktop/source/pkgchk/unopkg/unopkg_app.cxx | 4 |
3 files changed, 8 insertions, 6 deletions
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx index 6965b0264c00..8798710f9abd 100644 --- a/desktop/source/app/officeipcthread.cxx +++ b/desktop/source/app/officeipcthread.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: officeipcthread.cxx,v $ - * $Revision: 1.62 $ + * $Revision: 1.62.44.1 $ * * This file is part of OpenOffice.org. * @@ -885,7 +885,7 @@ void SAL_CALL OfficeIPCThread::run() nBytes = 0; while ( (nResult = maStreamPipe.send(sc_aConfirmationSequence+nBytes, sc_nCSeqLength-nBytes))>0 && - ((nBytes += nResult) < sc_nCSeqLength) ); + ((nBytes += nResult) < sc_nCSeqLength) ) ; // now we can close, don't we? // maStreamPipe.close(); diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx index a74fe7b41e35..9c755354fbf6 100644 --- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx +++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: dp_gui_updateinstalldialog.hxx,v $ - * $Revision: 1.4 $ + * $Revision: 1.4.126.1 $ * * This file is part of OpenOffice.org. * @@ -55,7 +55,9 @@ namespace com { namespace sun { namespace star { namespace xml { namespace xpath }}}}} class Window; -class ::osl::Condition; +namespace osl { + class Condition; +} namespace dp_gui { diff --git a/desktop/source/pkgchk/unopkg/unopkg_app.cxx b/desktop/source/pkgchk/unopkg/unopkg_app.cxx index b079a6b61c89..805ea3ea7d00 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_app.cxx +++ b/desktop/source/pkgchk/unopkg/unopkg_app.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: unopkg_app.cxx,v $ - * $Revision: 1.14 $ + * $Revision: 1.14.58.1 $ * * This file is part of OpenOffice.org. * @@ -252,7 +252,7 @@ extern "C" int unopkg_main() return 0; } //consume all bootstrap variables which may occur before the subcommannd - while(isBootstrapVariable(&nPos)); + while(isBootstrapVariable(&nPos)) ; if(nPos >= nCount) return 0; |