Merge branch 'develop' into fix/drawing_file_client

# Conflicts:
#	PdfReader/PdfReader.h
#	PdfReader/Src/RendererOutputDev.cpp
#	PdfReader/old/Graphics.cpp

DjVuFile/DjVu.cpp

@@ -63,6 +63,11 @@ void CDjVuFile::Close()
 		m_pImplementation->Close();
 }
 
+OfficeDrawingFileType CDjVuFile::GetType()
+{
+    return odftDJVU;
+}
+
 std::wstring CDjVuFile::GetTempDirectory()
 {
     return m_pImplementation ? m_pImplementation->GetTempDirectory() : L"";

DjVuFile/DjVu.h

@@ -61,6 +61,8 @@ public:
 
     virtual void Close();
 
+    virtual OfficeDrawingFileType GetType();
+
     virtual std::wstring GetTempDirectory();
     virtual void SetTempDirectory(const std::wstring& directory);