diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2012-05-10 10:35:47 +0200 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2012-05-14 13:55:12 +0200 |
| commit | ce37510deacf309311362a93913dfcbd7b0853c2 (patch) | |
| tree | c3fe2de950af3e63efce27f9ea347a33fae15cf9 | |
| parent | 45884d2a1378b46ab20abe92c2498bfed09cf58e (diff) | |
fdo#49692 RTFValue::Clone(): copy m_bForceString as well
Change-Id: Ib8f06ff33fd9c01ea4a1e47c97cfa12f2ced7318
Signed-off-by: Andras Timar <atimar@suse.com>
| -rw-r--r-- | writerfilter/source/rtftok/rtfvalue.cxx | 6 | ||||
| -rw-r--r-- | writerfilter/source/rtftok/rtfvalue.hxx | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/writerfilter/source/rtftok/rtfvalue.cxx b/writerfilter/source/rtftok/rtfvalue.cxx index 1d1017d020f7..7a1aec67975f 100644 --- a/writerfilter/source/rtftok/rtfvalue.cxx +++ b/writerfilter/source/rtftok/rtfvalue.cxx @@ -35,12 +35,12 @@ using rtl::OUString; RTFValue::RTFValue(int nValue, rtl::OUString sValue, RTFSprms rAttributes, RTFSprms rSprms, uno::Reference<drawing::XShape> rShape, - uno::Reference<io::XInputStream> rStream) + uno::Reference<io::XInputStream> rStream, bool bForceString) : m_nValue(nValue), m_sValue(sValue), m_rShape(rShape), m_rStream(rStream), - m_bForceString(false) + m_bForceString(bForceString) { m_pAttributes.reset(new RTFSprms(rAttributes)); m_pSprms.reset(new RTFSprms(rSprms)); @@ -176,7 +176,7 @@ std::string RTFValue::toString() const RTFValue* RTFValue::Clone() { - return new RTFValue(m_nValue, m_sValue, *m_pAttributes, *m_pSprms, m_rShape, m_rStream); + return new RTFValue(m_nValue, m_sValue, *m_pAttributes, *m_pSprms, m_rShape, m_rStream, m_bForceString); } RTFSprms& RTFValue::getAttributes() diff --git a/writerfilter/source/rtftok/rtfvalue.hxx b/writerfilter/source/rtftok/rtfvalue.hxx index 791842874da7..5a5ff8c72925 100644 --- a/writerfilter/source/rtftok/rtfvalue.hxx +++ b/writerfilter/source/rtftok/rtfvalue.hxx @@ -41,7 +41,7 @@ namespace writerfilter { public: typedef boost::shared_ptr<RTFValue> Pointer_t; RTFValue(int nValue, rtl::OUString sValue, RTFSprms rAttributes, RTFSprms rSprms, uno::Reference<drawing::XShape> rShape, - uno::Reference<io::XInputStream> rStream); + uno::Reference<io::XInputStream> rStream, bool bForceString); RTFValue(int nValue); RTFValue(rtl::OUString sValue, bool bForce = false); RTFValue(RTFSprms rAttributes); |