diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-03-12 13:43:31 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-03-12 13:47:33 +0200 |
| commit | ecdd44e8f577e51e0208e9f421704a70041f1be8 (patch) | |
| tree | 5dff0ddfe4796f698065d7346e0febff7882c778 /desktop/win32 | |
| parent | fix packaging of Pymailmerge (diff) | |
| download | core-ecdd44e8f577e51e0208e9f421704a70041f1be8.tar.gz core-ecdd44e8f577e51e0208e9f421704a70041f1be8.zip | |
Use symbolic names instead of magic literal constants
We use tons of plain C-style #defines to give symbolic names to constants all
over the place already, in headers used from C++ code only. So why in this
rare case where the symbolic names for some constants actually would be needed
from a C source file, too, here then we define them inside a C++ class?
Change-Id: I45726fe42687779724c45a1e2b118cc7a1debcf1
Diffstat (limited to 'desktop/win32')
| -rw-r--r-- | desktop/win32/source/officeloader/officeloader.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/desktop/win32/source/officeloader/officeloader.cxx b/desktop/win32/source/officeloader/officeloader.cxx index 527125f14a8a..69ec7f826e7b 100644 --- a/desktop/win32/source/officeloader/officeloader.cxx +++ b/desktop/win32/source/officeloader/officeloader.cxx @@ -43,7 +43,7 @@ #include "rtl/string.h" #include <sal/macros.h> -#include "../../../source/inc/exithelper.hxx" +#include "../../../source/inc/exithelper.h" #include "../extendloaderenvironment.hxx" #define PIPE_PREFIX TEXT("\\\\.\\pipe\\OSL_PIPE_") @@ -340,7 +340,7 @@ int WINAPI _tWinMain( HINSTANCE, HINSTANCE, LPTSTR, int ) lpCommandLine, MY_STRING(L"\"")); p = desktop_win32::commandLineAppend(p, argv[0]); for (int i = 1; i < argc; ++i) { - if (bFirst || ::desktop::ExitHelper::E_NORMAL_RESTART == dwExitCode || wcsncmp(argv[i], MY_STRING(L"-env:")) == 0) { + if (bFirst || EXITHELPER_NORMAL_RESTART == dwExitCode || wcsncmp(argv[i], MY_STRING(L"-env:")) == 0) { p = desktop_win32::commandLineAppend(p, MY_STRING(L"\" \"")); p = desktop_win32::commandLineAppend(p, argv[i]); } @@ -427,7 +427,7 @@ int WINAPI _tWinMain( HINSTANCE, HINSTANCE, LPTSTR, int ) CloseHandle( aProcessInfo.hThread ); } } while ( fSuccess - && ( ::desktop::ExitHelper::E_CRASH_WITH_RESTART == dwExitCode || ::desktop::ExitHelper::E_NORMAL_RESTART == dwExitCode )); + && ( EXITHELPER_CRASH_WITH_RESTART == dwExitCode || EXITHELPER_NORMAL_RESTART == dwExitCode )); delete[] lpCommandLine; return fSuccess ? dwExitCode : -1; |