adopt changes from messagelib master

4 files changed, 12 insertions, 0 deletions

diff --git a/framework/domain/mimetreeparser/objecttreesource.cpp b/framework/domain/mimetreeparser/objecttreesource.cpp
index 58667444..567f3516 100644
--- a/framework/domain/mimetreeparser/objecttreesource.cpp
+++ b/framework/domain/mimetreeparser/objecttreesource.cpp
@@ -135,6 +135,11 @@ bool ObjectTreeSource::showExpandQuotesMark() const
     return false;
 }
 
+bool ObjectTreeSource::isPrinting() const
+{
+    return false;
+}
+
 const MimeTreeParser::BodyPartFormatterBaseFactory *ObjectTreeSource::bodyPartFormatterFactory()
 {
     return &(d->mBodyPartFormatterBaseFactory);
diff --git a/framework/domain/mimetreeparser/objecttreesource.h b/framework/domain/mimetreeparser/objecttreesource.h
index 42433e71..93812dc3 100644
--- a/framework/domain/mimetreeparser/objecttreesource.h
+++ b/framework/domain/mimetreeparser/objecttreesource.h
@@ -46,6 +46,7 @@ public:
     bool autoImportKeys() const Q_DECL_OVERRIDE;
     bool showEmoticons() const Q_DECL_OVERRIDE;
     bool showExpandQuotesMark() const Q_DECL_OVERRIDE;
+    bool isPrinting() const Q_DECL_OVERRIDE;
     const MimeTreeParser::BodyPartFormatterBaseFactory *bodyPartFormatterFactory() Q_DECL_OVERRIDE;
     MimeTreeParser::Interface::MessagePartRendererPtr messagePartTheme(MimeTreeParser::Interface::MessagePartPtr msgPart) Q_DECL_OVERRIDE;
 private:
diff --git a/framework/domain/objecttreesource.cpp b/framework/domain/objecttreesource.cpp
index 58667444..567f3516 100644
--- a/framework/domain/objecttreesource.cpp
+++ b/framework/domain/objecttreesource.cpp
@@ -135,6 +135,11 @@ bool ObjectTreeSource::showExpandQuotesMark() const
     return false;
 }
 
+bool ObjectTreeSource::isPrinting() const
+{
+    return false;
+}
+
 const MimeTreeParser::BodyPartFormatterBaseFactory *ObjectTreeSource::bodyPartFormatterFactory()
 {
     return &(d->mBodyPartFormatterBaseFactory);
diff --git a/framework/domain/objecttreesource.h b/framework/domain/objecttreesource.h
index 42433e71..93812dc3 100644
--- a/framework/domain/objecttreesource.h
+++ b/framework/domain/objecttreesource.h
@@ -46,6 +46,7 @@ public:
     bool autoImportKeys() const Q_DECL_OVERRIDE;
     bool showEmoticons() const Q_DECL_OVERRIDE;
     bool showExpandQuotesMark() const Q_DECL_OVERRIDE;
+    bool isPrinting() const Q_DECL_OVERRIDE;
     const MimeTreeParser::BodyPartFormatterBaseFactory *bodyPartFormatterFactory() Q_DECL_OVERRIDE;
     MimeTreeParser::Interface::MessagePartRendererPtr messagePartTheme(MimeTreeParser::Interface::MessagePartPtr msgPart) Q_DECL_OVERRIDE;
 private: