Attachment #79116 for issue #120693

View | Details | Raw Unified | Return to issue 120693
Collapse All | Expand All

Lines 109-114 Link Here

(-)writerfilter/source/ooxml/OOXMLStreamImpl.cxx (-1 / +5 lines)
109	static rtl::OUString sCommentsType(RTL_CONSTASCII_USTRINGPARAM("http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments"));	109	static rtl::OUString sCommentsType(RTL_CONSTASCII_USTRINGPARAM("http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments"));
110	static rtl::OUString sThemeType(RTL_CONSTASCII_USTRINGPARAM("http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme"));	110	static rtl::OUString sThemeType(RTL_CONSTASCII_USTRINGPARAM("http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme"));
111	static rtl::OUString sSettingsType(RTL_CONSTASCII_USTRINGPARAM("http://schemas.openxmlformats.org/officeDocument/2006/relationships/settings"));	111	static rtl::OUString sSettingsType(RTL_CONSTASCII_USTRINGPARAM("http://schemas.openxmlformats.org/officeDocument/2006/relationships/settings"));
		112	static rtl::OUString sVbaDataType(RTL_CONSTASCII_USTRINGPARAM("http://schemas.microsoft.com/office/2006/relationships/vbaProject"));
112	static rtl::OUString sTarget(RTL_CONSTASCII_USTRINGPARAM("Target"));	113	static rtl::OUString sTarget(RTL_CONSTASCII_USTRINGPARAM("Target"));
113	static rtl::OUString sTargetMode(RTL_CONSTASCII_USTRINGPARAM("TargetMode"));	114	static rtl::OUString sTargetMode(RTL_CONSTASCII_USTRINGPARAM("TargetMode"));
114	static rtl::OUString sExternal(RTL_CONSTASCII_USTRINGPARAM("External"));	115	static rtl::OUString sExternal(RTL_CONSTASCII_USTRINGPARAM("External"));
Lines 122-128 Link Here
122	break;	123	break;
123	case STYLES:	124	case STYLES:
124	sStreamType = sStylesType;	125	sStreamType = sStylesType;
125	break;	126	break;
126	case NUMBERING:	127	case NUMBERING:
127	sStreamType = sNumberingType;	128	sStreamType = sNumberingType;
128	break;	129	break;
Lines 144-149 Link Here
144	case SETTINGS:	145	case SETTINGS:
145	sStreamType = sSettingsType;	146	sStreamType = sSettingsType;
146	break;	147	break;
		148	case VBADATA:
		149	sStreamType = sVbaDataType;
		150	break;
147	default:	151	default:
148	break;	152	break;
149	}	153	}

Lines 332-337 Link Here

(-)writerfilter/source/ooxml/OOXMLDocumentImpl.cxx (+1 lines)
332	resolveFastSubStream(rStream, OOXMLStream::FONTTABLE);	332	resolveFastSubStream(rStream, OOXMLStream::FONTTABLE);
333	resolveFastSubStream(rStream, OOXMLStream::STYLES);	333	resolveFastSubStream(rStream, OOXMLStream::STYLES);
334	resolveFastSubStream(rStream, OOXMLStream::NUMBERING);	334	resolveFastSubStream(rStream, OOXMLStream::NUMBERING);
		335	resolveFastSubStream(rStream, OOXMLStream::VBADATA);
335		336
336	xParser->setFastDocumentHandler( xDocumentHandler );	337	xParser->setFastDocumentHandler( xDocumentHandler );
337	xParser->setTokenHandler( xTokenHandler );	338	xParser->setTokenHandler( xTokenHandler );

Lines 84-90 Link Here

(-)writerfilter/inc/ooxml/OOXMLDocument.hxx (-1 / +2 lines)
84	{	84	{
85	public:	85	public:
86	enum StreamType_t { UNKNOWN, DOCUMENT, STYLES, FONTTABLE, NUMBERING,	86	enum StreamType_t { UNKNOWN, DOCUMENT, STYLES, FONTTABLE, NUMBERING,
87	FOOTNOTES, ENDNOTES, COMMENTS, THEME, SETTINGS };	87	FOOTNOTES, ENDNOTES, COMMENTS, THEME, SETTINGS,
		88	VBADATA};
88	typedef boost::shared_ptr<OOXMLStream> Pointer_t;	89	typedef boost::shared_ptr<OOXMLStream> Pointer_t;
89		90
90	virtual ~OOXMLStream() {}	91	virtual ~OOXMLStream() {}

Return to issue 120693