Skip to content

O
onlyoffice_core
Commit f6bd0814 authored by Ivan.Shulga's avatar Ivan.Shulga Committed by Alexander Trofimov
Browse files
Options

git-svn-id:... 

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@52584 954022d7-b5bf-4e40-9824-e11837661b57
parent 52787d13
Show whitespace changes
Inline Side-by-side
Showing with 37 additions and 37 deletions
ASCOfficeDjVuFile/File.h
View file @ f6bd0814
#pragma once #pragma once
#include "XmlUtils.h" #include ".\..\Common\XmlUtils.h"
#include "AVSUtils.h" #include ".\..\Common\ASCUtils.h"
#include "windows.h" #include "windows.h"
#ifndef pow2_16 #ifndef pow2_16
......
ASCOfficeDjVuFile/Image.h
View file @ f6bd0814
#pragma once #pragma once
#include "stdafx.h" #include "stdafx.h"
#include "File.h" #include "File.h"
#include "GdiplusEx.h" #include ".\..\Common\GdiplusEx.h"
using namespace Gdiplus; using namespace Gdiplus;
#include "libdjvu\GBitmap.h" #include "libdjvu\GBitmap.h"
......
ASCOfficeDjVuFile/OfficeDjVuFile.cpp
View file @ f6bd0814
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#include "OfficeDjVuFile.h" #include "OfficeDjVuFile.h"
#include "Resource.h" #include "Resource.h"
#include "math.h" #include "math.h"
#include "TimeMeasurer.h" #include "../Common/TimeMeasurer.h"
#define VER_DPI 96 #define VER_DPI 96
#define HOR_DPI 96 #define HOR_DPI 96
...@@ -164,8 +164,8 @@ STDMETHODIMP CDjVuFile::DrawPage(int nPage, IUnknown* punkRenderer, BOOL* pBreak ...@@ -164,8 +164,8 @@ STDMETHODIMP CDjVuFile::DrawPage(int nPage, IUnknown* punkRenderer, BOOL* pBreak
//RELEASEOBJECT(pCS); //RELEASEOBJECT(pCS);
AVSGraphics::IAVSGraphicsRenderer* pGrRenderer = NULL; AVSGraphics::IASCGraphicsRenderer* pGrRenderer = NULL;
punkRenderer->QueryInterface(__uuidof(AVSGraphics::IAVSGraphicsRenderer), (void**)&pGrRenderer); punkRenderer->QueryInterface(__uuidof(AVSGraphics::IASCGraphicsRenderer), (void**)&pGrRenderer);
if (NULL != pGrRenderer) if (NULL != pGrRenderer)
{ {
...@@ -176,8 +176,8 @@ STDMETHODIMP CDjVuFile::DrawPage(int nPage, IUnknown* punkRenderer, BOOL* pBreak ...@@ -176,8 +176,8 @@ STDMETHODIMP CDjVuFile::DrawPage(int nPage, IUnknown* punkRenderer, BOOL* pBreak
XmlUtils::CXmlNode text = ParseText(pPage); XmlUtils::CXmlNode text = ParseText(pPage);
AVSGraphics::IAVSRenderer* renderer; AVSGraphics::IASCRenderer* renderer;
punkRenderer->QueryInterface(__uuidof(AVSGraphics::IAVSRenderer), (void**)&renderer); punkRenderer->QueryInterface(__uuidof(AVSGraphics::IASCRenderer), (void**)&renderer);
CreateFrame2(renderer, pPage, nPage, text); CreateFrame2(renderer, pPage, nPage, text);
RELEASEINTERFACE(renderer); RELEASEINTERFACE(renderer);
} }
...@@ -402,7 +402,7 @@ void CDjVuFile::CreateFrame(GP<DjVuImage>& pPage, int nPage, XmlUtils::CXmlNode& ...@@ -402,7 +402,7 @@ void CDjVuFile::CreateFrame(GP<DjVuImage>& pPage, int nPage, XmlUtils::CXmlNode&
void CDjVuFile::CreateFrame2(AVSGraphics::IAVSRenderer* renderer, GP<DjVuImage>& pPage, int nPage, XmlUtils::CXmlNode& text) void CDjVuFile::CreateFrame2(AVSGraphics::IASCRenderer* renderer, GP<DjVuImage>& pPage, int nPage, XmlUtils::CXmlNode& text)
{ {
int nWidth = pPage->get_real_width(); int nWidth = pPage->get_real_width();
int nHeight = pPage->get_real_height(); int nHeight = pPage->get_real_height();
...@@ -614,7 +614,7 @@ void CDjVuFile::CreateFrame2(AVSGraphics::IAVSRenderer* renderer, GP<DjVuImage>& ...@@ -614,7 +614,7 @@ void CDjVuFile::CreateFrame2(AVSGraphics::IAVSRenderer* renderer, GP<DjVuImage>&
renderer->EndCommand(0x0001); // CompletePage renderer->EndCommand(0x0001); // CompletePage
} }
void CDjVuFile::CreateFrame3(AVSGraphics::IAVSGraphicsRenderer* renderer, GP<DjVuImage>& pPage, BOOL* pBreak) void CDjVuFile::CreateFrame3(AVSGraphics::IASCGraphicsRenderer* renderer, GP<DjVuImage>& pPage, BOOL* pBreak)
{ {
int nWidth = pPage->get_real_width(); int nWidth = pPage->get_real_width();
int nHeight = pPage->get_real_height(); int nHeight = pPage->get_real_height();
...@@ -773,7 +773,7 @@ void CDjVuFile::CreateFrame3(AVSGraphics::IAVSGraphicsRenderer* renderer, GP<DjV ...@@ -773,7 +773,7 @@ void CDjVuFile::CreateFrame3(AVSGraphics::IAVSGraphicsRenderer* renderer, GP<DjV
} }
} }
void CDjVuFile::CreateFrame(AVSGraphics::IAVSRenderer* renderer, GP<DjVuImage>& pPage, int nPage, XmlUtils::CXmlNode& text) void CDjVuFile::CreateFrame(AVSGraphics::IASCRenderer* renderer, GP<DjVuImage>& pPage, int nPage, XmlUtils::CXmlNode& text)
{ {
CString strNum; CString strNum;
strNum.Format(_T("%d"), nPage); strNum.Format(_T("%d"), nPage);
...@@ -916,7 +916,7 @@ void CDjVuFile::PageToRenderer(double width, double height) ...@@ -916,7 +916,7 @@ void CDjVuFile::PageToRenderer(double width, double height)
} }
void CDjVuFile::PageToRenderer(AVSGraphics::IAVSRenderer* renderer, double width, double height) void CDjVuFile::PageToRenderer(AVSGraphics::IASCRenderer* renderer, double width, double height)
{ {
renderer->NewPage(); renderer->NewPage();
renderer->put_Width(width); renderer->put_Width(width);
...@@ -951,7 +951,7 @@ void CDjVuFile::TextToRenderer(XmlUtils::CXmlNode text, double koef, bool isView ...@@ -951,7 +951,7 @@ void CDjVuFile::TextToRenderer(XmlUtils::CXmlNode text, double koef, bool isView
} }
void CDjVuFile::TextToRenderer(AVSGraphics::IAVSRenderer* renderer, XmlUtils::CXmlNode text, double koef, bool isView) void CDjVuFile::TextToRenderer(AVSGraphics::IASCRenderer* renderer, XmlUtils::CXmlNode text, double koef, bool isView)
{ {
renderer->put_ShadowVisible(0); renderer->put_ShadowVisible(0);
...@@ -989,7 +989,7 @@ void CDjVuFile::ImageToRenderer(const CString& strName, double width, double hei ...@@ -989,7 +989,7 @@ void CDjVuFile::ImageToRenderer(const CString& strName, double width, double hei
} }
void CDjVuFile::ImageToRenderer(AVSGraphics::IAVSRenderer* renderer, const CString& strName, double width, double height) void CDjVuFile::ImageToRenderer(AVSGraphics::IASCRenderer* renderer, const CString& strName, double width, double height)
{ {
BSTR bsPath = strName.AllocSysString(); BSTR bsPath = strName.AllocSysString();
renderer->DrawImageFromFile(bsPath, 0, 0, (float)width, (float)height); renderer->DrawImageFromFile(bsPath, 0, 0, (float)width, (float)height);
...@@ -1023,7 +1023,7 @@ void CDjVuFile::DrawRect(double* coords) ...@@ -1023,7 +1023,7 @@ void CDjVuFile::DrawRect(double* coords)
} }
void CDjVuFile::DrawRect(AVSGraphics::IAVSRenderer* renderer, double* coords) void CDjVuFile::DrawRect(AVSGraphics::IASCRenderer* renderer, double* coords)
{ {
renderer->PathCommandMoveTo(coords[0], coords[3]); renderer->PathCommandMoveTo(coords[0], coords[3]);
renderer->PathCommandLineTo(coords[2], coords[3]); renderer->PathCommandLineTo(coords[2], coords[3]);
...@@ -1052,7 +1052,7 @@ void CDjVuFile::DrawText(double* coords, CString text) ...@@ -1052,7 +1052,7 @@ void CDjVuFile::DrawText(double* coords, CString text)
SysFreeString(bsText); SysFreeString(bsText);
} }
void CDjVuFile::DrawText(AVSGraphics::IAVSRenderer* renderer, double* coords, CString text) void CDjVuFile::DrawText(AVSGraphics::IASCRenderer* renderer, double* coords, CString text)
{ {
/*CString strFont; /*CString strFont;
strFont.Format(_T("<font name='Arial' size='%lf'/>"), min( 100 , max( 1, fabs((float)(coords[3] - coords[1]))) * 72 / 25.4)); strFont.Format(_T("<font name='Arial' size='%lf'/>"), min( 100 , max( 1, fabs((float)(coords[3] - coords[1]))) * 72 / 25.4));
......
ASCOfficeDjVuFile/OfficeDjVuFile.h
View file @ f6bd0814
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
#include ".\..\Common\OfficeFileTemplate.h" #include ".\..\Common\OfficeFileTemplate.h"
#include ".\..\Common\OfficeFileErrorDescription.h" #include ".\..\Common\OfficeFileErrorDescription.h"
#include ".\..\Common\OfficeDefines.h" #include ".\..\Common\OfficeDefines.h"
#include "XmlUtils.h" #include ".\..\Common\XmlUtils.h"
#include "AVSUtils.h" #include ".\..\Common\ASCUtils.h"
#include "libdjvu/DjVuDocument.h" #include "libdjvu/DjVuDocument.h"
#include "libdjvu/DjVuImage.h" #include "libdjvu/DjVuImage.h"
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
#include "libdjvu/DjVuText.h" #include "libdjvu/DjVuText.h"
#include "libdjvu/DjVmNav.h" #include "libdjvu/DjVmNav.h"
#include "MediaFormatDefine.h" #include ".\..\Common\MediaFormatDefine.h"
#include "Image.h" #include "Image.h"
#include "TemporaryCS.h" #include ".\..\Common\TemporaryCS.h"
#if defined(_WIN32_WCE) && !defined(_CE_DCOM) && !defined(_CE_ALLOW_SINGLE_THREADED_OBJECTS_IN_MTA) #if defined(_WIN32_WCE) && !defined(_CE_DCOM) && !defined(_CE_ALLOW_SINGLE_THREADED_OBJECTS_IN_MTA)
#error "Single-threaded COM objects are not properly supported on Windows CE platform, such as the Windows Mobile platforms that do not include full DCOM support. Define _CE_ALLOW_SINGLE_THREADED_OBJECTS_IN_MTA to force ATL to support creating single-thread COM object's and allow use of it's single-threaded COM object implementations. The threading model in your rgs file was set to 'Free' as that is the only threading model supported in non DCOM Windows CE platforms." #error "Single-threaded COM objects are not properly supported on Windows CE platform, such as the Windows Mobile platforms that do not include full DCOM support. Define _CE_ALLOW_SINGLE_THREADED_OBJECTS_IN_MTA to force ATL to support creating single-thread COM object's and allow use of it's single-threaded COM object implementations. The threading model in your rgs file was set to 'Free' as that is the only threading model supported in non DCOM Windows CE platforms."
...@@ -85,13 +85,13 @@ public: ...@@ -85,13 +85,13 @@ public:
(*ppRenderer) = NULL; (*ppRenderer) = NULL;
if( NULL == m_pDocumentRenderer ) if( NULL == m_pDocumentRenderer )
return S_OK; return S_OK;
return m_pDocumentRenderer->QueryInterface(__uuidof(AVSGraphics::IAVSDocumentRenderer), (void**)ppRenderer); return m_pDocumentRenderer->QueryInterface(__uuidof(AVSGraphics::IASCRenderer), (void**)ppRenderer);
} }
STDMETHOD(put_DocumentRenderer)(IUnknown* pRenderer) STDMETHOD(put_DocumentRenderer)(IUnknown* pRenderer)
{ {
RELEASEINTERFACE( m_pDocumentRenderer ); RELEASEINTERFACE( m_pDocumentRenderer );
if( NULL != pRenderer ) if( NULL != pRenderer )
pRenderer->QueryInterface(__uuidof(AVSGraphics::IAVSDocumentRenderer), (void**)&m_pDocumentRenderer); pRenderer->QueryInterface(__uuidof(AVSGraphics::IASCRenderer), (void**)&m_pDocumentRenderer);
return S_OK; return S_OK;
} }
STDMETHOD(get_TempDirectory)(BSTR* pbsPath) STDMETHOD(get_TempDirectory)(BSTR* pbsPath)
...@@ -132,25 +132,25 @@ public: ...@@ -132,25 +132,25 @@ public:
private: private:
void CreateFrame(GP<DjVuImage>& pImage, int nPage, XmlUtils::CXmlNode& text); void CreateFrame(GP<DjVuImage>& pImage, int nPage, XmlUtils::CXmlNode& text);
void CreateFrame(AVSGraphics::IAVSRenderer* renderer, GP<DjVuImage>& pImage, int nPage, XmlUtils::CXmlNode& text); void CreateFrame(AVSGraphics::IASCRenderer* renderer, GP<DjVuImage>& pImage, int nPage, XmlUtils::CXmlNode& text);
void CreateFrame2(AVSGraphics::IAVSRenderer* renderer, GP<DjVuImage>& pImage, int nPage, XmlUtils::CXmlNode& text); void CreateFrame2(AVSGraphics::IASCRenderer* renderer, GP<DjVuImage>& pImage, int nPage, XmlUtils::CXmlNode& text);
void CreateFrame3(AVSGraphics::IAVSGraphicsRenderer* renderer, GP<DjVuImage>& pImage, BOOL* pBreak); void CreateFrame3(AVSGraphics::IASCGraphicsRenderer* renderer, GP<DjVuImage>& pImage, BOOL* pBreak);
CString SavePage(int nPageNum, IUnknown* pPage); CString SavePage(int nPageNum, IUnknown* pPage);
XmlUtils::CXmlNode ParseText(GP<DjVuImage> pPage); XmlUtils::CXmlNode ParseText(GP<DjVuImage> pPage);
void PageToRenderer(double width, double height); void PageToRenderer(double width, double height);
void TextToRenderer(XmlUtils::CXmlNode text, double koef, bool isView = true); void TextToRenderer(XmlUtils::CXmlNode text, double koef, bool isView = true);
void ImageToRenderer(const CString& strName, double width, double height); void ImageToRenderer(const CString& strName, double width, double height);
void PageToRenderer(AVSGraphics::IAVSRenderer* renderer, double width, double height); void PageToRenderer(AVSGraphics::IASCRenderer* renderer, double width, double height);
void TextToRenderer(AVSGraphics::IAVSRenderer* renderer, XmlUtils::CXmlNode text, double koef, bool isView = true); void TextToRenderer(AVSGraphics::IASCRenderer* renderer, XmlUtils::CXmlNode text, double koef, bool isView = true);
void ImageToRenderer(AVSGraphics::IAVSRenderer* renderer, const CString& strName, double width, double height); void ImageToRenderer(AVSGraphics::IASCRenderer* renderer, const CString& strName, double width, double height);
void ParseCoords(CString& coordsStr, double* coords, double koef); void ParseCoords(CString& coordsStr, double* coords, double koef);
void DrawRect(double* coords); void DrawRect(double* coords);
void DrawText(double* coords, CString text); void DrawText(double* coords, CString text);
void DrawRect(AVSGraphics::IAVSRenderer* renderer, double* coords); void DrawRect(AVSGraphics::IASCRenderer* renderer, double* coords);
void DrawText(AVSGraphics::IAVSRenderer* renderer, double* coords, CString text); void DrawText(AVSGraphics::IASCRenderer* renderer, double* coords, CString text);
private: private:
GP<DjVuDocument> m_pDoc; GP<DjVuDocument> m_pDoc;
......
ASCOfficeDjVuFile/Resource.h
View file @ f6bd0814
//{{NO_DEPENDENCIES}} //{{NO_DEPENDENCIES}}
// Microsoft Visual C++ generated include file. // Microsoft Visual C++ generated include file.
// Used by AVSOfficeDjVuFile.rc // Used by ASCOfficeDjVuFile.rc
// //
#define IDS_PROJNAME 100 #define IDS_PROJNAME 100
#define IDR_AVSDJVUFILE 101 #define IDR_ASCDJVUFILE 101
// Next default values for new objects // Next default values for new objects
// //
......
ASCOfficeDjVuFile/stdafx.h
View file @ f6bd0814
...@@ -57,11 +57,11 @@ ...@@ -57,11 +57,11 @@
#pragma comment(lib, "Release\\libdjvu.lib") #pragma comment(lib, "Release\\libdjvu.lib")
#endif #endif
#import "..\..\..\Redist\AVSMediaCore3.dll" named_guids raw_interfaces_only rename_namespace("MediaCore"), exclude("tagRECT") #import "..\..\Redist\ASCMediaCore3.dll" named_guids raw_interfaces_only rename_namespace("MediaCore"), exclude("tagRECT")
#import "..\..\..\Redist\AVSMediaFormatSettings3.dll" named_guids raw_interfaces_only rename_namespace("MediaFormat"), exclude("tagRECT") #import "..\..\Redist\ASCMediaFormatSettings3.dll" named_guids raw_interfaces_only rename_namespace("MediaFormat"), exclude("tagRECT")
#import "..\..\..\Redist\AVSImageStudio3.dll" named_guids raw_interfaces_only rename_namespace("ImageStudio") #import "..\..\Redist\ASCImageStudio3.dll" named_guids raw_interfaces_only rename_namespace("ImageStudio")
//#import "..\..\..\Redist\AVSOfficeStudio\AVSOfficeEditor.dll" named_guids raw_interfaces_only rename_namespace("OfficeEditor") //#import "..\..\Redist\ASCOfficeEditor.dll" named_guids raw_interfaces_only rename_namespace("OfficeEditor")
#import "..\..\..\Redist\AVSGraphics.dll" named_guids raw_interfaces_only rename_namespace("AVSGraphics") #import "..\..\Redist\ASCGraphics.dll" named_guids raw_interfaces_only rename_namespace("AVSGraphics")
using namespace ATL; using namespace ATL;
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7