diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2011-12-15 14:03:01 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-01-06 08:32:19 +0100 |
| commit | 58fb44a30df863d4ee1c4eb6931d9d15947187a1 (patch) | |
| tree | efc1277ec9539aaf5607d43836eb82b4d807db1a /desktop | |
| parent | a6dc4b7a1e2fcbe478bc7feae06bc9ff24b26aaf (diff) | |
gcc-trunk: fix error: unable to find string literal operator 'operator"" FOO'
Signed-off-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/migration/services/jvmfwk.cxx | 2 | ||||
| -rw-r--r-- | desktop/source/pkgchk/unopkg/unopkg_app.cxx | 8 | ||||
| -rw-r--r-- | desktop/unx/splash/unxsplash.cxx | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/desktop/source/migration/services/jvmfwk.cxx b/desktop/source/migration/services/jvmfwk.cxx index 31aef9fa58f0..f7022ce1e2ec 100644 --- a/desktop/source/migration/services/jvmfwk.cxx +++ b/desktop/source/migration/services/jvmfwk.cxx @@ -327,7 +327,7 @@ void JavaMigration::migrateJavarc() return; OUString sValue; - rtl::Bootstrap javaini(m_sUserDir + OUSTR("/user/config/"SAL_CONFIGFILE("java"))); + rtl::Bootstrap javaini(m_sUserDir + OUSTR( "/user/config/" SAL_CONFIGFILE("java") )); sal_Bool bSuccess = javaini.getFrom(OUSTR("Home"), sValue); OSL_ENSURE(bSuccess, "[Service implementation " IMPL_NAME "] XJob::execute: Could not get Home entry from java.ini/javarc."); diff --git a/desktop/source/pkgchk/unopkg/unopkg_app.cxx b/desktop/source/pkgchk/unopkg/unopkg_app.cxx index 9194ae89c91b..fa2c4d0ff5d1 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_app.cxx +++ b/desktop/source/pkgchk/unopkg/unopkg_app.cxx @@ -271,7 +271,7 @@ extern "C" DESKTOP_DLLPUBLIC int unopkg_main() return 0; } else if (isOption( info_version, &nPos )) { - dp_misc::writeConsole("\n"APP_NAME" Version 3.3\n"); + dp_misc::writeConsole("\n" APP_NAME " Version 3.3\n"); return 0; } //consume all bootstrap variables which may occur before the subcommannd @@ -651,7 +651,7 @@ extern "C" DESKTOP_DLLPUBLIC int unopkg_main() } if (option_verbose) - dp_misc::writeConsole(OUSTR("\n"APP_NAME" done.\n")); + dp_misc::writeConsole(OUSTR("\n" APP_NAME " done.\n")); //Force to release all bridges which connect us to the child processes disposeBridges(xLocalComponentContext); return 0; @@ -663,7 +663,7 @@ extern "C" DESKTOP_DLLPUBLIC int unopkg_main() } catch (const ucb::CommandAbortedException &) { - dp_misc::writeConsoleError("\n"APP_NAME" aborted!\n"); + dp_misc::writeConsoleError("\n" APP_NAME " aborted!\n"); } catch (const deployment::DeploymentException & exc) { @@ -701,7 +701,7 @@ extern "C" DESKTOP_DLLPUBLIC int unopkg_main() OUSTR("\n")); } if (!bNoOtherErrorMsg) - dp_misc::writeConsoleError("\n"APP_NAME" failed.\n"); + dp_misc::writeConsoleError("\n" APP_NAME " failed.\n"); disposeBridges(xLocalComponentContext); return 1; } diff --git a/desktop/unx/splash/unxsplash.cxx b/desktop/unx/splash/unxsplash.cxx index c2beeffc6891..bda01857a2e6 100644 --- a/desktop/unx/splash/unxsplash.cxx +++ b/desktop/unx/splash/unxsplash.cxx @@ -108,7 +108,7 @@ void SAL_CALL UnxSplashScreen::setValue( sal_Int32 nValue ) { if ( m_pOutFd ) { - fprintf( m_pOutFd, "%"SAL_PRIdINT32"%%\n", nValue ); + fprintf( m_pOutFd, "%" SAL_PRIdINT32 "%%\n", nValue ); fflush( m_pOutFd ); } } |