Menu
▾
▴
libwpd-cvs — CVS commit messages
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
(3) |
May
(4) |
Jun
(28) |
Jul
(15) |
Aug
(23) |
Sep
(2) |
Oct
(13) |
Nov
(26) |
Dec
(30) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(1) |
Feb
(2) |
Mar
(5) |
Apr
(4) |
May
(70) |
Jun
(32) |
Jul
(27) |
Aug
(25) |
Sep
(8) |
Oct
(16) |
Nov
(30) |
Dec
(30) |
| 2007 |
Jan
(17) |
Feb
(7) |
Mar
(6) |
Apr
(36) |
May
(19) |
Jun
(82) |
Jul
(99) |
Aug
(44) |
Sep
(60) |
Oct
(106) |
Nov
(47) |
Dec
(37) |
| 2008 |
Jan
(5) |
Feb
(5) |
Mar
(4) |
Apr
(16) |
May
(2) |
Jun
|
Jul
(20) |
Aug
(5) |
Sep
|
Oct
(95) |
Nov
(104) |
Dec
(23) |
| 2009 |
Jan
(2) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(8) |
Oct
|
Nov
|
Dec
|
| 2010 |
Jan
|
Feb
|
Mar
|
Apr
(4) |
May
(1) |
Jun
(46) |
Jul
(5) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Fridrich S. <str...@us...> - 2010-07-13 12:50:10
|
Update of /cvsroot/libwpd/libwpd2/src/lib In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv15020 Modified Files: WP6CharacterGroup.cpp Log Message: Fix debug build (patch Laurent Alonso) Index: WP6CharacterGroup.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP6CharacterGroup.cpp,v retrieving revision 1.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- WP6CharacterGroup.cpp 12 Jun 2010 07:35:52 -0000 1.40 +++ WP6CharacterGroup.cpp 13 Jul 2010 12:50:00 -0000 1.41 @@ -105,7 +105,7 @@ { m_packet = new WP6FontDescriptorPacket(input, encryption, 0, input->tell(), sizeDeletable); - WPD_DEBUG_MSG(("WordPerfect: Character Group Font Face Change subgroup info (font name: %s)\n", m_packet->getFontName())); + WPD_DEBUG_MSG(("WordPerfect: Character Group Font Face Change subgroup info (font name: %s)\n", m_packet->getFontName().cstr())); } } |
|
From: Fridrich S. <str...@us...> - 2010-07-13 12:44:11
|
Update of /cvsroot/libwpd/libwpd2/src/lib In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv13702 Modified Files: WPXOLEStream.cpp Log Message: fixing copyright line Index: WPXOLEStream.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WPXOLEStream.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- WPXOLEStream.cpp 13 Jul 2010 09:35:11 -0000 1.7 +++ WPXOLEStream.cpp 13 Jul 2010 12:43:58 -0000 1.8 @@ -1,6 +1,9 @@ /* POLE - Portable C++ library to access OLE Storage Copyright (C) 2002-2005 Ariya Hidayat <ar...@kd...> + Performance optimization: Dmitry Fedorov + Copyright 2009 <www.bioimage.ucsb.edu> <www.dimin.net> + Fix for more than 236 mbat block entries : Michel Boudinot Copyright 2010 <Mic...@in...> |
|
From: Fridrich S. <str...@us...> - 2010-07-13 12:43:33
|
Update of /cvsroot/libwpd/libwpd2/src/lib In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv13613 Modified Files: Tag: STABLE-0-8-0 WPXOLEStream.cpp Log Message: fixing copyright line Index: WPXOLEStream.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WPXOLEStream.cpp,v retrieving revision 1.5.4.2 retrieving revision 1.5.4.3 diff -u -d -r1.5.4.2 -r1.5.4.3 --- WPXOLEStream.cpp 13 Jul 2010 09:48:54 -0000 1.5.4.2 +++ WPXOLEStream.cpp 13 Jul 2010 12:43:21 -0000 1.5.4.3 @@ -1,6 +1,9 @@ /* POLE - Portable C++ library to access OLE Storage Copyright (C) 2002-2005 Ariya Hidayat <ar...@kd...> + Performance optimization: Dmitry Fedorov + Copyright 2009 <www.bioimage.ucsb.edu> <www.dimin.net> + Fix for more than 236 mbat block entries : Michel Boudinot Copyright 2010 <Mic...@in...> |
|
From: Fridrich S. <str...@us...> - 2010-07-13 09:49:03
|
Update of /cvsroot/libwpd/libwpd2/src/lib In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv15430/src/lib Modified Files: Tag: STABLE-0-8-0 WPXOLEStream.cpp Log Message: Fixes for WPXOleStrem from pole 0.4 (patch Laurent Alonso) Index: WPXOLEStream.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WPXOLEStream.cpp,v retrieving revision 1.5.4.1 retrieving revision 1.5.4.2 diff -u -d -r1.5.4.1 -r1.5.4.2 --- WPXOLEStream.cpp 10 Sep 2007 13:52:00 -0000 1.5.4.1 +++ WPXOLEStream.cpp 13 Jul 2010 09:48:54 -0000 1.5.4.2 @@ -1,6 +1,11 @@ /* POLE - Portable C++ library to access OLE Storage Copyright (C) 2002-2005 Ariya Hidayat <ar...@kd...> + Fix for more than 236 mbat block entries : Michel Boudinot + Copyright 2010 <Mic...@in...> + + Version: 0.4 + Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -117,6 +122,7 @@ int parent( unsigned index ); std::string fullName( unsigned index ); std::vector<unsigned> children( unsigned index ); + unsigned find_child( unsigned index, const std::string& name ); void load( unsigned char* buffer, unsigned len ); void save( unsigned char* buffer ); private: @@ -439,6 +445,10 @@ result.insert( 0, "/" ); int p = parent( index ); DirEntry * _entry = 0; + + std::vector<int> seens; + seens.push_back(p); + while( p > 0 ) { _entry = entry( p ); @@ -447,9 +457,17 @@ result.insert( 0, _entry->name); result.insert( 0, "/" ); } - --p; - index = p; - if( index <= 0 ) break; + + p = parent(p); + if (p < 0) break; + + bool ok = true; + // sanity check + for (int i = 0; i < int(seens.size()); i++) { + if (seens[i] == p) { ok = false; break; } + } + if (!ok) break; + seens.push_back(p); } return result; } @@ -484,18 +502,9 @@ for( it = names.begin(); it != names.end(); ++it ) { - // find among the children of index - std::vector<unsigned> chi = children( index ); unsigned child = 0; - for( unsigned i = 0; i < chi.size(); i++ ) - { - libwpd::DirEntry* ce = entry( chi[i] ); - if( ce ) - if( ce->valid && ( ce->name.length()>1 ) ) - if( ce->name == *it ) - child = chi[i]; - } - + // dima: performace optimisation of the previous + child = find_child( index, *it ); // traverse to the child if( child > 0 ) index = child; else return (libwpd::DirEntry*)0; @@ -505,7 +514,7 @@ } // helper function: recursively find siblings of index -void dirtree_find_siblings( libwpd::DirTree* dirtree, std::vector<unsigned>& result, +static void dirtree_find_siblings( libwpd::DirTree* dirtree, std::vector<unsigned>& result, unsigned index ) { libwpd::DirEntry* e = dirtree->entry( index ); @@ -538,6 +547,36 @@ } } +static unsigned dirtree_find_sibling( libwpd::DirTree* dirtree, unsigned index, const std::string& name ) { + + unsigned count = dirtree->entryCount(); + libwpd::DirEntry* e = dirtree->entry( index ); + if (!e || !e->valid) return 0; + if (e->name == name) return index; + + if (e->next>0 && e->next<count) { + unsigned r = dirtree_find_sibling( dirtree, e->next, name ); + if (r>0) return r; + } + + if (e->prev>0 && e->prev<count) { + unsigned r = dirtree_find_sibling( dirtree, e->prev, name ); + if (r>0) return r; + } + + return 0; +} + +unsigned libwpd::DirTree::find_child( unsigned index, const std::string& name ) { + + unsigned count = entryCount(); + libwpd::DirEntry* p = entry( index ); + if (p && p->valid && p->child < count ) + return dirtree_find_sibling( this, p->child, name ); + + return 0; +} + std::vector<unsigned> libwpd::DirTree::children( unsigned index ) { std::vector<unsigned> result; @@ -674,14 +713,27 @@ { unsigned char* buffer2 = new unsigned char[ bbat->blockSize ]; unsigned k = 109; + unsigned sector; for( unsigned r = 0; r < header->num_mbat; r++ ) { + if(r == 0) // 1st meta bat location is in file header. + sector = header->mbat_start; + else // next meta bat location is the last current block value. + sector = blocks[--k]; + loadBigBlock( sector, buffer2, bbat->blockSize ); + for( unsigned s=0; s < bbat->blockSize; s+=4 ) + { + if( k >= header->num_bat ) break; + else blocks[k++] = readU32( buffer2 + s ); + } + /* loadBigBlock( header->mbat_start+r, buffer2, bbat->blockSize ); for( unsigned s=0; s < bbat->blockSize; s+=4 ) { if( k >= header->num_bat ) break; else blocks[k++] = readU32( buffer2 + s ); } + */ } delete[] buffer2; } |
|
From: Fridrich S. <str...@us...> - 2010-07-13 09:35:20
|
Update of /cvsroot/libwpd/libwpd2/src/lib In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv13234/src/lib Modified Files: WPXOLEStream.cpp Log Message: Fixed for WPXOleStrem from pole 0.4 (patch Laurent Alonso) Index: WPXOLEStream.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WPXOLEStream.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- WPXOLEStream.cpp 10 Sep 2007 13:52:17 -0000 1.6 +++ WPXOLEStream.cpp 13 Jul 2010 09:35:11 -0000 1.7 @@ -1,6 +1,11 @@ /* POLE - Portable C++ library to access OLE Storage Copyright (C) 2002-2005 Ariya Hidayat <ar...@kd...> + Fix for more than 236 mbat block entries : Michel Boudinot + Copyright 2010 <Mic...@in...> + + Version: 0.4 + Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -117,6 +122,7 @@ int parent( unsigned index ); std::string fullName( unsigned index ); std::vector<unsigned> children( unsigned index ); + unsigned find_child( unsigned index, const std::string& name ); void load( unsigned char* buffer, unsigned len ); void save( unsigned char* buffer ); private: @@ -439,6 +445,10 @@ result.insert( 0, "/" ); int p = parent( index ); DirEntry * _entry = 0; + + std::vector<int> seens; + seens.push_back(p); + while( p > 0 ) { _entry = entry( p ); @@ -447,9 +457,17 @@ result.insert( 0, _entry->name); result.insert( 0, "/" ); } - --p; - index = p; - if( index <= 0 ) break; + + p = parent(p); + if (p < 0) break; + + bool ok = true; + // sanity check + for (int i = 0; i < int(seens.size()); i++) { + if (seens[i] == p) { ok = false; break; } + } + if (!ok) break; + seens.push_back(p); } return result; } @@ -484,18 +502,9 @@ for( it = names.begin(); it != names.end(); ++it ) { - // find among the children of index - std::vector<unsigned> chi = children( index ); unsigned child = 0; - for( unsigned i = 0; i < chi.size(); i++ ) - { - libwpd::DirEntry* ce = entry( chi[i] ); - if( ce ) - if( ce->valid && ( ce->name.length()>1 ) ) - if( ce->name == *it ) - child = chi[i]; - } - + // dima: performace optimisation of the previous + child = find_child( index, *it ); // traverse to the child if( child > 0 ) index = child; else return (libwpd::DirEntry*)0; @@ -505,7 +514,7 @@ } // helper function: recursively find siblings of index -void dirtree_find_siblings( libwpd::DirTree* dirtree, std::vector<unsigned>& result, +static void dirtree_find_siblings( libwpd::DirTree* dirtree, std::vector<unsigned>& result, unsigned index ) { libwpd::DirEntry* e = dirtree->entry( index ); @@ -538,6 +547,36 @@ } } +static unsigned dirtree_find_sibling( libwpd::DirTree* dirtree, unsigned index, const std::string& name ) { + + unsigned count = dirtree->entryCount(); + libwpd::DirEntry* e = dirtree->entry( index ); + if (!e || !e->valid) return 0; + if (e->name == name) return index; + + if (e->next>0 && e->next<count) { + unsigned r = dirtree_find_sibling( dirtree, e->next, name ); + if (r>0) return r; + } + + if (e->prev>0 && e->prev<count) { + unsigned r = dirtree_find_sibling( dirtree, e->prev, name ); + if (r>0) return r; + } + + return 0; +} + +unsigned libwpd::DirTree::find_child( unsigned index, const std::string& name ) { + + unsigned count = entryCount(); + libwpd::DirEntry* p = entry( index ); + if (p && p->valid && p->child < count ) + return dirtree_find_sibling( this, p->child, name ); + + return 0; +} + std::vector<unsigned> libwpd::DirTree::children( unsigned index ) { std::vector<unsigned> result; @@ -674,14 +713,27 @@ { unsigned char* buffer2 = new unsigned char[ bbat->blockSize ]; unsigned k = 109; + unsigned sector; for( unsigned r = 0; r < header->num_mbat; r++ ) { + if(r == 0) // 1st meta bat location is in file header. + sector = header->mbat_start; + else // next meta bat location is the last current block value. + sector = blocks[--k]; + loadBigBlock( sector, buffer2, bbat->blockSize ); + for( unsigned s=0; s < bbat->blockSize; s+=4 ) + { + if( k >= header->num_bat ) break; + else blocks[k++] = readU32( buffer2 + s ); + } + /* loadBigBlock( header->mbat_start+r, buffer2, bbat->blockSize ); for( unsigned s=0; s < bbat->blockSize; s+=4 ) { if( k >= header->num_bat ) break; else blocks[k++] = readU32( buffer2 + s ); } + */ } delete[] buffer2; } |
|
From: Fridrich S. <str...@us...> - 2010-06-22 12:01:59
|
Update of /cvsroot/libwpd/writerperfect/filter In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv28560/filter Modified Files: WordPerfectCollector.hxx Log Message: Adapt to libwpd changes Index: WordPerfectCollector.hxx =================================================================== RCS file: /cvsroot/libwpd/writerperfect/filter/WordPerfectCollector.hxx,v retrieving revision 1.39 retrieving revision 1.40 diff -u -d -r1.39 -r1.40 --- WordPerfectCollector.hxx 4 Jun 2010 21:35:30 -0000 1.39 +++ WordPerfectCollector.hxx 22 Jun 2010 12:01:51 -0000 1.40 @@ -128,6 +128,7 @@ virtual void insertTab(); virtual void insertText(const WPXString &text); virtual void insertLineBreak(); + virtual void insertField(const WPXPropertyList &propList) {} virtual void defineOrderedListLevel(const WPXPropertyList &propList); virtual void defineUnorderedListLevel(const WPXPropertyList &propList); |
|
From: Fridrich S. <str...@us...> - 2010-06-22 12:01:33
|
Update of /cvsroot/libwpd/libwpd2/src/lib In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv28447/src/lib Modified Files: WPXDocumentInterface.h Log Message: add callback for inserting fields into target document Index: WPXDocumentInterface.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WPXDocumentInterface.h,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- WPXDocumentInterface.h 4 Jun 2010 21:33:33 -0000 1.14 +++ WPXDocumentInterface.h 22 Jun 2010 12:01:25 -0000 1.15 @@ -235,6 +235,11 @@ Called when a line break should be inserted */ virtual void insertLineBreak() = 0; + + /** + Called when a field should be inserted + */ + virtual void insertField(const WPXPropertyList &propList) = 0; /** Defines an ordered (enumerated) list level |
|
From: Fridrich S. <str...@us...> - 2010-06-22 12:01:33
|
Update of /cvsroot/libwpd/libwpd2/src/conv/html In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv28447/src/conv/html Modified Files: HtmlDocumentGenerator.h Log Message: add callback for inserting fields into target document Index: HtmlDocumentGenerator.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/conv/html/HtmlDocumentGenerator.h,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- HtmlDocumentGenerator.h 4 Jun 2010 21:33:33 -0000 1.9 +++ HtmlDocumentGenerator.h 22 Jun 2010 12:01:24 -0000 1.10 @@ -65,6 +65,7 @@ virtual void insertTab(); virtual void insertText(const WPXString &text); virtual void insertLineBreak(); + virtual void insertField(const WPXPropertyList & /* propList */) {} virtual void defineOrderedListLevel(const WPXPropertyList & /* propList */) {} virtual void defineUnorderedListLevel(const WPXPropertyList & /* propList */) {} |
|
From: Fridrich S. <str...@us...> - 2010-06-22 12:01:33
|
Update of /cvsroot/libwpd/libwpd2/src/conv/text In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv28447/src/conv/text Modified Files: TextDocumentGenerator.h Log Message: add callback for inserting fields into target document Index: TextDocumentGenerator.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/conv/text/TextDocumentGenerator.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- TextDocumentGenerator.h 4 Jun 2010 21:33:33 -0000 1.5 +++ TextDocumentGenerator.h 22 Jun 2010 12:01:25 -0000 1.6 @@ -62,6 +62,7 @@ virtual void insertTab(); virtual void insertText(const WPXString &text); virtual void insertLineBreak(); + virtual void insertField(const WPXPropertyList & /* propList */) {} virtual void defineOrderedListLevel(const WPXPropertyList & /* propList */) {} virtual void defineUnorderedListLevel(const WPXPropertyList & /* propList */) {} |
|
From: Fridrich S. <str...@us...> - 2010-06-22 12:01:33
|
Update of /cvsroot/libwpd/libwpd2/src/conv/raw In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv28447/src/conv/raw Modified Files: RawDocumentGenerator.cpp RawDocumentGenerator.h Log Message: add callback for inserting fields into target document Index: RawDocumentGenerator.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/conv/raw/RawDocumentGenerator.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- RawDocumentGenerator.cpp 4 Jun 2010 21:33:33 -0000 1.6 +++ RawDocumentGenerator.cpp 22 Jun 2010 12:01:25 -0000 1.7 @@ -275,6 +275,11 @@ __iprintf("insertLineBreak()\n"); } +void RawDocumentGenerator::insertField(const WPXPropertyList &propList) +{ + __iprintf("insertField(%s)\n", getPropString(propList).cstr()); +} + void RawDocumentGenerator::defineOrderedListLevel(const WPXPropertyList &propList) { __iprintf("defineOrderedListLevel(%s)\n", getPropString(propList).cstr()); Index: RawDocumentGenerator.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/conv/raw/RawDocumentGenerator.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- RawDocumentGenerator.h 4 Jun 2010 21:33:33 -0000 1.6 +++ RawDocumentGenerator.h 22 Jun 2010 12:01:25 -0000 1.7 @@ -84,6 +84,7 @@ virtual void insertTab(); virtual void insertText(const WPXString &text); virtual void insertLineBreak(); + virtual void insertField(const WPXPropertyList &propList); virtual void defineOrderedListLevel(const WPXPropertyList &propList); virtual void defineUnorderedListLevel(const WPXPropertyList &propList); |
|
From: Fridrich S. <str...@us...> - 2010-06-22 10:14:25
|
Update of /cvsroot/libwpd/libwpd2/src/lib In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv9152/src/lib Modified Files: WP6ContentListener.cpp WP6FileStructure.h Log Message: and also try to get it right Index: WP6FileStructure.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP6FileStructure.h,v retrieving revision 1.55 retrieving revision 1.56 diff -u -d -r1.55 -r1.56 --- WP6FileStructure.h 22 Jun 2010 10:07:58 -0000 1.55 +++ WP6FileStructure.h 22 Jun 2010 10:14:17 -0000 1.56 @@ -301,18 +301,6 @@ #define WP6_PARAGRAPH_JUSTIFICATION_FULL_ALL_LINES 0x04 #define WP6_PARAGRAPH_JUSTIFICATION_RESERVED 0x05 -/* Display Number Reference Group */ -#define WP6_DISPLAY_NUMBER_REFERENCE_GROUP_USER_DEFINED_ON 0x00 -#define WP6_DISPLAY_NUMBER_REFERENCE_GROUP_USER_DEFINED_OFF 0x01 -//#define WP6_DISPLAY_NUMBER_REFERENCE_GROUP_CHAPTER_ON 0x08 -//#define WP6_DISPLAY_NUMBER_REFERENCE_GROUP_CHAPTER_OFF 0x09 -#define WP6_DISPLAY_NUMBER_REFERENCE_GROUP_PARAGRAPH_NUMBER_ON 0x0C -#define WP6_DISPLAY_NUMBER_REFERENCE_GROUP_PARAGRAPH_NUMBER_OFF 0x0D -#define WP6_DISPLAY_NUMBER_REFERENCE_GROUP_FOOTNOTE_NUMBER_ON 0x0E -#define WP6_DISPLAY_NUMBER_REFERENCE_GROUP_FOOTNOTE_NUMBER_OFF 0x0F -#define WP6_DISPLAY_NUMBER_REFERENCE_GROUP_ENDNOTE_NUMBER_ON 0x10 -#define WP6_DISPLAY_NUMBER_REFERENCE_GROUP_ENDNOTE_NUMBER_OFF 0x11 - /* Character Group */ #define WP6_CHARACTER_GROUP_SET_ALIGNMENT_CHARACTER 0x00 #define WP6_CHARACTER_GROUP_COLOR 0x18 Index: WP6ContentListener.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP6ContentListener.cpp,v retrieving revision 1.76 retrieving revision 1.77 diff -u -d -r1.76 -r1.77 --- WP6ContentListener.cpp 11 Jun 2010 15:24:51 -0000 1.76 +++ WP6ContentListener.cpp 22 Jun 2010 10:14:17 -0000 1.77 @@ -1037,8 +1037,8 @@ { switch (subGroup) { - case WP6_DISPLAY_NUMBER_REFERENCE_GROUP_PARAGRAPH_NUMBER_ON: - case WP6_DISPLAY_NUMBER_REFERENCE_GROUP_USER_DEFINED_ON: + case WP6_DISPLAY_NUMBER_REFERENCE_GROUP_PARAGRAPH_NUMBER_DISPLAY_ON: + case WP6_DISPLAY_NUMBER_REFERENCE_GROUP_USER_DEFINED_NUMBER_DISPLAY_ON: // HACKISH: if we are in a paragraph style sequence we will pretend that paragraph numbering was // just turned on even though it didn't happen if (m_parseState->m_styleStateSequence.getCurrentState() == BEGIN_BEFORE_NUMBERING) @@ -1056,8 +1056,8 @@ } m_parseState->m_putativeListElementHasDisplayReferenceNumber = true; break; - case WP6_DISPLAY_NUMBER_REFERENCE_GROUP_FOOTNOTE_NUMBER_ON: - case WP6_DISPLAY_NUMBER_REFERENCE_GROUP_ENDNOTE_NUMBER_ON: + case WP6_DISPLAY_NUMBER_REFERENCE_GROUP_FOOTNOTE_NUMBER_DISPLAY_ON: + case WP6_DISPLAY_NUMBER_REFERENCE_GROUP_ENDNOTE_NUMBER_DISPLAY_ON: m_parseState->m_styleStateSequence.setCurrentState(DISPLAY_REFERENCING); break; } @@ -1070,8 +1070,8 @@ { switch (subGroup) { - case WP6_DISPLAY_NUMBER_REFERENCE_GROUP_PARAGRAPH_NUMBER_OFF: - case WP6_DISPLAY_NUMBER_REFERENCE_GROUP_USER_DEFINED_OFF: + case WP6_DISPLAY_NUMBER_REFERENCE_GROUP_PARAGRAPH_NUMBER_DISPLAY_OFF: + case WP6_DISPLAY_NUMBER_REFERENCE_GROUP_USER_DEFINED_NUMBER_DISPLAY_OFF: if (m_parseState->m_styleStateSequence.getPreviousState() == BEGIN_NUMBERING_BEFORE_DISPLAY_REFERENCING) m_parseState->m_styleStateSequence.setCurrentState(BEGIN_NUMBERING_AFTER_DISPLAY_REFERENCING); else { @@ -1085,8 +1085,8 @@ } break; - case WP6_DISPLAY_NUMBER_REFERENCE_GROUP_FOOTNOTE_NUMBER_OFF: - case WP6_DISPLAY_NUMBER_REFERENCE_GROUP_ENDNOTE_NUMBER_OFF: + case WP6_DISPLAY_NUMBER_REFERENCE_GROUP_FOOTNOTE_NUMBER_DISPLAY_OFF: + case WP6_DISPLAY_NUMBER_REFERENCE_GROUP_ENDNOTE_NUMBER_DISPLAY_OFF: m_parseState->m_styleStateSequence.setCurrentState(m_parseState->m_styleStateSequence.getPreviousState()); break; } |
|
From: Fridrich S. <str...@us...> - 2010-06-22 10:08:07
|
Update of /cvsroot/libwpd/libwpd2/src/lib In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv7872/src/lib Modified Files: WP6FileStructure.h Log Message: Adding some defines to make William's work easier :) Index: WP6FileStructure.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP6FileStructure.h,v retrieving revision 1.54 retrieving revision 1.55 diff -u -d -r1.54 -r1.55 --- WP6FileStructure.h 23 Jul 2007 09:53:16 -0000 1.54 +++ WP6FileStructure.h 22 Jun 2010 10:07:58 -0000 1.55 @@ -344,6 +344,82 @@ #define WP6_HEADER_FOOTER_GROUP_ODD_BIT 0x01 #define WP6_HEADER_FOOTER_GROUP_EVEN_BIT 0x02 +/* Set Number Functions */ +#define WP6_SET_NUMBER_GROUP_SET_USER_DEFINED_COUNTER 0x00 +#define WP6_SET_NUMBER_GROUP_SET_BOX_NUMBER 0x01 +#define WP6_SET_NUMBER_GROUP_SET_PAGE_NUMBER 0x02 +#define WP6_SET_NUMBER_GROUP_SET_SECONDARY_PAGE_NUMBER 0x03 +#define WP6_SET_NUMBER_GROUP_SET_CHAPTER_NUMBER 0x04 +#define WP6_SET_NUMBER_GROUP_SET_VOLUME_NUMBER 0x05 +#define WP6_SET_NUMBER_GROUP_SET_PARAGRAPH_NUMBER 0x06 +#define WP6_SET_NUMBER_GROUP_SET_FOOTNOTE_NUMBER 0x07 +#define WP6_SET_NUMBER_GROUP_SET_ENDNOTE_NUMBER 0x08 +#define WP6_SET_NUMBER_GROUP_SET_LINE_NUMBER 0x09 + +/* Numbering Functions */ + +#define WP6_NUMBERING_METHOD_GROUP_SET_USER_DEFINED_COUNTER_NUMBERING_MODE 0x00 +#define WP6_NUMBERING_METHOD_GROUP_SET_BOX_NUMBERING_MODE 0x01 +#define WP6_NUMBERING_METHOD_GROUP_SET_PAGE_NUMBERING_MODE 0x02 +#define WP6_NUMBERING_METHOD_GROUP_SET_SECONDARY_PAGE_NUMBERING_MODE 0x03 +#define WP6_NUMBERING_METHOD_GROUP_SET_CHAPTER_NUMBERING_MODE 0x04 +#define WP6_NUMBERING_METHOD_GROUP_SET_VOLUME_NUMBERING_MODE 0x05 +#define WP6_NUMBERING_METHOD_GROUP_SET_PARAGRAPH_NUMBERING_MODE 0x06 +#define WP6_NUMBERING_METHOD_GROUP_SET_FOOTNOTE_NUMBERING_MODE 0x07 +#define WP6_NUMBERING_METHOD_GROUP_SET_ENDNOTE_NUMBERING_MODE 0x08 +#define WP6_NUMBERING_METHOD_GROUP_SET_LINE_NUMBERING_MODE 0x09 + +/* Display Number Functions */ + +#define WP6_DISPLAY_NUMBER_REFERENCE_GROUP_USER_DEFINED_NUMBER_DISPLAY_ON 0x00 +#define WP6_DISPLAY_NUMBER_REFERENCE_GROUP_USER_DEFINED_NUMBER_DISPLAY_OFF 0x01 +#define WP6_DISPLAY_NUMBER_REFERENCE_GROUP_BOX_NUMBER_DISPLAY_ON 0x02 +#define WP6_DISPLAY_NUMBER_REFERENCE_GROUP_BOX_NUMBER_DISPLAY_OFF 0x03 +#define WP6_DISPLAY_NUMBER_REFERENCE_GROUP_PAGE_NUMBER_DISPLAY_ON 0x04 +#define WP6_DISPLAY_NUMBER_REFERENCE_GROUP_PAGE_NUMBER_DISPLAY_OFF 0x05 +#define WP6_DISPLAY_NUMBER_REFERENCE_GROUP_SECONDARY_PAGE_NUMBER_DISPLAY_ON 0x06 +#define WP6_DISPLAY_NUMBER_REFERENCE_GROUP_SECONDARY_PAGE_NUMBER_DISPLAY_OFF 0x07 +#define WP6_DISPLAY_NUMBER_REFERENCE_GROUP_CHAPTER_NUMBER_DISPLAY_ON 0x08 +#define WP6_DISPLAY_NUMBER_REFERENCE_GROUP_CHAPTER_NUMBER_DISPLAY_OFF 0x09 +#define WP6_DISPLAY_NUMBER_REFERENCE_GROUP_VOLUME_NUMBER_DISPLAY_ON 0x0A +#define WP6_DISPLAY_NUMBER_REFERENCE_GROUP_VOLUME_NUMBER_DISPLAY_OFF 0x0B +#define WP6_DISPLAY_NUMBER_REFERENCE_GROUP_PARAGRAPH_NUMBER_DISPLAY_ON 0x0C +#define WP6_DISPLAY_NUMBER_REFERENCE_GROUP_PARAGRAPH_NUMBER_DISPLAY_OFF 0x0D +#define WP6_DISPLAY_NUMBER_REFERENCE_GROUP_FOOTNOTE_NUMBER_DISPLAY_ON 0x0E +#define WP6_DISPLAY_NUMBER_REFERENCE_GROUP_FOOTNOTE_NUMBER_DISPLAY_OFF 0x0F +#define WP6_DISPLAY_NUMBER_REFERENCE_GROUP_ENDNOTE_NUMBER_DISPLAY_ON 0x10 +#define WP6_DISPLAY_NUMBER_REFERENCE_GROUP_ENDNOTE_NUMBER_DISPLAY_OFF 0x11 +#define WP6_DISPLAY_NUMBER_REFERENCE_GROUP_LINE_NUMBER_DISPLAY_ON 0x12 +#define WP6_DISPLAY_NUMBER_REFERENCE_GROUP_LINE_NUMBER_DISPLAY_OFF 0x13 +#define WP6_DISPLAY_NUMBER_REFERENCE_GROUP_TOTAL_NUMBER_OF_PAGES_DISPLAY_ON 0x14 +#define WP6_DISPLAY_NUMBER_REFERENCE_GROUP_TOTAL_NUMBER_OF_PAGES_DISPLAY_OFF 0x15 + +/* Increment Number Functions */ + +#define WP6_INCREMENT_NUMBER_GROUP_INCREMENT_USER_DEFINED_NUMBER 0x00 +#define WP6_INCREMENT_NUMBER_GROUP_INCREMENT_BOX_NUMBER 0x01 +#define WP6_INCREMENT_NUMBER_GROUP_INCREMENT_PAGE_NUMBER 0x02 +#define WP6_INCREMENT_NUMBER_GROUP_INCREMENT_SECONDARY_PAGE_NUMBER 0x03 +#define WP6_INCREMENT_NUMBER_GROUP_INCREMENT_CHAPTER_NUMBER 0x04 +#define WP6_INCREMENT_NUMBER_GROUP_INCREMENT_VOLUME_NUMBER 0x05 +#define WP6_INCREMENT_NUMBER_GROUP_INCREMENT_PARAGRAPH_NUMBER 0x06 +#define WP6_INCREMENT_NUMBER_GROUP_INCREMENT_FOOTNOTE_NUMBER 0x07 +#define WP6_INCREMENT_NUMBER_GROUP_INCREMENT_ENDNOTE_NUMBER 0x08 +#define WP6_INCREMENT_NUMBER_GROUP_INCREMENT_LINE_NUMBER 0x09 + +/* Decrement Number Functions */ + +#define WP6_DECREMENT_NUMBER_GROUP_DECREMENT_USER_DEFINED_NUMBER 0x00 +#define WP6_DECREMENT_NUMBER_GROUP_DECREMENT_BOX_NUMBER 0x01 +#define WP6_DECREMENT_NUMBER_GROUP_DECREMENT_PAGE_NUMBER 0x02 +#define WP6_DECREMENT_NUMBER_GROUP_DECREMENT_SECONDARY_PAGE_NUMBER 0x03 +#define WP6_DECREMENT_NUMBER_GROUP_DECREMENT_CHAPTER_NUMBER 0x04 +#define WP6_DECREMENT_NUMBER_GROUP_DECREMENT_VOLUME_NUMBER 0x05 +#define WP6_DECREMENT_NUMBER_GROUP_DECREMENT_PARAGRAPH_NUMBER_0x06 +#define WP6_DECREMENT_NUMBER_GROUP_DECREMENT_FOOTNOTE_NUMBER 0x07 +#define WP6_DECREMENT_NUMBER_GROUP_DECREMENT_ENDNOTE_NUMBER 0x08 +#define WP6_DECREMENT_NUMBER_GROUP_DECREMENT_LINE_NUMBER 0x09 + /* Column Group */ #define WP6_COLUMN_GROUP_LEFT_MARGIN_SET 0 #define WP6_COLUMN_GROUP_RIGHT_MARGIN_SET 1 @@ -405,6 +481,54 @@ #define WP6_TAB_GROUP_RIGHT_TAB 0x12 #define WP6_TAB_GROUP_DECIMAL_TAB 0x1A +/* Platform Group */ +#define WP6_PLATFORM_GROUP_DYNAMIC_DATA_EXCHANGE_START 0x00 +#define WP6_PLATFORM_GROUP_DYNAMIC_DATA_EXCHANGE_END 0x01 +#define WP6_PLATFORM_GROUP_PUBLISH_DATA_START 0x02 +#define WP6_PLATFORM_GROUP_PUBLISH_DATA_END 0x03 +#define WP6_PLATFORM_GROUP_SUBSCRIBE_DATA_START 0x04 +#define WP6_PLATFORM_GROUP_SUBSCRIBE_DATA_END 0x05 +#define WP6_PLATFORM_GROUP_SUBTITLE_MARK 0x06 +#define WP6_PLATFORM_GROUP_SUBTITLE_TEXT 0x07 +#define WP6_PLATFORM_GROUP_SUBTITLE_OPTION 0x08 +#define WP6_PLATFORM_GROUP_SUBTITLE_TEXT_OPTIONS 0x09 +#define WP6_PLATFORM_GROUP_SUPPRESS_SUBTITLE Ox0A +#define WP6_PLATFORM_GROUP_THIRD_PARTY 0x0B +#define WP6_PLATFORM_GROUP_PEN_FOREGROUND_COLOR_32BIT 0x0C +#define WP6_PLATFORM_GROUP_PEN_FOREGROUND_COLOR_64BIT 0x0D +#define WP6_PLATFORM_GROUP_PEN_BACKGROUND_COLOR_32BIT 0x0E +#define WP6_PLATFORM_GROUP_PEN_BACKGROUND_COLOR_64BIT 0x0F +#define WP6_PLATFORM_GROUP_PEN_STYLE 0x10 +#define WP6_PLATFORM_GROUP_PEN_PATTERN 0x11 +#define WP6_PLATFORM_GROUP_PEN_SIZE_16BIT 0x12 +#define WP6_PLATFORM_GROUP_PEN_SIZE_32BIT 0x13 +#define WP6_PLATFORM_GROUP_BRUSH_GRADIENT_32BIT 0x14 +#define WP6_PLATFORM_GROUP_BRUSH_GRADIENT_64BIT 0x15 +#define WP6_PLATFORM_GROUP_BRUSH_FOREGROUND_COLOR_32BIT 0x16 +#define WP6_PLATFORM_GROUP_BRUSH_FOREGROUND_COLOR_64BIT 0x17 +#define WP6_PLATFORM_GROUP_BRUSH_BACKGROUND_COLOR_32BIT 0x18 +#define WP6_PLATFORM_GROUP_BRUSH_BACKGROUND_COLOR_64BIT 0x19 +#define WP6_PLATFORM_GROUP_BRUSH_PATTERN 0x1A +#define WP6_PLATFORM_GROUP_MISCELLANEOUS_ATTRIBUTES 0x1B +#define WP6_PLATFORM_GROUP_PRESENTATIONS_SLIDE_OPTIONS 0x1C +#define WP6_PLATFORM_GROUP_PRESENTATIONS_ORGANIZATION_CHART_NODE_OPTIONS 0x1D +#define WP6_PLATFORM_GROUP_HIDE_FOR_CONVERSIONS 0x1E +#define WP6_PLATFORM_GROUP_HIDE_OFF_FOR_CONVERSIONS 0x1F +#define WP6_PLATFORM_GROUP_SGML_START_TAG 0x20 +#define WP6_PLATFORM_GROUP_SGML_START_TAG_END 0x21 +#define WP6_PLATFORM_GROUP_SGML_END_TAG 0x22 +#define WP6_PLATFORM_GROUP_SGML_END_TAG_END 0x23 +#define WP6_PLATFORM_GROUP_SGML_CHARACTER_REFERENCE 0x24 +#define WP6_PLATFORM_GROUP_SGML_END_CHARACTER_REFERENCE 0x25 +#define WP6_PLATFORM_GROUP_SGML_ENTITY_REFERENCE 0x26 +#define WP6_PLATFORM_GROUP_SGML_END_ENTITY_REFERENCE 0x27 +#define WP6_PLATFORM_GROUP_SGML_IGNORE_ON 0x28 +#define WP6_PLATFORM_GROUP_SGML_IGNORE_OFF 0x29 +#define WP6_PLATFORM_GROUP_SGML_MARKED_SECTION_ON 0x2A +#define WP6_PLATFORM_GROUP_SGML_MARKED_SECTION_OFF 0x2B +#define WP6_PLATFORM_GROUP_SGML_PROCESSING_INSTRUCTION_ON 0x2C +#define WP6_PLATFORM_GROUP_SGML_PROCESSING_INSTRUCTION_OFF 0x2D + /* Extended Character */ #define WP6_MULTINATIONAL_CHARACTER_SET 1 #define WP6_PHONETIC_SYMBOL_CHARACTER_SET 2 |
|
From: Fridrich S. <str...@us...> - 2010-06-17 20:14:35
|
Update of /cvsroot/libwpd/libwpd2/src/lib In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv13887/src/lib Modified Files: Tag: STABLE-0-8-0 libwpd_internal.cpp Log Message: Fix greek charset in WP5 (patch Johannes Poehlmann) Index: libwpd_internal.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/libwpd_internal.cpp,v retrieving revision 1.35.2.2 retrieving revision 1.35.2.3 diff -u -d -r1.35.2.2 -r1.35.2.3 --- libwpd_internal.cpp 8 Dec 2007 09:27:00 -0000 1.35.2.2 +++ libwpd_internal.cpp 17 Jun 2010 20:14:27 -0000 1.35.2.3 @@ -737,11 +737,11 @@ 0x0394, 0x03b4, 0x0395, 0x03b5, 0x0396, 0x03b6, 0x0397, 0x03b7, 0x0398, 0x03b8, 0x0399, 0x03b9, 0x039a, 0x03ba, 0x039b, 0x03bb, 0x039c, 0x03bc, 0x039d, 0x03bd, 0x039e, 0x03be, 0x039f, 0x03bf, - 0x03a0, 0x03c0, 0x03a1, 0x03c1, 0x03a3, 0x03c3, 0x03a3, 0x03c2, + 0x03a0, 0x03c0, 0x03a1, 0x03c1, 0x03a3, 0x03c3, 0x03f9, 0x03db, 0x03a4, 0x03c4, 0x03a5, 0x03c5, 0x03a6, 0x03d5, 0x03a7, 0x03c7, - 0x03a8, 0x03c8, 0x03a9, 0x03c9, 0x03ac, 0x03ad, 0x03a5, 0x03af, + 0x03a8, 0x03c8, 0x03a9, 0x03c9, 0x03ac, 0x03ad, 0x03ae, 0x03af, 0x03ca, 0x03cc, 0x03cd, 0x03cb, 0x03ce, 0x03b5, 0x03d1, 0x03f0, - 0x03d6, 0x03f1, 0x03d2, 0x03c6, 0x03c9, 0x037e, 0x0387, 0x0384, + 0x03d6, 0x1fe5, 0x03d2, 0x03c6, 0x03c9, 0x037e, 0x0387, 0x0384, 0x00a8, 0x0385, 0x1fed, 0x1fef, 0x1fc0, 0x1fbd, 0x1fbf, 0x1fbe, 0x1fce, 0x1fde, 0x1fcd, 0x1fdd, 0x1fcf, 0x1fdf, 0x0384, 0x1fef, 0x1fc0, 0x1fbd, 0x1fbf, 0x1fce, 0x1fde, 0x1fcd, 0x1fdd, 0x1fcf, |
|
From: Fridrich S. <str...@us...> - 2010-06-17 20:14:13
|
Update of /cvsroot/libwpd/libwpd2/src/lib In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv13820/src/lib Modified Files: libwpd_internal.cpp Log Message: Fix greek charset in WP5 (patch Johannes Poehlmann) Index: libwpd_internal.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/libwpd_internal.cpp,v retrieving revision 1.45 retrieving revision 1.46 diff -u -d -r1.45 -r1.46 --- libwpd_internal.cpp 4 Sep 2009 13:15:48 -0000 1.45 +++ libwpd_internal.cpp 17 Jun 2010 20:14:05 -0000 1.46 @@ -732,11 +732,11 @@ 0x0394, 0x03b4, 0x0395, 0x03b5, 0x0396, 0x03b6, 0x0397, 0x03b7, 0x0398, 0x03b8, 0x0399, 0x03b9, 0x039a, 0x03ba, 0x039b, 0x03bb, 0x039c, 0x03bc, 0x039d, 0x03bd, 0x039e, 0x03be, 0x039f, 0x03bf, - 0x03a0, 0x03c0, 0x03a1, 0x03c1, 0x03a3, 0x03c3, 0x03a3, 0x03c2, + 0x03a0, 0x03c0, 0x03a1, 0x03c1, 0x03a3, 0x03c3, 0x03f9, 0x03db, 0x03a4, 0x03c4, 0x03a5, 0x03c5, 0x03a6, 0x03d5, 0x03a7, 0x03c7, - 0x03a8, 0x03c8, 0x03a9, 0x03c9, 0x03ac, 0x03ad, 0x03a5, 0x03af, + 0x03a8, 0x03c8, 0x03a9, 0x03c9, 0x03ac, 0x03ad, 0x03ae, 0x03af, 0x03ca, 0x03cc, 0x03cd, 0x03cb, 0x03ce, 0x03b5, 0x03d1, 0x03f0, - 0x03d6, 0x03f1, 0x03d2, 0x03c6, 0x03c9, 0x037e, 0x0387, 0x0384, + 0x03d6, 0x1fe5, 0x03d2, 0x03c6, 0x03c9, 0x037e, 0x0387, 0x0384, 0x00a8, 0x0385, 0x1fed, 0x1fef, 0x1fc0, 0x1fbd, 0x1fbf, 0x1fbe, 0x1fce, 0x1fde, 0x1fcd, 0x1fdd, 0x1fcf, 0x1fdf, 0x0384, 0x1fef, 0x1fc0, 0x1fbd, 0x1fbf, 0x1fce, 0x1fde, 0x1fcd, 0x1fdd, 0x1fcf, |
|
From: Fridrich S. <str...@us...> - 2010-06-17 20:14:13
|
Update of /cvsroot/libwpd/libwpd2 In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv13820 Modified Files: CHANGES Log Message: Fix greek charset in WP5 (patch Johannes Poehlmann) Index: CHANGES =================================================================== RCS file: /cvsroot/libwpd/libwpd2/CHANGES,v retrieving revision 1.80 retrieving revision 1.81 diff -u -d -r1.80 -r1.81 --- CHANGES 13 Oct 2007 21:37:51 -0000 1.80 +++ CHANGES 17 Jun 2010 20:14:05 -0000 1.81 @@ -1,6 +1,18 @@ CHANGES: 0.8.x - 0.9.0 - Conversion of annotations/comments in WP6 parser (Fridrich) +- Conversion of annotations/comments in WP6 parser (Fridrich) +- fix some greek characters so that Text written in WP5.1 with Printer Polyglott + convert correct. + - replace lunate small sigma with small stigma + - replate one occurence of capital Sigma by lunate capital sigma + - replace one occurence of capital Ypsilon by small eta with tonos + - replace variant of small rho by rho with tonos + +0.8.13 - 0.8.14 +- Fix some warnings due to unused variables +- Fix a warning due to a name hiding. +- Fix two loops with corrupted documents (Thank you, sum1!) 0.8.12 - 0.8.13 - Implement readahead in the WPXStreamImplementation class (Jan Holesovsky, Fridrich) |
|
From: Fridrich S. <str...@us...> - 2010-06-14 21:03:42
|
Update of /cvsroot/libwpd/libwpd2/src/conv/html In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv21072/src/conv/html Modified Files: wpd2html.cpp Log Message: clear all messes of printing errors to stdout Index: wpd2html.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/conv/html/wpd2html.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- wpd2html.cpp 27 Jul 2008 20:55:40 -0000 1.12 +++ wpd2html.cpp 14 Jun 2010 21:03:33 -0000 1.13 @@ -79,7 +79,7 @@ WPDConfidence confidence = WPDocument::isFileFormatSupported(&input); if (confidence != WPD_CONFIDENCE_EXCELLENT && confidence != WPD_CONFIDENCE_SUPPORTED_ENCRYPTION) { - printf("ERROR: Unsupported file format!\n"); + fprintf(stderr, "ERROR: Unsupported file format!\n"); return 1; } |
|
From: Fridrich S. <str...@us...> - 2010-06-14 21:03:42
|
Update of /cvsroot/libwpd/libwpd2/src/conv/text In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv21072/src/conv/text Modified Files: wpd2text.cpp Log Message: clear all messes of printing errors to stdout Index: wpd2text.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/conv/text/wpd2text.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- wpd2text.cpp 27 Jul 2008 20:55:40 -0000 1.12 +++ wpd2text.cpp 14 Jun 2010 21:03:34 -0000 1.13 @@ -87,7 +87,7 @@ WPDConfidence confidence = WPDocument::isFileFormatSupported(&input); if (confidence != WPD_CONFIDENCE_EXCELLENT && confidence != WPD_CONFIDENCE_SUPPORTED_ENCRYPTION) { - printf("ERROR: Unsupported file format!\n"); + fprintf(stderr, "ERROR: Unsupported file format!\n"); return 1; } |
|
From: Fridrich S. <str...@us...> - 2010-06-14 14:29:44
|
Update of /cvsroot/libwpd/libwpd2/src/conv/raw In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv17691 Modified Files: wpd2raw.cpp Log Message: write error messages to strderr Index: wpd2raw.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/conv/raw/wpd2raw.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- wpd2raw.cpp 27 Jul 2008 20:55:40 -0000 1.13 +++ wpd2raw.cpp 14 Jun 2010 14:29:36 -0000 1.14 @@ -87,7 +87,7 @@ WPDConfidence confidence = WPDocument::isFileFormatSupported(&input); if (confidence != WPD_CONFIDENCE_EXCELLENT && confidence != WPD_CONFIDENCE_SUPPORTED_ENCRYPTION) { - printf("ERROR: Unsupported file format!\n"); + fprintf(stderr, "ERROR: Unsupported file format!\n"); return 1; } |
|
From: Fridrich S. <str...@us...> - 2010-06-12 10:40:06
|
Update of /cvsroot/libwpd/libwpd2/src/lib In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv24542/src/lib Modified Files: WP6FontDescriptorPacket.cpp WP6FontDescriptorPacket.h Log Message: Making the _readFontName private member function and making getFontName return const reference to the WPXString Index: WP6FontDescriptorPacket.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP6FontDescriptorPacket.h,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- WP6FontDescriptorPacket.h 10 Jun 2010 11:52:46 -0000 1.14 +++ WP6FontDescriptorPacket.h 12 Jun 2010 10:39:58 -0000 1.15 @@ -30,15 +30,15 @@ class WP6FontDescriptorPacket : public WP6PrefixDataPacket { - public: +public: WP6FontDescriptorPacket(WPXInputStream *input, WPXEncryption *encryption, int id, uint32_t dataOffset, uint32_t dataSize); ~WP6FontDescriptorPacket(); void _readContents(WPXInputStream *input, WPXEncryption *encryption); - const char *getFontName() const { return m_fontName.cstr(); } + const WPXString &getFontName() const { return m_fontName; } - static void _readFontName(WPXInputStream *input, WPXEncryption *encryption, WPXString &fontName, uint16_t fontNameLength); +private: + void _readFontName(WPXInputStream *input, WPXEncryption *encryption); - private: WP6FontDescriptorPacket(const WP6FontDescriptorPacket&); WP6FontDescriptorPacket& operator=(const WP6FontDescriptorPacket&); uint16_t m_characterWidth; Index: WP6FontDescriptorPacket.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP6FontDescriptorPacket.cpp,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- WP6FontDescriptorPacket.cpp 10 Jun 2010 11:52:46 -0000 1.37 +++ WP6FontDescriptorPacket.cpp 12 Jun 2010 10:39:58 -0000 1.38 @@ -88,16 +88,16 @@ m_fontNameLength = readU16(input, encryption); - _readFontName(input, encryption, m_fontName, m_fontNameLength); + _readFontName(input, encryption); } -void WP6FontDescriptorPacket::_readFontName(WPXInputStream *input, WPXEncryption *encryption, WPXString &fontName, uint16_t fontNameLength) +void WP6FontDescriptorPacket::_readFontName(WPXInputStream *input, WPXEncryption *encryption) { - if (fontNameLength > ((std::numeric_limits<uint16_t>::max)() / 2)) - fontNameLength = ((std::numeric_limits<uint16_t>::max)() / 2); - if (fontNameLength) + if (m_fontNameLength > ((std::numeric_limits<uint16_t>::max)() / 2)) + m_fontNameLength = ((std::numeric_limits<uint16_t>::max)() / 2); + if (m_fontNameLength) { - for (uint16_t i=0; i<(fontNameLength/2); i++) + for (uint16_t i=0; i<(m_fontNameLength/2); i++) { uint16_t charWord = readU16(input, encryption); uint8_t characterSet = (uint8_t)((charWord >> 8) & 0x00FF); @@ -110,11 +110,11 @@ int len = extendedCharacterWP6ToUCS2(character, characterSet, &chars); for (int j = 0; j < len; j++) - appendUCS4(fontName, (uint32_t)chars[j]); + appendUCS4(m_fontName, (uint32_t)chars[j]); } - WPD_DEBUG_MSG(("WordPerfect: stripping font name (original: %s)\n", fontName.cstr())); - std::string stringValue(fontName.cstr()); + WPD_DEBUG_MSG(("WordPerfect: stripping font name (original: %s)\n", m_fontName.cstr())); + std::string stringValue(m_fontName.cstr()); std::string::size_type pos; for (unsigned k = 0; k < countElements(FONT_WEIGHT_STRINGS); k++) { @@ -138,7 +138,7 @@ while ((pos = stringValue.find("-", stringValue.size() - 1)) != std::string::npos) stringValue.replace(pos, strlen("-"), ""); - fontName = WPXString(stringValue.c_str()); - WPD_DEBUG_MSG(("WordPerfect: stripping font name (final: %s)\n", fontName.cstr())); + m_fontName = WPXString(stringValue.c_str()); + WPD_DEBUG_MSG(("WordPerfect: stripping font name (final: %s)\n", m_fontName.cstr())); } } |
|
From: Fridrich S. <str...@us...> - 2010-06-12 10:40:06
|
Update of /cvsroot/libwpd/libwpd2 In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv24542 Modified Files: libwpd.spec.in Log Message: Making the _readFontName private member function and making getFontName return const reference to the WPXString Index: libwpd.spec.in =================================================================== RCS file: /cvsroot/libwpd/libwpd2/libwpd.spec.in,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- libwpd.spec.in 27 Jul 2008 20:00:04 -0000 1.13 +++ libwpd.spec.in 12 Jun 2010 10:39:58 -0000 1.14 @@ -13,6 +13,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot License: LGPL BuildRequires: gcc-c++, libstdc++-devel +Provides: %{name}-@WPD_MAJOR_VERSION@_@WPD_MINOR_VERSION@-@WPD_MINOR_VERSION@ +Obsoletes: %{name}-@WPD_MAJOR_VERSION@_@WPD_MINOR_VERSION@-@WPD_MINOR_VERSION@ < %{version}-%{release} %description Library that handles Word Perfect documents. @@ -38,8 +40,9 @@ %if %{!?_without_docs:1}%{?_without_docs:0} %package docs -Requires: libwpd BuildRequires: doxygen +Provides: %{name}-devel-doc +Obsoletes: %{name}-devel-doc < %{version}-%{release} Summary: Documentation of libwpd API Group: Development/Documentation @@ -84,7 +87,7 @@ %{_libdir}/libwpd*-@WPD_MAJOR_VERSION@.@WPD_MINOR_VERSION@.so #%{_libdir}/libwpd*-@WPD_MAJOR_VERSION@.@WPD_MINOR_VERSION@.*a %{_libdir}/pkgconfig/libwpd*-@WPD_MAJOR_VERSION@.@WPD_MINOR_VERSION@.pc -%{_includedir}/libwpd-@WPD_MAJOR_VERSION@.@WPD_MINOR_VERSION@/libwpd +%{_includedir}/libwpd-@WPD_MAJOR_VERSION@.@WPD_MINOR_VERSION@/libwpd* %if %{!?_without_docs:1}%{?_without_docs:0} %files docs |
|
From: Fridrich S. <str...@us...> - 2010-06-12 07:36:01
|
Update of /cvsroot/libwpd/libwpd2/src/lib In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv14467/src/lib Modified Files: WP6CharacterGroup.cpp WP6CharacterGroup.h Log Message: better way to parse the font information Index: WP6CharacterGroup.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP6CharacterGroup.h,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- WP6CharacterGroup.h 11 Jun 2010 15:24:51 -0000 1.26 +++ WP6CharacterGroup.h 12 Jun 2010 07:35:52 -0000 1.27 @@ -27,6 +27,7 @@ #define WP6CHARACTERGROUP_H #include "WP6VariableLengthGroup.h" +#include "WP6FontDescriptorPacket.h" class WP6CharacterGroup_SetAlignmentCharacterSubGroup: public WP6VariableLengthGroup_SubGroup { @@ -65,6 +66,7 @@ { public: WP6CharacterGroup_FontFaceChangeSubGroup(WPXInputStream *input, WPXEncryption *encryption, uint16_t sizeDeletable); + ~WP6CharacterGroup_FontFaceChangeSubGroup(); void parse(WP6Listener *listener, const uint8_t numPrefixIDs, uint16_t const *prefixIDs) const; private: @@ -72,7 +74,7 @@ uint16_t m_hash; uint16_t m_matchedFontIndex; uint16_t m_matchedFontPointSize; - WPXString m_fontName; + WP6FontDescriptorPacket *m_packet; }; class WP6CharacterGroup_FontSizeChangeSubGroup : public WP6VariableLengthGroup_SubGroup Index: WP6CharacterGroup.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP6CharacterGroup.cpp,v retrieving revision 1.39 retrieving revision 1.40 diff -u -d -r1.39 -r1.40 --- WP6CharacterGroup.cpp 11 Jun 2010 15:24:51 -0000 1.39 +++ WP6CharacterGroup.cpp 12 Jun 2010 07:35:52 -0000 1.40 @@ -93,7 +93,7 @@ *************************************************************************/ WP6CharacterGroup_FontFaceChangeSubGroup::WP6CharacterGroup_FontFaceChangeSubGroup(WPXInputStream *input, WPXEncryption *encryption, uint16_t sizeDeletable) : - m_oldMatchedPointSize(0), m_hash(0), m_matchedFontIndex(0), m_matchedFontPointSize(0), m_fontName() + m_oldMatchedPointSize(0), m_hash(0), m_matchedFontIndex(0), m_matchedFontPointSize(0), m_packet(0) { m_oldMatchedPointSize = readU16(input, encryption); m_hash = readU16(input, encryption); @@ -103,20 +103,25 @@ if (sizeDeletable > 24) { - input->seek(22, WPX_SEEK_CUR); - uint16_t tmpSizeDeletable = readU16(input, encryption); - WP6FontDescriptorPacket::_readFontName(input, encryption, m_fontName, tmpSizeDeletable); + m_packet = new WP6FontDescriptorPacket(input, encryption, 0, input->tell(), sizeDeletable); - WPD_DEBUG_MSG(("WordPerfect: Character Group Font Face Change subgroup info (font name length: %i, font name: %s)\n", tmpSizeDeletable, m_fontName.cstr())); + WPD_DEBUG_MSG(("WordPerfect: Character Group Font Face Change subgroup info (font name: %s)\n", m_packet->getFontName())); } } +WP6CharacterGroup_FontFaceChangeSubGroup::~WP6CharacterGroup_FontFaceChangeSubGroup() +{ + if (m_packet) + delete m_packet; + m_packet = NULL; +} + void WP6CharacterGroup_FontFaceChangeSubGroup::parse(WP6Listener *listener, const uint8_t /* numPrefixIDs */, uint16_t const *prefixIDs) const { WPD_DEBUG_MSG(("WordPerfect: FontFaceChangeSubGroup parsing\n")); if (!prefixIDs) return; - listener->fontChange(m_matchedFontPointSize, prefixIDs[0], m_fontName); + listener->fontChange(m_matchedFontPointSize, prefixIDs[0], m_packet ? m_packet->getFontName() : WPXString()); } /************************************************************************* |
|
From: Fridrich S. <str...@us...> - 2010-06-11 15:25:00
|
Update of /cvsroot/libwpd/libwpd2/src/lib In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv9769/src/lib Modified Files: WP1ContentListener.cpp WP3ContentListener.cpp WP42ContentListener.cpp WP5ContentListener.cpp WP6CharacterGroup.cpp WP6CharacterGroup.h WP6ContentListener.cpp WP6VariableLengthGroup.cpp WP6VariableLengthGroup.h WPXContentListener.cpp WPXContentListener.h Log Message: Try to map Dingbats too and fix a regression in FontFace change function Index: WP6VariableLengthGroup.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP6VariableLengthGroup.cpp,v retrieving revision 1.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- WP6VariableLengthGroup.cpp 10 Jun 2010 11:54:24 -0000 1.40 +++ WP6VariableLengthGroup.cpp 11 Jun 2010 15:24:51 -0000 1.41 @@ -47,7 +47,8 @@ m_flags(0), m_numPrefixIDs(0), m_prefixIDs(0), - m_sizeNonDeletable(0) + m_sizeNonDeletable(0), + m_sizeDeletable(0) { } @@ -153,13 +154,18 @@ } m_sizeNonDeletable = readU16(input, encryption); - if (m_sizeNonDeletable > m_size) + if (m_sizeNonDeletable > m_size || (m_sizeNonDeletable & 0x8000)) { WPD_DEBUG_MSG(("WordPerfect: Possible corruption detected, bailing out!\n")); throw FileException(); - } + } + + uint32_t tmpPosition = input->tell(); + input->seek(m_sizeNonDeletable, WPX_SEEK_CUR); + m_sizeDeletable = (uint16_t)(startPosition + m_size - 4 - input->tell()); + input->seek(tmpPosition, WPX_SEEK_SET); - WPD_DEBUG_MSG(("WordPerfect: Read variable group header (start_position: %i, sub_group: %i, size: %i, flags: %i, num_prefix_ids: %i, size_non_deletable: %i)\n", startPosition, m_subGroup, m_size, m_flags, m_numPrefixIDs, m_sizeNonDeletable)); + WPD_DEBUG_MSG(("WordPerfect: Read variable group header (start_position: %i, sub_group: %i, size: %i, flags: %i, num_prefix_ids: %i, size_non_deletable: %i, size_deletable: %i)\n", startPosition, m_subGroup, m_size, m_flags, m_numPrefixIDs, m_sizeNonDeletable, m_sizeDeletable)); _readContents(input, encryption); Index: WP5ContentListener.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP5ContentListener.cpp,v retrieving revision 1.41 retrieving revision 1.42 diff -u -d -r1.41 -r1.42 --- WP5ContentListener.cpp 11 Jun 2010 09:58:26 -0000 1.41 +++ WP5ContentListener.cpp 11 Jun 2010 15:24:51 -0000 1.42 @@ -65,7 +65,7 @@ void WP5ContentListener::insertCharacter(uint16_t character) { - uint16_t tmpCharacter = _mapSymbolFont(character); + uint16_t tmpCharacter = _mapNonUnicodeCharacter(character); if (!m_ps->m_isSpanOpened) _openSpan(); appendUCS4(m_parseState->m_textBuffer, (uint32_t)tmpCharacter); Index: WP42ContentListener.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP42ContentListener.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- WP42ContentListener.cpp 11 Jun 2010 09:58:26 -0000 1.25 +++ WP42ContentListener.cpp 11 Jun 2010 15:24:51 -0000 1.26 @@ -61,7 +61,7 @@ { if (!isUndoOn()) { - uint16_t tmpCharacter = _mapSymbolFont(character); + uint16_t tmpCharacter = _mapNonUnicodeCharacter(character); if (!m_ps->m_isSpanOpened) _openSpan(); appendUCS4(m_parseState->m_textBuffer, (uint32_t)tmpCharacter); Index: WP6ContentListener.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP6ContentListener.cpp,v retrieving revision 1.75 retrieving revision 1.76 diff -u -d -r1.75 -r1.76 --- WP6ContentListener.cpp 11 Jun 2010 09:58:26 -0000 1.75 +++ WP6ContentListener.cpp 11 Jun 2010 15:24:51 -0000 1.76 @@ -412,7 +412,7 @@ { if (!isUndoOn()) { - uint16_t tmpCharacter = _mapSymbolFont(character); + uint16_t tmpCharacter = _mapNonUnicodeCharacter(character); if (m_parseState->m_styleStateSequence.getCurrentState() == STYLE_BODY || m_parseState->m_styleStateSequence.getCurrentState() == NORMAL) Index: WPXContentListener.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WPXContentListener.h,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- WPXContentListener.h 11 Jun 2010 09:58:26 -0000 1.27 +++ WPXContentListener.h 11 Jun 2010 15:24:51 -0000 1.28 @@ -203,13 +203,15 @@ void _insertBreakIfNecessary(WPXPropertyList &propList); - uint16_t _mapSymbolFont(uint16_t character); + uint16_t _mapNonUnicodeCharacter(uint16_t character); private: WPXContentListener(const WPXContentListener&); WPXContentListener& operator=(const WPXContentListener&); WPXString _colorToString(const RGBSColor * color); WPXString _mergeColorsToString(const RGBSColor *fgColor, const RGBSColor *bgColor); + uint16_t _mapSymbolFontCharacter(uint16_t character); + uint16_t _mapDingbatsFontCharacter(uint16_t character); }; #endif /* WPXCONTENTLISTENER_H */ Index: WP6CharacterGroup.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP6CharacterGroup.cpp,v retrieving revision 1.38 retrieving revision 1.39 diff -u -d -r1.38 -r1.39 --- WP6CharacterGroup.cpp 10 Jun 2010 11:52:46 -0000 1.38 +++ WP6CharacterGroup.cpp 11 Jun 2010 15:24:51 -0000 1.39 @@ -92,7 +92,7 @@ * WP6CharacterGroup_FontFaceChangeSubGroups *************************************************************************/ -WP6CharacterGroup_FontFaceChangeSubGroup::WP6CharacterGroup_FontFaceChangeSubGroup(WPXInputStream *input, WPXEncryption *encryption) : +WP6CharacterGroup_FontFaceChangeSubGroup::WP6CharacterGroup_FontFaceChangeSubGroup(WPXInputStream *input, WPXEncryption *encryption, uint16_t sizeDeletable) : m_oldMatchedPointSize(0), m_hash(0), m_matchedFontIndex(0), m_matchedFontPointSize(0), m_fontName() { m_oldMatchedPointSize = readU16(input, encryption); @@ -101,11 +101,14 @@ m_matchedFontPointSize = readU16(input, encryption); WPD_DEBUG_MSG(("WordPerfect: Character Group Font Face Change subgroup info (old matched point size: %i, hash: %i, matched font index: %i, matched font point size: %i)\n", m_oldMatchedPointSize, m_hash, m_matchedFontIndex, m_matchedFontPointSize)); - input->seek(22, WPX_SEEK_CUR); - uint16_t tmpSizeDeletable = readU16(input, encryption); - WP6FontDescriptorPacket::_readFontName(input, encryption, m_fontName, tmpSizeDeletable); + if (sizeDeletable > 24) + { + input->seek(22, WPX_SEEK_CUR); + uint16_t tmpSizeDeletable = readU16(input, encryption); + WP6FontDescriptorPacket::_readFontName(input, encryption, m_fontName, tmpSizeDeletable); - WPD_DEBUG_MSG(("WordPerfect: Character Group Font Face Change subgroup info (font name length: %i, font name: %s)\n", tmpSizeDeletable, m_fontName.cstr())); + WPD_DEBUG_MSG(("WordPerfect: Character Group Font Face Change subgroup info (font name length: %i, font name: %s)\n", tmpSizeDeletable, m_fontName.cstr())); + } } void WP6CharacterGroup_FontFaceChangeSubGroup::parse(WP6Listener *listener, const uint8_t /* numPrefixIDs */, uint16_t const *prefixIDs) const @@ -285,7 +288,7 @@ switch (getSubGroup()) { case WP6_CHARACTER_GROUP_FONT_FACE_CHANGE: - m_subGroupData = new WP6CharacterGroup_FontFaceChangeSubGroup(input, encryption); + m_subGroupData = new WP6CharacterGroup_FontFaceChangeSubGroup(input, encryption, getSizeDeletable()); break; case WP6_CHARACTER_GROUP_FONT_SIZE_CHANGE: m_subGroupData = new WP6CharacterGroup_FontSizeChangeSubGroup(input, encryption); Index: WP6VariableLengthGroup.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP6VariableLengthGroup.h,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- WP6VariableLengthGroup.h 22 Nov 2007 12:20:47 -0000 1.28 +++ WP6VariableLengthGroup.h 11 Jun 2010 15:24:51 -0000 1.29 @@ -56,6 +56,7 @@ uint8_t getNumPrefixIDs() const { return m_numPrefixIDs; } const uint16_t * getPrefixIDs() const { return m_prefixIDs; } uint16_t getSizeNonDeletable() const { return m_sizeNonDeletable; } + uint16_t getSizeDeletable() const { return m_sizeDeletable; } private: WP6VariableLengthGroup(const WP6VariableLengthGroup&); @@ -66,6 +67,7 @@ uint8_t m_numPrefixIDs; uint16_t *m_prefixIDs; uint16_t m_sizeNonDeletable; + uint16_t m_sizeDeletable; }; #endif /* WP6VARIABLELENGTHGROUP_H */ Index: WP6CharacterGroup.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP6CharacterGroup.h,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- WP6CharacterGroup.h 10 Jun 2010 11:52:46 -0000 1.25 +++ WP6CharacterGroup.h 11 Jun 2010 15:24:51 -0000 1.26 @@ -64,7 +64,7 @@ class WP6CharacterGroup_FontFaceChangeSubGroup : public WP6VariableLengthGroup_SubGroup { public: - WP6CharacterGroup_FontFaceChangeSubGroup(WPXInputStream *input, WPXEncryption *encryption); + WP6CharacterGroup_FontFaceChangeSubGroup(WPXInputStream *input, WPXEncryption *encryption, uint16_t sizeDeletable); void parse(WP6Listener *listener, const uint8_t numPrefixIDs, uint16_t const *prefixIDs) const; private: Index: WP3ContentListener.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP3ContentListener.cpp,v retrieving revision 1.45 retrieving revision 1.46 diff -u -d -r1.45 -r1.46 --- WP3ContentListener.cpp 11 Jun 2010 09:58:26 -0000 1.45 +++ WP3ContentListener.cpp 11 Jun 2010 15:24:51 -0000 1.46 @@ -69,7 +69,7 @@ { if (!isUndoOn()) { - uint16_t tmpCharacter = _mapSymbolFont(character); + uint16_t tmpCharacter = _mapNonUnicodeCharacter(character); if (!m_ps->m_isSpanOpened) _openSpan(); appendUCS4(m_parseState->m_textBuffer, (uint32_t)tmpCharacter); Index: WP1ContentListener.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP1ContentListener.cpp,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- WP1ContentListener.cpp 11 Jun 2010 09:58:26 -0000 1.29 +++ WP1ContentListener.cpp 11 Jun 2010 15:24:51 -0000 1.30 @@ -64,7 +64,7 @@ { if (!isUndoOn()) { - uint16_t tmpCharacter = _mapSymbolFont(character); + uint16_t tmpCharacter = _mapNonUnicodeCharacter(character); if (!m_ps->m_isSpanOpened) _openSpan(); @@ -89,7 +89,7 @@ if (extendedCharacter <= 0x20) appendUCS4(m_parseState->m_textBuffer, (uint32_t)0x20); else - appendUCS4(m_parseState->m_textBuffer, (uint32_t)macintoshCharacterMap[extendedCharacter - 0x20]); + appendUCS4(m_parseState->m_textBuffer, (uint32_t)(_mapNonUnicodeCharacter(macintoshCharacterMap[extendedCharacter - 0x20]))); } } Index: WPXContentListener.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WPXContentListener.cpp,v retrieving revision 1.43 retrieving revision 1.44 diff -u -d -r1.43 -r1.44 --- WPXContentListener.cpp 11 Jun 2010 09:58:26 -0000 1.43 +++ WPXContentListener.cpp 11 Jun 2010 15:24:51 -0000 1.44 @@ -712,12 +712,8 @@ propList.insert("fo:text-shadow", "1pt 1pt"); if (m_ps->m_fontName) - { - if (*(m_ps->m_fontName) == "Symbol") - propList.insert("style:font-name", "WGL4"); - else - propList.insert("style:font-name", m_ps->m_fontName->cstr()); - } + propList.insert("style:font-name", m_ps->m_fontName->cstr()); + propList.insert("fo:font-size", fontSizeChange*m_ps->m_fontSize, WPX_POINT); // Here we give the priority to the redline bit over the font color. This is how WordPerfect behaves: @@ -1283,11 +1279,22 @@ return position; } -uint16_t WPXContentListener::_mapSymbolFont(uint16_t character) +uint16_t WPXContentListener::_mapNonUnicodeCharacter(uint16_t character) { - static uint16_t _symbolFontMap1 [] = + if (*(m_ps->m_fontName) == "Symbol") + return _mapSymbolFontCharacter(character); + + if (*(m_ps->m_fontName) == "Dingbats") + return _mapDingbatsFontCharacter(character); + + return character; +} + +uint16_t WPXContentListener::_mapSymbolFontCharacter(uint16_t character) +{ + static const uint16_t _symbolFontMap1 [] = { - 0x0020, 0x0021, 0x2200, 0x0023, 0x2203, 0x0025, 0x0026, 0x220D, // 0x21 .. + 0x0020, 0x0021, 0x2200, 0x0023, 0x2203, 0x0025, 0x0026, 0x220D, // 0x20 .. 0x0028, 0x0029, 0x2217, 0x002B, 0x002C, 0x2212, 0x002E, 0x002F, 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, @@ -1301,7 +1308,7 @@ 0x03BE, 0x03C8, 0x03B6, 0x007B, 0x007C, 0x007D, 0x223C // .. 0x7E }; - static uint16_t _symbolFontMap2 [] = + static const uint16_t _symbolFontMap2 [] = { 0x20AC, 0x03D2, 0x2032, 0x2264, 0x2044, 0x221E, 0x0192, 0x2663, // 0xA0 .. 0x2666, 0x2665, 0x2660, 0x2194, 0x2190, 0x2191, 0x2192, 0x2193, @@ -1317,12 +1324,64 @@ 0x23A0, 0x23A4, 0x23A5, 0x23A6, 0x23AB, 0x23AC, 0x23AD // .. 0xFE }; - if (*(m_ps->m_fontName) != "Symbol") - return character; - - if (character >= 0x0020 && character < 0x7F) + if (character >= 0x0020 && character <= 0x7E) return _symbolFontMap1[character - 0x20]; - if (character >= 0x00A0 && character < 0xFF) + if (character >= 0x00A0 && character <= 0xFE) return _symbolFontMap2[character - 0xA0]; return character; } + +uint16_t WPXContentListener::_mapDingbatsFontCharacter(uint16_t character) +{ + static const uint16_t _dingbatsFontMap1 [] = + { + 0x0020, 0x2701, 0x2702, 0x2703, 0x2704, 0x260E, 0x2706, 0x2707, // 0x20 .. + 0x2708, 0x2709, 0x261B, 0x261E, 0x270C, 0x270D, 0x270E, 0x270F, + 0x2710, 0x2711, 0x2712, 0x2713, 0x2714, 0x2715, 0x2716, 0x2717, + 0x2718, 0x2719, 0x271A, 0x271B, 0x271C, 0x271D, 0x271E, 0x271F, + 0x2720, 0x2721, 0x2722, 0x2723, 0x2724, 0x2725, 0x2726, 0x2727, + 0x2605, 0x2729, 0x272A, 0x272B, 0x272C, 0x272D, 0x272E, 0x272F, + 0x2730, 0x2731, 0x2732, 0x2733, 0x2734, 0x2735, 0x2736, 0x2737, + 0x2738, 0x2739, 0x273A, 0x273B, 0x273C, 0x273D, 0x273E, 0x273F, + 0x2740, 0x2741, 0x2742, 0x2743, 0x2744, 0x2745, 0x2746, 0x2747, + 0x2748, 0x2749, 0x274A, 0x274B, 0x25CF, 0x274D, 0x25A0, 0x274F, + 0x2750, 0x2751, 0x2752, 0x25B2, 0x25BC, 0x25C6, 0x2756, 0x25D7, + 0x2758, 0x2759, 0x275A, 0x275B, 0x275C, 0x275D, 0x275E // .. 0x7E + }; + + static const uint16_t _dingbatsFontMap2 [] = + { + 0x2768, 0x2769, 0x276A, 0x276B, 0x276C, 0x276D, 0x276E, 0x276F, // 0x80 .. + 0x2770, 0x2771, 0x2772, 0x2773, 0x2774, 0x2775 // .. 0x8D + }; + + static const uint16_t _dingbatsFontMap3 [] = + { + 0x2761, 0x2762, 0x2763, 0x2764, 0x2765, 0x2766, 0x2767, 0x2663, // 0xA1 .. + 0x2666, 0x2665, 0x2660, 0x2460, 0x2461, 0x2462, 0x2463, 0x2464, + 0x2465, 0x2466, 0x2467, 0x2468, 0x2469, 0x2776, 0x2777, 0x2778, + 0x2779, 0x277A, 0x277B, 0x277C, 0x277D, 0x277E, 0x277F, 0x2780, + 0x2781, 0x2782, 0x2783, 0x2784, 0x2785, 0x2786, 0x2787, 0x2788, + 0x2789, 0x278A, 0x278B, 0x278C, 0x278D, 0x278E, 0x278F, 0x2790, + 0x2791, 0x2792, 0x2793, 0x2794, 0x2192, 0x2194, 0x2195, 0x2798, + 0x2799, 0x279A, 0x279B, 0x279C, 0x279D, 0x279E, 0x279F, 0x27A0, + 0x27A1, 0x27A2, 0x27A3, 0x27A4, 0x27A5, 0x27A6, 0x27A7, 0x27A8, + 0x27A9, 0x27AA, 0x27AB, 0x27AC, 0x27AD, 0x27AE, 0x27AF // .. 0xEF + }; + + static const uint16_t _dingbatsFontMap4 [] = + { + 0x27B1, 0x27B2, 0x27B3, 0x27B4, 0x27B5, 0x27B6, 0x27B7, 0x27B8, // 0xF1 .. + 0x27B9, 0x27BA, 0x27BB, 0x27BC, 0x27BD, 0x27BE // .. OxFE + }; + + if (character >= 0x20 && character <= 0x7E) + return _dingbatsFontMap1[character - 0x20]; + if (character >= 0x80 && character <= 0x8D) + return _dingbatsFontMap2[character - 0x80]; + if (character >= 0xA1 && character <= 0xEF) + return _dingbatsFontMap3[character - 0xA1]; + if (character >= 0xF1 && character <=0xFE) + return _dingbatsFontMap4[character - 0xF1]; + return character; +} |
|
From: Fridrich S. <str...@us...> - 2010-06-11 09:58:34
|
Update of /cvsroot/libwpd/libwpd2/src/lib In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv10544/src/lib Modified Files: WP1ContentListener.cpp WP3ContentListener.cpp WP42ContentListener.cpp WP5ContentListener.cpp WP6ContentListener.cpp WPXContentListener.cpp WPXContentListener.h Log Message: Map the noncompliant 'Symbol' font glyphs to their corresponding Unicode glyphs Index: WP5ContentListener.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP5ContentListener.cpp,v retrieving revision 1.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- WP5ContentListener.cpp 3 Dec 2008 13:40:34 -0000 1.40 +++ WP5ContentListener.cpp 11 Jun 2010 09:58:26 -0000 1.41 @@ -65,9 +65,10 @@ void WP5ContentListener::insertCharacter(uint16_t character) { + uint16_t tmpCharacter = _mapSymbolFont(character); if (!m_ps->m_isSpanOpened) _openSpan(); - appendUCS4(m_parseState->m_textBuffer, (uint32_t)character); + appendUCS4(m_parseState->m_textBuffer, (uint32_t)tmpCharacter); } void WP5ContentListener::insertTab(uint8_t tabType, double tabPosition) Index: WP42ContentListener.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP42ContentListener.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- WP42ContentListener.cpp 3 Dec 2008 13:40:34 -0000 1.24 +++ WP42ContentListener.cpp 11 Jun 2010 09:58:26 -0000 1.25 @@ -61,9 +61,10 @@ { if (!isUndoOn()) { + uint16_t tmpCharacter = _mapSymbolFont(character); if (!m_ps->m_isSpanOpened) _openSpan(); - appendUCS4(m_parseState->m_textBuffer, (uint32_t)character); + appendUCS4(m_parseState->m_textBuffer, (uint32_t)tmpCharacter); } } Index: WP6ContentListener.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP6ContentListener.cpp,v retrieving revision 1.74 retrieving revision 1.75 diff -u -d -r1.74 -r1.75 --- WP6ContentListener.cpp 10 Jun 2010 11:58:01 -0000 1.74 +++ WP6ContentListener.cpp 11 Jun 2010 09:58:26 -0000 1.75 @@ -412,40 +412,42 @@ { if (!isUndoOn()) { + uint16_t tmpCharacter = _mapSymbolFont(character); + if (m_parseState->m_styleStateSequence.getCurrentState() == STYLE_BODY || m_parseState->m_styleStateSequence.getCurrentState() == NORMAL) { if (!m_ps->m_isSpanOpened) _openSpan(); m_parseState->m_isListReference = false; - appendUCS4(m_parseState->m_bodyText, (uint32_t)character); + appendUCS4(m_parseState->m_bodyText, (uint32_t)tmpCharacter); } else if (m_parseState->m_styleStateSequence.getCurrentState() == BEGIN_BEFORE_NUMBERING) { m_parseState->m_isListReference = true; - appendUCS4(m_parseState->m_textBeforeNumber, (uint32_t)character); + appendUCS4(m_parseState->m_textBeforeNumber, (uint32_t)tmpCharacter); } else if (m_parseState->m_styleStateSequence.getCurrentState() == BEGIN_NUMBERING_BEFORE_DISPLAY_REFERENCING) { // left delimeter (or the bullet if there is no display referencing) - appendUCS4(m_parseState->m_textBeforeDisplayReference, (uint32_t)character); + appendUCS4(m_parseState->m_textBeforeDisplayReference, (uint32_t)tmpCharacter); m_parseState->m_isListReference = true; } else if (m_parseState->m_styleStateSequence.getCurrentState() == DISPLAY_REFERENCING) { // the actual paragraph number (in varying forms) - appendUCS4(m_parseState->m_numberText, (uint32_t)character); + appendUCS4(m_parseState->m_numberText, (uint32_t)tmpCharacter); m_parseState->m_isListReference = true; } else if (m_parseState->m_styleStateSequence.getCurrentState() == BEGIN_NUMBERING_AFTER_DISPLAY_REFERENCING) { // right delimeter (if there was a display no. ref. group) - appendUCS4(m_parseState->m_textAfterDisplayReference, (uint32_t)character); + appendUCS4(m_parseState->m_textAfterDisplayReference, (uint32_t)tmpCharacter); m_parseState->m_isListReference = true; } else if (m_parseState->m_styleStateSequence.getCurrentState() == BEGIN_AFTER_NUMBERING) { - appendUCS4(m_parseState->m_textAfterNumber, (uint32_t)character); + appendUCS4(m_parseState->m_textAfterNumber, (uint32_t)tmpCharacter); m_parseState->m_isListReference = true; } } Index: WPXContentListener.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WPXContentListener.h,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- WPXContentListener.h 3 Dec 2008 13:40:34 -0000 1.26 +++ WPXContentListener.h 11 Jun 2010 09:58:26 -0000 1.27 @@ -203,6 +203,8 @@ void _insertBreakIfNecessary(WPXPropertyList &propList); + uint16_t _mapSymbolFont(uint16_t character); + private: WPXContentListener(const WPXContentListener&); WPXContentListener& operator=(const WPXContentListener&); Index: WP3ContentListener.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP3ContentListener.cpp,v retrieving revision 1.44 retrieving revision 1.45 diff -u -d -r1.44 -r1.45 --- WP3ContentListener.cpp 3 Dec 2008 13:40:34 -0000 1.44 +++ WP3ContentListener.cpp 11 Jun 2010 09:58:26 -0000 1.45 @@ -67,11 +67,12 @@ void WP3ContentListener::insertCharacter(const uint16_t character) { - if (!isUndoOn()) + if (!isUndoOn()) { + uint16_t tmpCharacter = _mapSymbolFont(character); if (!m_ps->m_isSpanOpened) _openSpan(); - appendUCS4(m_parseState->m_textBuffer, (uint32_t)character); + appendUCS4(m_parseState->m_textBuffer, (uint32_t)tmpCharacter); } } Index: WP1ContentListener.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP1ContentListener.cpp,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- WP1ContentListener.cpp 3 Dec 2008 13:40:34 -0000 1.28 +++ WP1ContentListener.cpp 11 Jun 2010 09:58:26 -0000 1.29 @@ -64,13 +64,15 @@ { if (!isUndoOn()) { + uint16_t tmpCharacter = _mapSymbolFont(character); + if (!m_ps->m_isSpanOpened) _openSpan(); for (;m_parseState->m_numDeferredTabs > 0; m_parseState->m_numDeferredTabs--) { m_documentInterface->insertTab(); } - appendUCS4(m_parseState->m_textBuffer, (uint32_t)character); + appendUCS4(m_parseState->m_textBuffer, (uint32_t)tmpCharacter); } } Index: WPXContentListener.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WPXContentListener.cpp,v retrieving revision 1.42 retrieving revision 1.43 diff -u -d -r1.42 -r1.43 --- WPXContentListener.cpp 3 Dec 2008 13:40:34 -0000 1.42 +++ WPXContentListener.cpp 11 Jun 2010 09:58:26 -0000 1.43 @@ -712,7 +712,12 @@ propList.insert("fo:text-shadow", "1pt 1pt"); if (m_ps->m_fontName) - propList.insert("style:font-name", m_ps->m_fontName->cstr()); + { + if (*(m_ps->m_fontName) == "Symbol") + propList.insert("style:font-name", "WGL4"); + else + propList.insert("style:font-name", m_ps->m_fontName->cstr()); + } propList.insert("fo:font-size", fontSizeChange*m_ps->m_fontSize, WPX_POINT); // Here we give the priority to the redline bit over the font color. This is how WordPerfect behaves: @@ -1277,3 +1282,47 @@ } return position; } + +uint16_t WPXContentListener::_mapSymbolFont(uint16_t character) +{ + static uint16_t _symbolFontMap1 [] = + { + 0x0020, 0x0021, 0x2200, 0x0023, 0x2203, 0x0025, 0x0026, 0x220D, // 0x21 .. + 0x0028, 0x0029, 0x2217, 0x002B, 0x002C, 0x2212, 0x002E, 0x002F, + 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, + 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, + 0x2245, 0x0391, 0x0392, 0x03A7, 0x0394, 0x0395, 0x03A6, 0x0393, + 0x0397, 0x0399, 0x03D1, 0x039A, 0x039B, 0x039C, 0x039D, 0x039F, + 0x03A0, 0x0398, 0x03A1, 0x03A3, 0x03A4, 0x03A5, 0x03C2, 0x03A9, + 0x039E, 0x03A8, 0x0396, 0x005B, 0x2234, 0x005D, 0x22A5, 0x005F, + 0xF8E5, 0x03B1, 0x03B2, 0x03C7, 0x03B4, 0x03B5, 0x03C6, 0x03B3, + 0x03B7, 0x03B9, 0x03D5, 0x03BA, 0x03BB, 0x03BC, 0x03BD, 0x03BF, + 0x03C0, 0x03B8, 0x03C1, 0x03C3, 0x03C4, 0x03C5, 0x03D6, 0x03C9, + 0x03BE, 0x03C8, 0x03B6, 0x007B, 0x007C, 0x007D, 0x223C // .. 0x7E + }; + + static uint16_t _symbolFontMap2 [] = + { + 0x20AC, 0x03D2, 0x2032, 0x2264, 0x2044, 0x221E, 0x0192, 0x2663, // 0xA0 .. + 0x2666, 0x2665, 0x2660, 0x2194, 0x2190, 0x2191, 0x2192, 0x2193, + 0x00B0, 0x00B1, 0x2033, 0x2265, 0x00D7, 0x221D, 0x2202, 0x2022, + 0x00F7, 0x2260, 0x2261, 0x2248, 0x2026, 0x23D0, 0x23AF, 0x21B5, + 0x2135, 0x2111, 0x211C, 0x2118, 0x2297, 0x2295, 0x2205, 0x2229, + 0x222A, 0x2283, 0x2287, 0x2284, 0x2282, 0x2286, 0x2208, 0x2209, + 0x2220, 0x2207, 0x00AE, 0x00A9, 0x2122, 0x220F, 0x221A, 0x22C5, + 0x00AC, 0x2227, 0x2228, 0x21D4, 0x21D0, 0x21D1, 0x21D2, 0x21D3, + 0x25CA, 0x3008, 0x00AE, 0x00A9, 0x2122, 0x2211, 0x239B, 0x239C, + 0x239D, 0x23A1, 0x23A2, 0x23A3, 0x23A7, 0x23A8, 0x23A9, 0x23AA, + 0xF8FF, 0x3009, 0x222B, 0x2320, 0x23AE, 0x2321, 0x239E, 0x239F, + 0x23A0, 0x23A4, 0x23A5, 0x23A6, 0x23AB, 0x23AC, 0x23AD // .. 0xFE + }; + + if (*(m_ps->m_fontName) != "Symbol") + return character; + + if (character >= 0x0020 && character < 0x7F) + return _symbolFontMap1[character - 0x20]; + if (character >= 0x00A0 && character < 0xFF) + return _symbolFontMap2[character - 0xA0]; + return character; +} |
|
From: Fridrich S. <str...@us...> - 2010-06-10 18:52:02
|
Update of /cvsroot/libwpd/writerperfect/filter In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv30193/filter Modified Files: OdgExporter.cxx OdgExporter.hxx Log Message: Adapting to the recent libwpg interface changes Index: OdgExporter.cxx =================================================================== RCS file: /cvsroot/libwpd/writerperfect/filter/OdgExporter.cxx,v retrieving revision 1.43 retrieving revision 1.44 diff -u -d -r1.43 -r1.44 --- OdgExporter.cxx 8 Jun 2010 13:49:08 -0000 1.43 +++ OdgExporter.cxx 10 Jun 2010 18:51:52 -0000 1.44 @@ -543,10 +543,6 @@ mBodyElements.push_back(new TagCloseElement("draw:frame")); } -void OdgExporter::drawTextLine(const ::WPXPropertyList &propList, const ::WPXString &str) -{ -} - void OdgExporter::writeGraphicsStyle() { #if 0 Index: OdgExporter.hxx =================================================================== RCS file: /cvsroot/libwpd/writerperfect/filter/OdgExporter.hxx,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- OdgExporter.hxx 8 Jun 2010 13:49:08 -0000 1.20 +++ OdgExporter.hxx 10 Jun 2010 18:51:52 -0000 1.21 @@ -55,7 +55,13 @@ void drawPolygon(const ::WPXPropertyListVector& vertices); void drawPath(const ::WPXPropertyListVector& path); void drawGraphicObject(const ::WPXPropertyList &propList, const ::WPXBinaryData& binaryData); - void drawTextLine(const ::WPXPropertyList &propList, const ::WPXString& str); + void startTextObject(const ::WPXPropertyList &propList, const ::WPXPropertyListVector &path) {} + void endTextObject() {} + void startTextLine(const ::WPXPropertyList &propList) {} + void endTextLine() {} + void startTextSpan(const ::WPXPropertyList &propList) {} + void endTextSpan() {} + void insertText(const ::WPXString &str) {} private: void writeGraphicsStyle(); |
|
From: Fridrich S. <str...@us...> - 2010-06-10 11:58:08
|
Update of /cvsroot/libwpd/libwpd2/src/lib In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv21483/src/lib Modified Files: WP6ContentListener.cpp Log Message: Save some curly brackets Index: WP6ContentListener.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP6ContentListener.cpp,v retrieving revision 1.73 retrieving revision 1.74 diff -u -d -r1.73 -r1.74 --- WP6ContentListener.cpp 10 Jun 2010 11:57:13 -0000 1.73 +++ WP6ContentListener.cpp 10 Jun 2010 11:58:01 -0000 1.74 @@ -712,9 +712,8 @@ { const WP6FontDescriptorPacket *fontDescriptorPacket = dynamic_cast<const WP6FontDescriptorPacket *>(WP6Listener::getPrefixDataPacket(fontPID)); - if (fontDescriptorPacket) { + if (fontDescriptorPacket) *(m_ps->m_fontName) = fontDescriptorPacket->getFontName(); - } } else if (fontName.len()) *(m_ps->m_fontName) = fontName; |
1 message has been excluded from this view by a project administrator.
