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.

3 files changed, 110 insertions, 0 deletions

diff --git a/svtools/inc/sfxecode.hxx b/svtools/inc/sfxecode.hxx
index 100336796ea4..01292f1c87fa 100644
--- a/svtools/inc/sfxecode.hxx
+++ b/svtools/inc/sfxecode.hxx
@@ -84,6 +84,7 @@
 #define ERRCODE_SFX_MACROS_SUPPORT_DISABLED (ERRCODE_WARNING_MASK | ERRCODE_AREA_SFX | ERRCODE_CLASS_NONE | 51)
 #define ERRCODE_SFX_DOCUMENT_MACRO_DISABLED (ERRCODE_WARNING_MASK | ERRCODE_AREA_SFX | ERRCODE_CLASS_NONE | 52)
 #define ERRCODE_SFX_BROKENSIGNATURE         (ERRCODE_WARNING_MASK | ERRCODE_AREA_SFX | ERRCODE_CLASS_NONE | 53)
+#define ERRCODE_SFX_SHARED_NOPASSWORDCHANGE (ERRCODE_WARNING_MASK | ERRCODE_AREA_SFX | ERRCODE_CLASS_NONE | 54)
 
 
 
diff --git a/svtools/inc/svtools/parhtml.hxx b/svtools/inc/svtools/parhtml.hxx
index d129a8c14595..f5de6aea358d 100644
--- a/svtools/inc/svtools/parhtml.hxx
+++ b/svtools/inc/svtools/parhtml.hxx
@@ -37,9 +37,17 @@
 #include <svtools/svarray.hxx>
 #include <svtools/svparser.hxx>
 
+
+namespace com { namespace sun { namespace star {
+    namespace document {
+        class XDocumentProperties;
+    }
+} } }
+
 class Color;
 class SvNumberFormatter;
 class SvULongs;
+class SvKeyValueIterator;
 
 #define HTMLFONTSZ1_DFLT 7
 #define HTMLFONTSZ2_DFLT 10
@@ -224,6 +232,28 @@ public:
 //  virtual void RestoreState();
     virtual void Continue( int nToken );
 
+
+protected:
+
+    static rtl_TextEncoding GetEncodingByMIME( const String& rMime );
+
+    /// template method: called when ParseMetaOptions adds a user-defined meta
+    virtual void AddMetaUserDefined( ::rtl::OUString const & i_rMetaName );
+
+private:
+    /// parse meta options into XDocumentProperties and encoding
+    bool ParseMetaOptionsImpl( const ::com::sun::star::uno::Reference<
+                ::com::sun::star::document::XDocumentProperties>&,
+            SvKeyValueIterator*,
+            const HTMLOptions*,
+            rtl_TextEncoding& rEnc );
+
+public:
+    /// overriding method must call this implementation!
+    virtual bool ParseMetaOptions( const ::com::sun::star::uno::Reference<
+                ::com::sun::star::document::XDocumentProperties>&,
+            SvKeyValueIterator* );
+
     // Ist der uebergebene 0-terminierte String (vermutlich) der Anfang
     // eines HTML-Files? Er sollte mind. 80 Zeichen lang sein.
     // Mit Ausnahme des Falls, dass SwitchToUCS2==FALSE und
diff --git a/svtools/inc/svtools/svparser.hxx b/svtools/inc/svtools/svparser.hxx
index d63777d05b1b..96c1aadc6319 100644
--- a/svtools/inc/svtools/svparser.hxx
+++ b/svtools/inc/svtools/svparser.hxx
@@ -37,6 +37,7 @@
 #include <tools/string.hxx>
 #include <tools/ref.hxx>
 #include <rtl/textenc.h>
+#include <boost/utility.hpp>
 
 
 struct SvParser_Impl;
@@ -204,6 +205,84 @@ inline USHORT SvParser::GetCharSize() const
 {
     return (RTL_TEXTENCODING_UCS2 == eSrcEnc) ? 2 : 1;
 }
+
+
+/*========================================================================
+ *
+ * SvKeyValue.
+ *
+ *======================================================================*/
+
+SV_DECL_REF(SvKeyValueIterator)
+
+class SvKeyValue
+{
+    /** Representation.
+    */
+    String m_aKey;
+    String m_aValue;
+
+public:
+    /** Construction.
+    */
+    SvKeyValue (void)
+    {}
+
+    SvKeyValue (const String &rKey, const String &rValue)
+        : m_aKey (rKey), m_aValue (rValue)
+    {}
+
+    SvKeyValue (const SvKeyValue &rOther)
+        : m_aKey (rOther.m_aKey), m_aValue (rOther.m_aValue)
+    {}
+
+    /** Assignment.
+    */
+    SvKeyValue& operator= (SvKeyValue &rOther)
+    {
+        m_aKey   = rOther.m_aKey;
+        m_aValue = rOther.m_aValue;
+        return *this;
+    }
+
+    /** Operation.
+    */
+    const String& GetKey   (void) const { return m_aKey; }
+    const String& GetValue (void) const { return m_aValue; }
+
+    void SetKey   (const String &rKey  ) { m_aKey = rKey; }
+    void SetValue (const String &rValue) { m_aValue = rValue; }
+};
+
+/*========================================================================
+ *
+ * SvKeyValueIterator.
+ *
+ *======================================================================*/
+class SvKeyValueList_Impl;
+class SVT_DLLPUBLIC SvKeyValueIterator : public SvRefBase,
+    private boost::noncopyable
+{
+    /** Representation.
+    */
+    SvKeyValueList_Impl* m_pList;
+    USHORT               m_nPos;
+
+public:
+    /** Construction/Destruction.
+    */
+    SvKeyValueIterator (void);
+    virtual ~SvKeyValueIterator (void);
+
+    /** Operation.
+    */
+    virtual BOOL GetFirst (SvKeyValue &rKeyVal);
+    virtual BOOL GetNext  (SvKeyValue &rKeyVal);
+    virtual void Append   (const SvKeyValue &rKeyVal);
+};
+
+SV_IMPL_REF(SvKeyValueIterator);
+
 #endif //_SVPARSER_HXX
 
 /* vi:set tabstop=4 shiftwidth=4 expandtab: */