diff options
| author | Mikhail Voytenko <mav@openoffice.org> | 2011-01-24 17:13:39 +0100 |
|---|---|---|
| committer | Mikhail Voytenko <mav@openoffice.org> | 2011-01-24 17:13:39 +0100 |
| commit | dbd2d1c834a1ce7eb1a15c5f14890a3937d0a957 (patch) | |
| tree | f7b06c651a37b0f03981352353e3de25f67eb66a | |
| parent | b55473cd10240c7ae3c8b4dbc34fbd44146f4a87 (diff) | |
removetooltypes01: #i112600# adjust rebase for windows
| -rw-r--r-- | desktop/source/app/app.cxx | 2 | ||||
| -rw-r--r-- | desktop/source/deployment/registry/help/dp_help.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 2e1ab6ef2d84..a1a399af81c4 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -1988,7 +1988,7 @@ void Desktop::doShutdown() FlushConfiguration(); // The acceptors in the AcceptorMap must be released (in DeregisterServices) // with the solar mutex unlocked, to avoid deadlock: - ULONG nAcquireCount = Application::ReleaseSolarMutex(); + sal_uLong nAcquireCount = Application::ReleaseSolarMutex(); DeregisterServices(); Application::AcquireSolarMutex(nAcquireCount); tools::DeInitTestToolLib(); diff --git a/desktop/source/deployment/registry/help/dp_help.cxx b/desktop/source/deployment/registry/help/dp_help.cxx index 0adb63614828..025cbd36cf7d 100644 --- a/desktop/source/deployment/registry/help/dp_help.cxx +++ b/desktop/source/deployment/registry/help/dp_help.cxx @@ -547,7 +547,7 @@ void BackendImpl::implProcessHelp( if( !bSuccess ) { - USHORT nErrStrId = 0; + sal_uInt16 nErrStrId = 0; switch( aErrorInfo.m_eErrorClass ) { case HELPPROCESSING_GENERAL_ERROR: |