diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2009-04-29 08:46:38 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2009-04-29 08:46:38 +0000 |
| commit | f2386f84421da2ae9c0b24b010d5cd21e2b41c3d (patch) | |
| tree | 751c4ec7fdffaa6ffed9618827c3d7b057811ff1 /dbaccess | |
| parent | dbfe956a78171327e4ed24e5956a6c378064b30d (diff) | |
#i10000# merge error fix
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/source/ui/misc/TokenWriter.cxx | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx index 31024545901f..38643109d675 100644 --- a/dbaccess/source/ui/misc/TokenWriter.cxx +++ b/dbaccess/source/ui/misc/TokenWriter.cxx @@ -805,12 +805,8 @@ void OHTMLImportExport::WriteBody() //----------------------------------------------------------------------- void OHTMLImportExport::WriteTables() { -<<<<<<< .working RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OHTMLImportExport::WriteTables" ); - ::rtl::OString aStrOut = sHTML_table; -======= ::rtl::OString aStrOut = OOO_STRING_SVTOOLS_HTML_table; ->>>>>>> .merge-right.r271174 aStrOut = aStrOut + " "; aStrOut = aStrOut + OOO_STRING_SVTOOLS_HTML_frame; aStrOut = aStrOut + "="; |