2010-10-14 08:27:31 +02:00
|
|
|
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
2012-11-15 17:28:16 +00:00
|
|
|
/*
|
|
|
|
* This file is part of the LibreOffice project.
|
2000-09-18 16:07:07 +00:00
|
|
|
*
|
2012-11-15 17:28:16 +00:00
|
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
2000-09-18 16:07:07 +00:00
|
|
|
*
|
2012-11-15 17:28:16 +00:00
|
|
|
* This file incorporates work covered by the following license notice:
|
2000-09-18 16:07:07 +00:00
|
|
|
*
|
2012-11-15 17:28:16 +00:00
|
|
|
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
|
|
* contributor license agreements. See the NOTICE file distributed
|
|
|
|
* with this work for additional information regarding copyright
|
|
|
|
* ownership. The ASF licenses this file to you under the Apache
|
|
|
|
* License, Version 2.0 (the "License"); you may not use this file
|
|
|
|
* except in compliance with the License. You may obtain a copy of
|
|
|
|
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
|
|
|
*/
|
2000-09-18 16:07:07 +00:00
|
|
|
|
2006-09-17 14:27:01 +00:00
|
|
|
|
2000-09-18 16:07:07 +00:00
|
|
|
#include <ctype.h>
|
|
|
|
#include <stdio.h>
|
2011-11-18 21:03:31 +00:00
|
|
|
#include <comphelper/string.hxx>
|
2014-09-30 16:05:43 +02:00
|
|
|
#include <o3tl/ptr_container.hxx>
|
2000-09-18 16:07:07 +00:00
|
|
|
#include <tools/stream.hxx>
|
|
|
|
#include <tools/debug.hxx>
|
|
|
|
#include <tools/color.hxx>
|
|
|
|
#include <rtl/ustrbuf.hxx>
|
|
|
|
#include <rtl/strbuf.hxx>
|
|
|
|
|
CWS-TOOLING: integrate CWS fwk103
2009-05-26 12:44:25 +0200 mst r272292 : #i100727#
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx:
+ fix warning: rename method to prevent overloading
2009-05-19 13:42:31 +0200 mav r272075 : #i101356# add comment
2009-05-19 10:56:24 +0200 mav r272062 : #i101356# register the singleton correctly
2009-05-19 10:25:42 +0200 mav r272060 : #i101356# register the singleton correctly
2009-05-18 12:48:48 +0200 mav r272013 : #i91306# fix the typo
2009-05-14 08:50:06 +0200 mav r271871 : #i101356# reduce the amount of macros
2009-05-13 13:26:08 +0200 mav r271858 : #i101356# reduce the amount of macros
2009-05-13 11:29:16 +0200 mav r271849 : #i101356# reduce the amount of macros
2009-05-12 12:09:42 +0200 mav r271815 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 12:03:20 +0200 mav r271814 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:58:48 +0200 mav r271813 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:53:05 +0200 mav r271812 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:48:36 +0200 mav r271810 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:43:45 +0200 mav r271809 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:39:38 +0200 mav r271808 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:37:38 +0200 mav r271806 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:33:58 +0200 mav r271805 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:30:01 +0200 mav r271804 : #i101356# allow to generate a small log if a document can not be stored
2009-05-06 17:43:38 +0200 mst r271607 : #i100727#
- svtools/source/svhtml/parhtml.cxx:
+ adapt code to renaming of HTML constants (sb107)
2009-05-05 11:14:18 +0200 mav r271507 : #i101222# avoid warning
2009-05-05 10:27:23 +0200 mav r271505 : #i101426# send the modified() notification only when the document can be modified
2009-05-05 10:25:07 +0200 mav r271504 : #i101426# send the modified() notification only when the document is modified
2009-05-05 08:42:48 +0200 mav r271497 : CWS-TOOLING: rebase CWS fwk103 to trunk@271427 (milestone: DEV300:m47)
2009-04-30 13:32:11 +0200 mav r271412 : #i100518# check the template folders quietly
2009-04-29 20:04:25 +0200 mst r271393 : - sw/source/filter/html/swhtml.cxx:
+ fix wrong initialization order in constructor
2009-04-28 12:28:46 +0200 mav r271319 : #i99142# set the error correctly
2009-04-28 08:44:48 +0200 mav r271305 : #i99050# clear hidden flag if necessary
2009-04-28 08:40:10 +0200 mav r271304 : #i99050# avoid crash
2009-04-22 07:40:11 +0200 mav r271056 : #i101093# lets not affect the performance
2009-04-15 09:30:47 +0200 cd r270820 : #i99771# Fix warnings for gcc 4.4
2009-04-15 09:19:52 +0200 cd r270819 : #i99771# Fix warnings for gcc 4.4
2009-04-15 08:42:34 +0200 cd r270817 : #i99771# Fix warnings for gcc 4.4
2009-04-14 14:31:01 +0200 mav r270768 : #i99493# fix typo
2009-04-01 12:45:43 +0200 mst r270317 : fix #i100727#
- svtools/inc/svtools/svparser.hxx, svtools/source/svrtf/svparser.cxx,
sfx2/inc/sfx2/docfile.hxx, sfx2/source/doc/{objmisc.cxx,docfile.cxx}:
+ move SvKeyValue stuff from sfx2 to svtools
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx,
sfx2/inc/sfx2/sfxhtml.hxx, sfx2/source/bastyp/sfxhtml.cxx:
+ move ParseMetaOptions() and GetEncodingByMIME() from SfxHTMLParser (sfx2)
to HTMLParser (svtools)
+ make HTMLParser::ParseMetaOptions() a virtual function
+ HTMLParser::ParseMetaOptions() calls GetExtendedCompatibilityTextEncoding()
+ new template method HTMLParser::AddMetaUserDefined()
- svtools/source/svhtml/makefile.mk:
+ enable exceptions for parhtml.cxx
- dbaccess/source/ui/misc/HtmlReader.cxx,
sc/source/filter/html/htmlpars.cxx:
+ remove encoding related code duplication
- sw/source/filter/html/{swhtml{.hxx,.cxx},htmlfld.cxx}:
+ new SwHTMLParser::AddMetaUserDefined() for import of
DOCINFO field subtypes INFO[1-4]
+ do not use DocumentInfo for import of DOCINFO field subtypes INFO[1-4]
2009-03-31 17:01:35 +0200 mav r270288 : #i91214# fix typo
2009-03-31 15:19:41 +0200 mav r270285 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 15:00:36 +0200 mav r270284 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 12:19:13 +0200 mav r270270 : #i100123# taking the lock file over throws no exception
2009-03-30 13:57:21 +0200 mav r270227 : #i100351# fix the typo
2009-03-30 13:47:26 +0200 mav r270225 : #i99885# let OK be default button
2009-03-29 19:38:55 +0200 mav r270190 : CWS-TOOLING: rebase CWS fwk103 to trunk@270033 (milestone: DEV300:m45)
2009-03-16 16:39:48 +0100 mav r269558 : #i93558# convert the attributes as well
2009-03-13 15:35:55 +0100 mav r269488 : #i93558# improve manifest.xml parsing
2009-03-13 08:47:00 +0100 mav r269454 : #i96205# allow to remove password on SaveAs
2009-03-12 13:36:07 +0100 mav r269398 : #i91306# show special error in case of shared document
2009-03-12 13:33:35 +0100 mav r269397 : #i91306# introduce the new error-message
2009-03-12 11:40:42 +0100 mst r269378 : fix #i90877#
- svtools/source/uno/unoevent.cxx:
+ use proper operator delete[]
2009-02-26 15:23:10 +0100 mav r268526 : #i91214# do not use ATL
2009-02-26 14:19:06 +0100 mav r268516 : #i98909# integrate the patch
2009-02-10 17:29:52 +0100 cd r267568 : #i98649# Make sure that we catch the NoSuchElementException when a module is not installed.
2009-06-16 16:15:54 +00:00
|
|
|
#include <tools/tenccvt.hxx>
|
|
|
|
#include <tools/datetime.hxx>
|
2009-10-16 00:05:16 +02:00
|
|
|
#include <svl/inettype.hxx>
|
CWS-TOOLING: integrate CWS fwk103
2009-05-26 12:44:25 +0200 mst r272292 : #i100727#
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx:
+ fix warning: rename method to prevent overloading
2009-05-19 13:42:31 +0200 mav r272075 : #i101356# add comment
2009-05-19 10:56:24 +0200 mav r272062 : #i101356# register the singleton correctly
2009-05-19 10:25:42 +0200 mav r272060 : #i101356# register the singleton correctly
2009-05-18 12:48:48 +0200 mav r272013 : #i91306# fix the typo
2009-05-14 08:50:06 +0200 mav r271871 : #i101356# reduce the amount of macros
2009-05-13 13:26:08 +0200 mav r271858 : #i101356# reduce the amount of macros
2009-05-13 11:29:16 +0200 mav r271849 : #i101356# reduce the amount of macros
2009-05-12 12:09:42 +0200 mav r271815 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 12:03:20 +0200 mav r271814 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:58:48 +0200 mav r271813 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:53:05 +0200 mav r271812 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:48:36 +0200 mav r271810 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:43:45 +0200 mav r271809 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:39:38 +0200 mav r271808 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:37:38 +0200 mav r271806 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:33:58 +0200 mav r271805 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:30:01 +0200 mav r271804 : #i101356# allow to generate a small log if a document can not be stored
2009-05-06 17:43:38 +0200 mst r271607 : #i100727#
- svtools/source/svhtml/parhtml.cxx:
+ adapt code to renaming of HTML constants (sb107)
2009-05-05 11:14:18 +0200 mav r271507 : #i101222# avoid warning
2009-05-05 10:27:23 +0200 mav r271505 : #i101426# send the modified() notification only when the document can be modified
2009-05-05 10:25:07 +0200 mav r271504 : #i101426# send the modified() notification only when the document is modified
2009-05-05 08:42:48 +0200 mav r271497 : CWS-TOOLING: rebase CWS fwk103 to trunk@271427 (milestone: DEV300:m47)
2009-04-30 13:32:11 +0200 mav r271412 : #i100518# check the template folders quietly
2009-04-29 20:04:25 +0200 mst r271393 : - sw/source/filter/html/swhtml.cxx:
+ fix wrong initialization order in constructor
2009-04-28 12:28:46 +0200 mav r271319 : #i99142# set the error correctly
2009-04-28 08:44:48 +0200 mav r271305 : #i99050# clear hidden flag if necessary
2009-04-28 08:40:10 +0200 mav r271304 : #i99050# avoid crash
2009-04-22 07:40:11 +0200 mav r271056 : #i101093# lets not affect the performance
2009-04-15 09:30:47 +0200 cd r270820 : #i99771# Fix warnings for gcc 4.4
2009-04-15 09:19:52 +0200 cd r270819 : #i99771# Fix warnings for gcc 4.4
2009-04-15 08:42:34 +0200 cd r270817 : #i99771# Fix warnings for gcc 4.4
2009-04-14 14:31:01 +0200 mav r270768 : #i99493# fix typo
2009-04-01 12:45:43 +0200 mst r270317 : fix #i100727#
- svtools/inc/svtools/svparser.hxx, svtools/source/svrtf/svparser.cxx,
sfx2/inc/sfx2/docfile.hxx, sfx2/source/doc/{objmisc.cxx,docfile.cxx}:
+ move SvKeyValue stuff from sfx2 to svtools
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx,
sfx2/inc/sfx2/sfxhtml.hxx, sfx2/source/bastyp/sfxhtml.cxx:
+ move ParseMetaOptions() and GetEncodingByMIME() from SfxHTMLParser (sfx2)
to HTMLParser (svtools)
+ make HTMLParser::ParseMetaOptions() a virtual function
+ HTMLParser::ParseMetaOptions() calls GetExtendedCompatibilityTextEncoding()
+ new template method HTMLParser::AddMetaUserDefined()
- svtools/source/svhtml/makefile.mk:
+ enable exceptions for parhtml.cxx
- dbaccess/source/ui/misc/HtmlReader.cxx,
sc/source/filter/html/htmlpars.cxx:
+ remove encoding related code duplication
- sw/source/filter/html/{swhtml{.hxx,.cxx},htmlfld.cxx}:
+ new SwHTMLParser::AddMetaUserDefined() for import of
DOCINFO field subtypes INFO[1-4]
+ do not use DocumentInfo for import of DOCINFO field subtypes INFO[1-4]
2009-03-31 17:01:35 +0200 mav r270288 : #i91214# fix typo
2009-03-31 15:19:41 +0200 mav r270285 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 15:00:36 +0200 mav r270284 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 12:19:13 +0200 mav r270270 : #i100123# taking the lock file over throws no exception
2009-03-30 13:57:21 +0200 mav r270227 : #i100351# fix the typo
2009-03-30 13:47:26 +0200 mav r270225 : #i99885# let OK be default button
2009-03-29 19:38:55 +0200 mav r270190 : CWS-TOOLING: rebase CWS fwk103 to trunk@270033 (milestone: DEV300:m45)
2009-03-16 16:39:48 +0100 mav r269558 : #i93558# convert the attributes as well
2009-03-13 15:35:55 +0100 mav r269488 : #i93558# improve manifest.xml parsing
2009-03-13 08:47:00 +0100 mav r269454 : #i96205# allow to remove password on SaveAs
2009-03-12 13:36:07 +0100 mav r269398 : #i91306# show special error in case of shared document
2009-03-12 13:33:35 +0100 mav r269397 : #i91306# introduce the new error-message
2009-03-12 11:40:42 +0100 mst r269378 : fix #i90877#
- svtools/source/uno/unoevent.cxx:
+ use proper operator delete[]
2009-02-26 15:23:10 +0100 mav r268526 : #i91214# do not use ATL
2009-02-26 14:19:06 +0100 mav r268516 : #i98909# integrate the patch
2009-02-10 17:29:52 +0100 cd r267568 : #i98649# Make sure that we catch the NoSuchElementException when a module is not installed.
2009-06-16 16:15:54 +00:00
|
|
|
#include <com/sun/star/beans/PropertyAttribute.hpp>
|
|
|
|
#include <com/sun/star/document/XDocumentProperties.hpp>
|
|
|
|
|
2007-06-27 21:00:53 +00:00
|
|
|
#include <svtools/parhtml.hxx>
|
2010-04-16 23:00:12 +02:00
|
|
|
#include <svtools/htmltokn.h>
|
|
|
|
#include <svtools/htmlkywd.hxx>
|
2000-09-18 16:07:07 +00:00
|
|
|
|
2011-07-22 15:39:18 -04:00
|
|
|
#include <memory>
|
2014-09-30 16:05:43 +02:00
|
|
|
#include <utility>
|
CWS-TOOLING: integrate CWS fwk103
2009-05-26 12:44:25 +0200 mst r272292 : #i100727#
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx:
+ fix warning: rename method to prevent overloading
2009-05-19 13:42:31 +0200 mav r272075 : #i101356# add comment
2009-05-19 10:56:24 +0200 mav r272062 : #i101356# register the singleton correctly
2009-05-19 10:25:42 +0200 mav r272060 : #i101356# register the singleton correctly
2009-05-18 12:48:48 +0200 mav r272013 : #i91306# fix the typo
2009-05-14 08:50:06 +0200 mav r271871 : #i101356# reduce the amount of macros
2009-05-13 13:26:08 +0200 mav r271858 : #i101356# reduce the amount of macros
2009-05-13 11:29:16 +0200 mav r271849 : #i101356# reduce the amount of macros
2009-05-12 12:09:42 +0200 mav r271815 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 12:03:20 +0200 mav r271814 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:58:48 +0200 mav r271813 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:53:05 +0200 mav r271812 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:48:36 +0200 mav r271810 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:43:45 +0200 mav r271809 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:39:38 +0200 mav r271808 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:37:38 +0200 mav r271806 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:33:58 +0200 mav r271805 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:30:01 +0200 mav r271804 : #i101356# allow to generate a small log if a document can not be stored
2009-05-06 17:43:38 +0200 mst r271607 : #i100727#
- svtools/source/svhtml/parhtml.cxx:
+ adapt code to renaming of HTML constants (sb107)
2009-05-05 11:14:18 +0200 mav r271507 : #i101222# avoid warning
2009-05-05 10:27:23 +0200 mav r271505 : #i101426# send the modified() notification only when the document can be modified
2009-05-05 10:25:07 +0200 mav r271504 : #i101426# send the modified() notification only when the document is modified
2009-05-05 08:42:48 +0200 mav r271497 : CWS-TOOLING: rebase CWS fwk103 to trunk@271427 (milestone: DEV300:m47)
2009-04-30 13:32:11 +0200 mav r271412 : #i100518# check the template folders quietly
2009-04-29 20:04:25 +0200 mst r271393 : - sw/source/filter/html/swhtml.cxx:
+ fix wrong initialization order in constructor
2009-04-28 12:28:46 +0200 mav r271319 : #i99142# set the error correctly
2009-04-28 08:44:48 +0200 mav r271305 : #i99050# clear hidden flag if necessary
2009-04-28 08:40:10 +0200 mav r271304 : #i99050# avoid crash
2009-04-22 07:40:11 +0200 mav r271056 : #i101093# lets not affect the performance
2009-04-15 09:30:47 +0200 cd r270820 : #i99771# Fix warnings for gcc 4.4
2009-04-15 09:19:52 +0200 cd r270819 : #i99771# Fix warnings for gcc 4.4
2009-04-15 08:42:34 +0200 cd r270817 : #i99771# Fix warnings for gcc 4.4
2009-04-14 14:31:01 +0200 mav r270768 : #i99493# fix typo
2009-04-01 12:45:43 +0200 mst r270317 : fix #i100727#
- svtools/inc/svtools/svparser.hxx, svtools/source/svrtf/svparser.cxx,
sfx2/inc/sfx2/docfile.hxx, sfx2/source/doc/{objmisc.cxx,docfile.cxx}:
+ move SvKeyValue stuff from sfx2 to svtools
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx,
sfx2/inc/sfx2/sfxhtml.hxx, sfx2/source/bastyp/sfxhtml.cxx:
+ move ParseMetaOptions() and GetEncodingByMIME() from SfxHTMLParser (sfx2)
to HTMLParser (svtools)
+ make HTMLParser::ParseMetaOptions() a virtual function
+ HTMLParser::ParseMetaOptions() calls GetExtendedCompatibilityTextEncoding()
+ new template method HTMLParser::AddMetaUserDefined()
- svtools/source/svhtml/makefile.mk:
+ enable exceptions for parhtml.cxx
- dbaccess/source/ui/misc/HtmlReader.cxx,
sc/source/filter/html/htmlpars.cxx:
+ remove encoding related code duplication
- sw/source/filter/html/{swhtml{.hxx,.cxx},htmlfld.cxx}:
+ new SwHTMLParser::AddMetaUserDefined() for import of
DOCINFO field subtypes INFO[1-4]
+ do not use DocumentInfo for import of DOCINFO field subtypes INFO[1-4]
2009-03-31 17:01:35 +0200 mav r270288 : #i91214# fix typo
2009-03-31 15:19:41 +0200 mav r270285 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 15:00:36 +0200 mav r270284 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 12:19:13 +0200 mav r270270 : #i100123# taking the lock file over throws no exception
2009-03-30 13:57:21 +0200 mav r270227 : #i100351# fix the typo
2009-03-30 13:47:26 +0200 mav r270225 : #i99885# let OK be default button
2009-03-29 19:38:55 +0200 mav r270190 : CWS-TOOLING: rebase CWS fwk103 to trunk@270033 (milestone: DEV300:m45)
2009-03-16 16:39:48 +0100 mav r269558 : #i93558# convert the attributes as well
2009-03-13 15:35:55 +0100 mav r269488 : #i93558# improve manifest.xml parsing
2009-03-13 08:47:00 +0100 mav r269454 : #i96205# allow to remove password on SaveAs
2009-03-12 13:36:07 +0100 mav r269398 : #i91306# show special error in case of shared document
2009-03-12 13:33:35 +0100 mav r269397 : #i91306# introduce the new error-message
2009-03-12 11:40:42 +0100 mst r269378 : fix #i90877#
- svtools/source/uno/unoevent.cxx:
+ use proper operator delete[]
2009-02-26 15:23:10 +0100 mav r268526 : #i91214# do not use ATL
2009-02-26 14:19:06 +0100 mav r268516 : #i98909# integrate the patch
2009-02-10 17:29:52 +0100 cd r267568 : #i98649# Make sure that we catch the NoSuchElementException when a module is not installed.
2009-06-16 16:15:54 +00:00
|
|
|
|
|
|
|
using namespace ::com::sun::star;
|
|
|
|
|
|
|
|
|
2007-07-10 14:19:47 +00:00
|
|
|
const sal_Int32 MAX_LEN( 1024L );
|
2000-09-18 16:07:07 +00:00
|
|
|
|
2007-07-10 14:19:47 +00:00
|
|
|
const sal_Int32 MAX_ENTITY_LEN( 8L );
|
2001-10-31 07:30:08 +00:00
|
|
|
|
2000-09-18 16:07:07 +00:00
|
|
|
|
2011-04-22 22:13:32 +02:00
|
|
|
// Tables to convert option values into strings
|
2000-09-18 16:07:07 +00:00
|
|
|
|
|
|
|
// <INPUT TYPE=xxx>
|
2010-12-12 10:14:17 +01:00
|
|
|
static HTMLOptionEnum const aInputTypeOptEnums[] =
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
2009-04-27 11:24:10 +00:00
|
|
|
{ OOO_STRING_SVTOOLS_HTML_IT_text, HTML_IT_TEXT },
|
|
|
|
{ OOO_STRING_SVTOOLS_HTML_IT_password, HTML_IT_PASSWORD },
|
|
|
|
{ OOO_STRING_SVTOOLS_HTML_IT_checkbox, HTML_IT_CHECKBOX },
|
|
|
|
{ OOO_STRING_SVTOOLS_HTML_IT_radio, HTML_IT_RADIO },
|
|
|
|
{ OOO_STRING_SVTOOLS_HTML_IT_range, HTML_IT_RANGE },
|
|
|
|
{ OOO_STRING_SVTOOLS_HTML_IT_scribble, HTML_IT_SCRIBBLE },
|
|
|
|
{ OOO_STRING_SVTOOLS_HTML_IT_file, HTML_IT_FILE },
|
|
|
|
{ OOO_STRING_SVTOOLS_HTML_IT_hidden, HTML_IT_HIDDEN },
|
|
|
|
{ OOO_STRING_SVTOOLS_HTML_IT_submit, HTML_IT_SUBMIT },
|
|
|
|
{ OOO_STRING_SVTOOLS_HTML_IT_image, HTML_IT_IMAGE },
|
|
|
|
{ OOO_STRING_SVTOOLS_HTML_IT_reset, HTML_IT_RESET },
|
|
|
|
{ OOO_STRING_SVTOOLS_HTML_IT_button, HTML_IT_BUTTON },
|
2000-09-18 16:07:07 +00:00
|
|
|
{ 0, 0 }
|
|
|
|
};
|
|
|
|
|
|
|
|
// <TABLE FRAME=xxx>
|
2010-12-12 10:14:17 +01:00
|
|
|
static HTMLOptionEnum const aTableFrameOptEnums[] =
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
2009-04-27 11:24:10 +00:00
|
|
|
{ OOO_STRING_SVTOOLS_HTML_TF_void, HTML_TF_VOID },
|
|
|
|
{ OOO_STRING_SVTOOLS_HTML_TF_above, HTML_TF_ABOVE },
|
|
|
|
{ OOO_STRING_SVTOOLS_HTML_TF_below, HTML_TF_BELOW },
|
|
|
|
{ OOO_STRING_SVTOOLS_HTML_TF_hsides, HTML_TF_HSIDES },
|
|
|
|
{ OOO_STRING_SVTOOLS_HTML_TF_lhs, HTML_TF_LHS },
|
|
|
|
{ OOO_STRING_SVTOOLS_HTML_TF_rhs, HTML_TF_RHS },
|
|
|
|
{ OOO_STRING_SVTOOLS_HTML_TF_vsides, HTML_TF_VSIDES },
|
|
|
|
{ OOO_STRING_SVTOOLS_HTML_TF_box, HTML_TF_BOX },
|
|
|
|
{ OOO_STRING_SVTOOLS_HTML_TF_border, HTML_TF_BOX },
|
2000-09-18 16:07:07 +00:00
|
|
|
{ 0, 0 }
|
|
|
|
};
|
|
|
|
|
|
|
|
// <TABLE RULES=xxx>
|
2010-12-12 10:14:17 +01:00
|
|
|
static HTMLOptionEnum const aTableRulesOptEnums[] =
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
2009-04-27 11:24:10 +00:00
|
|
|
{ OOO_STRING_SVTOOLS_HTML_TR_none, HTML_TR_NONE },
|
|
|
|
{ OOO_STRING_SVTOOLS_HTML_TR_groups, HTML_TR_GROUPS },
|
|
|
|
{ OOO_STRING_SVTOOLS_HTML_TR_rows, HTML_TR_ROWS },
|
|
|
|
{ OOO_STRING_SVTOOLS_HTML_TR_cols, HTML_TR_COLS },
|
|
|
|
{ OOO_STRING_SVTOOLS_HTML_TR_all, HTML_TR_ALL },
|
2000-09-18 16:07:07 +00:00
|
|
|
{ 0, 0 }
|
|
|
|
};
|
|
|
|
|
2010-11-05 10:31:15 +08:00
|
|
|
sal_uInt16 HTMLOption::GetEnum( const HTMLOptionEnum *pOptEnums, sal_uInt16 nDflt ) const
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
2010-11-05 10:31:15 +08:00
|
|
|
sal_uInt16 nValue = nDflt;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
|
|
|
while( pOptEnums->pName )
|
2013-08-14 09:49:17 +02:00
|
|
|
if( aValue.equalsIgnoreAsciiCaseAscii( pOptEnums->pName ) )
|
2000-09-18 16:07:07 +00:00
|
|
|
break;
|
|
|
|
else
|
|
|
|
pOptEnums++;
|
|
|
|
|
|
|
|
if( pOptEnums->pName )
|
|
|
|
nValue = pOptEnums->nValue;
|
|
|
|
|
|
|
|
return nValue;
|
|
|
|
}
|
|
|
|
|
2011-07-22 15:02:30 -04:00
|
|
|
bool HTMLOption::GetEnum( sal_uInt16 &rEnum, const HTMLOptionEnum *pOptEnums ) const
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
|
|
|
while( pOptEnums->pName )
|
|
|
|
{
|
2013-08-14 09:49:17 +02:00
|
|
|
if( aValue.equalsIgnoreAsciiCaseAscii( pOptEnums->pName ) )
|
2000-09-18 16:07:07 +00:00
|
|
|
break;
|
|
|
|
else
|
|
|
|
pOptEnums++;
|
|
|
|
}
|
|
|
|
|
|
|
|
const sal_Char *pName = pOptEnums->pName;
|
|
|
|
if( pName )
|
|
|
|
rEnum = pOptEnums->nValue;
|
|
|
|
|
|
|
|
return (pName != 0);
|
|
|
|
}
|
|
|
|
|
2013-08-14 09:49:17 +02:00
|
|
|
HTMLOption::HTMLOption( sal_uInt16 nTok, const OUString& rToken,
|
|
|
|
const OUString& rValue )
|
2004-06-16 09:30:12 +00:00
|
|
|
: aValue(rValue)
|
|
|
|
, aToken(rToken)
|
|
|
|
, nToken( nTok )
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
|
|
|
DBG_ASSERT( nToken>=HTML_OPTION_START && nToken<HTML_OPTION_END,
|
2011-04-22 22:13:32 +02:00
|
|
|
"HTMLOption: unknown token" );
|
2000-09-18 16:07:07 +00:00
|
|
|
}
|
|
|
|
|
2006-03-16 12:06:54 +00:00
|
|
|
sal_uInt32 HTMLOption::GetNumber() const
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
|
|
|
DBG_ASSERT( (nToken>=HTML_OPTION_NUMBER_START &&
|
|
|
|
nToken<HTML_OPTION_NUMBER_END) ||
|
|
|
|
(nToken>=HTML_OPTION_CONTEXT_START &&
|
|
|
|
nToken<HTML_OPTION_CONTEXT_END) ||
|
|
|
|
nToken==HTML_O_VALUE,
|
2011-04-22 22:13:32 +02:00
|
|
|
"GetNumber: Option not numerical" );
|
2013-08-20 15:15:13 +02:00
|
|
|
OUString aTmp(comphelper::string::stripStart(aValue, ' '));
|
|
|
|
sal_Int32 nTmp = aTmp.toInt32();
|
2006-10-12 14:28:10 +00:00
|
|
|
return nTmp >= 0 ? (sal_uInt32)nTmp : 0;
|
2000-09-18 16:07:07 +00:00
|
|
|
}
|
|
|
|
|
2010-11-05 10:31:15 +08:00
|
|
|
sal_Int32 HTMLOption::GetSNumber() const
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
|
|
|
DBG_ASSERT( (nToken>=HTML_OPTION_NUMBER_START && nToken<HTML_OPTION_NUMBER_END) ||
|
|
|
|
(nToken>=HTML_OPTION_CONTEXT_START && nToken<HTML_OPTION_CONTEXT_END),
|
2011-04-22 22:13:32 +02:00
|
|
|
"GetSNumber: Option not numerical" );
|
2013-08-20 15:15:13 +02:00
|
|
|
OUString aTmp(comphelper::string::stripStart(aValue, ' '));
|
|
|
|
return aTmp.toInt32();
|
2000-09-18 16:07:07 +00:00
|
|
|
}
|
|
|
|
|
2011-09-27 22:04:20 +02:00
|
|
|
void HTMLOption::GetNumbers( std::vector<sal_uInt32> &rNumbers, bool bSpaceDelim ) const
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
2011-09-27 22:04:20 +02:00
|
|
|
rNumbers.clear();
|
2000-09-18 16:07:07 +00:00
|
|
|
|
|
|
|
if( bSpaceDelim )
|
|
|
|
{
|
2011-04-22 22:13:32 +02:00
|
|
|
// This is a very simplified scanner: it only searches all
|
|
|
|
// numerals in the string.
|
2011-07-22 15:02:30 -04:00
|
|
|
bool bInNum = false;
|
2011-01-12 15:56:50 +01:00
|
|
|
sal_uLong nNum = 0;
|
2013-08-14 09:49:17 +02:00
|
|
|
for( sal_Int32 i=0; i<aValue.getLength(); i++ )
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
2013-08-14 09:49:17 +02:00
|
|
|
sal_Unicode c = aValue[ i ];
|
2000-09-18 16:07:07 +00:00
|
|
|
if( c>='0' && c<='9' )
|
|
|
|
{
|
2006-10-12 14:28:10 +00:00
|
|
|
nNum *= 10;
|
2000-09-18 16:07:07 +00:00
|
|
|
nNum += (c - '0');
|
2011-07-22 15:02:30 -04:00
|
|
|
bInNum = true;
|
2000-09-18 16:07:07 +00:00
|
|
|
}
|
|
|
|
else if( bInNum )
|
|
|
|
{
|
2011-09-27 22:04:20 +02:00
|
|
|
rNumbers.push_back( nNum );
|
2011-07-22 15:02:30 -04:00
|
|
|
bInNum = false;
|
2006-10-12 14:28:10 +00:00
|
|
|
nNum = 0;
|
2000-09-18 16:07:07 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
if( bInNum )
|
|
|
|
{
|
2011-09-27 22:04:20 +02:00
|
|
|
rNumbers.push_back( nNum );
|
2000-09-18 16:07:07 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2011-04-22 22:13:32 +02:00
|
|
|
// Check whether numbers are separated by ',' and
|
|
|
|
// insert 0 if necessary
|
2013-08-14 09:49:17 +02:00
|
|
|
sal_Int32 nPos = 0;
|
|
|
|
while( nPos < aValue.getLength() )
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
2013-07-08 11:49:12 +02:00
|
|
|
sal_Unicode c;
|
2013-08-14 09:49:17 +02:00
|
|
|
while( nPos < aValue.getLength() &&
|
|
|
|
((c=aValue[nPos]) == ' ' || c == '\t' ||
|
2000-09-18 16:07:07 +00:00
|
|
|
c == '\n' || c== '\r' ) )
|
|
|
|
nPos++;
|
|
|
|
|
2013-08-14 09:49:17 +02:00
|
|
|
if( nPos==aValue.getLength() )
|
2011-09-27 22:04:20 +02:00
|
|
|
rNumbers.push_back(0);
|
2000-09-18 16:07:07 +00:00
|
|
|
else
|
|
|
|
{
|
2013-08-14 09:49:17 +02:00
|
|
|
sal_Int32 nEnd = aValue.indexOf( (sal_Unicode)',', nPos );
|
|
|
|
if( -1 == nEnd )
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
2013-08-14 09:49:17 +02:00
|
|
|
sal_Int32 nTmp = aValue.copy(nPos).toInt32();
|
2011-09-27 22:04:20 +02:00
|
|
|
rNumbers.push_back( nTmp >= 0 ? (sal_uInt32)nTmp : 0 );
|
2013-08-14 09:49:17 +02:00
|
|
|
nPos = aValue.getLength();
|
2000-09-18 16:07:07 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2013-08-14 09:49:17 +02:00
|
|
|
sal_Int32 nTmp = aValue.copy(nPos,nEnd-nPos).toInt32();
|
2011-09-27 22:04:20 +02:00
|
|
|
rNumbers.push_back( nTmp >= 0 ? (sal_uInt32)nTmp : 0 );
|
2006-10-12 14:28:10 +00:00
|
|
|
nPos = nEnd+1;
|
2000-09-18 16:07:07 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void HTMLOption::GetColor( Color& rColor ) const
|
|
|
|
{
|
|
|
|
DBG_ASSERT( (nToken>=HTML_OPTION_COLOR_START && nToken<HTML_OPTION_COLOR_END) || nToken==HTML_O_SIZE,
|
2011-04-22 22:13:32 +02:00
|
|
|
"GetColor: Option is not a color." );
|
2000-09-18 16:07:07 +00:00
|
|
|
|
2014-02-21 11:16:59 +01:00
|
|
|
OUString aTmp(aValue.toAsciiLowerCase());
|
2011-06-05 21:29:06 +02:00
|
|
|
sal_uInt32 nColor = SAL_MAX_UINT32;
|
2014-11-27 14:51:27 +00:00
|
|
|
if (!aTmp.isEmpty() && aTmp[0] != '#')
|
|
|
|
nColor = GetHTMLColor(aTmp);
|
2000-09-18 16:07:07 +00:00
|
|
|
|
2011-06-05 21:29:06 +02:00
|
|
|
if( SAL_MAX_UINT32 == nColor )
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
2006-10-12 14:28:10 +00:00
|
|
|
nColor = 0;
|
2013-11-13 10:45:15 +00:00
|
|
|
sal_Int32 nPos = 0;
|
|
|
|
for (sal_uInt32 i=0; i<6; ++i)
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
2011-04-22 22:13:32 +02:00
|
|
|
// Whatever Netscape does to get color values,
|
|
|
|
// at maximum three characters < '0' are ignored.
|
2013-08-20 15:15:13 +02:00
|
|
|
sal_Unicode c = nPos<aTmp.getLength() ? aTmp[ nPos++ ] : '0';
|
2000-09-18 16:07:07 +00:00
|
|
|
if( c < '0' )
|
|
|
|
{
|
2013-08-20 15:15:13 +02:00
|
|
|
c = nPos<aTmp.getLength() ? aTmp[nPos++] : '0';
|
2000-09-18 16:07:07 +00:00
|
|
|
if( c < '0' )
|
2013-08-20 15:15:13 +02:00
|
|
|
c = nPos<aTmp.getLength() ? aTmp[nPos++] : '0';
|
2000-09-18 16:07:07 +00:00
|
|
|
}
|
2006-10-12 14:28:10 +00:00
|
|
|
nColor *= 16;
|
2000-09-18 16:07:07 +00:00
|
|
|
if( c >= '0' && c <= '9' )
|
2014-02-21 11:16:59 +01:00
|
|
|
nColor += (c - '0');
|
|
|
|
else if( c >= 'a' && c <= 'f' )
|
|
|
|
nColor += (c + 0xa - 'a');
|
2000-09-18 16:07:07 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-11-05 10:31:15 +08:00
|
|
|
rColor.SetRed( (sal_uInt8)((nColor & 0x00ff0000) >> 16) );
|
|
|
|
rColor.SetGreen( (sal_uInt8)((nColor & 0x0000ff00) >> 8));
|
|
|
|
rColor.SetBlue( (sal_uInt8)(nColor & 0x000000ff) );
|
2000-09-18 16:07:07 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
HTMLInputType HTMLOption::GetInputType() const
|
|
|
|
{
|
2011-04-22 22:13:32 +02:00
|
|
|
DBG_ASSERT( nToken==HTML_O_TYPE, "GetInputType: Option not TYPE" );
|
2000-09-18 16:07:07 +00:00
|
|
|
return (HTMLInputType)GetEnum( aInputTypeOptEnums, HTML_IT_TEXT );
|
|
|
|
}
|
|
|
|
|
|
|
|
HTMLTableFrame HTMLOption::GetTableFrame() const
|
|
|
|
{
|
2011-04-22 22:13:32 +02:00
|
|
|
DBG_ASSERT( nToken==HTML_O_FRAME, "GetTableFrame: Option not FRAME" );
|
2000-09-18 16:07:07 +00:00
|
|
|
return (HTMLTableFrame)GetEnum( aTableFrameOptEnums, HTML_TF_VOID );
|
|
|
|
}
|
|
|
|
|
|
|
|
HTMLTableRules HTMLOption::GetTableRules() const
|
|
|
|
{
|
2011-04-22 22:13:32 +02:00
|
|
|
DBG_ASSERT( nToken==HTML_O_RULES, "GetTableRules: Option not RULES" );
|
2000-09-18 16:07:07 +00:00
|
|
|
return (HTMLTableRules)GetEnum( aTableRulesOptEnums, HTML_TR_NONE );
|
|
|
|
}
|
|
|
|
|
2011-07-22 15:13:14 -04:00
|
|
|
HTMLParser::HTMLParser( SvStream& rIn, bool bReadNewDoc ) :
|
|
|
|
SvParser( rIn ),
|
|
|
|
bNewDoc(bReadNewDoc),
|
|
|
|
bIsInHeader(true),
|
|
|
|
bIsInBody(false),
|
|
|
|
bReadListing(false),
|
|
|
|
bReadXMP(false),
|
|
|
|
bReadPRE(false),
|
|
|
|
bReadTextArea(false),
|
|
|
|
bReadScript(false),
|
|
|
|
bReadStyle(false),
|
|
|
|
bEndTokenFound(false),
|
|
|
|
bPre_IgnoreNewPara(false),
|
|
|
|
bReadNextChar(false),
|
2013-05-16 23:53:30 +02:00
|
|
|
bReadComment(false),
|
2014-02-19 12:38:35 +00:00
|
|
|
nPre_LinePos(0),
|
2013-05-16 23:53:30 +02:00
|
|
|
mnPendingOffToken(0)
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
2010-10-01 10:00:52 +01:00
|
|
|
//#i76649, default to UTF-8 for HTML unless we know differently
|
|
|
|
SetSrcEncoding(RTL_TEXTENCODING_UTF8);
|
2000-09-18 16:07:07 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
HTMLParser::~HTMLParser()
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2010-12-11 17:58:44 +01:00
|
|
|
SvParserState HTMLParser::CallParser()
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
|
|
|
eState = SVPAR_WORKING;
|
|
|
|
nNextCh = GetNextChar();
|
|
|
|
SaveState( 0 );
|
|
|
|
|
2006-10-12 14:28:10 +00:00
|
|
|
nPre_LinePos = 0;
|
2011-07-22 15:02:30 -04:00
|
|
|
bPre_IgnoreNewPara = false;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
2014-10-02 14:37:06 +02:00
|
|
|
AddFirstRef();
|
2000-09-18 16:07:07 +00:00
|
|
|
Continue( 0 );
|
|
|
|
if( SVPAR_PENDING != eState )
|
2011-04-22 22:13:32 +02:00
|
|
|
ReleaseRef(); // Parser not needed anymore
|
2000-09-18 16:07:07 +00:00
|
|
|
|
|
|
|
return eState;
|
|
|
|
}
|
|
|
|
|
|
|
|
void HTMLParser::Continue( int nToken )
|
|
|
|
{
|
|
|
|
if( !nToken )
|
|
|
|
nToken = GetNextToken();
|
|
|
|
|
|
|
|
while( IsParserWorking() )
|
|
|
|
{
|
|
|
|
SaveState( nToken );
|
|
|
|
nToken = FilterToken( nToken );
|
|
|
|
|
|
|
|
if( nToken )
|
|
|
|
NextToken( nToken );
|
|
|
|
|
|
|
|
if( IsParserWorking() )
|
2011-04-22 22:13:32 +02:00
|
|
|
SaveState( 0 ); // continue with new token
|
|
|
|
|
2000-09-18 16:07:07 +00:00
|
|
|
nToken = GetNextToken();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
int HTMLParser::FilterToken( int nToken )
|
|
|
|
{
|
|
|
|
switch( nToken )
|
|
|
|
{
|
|
|
|
case sal_Unicode(EOF):
|
|
|
|
nToken = 0;
|
2011-04-23 22:25:26 +02:00
|
|
|
break; // don't pass
|
2000-09-18 16:07:07 +00:00
|
|
|
|
|
|
|
case HTML_HEAD_OFF:
|
2011-07-22 15:02:30 -04:00
|
|
|
bIsInBody = true;
|
2014-02-12 10:11:18 +02:00
|
|
|
bIsInHeader = false;
|
|
|
|
break;
|
2014-03-03 22:16:50 +01:00
|
|
|
|
2000-09-18 16:07:07 +00:00
|
|
|
case HTML_HEAD_ON:
|
2014-02-12 10:11:18 +02:00
|
|
|
bIsInHeader = true;
|
2000-09-18 16:07:07 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case HTML_BODY_ON:
|
2014-03-03 22:16:50 +01:00
|
|
|
bIsInHeader = false;
|
|
|
|
bIsInBody = true;
|
|
|
|
break;
|
|
|
|
|
2000-09-18 16:07:07 +00:00
|
|
|
case HTML_FRAMESET_ON:
|
2011-07-22 15:02:30 -04:00
|
|
|
bIsInHeader = false;
|
2014-03-03 22:16:50 +01:00
|
|
|
bIsInBody = false;
|
2000-09-18 16:07:07 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case HTML_BODY_OFF:
|
2011-07-22 15:02:30 -04:00
|
|
|
bIsInBody = bReadPRE = bReadListing = bReadXMP = false;
|
2000-09-18 16:07:07 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case HTML_HTML_OFF:
|
|
|
|
nToken = 0;
|
2011-07-22 15:02:30 -04:00
|
|
|
bReadPRE = bReadListing = bReadXMP = false;
|
2011-04-23 22:25:26 +02:00
|
|
|
break; // HTML_ON hasn't been passed either !
|
2000-09-18 16:07:07 +00:00
|
|
|
|
|
|
|
case HTML_PREFORMTXT_ON:
|
|
|
|
StartPRE();
|
|
|
|
break;
|
|
|
|
|
|
|
|
case HTML_PREFORMTXT_OFF:
|
|
|
|
FinishPRE();
|
|
|
|
break;
|
|
|
|
|
|
|
|
case HTML_LISTING_ON:
|
|
|
|
StartListing();
|
|
|
|
break;
|
|
|
|
|
|
|
|
case HTML_LISTING_OFF:
|
|
|
|
FinishListing();
|
|
|
|
break;
|
|
|
|
|
|
|
|
case HTML_XMP_ON:
|
|
|
|
StartXMP();
|
|
|
|
break;
|
|
|
|
|
|
|
|
case HTML_XMP_OFF:
|
|
|
|
FinishXMP();
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
if( bReadPRE )
|
|
|
|
nToken = FilterPRE( nToken );
|
|
|
|
else if( bReadListing )
|
|
|
|
nToken = FilterListing( nToken );
|
|
|
|
else if( bReadXMP )
|
|
|
|
nToken = FilterXMP( nToken );
|
|
|
|
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return nToken;
|
|
|
|
}
|
|
|
|
|
2011-08-29 00:36:22 +01:00
|
|
|
#define HTML_ISDIGIT( c ) comphelper::string::isdigitAscii(c)
|
|
|
|
#define HTML_ISALPHA( c ) comphelper::string::isalphaAscii(c)
|
|
|
|
#define HTML_ISALNUM( c ) comphelper::string::isalnumAscii(c)
|
2000-09-18 16:07:07 +00:00
|
|
|
#define HTML_ISSPACE( c ) ( ' ' == c || (c >= 0x09 && c <= 0x0d) )
|
|
|
|
#define HTML_ISPRINTABLE( c ) ( c >= 32 && c != 127)
|
2011-08-29 00:36:22 +01:00
|
|
|
#define HTML_ISHEXDIGIT( c ) comphelper::string::isxdigitAscii(c)
|
2000-09-18 16:07:07 +00:00
|
|
|
|
|
|
|
int HTMLParser::ScanText( const sal_Unicode cBreak )
|
|
|
|
{
|
2013-04-07 12:06:47 +02:00
|
|
|
OUStringBuffer sTmpBuffer( MAX_LEN );
|
2014-01-10 17:09:01 +01:00
|
|
|
bool bContinue = true;
|
|
|
|
bool bEqSignFound = false;
|
2000-09-18 16:07:07 +00:00
|
|
|
sal_Unicode cQuote = 0U;
|
|
|
|
|
2011-03-18 21:19:34 +01:00
|
|
|
while( bContinue && IsParserWorking() )
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
2014-01-10 17:09:01 +01:00
|
|
|
bool bNextCh = true;
|
2000-09-18 16:07:07 +00:00
|
|
|
switch( nNextCh )
|
|
|
|
{
|
|
|
|
case '&':
|
2011-07-22 15:02:30 -04:00
|
|
|
bEqSignFound = false;
|
2000-09-18 16:07:07 +00:00
|
|
|
if( bReadXMP )
|
2013-12-20 14:23:33 +02:00
|
|
|
sTmpBuffer.append( '&' );
|
2000-09-18 16:07:07 +00:00
|
|
|
else
|
|
|
|
{
|
2011-01-12 15:56:50 +01:00
|
|
|
sal_uLong nStreamPos = rInput.Tell();
|
|
|
|
sal_uLong nLinePos = GetLinePos();
|
2000-09-18 16:07:07 +00:00
|
|
|
|
|
|
|
sal_Unicode cChar = 0U;
|
|
|
|
if( '#' == (nNextCh = GetNextChar()) )
|
|
|
|
{
|
|
|
|
nNextCh = GetNextChar();
|
2011-07-22 15:02:30 -04:00
|
|
|
const bool bIsHex( 'x' == nNextCh );
|
|
|
|
const bool bIsDecOrHex( bIsHex || HTML_ISDIGIT(nNextCh) );
|
2006-08-03 12:53:35 +00:00
|
|
|
if ( bIsDecOrHex )
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
2006-08-03 12:53:35 +00:00
|
|
|
if ( bIsHex )
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
|
|
|
nNextCh = GetNextChar();
|
2006-08-03 12:53:35 +00:00
|
|
|
while ( HTML_ISHEXDIGIT(nNextCh) )
|
|
|
|
{
|
|
|
|
cChar = cChar * 16U +
|
|
|
|
( nNextCh <= '9'
|
|
|
|
? sal_Unicode( nNextCh - '0' )
|
|
|
|
: ( nNextCh <= 'F'
|
|
|
|
? sal_Unicode( nNextCh - 'A' + 10 )
|
|
|
|
: sal_Unicode( nNextCh - 'a' + 10 ) ) );
|
|
|
|
nNextCh = GetNextChar();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
do
|
|
|
|
{
|
|
|
|
cChar = cChar * 10U + sal_Unicode( nNextCh - '0');
|
|
|
|
nNextCh = GetNextChar();
|
|
|
|
}
|
|
|
|
while( HTML_ISDIGIT(nNextCh) );
|
2000-09-18 16:07:07 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if( RTL_TEXTENCODING_DONTKNOW != eSrcEnc &&
|
|
|
|
RTL_TEXTENCODING_UCS2 != eSrcEnc &&
|
2001-07-03 06:49:47 +00:00
|
|
|
RTL_TEXTENCODING_UTF8 != eSrcEnc &&
|
2011-08-07 21:39:18 +01:00
|
|
|
cChar < 256 )
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
2011-08-07 21:39:18 +01:00
|
|
|
const sal_uInt32 convertFlags =
|
|
|
|
RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_DEFAULT |
|
|
|
|
RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_DEFAULT |
|
2011-08-07 23:09:44 +01:00
|
|
|
RTL_TEXTTOUNICODE_FLAGS_INVALID_DEFAULT;
|
2011-08-07 21:39:18 +01:00
|
|
|
|
|
|
|
sal_Char cEncodedChar = static_cast<sal_Char>(cChar);
|
2013-04-07 12:06:47 +02:00
|
|
|
cChar = OUString(&cEncodedChar, 1, eSrcEnc, convertFlags).toChar();
|
2000-09-18 16:07:07 +00:00
|
|
|
if( 0U == cChar )
|
|
|
|
{
|
2011-04-22 22:13:32 +02:00
|
|
|
// If the character could not be
|
2000-09-18 16:07:07 +00:00
|
|
|
// converted, because a conversion is not
|
|
|
|
// available, do no conversion at all.
|
2011-08-07 21:39:18 +01:00
|
|
|
cChar = cEncodedChar;
|
2000-09-18 16:07:07 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
nNextCh = 0U;
|
|
|
|
}
|
|
|
|
else if( HTML_ISALPHA( nNextCh ) )
|
|
|
|
{
|
2013-04-07 12:06:47 +02:00
|
|
|
OUStringBuffer sEntityBuffer( MAX_ENTITY_LEN );
|
2013-10-28 12:21:40 +02:00
|
|
|
sal_Int32 nPos = 0L;
|
2000-09-18 16:07:07 +00:00
|
|
|
do
|
|
|
|
{
|
|
|
|
sEntityBuffer.append( nNextCh );
|
|
|
|
nPos++;
|
|
|
|
nNextCh = GetNextChar();
|
|
|
|
}
|
2001-10-31 07:30:08 +00:00
|
|
|
while( nPos < MAX_ENTITY_LEN && HTML_ISALNUM( nNextCh ) &&
|
2000-09-18 16:07:07 +00:00
|
|
|
!rInput.IsEof() );
|
|
|
|
|
|
|
|
if( IsParserWorking() && !rInput.IsEof() )
|
|
|
|
{
|
2013-04-07 12:06:47 +02:00
|
|
|
OUString sEntity(sEntityBuffer.getStr(), nPos);
|
2000-09-18 16:07:07 +00:00
|
|
|
cChar = GetHTMLCharName( sEntity );
|
|
|
|
|
2011-04-22 22:13:32 +02:00
|
|
|
// not found ( == 0 ): plain text
|
|
|
|
// or a character which is inserted as attribute
|
2000-09-18 16:07:07 +00:00
|
|
|
if( 0U == cChar && ';' != nNextCh )
|
|
|
|
{
|
|
|
|
DBG_ASSERT( rInput.Tell() - nStreamPos ==
|
2011-01-12 15:56:50 +01:00
|
|
|
(sal_uLong)(nPos+1L)*GetCharSize(),
|
2011-04-22 22:13:32 +02:00
|
|
|
"UTF-8 is failing here" );
|
2013-10-28 12:21:40 +02:00
|
|
|
for( sal_Int32 i = nPos-1; i>1; i-- )
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
|
|
|
nNextCh = sEntityBuffer[i];
|
|
|
|
sEntityBuffer.setLength( i );
|
2013-04-07 12:06:47 +02:00
|
|
|
sEntity = OUString(sEntityBuffer.getStr(), i);
|
2012-06-19 11:36:39 +01:00
|
|
|
cChar = GetHTMLCharName( sEntity );
|
2000-09-18 16:07:07 +00:00
|
|
|
if( cChar )
|
|
|
|
{
|
|
|
|
rInput.SeekRel( -(long)
|
|
|
|
((nPos-i)*GetCharSize()) );
|
|
|
|
nlLinePos -= sal_uInt32(nPos-i);
|
|
|
|
nPos = i;
|
2001-11-22 09:48:35 +00:00
|
|
|
ClearTxtConvContext();
|
2000-09-18 16:07:07 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-04-22 22:13:32 +02:00
|
|
|
if( !cChar ) // unknown character?
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
2011-04-22 22:13:32 +02:00
|
|
|
// back in stream, insert '&'
|
|
|
|
// and restart with next character
|
2013-12-20 14:23:33 +02:00
|
|
|
sTmpBuffer.append( '&' );
|
2000-09-18 16:07:07 +00:00
|
|
|
|
|
|
|
DBG_ASSERT( rInput.Tell()-nStreamPos ==
|
2011-01-12 15:56:50 +01:00
|
|
|
(sal_uLong)(nPos+1)*GetCharSize(),
|
2011-04-22 22:13:32 +02:00
|
|
|
"Wrong stream position" );
|
2000-09-18 16:07:07 +00:00
|
|
|
DBG_ASSERT( nlLinePos-nLinePos ==
|
2011-01-12 15:56:50 +01:00
|
|
|
(sal_uLong)(nPos+1),
|
2011-04-22 22:13:32 +02:00
|
|
|
"Wrong line position" );
|
2000-09-18 16:07:07 +00:00
|
|
|
rInput.Seek( nStreamPos );
|
|
|
|
nlLinePos = nLinePos;
|
2001-11-22 09:48:35 +00:00
|
|
|
ClearTxtConvContext();
|
2000-09-18 16:07:07 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2014-04-01 13:38:37 +01:00
|
|
|
assert(cChar != 0);
|
|
|
|
|
2000-09-18 16:07:07 +00:00
|
|
|
// 1 == Non Breaking Space
|
|
|
|
// 2 == SoftHyphen
|
|
|
|
|
2014-04-01 13:38:37 +01:00
|
|
|
if (cChar == 1 || cChar == 2)
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
|
|
|
if( '>' == cBreak )
|
|
|
|
{
|
2011-04-22 22:13:32 +02:00
|
|
|
// When reading the content of a tag we have
|
|
|
|
// to change it to ' ' or '-'
|
2014-04-01 13:38:37 +01:00
|
|
|
if( 1U == cChar )
|
|
|
|
cChar = ' ';
|
|
|
|
else //2U
|
|
|
|
cChar = '-';
|
2000-09-18 16:07:07 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2011-04-22 22:13:32 +02:00
|
|
|
// If not scanning a tag return token
|
2013-08-20 15:15:13 +02:00
|
|
|
aToken += sTmpBuffer.makeStringAndClear();
|
2014-04-01 13:38:37 +01:00
|
|
|
|
|
|
|
if( !aToken.isEmpty() )
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
2014-04-01 13:38:37 +01:00
|
|
|
// restart with character
|
|
|
|
nNextCh = '&';
|
|
|
|
DBG_ASSERT( rInput.Tell()-nStreamPos ==
|
|
|
|
(sal_uLong)(nPos+1)*GetCharSize(),
|
|
|
|
"Wrong stream position" );
|
|
|
|
DBG_ASSERT( nlLinePos-nLinePos ==
|
|
|
|
(sal_uLong)(nPos+1),
|
|
|
|
"Wrong line position" );
|
|
|
|
rInput.Seek( nStreamPos );
|
|
|
|
nlLinePos = nLinePos;
|
|
|
|
ClearTxtConvContext();
|
|
|
|
return HTML_TEXTTOKEN;
|
2000-09-18 16:07:07 +00:00
|
|
|
}
|
2014-04-01 13:38:37 +01:00
|
|
|
|
|
|
|
// Hack: _GetNextChar shall not read the
|
|
|
|
// next character
|
|
|
|
if( ';' != nNextCh )
|
|
|
|
aToken += " ";
|
|
|
|
if( 1U == cChar )
|
|
|
|
return HTML_NONBREAKSPACE;
|
|
|
|
else //2U
|
|
|
|
return HTML_SOFTHYPH;
|
2000-09-18 16:07:07 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
nNextCh = 0U;
|
|
|
|
}
|
2011-03-18 21:28:43 +01:00
|
|
|
// &{...};-JavaScript-Macros are not supported any longer.
|
2000-09-18 16:07:07 +00:00
|
|
|
else if( IsParserWorking() )
|
|
|
|
{
|
2013-12-20 14:23:33 +02:00
|
|
|
sTmpBuffer.append( '&' );
|
2011-07-22 15:02:30 -04:00
|
|
|
bNextCh = false;
|
2000-09-18 16:07:07 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
bNextCh = (';' == nNextCh);
|
|
|
|
if( cBreak=='>' && (cChar=='\\' || cChar=='\'' ||
|
|
|
|
cChar=='\"' || cChar==' ') )
|
|
|
|
{
|
2014-11-10 15:05:25 +01:00
|
|
|
// ' and " have to be escaped within tags to separate
|
2011-04-22 22:13:32 +02:00
|
|
|
// them from ' and " enclosing options.
|
|
|
|
// \ has to be escaped as well.
|
|
|
|
// Space is protected because it's not a delimiter between
|
|
|
|
// options.
|
2013-12-20 14:23:33 +02:00
|
|
|
sTmpBuffer.append( '\\' );
|
2000-09-18 16:07:07 +00:00
|
|
|
if( MAX_LEN == sTmpBuffer.getLength() )
|
2013-08-20 15:15:13 +02:00
|
|
|
aToken += sTmpBuffer.makeStringAndClear();
|
2000-09-18 16:07:07 +00:00
|
|
|
}
|
|
|
|
if( IsParserWorking() )
|
|
|
|
{
|
|
|
|
if( cChar )
|
|
|
|
sTmpBuffer.append( cChar );
|
|
|
|
}
|
|
|
|
else if( SVPAR_PENDING==eState && '>'!=cBreak )
|
|
|
|
{
|
2011-04-22 22:13:32 +02:00
|
|
|
// Restart with '&', the remainder is returned as
|
|
|
|
// text token.
|
2013-08-12 17:19:48 +02:00
|
|
|
if( !aToken.isEmpty() || !sTmpBuffer.isEmpty() )
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
2011-04-22 22:13:32 +02:00
|
|
|
// _GetNextChar() returns the previous text and
|
|
|
|
// during the next execution a new character is read.
|
|
|
|
// Thus we have to position in front of the '&'.
|
2000-09-18 16:07:07 +00:00
|
|
|
nNextCh = 0U;
|
|
|
|
rInput.Seek( nStreamPos-(sal_uInt32)GetCharSize() );
|
2006-10-12 14:28:10 +00:00
|
|
|
nlLinePos = nLinePos-1;
|
2001-11-22 09:48:35 +00:00
|
|
|
ClearTxtConvContext();
|
2011-07-22 15:02:30 -04:00
|
|
|
bReadNextChar = true;
|
2000-09-18 16:07:07 +00:00
|
|
|
}
|
2011-07-22 15:02:30 -04:00
|
|
|
bNextCh = false;
|
2000-09-18 16:07:07 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case '=':
|
|
|
|
if( '>'==cBreak && !cQuote )
|
2011-07-22 15:02:30 -04:00
|
|
|
bEqSignFound = true;
|
2000-09-18 16:07:07 +00:00
|
|
|
sTmpBuffer.append( nNextCh );
|
|
|
|
break;
|
|
|
|
|
|
|
|
case '\\':
|
|
|
|
if( '>'==cBreak )
|
|
|
|
{
|
|
|
|
// Innerhalb von Tags kennzeichnen
|
2013-12-20 14:23:33 +02:00
|
|
|
sTmpBuffer.append( '\\' );
|
2000-09-18 16:07:07 +00:00
|
|
|
if( MAX_LEN == sTmpBuffer.getLength() )
|
2013-08-20 15:15:13 +02:00
|
|
|
aToken += sTmpBuffer.makeStringAndClear();
|
2000-09-18 16:07:07 +00:00
|
|
|
}
|
2013-12-20 14:23:33 +02:00
|
|
|
sTmpBuffer.append( '\\' );
|
2000-09-18 16:07:07 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case '\"':
|
|
|
|
case '\'':
|
|
|
|
if( '>'==cBreak )
|
|
|
|
{
|
|
|
|
if( bEqSignFound )
|
|
|
|
cQuote = nNextCh;
|
|
|
|
else if( cQuote && (cQuote==nNextCh ) )
|
|
|
|
cQuote = 0U;
|
|
|
|
}
|
|
|
|
sTmpBuffer.append( nNextCh );
|
2011-07-22 15:02:30 -04:00
|
|
|
bEqSignFound = false;
|
2000-09-18 16:07:07 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case sal_Unicode(EOF):
|
|
|
|
if( rInput.IsEof() )
|
|
|
|
{
|
2011-07-22 15:02:30 -04:00
|
|
|
bContinue = false;
|
2000-09-18 16:07:07 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
sTmpBuffer.append( nNextCh );
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case '<':
|
2011-07-22 15:02:30 -04:00
|
|
|
bEqSignFound = false;
|
2000-09-18 16:07:07 +00:00
|
|
|
if( '>'==cBreak )
|
|
|
|
sTmpBuffer.append( nNextCh );
|
|
|
|
else
|
2011-07-22 15:02:30 -04:00
|
|
|
bContinue = false; // break, String zusammen
|
2000-09-18 16:07:07 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case '\f':
|
|
|
|
if( '>' == cBreak )
|
|
|
|
{
|
2011-04-22 22:13:32 +02:00
|
|
|
// If scanning options treat it like a space, ...
|
2013-12-20 14:23:33 +02:00
|
|
|
sTmpBuffer.append( ' ' );
|
2000-09-18 16:07:07 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2011-04-22 22:13:32 +02:00
|
|
|
// otherwise it's a separate token.
|
2011-07-22 15:02:30 -04:00
|
|
|
bContinue = false;
|
2000-09-18 16:07:07 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case '\r':
|
|
|
|
case '\n':
|
|
|
|
if( '>'==cBreak )
|
|
|
|
{
|
2011-04-22 22:13:32 +02:00
|
|
|
// cr/lf in tag is handled in _GetNextToken()
|
2000-09-18 16:07:07 +00:00
|
|
|
sTmpBuffer.append( nNextCh );
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
else if( bReadListing || bReadXMP || bReadPRE || bReadTextArea )
|
|
|
|
{
|
2011-07-22 15:02:30 -04:00
|
|
|
bContinue = false;
|
2000-09-18 16:07:07 +00:00
|
|
|
break;
|
|
|
|
}
|
2011-04-22 22:13:32 +02:00
|
|
|
// Reduce sequence of CR/LF/BLANK/TAB to a single blank
|
|
|
|
// no break!!
|
2000-09-18 16:07:07 +00:00
|
|
|
case '\t':
|
|
|
|
if( '\t'==nNextCh && bReadPRE && '>'!=cBreak )
|
|
|
|
{
|
2014-01-07 22:48:59 +01:00
|
|
|
// Pass Tabs up in <PRE>
|
2011-07-22 15:02:30 -04:00
|
|
|
bContinue = false;
|
2000-09-18 16:07:07 +00:00
|
|
|
break;
|
|
|
|
}
|
2011-04-22 22:13:32 +02:00
|
|
|
// no break
|
2000-09-18 16:07:07 +00:00
|
|
|
case '\x0b':
|
|
|
|
if( '\x0b'==nNextCh && (bReadPRE || bReadXMP ||bReadListing) &&
|
|
|
|
'>'!=cBreak )
|
|
|
|
{
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
nNextCh = ' ';
|
2011-04-22 22:13:32 +02:00
|
|
|
// no break;
|
2000-09-18 16:07:07 +00:00
|
|
|
case ' ':
|
|
|
|
sTmpBuffer.append( nNextCh );
|
|
|
|
if( '>'!=cBreak && (!bReadListing && !bReadXMP &&
|
|
|
|
!bReadPRE && !bReadTextArea) )
|
|
|
|
{
|
2011-04-22 22:13:32 +02:00
|
|
|
// Reduce sequences of Blanks/Tabs/CR/LF to a single blank
|
2000-09-18 16:07:07 +00:00
|
|
|
do {
|
|
|
|
if( sal_Unicode(EOF) == (nNextCh = GetNextChar()) &&
|
|
|
|
rInput.IsEof() )
|
|
|
|
{
|
2013-08-12 17:19:48 +02:00
|
|
|
if( !aToken.isEmpty() || sTmpBuffer.getLength() > 1L )
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
2011-04-22 22:13:32 +02:00
|
|
|
// Have seen s.th. aside from blanks?
|
2013-08-20 15:15:13 +02:00
|
|
|
aToken += sTmpBuffer.makeStringAndClear();
|
2000-09-18 16:07:07 +00:00
|
|
|
return HTML_TEXTTOKEN;
|
|
|
|
}
|
|
|
|
else
|
2011-04-22 22:13:32 +02:00
|
|
|
// Only read blanks: no text must be returned
|
|
|
|
// and _GetNextToken has to read until EOF
|
2000-09-18 16:07:07 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
} while ( ' ' == nNextCh || '\t' == nNextCh ||
|
|
|
|
'\r' == nNextCh || '\n' == nNextCh ||
|
|
|
|
'\x0b' == nNextCh );
|
2011-07-22 15:02:30 -04:00
|
|
|
bNextCh = false;
|
2000-09-18 16:07:07 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
2011-07-22 15:02:30 -04:00
|
|
|
bEqSignFound = false;
|
2014-01-14 09:50:47 +00:00
|
|
|
if (nNextCh == cBreak && !cQuote)
|
2011-07-22 15:02:30 -04:00
|
|
|
bContinue = false;
|
2000-09-18 16:07:07 +00:00
|
|
|
else
|
|
|
|
{
|
|
|
|
do {
|
2011-04-22 22:13:32 +02:00
|
|
|
// All remaining characters make their way into the text.
|
2000-09-18 16:07:07 +00:00
|
|
|
sTmpBuffer.append( nNextCh );
|
|
|
|
if( MAX_LEN == sTmpBuffer.getLength() )
|
|
|
|
{
|
2013-08-20 15:15:13 +02:00
|
|
|
aToken += sTmpBuffer.makeStringAndClear();
|
2000-09-18 16:07:07 +00:00
|
|
|
}
|
|
|
|
if( ( sal_Unicode(EOF) == (nNextCh = GetNextChar()) &&
|
|
|
|
rInput.IsEof() ) ||
|
|
|
|
!IsParserWorking() )
|
|
|
|
{
|
2013-06-18 12:05:03 +02:00
|
|
|
if( !sTmpBuffer.isEmpty() )
|
2013-08-20 15:15:13 +02:00
|
|
|
aToken += sTmpBuffer.makeStringAndClear();
|
2000-09-18 16:07:07 +00:00
|
|
|
return HTML_TEXTTOKEN;
|
|
|
|
}
|
|
|
|
} while( HTML_ISALPHA( nNextCh ) || HTML_ISDIGIT( nNextCh ) );
|
2011-07-22 15:02:30 -04:00
|
|
|
bNextCh = false;
|
2000-09-18 16:07:07 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if( MAX_LEN == sTmpBuffer.getLength() )
|
2013-08-20 15:15:13 +02:00
|
|
|
aToken += sTmpBuffer.makeStringAndClear();
|
2000-09-18 16:07:07 +00:00
|
|
|
|
2011-03-18 21:19:34 +01:00
|
|
|
if( bContinue && bNextCh )
|
2000-09-18 16:07:07 +00:00
|
|
|
nNextCh = GetNextChar();
|
|
|
|
}
|
|
|
|
|
2013-06-18 12:05:03 +02:00
|
|
|
if( !sTmpBuffer.isEmpty() )
|
2013-08-20 15:15:13 +02:00
|
|
|
aToken += sTmpBuffer.makeStringAndClear();
|
2000-09-18 16:07:07 +00:00
|
|
|
|
|
|
|
return HTML_TEXTTOKEN;
|
|
|
|
}
|
|
|
|
|
|
|
|
int HTMLParser::_GetNextRawToken()
|
|
|
|
{
|
2013-04-07 12:06:47 +02:00
|
|
|
OUStringBuffer sTmpBuffer( MAX_LEN );
|
2000-09-18 16:07:07 +00:00
|
|
|
|
|
|
|
if( bEndTokenFound )
|
|
|
|
{
|
2011-04-22 22:13:32 +02:00
|
|
|
// During the last execution we already found the end token,
|
|
|
|
// thus we don't have to search it again.
|
2011-07-22 15:02:30 -04:00
|
|
|
bReadScript = false;
|
|
|
|
bReadStyle = false;
|
2014-12-18 13:33:54 +01:00
|
|
|
aEndToken.clear();
|
2011-07-22 15:02:30 -04:00
|
|
|
bEndTokenFound = false;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2011-04-22 22:13:32 +02:00
|
|
|
// Default return value: HTML_RAWDATA
|
2014-01-10 17:09:01 +01:00
|
|
|
bool bContinue = true;
|
2000-09-18 16:07:07 +00:00
|
|
|
int nToken = HTML_RAWDATA;
|
|
|
|
SaveState( 0 );
|
2011-03-18 21:19:34 +01:00
|
|
|
while( bContinue && IsParserWorking() )
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
2014-01-10 17:09:01 +01:00
|
|
|
bool bNextCh = true;
|
2000-09-18 16:07:07 +00:00
|
|
|
switch( nNextCh )
|
|
|
|
{
|
|
|
|
case '<':
|
|
|
|
{
|
2011-04-22 22:13:32 +02:00
|
|
|
// Maybe we've reached the end.
|
2000-09-18 16:07:07 +00:00
|
|
|
|
2011-04-22 22:13:32 +02:00
|
|
|
// Save what we have read previously...
|
2013-08-20 15:15:13 +02:00
|
|
|
aToken += sTmpBuffer.makeStringAndClear();
|
2000-09-18 16:07:07 +00:00
|
|
|
|
2011-04-22 22:13:32 +02:00
|
|
|
// and remember position in stream.
|
2011-01-12 15:56:50 +01:00
|
|
|
sal_uLong nStreamPos = rInput.Tell();
|
|
|
|
sal_uLong nLineNr = GetLineNr();
|
|
|
|
sal_uLong nLinePos = GetLinePos();
|
2000-09-18 16:07:07 +00:00
|
|
|
|
2011-04-22 22:13:32 +02:00
|
|
|
// Start of an end token?
|
2014-01-10 17:09:01 +01:00
|
|
|
bool bOffState = false;
|
2000-09-18 16:07:07 +00:00
|
|
|
if( '/' == (nNextCh = GetNextChar()) )
|
|
|
|
{
|
2011-07-22 15:02:30 -04:00
|
|
|
bOffState = true;
|
2000-09-18 16:07:07 +00:00
|
|
|
nNextCh = GetNextChar();
|
|
|
|
}
|
|
|
|
else if( '!' == nNextCh )
|
|
|
|
{
|
|
|
|
sTmpBuffer.append( nNextCh );
|
|
|
|
nNextCh = GetNextChar();
|
|
|
|
}
|
|
|
|
|
2011-04-22 22:13:32 +02:00
|
|
|
// Read following letters
|
2000-09-18 16:07:07 +00:00
|
|
|
while( (HTML_ISALPHA(nNextCh) || '-'==nNextCh) &&
|
|
|
|
IsParserWorking() && sTmpBuffer.getLength() < MAX_LEN )
|
|
|
|
{
|
|
|
|
sTmpBuffer.append( nNextCh );
|
|
|
|
nNextCh = GetNextChar();
|
|
|
|
}
|
|
|
|
|
2013-08-20 15:15:13 +02:00
|
|
|
OUString aTok( sTmpBuffer.toString() );
|
2014-02-21 09:32:17 +00:00
|
|
|
aTok = aTok.toAsciiLowerCase();
|
2011-07-22 15:02:30 -04:00
|
|
|
bool bDone = false;
|
2013-08-14 09:49:17 +02:00
|
|
|
if( bReadScript || !aEndToken.isEmpty() )
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
|
|
|
if( !bReadComment )
|
|
|
|
{
|
2014-06-04 11:43:58 +02:00
|
|
|
if( aTok.startsWith( OOO_STRING_SVTOOLS_HTML_comment ) )
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
2011-07-22 15:02:30 -04:00
|
|
|
bReadComment = true;
|
2000-09-18 16:07:07 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2011-04-22 22:13:32 +02:00
|
|
|
// A script has to end with "</SCRIPT>". But
|
|
|
|
// ">" is optional for security reasons
|
|
|
|
bDone = bOffState &&
|
2014-06-04 11:43:58 +02:00
|
|
|
( bReadScript
|
2014-12-18 13:33:54 +01:00
|
|
|
? aTok == OOO_STRING_SVTOOLS_HTML_script
|
2014-06-04 11:43:58 +02:00
|
|
|
: aTok.equals(aEndToken) );
|
2000-09-18 16:07:07 +00:00
|
|
|
}
|
|
|
|
}
|
2013-10-21 10:21:01 +02:00
|
|
|
if( bReadComment && '>'==nNextCh && aTok.endsWith( "--" ) )
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
2011-04-22 22:13:32 +02:00
|
|
|
// End of comment of style <!----->
|
2011-07-22 15:02:30 -04:00
|
|
|
bReadComment = false;
|
2000-09-18 16:07:07 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2011-04-22 22:13:32 +02:00
|
|
|
// Style sheets can be closed by </STYLE>, </HEAD> or <BODY>
|
2000-09-18 16:07:07 +00:00
|
|
|
if( bOffState )
|
2014-12-18 13:33:54 +01:00
|
|
|
bDone = aTok == OOO_STRING_SVTOOLS_HTML_style ||
|
|
|
|
aTok == OOO_STRING_SVTOOLS_HTML_head;
|
2000-09-18 16:07:07 +00:00
|
|
|
else
|
2014-12-18 13:33:54 +01:00
|
|
|
bDone = aTok == OOO_STRING_SVTOOLS_HTML_body;
|
2000-09-18 16:07:07 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if( bDone )
|
|
|
|
{
|
2011-04-22 22:13:32 +02:00
|
|
|
// Done! Return the previously read string (if requested)
|
|
|
|
// and continue.
|
2000-09-18 16:07:07 +00:00
|
|
|
|
2011-07-22 15:02:30 -04:00
|
|
|
bContinue = false;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
2011-04-22 22:13:32 +02:00
|
|
|
// nToken==0 means, _GetNextToken continues to read
|
2013-08-12 17:19:48 +02:00
|
|
|
if( aToken.isEmpty() && (bReadStyle || bReadScript) )
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
2011-04-22 22:13:32 +02:00
|
|
|
// Immediately close environment (or context?)
|
|
|
|
// and parse the end token
|
2011-07-22 15:02:30 -04:00
|
|
|
bReadScript = false;
|
|
|
|
bReadStyle = false;
|
2014-12-18 13:33:54 +01:00
|
|
|
aEndToken.clear();
|
2000-09-18 16:07:07 +00:00
|
|
|
nToken = 0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2011-04-22 22:13:32 +02:00
|
|
|
// Keep bReadScript/bReadStyle alive
|
|
|
|
// and parse end token during next execution
|
2011-07-22 15:02:30 -04:00
|
|
|
bEndTokenFound = true;
|
2000-09-18 16:07:07 +00:00
|
|
|
}
|
|
|
|
|
2011-04-22 22:13:32 +02:00
|
|
|
// Move backwards in stream to '<'
|
2000-09-18 16:07:07 +00:00
|
|
|
rInput.Seek( nStreamPos );
|
|
|
|
SetLineNr( nLineNr );
|
|
|
|
SetLinePos( nLinePos );
|
2001-11-22 09:48:35 +00:00
|
|
|
ClearTxtConvContext();
|
2000-09-18 16:07:07 +00:00
|
|
|
nNextCh = '<';
|
|
|
|
|
2011-04-22 22:13:32 +02:00
|
|
|
// Don't append string to token.
|
2000-09-18 16:07:07 +00:00
|
|
|
sTmpBuffer.setLength( 0L );
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2011-04-22 22:13:32 +02:00
|
|
|
// remember "</" , everything else we find in the buffer
|
2013-08-12 17:19:48 +02:00
|
|
|
aToken += "<";
|
2000-09-18 16:07:07 +00:00
|
|
|
if( bOffState )
|
2013-08-12 17:19:48 +02:00
|
|
|
aToken += "/";
|
2000-09-18 16:07:07 +00:00
|
|
|
|
2011-07-22 15:02:30 -04:00
|
|
|
bNextCh = false;
|
2000-09-18 16:07:07 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case '-':
|
|
|
|
sTmpBuffer.append( nNextCh );
|
|
|
|
if( bReadComment )
|
|
|
|
{
|
2011-07-22 15:02:30 -04:00
|
|
|
bool bTwoMinus = false;
|
2000-09-18 16:07:07 +00:00
|
|
|
nNextCh = GetNextChar();
|
|
|
|
while( '-' == nNextCh && IsParserWorking() )
|
|
|
|
{
|
2011-07-22 15:02:30 -04:00
|
|
|
bTwoMinus = true;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
|
|
|
if( MAX_LEN == sTmpBuffer.getLength() )
|
2013-08-20 15:15:13 +02:00
|
|
|
aToken += sTmpBuffer.makeStringAndClear();
|
2000-09-18 16:07:07 +00:00
|
|
|
sTmpBuffer.append( nNextCh );
|
|
|
|
nNextCh = GetNextChar();
|
|
|
|
}
|
|
|
|
|
|
|
|
if( '>' == nNextCh && IsParserWorking() && bTwoMinus )
|
2011-07-22 15:02:30 -04:00
|
|
|
bReadComment = false;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
2011-07-22 15:02:30 -04:00
|
|
|
bNextCh = false;
|
2000-09-18 16:07:07 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case '\r':
|
2011-04-22 22:13:32 +02:00
|
|
|
// \r\n? closes the current text token (even if it's empty)
|
2000-09-18 16:07:07 +00:00
|
|
|
nNextCh = GetNextChar();
|
|
|
|
if( nNextCh=='\n' )
|
|
|
|
nNextCh = GetNextChar();
|
2011-07-22 15:02:30 -04:00
|
|
|
bContinue = false;
|
2000-09-18 16:07:07 +00:00
|
|
|
break;
|
|
|
|
case '\n':
|
2011-04-22 22:13:32 +02:00
|
|
|
// \n closes the current text token (even if it's empty)
|
2000-09-18 16:07:07 +00:00
|
|
|
nNextCh = GetNextChar();
|
2011-07-22 15:02:30 -04:00
|
|
|
bContinue = false;
|
2000-09-18 16:07:07 +00:00
|
|
|
break;
|
|
|
|
case sal_Unicode(EOF):
|
2011-04-22 22:13:32 +02:00
|
|
|
// eof closes the current text token and behaves like having read
|
|
|
|
// an end token
|
2000-09-18 16:07:07 +00:00
|
|
|
if( rInput.IsEof() )
|
|
|
|
{
|
2011-07-22 15:02:30 -04:00
|
|
|
bContinue = false;
|
2013-08-12 17:19:48 +02:00
|
|
|
if( !aToken.isEmpty() || !sTmpBuffer.isEmpty() )
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
2011-07-22 15:02:30 -04:00
|
|
|
bEndTokenFound = true;
|
2000-09-18 16:07:07 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2011-07-22 15:02:30 -04:00
|
|
|
bReadScript = false;
|
|
|
|
bReadStyle = false;
|
2014-12-18 13:33:54 +01:00
|
|
|
aEndToken.clear();
|
2000-09-18 16:07:07 +00:00
|
|
|
nToken = 0;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
2011-04-22 22:13:32 +02:00
|
|
|
// no break
|
2000-09-18 16:07:07 +00:00
|
|
|
default:
|
2011-04-22 22:13:32 +02:00
|
|
|
// all remaining characters are appended to the buffer
|
2000-09-18 16:07:07 +00:00
|
|
|
sTmpBuffer.append( nNextCh );
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2013-06-18 12:05:03 +02:00
|
|
|
if( (!bContinue && !sTmpBuffer.isEmpty()) ||
|
2000-09-18 16:07:07 +00:00
|
|
|
MAX_LEN == sTmpBuffer.getLength() )
|
2013-08-20 15:15:13 +02:00
|
|
|
aToken += sTmpBuffer.makeStringAndClear();
|
2000-09-18 16:07:07 +00:00
|
|
|
|
2011-03-18 21:19:34 +01:00
|
|
|
if( bContinue && bNextCh )
|
2000-09-18 16:07:07 +00:00
|
|
|
nNextCh = GetNextChar();
|
|
|
|
}
|
|
|
|
|
|
|
|
if( IsParserWorking() )
|
|
|
|
SaveState( 0 );
|
|
|
|
else
|
|
|
|
nToken = 0;
|
|
|
|
|
|
|
|
return nToken;
|
|
|
|
}
|
|
|
|
|
2011-04-22 22:13:32 +02:00
|
|
|
// Scan next token
|
2010-12-11 17:58:44 +01:00
|
|
|
int HTMLParser::_GetNextToken()
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
|
|
|
int nRet = 0;
|
2014-12-18 13:33:54 +01:00
|
|
|
sSaveToken.clear();
|
2000-09-18 16:07:07 +00:00
|
|
|
|
2013-05-16 23:53:30 +02:00
|
|
|
if (mnPendingOffToken)
|
|
|
|
{
|
|
|
|
// HTML_<TOKEN>_OFF generated for HTML_<TOKEN>_ON
|
|
|
|
nRet = mnPendingOffToken;
|
|
|
|
mnPendingOffToken = 0;
|
2014-12-18 13:33:54 +01:00
|
|
|
aToken.clear();
|
2013-05-16 23:53:30 +02:00
|
|
|
return nRet;
|
|
|
|
}
|
|
|
|
|
2011-04-22 22:13:32 +02:00
|
|
|
// Delete options
|
2011-07-22 15:39:18 -04:00
|
|
|
if (!maOptions.empty())
|
|
|
|
maOptions.clear();
|
2000-09-18 16:07:07 +00:00
|
|
|
|
2013-03-03 17:11:39 +01:00
|
|
|
if( !IsParserWorking() ) // Don't continue if already an error occurred
|
2000-09-18 16:07:07 +00:00
|
|
|
return 0;
|
|
|
|
|
2011-07-22 15:02:30 -04:00
|
|
|
bool bReadNextCharSave = bReadNextChar;
|
2000-09-18 16:07:07 +00:00
|
|
|
if( bReadNextChar )
|
|
|
|
{
|
|
|
|
DBG_ASSERT( !bEndTokenFound,
|
2011-04-22 22:13:32 +02:00
|
|
|
"Read a character despite </SCRIPT> was read?" );
|
2000-09-18 16:07:07 +00:00
|
|
|
nNextCh = GetNextChar();
|
2013-03-03 17:11:39 +01:00
|
|
|
if( !IsParserWorking() ) // Don't continue if already an error occurred
|
2000-09-18 16:07:07 +00:00
|
|
|
return 0;
|
2011-07-22 15:02:30 -04:00
|
|
|
bReadNextChar = false;
|
2000-09-18 16:07:07 +00:00
|
|
|
}
|
|
|
|
|
2013-08-14 09:49:17 +02:00
|
|
|
if( bReadScript || bReadStyle || !aEndToken.isEmpty() )
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
|
|
|
nRet = _GetNextRawToken();
|
|
|
|
if( nRet || !IsParserWorking() )
|
|
|
|
return nRet;
|
|
|
|
}
|
|
|
|
|
|
|
|
do {
|
2014-01-10 17:09:01 +01:00
|
|
|
bool bNextCh = true;
|
2000-09-18 16:07:07 +00:00
|
|
|
switch( nNextCh )
|
|
|
|
{
|
|
|
|
case '<':
|
|
|
|
{
|
2011-01-12 15:56:50 +01:00
|
|
|
sal_uLong nStreamPos = rInput.Tell();
|
|
|
|
sal_uLong nLineNr = GetLineNr();
|
|
|
|
sal_uLong nLinePos = GetLinePos();
|
2000-09-18 16:07:07 +00:00
|
|
|
|
2014-01-10 17:09:01 +01:00
|
|
|
bool bOffState = false;
|
2000-09-18 16:07:07 +00:00
|
|
|
if( '/' == (nNextCh = GetNextChar()) )
|
|
|
|
{
|
2011-07-22 15:02:30 -04:00
|
|
|
bOffState = true;
|
2000-09-18 16:07:07 +00:00
|
|
|
nNextCh = GetNextChar();
|
|
|
|
}
|
2011-04-22 22:13:32 +02:00
|
|
|
if( HTML_ISALPHA( nNextCh ) || '!'==nNextCh )
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
2013-04-07 12:06:47 +02:00
|
|
|
OUStringBuffer sTmpBuffer;
|
2000-09-18 16:07:07 +00:00
|
|
|
do {
|
|
|
|
sTmpBuffer.append( nNextCh );
|
|
|
|
if( MAX_LEN == sTmpBuffer.getLength() )
|
2013-08-20 15:15:13 +02:00
|
|
|
aToken += sTmpBuffer.makeStringAndClear();
|
2000-09-18 16:07:07 +00:00
|
|
|
nNextCh = GetNextChar();
|
2012-10-26 16:18:34 +02:00
|
|
|
} while( '>' != nNextCh && '/' != nNextCh && !HTML_ISSPACE( nNextCh ) &&
|
2000-09-18 16:07:07 +00:00
|
|
|
IsParserWorking() && !rInput.IsEof() );
|
|
|
|
|
2013-06-18 12:05:03 +02:00
|
|
|
if( !sTmpBuffer.isEmpty() )
|
2013-08-20 15:15:13 +02:00
|
|
|
aToken += sTmpBuffer.makeStringAndClear();
|
2000-09-18 16:07:07 +00:00
|
|
|
|
2011-04-22 22:13:32 +02:00
|
|
|
// Skip blanks
|
2000-09-18 16:07:07 +00:00
|
|
|
while( HTML_ISSPACE( nNextCh ) && IsParserWorking() )
|
|
|
|
nNextCh = GetNextChar();
|
|
|
|
|
|
|
|
if( !IsParserWorking() )
|
|
|
|
{
|
|
|
|
if( SVPAR_PENDING == eState )
|
|
|
|
bReadNextChar = bReadNextCharSave;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2011-04-22 22:13:32 +02:00
|
|
|
// Search token in table:
|
2000-09-18 16:07:07 +00:00
|
|
|
sSaveToken = aToken;
|
2014-02-21 09:32:17 +00:00
|
|
|
aToken = aToken.toAsciiLowerCase();
|
2000-09-18 16:07:07 +00:00
|
|
|
if( 0 == (nRet = GetHTMLToken( aToken )) )
|
2011-04-22 22:13:32 +02:00
|
|
|
// Unknown control
|
2000-09-18 16:07:07 +00:00
|
|
|
nRet = HTML_UNKNOWNCONTROL_ON;
|
|
|
|
|
2011-04-22 22:13:32 +02:00
|
|
|
// If it's a token which can be switched off...
|
2000-09-18 16:07:07 +00:00
|
|
|
if( bOffState )
|
|
|
|
{
|
|
|
|
if( HTML_TOKEN_ONOFF & nRet )
|
|
|
|
{
|
2011-04-22 22:13:32 +02:00
|
|
|
// and there is an off token, return off token instead
|
2000-09-18 16:07:07 +00:00
|
|
|
++nRet;
|
|
|
|
}
|
|
|
|
else if( HTML_LINEBREAK!=nRet )
|
|
|
|
{
|
2011-04-22 22:13:32 +02:00
|
|
|
// and there is no off token, return unknown token.
|
|
|
|
// (except for </BR>, that is treated like <BR>)
|
2000-09-18 16:07:07 +00:00
|
|
|
nRet = HTML_UNKNOWNCONTROL_OFF;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if( nRet == HTML_COMMENT )
|
|
|
|
{
|
2011-04-22 22:13:32 +02:00
|
|
|
// fix: due to being case sensitive use sSaveToken as start of comment
|
|
|
|
// and append a blank.
|
2000-09-18 16:07:07 +00:00
|
|
|
aToken = sSaveToken;
|
|
|
|
if( '>'!=nNextCh )
|
2013-08-12 17:19:48 +02:00
|
|
|
aToken += " ";
|
2011-01-12 15:56:50 +01:00
|
|
|
sal_uLong nCStreamPos = 0;
|
|
|
|
sal_uLong nCLineNr = 0;
|
|
|
|
sal_uLong nCLinePos = 0;
|
2013-11-13 10:45:15 +00:00
|
|
|
sal_Int32 nCStrLen = 0;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
2011-07-22 15:02:30 -04:00
|
|
|
bool bDone = false;
|
2011-04-22 22:13:32 +02:00
|
|
|
// Read until closing -->. If not found restart at first >
|
2000-09-18 16:07:07 +00:00
|
|
|
while( !bDone && !rInput.IsEof() && IsParserWorking() )
|
|
|
|
{
|
|
|
|
if( '>'==nNextCh )
|
|
|
|
{
|
|
|
|
if( !nCStreamPos )
|
|
|
|
{
|
|
|
|
nCStreamPos = rInput.Tell();
|
2013-08-12 17:19:48 +02:00
|
|
|
nCStrLen = aToken.getLength();
|
2000-09-18 16:07:07 +00:00
|
|
|
nCLineNr = GetLineNr();
|
|
|
|
nCLinePos = GetLinePos();
|
|
|
|
}
|
2014-12-12 12:23:11 +01:00
|
|
|
bDone = aToken.endsWith( "--" );
|
2000-09-18 16:07:07 +00:00
|
|
|
if( !bDone )
|
2013-08-12 17:19:48 +02:00
|
|
|
aToken += OUString(nNextCh);
|
2000-09-18 16:07:07 +00:00
|
|
|
}
|
|
|
|
else
|
2013-08-12 17:19:48 +02:00
|
|
|
aToken += OUString(nNextCh);
|
2000-09-18 16:07:07 +00:00
|
|
|
if( !bDone )
|
|
|
|
nNextCh = GetNextChar();
|
|
|
|
}
|
|
|
|
if( !bDone && IsParserWorking() && nCStreamPos )
|
|
|
|
{
|
|
|
|
rInput.Seek( nCStreamPos );
|
|
|
|
SetLineNr( nCLineNr );
|
|
|
|
SetLinePos( nCLinePos );
|
2001-11-22 09:48:35 +00:00
|
|
|
ClearTxtConvContext();
|
2013-08-15 09:28:24 +01:00
|
|
|
aToken = aToken.copy(0, nCStrLen);
|
2000-09-18 16:07:07 +00:00
|
|
|
nNextCh = '>';
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2011-04-22 22:13:32 +02:00
|
|
|
// TokenString not needed anymore
|
2014-12-18 13:33:54 +01:00
|
|
|
aToken.clear();
|
2000-09-18 16:07:07 +00:00
|
|
|
}
|
|
|
|
|
2011-04-22 22:13:32 +02:00
|
|
|
// Read until closing '>'
|
2000-09-18 16:07:07 +00:00
|
|
|
if( '>' != nNextCh && IsParserWorking() )
|
|
|
|
{
|
|
|
|
ScanText( '>' );
|
2011-03-17 13:47:12 +01:00
|
|
|
|
2011-04-23 22:25:26 +02:00
|
|
|
// fdo#34666 fdo#36080 fdo#36390: closing "/>"?:
|
2013-05-16 23:53:30 +02:00
|
|
|
// generate pending HTML_<TOKEN>_OFF for HTML_<TOKEN>_ON
|
|
|
|
// Do not convert this to a single HTML_<TOKEN>_OFF
|
|
|
|
// which lead to fdo#56772.
|
2013-10-21 10:21:01 +02:00
|
|
|
if ((HTML_TOKEN_ONOFF & nRet) && aToken.endsWith("/"))
|
2013-05-16 23:53:30 +02:00
|
|
|
{
|
|
|
|
mnPendingOffToken = nRet + 1; // HTML_<TOKEN>_ON -> HTML_<TOKEN>_OFF
|
2013-08-12 17:19:48 +02:00
|
|
|
aToken = aToken.replaceAt( aToken.getLength()-1, 1, ""); // remove trailing '/'
|
2011-03-17 13:47:12 +01:00
|
|
|
}
|
2000-09-18 16:07:07 +00:00
|
|
|
if( sal_Unicode(EOF) == nNextCh && rInput.IsEof() )
|
|
|
|
{
|
2011-04-22 22:13:32 +02:00
|
|
|
// Move back in front of < and restart there.
|
|
|
|
// Return < as text.
|
2000-09-18 16:07:07 +00:00
|
|
|
rInput.Seek( nStreamPos );
|
|
|
|
SetLineNr( nLineNr );
|
|
|
|
SetLinePos( nLinePos );
|
2001-11-22 09:48:35 +00:00
|
|
|
ClearTxtConvContext();
|
2000-09-18 16:07:07 +00:00
|
|
|
|
2013-08-12 17:19:48 +02:00
|
|
|
aToken = "<";
|
2000-09-18 16:07:07 +00:00
|
|
|
nRet = HTML_TEXTTOKEN;
|
|
|
|
nNextCh = GetNextChar();
|
2011-07-22 15:02:30 -04:00
|
|
|
bNextCh = false;
|
2000-09-18 16:07:07 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if( SVPAR_PENDING == eState )
|
|
|
|
bReadNextChar = bReadNextCharSave;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if( bOffState )
|
|
|
|
{
|
|
|
|
// einfach alles wegschmeissen
|
|
|
|
ScanText( '>' );
|
|
|
|
if( sal_Unicode(EOF) == nNextCh && rInput.IsEof() )
|
|
|
|
{
|
2011-04-22 22:13:32 +02:00
|
|
|
// Move back in front of < and restart there.
|
|
|
|
// Return < as text.
|
2000-09-18 16:07:07 +00:00
|
|
|
rInput.Seek( nStreamPos );
|
|
|
|
SetLineNr( nLineNr );
|
|
|
|
SetLinePos( nLinePos );
|
2001-11-22 09:48:35 +00:00
|
|
|
ClearTxtConvContext();
|
2000-09-18 16:07:07 +00:00
|
|
|
|
2013-08-12 17:19:48 +02:00
|
|
|
aToken = "<";
|
2000-09-18 16:07:07 +00:00
|
|
|
nRet = HTML_TEXTTOKEN;
|
|
|
|
nNextCh = GetNextChar();
|
2011-07-22 15:02:30 -04:00
|
|
|
bNextCh = false;
|
2000-09-18 16:07:07 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
if( SVPAR_PENDING == eState )
|
|
|
|
bReadNextChar = bReadNextCharSave;
|
2014-12-18 13:33:54 +01:00
|
|
|
aToken.clear();
|
2000-09-18 16:07:07 +00:00
|
|
|
}
|
|
|
|
else if( '%' == nNextCh )
|
|
|
|
{
|
|
|
|
nRet = HTML_UNKNOWNCONTROL_ON;
|
|
|
|
|
2011-01-12 15:56:50 +01:00
|
|
|
sal_uLong nCStreamPos = rInput.Tell();
|
|
|
|
sal_uLong nCLineNr = GetLineNr(), nCLinePos = GetLinePos();
|
2000-09-18 16:07:07 +00:00
|
|
|
|
2011-07-22 15:02:30 -04:00
|
|
|
bool bDone = false;
|
2011-04-22 22:13:32 +02:00
|
|
|
// Read until closing %>. If not found restart at first >.
|
2000-09-18 16:07:07 +00:00
|
|
|
while( !bDone && !rInput.IsEof() && IsParserWorking() )
|
|
|
|
{
|
2013-10-21 10:21:01 +02:00
|
|
|
bDone = '>'==nNextCh && aToken.endsWith("%");
|
2000-09-18 16:07:07 +00:00
|
|
|
if( !bDone )
|
|
|
|
{
|
2013-08-12 17:19:48 +02:00
|
|
|
aToken += OUString(nNextCh);
|
2000-09-18 16:07:07 +00:00
|
|
|
nNextCh = GetNextChar();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if( !bDone && IsParserWorking() )
|
|
|
|
{
|
|
|
|
rInput.Seek( nCStreamPos );
|
|
|
|
SetLineNr( nCLineNr );
|
|
|
|
SetLinePos( nCLinePos );
|
2001-11-22 09:48:35 +00:00
|
|
|
ClearTxtConvContext();
|
2013-08-12 17:19:48 +02:00
|
|
|
aToken = "<%";
|
2000-09-18 16:07:07 +00:00
|
|
|
nRet = HTML_TEXTTOKEN;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if( IsParserWorking() )
|
|
|
|
{
|
|
|
|
sSaveToken = aToken;
|
2014-12-18 13:33:54 +01:00
|
|
|
aToken.clear();
|
2000-09-18 16:07:07 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2013-08-12 17:19:48 +02:00
|
|
|
aToken = "<";
|
2000-09-18 16:07:07 +00:00
|
|
|
nRet = HTML_TEXTTOKEN;
|
2011-07-22 15:02:30 -04:00
|
|
|
bNextCh = false;
|
2000-09-18 16:07:07 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if( IsParserWorking() )
|
|
|
|
{
|
|
|
|
bNextCh = '>' == nNextCh;
|
|
|
|
switch( nRet )
|
|
|
|
{
|
|
|
|
case HTML_TEXTAREA_ON:
|
2011-07-22 15:02:30 -04:00
|
|
|
bReadTextArea = true;
|
2000-09-18 16:07:07 +00:00
|
|
|
break;
|
|
|
|
case HTML_TEXTAREA_OFF:
|
2011-07-22 15:02:30 -04:00
|
|
|
bReadTextArea = false;
|
2000-09-18 16:07:07 +00:00
|
|
|
break;
|
|
|
|
case HTML_SCRIPT_ON:
|
|
|
|
if( !bReadTextArea )
|
2011-07-22 15:02:30 -04:00
|
|
|
bReadScript = true;
|
2000-09-18 16:07:07 +00:00
|
|
|
break;
|
|
|
|
case HTML_SCRIPT_OFF:
|
|
|
|
if( !bReadTextArea )
|
|
|
|
{
|
2011-07-22 15:02:30 -04:00
|
|
|
bReadScript = false;
|
2011-04-22 22:13:32 +02:00
|
|
|
// JavaScript might modify the stream,
|
|
|
|
// thus the last character has to be read again.
|
2011-07-22 15:02:30 -04:00
|
|
|
bReadNextChar = true;
|
|
|
|
bNextCh = false;
|
2000-09-18 16:07:07 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case HTML_STYLE_ON:
|
2011-07-22 15:02:30 -04:00
|
|
|
bReadStyle = true;
|
2000-09-18 16:07:07 +00:00
|
|
|
break;
|
|
|
|
case HTML_STYLE_OFF:
|
2011-07-22 15:02:30 -04:00
|
|
|
bReadStyle = false;
|
2000-09-18 16:07:07 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case sal_Unicode(EOF):
|
|
|
|
if( rInput.IsEof() )
|
|
|
|
{
|
|
|
|
eState = SVPAR_ACCEPTED;
|
|
|
|
nRet = nNextCh;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2011-04-22 22:13:32 +02:00
|
|
|
// Read normal text.
|
2000-09-18 16:07:07 +00:00
|
|
|
goto scan_text;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case '\f':
|
2011-04-22 22:13:32 +02:00
|
|
|
// form feeds are passed upwards separately
|
|
|
|
nRet = HTML_LINEFEEDCHAR; // !!! should be FORMFEEDCHAR
|
2000-09-18 16:07:07 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case '\n':
|
|
|
|
case '\r':
|
|
|
|
if( bReadListing || bReadXMP || bReadPRE || bReadTextArea )
|
|
|
|
{
|
|
|
|
sal_Unicode c = GetNextChar();
|
|
|
|
if( ( '\n' != nNextCh || '\r' != c ) &&
|
|
|
|
( '\r' != nNextCh || '\n' != c ) )
|
|
|
|
{
|
2011-07-22 15:02:30 -04:00
|
|
|
bNextCh = false;
|
2000-09-18 16:07:07 +00:00
|
|
|
nNextCh = c;
|
|
|
|
}
|
|
|
|
nRet = HTML_NEWPARA;
|
|
|
|
break;
|
|
|
|
}
|
2011-04-22 22:13:32 +02:00
|
|
|
// no break !
|
2000-09-18 16:07:07 +00:00
|
|
|
case '\t':
|
|
|
|
if( bReadPRE )
|
|
|
|
{
|
|
|
|
nRet = HTML_TABCHAR;
|
|
|
|
break;
|
|
|
|
}
|
2011-04-22 22:13:32 +02:00
|
|
|
// no break !
|
2000-09-18 16:07:07 +00:00
|
|
|
case ' ':
|
2011-04-22 22:13:32 +02:00
|
|
|
// no break !
|
2000-09-18 16:07:07 +00:00
|
|
|
default:
|
|
|
|
|
|
|
|
scan_text:
|
2011-04-22 22:13:32 +02:00
|
|
|
// "normal" text to come
|
2000-09-18 16:07:07 +00:00
|
|
|
nRet = ScanText();
|
2013-08-12 17:19:48 +02:00
|
|
|
bNextCh = 0 == aToken.getLength();
|
2000-09-18 16:07:07 +00:00
|
|
|
|
2011-04-22 22:13:32 +02:00
|
|
|
// the text should be processed
|
2000-09-18 16:07:07 +00:00
|
|
|
if( !bNextCh && eState == SVPAR_PENDING )
|
|
|
|
{
|
|
|
|
eState = SVPAR_WORKING;
|
2011-07-22 15:02:30 -04:00
|
|
|
bReadNextChar = true;
|
2000-09-18 16:07:07 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if( bNextCh && SVPAR_WORKING == eState )
|
|
|
|
{
|
|
|
|
nNextCh = GetNextChar();
|
|
|
|
if( SVPAR_PENDING == eState && nRet && HTML_TEXTTOKEN != nRet )
|
|
|
|
{
|
2011-07-22 15:02:30 -04:00
|
|
|
bReadNextChar = true;
|
2000-09-18 16:07:07 +00:00
|
|
|
eState = SVPAR_WORKING;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
} while( !nRet && SVPAR_WORKING == eState );
|
|
|
|
|
|
|
|
if( SVPAR_PENDING == eState )
|
2011-04-22 22:13:32 +02:00
|
|
|
nRet = -1; // s.th. invalid
|
2000-09-18 16:07:07 +00:00
|
|
|
|
|
|
|
return nRet;
|
|
|
|
}
|
|
|
|
|
|
|
|
void HTMLParser::UnescapeToken()
|
|
|
|
{
|
2013-11-13 10:45:15 +00:00
|
|
|
sal_Int32 nPos=0;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
2011-07-22 15:02:30 -04:00
|
|
|
bool bEscape = false;
|
2013-08-12 17:19:48 +02:00
|
|
|
while( nPos < aToken.getLength() )
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
2011-07-22 15:02:30 -04:00
|
|
|
bool bOldEscape = bEscape;
|
|
|
|
bEscape = false;
|
2013-08-12 17:19:48 +02:00
|
|
|
if( '\\'==aToken[nPos] && !bOldEscape )
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
2013-08-12 17:19:48 +02:00
|
|
|
aToken = aToken.replaceAt( nPos, 1, "" );
|
2011-07-22 15:02:30 -04:00
|
|
|
bEscape = true;
|
2000-09-18 16:07:07 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
nPos++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-08-12 17:19:48 +02:00
|
|
|
const HTMLOptions& HTMLParser::GetOptions( sal_uInt16 *pNoConvertToken )
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
2011-04-22 22:13:32 +02:00
|
|
|
// If the options for the current token have already been returned,
|
|
|
|
// return them once again.
|
2011-07-22 15:39:18 -04:00
|
|
|
if (!maOptions.empty())
|
|
|
|
return maOptions;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
2013-11-13 10:45:15 +00:00
|
|
|
sal_Int32 nPos = 0;
|
2013-08-12 17:19:48 +02:00
|
|
|
while( nPos < aToken.getLength() )
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
2011-04-22 22:13:32 +02:00
|
|
|
// A letter? Option beginning here.
|
2013-08-12 17:19:48 +02:00
|
|
|
if( HTML_ISALPHA( aToken[nPos] ) )
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
2006-10-12 14:28:10 +00:00
|
|
|
int nToken;
|
2013-08-20 15:15:13 +02:00
|
|
|
OUString aValue;
|
2013-11-13 10:45:15 +00:00
|
|
|
sal_Int32 nStt = nPos;
|
2006-06-19 20:26:23 +00:00
|
|
|
sal_Unicode cChar = 0;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
2011-04-22 22:13:32 +02:00
|
|
|
// Actually only certain characters allowed.
|
|
|
|
// Netscape only looks for "=" and white space (c.f.
|
|
|
|
// Mozilla: PA_FetchRequestedNameValues in lipparse/pa_mdl.c)
|
2013-08-12 17:19:48 +02:00
|
|
|
while( nPos < aToken.getLength() && '=' != (cChar=aToken[nPos]) &&
|
2006-06-19 20:26:23 +00:00
|
|
|
HTML_ISPRINTABLE(cChar) && !HTML_ISSPACE(cChar) )
|
2000-09-18 16:07:07 +00:00
|
|
|
nPos++;
|
|
|
|
|
2013-08-12 17:19:48 +02:00
|
|
|
OUString sName( aToken.copy( nStt, nPos-nStt ) );
|
2000-09-18 16:07:07 +00:00
|
|
|
|
2014-02-21 09:32:17 +00:00
|
|
|
// PlugIns require original token name. Convert to lower case only for searching.
|
|
|
|
nToken = GetHTMLOption( sName.toAsciiLowerCase() ); // Name is ready
|
2000-09-18 16:07:07 +00:00
|
|
|
DBG_ASSERTWARNING( nToken!=HTML_O_UNKNOWN,
|
2011-04-22 22:13:32 +02:00
|
|
|
"GetOption: unknown HTML option" );
|
2011-07-22 15:02:30 -04:00
|
|
|
bool bStripCRLF = (nToken < HTML_OPTION_SCRIPT_START ||
|
2000-09-18 16:07:07 +00:00
|
|
|
nToken >= HTML_OPTION_SCRIPT_END) &&
|
|
|
|
(!pNoConvertToken || nToken != *pNoConvertToken);
|
|
|
|
|
2013-08-12 17:19:48 +02:00
|
|
|
while( nPos < aToken.getLength() &&
|
|
|
|
( !HTML_ISPRINTABLE( (cChar=aToken[nPos]) ) ||
|
2006-06-19 20:26:23 +00:00
|
|
|
HTML_ISSPACE(cChar) ) )
|
2000-09-18 16:07:07 +00:00
|
|
|
nPos++;
|
|
|
|
|
2011-04-22 22:13:32 +02:00
|
|
|
// Option with value?
|
2013-08-12 17:19:48 +02:00
|
|
|
if( nPos!=aToken.getLength() && '='==cChar )
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
|
|
|
nPos++;
|
|
|
|
|
2013-08-12 17:19:48 +02:00
|
|
|
while( nPos < aToken.getLength() &&
|
|
|
|
( !HTML_ISPRINTABLE( (cChar=aToken[nPos]) ) ||
|
2006-06-19 20:26:23 +00:00
|
|
|
' '==cChar || '\t'==cChar || '\r'==cChar || '\n'==cChar ) )
|
2000-09-18 16:07:07 +00:00
|
|
|
nPos++;
|
|
|
|
|
2013-08-12 17:19:48 +02:00
|
|
|
if( nPos != aToken.getLength() )
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
2013-11-13 10:45:15 +00:00
|
|
|
sal_Int32 nLen = 0;
|
2000-09-18 16:07:07 +00:00
|
|
|
nStt = nPos;
|
2006-06-19 20:26:23 +00:00
|
|
|
if( ('"'==cChar) || ('\'')==cChar )
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
2006-06-19 20:26:23 +00:00
|
|
|
sal_Unicode cEnd = cChar;
|
2000-09-18 16:07:07 +00:00
|
|
|
nPos++; nStt++;
|
2011-07-22 15:02:30 -04:00
|
|
|
bool bDone = false;
|
|
|
|
bool bEscape = false;
|
2013-08-12 17:19:48 +02:00
|
|
|
while( nPos < aToken.getLength() && !bDone )
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
2011-07-22 15:02:30 -04:00
|
|
|
bool bOldEscape = bEscape;
|
|
|
|
bEscape = false;
|
2013-08-12 17:19:48 +02:00
|
|
|
cChar = aToken[nPos];
|
2006-06-19 20:26:23 +00:00
|
|
|
switch( cChar )
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
|
|
|
case '\r':
|
|
|
|
case '\n':
|
|
|
|
if( bStripCRLF )
|
2013-08-12 17:19:48 +02:00
|
|
|
aToken = aToken.replaceAt( nPos, 1, "" );
|
2000-09-18 16:07:07 +00:00
|
|
|
else
|
|
|
|
nPos++, nLen++;
|
|
|
|
break;
|
|
|
|
case '\\':
|
|
|
|
if( bOldEscape )
|
|
|
|
{
|
|
|
|
nPos++, nLen++;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2013-08-12 17:19:48 +02:00
|
|
|
aToken = aToken.replaceAt( nPos, 1, "" );
|
2011-07-22 15:02:30 -04:00
|
|
|
bEscape = true;
|
2000-09-18 16:07:07 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
case '"':
|
|
|
|
case '\'':
|
2006-06-19 20:26:23 +00:00
|
|
|
bDone = !bOldEscape && cChar==cEnd;
|
2000-09-18 16:07:07 +00:00
|
|
|
if( !bDone )
|
|
|
|
nPos++, nLen++;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
nPos++, nLen++;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2013-08-12 17:19:48 +02:00
|
|
|
if( nPos!=aToken.getLength() )
|
2000-09-18 16:07:07 +00:00
|
|
|
nPos++;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2011-04-22 22:13:32 +02:00
|
|
|
// More liberal than the standard: allow all printable characters
|
2011-07-22 15:02:30 -04:00
|
|
|
bool bEscape = false;
|
|
|
|
bool bDone = false;
|
2013-08-12 17:19:48 +02:00
|
|
|
while( nPos < aToken.getLength() && !bDone )
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
2011-07-22 15:02:30 -04:00
|
|
|
bool bOldEscape = bEscape;
|
|
|
|
bEscape = false;
|
2013-08-12 17:19:48 +02:00
|
|
|
sal_Unicode c = aToken[nPos];
|
2000-09-18 16:07:07 +00:00
|
|
|
switch( c )
|
|
|
|
{
|
|
|
|
case ' ':
|
|
|
|
bDone = !bOldEscape;
|
|
|
|
if( !bDone )
|
|
|
|
nPos++, nLen++;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case '\t':
|
|
|
|
case '\r':
|
|
|
|
case '\n':
|
2011-07-22 15:02:30 -04:00
|
|
|
bDone = true;
|
2000-09-18 16:07:07 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case '\\':
|
|
|
|
if( bOldEscape )
|
|
|
|
{
|
|
|
|
nPos++, nLen++;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2013-08-12 17:19:48 +02:00
|
|
|
aToken = aToken.replaceAt( nPos, 1, "" );
|
2011-07-22 15:02:30 -04:00
|
|
|
bEscape = true;
|
2000-09-18 16:07:07 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
if( HTML_ISPRINTABLE( c ) )
|
|
|
|
nPos++, nLen++;
|
|
|
|
else
|
2011-07-22 15:02:30 -04:00
|
|
|
bDone = true;
|
2000-09-18 16:07:07 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if( nLen )
|
2013-08-12 17:19:48 +02:00
|
|
|
aValue = aToken.copy( nStt, nLen );
|
2000-09-18 16:07:07 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-04-22 22:13:32 +02:00
|
|
|
// Token is known and can be saved
|
2014-09-29 13:56:43 +02:00
|
|
|
std::unique_ptr<HTMLOption> pOption(
|
2011-07-22 15:39:18 -04:00
|
|
|
new HTMLOption(sal::static_int_cast<sal_uInt16>(nToken), sName, aValue));
|
2000-09-18 16:07:07 +00:00
|
|
|
|
2014-09-30 16:05:43 +02:00
|
|
|
o3tl::ptr_container::push_back(maOptions, std::move(pOption));
|
2000-09-18 16:07:07 +00:00
|
|
|
}
|
|
|
|
else
|
2011-04-22 22:13:32 +02:00
|
|
|
// Ignore white space and unexpected characters
|
2000-09-18 16:07:07 +00:00
|
|
|
nPos++;
|
|
|
|
}
|
|
|
|
|
2011-07-22 15:39:18 -04:00
|
|
|
return maOptions;
|
2000-09-18 16:07:07 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
int HTMLParser::FilterPRE( int nToken )
|
|
|
|
{
|
|
|
|
switch( nToken )
|
|
|
|
{
|
2011-04-22 22:13:32 +02:00
|
|
|
// in Netscape they only have impact in not empty paragraphs
|
2000-09-18 16:07:07 +00:00
|
|
|
case HTML_PARABREAK_ON:
|
|
|
|
nToken = HTML_LINEBREAK;
|
2014-06-05 10:23:27 +01:00
|
|
|
//fall-through
|
2000-09-18 16:07:07 +00:00
|
|
|
case HTML_LINEBREAK:
|
|
|
|
case HTML_NEWPARA:
|
2006-10-12 14:28:10 +00:00
|
|
|
nPre_LinePos = 0;
|
2000-09-18 16:07:07 +00:00
|
|
|
if( bPre_IgnoreNewPara )
|
|
|
|
nToken = 0;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case HTML_TABCHAR:
|
|
|
|
{
|
2012-08-29 11:22:25 +01:00
|
|
|
sal_Int32 nSpaces = (8 - (nPre_LinePos % 8));
|
2013-08-12 17:19:48 +02:00
|
|
|
DBG_ASSERT( aToken.isEmpty(), "Why is the token not empty?" );
|
|
|
|
if (aToken.getLength() < nSpaces)
|
2012-08-29 11:22:25 +01:00
|
|
|
{
|
|
|
|
using comphelper::string::padToLength;
|
|
|
|
OUStringBuffer aBuf(aToken);
|
|
|
|
aToken = padToLength(aBuf, nSpaces, ' ').makeStringAndClear();
|
|
|
|
}
|
2000-09-18 16:07:07 +00:00
|
|
|
nPre_LinePos += nSpaces;
|
|
|
|
nToken = HTML_TEXTTOKEN;
|
|
|
|
}
|
|
|
|
break;
|
2011-04-22 22:13:32 +02:00
|
|
|
// Keep those
|
2000-09-18 16:07:07 +00:00
|
|
|
case HTML_TEXTTOKEN:
|
2013-08-12 17:19:48 +02:00
|
|
|
nPre_LinePos += aToken.getLength();
|
2000-09-18 16:07:07 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case HTML_SELECT_ON:
|
|
|
|
case HTML_SELECT_OFF:
|
|
|
|
case HTML_BODY_ON:
|
|
|
|
case HTML_FORM_ON:
|
|
|
|
case HTML_FORM_OFF:
|
|
|
|
case HTML_INPUT:
|
|
|
|
case HTML_OPTION:
|
|
|
|
case HTML_TEXTAREA_ON:
|
|
|
|
case HTML_TEXTAREA_OFF:
|
|
|
|
|
|
|
|
case HTML_IMAGE:
|
|
|
|
case HTML_APPLET_ON:
|
|
|
|
case HTML_APPLET_OFF:
|
|
|
|
case HTML_PARAM:
|
|
|
|
case HTML_EMBED:
|
|
|
|
|
|
|
|
case HTML_HEAD1_ON:
|
|
|
|
case HTML_HEAD1_OFF:
|
|
|
|
case HTML_HEAD2_ON:
|
|
|
|
case HTML_HEAD2_OFF:
|
|
|
|
case HTML_HEAD3_ON:
|
|
|
|
case HTML_HEAD3_OFF:
|
|
|
|
case HTML_HEAD4_ON:
|
|
|
|
case HTML_HEAD4_OFF:
|
|
|
|
case HTML_HEAD5_ON:
|
|
|
|
case HTML_HEAD5_OFF:
|
|
|
|
case HTML_HEAD6_ON:
|
|
|
|
case HTML_HEAD6_OFF:
|
|
|
|
case HTML_BLOCKQUOTE_ON:
|
|
|
|
case HTML_BLOCKQUOTE_OFF:
|
|
|
|
case HTML_ADDRESS_ON:
|
|
|
|
case HTML_ADDRESS_OFF:
|
|
|
|
case HTML_HORZRULE:
|
|
|
|
|
|
|
|
case HTML_CENTER_ON:
|
|
|
|
case HTML_CENTER_OFF:
|
|
|
|
case HTML_DIVISION_ON:
|
|
|
|
case HTML_DIVISION_OFF:
|
|
|
|
|
|
|
|
case HTML_SCRIPT_ON:
|
|
|
|
case HTML_SCRIPT_OFF:
|
|
|
|
case HTML_RAWDATA:
|
|
|
|
|
|
|
|
case HTML_TABLE_ON:
|
|
|
|
case HTML_TABLE_OFF:
|
|
|
|
case HTML_CAPTION_ON:
|
|
|
|
case HTML_CAPTION_OFF:
|
|
|
|
case HTML_COLGROUP_ON:
|
|
|
|
case HTML_COLGROUP_OFF:
|
|
|
|
case HTML_COL_ON:
|
|
|
|
case HTML_COL_OFF:
|
|
|
|
case HTML_THEAD_ON:
|
|
|
|
case HTML_THEAD_OFF:
|
|
|
|
case HTML_TFOOT_ON:
|
|
|
|
case HTML_TFOOT_OFF:
|
|
|
|
case HTML_TBODY_ON:
|
|
|
|
case HTML_TBODY_OFF:
|
|
|
|
case HTML_TABLEROW_ON:
|
|
|
|
case HTML_TABLEROW_OFF:
|
|
|
|
case HTML_TABLEDATA_ON:
|
|
|
|
case HTML_TABLEDATA_OFF:
|
|
|
|
case HTML_TABLEHEADER_ON:
|
|
|
|
case HTML_TABLEHEADER_OFF:
|
|
|
|
|
|
|
|
case HTML_ANCHOR_ON:
|
|
|
|
case HTML_ANCHOR_OFF:
|
|
|
|
case HTML_BOLD_ON:
|
|
|
|
case HTML_BOLD_OFF:
|
|
|
|
case HTML_ITALIC_ON:
|
|
|
|
case HTML_ITALIC_OFF:
|
2005-01-05 12:29:27 +00:00
|
|
|
case HTML_STRIKE_ON:
|
|
|
|
case HTML_STRIKE_OFF:
|
|
|
|
case HTML_STRIKETHROUGH_ON:
|
|
|
|
case HTML_STRIKETHROUGH_OFF:
|
2000-09-18 16:07:07 +00:00
|
|
|
case HTML_UNDERLINE_ON:
|
|
|
|
case HTML_UNDERLINE_OFF:
|
|
|
|
case HTML_BASEFONT_ON:
|
|
|
|
case HTML_BASEFONT_OFF:
|
|
|
|
case HTML_FONT_ON:
|
|
|
|
case HTML_FONT_OFF:
|
|
|
|
case HTML_BLINK_ON:
|
|
|
|
case HTML_BLINK_OFF:
|
|
|
|
case HTML_SPAN_ON:
|
|
|
|
case HTML_SPAN_OFF:
|
2005-01-05 12:29:27 +00:00
|
|
|
case HTML_SUBSCRIPT_ON:
|
|
|
|
case HTML_SUBSCRIPT_OFF:
|
|
|
|
case HTML_SUPERSCRIPT_ON:
|
|
|
|
case HTML_SUPERSCRIPT_OFF:
|
|
|
|
case HTML_BIGPRINT_ON:
|
|
|
|
case HTML_BIGPRINT_OFF:
|
|
|
|
case HTML_SMALLPRINT_OFF:
|
|
|
|
case HTML_SMALLPRINT_ON:
|
|
|
|
|
|
|
|
case HTML_EMPHASIS_ON:
|
|
|
|
case HTML_EMPHASIS_OFF:
|
|
|
|
case HTML_CITIATION_ON:
|
|
|
|
case HTML_CITIATION_OFF:
|
|
|
|
case HTML_STRONG_ON:
|
|
|
|
case HTML_STRONG_OFF:
|
|
|
|
case HTML_CODE_ON:
|
|
|
|
case HTML_CODE_OFF:
|
|
|
|
case HTML_SAMPLE_ON:
|
|
|
|
case HTML_SAMPLE_OFF:
|
|
|
|
case HTML_KEYBOARD_ON:
|
|
|
|
case HTML_KEYBOARD_OFF:
|
|
|
|
case HTML_VARIABLE_ON:
|
|
|
|
case HTML_VARIABLE_OFF:
|
|
|
|
case HTML_DEFINSTANCE_ON:
|
|
|
|
case HTML_DEFINSTANCE_OFF:
|
|
|
|
case HTML_SHORTQUOTE_ON:
|
|
|
|
case HTML_SHORTQUOTE_OFF:
|
|
|
|
case HTML_LANGUAGE_ON:
|
|
|
|
case HTML_LANGUAGE_OFF:
|
|
|
|
case HTML_AUTHOR_ON:
|
|
|
|
case HTML_AUTHOR_OFF:
|
|
|
|
case HTML_PERSON_ON:
|
|
|
|
case HTML_PERSON_OFF:
|
|
|
|
case HTML_ACRONYM_ON:
|
|
|
|
case HTML_ACRONYM_OFF:
|
|
|
|
case HTML_ABBREVIATION_ON:
|
|
|
|
case HTML_ABBREVIATION_OFF:
|
|
|
|
case HTML_INSERTEDTEXT_ON:
|
|
|
|
case HTML_INSERTEDTEXT_OFF:
|
|
|
|
case HTML_DELETEDTEXT_ON:
|
|
|
|
case HTML_DELETEDTEXT_OFF:
|
|
|
|
case HTML_TELETYPE_ON:
|
|
|
|
case HTML_TELETYPE_OFF:
|
|
|
|
|
2000-09-18 16:07:07 +00:00
|
|
|
break;
|
|
|
|
|
2011-04-22 22:13:32 +02:00
|
|
|
// The remainder is treated as an unknown token.
|
2000-09-18 16:07:07 +00:00
|
|
|
default:
|
|
|
|
if( nToken )
|
|
|
|
{
|
|
|
|
nToken =
|
|
|
|
( ((HTML_TOKEN_ONOFF & nToken) && (1 & nToken))
|
|
|
|
? HTML_UNKNOWNCONTROL_OFF
|
|
|
|
: HTML_UNKNOWNCONTROL_ON );
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2011-07-22 15:02:30 -04:00
|
|
|
bPre_IgnoreNewPara = false;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
|
|
|
return nToken;
|
|
|
|
}
|
|
|
|
|
|
|
|
int HTMLParser::FilterXMP( int nToken )
|
|
|
|
{
|
|
|
|
switch( nToken )
|
|
|
|
{
|
|
|
|
case HTML_NEWPARA:
|
|
|
|
if( bPre_IgnoreNewPara )
|
|
|
|
nToken = 0;
|
|
|
|
case HTML_TEXTTOKEN:
|
|
|
|
case HTML_NONBREAKSPACE:
|
|
|
|
case HTML_SOFTHYPH:
|
2011-04-22 22:13:32 +02:00
|
|
|
break; // kept
|
2000-09-18 16:07:07 +00:00
|
|
|
|
|
|
|
default:
|
|
|
|
if( nToken )
|
|
|
|
{
|
|
|
|
if( (HTML_TOKEN_ONOFF & nToken) && (1 & nToken) )
|
|
|
|
{
|
2013-08-14 09:49:17 +02:00
|
|
|
sSaveToken = "</" + sSaveToken;
|
2000-09-18 16:07:07 +00:00
|
|
|
}
|
|
|
|
else
|
2013-08-14 09:49:17 +02:00
|
|
|
sSaveToken = "<" + sSaveToken;
|
2013-08-12 17:19:48 +02:00
|
|
|
if( !aToken.isEmpty() )
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
|
|
|
UnescapeToken();
|
2013-08-14 09:49:17 +02:00
|
|
|
sSaveToken += " ";
|
2013-08-15 09:40:09 +01:00
|
|
|
aToken = sSaveToken + aToken;
|
2000-09-18 16:07:07 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
aToken = sSaveToken;
|
2013-08-12 17:19:48 +02:00
|
|
|
aToken += ">";
|
2000-09-18 16:07:07 +00:00
|
|
|
nToken = HTML_TEXTTOKEN;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2011-07-22 15:02:30 -04:00
|
|
|
bPre_IgnoreNewPara = false;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
|
|
|
return nToken;
|
|
|
|
}
|
|
|
|
|
|
|
|
int HTMLParser::FilterListing( int nToken )
|
|
|
|
{
|
|
|
|
switch( nToken )
|
|
|
|
{
|
|
|
|
case HTML_NEWPARA:
|
|
|
|
if( bPre_IgnoreNewPara )
|
|
|
|
nToken = 0;
|
|
|
|
case HTML_TEXTTOKEN:
|
|
|
|
case HTML_NONBREAKSPACE:
|
|
|
|
case HTML_SOFTHYPH:
|
2011-04-22 22:13:32 +02:00
|
|
|
break; // kept
|
2000-09-18 16:07:07 +00:00
|
|
|
|
|
|
|
default:
|
|
|
|
if( nToken )
|
|
|
|
{
|
|
|
|
nToken =
|
|
|
|
( ((HTML_TOKEN_ONOFF & nToken) && (1 & nToken))
|
|
|
|
? HTML_UNKNOWNCONTROL_OFF
|
|
|
|
: HTML_UNKNOWNCONTROL_ON );
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2011-07-22 15:02:30 -04:00
|
|
|
bPre_IgnoreNewPara = false;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
|
|
|
return nToken;
|
|
|
|
}
|
|
|
|
|
2013-08-14 09:49:17 +02:00
|
|
|
bool HTMLParser::InternalImgToPrivateURL( OUString& rURL )
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
2011-07-22 15:02:30 -04:00
|
|
|
bool bFound = false;
|
2000-09-18 16:07:07 +00:00
|
|
|
|
2015-03-13 22:32:14 -06:00
|
|
|
if( rURL.startsWith( OOO_STRING_SVTOOLS_HTML_internal_icon ) )
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
2013-08-14 09:49:17 +02:00
|
|
|
OUString aName( rURL.copy(14) );
|
|
|
|
switch( aName[0] )
|
2000-09-18 16:07:07 +00:00
|
|
|
{
|
|
|
|
case 'b':
|
2013-08-14 09:49:17 +02:00
|
|
|
bFound = aName == OOO_STRING_SVTOOLS_HTML_INT_ICON_baddata;
|
2000-09-18 16:07:07 +00:00
|
|
|
break;
|
|
|
|
case 'd':
|
2013-08-14 09:49:17 +02:00
|
|
|
bFound = aName == OOO_STRING_SVTOOLS_HTML_INT_ICON_delayed;
|
2000-09-18 16:07:07 +00:00
|
|
|
break;
|
|
|
|
case 'e':
|
2013-08-14 09:49:17 +02:00
|
|
|
bFound = aName == OOO_STRING_SVTOOLS_HTML_INT_ICON_embed;
|
2000-09-18 16:07:07 +00:00
|
|
|
break;
|
|
|
|
case 'i':
|
2013-08-14 09:49:17 +02:00
|
|
|
bFound = aName == OOO_STRING_SVTOOLS_HTML_INT_ICON_insecure;
|
2000-09-18 16:07:07 +00:00
|
|
|
break;
|
|
|
|
case 'n':
|
2013-08-14 09:49:17 +02:00
|
|
|
bFound = aName == OOO_STRING_SVTOOLS_HTML_INT_ICON_notfound;
|
2000-09-18 16:07:07 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if( bFound )
|
|
|
|
{
|
2013-08-14 09:49:17 +02:00
|
|
|
OUString sTmp ( rURL );
|
|
|
|
rURL = OOO_STRING_SVTOOLS_HTML_private_image;
|
|
|
|
rURL += sTmp;
|
2000-09-18 16:07:07 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return bFound;
|
|
|
|
}
|
|
|
|
|
CWS-TOOLING: integrate CWS fwk103
2009-05-26 12:44:25 +0200 mst r272292 : #i100727#
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx:
+ fix warning: rename method to prevent overloading
2009-05-19 13:42:31 +0200 mav r272075 : #i101356# add comment
2009-05-19 10:56:24 +0200 mav r272062 : #i101356# register the singleton correctly
2009-05-19 10:25:42 +0200 mav r272060 : #i101356# register the singleton correctly
2009-05-18 12:48:48 +0200 mav r272013 : #i91306# fix the typo
2009-05-14 08:50:06 +0200 mav r271871 : #i101356# reduce the amount of macros
2009-05-13 13:26:08 +0200 mav r271858 : #i101356# reduce the amount of macros
2009-05-13 11:29:16 +0200 mav r271849 : #i101356# reduce the amount of macros
2009-05-12 12:09:42 +0200 mav r271815 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 12:03:20 +0200 mav r271814 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:58:48 +0200 mav r271813 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:53:05 +0200 mav r271812 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:48:36 +0200 mav r271810 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:43:45 +0200 mav r271809 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:39:38 +0200 mav r271808 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:37:38 +0200 mav r271806 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:33:58 +0200 mav r271805 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:30:01 +0200 mav r271804 : #i101356# allow to generate a small log if a document can not be stored
2009-05-06 17:43:38 +0200 mst r271607 : #i100727#
- svtools/source/svhtml/parhtml.cxx:
+ adapt code to renaming of HTML constants (sb107)
2009-05-05 11:14:18 +0200 mav r271507 : #i101222# avoid warning
2009-05-05 10:27:23 +0200 mav r271505 : #i101426# send the modified() notification only when the document can be modified
2009-05-05 10:25:07 +0200 mav r271504 : #i101426# send the modified() notification only when the document is modified
2009-05-05 08:42:48 +0200 mav r271497 : CWS-TOOLING: rebase CWS fwk103 to trunk@271427 (milestone: DEV300:m47)
2009-04-30 13:32:11 +0200 mav r271412 : #i100518# check the template folders quietly
2009-04-29 20:04:25 +0200 mst r271393 : - sw/source/filter/html/swhtml.cxx:
+ fix wrong initialization order in constructor
2009-04-28 12:28:46 +0200 mav r271319 : #i99142# set the error correctly
2009-04-28 08:44:48 +0200 mav r271305 : #i99050# clear hidden flag if necessary
2009-04-28 08:40:10 +0200 mav r271304 : #i99050# avoid crash
2009-04-22 07:40:11 +0200 mav r271056 : #i101093# lets not affect the performance
2009-04-15 09:30:47 +0200 cd r270820 : #i99771# Fix warnings for gcc 4.4
2009-04-15 09:19:52 +0200 cd r270819 : #i99771# Fix warnings for gcc 4.4
2009-04-15 08:42:34 +0200 cd r270817 : #i99771# Fix warnings for gcc 4.4
2009-04-14 14:31:01 +0200 mav r270768 : #i99493# fix typo
2009-04-01 12:45:43 +0200 mst r270317 : fix #i100727#
- svtools/inc/svtools/svparser.hxx, svtools/source/svrtf/svparser.cxx,
sfx2/inc/sfx2/docfile.hxx, sfx2/source/doc/{objmisc.cxx,docfile.cxx}:
+ move SvKeyValue stuff from sfx2 to svtools
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx,
sfx2/inc/sfx2/sfxhtml.hxx, sfx2/source/bastyp/sfxhtml.cxx:
+ move ParseMetaOptions() and GetEncodingByMIME() from SfxHTMLParser (sfx2)
to HTMLParser (svtools)
+ make HTMLParser::ParseMetaOptions() a virtual function
+ HTMLParser::ParseMetaOptions() calls GetExtendedCompatibilityTextEncoding()
+ new template method HTMLParser::AddMetaUserDefined()
- svtools/source/svhtml/makefile.mk:
+ enable exceptions for parhtml.cxx
- dbaccess/source/ui/misc/HtmlReader.cxx,
sc/source/filter/html/htmlpars.cxx:
+ remove encoding related code duplication
- sw/source/filter/html/{swhtml{.hxx,.cxx},htmlfld.cxx}:
+ new SwHTMLParser::AddMetaUserDefined() for import of
DOCINFO field subtypes INFO[1-4]
+ do not use DocumentInfo for import of DOCINFO field subtypes INFO[1-4]
2009-03-31 17:01:35 +0200 mav r270288 : #i91214# fix typo
2009-03-31 15:19:41 +0200 mav r270285 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 15:00:36 +0200 mav r270284 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 12:19:13 +0200 mav r270270 : #i100123# taking the lock file over throws no exception
2009-03-30 13:57:21 +0200 mav r270227 : #i100351# fix the typo
2009-03-30 13:47:26 +0200 mav r270225 : #i99885# let OK be default button
2009-03-29 19:38:55 +0200 mav r270190 : CWS-TOOLING: rebase CWS fwk103 to trunk@270033 (milestone: DEV300:m45)
2009-03-16 16:39:48 +0100 mav r269558 : #i93558# convert the attributes as well
2009-03-13 15:35:55 +0100 mav r269488 : #i93558# improve manifest.xml parsing
2009-03-13 08:47:00 +0100 mav r269454 : #i96205# allow to remove password on SaveAs
2009-03-12 13:36:07 +0100 mav r269398 : #i91306# show special error in case of shared document
2009-03-12 13:33:35 +0100 mav r269397 : #i91306# introduce the new error-message
2009-03-12 11:40:42 +0100 mst r269378 : fix #i90877#
- svtools/source/uno/unoevent.cxx:
+ use proper operator delete[]
2009-02-26 15:23:10 +0100 mav r268526 : #i91214# do not use ATL
2009-02-26 14:19:06 +0100 mav r268516 : #i98909# integrate the patch
2009-02-10 17:29:52 +0100 cd r267568 : #i98649# Make sure that we catch the NoSuchElementException when a module is not installed.
2009-06-16 16:15:54 +00:00
|
|
|
enum eHtmlMetas {
|
|
|
|
HTML_META_NONE = 0,
|
|
|
|
HTML_META_AUTHOR,
|
|
|
|
HTML_META_DESCRIPTION,
|
|
|
|
HTML_META_KEYWORDS,
|
|
|
|
HTML_META_REFRESH,
|
|
|
|
HTML_META_CLASSIFICATION,
|
|
|
|
HTML_META_CREATED,
|
|
|
|
HTML_META_CHANGEDBY,
|
|
|
|
HTML_META_CHANGED,
|
|
|
|
HTML_META_GENERATOR,
|
|
|
|
HTML_META_SDFOOTNOTE,
|
|
|
|
HTML_META_SDENDNOTE,
|
|
|
|
HTML_META_CONTENT_TYPE
|
|
|
|
};
|
|
|
|
|
|
|
|
// <META NAME=xxx>
|
2010-12-12 10:14:17 +01:00
|
|
|
static HTMLOptionEnum const aHTMLMetaNameTable[] =
|
CWS-TOOLING: integrate CWS fwk103
2009-05-26 12:44:25 +0200 mst r272292 : #i100727#
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx:
+ fix warning: rename method to prevent overloading
2009-05-19 13:42:31 +0200 mav r272075 : #i101356# add comment
2009-05-19 10:56:24 +0200 mav r272062 : #i101356# register the singleton correctly
2009-05-19 10:25:42 +0200 mav r272060 : #i101356# register the singleton correctly
2009-05-18 12:48:48 +0200 mav r272013 : #i91306# fix the typo
2009-05-14 08:50:06 +0200 mav r271871 : #i101356# reduce the amount of macros
2009-05-13 13:26:08 +0200 mav r271858 : #i101356# reduce the amount of macros
2009-05-13 11:29:16 +0200 mav r271849 : #i101356# reduce the amount of macros
2009-05-12 12:09:42 +0200 mav r271815 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 12:03:20 +0200 mav r271814 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:58:48 +0200 mav r271813 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:53:05 +0200 mav r271812 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:48:36 +0200 mav r271810 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:43:45 +0200 mav r271809 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:39:38 +0200 mav r271808 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:37:38 +0200 mav r271806 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:33:58 +0200 mav r271805 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:30:01 +0200 mav r271804 : #i101356# allow to generate a small log if a document can not be stored
2009-05-06 17:43:38 +0200 mst r271607 : #i100727#
- svtools/source/svhtml/parhtml.cxx:
+ adapt code to renaming of HTML constants (sb107)
2009-05-05 11:14:18 +0200 mav r271507 : #i101222# avoid warning
2009-05-05 10:27:23 +0200 mav r271505 : #i101426# send the modified() notification only when the document can be modified
2009-05-05 10:25:07 +0200 mav r271504 : #i101426# send the modified() notification only when the document is modified
2009-05-05 08:42:48 +0200 mav r271497 : CWS-TOOLING: rebase CWS fwk103 to trunk@271427 (milestone: DEV300:m47)
2009-04-30 13:32:11 +0200 mav r271412 : #i100518# check the template folders quietly
2009-04-29 20:04:25 +0200 mst r271393 : - sw/source/filter/html/swhtml.cxx:
+ fix wrong initialization order in constructor
2009-04-28 12:28:46 +0200 mav r271319 : #i99142# set the error correctly
2009-04-28 08:44:48 +0200 mav r271305 : #i99050# clear hidden flag if necessary
2009-04-28 08:40:10 +0200 mav r271304 : #i99050# avoid crash
2009-04-22 07:40:11 +0200 mav r271056 : #i101093# lets not affect the performance
2009-04-15 09:30:47 +0200 cd r270820 : #i99771# Fix warnings for gcc 4.4
2009-04-15 09:19:52 +0200 cd r270819 : #i99771# Fix warnings for gcc 4.4
2009-04-15 08:42:34 +0200 cd r270817 : #i99771# Fix warnings for gcc 4.4
2009-04-14 14:31:01 +0200 mav r270768 : #i99493# fix typo
2009-04-01 12:45:43 +0200 mst r270317 : fix #i100727#
- svtools/inc/svtools/svparser.hxx, svtools/source/svrtf/svparser.cxx,
sfx2/inc/sfx2/docfile.hxx, sfx2/source/doc/{objmisc.cxx,docfile.cxx}:
+ move SvKeyValue stuff from sfx2 to svtools
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx,
sfx2/inc/sfx2/sfxhtml.hxx, sfx2/source/bastyp/sfxhtml.cxx:
+ move ParseMetaOptions() and GetEncodingByMIME() from SfxHTMLParser (sfx2)
to HTMLParser (svtools)
+ make HTMLParser::ParseMetaOptions() a virtual function
+ HTMLParser::ParseMetaOptions() calls GetExtendedCompatibilityTextEncoding()
+ new template method HTMLParser::AddMetaUserDefined()
- svtools/source/svhtml/makefile.mk:
+ enable exceptions for parhtml.cxx
- dbaccess/source/ui/misc/HtmlReader.cxx,
sc/source/filter/html/htmlpars.cxx:
+ remove encoding related code duplication
- sw/source/filter/html/{swhtml{.hxx,.cxx},htmlfld.cxx}:
+ new SwHTMLParser::AddMetaUserDefined() for import of
DOCINFO field subtypes INFO[1-4]
+ do not use DocumentInfo for import of DOCINFO field subtypes INFO[1-4]
2009-03-31 17:01:35 +0200 mav r270288 : #i91214# fix typo
2009-03-31 15:19:41 +0200 mav r270285 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 15:00:36 +0200 mav r270284 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 12:19:13 +0200 mav r270270 : #i100123# taking the lock file over throws no exception
2009-03-30 13:57:21 +0200 mav r270227 : #i100351# fix the typo
2009-03-30 13:47:26 +0200 mav r270225 : #i99885# let OK be default button
2009-03-29 19:38:55 +0200 mav r270190 : CWS-TOOLING: rebase CWS fwk103 to trunk@270033 (milestone: DEV300:m45)
2009-03-16 16:39:48 +0100 mav r269558 : #i93558# convert the attributes as well
2009-03-13 15:35:55 +0100 mav r269488 : #i93558# improve manifest.xml parsing
2009-03-13 08:47:00 +0100 mav r269454 : #i96205# allow to remove password on SaveAs
2009-03-12 13:36:07 +0100 mav r269398 : #i91306# show special error in case of shared document
2009-03-12 13:33:35 +0100 mav r269397 : #i91306# introduce the new error-message
2009-03-12 11:40:42 +0100 mst r269378 : fix #i90877#
- svtools/source/uno/unoevent.cxx:
+ use proper operator delete[]
2009-02-26 15:23:10 +0100 mav r268526 : #i91214# do not use ATL
2009-02-26 14:19:06 +0100 mav r268516 : #i98909# integrate the patch
2009-02-10 17:29:52 +0100 cd r267568 : #i98649# Make sure that we catch the NoSuchElementException when a module is not installed.
2009-06-16 16:15:54 +00:00
|
|
|
{
|
|
|
|
{ OOO_STRING_SVTOOLS_HTML_META_author, HTML_META_AUTHOR },
|
|
|
|
{ OOO_STRING_SVTOOLS_HTML_META_changed, HTML_META_CHANGED },
|
|
|
|
{ OOO_STRING_SVTOOLS_HTML_META_changedby, HTML_META_CHANGEDBY },
|
|
|
|
{ OOO_STRING_SVTOOLS_HTML_META_classification,HTML_META_CLASSIFICATION},
|
|
|
|
{ OOO_STRING_SVTOOLS_HTML_META_content_type, HTML_META_CONTENT_TYPE },
|
|
|
|
{ OOO_STRING_SVTOOLS_HTML_META_created, HTML_META_CREATED },
|
|
|
|
{ OOO_STRING_SVTOOLS_HTML_META_description, HTML_META_DESCRIPTION },
|
|
|
|
{ OOO_STRING_SVTOOLS_HTML_META_keywords, HTML_META_KEYWORDS },
|
|
|
|
{ OOO_STRING_SVTOOLS_HTML_META_generator, HTML_META_GENERATOR },
|
|
|
|
{ OOO_STRING_SVTOOLS_HTML_META_refresh, HTML_META_REFRESH },
|
|
|
|
{ OOO_STRING_SVTOOLS_HTML_META_sdendnote, HTML_META_SDENDNOTE },
|
|
|
|
{ OOO_STRING_SVTOOLS_HTML_META_sdfootnote, HTML_META_SDFOOTNOTE },
|
|
|
|
{ 0, 0 }
|
|
|
|
};
|
|
|
|
|
|
|
|
|
2013-04-07 12:06:47 +02:00
|
|
|
void HTMLParser::AddMetaUserDefined( OUString const & )
|
CWS-TOOLING: integrate CWS fwk103
2009-05-26 12:44:25 +0200 mst r272292 : #i100727#
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx:
+ fix warning: rename method to prevent overloading
2009-05-19 13:42:31 +0200 mav r272075 : #i101356# add comment
2009-05-19 10:56:24 +0200 mav r272062 : #i101356# register the singleton correctly
2009-05-19 10:25:42 +0200 mav r272060 : #i101356# register the singleton correctly
2009-05-18 12:48:48 +0200 mav r272013 : #i91306# fix the typo
2009-05-14 08:50:06 +0200 mav r271871 : #i101356# reduce the amount of macros
2009-05-13 13:26:08 +0200 mav r271858 : #i101356# reduce the amount of macros
2009-05-13 11:29:16 +0200 mav r271849 : #i101356# reduce the amount of macros
2009-05-12 12:09:42 +0200 mav r271815 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 12:03:20 +0200 mav r271814 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:58:48 +0200 mav r271813 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:53:05 +0200 mav r271812 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:48:36 +0200 mav r271810 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:43:45 +0200 mav r271809 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:39:38 +0200 mav r271808 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:37:38 +0200 mav r271806 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:33:58 +0200 mav r271805 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:30:01 +0200 mav r271804 : #i101356# allow to generate a small log if a document can not be stored
2009-05-06 17:43:38 +0200 mst r271607 : #i100727#
- svtools/source/svhtml/parhtml.cxx:
+ adapt code to renaming of HTML constants (sb107)
2009-05-05 11:14:18 +0200 mav r271507 : #i101222# avoid warning
2009-05-05 10:27:23 +0200 mav r271505 : #i101426# send the modified() notification only when the document can be modified
2009-05-05 10:25:07 +0200 mav r271504 : #i101426# send the modified() notification only when the document is modified
2009-05-05 08:42:48 +0200 mav r271497 : CWS-TOOLING: rebase CWS fwk103 to trunk@271427 (milestone: DEV300:m47)
2009-04-30 13:32:11 +0200 mav r271412 : #i100518# check the template folders quietly
2009-04-29 20:04:25 +0200 mst r271393 : - sw/source/filter/html/swhtml.cxx:
+ fix wrong initialization order in constructor
2009-04-28 12:28:46 +0200 mav r271319 : #i99142# set the error correctly
2009-04-28 08:44:48 +0200 mav r271305 : #i99050# clear hidden flag if necessary
2009-04-28 08:40:10 +0200 mav r271304 : #i99050# avoid crash
2009-04-22 07:40:11 +0200 mav r271056 : #i101093# lets not affect the performance
2009-04-15 09:30:47 +0200 cd r270820 : #i99771# Fix warnings for gcc 4.4
2009-04-15 09:19:52 +0200 cd r270819 : #i99771# Fix warnings for gcc 4.4
2009-04-15 08:42:34 +0200 cd r270817 : #i99771# Fix warnings for gcc 4.4
2009-04-14 14:31:01 +0200 mav r270768 : #i99493# fix typo
2009-04-01 12:45:43 +0200 mst r270317 : fix #i100727#
- svtools/inc/svtools/svparser.hxx, svtools/source/svrtf/svparser.cxx,
sfx2/inc/sfx2/docfile.hxx, sfx2/source/doc/{objmisc.cxx,docfile.cxx}:
+ move SvKeyValue stuff from sfx2 to svtools
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx,
sfx2/inc/sfx2/sfxhtml.hxx, sfx2/source/bastyp/sfxhtml.cxx:
+ move ParseMetaOptions() and GetEncodingByMIME() from SfxHTMLParser (sfx2)
to HTMLParser (svtools)
+ make HTMLParser::ParseMetaOptions() a virtual function
+ HTMLParser::ParseMetaOptions() calls GetExtendedCompatibilityTextEncoding()
+ new template method HTMLParser::AddMetaUserDefined()
- svtools/source/svhtml/makefile.mk:
+ enable exceptions for parhtml.cxx
- dbaccess/source/ui/misc/HtmlReader.cxx,
sc/source/filter/html/htmlpars.cxx:
+ remove encoding related code duplication
- sw/source/filter/html/{swhtml{.hxx,.cxx},htmlfld.cxx}:
+ new SwHTMLParser::AddMetaUserDefined() for import of
DOCINFO field subtypes INFO[1-4]
+ do not use DocumentInfo for import of DOCINFO field subtypes INFO[1-4]
2009-03-31 17:01:35 +0200 mav r270288 : #i91214# fix typo
2009-03-31 15:19:41 +0200 mav r270285 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 15:00:36 +0200 mav r270284 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 12:19:13 +0200 mav r270270 : #i100123# taking the lock file over throws no exception
2009-03-30 13:57:21 +0200 mav r270227 : #i100351# fix the typo
2009-03-30 13:47:26 +0200 mav r270225 : #i99885# let OK be default button
2009-03-29 19:38:55 +0200 mav r270190 : CWS-TOOLING: rebase CWS fwk103 to trunk@270033 (milestone: DEV300:m45)
2009-03-16 16:39:48 +0100 mav r269558 : #i93558# convert the attributes as well
2009-03-13 15:35:55 +0100 mav r269488 : #i93558# improve manifest.xml parsing
2009-03-13 08:47:00 +0100 mav r269454 : #i96205# allow to remove password on SaveAs
2009-03-12 13:36:07 +0100 mav r269398 : #i91306# show special error in case of shared document
2009-03-12 13:33:35 +0100 mav r269397 : #i91306# introduce the new error-message
2009-03-12 11:40:42 +0100 mst r269378 : fix #i90877#
- svtools/source/uno/unoevent.cxx:
+ use proper operator delete[]
2009-02-26 15:23:10 +0100 mav r268526 : #i91214# do not use ATL
2009-02-26 14:19:06 +0100 mav r268516 : #i98909# integrate the patch
2009-02-10 17:29:52 +0100 cd r267568 : #i98649# Make sure that we catch the NoSuchElementException when a module is not installed.
2009-06-16 16:15:54 +00:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
bool HTMLParser::ParseMetaOptionsImpl(
|
|
|
|
const uno::Reference<document::XDocumentProperties> & i_xDocProps,
|
|
|
|
SvKeyValueIterator *i_pHTTPHeader,
|
2011-07-22 15:39:18 -04:00
|
|
|
const HTMLOptions& aOptions,
|
CWS-TOOLING: integrate CWS fwk103
2009-05-26 12:44:25 +0200 mst r272292 : #i100727#
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx:
+ fix warning: rename method to prevent overloading
2009-05-19 13:42:31 +0200 mav r272075 : #i101356# add comment
2009-05-19 10:56:24 +0200 mav r272062 : #i101356# register the singleton correctly
2009-05-19 10:25:42 +0200 mav r272060 : #i101356# register the singleton correctly
2009-05-18 12:48:48 +0200 mav r272013 : #i91306# fix the typo
2009-05-14 08:50:06 +0200 mav r271871 : #i101356# reduce the amount of macros
2009-05-13 13:26:08 +0200 mav r271858 : #i101356# reduce the amount of macros
2009-05-13 11:29:16 +0200 mav r271849 : #i101356# reduce the amount of macros
2009-05-12 12:09:42 +0200 mav r271815 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 12:03:20 +0200 mav r271814 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:58:48 +0200 mav r271813 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:53:05 +0200 mav r271812 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:48:36 +0200 mav r271810 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:43:45 +0200 mav r271809 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:39:38 +0200 mav r271808 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:37:38 +0200 mav r271806 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:33:58 +0200 mav r271805 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:30:01 +0200 mav r271804 : #i101356# allow to generate a small log if a document can not be stored
2009-05-06 17:43:38 +0200 mst r271607 : #i100727#
- svtools/source/svhtml/parhtml.cxx:
+ adapt code to renaming of HTML constants (sb107)
2009-05-05 11:14:18 +0200 mav r271507 : #i101222# avoid warning
2009-05-05 10:27:23 +0200 mav r271505 : #i101426# send the modified() notification only when the document can be modified
2009-05-05 10:25:07 +0200 mav r271504 : #i101426# send the modified() notification only when the document is modified
2009-05-05 08:42:48 +0200 mav r271497 : CWS-TOOLING: rebase CWS fwk103 to trunk@271427 (milestone: DEV300:m47)
2009-04-30 13:32:11 +0200 mav r271412 : #i100518# check the template folders quietly
2009-04-29 20:04:25 +0200 mst r271393 : - sw/source/filter/html/swhtml.cxx:
+ fix wrong initialization order in constructor
2009-04-28 12:28:46 +0200 mav r271319 : #i99142# set the error correctly
2009-04-28 08:44:48 +0200 mav r271305 : #i99050# clear hidden flag if necessary
2009-04-28 08:40:10 +0200 mav r271304 : #i99050# avoid crash
2009-04-22 07:40:11 +0200 mav r271056 : #i101093# lets not affect the performance
2009-04-15 09:30:47 +0200 cd r270820 : #i99771# Fix warnings for gcc 4.4
2009-04-15 09:19:52 +0200 cd r270819 : #i99771# Fix warnings for gcc 4.4
2009-04-15 08:42:34 +0200 cd r270817 : #i99771# Fix warnings for gcc 4.4
2009-04-14 14:31:01 +0200 mav r270768 : #i99493# fix typo
2009-04-01 12:45:43 +0200 mst r270317 : fix #i100727#
- svtools/inc/svtools/svparser.hxx, svtools/source/svrtf/svparser.cxx,
sfx2/inc/sfx2/docfile.hxx, sfx2/source/doc/{objmisc.cxx,docfile.cxx}:
+ move SvKeyValue stuff from sfx2 to svtools
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx,
sfx2/inc/sfx2/sfxhtml.hxx, sfx2/source/bastyp/sfxhtml.cxx:
+ move ParseMetaOptions() and GetEncodingByMIME() from SfxHTMLParser (sfx2)
to HTMLParser (svtools)
+ make HTMLParser::ParseMetaOptions() a virtual function
+ HTMLParser::ParseMetaOptions() calls GetExtendedCompatibilityTextEncoding()
+ new template method HTMLParser::AddMetaUserDefined()
- svtools/source/svhtml/makefile.mk:
+ enable exceptions for parhtml.cxx
- dbaccess/source/ui/misc/HtmlReader.cxx,
sc/source/filter/html/htmlpars.cxx:
+ remove encoding related code duplication
- sw/source/filter/html/{swhtml{.hxx,.cxx},htmlfld.cxx}:
+ new SwHTMLParser::AddMetaUserDefined() for import of
DOCINFO field subtypes INFO[1-4]
+ do not use DocumentInfo for import of DOCINFO field subtypes INFO[1-4]
2009-03-31 17:01:35 +0200 mav r270288 : #i91214# fix typo
2009-03-31 15:19:41 +0200 mav r270285 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 15:00:36 +0200 mav r270284 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 12:19:13 +0200 mav r270270 : #i100123# taking the lock file over throws no exception
2009-03-30 13:57:21 +0200 mav r270227 : #i100351# fix the typo
2009-03-30 13:47:26 +0200 mav r270225 : #i99885# let OK be default button
2009-03-29 19:38:55 +0200 mav r270190 : CWS-TOOLING: rebase CWS fwk103 to trunk@270033 (milestone: DEV300:m45)
2009-03-16 16:39:48 +0100 mav r269558 : #i93558# convert the attributes as well
2009-03-13 15:35:55 +0100 mav r269488 : #i93558# improve manifest.xml parsing
2009-03-13 08:47:00 +0100 mav r269454 : #i96205# allow to remove password on SaveAs
2009-03-12 13:36:07 +0100 mav r269398 : #i91306# show special error in case of shared document
2009-03-12 13:33:35 +0100 mav r269397 : #i91306# introduce the new error-message
2009-03-12 11:40:42 +0100 mst r269378 : fix #i90877#
- svtools/source/uno/unoevent.cxx:
+ use proper operator delete[]
2009-02-26 15:23:10 +0100 mav r268526 : #i91214# do not use ATL
2009-02-26 14:19:06 +0100 mav r268516 : #i98909# integrate the patch
2009-02-10 17:29:52 +0100 cd r267568 : #i98649# Make sure that we catch the NoSuchElementException when a module is not installed.
2009-06-16 16:15:54 +00:00
|
|
|
rtl_TextEncoding& o_rEnc )
|
|
|
|
{
|
2013-08-20 15:15:13 +02:00
|
|
|
OUString aName, aContent;
|
2010-11-05 10:31:15 +08:00
|
|
|
sal_uInt16 nAction = HTML_META_NONE;
|
CWS-TOOLING: integrate CWS fwk103
2009-05-26 12:44:25 +0200 mst r272292 : #i100727#
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx:
+ fix warning: rename method to prevent overloading
2009-05-19 13:42:31 +0200 mav r272075 : #i101356# add comment
2009-05-19 10:56:24 +0200 mav r272062 : #i101356# register the singleton correctly
2009-05-19 10:25:42 +0200 mav r272060 : #i101356# register the singleton correctly
2009-05-18 12:48:48 +0200 mav r272013 : #i91306# fix the typo
2009-05-14 08:50:06 +0200 mav r271871 : #i101356# reduce the amount of macros
2009-05-13 13:26:08 +0200 mav r271858 : #i101356# reduce the amount of macros
2009-05-13 11:29:16 +0200 mav r271849 : #i101356# reduce the amount of macros
2009-05-12 12:09:42 +0200 mav r271815 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 12:03:20 +0200 mav r271814 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:58:48 +0200 mav r271813 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:53:05 +0200 mav r271812 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:48:36 +0200 mav r271810 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:43:45 +0200 mav r271809 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:39:38 +0200 mav r271808 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:37:38 +0200 mav r271806 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:33:58 +0200 mav r271805 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:30:01 +0200 mav r271804 : #i101356# allow to generate a small log if a document can not be stored
2009-05-06 17:43:38 +0200 mst r271607 : #i100727#
- svtools/source/svhtml/parhtml.cxx:
+ adapt code to renaming of HTML constants (sb107)
2009-05-05 11:14:18 +0200 mav r271507 : #i101222# avoid warning
2009-05-05 10:27:23 +0200 mav r271505 : #i101426# send the modified() notification only when the document can be modified
2009-05-05 10:25:07 +0200 mav r271504 : #i101426# send the modified() notification only when the document is modified
2009-05-05 08:42:48 +0200 mav r271497 : CWS-TOOLING: rebase CWS fwk103 to trunk@271427 (milestone: DEV300:m47)
2009-04-30 13:32:11 +0200 mav r271412 : #i100518# check the template folders quietly
2009-04-29 20:04:25 +0200 mst r271393 : - sw/source/filter/html/swhtml.cxx:
+ fix wrong initialization order in constructor
2009-04-28 12:28:46 +0200 mav r271319 : #i99142# set the error correctly
2009-04-28 08:44:48 +0200 mav r271305 : #i99050# clear hidden flag if necessary
2009-04-28 08:40:10 +0200 mav r271304 : #i99050# avoid crash
2009-04-22 07:40:11 +0200 mav r271056 : #i101093# lets not affect the performance
2009-04-15 09:30:47 +0200 cd r270820 : #i99771# Fix warnings for gcc 4.4
2009-04-15 09:19:52 +0200 cd r270819 : #i99771# Fix warnings for gcc 4.4
2009-04-15 08:42:34 +0200 cd r270817 : #i99771# Fix warnings for gcc 4.4
2009-04-14 14:31:01 +0200 mav r270768 : #i99493# fix typo
2009-04-01 12:45:43 +0200 mst r270317 : fix #i100727#
- svtools/inc/svtools/svparser.hxx, svtools/source/svrtf/svparser.cxx,
sfx2/inc/sfx2/docfile.hxx, sfx2/source/doc/{objmisc.cxx,docfile.cxx}:
+ move SvKeyValue stuff from sfx2 to svtools
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx,
sfx2/inc/sfx2/sfxhtml.hxx, sfx2/source/bastyp/sfxhtml.cxx:
+ move ParseMetaOptions() and GetEncodingByMIME() from SfxHTMLParser (sfx2)
to HTMLParser (svtools)
+ make HTMLParser::ParseMetaOptions() a virtual function
+ HTMLParser::ParseMetaOptions() calls GetExtendedCompatibilityTextEncoding()
+ new template method HTMLParser::AddMetaUserDefined()
- svtools/source/svhtml/makefile.mk:
+ enable exceptions for parhtml.cxx
- dbaccess/source/ui/misc/HtmlReader.cxx,
sc/source/filter/html/htmlpars.cxx:
+ remove encoding related code duplication
- sw/source/filter/html/{swhtml{.hxx,.cxx},htmlfld.cxx}:
+ new SwHTMLParser::AddMetaUserDefined() for import of
DOCINFO field subtypes INFO[1-4]
+ do not use DocumentInfo for import of DOCINFO field subtypes INFO[1-4]
2009-03-31 17:01:35 +0200 mav r270288 : #i91214# fix typo
2009-03-31 15:19:41 +0200 mav r270285 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 15:00:36 +0200 mav r270284 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 12:19:13 +0200 mav r270270 : #i100123# taking the lock file over throws no exception
2009-03-30 13:57:21 +0200 mav r270227 : #i100351# fix the typo
2009-03-30 13:47:26 +0200 mav r270225 : #i99885# let OK be default button
2009-03-29 19:38:55 +0200 mav r270190 : CWS-TOOLING: rebase CWS fwk103 to trunk@270033 (milestone: DEV300:m45)
2009-03-16 16:39:48 +0100 mav r269558 : #i93558# convert the attributes as well
2009-03-13 15:35:55 +0100 mav r269488 : #i93558# improve manifest.xml parsing
2009-03-13 08:47:00 +0100 mav r269454 : #i96205# allow to remove password on SaveAs
2009-03-12 13:36:07 +0100 mav r269398 : #i91306# show special error in case of shared document
2009-03-12 13:33:35 +0100 mav r269397 : #i91306# introduce the new error-message
2009-03-12 11:40:42 +0100 mst r269378 : fix #i90877#
- svtools/source/uno/unoevent.cxx:
+ use proper operator delete[]
2009-02-26 15:23:10 +0100 mav r268526 : #i91214# do not use ATL
2009-02-26 14:19:06 +0100 mav r268516 : #i98909# integrate the patch
2009-02-10 17:29:52 +0100 cd r267568 : #i98649# Make sure that we catch the NoSuchElementException when a module is not installed.
2009-06-16 16:15:54 +00:00
|
|
|
bool bHTTPEquiv = false, bChanged = false;
|
|
|
|
|
2011-07-22 15:39:18 -04:00
|
|
|
for ( size_t i = aOptions.size(); i; )
|
CWS-TOOLING: integrate CWS fwk103
2009-05-26 12:44:25 +0200 mst r272292 : #i100727#
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx:
+ fix warning: rename method to prevent overloading
2009-05-19 13:42:31 +0200 mav r272075 : #i101356# add comment
2009-05-19 10:56:24 +0200 mav r272062 : #i101356# register the singleton correctly
2009-05-19 10:25:42 +0200 mav r272060 : #i101356# register the singleton correctly
2009-05-18 12:48:48 +0200 mav r272013 : #i91306# fix the typo
2009-05-14 08:50:06 +0200 mav r271871 : #i101356# reduce the amount of macros
2009-05-13 13:26:08 +0200 mav r271858 : #i101356# reduce the amount of macros
2009-05-13 11:29:16 +0200 mav r271849 : #i101356# reduce the amount of macros
2009-05-12 12:09:42 +0200 mav r271815 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 12:03:20 +0200 mav r271814 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:58:48 +0200 mav r271813 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:53:05 +0200 mav r271812 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:48:36 +0200 mav r271810 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:43:45 +0200 mav r271809 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:39:38 +0200 mav r271808 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:37:38 +0200 mav r271806 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:33:58 +0200 mav r271805 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:30:01 +0200 mav r271804 : #i101356# allow to generate a small log if a document can not be stored
2009-05-06 17:43:38 +0200 mst r271607 : #i100727#
- svtools/source/svhtml/parhtml.cxx:
+ adapt code to renaming of HTML constants (sb107)
2009-05-05 11:14:18 +0200 mav r271507 : #i101222# avoid warning
2009-05-05 10:27:23 +0200 mav r271505 : #i101426# send the modified() notification only when the document can be modified
2009-05-05 10:25:07 +0200 mav r271504 : #i101426# send the modified() notification only when the document is modified
2009-05-05 08:42:48 +0200 mav r271497 : CWS-TOOLING: rebase CWS fwk103 to trunk@271427 (milestone: DEV300:m47)
2009-04-30 13:32:11 +0200 mav r271412 : #i100518# check the template folders quietly
2009-04-29 20:04:25 +0200 mst r271393 : - sw/source/filter/html/swhtml.cxx:
+ fix wrong initialization order in constructor
2009-04-28 12:28:46 +0200 mav r271319 : #i99142# set the error correctly
2009-04-28 08:44:48 +0200 mav r271305 : #i99050# clear hidden flag if necessary
2009-04-28 08:40:10 +0200 mav r271304 : #i99050# avoid crash
2009-04-22 07:40:11 +0200 mav r271056 : #i101093# lets not affect the performance
2009-04-15 09:30:47 +0200 cd r270820 : #i99771# Fix warnings for gcc 4.4
2009-04-15 09:19:52 +0200 cd r270819 : #i99771# Fix warnings for gcc 4.4
2009-04-15 08:42:34 +0200 cd r270817 : #i99771# Fix warnings for gcc 4.4
2009-04-14 14:31:01 +0200 mav r270768 : #i99493# fix typo
2009-04-01 12:45:43 +0200 mst r270317 : fix #i100727#
- svtools/inc/svtools/svparser.hxx, svtools/source/svrtf/svparser.cxx,
sfx2/inc/sfx2/docfile.hxx, sfx2/source/doc/{objmisc.cxx,docfile.cxx}:
+ move SvKeyValue stuff from sfx2 to svtools
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx,
sfx2/inc/sfx2/sfxhtml.hxx, sfx2/source/bastyp/sfxhtml.cxx:
+ move ParseMetaOptions() and GetEncodingByMIME() from SfxHTMLParser (sfx2)
to HTMLParser (svtools)
+ make HTMLParser::ParseMetaOptions() a virtual function
+ HTMLParser::ParseMetaOptions() calls GetExtendedCompatibilityTextEncoding()
+ new template method HTMLParser::AddMetaUserDefined()
- svtools/source/svhtml/makefile.mk:
+ enable exceptions for parhtml.cxx
- dbaccess/source/ui/misc/HtmlReader.cxx,
sc/source/filter/html/htmlpars.cxx:
+ remove encoding related code duplication
- sw/source/filter/html/{swhtml{.hxx,.cxx},htmlfld.cxx}:
+ new SwHTMLParser::AddMetaUserDefined() for import of
DOCINFO field subtypes INFO[1-4]
+ do not use DocumentInfo for import of DOCINFO field subtypes INFO[1-4]
2009-03-31 17:01:35 +0200 mav r270288 : #i91214# fix typo
2009-03-31 15:19:41 +0200 mav r270285 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 15:00:36 +0200 mav r270284 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 12:19:13 +0200 mav r270270 : #i100123# taking the lock file over throws no exception
2009-03-30 13:57:21 +0200 mav r270227 : #i100351# fix the typo
2009-03-30 13:47:26 +0200 mav r270225 : #i99885# let OK be default button
2009-03-29 19:38:55 +0200 mav r270190 : CWS-TOOLING: rebase CWS fwk103 to trunk@270033 (milestone: DEV300:m45)
2009-03-16 16:39:48 +0100 mav r269558 : #i93558# convert the attributes as well
2009-03-13 15:35:55 +0100 mav r269488 : #i93558# improve manifest.xml parsing
2009-03-13 08:47:00 +0100 mav r269454 : #i96205# allow to remove password on SaveAs
2009-03-12 13:36:07 +0100 mav r269398 : #i91306# show special error in case of shared document
2009-03-12 13:33:35 +0100 mav r269397 : #i91306# introduce the new error-message
2009-03-12 11:40:42 +0100 mst r269378 : fix #i90877#
- svtools/source/uno/unoevent.cxx:
+ use proper operator delete[]
2009-02-26 15:23:10 +0100 mav r268526 : #i91214# do not use ATL
2009-02-26 14:19:06 +0100 mav r268516 : #i98909# integrate the patch
2009-02-10 17:29:52 +0100 cd r267568 : #i98649# Make sure that we catch the NoSuchElementException when a module is not installed.
2009-06-16 16:15:54 +00:00
|
|
|
{
|
2014-09-29 15:27:46 +02:00
|
|
|
const HTMLOption& aOption = aOptions[--i];
|
2011-07-22 15:39:18 -04:00
|
|
|
switch ( aOption.GetToken() )
|
CWS-TOOLING: integrate CWS fwk103
2009-05-26 12:44:25 +0200 mst r272292 : #i100727#
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx:
+ fix warning: rename method to prevent overloading
2009-05-19 13:42:31 +0200 mav r272075 : #i101356# add comment
2009-05-19 10:56:24 +0200 mav r272062 : #i101356# register the singleton correctly
2009-05-19 10:25:42 +0200 mav r272060 : #i101356# register the singleton correctly
2009-05-18 12:48:48 +0200 mav r272013 : #i91306# fix the typo
2009-05-14 08:50:06 +0200 mav r271871 : #i101356# reduce the amount of macros
2009-05-13 13:26:08 +0200 mav r271858 : #i101356# reduce the amount of macros
2009-05-13 11:29:16 +0200 mav r271849 : #i101356# reduce the amount of macros
2009-05-12 12:09:42 +0200 mav r271815 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 12:03:20 +0200 mav r271814 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:58:48 +0200 mav r271813 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:53:05 +0200 mav r271812 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:48:36 +0200 mav r271810 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:43:45 +0200 mav r271809 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:39:38 +0200 mav r271808 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:37:38 +0200 mav r271806 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:33:58 +0200 mav r271805 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:30:01 +0200 mav r271804 : #i101356# allow to generate a small log if a document can not be stored
2009-05-06 17:43:38 +0200 mst r271607 : #i100727#
- svtools/source/svhtml/parhtml.cxx:
+ adapt code to renaming of HTML constants (sb107)
2009-05-05 11:14:18 +0200 mav r271507 : #i101222# avoid warning
2009-05-05 10:27:23 +0200 mav r271505 : #i101426# send the modified() notification only when the document can be modified
2009-05-05 10:25:07 +0200 mav r271504 : #i101426# send the modified() notification only when the document is modified
2009-05-05 08:42:48 +0200 mav r271497 : CWS-TOOLING: rebase CWS fwk103 to trunk@271427 (milestone: DEV300:m47)
2009-04-30 13:32:11 +0200 mav r271412 : #i100518# check the template folders quietly
2009-04-29 20:04:25 +0200 mst r271393 : - sw/source/filter/html/swhtml.cxx:
+ fix wrong initialization order in constructor
2009-04-28 12:28:46 +0200 mav r271319 : #i99142# set the error correctly
2009-04-28 08:44:48 +0200 mav r271305 : #i99050# clear hidden flag if necessary
2009-04-28 08:40:10 +0200 mav r271304 : #i99050# avoid crash
2009-04-22 07:40:11 +0200 mav r271056 : #i101093# lets not affect the performance
2009-04-15 09:30:47 +0200 cd r270820 : #i99771# Fix warnings for gcc 4.4
2009-04-15 09:19:52 +0200 cd r270819 : #i99771# Fix warnings for gcc 4.4
2009-04-15 08:42:34 +0200 cd r270817 : #i99771# Fix warnings for gcc 4.4
2009-04-14 14:31:01 +0200 mav r270768 : #i99493# fix typo
2009-04-01 12:45:43 +0200 mst r270317 : fix #i100727#
- svtools/inc/svtools/svparser.hxx, svtools/source/svrtf/svparser.cxx,
sfx2/inc/sfx2/docfile.hxx, sfx2/source/doc/{objmisc.cxx,docfile.cxx}:
+ move SvKeyValue stuff from sfx2 to svtools
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx,
sfx2/inc/sfx2/sfxhtml.hxx, sfx2/source/bastyp/sfxhtml.cxx:
+ move ParseMetaOptions() and GetEncodingByMIME() from SfxHTMLParser (sfx2)
to HTMLParser (svtools)
+ make HTMLParser::ParseMetaOptions() a virtual function
+ HTMLParser::ParseMetaOptions() calls GetExtendedCompatibilityTextEncoding()
+ new template method HTMLParser::AddMetaUserDefined()
- svtools/source/svhtml/makefile.mk:
+ enable exceptions for parhtml.cxx
- dbaccess/source/ui/misc/HtmlReader.cxx,
sc/source/filter/html/htmlpars.cxx:
+ remove encoding related code duplication
- sw/source/filter/html/{swhtml{.hxx,.cxx},htmlfld.cxx}:
+ new SwHTMLParser::AddMetaUserDefined() for import of
DOCINFO field subtypes INFO[1-4]
+ do not use DocumentInfo for import of DOCINFO field subtypes INFO[1-4]
2009-03-31 17:01:35 +0200 mav r270288 : #i91214# fix typo
2009-03-31 15:19:41 +0200 mav r270285 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 15:00:36 +0200 mav r270284 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 12:19:13 +0200 mav r270270 : #i100123# taking the lock file over throws no exception
2009-03-30 13:57:21 +0200 mav r270227 : #i100351# fix the typo
2009-03-30 13:47:26 +0200 mav r270225 : #i99885# let OK be default button
2009-03-29 19:38:55 +0200 mav r270190 : CWS-TOOLING: rebase CWS fwk103 to trunk@270033 (milestone: DEV300:m45)
2009-03-16 16:39:48 +0100 mav r269558 : #i93558# convert the attributes as well
2009-03-13 15:35:55 +0100 mav r269488 : #i93558# improve manifest.xml parsing
2009-03-13 08:47:00 +0100 mav r269454 : #i96205# allow to remove password on SaveAs
2009-03-12 13:36:07 +0100 mav r269398 : #i91306# show special error in case of shared document
2009-03-12 13:33:35 +0100 mav r269397 : #i91306# introduce the new error-message
2009-03-12 11:40:42 +0100 mst r269378 : fix #i90877#
- svtools/source/uno/unoevent.cxx:
+ use proper operator delete[]
2009-02-26 15:23:10 +0100 mav r268526 : #i91214# do not use ATL
2009-02-26 14:19:06 +0100 mav r268516 : #i98909# integrate the patch
2009-02-10 17:29:52 +0100 cd r267568 : #i98649# Make sure that we catch the NoSuchElementException when a module is not installed.
2009-06-16 16:15:54 +00:00
|
|
|
{
|
|
|
|
case HTML_O_NAME:
|
2011-07-22 15:39:18 -04:00
|
|
|
aName = aOption.GetString();
|
CWS-TOOLING: integrate CWS fwk103
2009-05-26 12:44:25 +0200 mst r272292 : #i100727#
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx:
+ fix warning: rename method to prevent overloading
2009-05-19 13:42:31 +0200 mav r272075 : #i101356# add comment
2009-05-19 10:56:24 +0200 mav r272062 : #i101356# register the singleton correctly
2009-05-19 10:25:42 +0200 mav r272060 : #i101356# register the singleton correctly
2009-05-18 12:48:48 +0200 mav r272013 : #i91306# fix the typo
2009-05-14 08:50:06 +0200 mav r271871 : #i101356# reduce the amount of macros
2009-05-13 13:26:08 +0200 mav r271858 : #i101356# reduce the amount of macros
2009-05-13 11:29:16 +0200 mav r271849 : #i101356# reduce the amount of macros
2009-05-12 12:09:42 +0200 mav r271815 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 12:03:20 +0200 mav r271814 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:58:48 +0200 mav r271813 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:53:05 +0200 mav r271812 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:48:36 +0200 mav r271810 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:43:45 +0200 mav r271809 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:39:38 +0200 mav r271808 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:37:38 +0200 mav r271806 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:33:58 +0200 mav r271805 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:30:01 +0200 mav r271804 : #i101356# allow to generate a small log if a document can not be stored
2009-05-06 17:43:38 +0200 mst r271607 : #i100727#
- svtools/source/svhtml/parhtml.cxx:
+ adapt code to renaming of HTML constants (sb107)
2009-05-05 11:14:18 +0200 mav r271507 : #i101222# avoid warning
2009-05-05 10:27:23 +0200 mav r271505 : #i101426# send the modified() notification only when the document can be modified
2009-05-05 10:25:07 +0200 mav r271504 : #i101426# send the modified() notification only when the document is modified
2009-05-05 08:42:48 +0200 mav r271497 : CWS-TOOLING: rebase CWS fwk103 to trunk@271427 (milestone: DEV300:m47)
2009-04-30 13:32:11 +0200 mav r271412 : #i100518# check the template folders quietly
2009-04-29 20:04:25 +0200 mst r271393 : - sw/source/filter/html/swhtml.cxx:
+ fix wrong initialization order in constructor
2009-04-28 12:28:46 +0200 mav r271319 : #i99142# set the error correctly
2009-04-28 08:44:48 +0200 mav r271305 : #i99050# clear hidden flag if necessary
2009-04-28 08:40:10 +0200 mav r271304 : #i99050# avoid crash
2009-04-22 07:40:11 +0200 mav r271056 : #i101093# lets not affect the performance
2009-04-15 09:30:47 +0200 cd r270820 : #i99771# Fix warnings for gcc 4.4
2009-04-15 09:19:52 +0200 cd r270819 : #i99771# Fix warnings for gcc 4.4
2009-04-15 08:42:34 +0200 cd r270817 : #i99771# Fix warnings for gcc 4.4
2009-04-14 14:31:01 +0200 mav r270768 : #i99493# fix typo
2009-04-01 12:45:43 +0200 mst r270317 : fix #i100727#
- svtools/inc/svtools/svparser.hxx, svtools/source/svrtf/svparser.cxx,
sfx2/inc/sfx2/docfile.hxx, sfx2/source/doc/{objmisc.cxx,docfile.cxx}:
+ move SvKeyValue stuff from sfx2 to svtools
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx,
sfx2/inc/sfx2/sfxhtml.hxx, sfx2/source/bastyp/sfxhtml.cxx:
+ move ParseMetaOptions() and GetEncodingByMIME() from SfxHTMLParser (sfx2)
to HTMLParser (svtools)
+ make HTMLParser::ParseMetaOptions() a virtual function
+ HTMLParser::ParseMetaOptions() calls GetExtendedCompatibilityTextEncoding()
+ new template method HTMLParser::AddMetaUserDefined()
- svtools/source/svhtml/makefile.mk:
+ enable exceptions for parhtml.cxx
- dbaccess/source/ui/misc/HtmlReader.cxx,
sc/source/filter/html/htmlpars.cxx:
+ remove encoding related code duplication
- sw/source/filter/html/{swhtml{.hxx,.cxx},htmlfld.cxx}:
+ new SwHTMLParser::AddMetaUserDefined() for import of
DOCINFO field subtypes INFO[1-4]
+ do not use DocumentInfo for import of DOCINFO field subtypes INFO[1-4]
2009-03-31 17:01:35 +0200 mav r270288 : #i91214# fix typo
2009-03-31 15:19:41 +0200 mav r270285 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 15:00:36 +0200 mav r270284 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 12:19:13 +0200 mav r270270 : #i100123# taking the lock file over throws no exception
2009-03-30 13:57:21 +0200 mav r270227 : #i100351# fix the typo
2009-03-30 13:47:26 +0200 mav r270225 : #i99885# let OK be default button
2009-03-29 19:38:55 +0200 mav r270190 : CWS-TOOLING: rebase CWS fwk103 to trunk@270033 (milestone: DEV300:m45)
2009-03-16 16:39:48 +0100 mav r269558 : #i93558# convert the attributes as well
2009-03-13 15:35:55 +0100 mav r269488 : #i93558# improve manifest.xml parsing
2009-03-13 08:47:00 +0100 mav r269454 : #i96205# allow to remove password on SaveAs
2009-03-12 13:36:07 +0100 mav r269398 : #i91306# show special error in case of shared document
2009-03-12 13:33:35 +0100 mav r269397 : #i91306# introduce the new error-message
2009-03-12 11:40:42 +0100 mst r269378 : fix #i90877#
- svtools/source/uno/unoevent.cxx:
+ use proper operator delete[]
2009-02-26 15:23:10 +0100 mav r268526 : #i91214# do not use ATL
2009-02-26 14:19:06 +0100 mav r268516 : #i98909# integrate the patch
2009-02-10 17:29:52 +0100 cd r267568 : #i98649# Make sure that we catch the NoSuchElementException when a module is not installed.
2009-06-16 16:15:54 +00:00
|
|
|
if ( HTML_META_NONE==nAction )
|
|
|
|
{
|
2011-07-22 15:39:18 -04:00
|
|
|
aOption.GetEnum( nAction, aHTMLMetaNameTable );
|
CWS-TOOLING: integrate CWS fwk103
2009-05-26 12:44:25 +0200 mst r272292 : #i100727#
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx:
+ fix warning: rename method to prevent overloading
2009-05-19 13:42:31 +0200 mav r272075 : #i101356# add comment
2009-05-19 10:56:24 +0200 mav r272062 : #i101356# register the singleton correctly
2009-05-19 10:25:42 +0200 mav r272060 : #i101356# register the singleton correctly
2009-05-18 12:48:48 +0200 mav r272013 : #i91306# fix the typo
2009-05-14 08:50:06 +0200 mav r271871 : #i101356# reduce the amount of macros
2009-05-13 13:26:08 +0200 mav r271858 : #i101356# reduce the amount of macros
2009-05-13 11:29:16 +0200 mav r271849 : #i101356# reduce the amount of macros
2009-05-12 12:09:42 +0200 mav r271815 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 12:03:20 +0200 mav r271814 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:58:48 +0200 mav r271813 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:53:05 +0200 mav r271812 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:48:36 +0200 mav r271810 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:43:45 +0200 mav r271809 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:39:38 +0200 mav r271808 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:37:38 +0200 mav r271806 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:33:58 +0200 mav r271805 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:30:01 +0200 mav r271804 : #i101356# allow to generate a small log if a document can not be stored
2009-05-06 17:43:38 +0200 mst r271607 : #i100727#
- svtools/source/svhtml/parhtml.cxx:
+ adapt code to renaming of HTML constants (sb107)
2009-05-05 11:14:18 +0200 mav r271507 : #i101222# avoid warning
2009-05-05 10:27:23 +0200 mav r271505 : #i101426# send the modified() notification only when the document can be modified
2009-05-05 10:25:07 +0200 mav r271504 : #i101426# send the modified() notification only when the document is modified
2009-05-05 08:42:48 +0200 mav r271497 : CWS-TOOLING: rebase CWS fwk103 to trunk@271427 (milestone: DEV300:m47)
2009-04-30 13:32:11 +0200 mav r271412 : #i100518# check the template folders quietly
2009-04-29 20:04:25 +0200 mst r271393 : - sw/source/filter/html/swhtml.cxx:
+ fix wrong initialization order in constructor
2009-04-28 12:28:46 +0200 mav r271319 : #i99142# set the error correctly
2009-04-28 08:44:48 +0200 mav r271305 : #i99050# clear hidden flag if necessary
2009-04-28 08:40:10 +0200 mav r271304 : #i99050# avoid crash
2009-04-22 07:40:11 +0200 mav r271056 : #i101093# lets not affect the performance
2009-04-15 09:30:47 +0200 cd r270820 : #i99771# Fix warnings for gcc 4.4
2009-04-15 09:19:52 +0200 cd r270819 : #i99771# Fix warnings for gcc 4.4
2009-04-15 08:42:34 +0200 cd r270817 : #i99771# Fix warnings for gcc 4.4
2009-04-14 14:31:01 +0200 mav r270768 : #i99493# fix typo
2009-04-01 12:45:43 +0200 mst r270317 : fix #i100727#
- svtools/inc/svtools/svparser.hxx, svtools/source/svrtf/svparser.cxx,
sfx2/inc/sfx2/docfile.hxx, sfx2/source/doc/{objmisc.cxx,docfile.cxx}:
+ move SvKeyValue stuff from sfx2 to svtools
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx,
sfx2/inc/sfx2/sfxhtml.hxx, sfx2/source/bastyp/sfxhtml.cxx:
+ move ParseMetaOptions() and GetEncodingByMIME() from SfxHTMLParser (sfx2)
to HTMLParser (svtools)
+ make HTMLParser::ParseMetaOptions() a virtual function
+ HTMLParser::ParseMetaOptions() calls GetExtendedCompatibilityTextEncoding()
+ new template method HTMLParser::AddMetaUserDefined()
- svtools/source/svhtml/makefile.mk:
+ enable exceptions for parhtml.cxx
- dbaccess/source/ui/misc/HtmlReader.cxx,
sc/source/filter/html/htmlpars.cxx:
+ remove encoding related code duplication
- sw/source/filter/html/{swhtml{.hxx,.cxx},htmlfld.cxx}:
+ new SwHTMLParser::AddMetaUserDefined() for import of
DOCINFO field subtypes INFO[1-4]
+ do not use DocumentInfo for import of DOCINFO field subtypes INFO[1-4]
2009-03-31 17:01:35 +0200 mav r270288 : #i91214# fix typo
2009-03-31 15:19:41 +0200 mav r270285 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 15:00:36 +0200 mav r270284 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 12:19:13 +0200 mav r270270 : #i100123# taking the lock file over throws no exception
2009-03-30 13:57:21 +0200 mav r270227 : #i100351# fix the typo
2009-03-30 13:47:26 +0200 mav r270225 : #i99885# let OK be default button
2009-03-29 19:38:55 +0200 mav r270190 : CWS-TOOLING: rebase CWS fwk103 to trunk@270033 (milestone: DEV300:m45)
2009-03-16 16:39:48 +0100 mav r269558 : #i93558# convert the attributes as well
2009-03-13 15:35:55 +0100 mav r269488 : #i93558# improve manifest.xml parsing
2009-03-13 08:47:00 +0100 mav r269454 : #i96205# allow to remove password on SaveAs
2009-03-12 13:36:07 +0100 mav r269398 : #i91306# show special error in case of shared document
2009-03-12 13:33:35 +0100 mav r269397 : #i91306# introduce the new error-message
2009-03-12 11:40:42 +0100 mst r269378 : fix #i90877#
- svtools/source/uno/unoevent.cxx:
+ use proper operator delete[]
2009-02-26 15:23:10 +0100 mav r268526 : #i91214# do not use ATL
2009-02-26 14:19:06 +0100 mav r268516 : #i98909# integrate the patch
2009-02-10 17:29:52 +0100 cd r267568 : #i98649# Make sure that we catch the NoSuchElementException when a module is not installed.
2009-06-16 16:15:54 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
case HTML_O_HTTPEQUIV:
|
2011-07-22 15:39:18 -04:00
|
|
|
aName = aOption.GetString();
|
|
|
|
aOption.GetEnum( nAction, aHTMLMetaNameTable );
|
CWS-TOOLING: integrate CWS fwk103
2009-05-26 12:44:25 +0200 mst r272292 : #i100727#
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx:
+ fix warning: rename method to prevent overloading
2009-05-19 13:42:31 +0200 mav r272075 : #i101356# add comment
2009-05-19 10:56:24 +0200 mav r272062 : #i101356# register the singleton correctly
2009-05-19 10:25:42 +0200 mav r272060 : #i101356# register the singleton correctly
2009-05-18 12:48:48 +0200 mav r272013 : #i91306# fix the typo
2009-05-14 08:50:06 +0200 mav r271871 : #i101356# reduce the amount of macros
2009-05-13 13:26:08 +0200 mav r271858 : #i101356# reduce the amount of macros
2009-05-13 11:29:16 +0200 mav r271849 : #i101356# reduce the amount of macros
2009-05-12 12:09:42 +0200 mav r271815 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 12:03:20 +0200 mav r271814 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:58:48 +0200 mav r271813 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:53:05 +0200 mav r271812 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:48:36 +0200 mav r271810 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:43:45 +0200 mav r271809 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:39:38 +0200 mav r271808 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:37:38 +0200 mav r271806 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:33:58 +0200 mav r271805 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:30:01 +0200 mav r271804 : #i101356# allow to generate a small log if a document can not be stored
2009-05-06 17:43:38 +0200 mst r271607 : #i100727#
- svtools/source/svhtml/parhtml.cxx:
+ adapt code to renaming of HTML constants (sb107)
2009-05-05 11:14:18 +0200 mav r271507 : #i101222# avoid warning
2009-05-05 10:27:23 +0200 mav r271505 : #i101426# send the modified() notification only when the document can be modified
2009-05-05 10:25:07 +0200 mav r271504 : #i101426# send the modified() notification only when the document is modified
2009-05-05 08:42:48 +0200 mav r271497 : CWS-TOOLING: rebase CWS fwk103 to trunk@271427 (milestone: DEV300:m47)
2009-04-30 13:32:11 +0200 mav r271412 : #i100518# check the template folders quietly
2009-04-29 20:04:25 +0200 mst r271393 : - sw/source/filter/html/swhtml.cxx:
+ fix wrong initialization order in constructor
2009-04-28 12:28:46 +0200 mav r271319 : #i99142# set the error correctly
2009-04-28 08:44:48 +0200 mav r271305 : #i99050# clear hidden flag if necessary
2009-04-28 08:40:10 +0200 mav r271304 : #i99050# avoid crash
2009-04-22 07:40:11 +0200 mav r271056 : #i101093# lets not affect the performance
2009-04-15 09:30:47 +0200 cd r270820 : #i99771# Fix warnings for gcc 4.4
2009-04-15 09:19:52 +0200 cd r270819 : #i99771# Fix warnings for gcc 4.4
2009-04-15 08:42:34 +0200 cd r270817 : #i99771# Fix warnings for gcc 4.4
2009-04-14 14:31:01 +0200 mav r270768 : #i99493# fix typo
2009-04-01 12:45:43 +0200 mst r270317 : fix #i100727#
- svtools/inc/svtools/svparser.hxx, svtools/source/svrtf/svparser.cxx,
sfx2/inc/sfx2/docfile.hxx, sfx2/source/doc/{objmisc.cxx,docfile.cxx}:
+ move SvKeyValue stuff from sfx2 to svtools
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx,
sfx2/inc/sfx2/sfxhtml.hxx, sfx2/source/bastyp/sfxhtml.cxx:
+ move ParseMetaOptions() and GetEncodingByMIME() from SfxHTMLParser (sfx2)
to HTMLParser (svtools)
+ make HTMLParser::ParseMetaOptions() a virtual function
+ HTMLParser::ParseMetaOptions() calls GetExtendedCompatibilityTextEncoding()
+ new template method HTMLParser::AddMetaUserDefined()
- svtools/source/svhtml/makefile.mk:
+ enable exceptions for parhtml.cxx
- dbaccess/source/ui/misc/HtmlReader.cxx,
sc/source/filter/html/htmlpars.cxx:
+ remove encoding related code duplication
- sw/source/filter/html/{swhtml{.hxx,.cxx},htmlfld.cxx}:
+ new SwHTMLParser::AddMetaUserDefined() for import of
DOCINFO field subtypes INFO[1-4]
+ do not use DocumentInfo for import of DOCINFO field subtypes INFO[1-4]
2009-03-31 17:01:35 +0200 mav r270288 : #i91214# fix typo
2009-03-31 15:19:41 +0200 mav r270285 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 15:00:36 +0200 mav r270284 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 12:19:13 +0200 mav r270270 : #i100123# taking the lock file over throws no exception
2009-03-30 13:57:21 +0200 mav r270227 : #i100351# fix the typo
2009-03-30 13:47:26 +0200 mav r270225 : #i99885# let OK be default button
2009-03-29 19:38:55 +0200 mav r270190 : CWS-TOOLING: rebase CWS fwk103 to trunk@270033 (milestone: DEV300:m45)
2009-03-16 16:39:48 +0100 mav r269558 : #i93558# convert the attributes as well
2009-03-13 15:35:55 +0100 mav r269488 : #i93558# improve manifest.xml parsing
2009-03-13 08:47:00 +0100 mav r269454 : #i96205# allow to remove password on SaveAs
2009-03-12 13:36:07 +0100 mav r269398 : #i91306# show special error in case of shared document
2009-03-12 13:33:35 +0100 mav r269397 : #i91306# introduce the new error-message
2009-03-12 11:40:42 +0100 mst r269378 : fix #i90877#
- svtools/source/uno/unoevent.cxx:
+ use proper operator delete[]
2009-02-26 15:23:10 +0100 mav r268526 : #i91214# do not use ATL
2009-02-26 14:19:06 +0100 mav r268516 : #i98909# integrate the patch
2009-02-10 17:29:52 +0100 cd r267568 : #i98649# Make sure that we catch the NoSuchElementException when a module is not installed.
2009-06-16 16:15:54 +00:00
|
|
|
bHTTPEquiv = true;
|
|
|
|
break;
|
|
|
|
case HTML_O_CONTENT:
|
2011-07-22 15:39:18 -04:00
|
|
|
aContent = aOption.GetString();
|
CWS-TOOLING: integrate CWS fwk103
2009-05-26 12:44:25 +0200 mst r272292 : #i100727#
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx:
+ fix warning: rename method to prevent overloading
2009-05-19 13:42:31 +0200 mav r272075 : #i101356# add comment
2009-05-19 10:56:24 +0200 mav r272062 : #i101356# register the singleton correctly
2009-05-19 10:25:42 +0200 mav r272060 : #i101356# register the singleton correctly
2009-05-18 12:48:48 +0200 mav r272013 : #i91306# fix the typo
2009-05-14 08:50:06 +0200 mav r271871 : #i101356# reduce the amount of macros
2009-05-13 13:26:08 +0200 mav r271858 : #i101356# reduce the amount of macros
2009-05-13 11:29:16 +0200 mav r271849 : #i101356# reduce the amount of macros
2009-05-12 12:09:42 +0200 mav r271815 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 12:03:20 +0200 mav r271814 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:58:48 +0200 mav r271813 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:53:05 +0200 mav r271812 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:48:36 +0200 mav r271810 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:43:45 +0200 mav r271809 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:39:38 +0200 mav r271808 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:37:38 +0200 mav r271806 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:33:58 +0200 mav r271805 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:30:01 +0200 mav r271804 : #i101356# allow to generate a small log if a document can not be stored
2009-05-06 17:43:38 +0200 mst r271607 : #i100727#
- svtools/source/svhtml/parhtml.cxx:
+ adapt code to renaming of HTML constants (sb107)
2009-05-05 11:14:18 +0200 mav r271507 : #i101222# avoid warning
2009-05-05 10:27:23 +0200 mav r271505 : #i101426# send the modified() notification only when the document can be modified
2009-05-05 10:25:07 +0200 mav r271504 : #i101426# send the modified() notification only when the document is modified
2009-05-05 08:42:48 +0200 mav r271497 : CWS-TOOLING: rebase CWS fwk103 to trunk@271427 (milestone: DEV300:m47)
2009-04-30 13:32:11 +0200 mav r271412 : #i100518# check the template folders quietly
2009-04-29 20:04:25 +0200 mst r271393 : - sw/source/filter/html/swhtml.cxx:
+ fix wrong initialization order in constructor
2009-04-28 12:28:46 +0200 mav r271319 : #i99142# set the error correctly
2009-04-28 08:44:48 +0200 mav r271305 : #i99050# clear hidden flag if necessary
2009-04-28 08:40:10 +0200 mav r271304 : #i99050# avoid crash
2009-04-22 07:40:11 +0200 mav r271056 : #i101093# lets not affect the performance
2009-04-15 09:30:47 +0200 cd r270820 : #i99771# Fix warnings for gcc 4.4
2009-04-15 09:19:52 +0200 cd r270819 : #i99771# Fix warnings for gcc 4.4
2009-04-15 08:42:34 +0200 cd r270817 : #i99771# Fix warnings for gcc 4.4
2009-04-14 14:31:01 +0200 mav r270768 : #i99493# fix typo
2009-04-01 12:45:43 +0200 mst r270317 : fix #i100727#
- svtools/inc/svtools/svparser.hxx, svtools/source/svrtf/svparser.cxx,
sfx2/inc/sfx2/docfile.hxx, sfx2/source/doc/{objmisc.cxx,docfile.cxx}:
+ move SvKeyValue stuff from sfx2 to svtools
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx,
sfx2/inc/sfx2/sfxhtml.hxx, sfx2/source/bastyp/sfxhtml.cxx:
+ move ParseMetaOptions() and GetEncodingByMIME() from SfxHTMLParser (sfx2)
to HTMLParser (svtools)
+ make HTMLParser::ParseMetaOptions() a virtual function
+ HTMLParser::ParseMetaOptions() calls GetExtendedCompatibilityTextEncoding()
+ new template method HTMLParser::AddMetaUserDefined()
- svtools/source/svhtml/makefile.mk:
+ enable exceptions for parhtml.cxx
- dbaccess/source/ui/misc/HtmlReader.cxx,
sc/source/filter/html/htmlpars.cxx:
+ remove encoding related code duplication
- sw/source/filter/html/{swhtml{.hxx,.cxx},htmlfld.cxx}:
+ new SwHTMLParser::AddMetaUserDefined() for import of
DOCINFO field subtypes INFO[1-4]
+ do not use DocumentInfo for import of DOCINFO field subtypes INFO[1-4]
2009-03-31 17:01:35 +0200 mav r270288 : #i91214# fix typo
2009-03-31 15:19:41 +0200 mav r270285 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 15:00:36 +0200 mav r270284 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 12:19:13 +0200 mav r270270 : #i100123# taking the lock file over throws no exception
2009-03-30 13:57:21 +0200 mav r270227 : #i100351# fix the typo
2009-03-30 13:47:26 +0200 mav r270225 : #i99885# let OK be default button
2009-03-29 19:38:55 +0200 mav r270190 : CWS-TOOLING: rebase CWS fwk103 to trunk@270033 (milestone: DEV300:m45)
2009-03-16 16:39:48 +0100 mav r269558 : #i93558# convert the attributes as well
2009-03-13 15:35:55 +0100 mav r269488 : #i93558# improve manifest.xml parsing
2009-03-13 08:47:00 +0100 mav r269454 : #i96205# allow to remove password on SaveAs
2009-03-12 13:36:07 +0100 mav r269398 : #i91306# show special error in case of shared document
2009-03-12 13:33:35 +0100 mav r269397 : #i91306# introduce the new error-message
2009-03-12 11:40:42 +0100 mst r269378 : fix #i90877#
- svtools/source/uno/unoevent.cxx:
+ use proper operator delete[]
2009-02-26 15:23:10 +0100 mav r268526 : #i91214# do not use ATL
2009-02-26 14:19:06 +0100 mav r268516 : #i98909# integrate the patch
2009-02-10 17:29:52 +0100 cd r267568 : #i98649# Make sure that we catch the NoSuchElementException when a module is not installed.
2009-06-16 16:15:54 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( bHTTPEquiv || HTML_META_DESCRIPTION != nAction )
|
|
|
|
{
|
|
|
|
// if it is not a Description, remove CRs and LFs from CONTENT
|
2013-05-02 08:22:00 -03:00
|
|
|
aContent = comphelper::string::remove(aContent, '\r');
|
|
|
|
aContent = comphelper::string::remove(aContent, '\n');
|
CWS-TOOLING: integrate CWS fwk103
2009-05-26 12:44:25 +0200 mst r272292 : #i100727#
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx:
+ fix warning: rename method to prevent overloading
2009-05-19 13:42:31 +0200 mav r272075 : #i101356# add comment
2009-05-19 10:56:24 +0200 mav r272062 : #i101356# register the singleton correctly
2009-05-19 10:25:42 +0200 mav r272060 : #i101356# register the singleton correctly
2009-05-18 12:48:48 +0200 mav r272013 : #i91306# fix the typo
2009-05-14 08:50:06 +0200 mav r271871 : #i101356# reduce the amount of macros
2009-05-13 13:26:08 +0200 mav r271858 : #i101356# reduce the amount of macros
2009-05-13 11:29:16 +0200 mav r271849 : #i101356# reduce the amount of macros
2009-05-12 12:09:42 +0200 mav r271815 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 12:03:20 +0200 mav r271814 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:58:48 +0200 mav r271813 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:53:05 +0200 mav r271812 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:48:36 +0200 mav r271810 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:43:45 +0200 mav r271809 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:39:38 +0200 mav r271808 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:37:38 +0200 mav r271806 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:33:58 +0200 mav r271805 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:30:01 +0200 mav r271804 : #i101356# allow to generate a small log if a document can not be stored
2009-05-06 17:43:38 +0200 mst r271607 : #i100727#
- svtools/source/svhtml/parhtml.cxx:
+ adapt code to renaming of HTML constants (sb107)
2009-05-05 11:14:18 +0200 mav r271507 : #i101222# avoid warning
2009-05-05 10:27:23 +0200 mav r271505 : #i101426# send the modified() notification only when the document can be modified
2009-05-05 10:25:07 +0200 mav r271504 : #i101426# send the modified() notification only when the document is modified
2009-05-05 08:42:48 +0200 mav r271497 : CWS-TOOLING: rebase CWS fwk103 to trunk@271427 (milestone: DEV300:m47)
2009-04-30 13:32:11 +0200 mav r271412 : #i100518# check the template folders quietly
2009-04-29 20:04:25 +0200 mst r271393 : - sw/source/filter/html/swhtml.cxx:
+ fix wrong initialization order in constructor
2009-04-28 12:28:46 +0200 mav r271319 : #i99142# set the error correctly
2009-04-28 08:44:48 +0200 mav r271305 : #i99050# clear hidden flag if necessary
2009-04-28 08:40:10 +0200 mav r271304 : #i99050# avoid crash
2009-04-22 07:40:11 +0200 mav r271056 : #i101093# lets not affect the performance
2009-04-15 09:30:47 +0200 cd r270820 : #i99771# Fix warnings for gcc 4.4
2009-04-15 09:19:52 +0200 cd r270819 : #i99771# Fix warnings for gcc 4.4
2009-04-15 08:42:34 +0200 cd r270817 : #i99771# Fix warnings for gcc 4.4
2009-04-14 14:31:01 +0200 mav r270768 : #i99493# fix typo
2009-04-01 12:45:43 +0200 mst r270317 : fix #i100727#
- svtools/inc/svtools/svparser.hxx, svtools/source/svrtf/svparser.cxx,
sfx2/inc/sfx2/docfile.hxx, sfx2/source/doc/{objmisc.cxx,docfile.cxx}:
+ move SvKeyValue stuff from sfx2 to svtools
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx,
sfx2/inc/sfx2/sfxhtml.hxx, sfx2/source/bastyp/sfxhtml.cxx:
+ move ParseMetaOptions() and GetEncodingByMIME() from SfxHTMLParser (sfx2)
to HTMLParser (svtools)
+ make HTMLParser::ParseMetaOptions() a virtual function
+ HTMLParser::ParseMetaOptions() calls GetExtendedCompatibilityTextEncoding()
+ new template method HTMLParser::AddMetaUserDefined()
- svtools/source/svhtml/makefile.mk:
+ enable exceptions for parhtml.cxx
- dbaccess/source/ui/misc/HtmlReader.cxx,
sc/source/filter/html/htmlpars.cxx:
+ remove encoding related code duplication
- sw/source/filter/html/{swhtml{.hxx,.cxx},htmlfld.cxx}:
+ new SwHTMLParser::AddMetaUserDefined() for import of
DOCINFO field subtypes INFO[1-4]
+ do not use DocumentInfo for import of DOCINFO field subtypes INFO[1-4]
2009-03-31 17:01:35 +0200 mav r270288 : #i91214# fix typo
2009-03-31 15:19:41 +0200 mav r270285 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 15:00:36 +0200 mav r270284 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 12:19:13 +0200 mav r270270 : #i100123# taking the lock file over throws no exception
2009-03-30 13:57:21 +0200 mav r270227 : #i100351# fix the typo
2009-03-30 13:47:26 +0200 mav r270225 : #i99885# let OK be default button
2009-03-29 19:38:55 +0200 mav r270190 : CWS-TOOLING: rebase CWS fwk103 to trunk@270033 (milestone: DEV300:m45)
2009-03-16 16:39:48 +0100 mav r269558 : #i93558# convert the attributes as well
2009-03-13 15:35:55 +0100 mav r269488 : #i93558# improve manifest.xml parsing
2009-03-13 08:47:00 +0100 mav r269454 : #i96205# allow to remove password on SaveAs
2009-03-12 13:36:07 +0100 mav r269398 : #i91306# show special error in case of shared document
2009-03-12 13:33:35 +0100 mav r269397 : #i91306# introduce the new error-message
2009-03-12 11:40:42 +0100 mst r269378 : fix #i90877#
- svtools/source/uno/unoevent.cxx:
+ use proper operator delete[]
2009-02-26 15:23:10 +0100 mav r268526 : #i91214# do not use ATL
2009-02-26 14:19:06 +0100 mav r268516 : #i98909# integrate the patch
2009-02-10 17:29:52 +0100 cd r267568 : #i98649# Make sure that we catch the NoSuchElementException when a module is not installed.
2009-06-16 16:15:54 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// convert line endings for Description
|
2012-01-30 11:31:05 +00:00
|
|
|
aContent = convertLineEnd(aContent, GetSystemLineEnd());
|
CWS-TOOLING: integrate CWS fwk103
2009-05-26 12:44:25 +0200 mst r272292 : #i100727#
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx:
+ fix warning: rename method to prevent overloading
2009-05-19 13:42:31 +0200 mav r272075 : #i101356# add comment
2009-05-19 10:56:24 +0200 mav r272062 : #i101356# register the singleton correctly
2009-05-19 10:25:42 +0200 mav r272060 : #i101356# register the singleton correctly
2009-05-18 12:48:48 +0200 mav r272013 : #i91306# fix the typo
2009-05-14 08:50:06 +0200 mav r271871 : #i101356# reduce the amount of macros
2009-05-13 13:26:08 +0200 mav r271858 : #i101356# reduce the amount of macros
2009-05-13 11:29:16 +0200 mav r271849 : #i101356# reduce the amount of macros
2009-05-12 12:09:42 +0200 mav r271815 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 12:03:20 +0200 mav r271814 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:58:48 +0200 mav r271813 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:53:05 +0200 mav r271812 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:48:36 +0200 mav r271810 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:43:45 +0200 mav r271809 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:39:38 +0200 mav r271808 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:37:38 +0200 mav r271806 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:33:58 +0200 mav r271805 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:30:01 +0200 mav r271804 : #i101356# allow to generate a small log if a document can not be stored
2009-05-06 17:43:38 +0200 mst r271607 : #i100727#
- svtools/source/svhtml/parhtml.cxx:
+ adapt code to renaming of HTML constants (sb107)
2009-05-05 11:14:18 +0200 mav r271507 : #i101222# avoid warning
2009-05-05 10:27:23 +0200 mav r271505 : #i101426# send the modified() notification only when the document can be modified
2009-05-05 10:25:07 +0200 mav r271504 : #i101426# send the modified() notification only when the document is modified
2009-05-05 08:42:48 +0200 mav r271497 : CWS-TOOLING: rebase CWS fwk103 to trunk@271427 (milestone: DEV300:m47)
2009-04-30 13:32:11 +0200 mav r271412 : #i100518# check the template folders quietly
2009-04-29 20:04:25 +0200 mst r271393 : - sw/source/filter/html/swhtml.cxx:
+ fix wrong initialization order in constructor
2009-04-28 12:28:46 +0200 mav r271319 : #i99142# set the error correctly
2009-04-28 08:44:48 +0200 mav r271305 : #i99050# clear hidden flag if necessary
2009-04-28 08:40:10 +0200 mav r271304 : #i99050# avoid crash
2009-04-22 07:40:11 +0200 mav r271056 : #i101093# lets not affect the performance
2009-04-15 09:30:47 +0200 cd r270820 : #i99771# Fix warnings for gcc 4.4
2009-04-15 09:19:52 +0200 cd r270819 : #i99771# Fix warnings for gcc 4.4
2009-04-15 08:42:34 +0200 cd r270817 : #i99771# Fix warnings for gcc 4.4
2009-04-14 14:31:01 +0200 mav r270768 : #i99493# fix typo
2009-04-01 12:45:43 +0200 mst r270317 : fix #i100727#
- svtools/inc/svtools/svparser.hxx, svtools/source/svrtf/svparser.cxx,
sfx2/inc/sfx2/docfile.hxx, sfx2/source/doc/{objmisc.cxx,docfile.cxx}:
+ move SvKeyValue stuff from sfx2 to svtools
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx,
sfx2/inc/sfx2/sfxhtml.hxx, sfx2/source/bastyp/sfxhtml.cxx:
+ move ParseMetaOptions() and GetEncodingByMIME() from SfxHTMLParser (sfx2)
to HTMLParser (svtools)
+ make HTMLParser::ParseMetaOptions() a virtual function
+ HTMLParser::ParseMetaOptions() calls GetExtendedCompatibilityTextEncoding()
+ new template method HTMLParser::AddMetaUserDefined()
- svtools/source/svhtml/makefile.mk:
+ enable exceptions for parhtml.cxx
- dbaccess/source/ui/misc/HtmlReader.cxx,
sc/source/filter/html/htmlpars.cxx:
+ remove encoding related code duplication
- sw/source/filter/html/{swhtml{.hxx,.cxx},htmlfld.cxx}:
+ new SwHTMLParser::AddMetaUserDefined() for import of
DOCINFO field subtypes INFO[1-4]
+ do not use DocumentInfo for import of DOCINFO field subtypes INFO[1-4]
2009-03-31 17:01:35 +0200 mav r270288 : #i91214# fix typo
2009-03-31 15:19:41 +0200 mav r270285 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 15:00:36 +0200 mav r270284 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 12:19:13 +0200 mav r270270 : #i100123# taking the lock file over throws no exception
2009-03-30 13:57:21 +0200 mav r270227 : #i100351# fix the typo
2009-03-30 13:47:26 +0200 mav r270225 : #i99885# let OK be default button
2009-03-29 19:38:55 +0200 mav r270190 : CWS-TOOLING: rebase CWS fwk103 to trunk@270033 (milestone: DEV300:m45)
2009-03-16 16:39:48 +0100 mav r269558 : #i93558# convert the attributes as well
2009-03-13 15:35:55 +0100 mav r269488 : #i93558# improve manifest.xml parsing
2009-03-13 08:47:00 +0100 mav r269454 : #i96205# allow to remove password on SaveAs
2009-03-12 13:36:07 +0100 mav r269398 : #i91306# show special error in case of shared document
2009-03-12 13:33:35 +0100 mav r269397 : #i91306# introduce the new error-message
2009-03-12 11:40:42 +0100 mst r269378 : fix #i90877#
- svtools/source/uno/unoevent.cxx:
+ use proper operator delete[]
2009-02-26 15:23:10 +0100 mav r268526 : #i91214# do not use ATL
2009-02-26 14:19:06 +0100 mav r268516 : #i98909# integrate the patch
2009-02-10 17:29:52 +0100 cd r267568 : #i98649# Make sure that we catch the NoSuchElementException when a module is not installed.
2009-06-16 16:15:54 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if ( bHTTPEquiv && i_pHTTPHeader )
|
|
|
|
{
|
2011-04-22 22:13:32 +02:00
|
|
|
// Netscape seems to just ignore a closing ", so we do too
|
2013-10-21 10:21:01 +02:00
|
|
|
if ( aContent.endsWith("\"") )
|
CWS-TOOLING: integrate CWS fwk103
2009-05-26 12:44:25 +0200 mst r272292 : #i100727#
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx:
+ fix warning: rename method to prevent overloading
2009-05-19 13:42:31 +0200 mav r272075 : #i101356# add comment
2009-05-19 10:56:24 +0200 mav r272062 : #i101356# register the singleton correctly
2009-05-19 10:25:42 +0200 mav r272060 : #i101356# register the singleton correctly
2009-05-18 12:48:48 +0200 mav r272013 : #i91306# fix the typo
2009-05-14 08:50:06 +0200 mav r271871 : #i101356# reduce the amount of macros
2009-05-13 13:26:08 +0200 mav r271858 : #i101356# reduce the amount of macros
2009-05-13 11:29:16 +0200 mav r271849 : #i101356# reduce the amount of macros
2009-05-12 12:09:42 +0200 mav r271815 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 12:03:20 +0200 mav r271814 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:58:48 +0200 mav r271813 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:53:05 +0200 mav r271812 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:48:36 +0200 mav r271810 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:43:45 +0200 mav r271809 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:39:38 +0200 mav r271808 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:37:38 +0200 mav r271806 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:33:58 +0200 mav r271805 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:30:01 +0200 mav r271804 : #i101356# allow to generate a small log if a document can not be stored
2009-05-06 17:43:38 +0200 mst r271607 : #i100727#
- svtools/source/svhtml/parhtml.cxx:
+ adapt code to renaming of HTML constants (sb107)
2009-05-05 11:14:18 +0200 mav r271507 : #i101222# avoid warning
2009-05-05 10:27:23 +0200 mav r271505 : #i101426# send the modified() notification only when the document can be modified
2009-05-05 10:25:07 +0200 mav r271504 : #i101426# send the modified() notification only when the document is modified
2009-05-05 08:42:48 +0200 mav r271497 : CWS-TOOLING: rebase CWS fwk103 to trunk@271427 (milestone: DEV300:m47)
2009-04-30 13:32:11 +0200 mav r271412 : #i100518# check the template folders quietly
2009-04-29 20:04:25 +0200 mst r271393 : - sw/source/filter/html/swhtml.cxx:
+ fix wrong initialization order in constructor
2009-04-28 12:28:46 +0200 mav r271319 : #i99142# set the error correctly
2009-04-28 08:44:48 +0200 mav r271305 : #i99050# clear hidden flag if necessary
2009-04-28 08:40:10 +0200 mav r271304 : #i99050# avoid crash
2009-04-22 07:40:11 +0200 mav r271056 : #i101093# lets not affect the performance
2009-04-15 09:30:47 +0200 cd r270820 : #i99771# Fix warnings for gcc 4.4
2009-04-15 09:19:52 +0200 cd r270819 : #i99771# Fix warnings for gcc 4.4
2009-04-15 08:42:34 +0200 cd r270817 : #i99771# Fix warnings for gcc 4.4
2009-04-14 14:31:01 +0200 mav r270768 : #i99493# fix typo
2009-04-01 12:45:43 +0200 mst r270317 : fix #i100727#
- svtools/inc/svtools/svparser.hxx, svtools/source/svrtf/svparser.cxx,
sfx2/inc/sfx2/docfile.hxx, sfx2/source/doc/{objmisc.cxx,docfile.cxx}:
+ move SvKeyValue stuff from sfx2 to svtools
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx,
sfx2/inc/sfx2/sfxhtml.hxx, sfx2/source/bastyp/sfxhtml.cxx:
+ move ParseMetaOptions() and GetEncodingByMIME() from SfxHTMLParser (sfx2)
to HTMLParser (svtools)
+ make HTMLParser::ParseMetaOptions() a virtual function
+ HTMLParser::ParseMetaOptions() calls GetExtendedCompatibilityTextEncoding()
+ new template method HTMLParser::AddMetaUserDefined()
- svtools/source/svhtml/makefile.mk:
+ enable exceptions for parhtml.cxx
- dbaccess/source/ui/misc/HtmlReader.cxx,
sc/source/filter/html/htmlpars.cxx:
+ remove encoding related code duplication
- sw/source/filter/html/{swhtml{.hxx,.cxx},htmlfld.cxx}:
+ new SwHTMLParser::AddMetaUserDefined() for import of
DOCINFO field subtypes INFO[1-4]
+ do not use DocumentInfo for import of DOCINFO field subtypes INFO[1-4]
2009-03-31 17:01:35 +0200 mav r270288 : #i91214# fix typo
2009-03-31 15:19:41 +0200 mav r270285 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 15:00:36 +0200 mav r270284 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 12:19:13 +0200 mav r270270 : #i100123# taking the lock file over throws no exception
2009-03-30 13:57:21 +0200 mav r270227 : #i100351# fix the typo
2009-03-30 13:47:26 +0200 mav r270225 : #i99885# let OK be default button
2009-03-29 19:38:55 +0200 mav r270190 : CWS-TOOLING: rebase CWS fwk103 to trunk@270033 (milestone: DEV300:m45)
2009-03-16 16:39:48 +0100 mav r269558 : #i93558# convert the attributes as well
2009-03-13 15:35:55 +0100 mav r269488 : #i93558# improve manifest.xml parsing
2009-03-13 08:47:00 +0100 mav r269454 : #i96205# allow to remove password on SaveAs
2009-03-12 13:36:07 +0100 mav r269398 : #i91306# show special error in case of shared document
2009-03-12 13:33:35 +0100 mav r269397 : #i91306# introduce the new error-message
2009-03-12 11:40:42 +0100 mst r269378 : fix #i90877#
- svtools/source/uno/unoevent.cxx:
+ use proper operator delete[]
2009-02-26 15:23:10 +0100 mav r268526 : #i91214# do not use ATL
2009-02-26 14:19:06 +0100 mav r268516 : #i98909# integrate the patch
2009-02-10 17:29:52 +0100 cd r267568 : #i98649# Make sure that we catch the NoSuchElementException when a module is not installed.
2009-06-16 16:15:54 +00:00
|
|
|
{
|
2013-08-20 15:15:13 +02:00
|
|
|
aContent = aContent.copy( 0, aContent.getLength() - 1 );
|
CWS-TOOLING: integrate CWS fwk103
2009-05-26 12:44:25 +0200 mst r272292 : #i100727#
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx:
+ fix warning: rename method to prevent overloading
2009-05-19 13:42:31 +0200 mav r272075 : #i101356# add comment
2009-05-19 10:56:24 +0200 mav r272062 : #i101356# register the singleton correctly
2009-05-19 10:25:42 +0200 mav r272060 : #i101356# register the singleton correctly
2009-05-18 12:48:48 +0200 mav r272013 : #i91306# fix the typo
2009-05-14 08:50:06 +0200 mav r271871 : #i101356# reduce the amount of macros
2009-05-13 13:26:08 +0200 mav r271858 : #i101356# reduce the amount of macros
2009-05-13 11:29:16 +0200 mav r271849 : #i101356# reduce the amount of macros
2009-05-12 12:09:42 +0200 mav r271815 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 12:03:20 +0200 mav r271814 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:58:48 +0200 mav r271813 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:53:05 +0200 mav r271812 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:48:36 +0200 mav r271810 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:43:45 +0200 mav r271809 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:39:38 +0200 mav r271808 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:37:38 +0200 mav r271806 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:33:58 +0200 mav r271805 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:30:01 +0200 mav r271804 : #i101356# allow to generate a small log if a document can not be stored
2009-05-06 17:43:38 +0200 mst r271607 : #i100727#
- svtools/source/svhtml/parhtml.cxx:
+ adapt code to renaming of HTML constants (sb107)
2009-05-05 11:14:18 +0200 mav r271507 : #i101222# avoid warning
2009-05-05 10:27:23 +0200 mav r271505 : #i101426# send the modified() notification only when the document can be modified
2009-05-05 10:25:07 +0200 mav r271504 : #i101426# send the modified() notification only when the document is modified
2009-05-05 08:42:48 +0200 mav r271497 : CWS-TOOLING: rebase CWS fwk103 to trunk@271427 (milestone: DEV300:m47)
2009-04-30 13:32:11 +0200 mav r271412 : #i100518# check the template folders quietly
2009-04-29 20:04:25 +0200 mst r271393 : - sw/source/filter/html/swhtml.cxx:
+ fix wrong initialization order in constructor
2009-04-28 12:28:46 +0200 mav r271319 : #i99142# set the error correctly
2009-04-28 08:44:48 +0200 mav r271305 : #i99050# clear hidden flag if necessary
2009-04-28 08:40:10 +0200 mav r271304 : #i99050# avoid crash
2009-04-22 07:40:11 +0200 mav r271056 : #i101093# lets not affect the performance
2009-04-15 09:30:47 +0200 cd r270820 : #i99771# Fix warnings for gcc 4.4
2009-04-15 09:19:52 +0200 cd r270819 : #i99771# Fix warnings for gcc 4.4
2009-04-15 08:42:34 +0200 cd r270817 : #i99771# Fix warnings for gcc 4.4
2009-04-14 14:31:01 +0200 mav r270768 : #i99493# fix typo
2009-04-01 12:45:43 +0200 mst r270317 : fix #i100727#
- svtools/inc/svtools/svparser.hxx, svtools/source/svrtf/svparser.cxx,
sfx2/inc/sfx2/docfile.hxx, sfx2/source/doc/{objmisc.cxx,docfile.cxx}:
+ move SvKeyValue stuff from sfx2 to svtools
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx,
sfx2/inc/sfx2/sfxhtml.hxx, sfx2/source/bastyp/sfxhtml.cxx:
+ move ParseMetaOptions() and GetEncodingByMIME() from SfxHTMLParser (sfx2)
to HTMLParser (svtools)
+ make HTMLParser::ParseMetaOptions() a virtual function
+ HTMLParser::ParseMetaOptions() calls GetExtendedCompatibilityTextEncoding()
+ new template method HTMLParser::AddMetaUserDefined()
- svtools/source/svhtml/makefile.mk:
+ enable exceptions for parhtml.cxx
- dbaccess/source/ui/misc/HtmlReader.cxx,
sc/source/filter/html/htmlpars.cxx:
+ remove encoding related code duplication
- sw/source/filter/html/{swhtml{.hxx,.cxx},htmlfld.cxx}:
+ new SwHTMLParser::AddMetaUserDefined() for import of
DOCINFO field subtypes INFO[1-4]
+ do not use DocumentInfo for import of DOCINFO field subtypes INFO[1-4]
2009-03-31 17:01:35 +0200 mav r270288 : #i91214# fix typo
2009-03-31 15:19:41 +0200 mav r270285 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 15:00:36 +0200 mav r270284 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 12:19:13 +0200 mav r270270 : #i100123# taking the lock file over throws no exception
2009-03-30 13:57:21 +0200 mav r270227 : #i100351# fix the typo
2009-03-30 13:47:26 +0200 mav r270225 : #i99885# let OK be default button
2009-03-29 19:38:55 +0200 mav r270190 : CWS-TOOLING: rebase CWS fwk103 to trunk@270033 (milestone: DEV300:m45)
2009-03-16 16:39:48 +0100 mav r269558 : #i93558# convert the attributes as well
2009-03-13 15:35:55 +0100 mav r269488 : #i93558# improve manifest.xml parsing
2009-03-13 08:47:00 +0100 mav r269454 : #i96205# allow to remove password on SaveAs
2009-03-12 13:36:07 +0100 mav r269398 : #i91306# show special error in case of shared document
2009-03-12 13:33:35 +0100 mav r269397 : #i91306# introduce the new error-message
2009-03-12 11:40:42 +0100 mst r269378 : fix #i90877#
- svtools/source/uno/unoevent.cxx:
+ use proper operator delete[]
2009-02-26 15:23:10 +0100 mav r268526 : #i91214# do not use ATL
2009-02-26 14:19:06 +0100 mav r268516 : #i98909# integrate the patch
2009-02-10 17:29:52 +0100 cd r267568 : #i98649# Make sure that we catch the NoSuchElementException when a module is not installed.
2009-06-16 16:15:54 +00:00
|
|
|
}
|
|
|
|
SvKeyValue aKeyValue( aName, aContent );
|
|
|
|
i_pHTTPHeader->Append( aKeyValue );
|
|
|
|
}
|
|
|
|
|
|
|
|
switch ( nAction )
|
|
|
|
{
|
|
|
|
case HTML_META_AUTHOR:
|
|
|
|
if (i_xDocProps.is()) {
|
|
|
|
i_xDocProps->setAuthor( aContent );
|
|
|
|
bChanged = true;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case HTML_META_DESCRIPTION:
|
|
|
|
if (i_xDocProps.is()) {
|
|
|
|
i_xDocProps->setDescription( aContent );
|
|
|
|
bChanged = true;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case HTML_META_KEYWORDS:
|
|
|
|
if (i_xDocProps.is()) {
|
|
|
|
i_xDocProps->setKeywords(
|
|
|
|
::comphelper::string::convertCommaSeparated(aContent));
|
|
|
|
bChanged = true;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case HTML_META_CLASSIFICATION:
|
|
|
|
if (i_xDocProps.is()) {
|
|
|
|
i_xDocProps->setSubject( aContent );
|
|
|
|
bChanged = true;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case HTML_META_CHANGEDBY:
|
|
|
|
if (i_xDocProps.is()) {
|
|
|
|
i_xDocProps->setModifiedBy( aContent );
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case HTML_META_CREATED:
|
|
|
|
case HTML_META_CHANGED:
|
2013-08-20 15:15:13 +02:00
|
|
|
if ( i_xDocProps.is() && !aContent.isEmpty() &&
|
2012-01-02 10:55:27 +00:00
|
|
|
comphelper::string::getTokenCount(aContent, ';') == 2 )
|
CWS-TOOLING: integrate CWS fwk103
2009-05-26 12:44:25 +0200 mst r272292 : #i100727#
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx:
+ fix warning: rename method to prevent overloading
2009-05-19 13:42:31 +0200 mav r272075 : #i101356# add comment
2009-05-19 10:56:24 +0200 mav r272062 : #i101356# register the singleton correctly
2009-05-19 10:25:42 +0200 mav r272060 : #i101356# register the singleton correctly
2009-05-18 12:48:48 +0200 mav r272013 : #i91306# fix the typo
2009-05-14 08:50:06 +0200 mav r271871 : #i101356# reduce the amount of macros
2009-05-13 13:26:08 +0200 mav r271858 : #i101356# reduce the amount of macros
2009-05-13 11:29:16 +0200 mav r271849 : #i101356# reduce the amount of macros
2009-05-12 12:09:42 +0200 mav r271815 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 12:03:20 +0200 mav r271814 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:58:48 +0200 mav r271813 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:53:05 +0200 mav r271812 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:48:36 +0200 mav r271810 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:43:45 +0200 mav r271809 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:39:38 +0200 mav r271808 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:37:38 +0200 mav r271806 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:33:58 +0200 mav r271805 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:30:01 +0200 mav r271804 : #i101356# allow to generate a small log if a document can not be stored
2009-05-06 17:43:38 +0200 mst r271607 : #i100727#
- svtools/source/svhtml/parhtml.cxx:
+ adapt code to renaming of HTML constants (sb107)
2009-05-05 11:14:18 +0200 mav r271507 : #i101222# avoid warning
2009-05-05 10:27:23 +0200 mav r271505 : #i101426# send the modified() notification only when the document can be modified
2009-05-05 10:25:07 +0200 mav r271504 : #i101426# send the modified() notification only when the document is modified
2009-05-05 08:42:48 +0200 mav r271497 : CWS-TOOLING: rebase CWS fwk103 to trunk@271427 (milestone: DEV300:m47)
2009-04-30 13:32:11 +0200 mav r271412 : #i100518# check the template folders quietly
2009-04-29 20:04:25 +0200 mst r271393 : - sw/source/filter/html/swhtml.cxx:
+ fix wrong initialization order in constructor
2009-04-28 12:28:46 +0200 mav r271319 : #i99142# set the error correctly
2009-04-28 08:44:48 +0200 mav r271305 : #i99050# clear hidden flag if necessary
2009-04-28 08:40:10 +0200 mav r271304 : #i99050# avoid crash
2009-04-22 07:40:11 +0200 mav r271056 : #i101093# lets not affect the performance
2009-04-15 09:30:47 +0200 cd r270820 : #i99771# Fix warnings for gcc 4.4
2009-04-15 09:19:52 +0200 cd r270819 : #i99771# Fix warnings for gcc 4.4
2009-04-15 08:42:34 +0200 cd r270817 : #i99771# Fix warnings for gcc 4.4
2009-04-14 14:31:01 +0200 mav r270768 : #i99493# fix typo
2009-04-01 12:45:43 +0200 mst r270317 : fix #i100727#
- svtools/inc/svtools/svparser.hxx, svtools/source/svrtf/svparser.cxx,
sfx2/inc/sfx2/docfile.hxx, sfx2/source/doc/{objmisc.cxx,docfile.cxx}:
+ move SvKeyValue stuff from sfx2 to svtools
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx,
sfx2/inc/sfx2/sfxhtml.hxx, sfx2/source/bastyp/sfxhtml.cxx:
+ move ParseMetaOptions() and GetEncodingByMIME() from SfxHTMLParser (sfx2)
to HTMLParser (svtools)
+ make HTMLParser::ParseMetaOptions() a virtual function
+ HTMLParser::ParseMetaOptions() calls GetExtendedCompatibilityTextEncoding()
+ new template method HTMLParser::AddMetaUserDefined()
- svtools/source/svhtml/makefile.mk:
+ enable exceptions for parhtml.cxx
- dbaccess/source/ui/misc/HtmlReader.cxx,
sc/source/filter/html/htmlpars.cxx:
+ remove encoding related code duplication
- sw/source/filter/html/{swhtml{.hxx,.cxx},htmlfld.cxx}:
+ new SwHTMLParser::AddMetaUserDefined() for import of
DOCINFO field subtypes INFO[1-4]
+ do not use DocumentInfo for import of DOCINFO field subtypes INFO[1-4]
2009-03-31 17:01:35 +0200 mav r270288 : #i91214# fix typo
2009-03-31 15:19:41 +0200 mav r270285 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 15:00:36 +0200 mav r270284 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 12:19:13 +0200 mav r270270 : #i100123# taking the lock file over throws no exception
2009-03-30 13:57:21 +0200 mav r270227 : #i100351# fix the typo
2009-03-30 13:47:26 +0200 mav r270225 : #i99885# let OK be default button
2009-03-29 19:38:55 +0200 mav r270190 : CWS-TOOLING: rebase CWS fwk103 to trunk@270033 (milestone: DEV300:m45)
2009-03-16 16:39:48 +0100 mav r269558 : #i93558# convert the attributes as well
2009-03-13 15:35:55 +0100 mav r269488 : #i93558# improve manifest.xml parsing
2009-03-13 08:47:00 +0100 mav r269454 : #i96205# allow to remove password on SaveAs
2009-03-12 13:36:07 +0100 mav r269398 : #i91306# show special error in case of shared document
2009-03-12 13:33:35 +0100 mav r269397 : #i91306# introduce the new error-message
2009-03-12 11:40:42 +0100 mst r269378 : fix #i90877#
- svtools/source/uno/unoevent.cxx:
+ use proper operator delete[]
2009-02-26 15:23:10 +0100 mav r268526 : #i91214# do not use ATL
2009-02-26 14:19:06 +0100 mav r268516 : #i98909# integrate the patch
2009-02-10 17:29:52 +0100 cd r267568 : #i98649# Make sure that we catch the NoSuchElementException when a module is not installed.
2009-06-16 16:15:54 +00:00
|
|
|
{
|
2013-08-20 15:15:13 +02:00
|
|
|
Date aDate( (sal_uLong)aContent.getToken(0, ';').toInt32() );
|
2014-09-28 15:49:26 +02:00
|
|
|
tools::Time aTime( (sal_uLong)aContent.getToken(1, ';').toInt32() );
|
CWS-TOOLING: integrate CWS fwk103
2009-05-26 12:44:25 +0200 mst r272292 : #i100727#
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx:
+ fix warning: rename method to prevent overloading
2009-05-19 13:42:31 +0200 mav r272075 : #i101356# add comment
2009-05-19 10:56:24 +0200 mav r272062 : #i101356# register the singleton correctly
2009-05-19 10:25:42 +0200 mav r272060 : #i101356# register the singleton correctly
2009-05-18 12:48:48 +0200 mav r272013 : #i91306# fix the typo
2009-05-14 08:50:06 +0200 mav r271871 : #i101356# reduce the amount of macros
2009-05-13 13:26:08 +0200 mav r271858 : #i101356# reduce the amount of macros
2009-05-13 11:29:16 +0200 mav r271849 : #i101356# reduce the amount of macros
2009-05-12 12:09:42 +0200 mav r271815 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 12:03:20 +0200 mav r271814 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:58:48 +0200 mav r271813 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:53:05 +0200 mav r271812 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:48:36 +0200 mav r271810 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:43:45 +0200 mav r271809 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:39:38 +0200 mav r271808 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:37:38 +0200 mav r271806 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:33:58 +0200 mav r271805 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:30:01 +0200 mav r271804 : #i101356# allow to generate a small log if a document can not be stored
2009-05-06 17:43:38 +0200 mst r271607 : #i100727#
- svtools/source/svhtml/parhtml.cxx:
+ adapt code to renaming of HTML constants (sb107)
2009-05-05 11:14:18 +0200 mav r271507 : #i101222# avoid warning
2009-05-05 10:27:23 +0200 mav r271505 : #i101426# send the modified() notification only when the document can be modified
2009-05-05 10:25:07 +0200 mav r271504 : #i101426# send the modified() notification only when the document is modified
2009-05-05 08:42:48 +0200 mav r271497 : CWS-TOOLING: rebase CWS fwk103 to trunk@271427 (milestone: DEV300:m47)
2009-04-30 13:32:11 +0200 mav r271412 : #i100518# check the template folders quietly
2009-04-29 20:04:25 +0200 mst r271393 : - sw/source/filter/html/swhtml.cxx:
+ fix wrong initialization order in constructor
2009-04-28 12:28:46 +0200 mav r271319 : #i99142# set the error correctly
2009-04-28 08:44:48 +0200 mav r271305 : #i99050# clear hidden flag if necessary
2009-04-28 08:40:10 +0200 mav r271304 : #i99050# avoid crash
2009-04-22 07:40:11 +0200 mav r271056 : #i101093# lets not affect the performance
2009-04-15 09:30:47 +0200 cd r270820 : #i99771# Fix warnings for gcc 4.4
2009-04-15 09:19:52 +0200 cd r270819 : #i99771# Fix warnings for gcc 4.4
2009-04-15 08:42:34 +0200 cd r270817 : #i99771# Fix warnings for gcc 4.4
2009-04-14 14:31:01 +0200 mav r270768 : #i99493# fix typo
2009-04-01 12:45:43 +0200 mst r270317 : fix #i100727#
- svtools/inc/svtools/svparser.hxx, svtools/source/svrtf/svparser.cxx,
sfx2/inc/sfx2/docfile.hxx, sfx2/source/doc/{objmisc.cxx,docfile.cxx}:
+ move SvKeyValue stuff from sfx2 to svtools
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx,
sfx2/inc/sfx2/sfxhtml.hxx, sfx2/source/bastyp/sfxhtml.cxx:
+ move ParseMetaOptions() and GetEncodingByMIME() from SfxHTMLParser (sfx2)
to HTMLParser (svtools)
+ make HTMLParser::ParseMetaOptions() a virtual function
+ HTMLParser::ParseMetaOptions() calls GetExtendedCompatibilityTextEncoding()
+ new template method HTMLParser::AddMetaUserDefined()
- svtools/source/svhtml/makefile.mk:
+ enable exceptions for parhtml.cxx
- dbaccess/source/ui/misc/HtmlReader.cxx,
sc/source/filter/html/htmlpars.cxx:
+ remove encoding related code duplication
- sw/source/filter/html/{swhtml{.hxx,.cxx},htmlfld.cxx}:
+ new SwHTMLParser::AddMetaUserDefined() for import of
DOCINFO field subtypes INFO[1-4]
+ do not use DocumentInfo for import of DOCINFO field subtypes INFO[1-4]
2009-03-31 17:01:35 +0200 mav r270288 : #i91214# fix typo
2009-03-31 15:19:41 +0200 mav r270285 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 15:00:36 +0200 mav r270284 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 12:19:13 +0200 mav r270270 : #i100123# taking the lock file over throws no exception
2009-03-30 13:57:21 +0200 mav r270227 : #i100351# fix the typo
2009-03-30 13:47:26 +0200 mav r270225 : #i99885# let OK be default button
2009-03-29 19:38:55 +0200 mav r270190 : CWS-TOOLING: rebase CWS fwk103 to trunk@270033 (milestone: DEV300:m45)
2009-03-16 16:39:48 +0100 mav r269558 : #i93558# convert the attributes as well
2009-03-13 15:35:55 +0100 mav r269488 : #i93558# improve manifest.xml parsing
2009-03-13 08:47:00 +0100 mav r269454 : #i96205# allow to remove password on SaveAs
2009-03-12 13:36:07 +0100 mav r269398 : #i91306# show special error in case of shared document
2009-03-12 13:33:35 +0100 mav r269397 : #i91306# introduce the new error-message
2009-03-12 11:40:42 +0100 mst r269378 : fix #i90877#
- svtools/source/uno/unoevent.cxx:
+ use proper operator delete[]
2009-02-26 15:23:10 +0100 mav r268526 : #i91214# do not use ATL
2009-02-26 14:19:06 +0100 mav r268516 : #i98909# integrate the patch
2009-02-10 17:29:52 +0100 cd r267568 : #i98649# Make sure that we catch the NoSuchElementException when a module is not installed.
2009-06-16 16:15:54 +00:00
|
|
|
DateTime aDateTime( aDate, aTime );
|
2015-01-11 13:35:38 +02:00
|
|
|
::util::DateTime uDT = aDateTime.GetUNODateTime();
|
CWS-TOOLING: integrate CWS fwk103
2009-05-26 12:44:25 +0200 mst r272292 : #i100727#
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx:
+ fix warning: rename method to prevent overloading
2009-05-19 13:42:31 +0200 mav r272075 : #i101356# add comment
2009-05-19 10:56:24 +0200 mav r272062 : #i101356# register the singleton correctly
2009-05-19 10:25:42 +0200 mav r272060 : #i101356# register the singleton correctly
2009-05-18 12:48:48 +0200 mav r272013 : #i91306# fix the typo
2009-05-14 08:50:06 +0200 mav r271871 : #i101356# reduce the amount of macros
2009-05-13 13:26:08 +0200 mav r271858 : #i101356# reduce the amount of macros
2009-05-13 11:29:16 +0200 mav r271849 : #i101356# reduce the amount of macros
2009-05-12 12:09:42 +0200 mav r271815 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 12:03:20 +0200 mav r271814 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:58:48 +0200 mav r271813 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:53:05 +0200 mav r271812 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:48:36 +0200 mav r271810 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:43:45 +0200 mav r271809 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:39:38 +0200 mav r271808 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:37:38 +0200 mav r271806 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:33:58 +0200 mav r271805 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:30:01 +0200 mav r271804 : #i101356# allow to generate a small log if a document can not be stored
2009-05-06 17:43:38 +0200 mst r271607 : #i100727#
- svtools/source/svhtml/parhtml.cxx:
+ adapt code to renaming of HTML constants (sb107)
2009-05-05 11:14:18 +0200 mav r271507 : #i101222# avoid warning
2009-05-05 10:27:23 +0200 mav r271505 : #i101426# send the modified() notification only when the document can be modified
2009-05-05 10:25:07 +0200 mav r271504 : #i101426# send the modified() notification only when the document is modified
2009-05-05 08:42:48 +0200 mav r271497 : CWS-TOOLING: rebase CWS fwk103 to trunk@271427 (milestone: DEV300:m47)
2009-04-30 13:32:11 +0200 mav r271412 : #i100518# check the template folders quietly
2009-04-29 20:04:25 +0200 mst r271393 : - sw/source/filter/html/swhtml.cxx:
+ fix wrong initialization order in constructor
2009-04-28 12:28:46 +0200 mav r271319 : #i99142# set the error correctly
2009-04-28 08:44:48 +0200 mav r271305 : #i99050# clear hidden flag if necessary
2009-04-28 08:40:10 +0200 mav r271304 : #i99050# avoid crash
2009-04-22 07:40:11 +0200 mav r271056 : #i101093# lets not affect the performance
2009-04-15 09:30:47 +0200 cd r270820 : #i99771# Fix warnings for gcc 4.4
2009-04-15 09:19:52 +0200 cd r270819 : #i99771# Fix warnings for gcc 4.4
2009-04-15 08:42:34 +0200 cd r270817 : #i99771# Fix warnings for gcc 4.4
2009-04-14 14:31:01 +0200 mav r270768 : #i99493# fix typo
2009-04-01 12:45:43 +0200 mst r270317 : fix #i100727#
- svtools/inc/svtools/svparser.hxx, svtools/source/svrtf/svparser.cxx,
sfx2/inc/sfx2/docfile.hxx, sfx2/source/doc/{objmisc.cxx,docfile.cxx}:
+ move SvKeyValue stuff from sfx2 to svtools
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx,
sfx2/inc/sfx2/sfxhtml.hxx, sfx2/source/bastyp/sfxhtml.cxx:
+ move ParseMetaOptions() and GetEncodingByMIME() from SfxHTMLParser (sfx2)
to HTMLParser (svtools)
+ make HTMLParser::ParseMetaOptions() a virtual function
+ HTMLParser::ParseMetaOptions() calls GetExtendedCompatibilityTextEncoding()
+ new template method HTMLParser::AddMetaUserDefined()
- svtools/source/svhtml/makefile.mk:
+ enable exceptions for parhtml.cxx
- dbaccess/source/ui/misc/HtmlReader.cxx,
sc/source/filter/html/htmlpars.cxx:
+ remove encoding related code duplication
- sw/source/filter/html/{swhtml{.hxx,.cxx},htmlfld.cxx}:
+ new SwHTMLParser::AddMetaUserDefined() for import of
DOCINFO field subtypes INFO[1-4]
+ do not use DocumentInfo for import of DOCINFO field subtypes INFO[1-4]
2009-03-31 17:01:35 +0200 mav r270288 : #i91214# fix typo
2009-03-31 15:19:41 +0200 mav r270285 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 15:00:36 +0200 mav r270284 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 12:19:13 +0200 mav r270270 : #i100123# taking the lock file over throws no exception
2009-03-30 13:57:21 +0200 mav r270227 : #i100351# fix the typo
2009-03-30 13:47:26 +0200 mav r270225 : #i99885# let OK be default button
2009-03-29 19:38:55 +0200 mav r270190 : CWS-TOOLING: rebase CWS fwk103 to trunk@270033 (milestone: DEV300:m45)
2009-03-16 16:39:48 +0100 mav r269558 : #i93558# convert the attributes as well
2009-03-13 15:35:55 +0100 mav r269488 : #i93558# improve manifest.xml parsing
2009-03-13 08:47:00 +0100 mav r269454 : #i96205# allow to remove password on SaveAs
2009-03-12 13:36:07 +0100 mav r269398 : #i91306# show special error in case of shared document
2009-03-12 13:33:35 +0100 mav r269397 : #i91306# introduce the new error-message
2009-03-12 11:40:42 +0100 mst r269378 : fix #i90877#
- svtools/source/uno/unoevent.cxx:
+ use proper operator delete[]
2009-02-26 15:23:10 +0100 mav r268526 : #i91214# do not use ATL
2009-02-26 14:19:06 +0100 mav r268516 : #i98909# integrate the patch
2009-02-10 17:29:52 +0100 cd r267568 : #i98649# Make sure that we catch the NoSuchElementException when a module is not installed.
2009-06-16 16:15:54 +00:00
|
|
|
if ( HTML_META_CREATED==nAction )
|
|
|
|
i_xDocProps->setCreationDate( uDT );
|
|
|
|
else
|
|
|
|
i_xDocProps->setModificationDate( uDT );
|
|
|
|
bChanged = true;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case HTML_META_REFRESH:
|
|
|
|
DBG_ASSERT( !bHTTPEquiv || i_pHTTPHeader,
|
|
|
|
"Reload-URL aufgrund unterlassener MUSS-Aenderung verlorengegangen" );
|
|
|
|
break;
|
|
|
|
|
|
|
|
case HTML_META_CONTENT_TYPE:
|
2013-08-20 15:15:13 +02:00
|
|
|
if ( !aContent.isEmpty() )
|
CWS-TOOLING: integrate CWS fwk103
2009-05-26 12:44:25 +0200 mst r272292 : #i100727#
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx:
+ fix warning: rename method to prevent overloading
2009-05-19 13:42:31 +0200 mav r272075 : #i101356# add comment
2009-05-19 10:56:24 +0200 mav r272062 : #i101356# register the singleton correctly
2009-05-19 10:25:42 +0200 mav r272060 : #i101356# register the singleton correctly
2009-05-18 12:48:48 +0200 mav r272013 : #i91306# fix the typo
2009-05-14 08:50:06 +0200 mav r271871 : #i101356# reduce the amount of macros
2009-05-13 13:26:08 +0200 mav r271858 : #i101356# reduce the amount of macros
2009-05-13 11:29:16 +0200 mav r271849 : #i101356# reduce the amount of macros
2009-05-12 12:09:42 +0200 mav r271815 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 12:03:20 +0200 mav r271814 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:58:48 +0200 mav r271813 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:53:05 +0200 mav r271812 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:48:36 +0200 mav r271810 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:43:45 +0200 mav r271809 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:39:38 +0200 mav r271808 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:37:38 +0200 mav r271806 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:33:58 +0200 mav r271805 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:30:01 +0200 mav r271804 : #i101356# allow to generate a small log if a document can not be stored
2009-05-06 17:43:38 +0200 mst r271607 : #i100727#
- svtools/source/svhtml/parhtml.cxx:
+ adapt code to renaming of HTML constants (sb107)
2009-05-05 11:14:18 +0200 mav r271507 : #i101222# avoid warning
2009-05-05 10:27:23 +0200 mav r271505 : #i101426# send the modified() notification only when the document can be modified
2009-05-05 10:25:07 +0200 mav r271504 : #i101426# send the modified() notification only when the document is modified
2009-05-05 08:42:48 +0200 mav r271497 : CWS-TOOLING: rebase CWS fwk103 to trunk@271427 (milestone: DEV300:m47)
2009-04-30 13:32:11 +0200 mav r271412 : #i100518# check the template folders quietly
2009-04-29 20:04:25 +0200 mst r271393 : - sw/source/filter/html/swhtml.cxx:
+ fix wrong initialization order in constructor
2009-04-28 12:28:46 +0200 mav r271319 : #i99142# set the error correctly
2009-04-28 08:44:48 +0200 mav r271305 : #i99050# clear hidden flag if necessary
2009-04-28 08:40:10 +0200 mav r271304 : #i99050# avoid crash
2009-04-22 07:40:11 +0200 mav r271056 : #i101093# lets not affect the performance
2009-04-15 09:30:47 +0200 cd r270820 : #i99771# Fix warnings for gcc 4.4
2009-04-15 09:19:52 +0200 cd r270819 : #i99771# Fix warnings for gcc 4.4
2009-04-15 08:42:34 +0200 cd r270817 : #i99771# Fix warnings for gcc 4.4
2009-04-14 14:31:01 +0200 mav r270768 : #i99493# fix typo
2009-04-01 12:45:43 +0200 mst r270317 : fix #i100727#
- svtools/inc/svtools/svparser.hxx, svtools/source/svrtf/svparser.cxx,
sfx2/inc/sfx2/docfile.hxx, sfx2/source/doc/{objmisc.cxx,docfile.cxx}:
+ move SvKeyValue stuff from sfx2 to svtools
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx,
sfx2/inc/sfx2/sfxhtml.hxx, sfx2/source/bastyp/sfxhtml.cxx:
+ move ParseMetaOptions() and GetEncodingByMIME() from SfxHTMLParser (sfx2)
to HTMLParser (svtools)
+ make HTMLParser::ParseMetaOptions() a virtual function
+ HTMLParser::ParseMetaOptions() calls GetExtendedCompatibilityTextEncoding()
+ new template method HTMLParser::AddMetaUserDefined()
- svtools/source/svhtml/makefile.mk:
+ enable exceptions for parhtml.cxx
- dbaccess/source/ui/misc/HtmlReader.cxx,
sc/source/filter/html/htmlpars.cxx:
+ remove encoding related code duplication
- sw/source/filter/html/{swhtml{.hxx,.cxx},htmlfld.cxx}:
+ new SwHTMLParser::AddMetaUserDefined() for import of
DOCINFO field subtypes INFO[1-4]
+ do not use DocumentInfo for import of DOCINFO field subtypes INFO[1-4]
2009-03-31 17:01:35 +0200 mav r270288 : #i91214# fix typo
2009-03-31 15:19:41 +0200 mav r270285 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 15:00:36 +0200 mav r270284 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 12:19:13 +0200 mav r270270 : #i100123# taking the lock file over throws no exception
2009-03-30 13:57:21 +0200 mav r270227 : #i100351# fix the typo
2009-03-30 13:47:26 +0200 mav r270225 : #i99885# let OK be default button
2009-03-29 19:38:55 +0200 mav r270190 : CWS-TOOLING: rebase CWS fwk103 to trunk@270033 (milestone: DEV300:m45)
2009-03-16 16:39:48 +0100 mav r269558 : #i93558# convert the attributes as well
2009-03-13 15:35:55 +0100 mav r269488 : #i93558# improve manifest.xml parsing
2009-03-13 08:47:00 +0100 mav r269454 : #i96205# allow to remove password on SaveAs
2009-03-12 13:36:07 +0100 mav r269398 : #i91306# show special error in case of shared document
2009-03-12 13:33:35 +0100 mav r269397 : #i91306# introduce the new error-message
2009-03-12 11:40:42 +0100 mst r269378 : fix #i90877#
- svtools/source/uno/unoevent.cxx:
+ use proper operator delete[]
2009-02-26 15:23:10 +0100 mav r268526 : #i91214# do not use ATL
2009-02-26 14:19:06 +0100 mav r268516 : #i98909# integrate the patch
2009-02-10 17:29:52 +0100 cd r267568 : #i98649# Make sure that we catch the NoSuchElementException when a module is not installed.
2009-06-16 16:15:54 +00:00
|
|
|
{
|
|
|
|
o_rEnc = GetEncodingByMIME( aContent );
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case HTML_META_NONE:
|
|
|
|
if ( !bHTTPEquiv )
|
|
|
|
{
|
|
|
|
if (i_xDocProps.is())
|
|
|
|
{
|
|
|
|
uno::Reference<beans::XPropertyContainer> xUDProps
|
|
|
|
= i_xDocProps->getUserDefinedProperties();
|
|
|
|
try {
|
|
|
|
xUDProps->addProperty(aName,
|
2013-03-01 23:33:49 -06:00
|
|
|
beans::PropertyAttribute::REMOVABLE,
|
2013-04-07 12:06:47 +02:00
|
|
|
uno::makeAny(OUString(aContent)));
|
CWS-TOOLING: integrate CWS fwk103
2009-05-26 12:44:25 +0200 mst r272292 : #i100727#
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx:
+ fix warning: rename method to prevent overloading
2009-05-19 13:42:31 +0200 mav r272075 : #i101356# add comment
2009-05-19 10:56:24 +0200 mav r272062 : #i101356# register the singleton correctly
2009-05-19 10:25:42 +0200 mav r272060 : #i101356# register the singleton correctly
2009-05-18 12:48:48 +0200 mav r272013 : #i91306# fix the typo
2009-05-14 08:50:06 +0200 mav r271871 : #i101356# reduce the amount of macros
2009-05-13 13:26:08 +0200 mav r271858 : #i101356# reduce the amount of macros
2009-05-13 11:29:16 +0200 mav r271849 : #i101356# reduce the amount of macros
2009-05-12 12:09:42 +0200 mav r271815 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 12:03:20 +0200 mav r271814 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:58:48 +0200 mav r271813 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:53:05 +0200 mav r271812 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:48:36 +0200 mav r271810 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:43:45 +0200 mav r271809 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:39:38 +0200 mav r271808 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:37:38 +0200 mav r271806 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:33:58 +0200 mav r271805 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:30:01 +0200 mav r271804 : #i101356# allow to generate a small log if a document can not be stored
2009-05-06 17:43:38 +0200 mst r271607 : #i100727#
- svtools/source/svhtml/parhtml.cxx:
+ adapt code to renaming of HTML constants (sb107)
2009-05-05 11:14:18 +0200 mav r271507 : #i101222# avoid warning
2009-05-05 10:27:23 +0200 mav r271505 : #i101426# send the modified() notification only when the document can be modified
2009-05-05 10:25:07 +0200 mav r271504 : #i101426# send the modified() notification only when the document is modified
2009-05-05 08:42:48 +0200 mav r271497 : CWS-TOOLING: rebase CWS fwk103 to trunk@271427 (milestone: DEV300:m47)
2009-04-30 13:32:11 +0200 mav r271412 : #i100518# check the template folders quietly
2009-04-29 20:04:25 +0200 mst r271393 : - sw/source/filter/html/swhtml.cxx:
+ fix wrong initialization order in constructor
2009-04-28 12:28:46 +0200 mav r271319 : #i99142# set the error correctly
2009-04-28 08:44:48 +0200 mav r271305 : #i99050# clear hidden flag if necessary
2009-04-28 08:40:10 +0200 mav r271304 : #i99050# avoid crash
2009-04-22 07:40:11 +0200 mav r271056 : #i101093# lets not affect the performance
2009-04-15 09:30:47 +0200 cd r270820 : #i99771# Fix warnings for gcc 4.4
2009-04-15 09:19:52 +0200 cd r270819 : #i99771# Fix warnings for gcc 4.4
2009-04-15 08:42:34 +0200 cd r270817 : #i99771# Fix warnings for gcc 4.4
2009-04-14 14:31:01 +0200 mav r270768 : #i99493# fix typo
2009-04-01 12:45:43 +0200 mst r270317 : fix #i100727#
- svtools/inc/svtools/svparser.hxx, svtools/source/svrtf/svparser.cxx,
sfx2/inc/sfx2/docfile.hxx, sfx2/source/doc/{objmisc.cxx,docfile.cxx}:
+ move SvKeyValue stuff from sfx2 to svtools
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx,
sfx2/inc/sfx2/sfxhtml.hxx, sfx2/source/bastyp/sfxhtml.cxx:
+ move ParseMetaOptions() and GetEncodingByMIME() from SfxHTMLParser (sfx2)
to HTMLParser (svtools)
+ make HTMLParser::ParseMetaOptions() a virtual function
+ HTMLParser::ParseMetaOptions() calls GetExtendedCompatibilityTextEncoding()
+ new template method HTMLParser::AddMetaUserDefined()
- svtools/source/svhtml/makefile.mk:
+ enable exceptions for parhtml.cxx
- dbaccess/source/ui/misc/HtmlReader.cxx,
sc/source/filter/html/htmlpars.cxx:
+ remove encoding related code duplication
- sw/source/filter/html/{swhtml{.hxx,.cxx},htmlfld.cxx}:
+ new SwHTMLParser::AddMetaUserDefined() for import of
DOCINFO field subtypes INFO[1-4]
+ do not use DocumentInfo for import of DOCINFO field subtypes INFO[1-4]
2009-03-31 17:01:35 +0200 mav r270288 : #i91214# fix typo
2009-03-31 15:19:41 +0200 mav r270285 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 15:00:36 +0200 mav r270284 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 12:19:13 +0200 mav r270270 : #i100123# taking the lock file over throws no exception
2009-03-30 13:57:21 +0200 mav r270227 : #i100351# fix the typo
2009-03-30 13:47:26 +0200 mav r270225 : #i99885# let OK be default button
2009-03-29 19:38:55 +0200 mav r270190 : CWS-TOOLING: rebase CWS fwk103 to trunk@270033 (milestone: DEV300:m45)
2009-03-16 16:39:48 +0100 mav r269558 : #i93558# convert the attributes as well
2009-03-13 15:35:55 +0100 mav r269488 : #i93558# improve manifest.xml parsing
2009-03-13 08:47:00 +0100 mav r269454 : #i96205# allow to remove password on SaveAs
2009-03-12 13:36:07 +0100 mav r269398 : #i91306# show special error in case of shared document
2009-03-12 13:33:35 +0100 mav r269397 : #i91306# introduce the new error-message
2009-03-12 11:40:42 +0100 mst r269378 : fix #i90877#
- svtools/source/uno/unoevent.cxx:
+ use proper operator delete[]
2009-02-26 15:23:10 +0100 mav r268526 : #i91214# do not use ATL
2009-02-26 14:19:06 +0100 mav r268516 : #i98909# integrate the patch
2009-02-10 17:29:52 +0100 cd r267568 : #i98649# Make sure that we catch the NoSuchElementException when a module is not installed.
2009-06-16 16:15:54 +00:00
|
|
|
AddMetaUserDefined(aName);
|
|
|
|
bChanged = true;
|
|
|
|
} catch (uno::Exception &) {
|
|
|
|
// ignore
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return bChanged;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool HTMLParser::ParseMetaOptions(
|
|
|
|
const uno::Reference<document::XDocumentProperties> & i_xDocProps,
|
|
|
|
SvKeyValueIterator *i_pHeader )
|
|
|
|
{
|
2010-11-05 10:31:15 +08:00
|
|
|
sal_uInt16 nContentOption = HTML_O_CONTENT;
|
CWS-TOOLING: integrate CWS fwk103
2009-05-26 12:44:25 +0200 mst r272292 : #i100727#
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx:
+ fix warning: rename method to prevent overloading
2009-05-19 13:42:31 +0200 mav r272075 : #i101356# add comment
2009-05-19 10:56:24 +0200 mav r272062 : #i101356# register the singleton correctly
2009-05-19 10:25:42 +0200 mav r272060 : #i101356# register the singleton correctly
2009-05-18 12:48:48 +0200 mav r272013 : #i91306# fix the typo
2009-05-14 08:50:06 +0200 mav r271871 : #i101356# reduce the amount of macros
2009-05-13 13:26:08 +0200 mav r271858 : #i101356# reduce the amount of macros
2009-05-13 11:29:16 +0200 mav r271849 : #i101356# reduce the amount of macros
2009-05-12 12:09:42 +0200 mav r271815 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 12:03:20 +0200 mav r271814 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:58:48 +0200 mav r271813 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:53:05 +0200 mav r271812 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:48:36 +0200 mav r271810 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:43:45 +0200 mav r271809 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:39:38 +0200 mav r271808 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:37:38 +0200 mav r271806 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:33:58 +0200 mav r271805 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:30:01 +0200 mav r271804 : #i101356# allow to generate a small log if a document can not be stored
2009-05-06 17:43:38 +0200 mst r271607 : #i100727#
- svtools/source/svhtml/parhtml.cxx:
+ adapt code to renaming of HTML constants (sb107)
2009-05-05 11:14:18 +0200 mav r271507 : #i101222# avoid warning
2009-05-05 10:27:23 +0200 mav r271505 : #i101426# send the modified() notification only when the document can be modified
2009-05-05 10:25:07 +0200 mav r271504 : #i101426# send the modified() notification only when the document is modified
2009-05-05 08:42:48 +0200 mav r271497 : CWS-TOOLING: rebase CWS fwk103 to trunk@271427 (milestone: DEV300:m47)
2009-04-30 13:32:11 +0200 mav r271412 : #i100518# check the template folders quietly
2009-04-29 20:04:25 +0200 mst r271393 : - sw/source/filter/html/swhtml.cxx:
+ fix wrong initialization order in constructor
2009-04-28 12:28:46 +0200 mav r271319 : #i99142# set the error correctly
2009-04-28 08:44:48 +0200 mav r271305 : #i99050# clear hidden flag if necessary
2009-04-28 08:40:10 +0200 mav r271304 : #i99050# avoid crash
2009-04-22 07:40:11 +0200 mav r271056 : #i101093# lets not affect the performance
2009-04-15 09:30:47 +0200 cd r270820 : #i99771# Fix warnings for gcc 4.4
2009-04-15 09:19:52 +0200 cd r270819 : #i99771# Fix warnings for gcc 4.4
2009-04-15 08:42:34 +0200 cd r270817 : #i99771# Fix warnings for gcc 4.4
2009-04-14 14:31:01 +0200 mav r270768 : #i99493# fix typo
2009-04-01 12:45:43 +0200 mst r270317 : fix #i100727#
- svtools/inc/svtools/svparser.hxx, svtools/source/svrtf/svparser.cxx,
sfx2/inc/sfx2/docfile.hxx, sfx2/source/doc/{objmisc.cxx,docfile.cxx}:
+ move SvKeyValue stuff from sfx2 to svtools
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx,
sfx2/inc/sfx2/sfxhtml.hxx, sfx2/source/bastyp/sfxhtml.cxx:
+ move ParseMetaOptions() and GetEncodingByMIME() from SfxHTMLParser (sfx2)
to HTMLParser (svtools)
+ make HTMLParser::ParseMetaOptions() a virtual function
+ HTMLParser::ParseMetaOptions() calls GetExtendedCompatibilityTextEncoding()
+ new template method HTMLParser::AddMetaUserDefined()
- svtools/source/svhtml/makefile.mk:
+ enable exceptions for parhtml.cxx
- dbaccess/source/ui/misc/HtmlReader.cxx,
sc/source/filter/html/htmlpars.cxx:
+ remove encoding related code duplication
- sw/source/filter/html/{swhtml{.hxx,.cxx},htmlfld.cxx}:
+ new SwHTMLParser::AddMetaUserDefined() for import of
DOCINFO field subtypes INFO[1-4]
+ do not use DocumentInfo for import of DOCINFO field subtypes INFO[1-4]
2009-03-31 17:01:35 +0200 mav r270288 : #i91214# fix typo
2009-03-31 15:19:41 +0200 mav r270285 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 15:00:36 +0200 mav r270284 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 12:19:13 +0200 mav r270270 : #i100123# taking the lock file over throws no exception
2009-03-30 13:57:21 +0200 mav r270227 : #i100351# fix the typo
2009-03-30 13:47:26 +0200 mav r270225 : #i99885# let OK be default button
2009-03-29 19:38:55 +0200 mav r270190 : CWS-TOOLING: rebase CWS fwk103 to trunk@270033 (milestone: DEV300:m45)
2009-03-16 16:39:48 +0100 mav r269558 : #i93558# convert the attributes as well
2009-03-13 15:35:55 +0100 mav r269488 : #i93558# improve manifest.xml parsing
2009-03-13 08:47:00 +0100 mav r269454 : #i96205# allow to remove password on SaveAs
2009-03-12 13:36:07 +0100 mav r269398 : #i91306# show special error in case of shared document
2009-03-12 13:33:35 +0100 mav r269397 : #i91306# introduce the new error-message
2009-03-12 11:40:42 +0100 mst r269378 : fix #i90877#
- svtools/source/uno/unoevent.cxx:
+ use proper operator delete[]
2009-02-26 15:23:10 +0100 mav r268526 : #i91214# do not use ATL
2009-02-26 14:19:06 +0100 mav r268516 : #i98909# integrate the patch
2009-02-10 17:29:52 +0100 cd r267568 : #i98649# Make sure that we catch the NoSuchElementException when a module is not installed.
2009-06-16 16:15:54 +00:00
|
|
|
rtl_TextEncoding eEnc = RTL_TEXTENCODING_DONTKNOW;
|
|
|
|
|
|
|
|
bool bRet = ParseMetaOptionsImpl( i_xDocProps, i_pHeader,
|
|
|
|
GetOptions(&nContentOption),
|
|
|
|
eEnc );
|
|
|
|
|
|
|
|
// If the encoding is set by a META tag, it may only overwrite the
|
2010-11-05 10:31:15 +08:00
|
|
|
// current encoding if both, the current and the new encoding, are 1-sal_uInt8
|
CWS-TOOLING: integrate CWS fwk103
2009-05-26 12:44:25 +0200 mst r272292 : #i100727#
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx:
+ fix warning: rename method to prevent overloading
2009-05-19 13:42:31 +0200 mav r272075 : #i101356# add comment
2009-05-19 10:56:24 +0200 mav r272062 : #i101356# register the singleton correctly
2009-05-19 10:25:42 +0200 mav r272060 : #i101356# register the singleton correctly
2009-05-18 12:48:48 +0200 mav r272013 : #i91306# fix the typo
2009-05-14 08:50:06 +0200 mav r271871 : #i101356# reduce the amount of macros
2009-05-13 13:26:08 +0200 mav r271858 : #i101356# reduce the amount of macros
2009-05-13 11:29:16 +0200 mav r271849 : #i101356# reduce the amount of macros
2009-05-12 12:09:42 +0200 mav r271815 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 12:03:20 +0200 mav r271814 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:58:48 +0200 mav r271813 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:53:05 +0200 mav r271812 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:48:36 +0200 mav r271810 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:43:45 +0200 mav r271809 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:39:38 +0200 mav r271808 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:37:38 +0200 mav r271806 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:33:58 +0200 mav r271805 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:30:01 +0200 mav r271804 : #i101356# allow to generate a small log if a document can not be stored
2009-05-06 17:43:38 +0200 mst r271607 : #i100727#
- svtools/source/svhtml/parhtml.cxx:
+ adapt code to renaming of HTML constants (sb107)
2009-05-05 11:14:18 +0200 mav r271507 : #i101222# avoid warning
2009-05-05 10:27:23 +0200 mav r271505 : #i101426# send the modified() notification only when the document can be modified
2009-05-05 10:25:07 +0200 mav r271504 : #i101426# send the modified() notification only when the document is modified
2009-05-05 08:42:48 +0200 mav r271497 : CWS-TOOLING: rebase CWS fwk103 to trunk@271427 (milestone: DEV300:m47)
2009-04-30 13:32:11 +0200 mav r271412 : #i100518# check the template folders quietly
2009-04-29 20:04:25 +0200 mst r271393 : - sw/source/filter/html/swhtml.cxx:
+ fix wrong initialization order in constructor
2009-04-28 12:28:46 +0200 mav r271319 : #i99142# set the error correctly
2009-04-28 08:44:48 +0200 mav r271305 : #i99050# clear hidden flag if necessary
2009-04-28 08:40:10 +0200 mav r271304 : #i99050# avoid crash
2009-04-22 07:40:11 +0200 mav r271056 : #i101093# lets not affect the performance
2009-04-15 09:30:47 +0200 cd r270820 : #i99771# Fix warnings for gcc 4.4
2009-04-15 09:19:52 +0200 cd r270819 : #i99771# Fix warnings for gcc 4.4
2009-04-15 08:42:34 +0200 cd r270817 : #i99771# Fix warnings for gcc 4.4
2009-04-14 14:31:01 +0200 mav r270768 : #i99493# fix typo
2009-04-01 12:45:43 +0200 mst r270317 : fix #i100727#
- svtools/inc/svtools/svparser.hxx, svtools/source/svrtf/svparser.cxx,
sfx2/inc/sfx2/docfile.hxx, sfx2/source/doc/{objmisc.cxx,docfile.cxx}:
+ move SvKeyValue stuff from sfx2 to svtools
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx,
sfx2/inc/sfx2/sfxhtml.hxx, sfx2/source/bastyp/sfxhtml.cxx:
+ move ParseMetaOptions() and GetEncodingByMIME() from SfxHTMLParser (sfx2)
to HTMLParser (svtools)
+ make HTMLParser::ParseMetaOptions() a virtual function
+ HTMLParser::ParseMetaOptions() calls GetExtendedCompatibilityTextEncoding()
+ new template method HTMLParser::AddMetaUserDefined()
- svtools/source/svhtml/makefile.mk:
+ enable exceptions for parhtml.cxx
- dbaccess/source/ui/misc/HtmlReader.cxx,
sc/source/filter/html/htmlpars.cxx:
+ remove encoding related code duplication
- sw/source/filter/html/{swhtml{.hxx,.cxx},htmlfld.cxx}:
+ new SwHTMLParser::AddMetaUserDefined() for import of
DOCINFO field subtypes INFO[1-4]
+ do not use DocumentInfo for import of DOCINFO field subtypes INFO[1-4]
2009-03-31 17:01:35 +0200 mav r270288 : #i91214# fix typo
2009-03-31 15:19:41 +0200 mav r270285 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 15:00:36 +0200 mav r270284 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 12:19:13 +0200 mav r270270 : #i100123# taking the lock file over throws no exception
2009-03-30 13:57:21 +0200 mav r270227 : #i100351# fix the typo
2009-03-30 13:47:26 +0200 mav r270225 : #i99885# let OK be default button
2009-03-29 19:38:55 +0200 mav r270190 : CWS-TOOLING: rebase CWS fwk103 to trunk@270033 (milestone: DEV300:m45)
2009-03-16 16:39:48 +0100 mav r269558 : #i93558# convert the attributes as well
2009-03-13 15:35:55 +0100 mav r269488 : #i93558# improve manifest.xml parsing
2009-03-13 08:47:00 +0100 mav r269454 : #i96205# allow to remove password on SaveAs
2009-03-12 13:36:07 +0100 mav r269398 : #i91306# show special error in case of shared document
2009-03-12 13:33:35 +0100 mav r269397 : #i91306# introduce the new error-message
2009-03-12 11:40:42 +0100 mst r269378 : fix #i90877#
- svtools/source/uno/unoevent.cxx:
+ use proper operator delete[]
2009-02-26 15:23:10 +0100 mav r268526 : #i91214# do not use ATL
2009-02-26 14:19:06 +0100 mav r268516 : #i98909# integrate the patch
2009-02-10 17:29:52 +0100 cd r267568 : #i98649# Make sure that we catch the NoSuchElementException when a module is not installed.
2009-06-16 16:15:54 +00:00
|
|
|
// encodings. Everything else cannot lead to reasonable results.
|
|
|
|
if (RTL_TEXTENCODING_DONTKNOW != eEnc &&
|
|
|
|
rtl_isOctetTextEncoding( eEnc ) &&
|
|
|
|
rtl_isOctetTextEncoding( GetSrcEncoding() ) )
|
|
|
|
{
|
2011-04-22 22:13:32 +02:00
|
|
|
eEnc = GetExtendedCompatibilityTextEncoding( eEnc );
|
CWS-TOOLING: integrate CWS fwk103
2009-05-26 12:44:25 +0200 mst r272292 : #i100727#
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx:
+ fix warning: rename method to prevent overloading
2009-05-19 13:42:31 +0200 mav r272075 : #i101356# add comment
2009-05-19 10:56:24 +0200 mav r272062 : #i101356# register the singleton correctly
2009-05-19 10:25:42 +0200 mav r272060 : #i101356# register the singleton correctly
2009-05-18 12:48:48 +0200 mav r272013 : #i91306# fix the typo
2009-05-14 08:50:06 +0200 mav r271871 : #i101356# reduce the amount of macros
2009-05-13 13:26:08 +0200 mav r271858 : #i101356# reduce the amount of macros
2009-05-13 11:29:16 +0200 mav r271849 : #i101356# reduce the amount of macros
2009-05-12 12:09:42 +0200 mav r271815 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 12:03:20 +0200 mav r271814 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:58:48 +0200 mav r271813 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:53:05 +0200 mav r271812 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:48:36 +0200 mav r271810 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:43:45 +0200 mav r271809 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:39:38 +0200 mav r271808 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:37:38 +0200 mav r271806 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:33:58 +0200 mav r271805 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:30:01 +0200 mav r271804 : #i101356# allow to generate a small log if a document can not be stored
2009-05-06 17:43:38 +0200 mst r271607 : #i100727#
- svtools/source/svhtml/parhtml.cxx:
+ adapt code to renaming of HTML constants (sb107)
2009-05-05 11:14:18 +0200 mav r271507 : #i101222# avoid warning
2009-05-05 10:27:23 +0200 mav r271505 : #i101426# send the modified() notification only when the document can be modified
2009-05-05 10:25:07 +0200 mav r271504 : #i101426# send the modified() notification only when the document is modified
2009-05-05 08:42:48 +0200 mav r271497 : CWS-TOOLING: rebase CWS fwk103 to trunk@271427 (milestone: DEV300:m47)
2009-04-30 13:32:11 +0200 mav r271412 : #i100518# check the template folders quietly
2009-04-29 20:04:25 +0200 mst r271393 : - sw/source/filter/html/swhtml.cxx:
+ fix wrong initialization order in constructor
2009-04-28 12:28:46 +0200 mav r271319 : #i99142# set the error correctly
2009-04-28 08:44:48 +0200 mav r271305 : #i99050# clear hidden flag if necessary
2009-04-28 08:40:10 +0200 mav r271304 : #i99050# avoid crash
2009-04-22 07:40:11 +0200 mav r271056 : #i101093# lets not affect the performance
2009-04-15 09:30:47 +0200 cd r270820 : #i99771# Fix warnings for gcc 4.4
2009-04-15 09:19:52 +0200 cd r270819 : #i99771# Fix warnings for gcc 4.4
2009-04-15 08:42:34 +0200 cd r270817 : #i99771# Fix warnings for gcc 4.4
2009-04-14 14:31:01 +0200 mav r270768 : #i99493# fix typo
2009-04-01 12:45:43 +0200 mst r270317 : fix #i100727#
- svtools/inc/svtools/svparser.hxx, svtools/source/svrtf/svparser.cxx,
sfx2/inc/sfx2/docfile.hxx, sfx2/source/doc/{objmisc.cxx,docfile.cxx}:
+ move SvKeyValue stuff from sfx2 to svtools
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx,
sfx2/inc/sfx2/sfxhtml.hxx, sfx2/source/bastyp/sfxhtml.cxx:
+ move ParseMetaOptions() and GetEncodingByMIME() from SfxHTMLParser (sfx2)
to HTMLParser (svtools)
+ make HTMLParser::ParseMetaOptions() a virtual function
+ HTMLParser::ParseMetaOptions() calls GetExtendedCompatibilityTextEncoding()
+ new template method HTMLParser::AddMetaUserDefined()
- svtools/source/svhtml/makefile.mk:
+ enable exceptions for parhtml.cxx
- dbaccess/source/ui/misc/HtmlReader.cxx,
sc/source/filter/html/htmlpars.cxx:
+ remove encoding related code duplication
- sw/source/filter/html/{swhtml{.hxx,.cxx},htmlfld.cxx}:
+ new SwHTMLParser::AddMetaUserDefined() for import of
DOCINFO field subtypes INFO[1-4]
+ do not use DocumentInfo for import of DOCINFO field subtypes INFO[1-4]
2009-03-31 17:01:35 +0200 mav r270288 : #i91214# fix typo
2009-03-31 15:19:41 +0200 mav r270285 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 15:00:36 +0200 mav r270284 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 12:19:13 +0200 mav r270270 : #i100123# taking the lock file over throws no exception
2009-03-30 13:57:21 +0200 mav r270227 : #i100351# fix the typo
2009-03-30 13:47:26 +0200 mav r270225 : #i99885# let OK be default button
2009-03-29 19:38:55 +0200 mav r270190 : CWS-TOOLING: rebase CWS fwk103 to trunk@270033 (milestone: DEV300:m45)
2009-03-16 16:39:48 +0100 mav r269558 : #i93558# convert the attributes as well
2009-03-13 15:35:55 +0100 mav r269488 : #i93558# improve manifest.xml parsing
2009-03-13 08:47:00 +0100 mav r269454 : #i96205# allow to remove password on SaveAs
2009-03-12 13:36:07 +0100 mav r269398 : #i91306# show special error in case of shared document
2009-03-12 13:33:35 +0100 mav r269397 : #i91306# introduce the new error-message
2009-03-12 11:40:42 +0100 mst r269378 : fix #i90877#
- svtools/source/uno/unoevent.cxx:
+ use proper operator delete[]
2009-02-26 15:23:10 +0100 mav r268526 : #i91214# do not use ATL
2009-02-26 14:19:06 +0100 mav r268516 : #i98909# integrate the patch
2009-02-10 17:29:52 +0100 cd r267568 : #i98649# Make sure that we catch the NoSuchElementException when a module is not installed.
2009-06-16 16:15:54 +00:00
|
|
|
SetSrcEncoding( eEnc );
|
|
|
|
}
|
|
|
|
|
|
|
|
return bRet;
|
|
|
|
}
|
|
|
|
|
2013-08-14 09:49:17 +02:00
|
|
|
rtl_TextEncoding HTMLParser::GetEncodingByMIME( const OUString& rMime )
|
CWS-TOOLING: integrate CWS fwk103
2009-05-26 12:44:25 +0200 mst r272292 : #i100727#
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx:
+ fix warning: rename method to prevent overloading
2009-05-19 13:42:31 +0200 mav r272075 : #i101356# add comment
2009-05-19 10:56:24 +0200 mav r272062 : #i101356# register the singleton correctly
2009-05-19 10:25:42 +0200 mav r272060 : #i101356# register the singleton correctly
2009-05-18 12:48:48 +0200 mav r272013 : #i91306# fix the typo
2009-05-14 08:50:06 +0200 mav r271871 : #i101356# reduce the amount of macros
2009-05-13 13:26:08 +0200 mav r271858 : #i101356# reduce the amount of macros
2009-05-13 11:29:16 +0200 mav r271849 : #i101356# reduce the amount of macros
2009-05-12 12:09:42 +0200 mav r271815 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 12:03:20 +0200 mav r271814 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:58:48 +0200 mav r271813 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:53:05 +0200 mav r271812 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:48:36 +0200 mav r271810 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:43:45 +0200 mav r271809 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:39:38 +0200 mav r271808 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:37:38 +0200 mav r271806 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:33:58 +0200 mav r271805 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:30:01 +0200 mav r271804 : #i101356# allow to generate a small log if a document can not be stored
2009-05-06 17:43:38 +0200 mst r271607 : #i100727#
- svtools/source/svhtml/parhtml.cxx:
+ adapt code to renaming of HTML constants (sb107)
2009-05-05 11:14:18 +0200 mav r271507 : #i101222# avoid warning
2009-05-05 10:27:23 +0200 mav r271505 : #i101426# send the modified() notification only when the document can be modified
2009-05-05 10:25:07 +0200 mav r271504 : #i101426# send the modified() notification only when the document is modified
2009-05-05 08:42:48 +0200 mav r271497 : CWS-TOOLING: rebase CWS fwk103 to trunk@271427 (milestone: DEV300:m47)
2009-04-30 13:32:11 +0200 mav r271412 : #i100518# check the template folders quietly
2009-04-29 20:04:25 +0200 mst r271393 : - sw/source/filter/html/swhtml.cxx:
+ fix wrong initialization order in constructor
2009-04-28 12:28:46 +0200 mav r271319 : #i99142# set the error correctly
2009-04-28 08:44:48 +0200 mav r271305 : #i99050# clear hidden flag if necessary
2009-04-28 08:40:10 +0200 mav r271304 : #i99050# avoid crash
2009-04-22 07:40:11 +0200 mav r271056 : #i101093# lets not affect the performance
2009-04-15 09:30:47 +0200 cd r270820 : #i99771# Fix warnings for gcc 4.4
2009-04-15 09:19:52 +0200 cd r270819 : #i99771# Fix warnings for gcc 4.4
2009-04-15 08:42:34 +0200 cd r270817 : #i99771# Fix warnings for gcc 4.4
2009-04-14 14:31:01 +0200 mav r270768 : #i99493# fix typo
2009-04-01 12:45:43 +0200 mst r270317 : fix #i100727#
- svtools/inc/svtools/svparser.hxx, svtools/source/svrtf/svparser.cxx,
sfx2/inc/sfx2/docfile.hxx, sfx2/source/doc/{objmisc.cxx,docfile.cxx}:
+ move SvKeyValue stuff from sfx2 to svtools
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx,
sfx2/inc/sfx2/sfxhtml.hxx, sfx2/source/bastyp/sfxhtml.cxx:
+ move ParseMetaOptions() and GetEncodingByMIME() from SfxHTMLParser (sfx2)
to HTMLParser (svtools)
+ make HTMLParser::ParseMetaOptions() a virtual function
+ HTMLParser::ParseMetaOptions() calls GetExtendedCompatibilityTextEncoding()
+ new template method HTMLParser::AddMetaUserDefined()
- svtools/source/svhtml/makefile.mk:
+ enable exceptions for parhtml.cxx
- dbaccess/source/ui/misc/HtmlReader.cxx,
sc/source/filter/html/htmlpars.cxx:
+ remove encoding related code duplication
- sw/source/filter/html/{swhtml{.hxx,.cxx},htmlfld.cxx}:
+ new SwHTMLParser::AddMetaUserDefined() for import of
DOCINFO field subtypes INFO[1-4]
+ do not use DocumentInfo for import of DOCINFO field subtypes INFO[1-4]
2009-03-31 17:01:35 +0200 mav r270288 : #i91214# fix typo
2009-03-31 15:19:41 +0200 mav r270285 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 15:00:36 +0200 mav r270284 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 12:19:13 +0200 mav r270270 : #i100123# taking the lock file over throws no exception
2009-03-30 13:57:21 +0200 mav r270227 : #i100351# fix the typo
2009-03-30 13:47:26 +0200 mav r270225 : #i99885# let OK be default button
2009-03-29 19:38:55 +0200 mav r270190 : CWS-TOOLING: rebase CWS fwk103 to trunk@270033 (milestone: DEV300:m45)
2009-03-16 16:39:48 +0100 mav r269558 : #i93558# convert the attributes as well
2009-03-13 15:35:55 +0100 mav r269488 : #i93558# improve manifest.xml parsing
2009-03-13 08:47:00 +0100 mav r269454 : #i96205# allow to remove password on SaveAs
2009-03-12 13:36:07 +0100 mav r269398 : #i91306# show special error in case of shared document
2009-03-12 13:33:35 +0100 mav r269397 : #i91306# introduce the new error-message
2009-03-12 11:40:42 +0100 mst r269378 : fix #i90877#
- svtools/source/uno/unoevent.cxx:
+ use proper operator delete[]
2009-02-26 15:23:10 +0100 mav r268526 : #i91214# do not use ATL
2009-02-26 14:19:06 +0100 mav r268516 : #i98909# integrate the patch
2009-02-10 17:29:52 +0100 cd r267568 : #i98649# Make sure that we catch the NoSuchElementException when a module is not installed.
2009-06-16 16:15:54 +00:00
|
|
|
{
|
2012-11-27 07:00:28 -06:00
|
|
|
OUString sType;
|
|
|
|
OUString sSubType;
|
CWS-TOOLING: integrate CWS fwk103
2009-05-26 12:44:25 +0200 mst r272292 : #i100727#
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx:
+ fix warning: rename method to prevent overloading
2009-05-19 13:42:31 +0200 mav r272075 : #i101356# add comment
2009-05-19 10:56:24 +0200 mav r272062 : #i101356# register the singleton correctly
2009-05-19 10:25:42 +0200 mav r272060 : #i101356# register the singleton correctly
2009-05-18 12:48:48 +0200 mav r272013 : #i91306# fix the typo
2009-05-14 08:50:06 +0200 mav r271871 : #i101356# reduce the amount of macros
2009-05-13 13:26:08 +0200 mav r271858 : #i101356# reduce the amount of macros
2009-05-13 11:29:16 +0200 mav r271849 : #i101356# reduce the amount of macros
2009-05-12 12:09:42 +0200 mav r271815 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 12:03:20 +0200 mav r271814 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:58:48 +0200 mav r271813 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:53:05 +0200 mav r271812 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:48:36 +0200 mav r271810 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:43:45 +0200 mav r271809 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:39:38 +0200 mav r271808 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:37:38 +0200 mav r271806 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:33:58 +0200 mav r271805 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:30:01 +0200 mav r271804 : #i101356# allow to generate a small log if a document can not be stored
2009-05-06 17:43:38 +0200 mst r271607 : #i100727#
- svtools/source/svhtml/parhtml.cxx:
+ adapt code to renaming of HTML constants (sb107)
2009-05-05 11:14:18 +0200 mav r271507 : #i101222# avoid warning
2009-05-05 10:27:23 +0200 mav r271505 : #i101426# send the modified() notification only when the document can be modified
2009-05-05 10:25:07 +0200 mav r271504 : #i101426# send the modified() notification only when the document is modified
2009-05-05 08:42:48 +0200 mav r271497 : CWS-TOOLING: rebase CWS fwk103 to trunk@271427 (milestone: DEV300:m47)
2009-04-30 13:32:11 +0200 mav r271412 : #i100518# check the template folders quietly
2009-04-29 20:04:25 +0200 mst r271393 : - sw/source/filter/html/swhtml.cxx:
+ fix wrong initialization order in constructor
2009-04-28 12:28:46 +0200 mav r271319 : #i99142# set the error correctly
2009-04-28 08:44:48 +0200 mav r271305 : #i99050# clear hidden flag if necessary
2009-04-28 08:40:10 +0200 mav r271304 : #i99050# avoid crash
2009-04-22 07:40:11 +0200 mav r271056 : #i101093# lets not affect the performance
2009-04-15 09:30:47 +0200 cd r270820 : #i99771# Fix warnings for gcc 4.4
2009-04-15 09:19:52 +0200 cd r270819 : #i99771# Fix warnings for gcc 4.4
2009-04-15 08:42:34 +0200 cd r270817 : #i99771# Fix warnings for gcc 4.4
2009-04-14 14:31:01 +0200 mav r270768 : #i99493# fix typo
2009-04-01 12:45:43 +0200 mst r270317 : fix #i100727#
- svtools/inc/svtools/svparser.hxx, svtools/source/svrtf/svparser.cxx,
sfx2/inc/sfx2/docfile.hxx, sfx2/source/doc/{objmisc.cxx,docfile.cxx}:
+ move SvKeyValue stuff from sfx2 to svtools
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx,
sfx2/inc/sfx2/sfxhtml.hxx, sfx2/source/bastyp/sfxhtml.cxx:
+ move ParseMetaOptions() and GetEncodingByMIME() from SfxHTMLParser (sfx2)
to HTMLParser (svtools)
+ make HTMLParser::ParseMetaOptions() a virtual function
+ HTMLParser::ParseMetaOptions() calls GetExtendedCompatibilityTextEncoding()
+ new template method HTMLParser::AddMetaUserDefined()
- svtools/source/svhtml/makefile.mk:
+ enable exceptions for parhtml.cxx
- dbaccess/source/ui/misc/HtmlReader.cxx,
sc/source/filter/html/htmlpars.cxx:
+ remove encoding related code duplication
- sw/source/filter/html/{swhtml{.hxx,.cxx},htmlfld.cxx}:
+ new SwHTMLParser::AddMetaUserDefined() for import of
DOCINFO field subtypes INFO[1-4]
+ do not use DocumentInfo for import of DOCINFO field subtypes INFO[1-4]
2009-03-31 17:01:35 +0200 mav r270288 : #i91214# fix typo
2009-03-31 15:19:41 +0200 mav r270285 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 15:00:36 +0200 mav r270284 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 12:19:13 +0200 mav r270270 : #i100123# taking the lock file over throws no exception
2009-03-30 13:57:21 +0200 mav r270227 : #i100351# fix the typo
2009-03-30 13:47:26 +0200 mav r270225 : #i99885# let OK be default button
2009-03-29 19:38:55 +0200 mav r270190 : CWS-TOOLING: rebase CWS fwk103 to trunk@270033 (milestone: DEV300:m45)
2009-03-16 16:39:48 +0100 mav r269558 : #i93558# convert the attributes as well
2009-03-13 15:35:55 +0100 mav r269488 : #i93558# improve manifest.xml parsing
2009-03-13 08:47:00 +0100 mav r269454 : #i96205# allow to remove password on SaveAs
2009-03-12 13:36:07 +0100 mav r269398 : #i91306# show special error in case of shared document
2009-03-12 13:33:35 +0100 mav r269397 : #i91306# introduce the new error-message
2009-03-12 11:40:42 +0100 mst r269378 : fix #i90877#
- svtools/source/uno/unoevent.cxx:
+ use proper operator delete[]
2009-02-26 15:23:10 +0100 mav r268526 : #i91214# do not use ATL
2009-02-26 14:19:06 +0100 mav r268516 : #i98909# integrate the patch
2009-02-10 17:29:52 +0100 cd r267568 : #i98649# Make sure that we catch the NoSuchElementException when a module is not installed.
2009-06-16 16:15:54 +00:00
|
|
|
INetContentTypeParameterList aParameters;
|
2011-06-23 00:03:52 +01:00
|
|
|
if (INetContentTypes::parse(rMime, sType, sSubType, &aParameters))
|
CWS-TOOLING: integrate CWS fwk103
2009-05-26 12:44:25 +0200 mst r272292 : #i100727#
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx:
+ fix warning: rename method to prevent overloading
2009-05-19 13:42:31 +0200 mav r272075 : #i101356# add comment
2009-05-19 10:56:24 +0200 mav r272062 : #i101356# register the singleton correctly
2009-05-19 10:25:42 +0200 mav r272060 : #i101356# register the singleton correctly
2009-05-18 12:48:48 +0200 mav r272013 : #i91306# fix the typo
2009-05-14 08:50:06 +0200 mav r271871 : #i101356# reduce the amount of macros
2009-05-13 13:26:08 +0200 mav r271858 : #i101356# reduce the amount of macros
2009-05-13 11:29:16 +0200 mav r271849 : #i101356# reduce the amount of macros
2009-05-12 12:09:42 +0200 mav r271815 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 12:03:20 +0200 mav r271814 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:58:48 +0200 mav r271813 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:53:05 +0200 mav r271812 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:48:36 +0200 mav r271810 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:43:45 +0200 mav r271809 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:39:38 +0200 mav r271808 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:37:38 +0200 mav r271806 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:33:58 +0200 mav r271805 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:30:01 +0200 mav r271804 : #i101356# allow to generate a small log if a document can not be stored
2009-05-06 17:43:38 +0200 mst r271607 : #i100727#
- svtools/source/svhtml/parhtml.cxx:
+ adapt code to renaming of HTML constants (sb107)
2009-05-05 11:14:18 +0200 mav r271507 : #i101222# avoid warning
2009-05-05 10:27:23 +0200 mav r271505 : #i101426# send the modified() notification only when the document can be modified
2009-05-05 10:25:07 +0200 mav r271504 : #i101426# send the modified() notification only when the document is modified
2009-05-05 08:42:48 +0200 mav r271497 : CWS-TOOLING: rebase CWS fwk103 to trunk@271427 (milestone: DEV300:m47)
2009-04-30 13:32:11 +0200 mav r271412 : #i100518# check the template folders quietly
2009-04-29 20:04:25 +0200 mst r271393 : - sw/source/filter/html/swhtml.cxx:
+ fix wrong initialization order in constructor
2009-04-28 12:28:46 +0200 mav r271319 : #i99142# set the error correctly
2009-04-28 08:44:48 +0200 mav r271305 : #i99050# clear hidden flag if necessary
2009-04-28 08:40:10 +0200 mav r271304 : #i99050# avoid crash
2009-04-22 07:40:11 +0200 mav r271056 : #i101093# lets not affect the performance
2009-04-15 09:30:47 +0200 cd r270820 : #i99771# Fix warnings for gcc 4.4
2009-04-15 09:19:52 +0200 cd r270819 : #i99771# Fix warnings for gcc 4.4
2009-04-15 08:42:34 +0200 cd r270817 : #i99771# Fix warnings for gcc 4.4
2009-04-14 14:31:01 +0200 mav r270768 : #i99493# fix typo
2009-04-01 12:45:43 +0200 mst r270317 : fix #i100727#
- svtools/inc/svtools/svparser.hxx, svtools/source/svrtf/svparser.cxx,
sfx2/inc/sfx2/docfile.hxx, sfx2/source/doc/{objmisc.cxx,docfile.cxx}:
+ move SvKeyValue stuff from sfx2 to svtools
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx,
sfx2/inc/sfx2/sfxhtml.hxx, sfx2/source/bastyp/sfxhtml.cxx:
+ move ParseMetaOptions() and GetEncodingByMIME() from SfxHTMLParser (sfx2)
to HTMLParser (svtools)
+ make HTMLParser::ParseMetaOptions() a virtual function
+ HTMLParser::ParseMetaOptions() calls GetExtendedCompatibilityTextEncoding()
+ new template method HTMLParser::AddMetaUserDefined()
- svtools/source/svhtml/makefile.mk:
+ enable exceptions for parhtml.cxx
- dbaccess/source/ui/misc/HtmlReader.cxx,
sc/source/filter/html/htmlpars.cxx:
+ remove encoding related code duplication
- sw/source/filter/html/{swhtml{.hxx,.cxx},htmlfld.cxx}:
+ new SwHTMLParser::AddMetaUserDefined() for import of
DOCINFO field subtypes INFO[1-4]
+ do not use DocumentInfo for import of DOCINFO field subtypes INFO[1-4]
2009-03-31 17:01:35 +0200 mav r270288 : #i91214# fix typo
2009-03-31 15:19:41 +0200 mav r270285 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 15:00:36 +0200 mav r270284 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 12:19:13 +0200 mav r270270 : #i100123# taking the lock file over throws no exception
2009-03-30 13:57:21 +0200 mav r270227 : #i100351# fix the typo
2009-03-30 13:47:26 +0200 mav r270225 : #i99885# let OK be default button
2009-03-29 19:38:55 +0200 mav r270190 : CWS-TOOLING: rebase CWS fwk103 to trunk@270033 (milestone: DEV300:m45)
2009-03-16 16:39:48 +0100 mav r269558 : #i93558# convert the attributes as well
2009-03-13 15:35:55 +0100 mav r269488 : #i93558# improve manifest.xml parsing
2009-03-13 08:47:00 +0100 mav r269454 : #i96205# allow to remove password on SaveAs
2009-03-12 13:36:07 +0100 mav r269398 : #i91306# show special error in case of shared document
2009-03-12 13:33:35 +0100 mav r269397 : #i91306# introduce the new error-message
2009-03-12 11:40:42 +0100 mst r269378 : fix #i90877#
- svtools/source/uno/unoevent.cxx:
+ use proper operator delete[]
2009-02-26 15:23:10 +0100 mav r268526 : #i91214# do not use ATL
2009-02-26 14:19:06 +0100 mav r268516 : #i98909# integrate the patch
2009-02-10 17:29:52 +0100 cd r267568 : #i98649# Make sure that we catch the NoSuchElementException when a module is not installed.
2009-06-16 16:15:54 +00:00
|
|
|
{
|
2012-11-27 07:00:28 -06:00
|
|
|
const INetContentTypeParameter * pCharset = aParameters.find("charset");
|
CWS-TOOLING: integrate CWS fwk103
2009-05-26 12:44:25 +0200 mst r272292 : #i100727#
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx:
+ fix warning: rename method to prevent overloading
2009-05-19 13:42:31 +0200 mav r272075 : #i101356# add comment
2009-05-19 10:56:24 +0200 mav r272062 : #i101356# register the singleton correctly
2009-05-19 10:25:42 +0200 mav r272060 : #i101356# register the singleton correctly
2009-05-18 12:48:48 +0200 mav r272013 : #i91306# fix the typo
2009-05-14 08:50:06 +0200 mav r271871 : #i101356# reduce the amount of macros
2009-05-13 13:26:08 +0200 mav r271858 : #i101356# reduce the amount of macros
2009-05-13 11:29:16 +0200 mav r271849 : #i101356# reduce the amount of macros
2009-05-12 12:09:42 +0200 mav r271815 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 12:03:20 +0200 mav r271814 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:58:48 +0200 mav r271813 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:53:05 +0200 mav r271812 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:48:36 +0200 mav r271810 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:43:45 +0200 mav r271809 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:39:38 +0200 mav r271808 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:37:38 +0200 mav r271806 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:33:58 +0200 mav r271805 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:30:01 +0200 mav r271804 : #i101356# allow to generate a small log if a document can not be stored
2009-05-06 17:43:38 +0200 mst r271607 : #i100727#
- svtools/source/svhtml/parhtml.cxx:
+ adapt code to renaming of HTML constants (sb107)
2009-05-05 11:14:18 +0200 mav r271507 : #i101222# avoid warning
2009-05-05 10:27:23 +0200 mav r271505 : #i101426# send the modified() notification only when the document can be modified
2009-05-05 10:25:07 +0200 mav r271504 : #i101426# send the modified() notification only when the document is modified
2009-05-05 08:42:48 +0200 mav r271497 : CWS-TOOLING: rebase CWS fwk103 to trunk@271427 (milestone: DEV300:m47)
2009-04-30 13:32:11 +0200 mav r271412 : #i100518# check the template folders quietly
2009-04-29 20:04:25 +0200 mst r271393 : - sw/source/filter/html/swhtml.cxx:
+ fix wrong initialization order in constructor
2009-04-28 12:28:46 +0200 mav r271319 : #i99142# set the error correctly
2009-04-28 08:44:48 +0200 mav r271305 : #i99050# clear hidden flag if necessary
2009-04-28 08:40:10 +0200 mav r271304 : #i99050# avoid crash
2009-04-22 07:40:11 +0200 mav r271056 : #i101093# lets not affect the performance
2009-04-15 09:30:47 +0200 cd r270820 : #i99771# Fix warnings for gcc 4.4
2009-04-15 09:19:52 +0200 cd r270819 : #i99771# Fix warnings for gcc 4.4
2009-04-15 08:42:34 +0200 cd r270817 : #i99771# Fix warnings for gcc 4.4
2009-04-14 14:31:01 +0200 mav r270768 : #i99493# fix typo
2009-04-01 12:45:43 +0200 mst r270317 : fix #i100727#
- svtools/inc/svtools/svparser.hxx, svtools/source/svrtf/svparser.cxx,
sfx2/inc/sfx2/docfile.hxx, sfx2/source/doc/{objmisc.cxx,docfile.cxx}:
+ move SvKeyValue stuff from sfx2 to svtools
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx,
sfx2/inc/sfx2/sfxhtml.hxx, sfx2/source/bastyp/sfxhtml.cxx:
+ move ParseMetaOptions() and GetEncodingByMIME() from SfxHTMLParser (sfx2)
to HTMLParser (svtools)
+ make HTMLParser::ParseMetaOptions() a virtual function
+ HTMLParser::ParseMetaOptions() calls GetExtendedCompatibilityTextEncoding()
+ new template method HTMLParser::AddMetaUserDefined()
- svtools/source/svhtml/makefile.mk:
+ enable exceptions for parhtml.cxx
- dbaccess/source/ui/misc/HtmlReader.cxx,
sc/source/filter/html/htmlpars.cxx:
+ remove encoding related code duplication
- sw/source/filter/html/{swhtml{.hxx,.cxx},htmlfld.cxx}:
+ new SwHTMLParser::AddMetaUserDefined() for import of
DOCINFO field subtypes INFO[1-4]
+ do not use DocumentInfo for import of DOCINFO field subtypes INFO[1-4]
2009-03-31 17:01:35 +0200 mav r270288 : #i91214# fix typo
2009-03-31 15:19:41 +0200 mav r270285 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 15:00:36 +0200 mav r270284 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 12:19:13 +0200 mav r270270 : #i100123# taking the lock file over throws no exception
2009-03-30 13:57:21 +0200 mav r270227 : #i100351# fix the typo
2009-03-30 13:47:26 +0200 mav r270225 : #i99885# let OK be default button
2009-03-29 19:38:55 +0200 mav r270190 : CWS-TOOLING: rebase CWS fwk103 to trunk@270033 (milestone: DEV300:m45)
2009-03-16 16:39:48 +0100 mav r269558 : #i93558# convert the attributes as well
2009-03-13 15:35:55 +0100 mav r269488 : #i93558# improve manifest.xml parsing
2009-03-13 08:47:00 +0100 mav r269454 : #i96205# allow to remove password on SaveAs
2009-03-12 13:36:07 +0100 mav r269398 : #i91306# show special error in case of shared document
2009-03-12 13:33:35 +0100 mav r269397 : #i91306# introduce the new error-message
2009-03-12 11:40:42 +0100 mst r269378 : fix #i90877#
- svtools/source/uno/unoevent.cxx:
+ use proper operator delete[]
2009-02-26 15:23:10 +0100 mav r268526 : #i91214# do not use ATL
2009-02-26 14:19:06 +0100 mav r268516 : #i98909# integrate the patch
2009-02-10 17:29:52 +0100 cd r267568 : #i98649# Make sure that we catch the NoSuchElementException when a module is not installed.
2009-06-16 16:15:54 +00:00
|
|
|
if (pCharset != 0)
|
|
|
|
{
|
2013-04-07 12:06:47 +02:00
|
|
|
OString sValue(OUStringToOString(pCharset->m_sValue, RTL_TEXTENCODING_ASCII_US));
|
2012-11-27 07:00:28 -06:00
|
|
|
return GetExtendedCompatibilityTextEncoding( rtl_getTextEncodingFromMimeCharset( sValue.getStr() ) );
|
CWS-TOOLING: integrate CWS fwk103
2009-05-26 12:44:25 +0200 mst r272292 : #i100727#
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx:
+ fix warning: rename method to prevent overloading
2009-05-19 13:42:31 +0200 mav r272075 : #i101356# add comment
2009-05-19 10:56:24 +0200 mav r272062 : #i101356# register the singleton correctly
2009-05-19 10:25:42 +0200 mav r272060 : #i101356# register the singleton correctly
2009-05-18 12:48:48 +0200 mav r272013 : #i91306# fix the typo
2009-05-14 08:50:06 +0200 mav r271871 : #i101356# reduce the amount of macros
2009-05-13 13:26:08 +0200 mav r271858 : #i101356# reduce the amount of macros
2009-05-13 11:29:16 +0200 mav r271849 : #i101356# reduce the amount of macros
2009-05-12 12:09:42 +0200 mav r271815 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 12:03:20 +0200 mav r271814 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:58:48 +0200 mav r271813 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:53:05 +0200 mav r271812 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:48:36 +0200 mav r271810 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:43:45 +0200 mav r271809 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:39:38 +0200 mav r271808 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:37:38 +0200 mav r271806 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:33:58 +0200 mav r271805 : #i101356# allow to generate a small log if a document can not be stored
2009-05-12 11:30:01 +0200 mav r271804 : #i101356# allow to generate a small log if a document can not be stored
2009-05-06 17:43:38 +0200 mst r271607 : #i100727#
- svtools/source/svhtml/parhtml.cxx:
+ adapt code to renaming of HTML constants (sb107)
2009-05-05 11:14:18 +0200 mav r271507 : #i101222# avoid warning
2009-05-05 10:27:23 +0200 mav r271505 : #i101426# send the modified() notification only when the document can be modified
2009-05-05 10:25:07 +0200 mav r271504 : #i101426# send the modified() notification only when the document is modified
2009-05-05 08:42:48 +0200 mav r271497 : CWS-TOOLING: rebase CWS fwk103 to trunk@271427 (milestone: DEV300:m47)
2009-04-30 13:32:11 +0200 mav r271412 : #i100518# check the template folders quietly
2009-04-29 20:04:25 +0200 mst r271393 : - sw/source/filter/html/swhtml.cxx:
+ fix wrong initialization order in constructor
2009-04-28 12:28:46 +0200 mav r271319 : #i99142# set the error correctly
2009-04-28 08:44:48 +0200 mav r271305 : #i99050# clear hidden flag if necessary
2009-04-28 08:40:10 +0200 mav r271304 : #i99050# avoid crash
2009-04-22 07:40:11 +0200 mav r271056 : #i101093# lets not affect the performance
2009-04-15 09:30:47 +0200 cd r270820 : #i99771# Fix warnings for gcc 4.4
2009-04-15 09:19:52 +0200 cd r270819 : #i99771# Fix warnings for gcc 4.4
2009-04-15 08:42:34 +0200 cd r270817 : #i99771# Fix warnings for gcc 4.4
2009-04-14 14:31:01 +0200 mav r270768 : #i99493# fix typo
2009-04-01 12:45:43 +0200 mst r270317 : fix #i100727#
- svtools/inc/svtools/svparser.hxx, svtools/source/svrtf/svparser.cxx,
sfx2/inc/sfx2/docfile.hxx, sfx2/source/doc/{objmisc.cxx,docfile.cxx}:
+ move SvKeyValue stuff from sfx2 to svtools
- svtools/inc/svtools/parhtml.hxx, svtools/source/svhtml/parhtml.cxx,
sfx2/inc/sfx2/sfxhtml.hxx, sfx2/source/bastyp/sfxhtml.cxx:
+ move ParseMetaOptions() and GetEncodingByMIME() from SfxHTMLParser (sfx2)
to HTMLParser (svtools)
+ make HTMLParser::ParseMetaOptions() a virtual function
+ HTMLParser::ParseMetaOptions() calls GetExtendedCompatibilityTextEncoding()
+ new template method HTMLParser::AddMetaUserDefined()
- svtools/source/svhtml/makefile.mk:
+ enable exceptions for parhtml.cxx
- dbaccess/source/ui/misc/HtmlReader.cxx,
sc/source/filter/html/htmlpars.cxx:
+ remove encoding related code duplication
- sw/source/filter/html/{swhtml{.hxx,.cxx},htmlfld.cxx}:
+ new SwHTMLParser::AddMetaUserDefined() for import of
DOCINFO field subtypes INFO[1-4]
+ do not use DocumentInfo for import of DOCINFO field subtypes INFO[1-4]
2009-03-31 17:01:35 +0200 mav r270288 : #i91214# fix typo
2009-03-31 15:19:41 +0200 mav r270285 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 15:00:36 +0200 mav r270284 : #i100123# allow to turn OOo locking mechanics off
2009-03-31 12:19:13 +0200 mav r270270 : #i100123# taking the lock file over throws no exception
2009-03-30 13:57:21 +0200 mav r270227 : #i100351# fix the typo
2009-03-30 13:47:26 +0200 mav r270225 : #i99885# let OK be default button
2009-03-29 19:38:55 +0200 mav r270190 : CWS-TOOLING: rebase CWS fwk103 to trunk@270033 (milestone: DEV300:m45)
2009-03-16 16:39:48 +0100 mav r269558 : #i93558# convert the attributes as well
2009-03-13 15:35:55 +0100 mav r269488 : #i93558# improve manifest.xml parsing
2009-03-13 08:47:00 +0100 mav r269454 : #i96205# allow to remove password on SaveAs
2009-03-12 13:36:07 +0100 mav r269398 : #i91306# show special error in case of shared document
2009-03-12 13:33:35 +0100 mav r269397 : #i91306# introduce the new error-message
2009-03-12 11:40:42 +0100 mst r269378 : fix #i90877#
- svtools/source/uno/unoevent.cxx:
+ use proper operator delete[]
2009-02-26 15:23:10 +0100 mav r268526 : #i91214# do not use ATL
2009-02-26 14:19:06 +0100 mav r268516 : #i98909# integrate the patch
2009-02-10 17:29:52 +0100 cd r267568 : #i98649# Make sure that we catch the NoSuchElementException when a module is not installed.
2009-06-16 16:15:54 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return RTL_TEXTENCODING_DONTKNOW;
|
|
|
|
}
|
|
|
|
|
2009-12-10 23:18:57 +01:00
|
|
|
rtl_TextEncoding HTMLParser::GetEncodingByHttpHeader( SvKeyValueIterator *pHTTPHeader )
|
|
|
|
{
|
|
|
|
rtl_TextEncoding eRet = RTL_TEXTENCODING_DONTKNOW;
|
|
|
|
if( pHTTPHeader )
|
|
|
|
{
|
|
|
|
SvKeyValue aKV;
|
2011-07-22 15:02:30 -04:00
|
|
|
for( bool bCont = pHTTPHeader->GetFirst( aKV ); bCont;
|
2009-12-10 23:18:57 +01:00
|
|
|
bCont = pHTTPHeader->GetNext( aKV ) )
|
|
|
|
{
|
2013-08-12 17:19:48 +02:00
|
|
|
if( aKV.GetKey().equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_META_content_type ) )
|
2009-12-10 23:18:57 +01:00
|
|
|
{
|
2013-08-12 17:19:48 +02:00
|
|
|
if( !aKV.GetValue().isEmpty() )
|
2009-12-10 23:18:57 +01:00
|
|
|
{
|
|
|
|
eRet = HTMLParser::GetEncodingByMIME( aKV.GetValue() );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return eRet;
|
|
|
|
}
|
|
|
|
|
2011-07-22 15:02:30 -04:00
|
|
|
bool HTMLParser::SetEncodingByHTTPHeader( SvKeyValueIterator *pHTTPHeader )
|
2009-12-10 23:18:57 +01:00
|
|
|
{
|
2011-07-22 15:02:30 -04:00
|
|
|
bool bRet = false;
|
2009-12-10 23:18:57 +01:00
|
|
|
rtl_TextEncoding eEnc = HTMLParser::GetEncodingByHttpHeader( pHTTPHeader );
|
|
|
|
if(RTL_TEXTENCODING_DONTKNOW != eEnc)
|
|
|
|
{
|
|
|
|
SetSrcEncoding( eEnc );
|
2011-07-22 15:02:30 -04:00
|
|
|
bRet = true;
|
2009-12-10 23:18:57 +01:00
|
|
|
}
|
|
|
|
return bRet;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2010-10-14 08:27:31 +02:00
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|