summaryrefslogtreecommitdiff
path: root/writerfilter/inc
diff options
context:
space:
mode:
authorCédric Bosdonnat <cedricbosdo@openoffice.org>2011-03-31 12:43:00 +0200
committerCédric Bosdonnat <cedricbosdo@openoffice.org>2011-03-31 12:43:07 +0200
commit61f6193d26615e5849a97d670f77d71c7f7d8dea (patch)
treebc65c28cbbc22c09b6051db89cf88736cc86dccc /writerfilter/inc
parent41d8a206335f649b4e2d4ae93754123f9ede2435 (diff)
fdo#34489: fix the docx import of comments, properly resolve all ids
Comment, footnote and endnote ids are integer values, not strings. The code was using string though the comments ids where defined as integers in the model.xml. All are changed to integer values from now.
Diffstat (limited to 'writerfilter/inc')
-rw-r--r--writerfilter/inc/ooxml/OOXMLDocument.hxx10
1 files changed, 5 insertions, 5 deletions
diff --git a/writerfilter/inc/ooxml/OOXMLDocument.hxx b/writerfilter/inc/ooxml/OOXMLDocument.hxx
index 3a0b3904908c..6a8d7df80a7d 100644
--- a/writerfilter/inc/ooxml/OOXMLDocument.hxx
+++ b/writerfilter/inc/ooxml/OOXMLDocument.hxx
@@ -160,7 +160,7 @@ public:
*/
virtual void resolveFootnote(Stream & rStream,
const Id & rNoteType,
- const rtl::OUString & rNoteId) = 0;
+ const sal_Int32 nNoteId) = 0;
/**
Resolves an endnote to a stream handler.
@@ -173,7 +173,7 @@ public:
*/
virtual void resolveEndnote(Stream & rStream,
const Id & rNoteType,
- const rtl::OUString & rNoteId) = 0;
+ const sal_Int32 NoteId) = 0;
/**
Resolves a comment to a stream handler.
@@ -182,7 +182,7 @@ public:
@param rComment id of the comment to resolve
*/
virtual void resolveComment(Stream & rStream,
- const rtl::OUString & rCommentId) = 0;
+ const sal_Int32 nCommentId) = 0;
/**
Resolves a picture to a stream handler.
@@ -241,8 +241,8 @@ public:
virtual uno::Reference<io::XInputStream> getStorageStream() = 0;
virtual uno::Reference<io::XInputStream> getInputStreamForId
(const ::rtl::OUString & rId) = 0;
- virtual void setXNoteId(const rtl::OUString & rId) = 0;
- virtual const ::rtl::OUString & getXNoteId() const = 0;
+ virtual void setXNoteId(const sal_Int32 nId) = 0;
+ virtual sal_Int32 getXNoteId() const = 0;
virtual void setXNoteType(const Id & nId) = 0;
virtual const Id & getXNoteType() const = 0;
virtual const ::rtl::OUString & getTarget() const = 0;