перешел на новые интерфейсы

303a13a9 · Oleg Korshul · Alexander Trofimov · 3600991e · 303a13a9 · 303a13a9
Commit 303a13a9 authored Apr 20, 2016 by Oleg Korshul Committed by Alexander Trofimov May 21, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

PdfReader/PdfReader.h PdfReader/PdfReader.h +2 -2

XpsFile/XpsFile.h XpsFile/XpsFile.h +1 -1

No files found.
--- a/PdfReader/PdfReader.h
+++ b/PdfReader/PdfReader.h
@@ -14,12 +14,12 @@
 namespace PdfReader
 {
    class CPdfReader_Private;
-    class PDFREADER_DECL_EXPORT CPdfReader
+    class PDFREADER_DECL_EXPORT CPdfReader : public IOfficeDrawingFile
 	{
 	public:

        CPdfReader(CApplicationFonts* fonts);
-		~CPdfReader();
+        virtual ~CPdfReader();

        virtual bool LoadFromFile(const std::wstring& file, const std::wstring& options = L"",
                                        const std::wstring& owner_password = L"", const std::wstring& user_password = L"");

--- a/XpsFile/XpsFile.h
+++ b/XpsFile/XpsFile.h
@@ -11,7 +11,7 @@
 #include "../DesktopEditor/common/officedrawingfile.h"

 class CXpsFile_Private;
-class XPS_DECL_EXPORT CXpsFile
+class XPS_DECL_EXPORT CXpsFile : public IOfficeDrawingFile
 {
 public:
    CXpsFile(CApplicationFonts* fonts);