Skip to content

O
onlyoffice_core
Commit cf611906 authored by Elen.Subbotina's avatar Elen.Subbotina Committed by Alexander Trofimov
Browse files
Options

.. 

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@52760 954022d7-b5bf-4e40-9824-e11837661b57
parent 99e9af10
Hide whitespace changes
Inline Side-by-side
Showing with 40 additions and 55 deletions
ASCOfficeODFFile/ASCOfficeOdfFile/ASCOfficeOdfFile.cpp
View file @ cf611906
......@@ -10,7 +10,7 @@
name = "ASCOfficeOdfFile",
helpstring = "ASCOfficeOdfFile 1.0 Type Library",
resource_name = "IDR_ASCOFFICEODFFILE") ]
class CAVSOfficeOdfFileModule
class CASCOfficeOdfFileModule
{
public:
// Override CAtlDllModuleT members
......
ASCOfficeODFFile/ASCOfficeOdfFile/ASCOfficeOdfFile.vcproj
View file @ cf611906
......@@ -111,7 +111,7 @@
<Tool
Name="VCPostBuildEventTool"
Description="Performing registration"
CommandLine="regsvr32 /s /c &quot;$(TargetPath)&quot;&#x0D;&#x0A;copy &quot;$(TargetPath)&quot; &quot;../../Redist&quot;"
CommandLine="regsvr32 /s /c &quot;$(TargetPath)&quot;&#x0D;&#x0A;"
/>
</Configuration>
<Configuration
......@@ -215,7 +215,7 @@
<Tool
Name="VCPostBuildEventTool"
Description="Performing registration"
CommandLine="regsvr32 /s /c &quot;$(TargetPath)&quot;"
CommandLine="regsvr32 /s /c &quot;$(TargetPath)&quot;&#x0D;&#x0A;copy &quot;$(TargetPath)&quot; &quot;../../Redist&quot;"
/>
</Configuration>
<Configuration
......
ASCOfficeODFFile/ASCOfficeOdfFile/OfficeOdfFile.cpp
View file @ cf611906
/// \file OfficeOdfFile.cpp
/// \author pogorskiy@gmail.com (@avsmedia.net)
#include "stdafx.h"
#include "OfficeOdfFile.h"
......@@ -41,7 +40,7 @@
COfficeOdfFile::COfficeOdfFile()
{
office_utils_.CoCreateInstance(__uuidof(AVSOfficeUtils::COfficeUtils));
office_utils_.CoCreateInstance(__uuidof(ASCOfficeUtils::COfficeUtils));
}
namespace {
......
ASCOfficeODFFile/ASCOfficeOdfFile/OfficeOdfFile.h
View file @ cf611906
......@@ -4,18 +4,17 @@
#include "resource.h" // main symbols
#include <string>
//#import "libid:92F87FA9-D3C2-4820-82F6-DEAEC0A3539D" rename_namespace("AVSOfficeUtils"), raw_interfaces_only
#import "../../Redist/ASCOfficeUtils.dll" rename_namespace("AVSOfficeUtils"), raw_interfaces_only
#import "../../Redist/ASCOfficeUtils.dll" rename_namespace("ASCOfficeUtils"), raw_interfaces_only
////////////////////////////////////////////////////////////////
// IAVSOfficeFileTemplate
// IASCOfficeFileTemplate
[
object,
uuid("3FC4EC15-9467-4D66-AD6A-A0C0BAEDD3CD"),
dual, helpstring("IAVSOfficeFileTemplate Interface"),
dual, helpstring("IASCOfficeFileTemplate Interface"),
pointer_default(unique)
]
__interface IAVSOfficeFileTemplate : IDispatch
__interface IASCOfficeFileTemplate : IDispatch
{
[id(1), helpstring("method LoadFromFile")] HRESULT LoadFromFile([in] BSTR sSrcFileName, [in] BSTR sDstPath, [in] BSTR sXMLOptions);
[id(2), helpstring("method SaveToFile")] HRESULT SaveToFile([in] BSTR sDstFileName, [in] BSTR sSrcPath, [in] BSTR sXMLOptions);
......@@ -35,7 +34,7 @@ __interface IAVSOfficeFileTemplate : IDispatch
dual, helpstring("IOfficeOdfFile Interface"),
pointer_default(unique)
]
__interface IOfficeOdfFile : IAVSOfficeFileTemplate
__interface IOfficeOdfFile : IASCOfficeFileTemplate
{
};
......@@ -59,8 +58,8 @@ __interface _IOfficeOdfFileEvents
threading(apartment),
support_error_info("IOfficeOdfFile"),
event_source(com),
vi_progid("AVSOfficeOdfFile.OfficeOdfFile"),
progid("AVSOfficeOdfFile.OfficeOdfFile.1"),
vi_progid("ASCOfficeOdfFile.OfficeOdfFile"),
progid("ASCOfficeOdfFile.OfficeOdfFile.1"),
version(1.0),
uuid("99901ECB-3527-494D-A9EC-5A7CA98AD18B"),
helpstring("OfficeOdfFile Class")
......@@ -90,7 +89,7 @@ public:
STDMETHOD(SaveToFile)(BSTR sDstFileName, BSTR sSrcPath, BSTR sXMLOptions);
private:
ATL::CComPtr< AVSOfficeUtils::IOfficeUtils > office_utils_;
ATL::CComPtr< ASCOfficeUtils::IOfficeUtils > office_utils_;
private:
bool initialized();
......
ASCOfficeODFFile/ASCOfficeOdfFile/stdafx.cpp
View file @ cf611906
// stdafx.cpp : source file that includes just the standard includes
// AVSOfficeOdfFile.pch will be the pre-compiled header
// ASCOfficeOdfFile.pch will be the pre-compiled header
// stdafx.obj will contain the pre-compiled type information
#include "stdafx.h"
ASCOfficeODFFile/ASCOfficeOdtFile/ASCOfficeOdtFile.cpp
View file @ cf611906
......@@ -10,7 +10,7 @@
name = "ASCOfficeOdtFile",
helpstring = "ASCOfficeOdtFile 1.0 Type Library",
resource_name = "IDR_ASCOFFICEODTFILE") ]
class CAVSOfficeOdtFileModule
class CASCOfficeOdtFileModule
{
public:
// Override CAtlDllModuleT members
......
ASCOfficeODFFile/ASCOfficeOdtFile/OdtFile.cpp
View file @ cf611906
......@@ -3,7 +3,7 @@
#include "stdafx.h"
#include "OdtFile.h"
#import "libid:9AEF1F19-91CE-46C0-A380-06A7F56CE4AE" rename_namespace("AVSOfficeOdfFile"), raw_interfaces_only
#import "../../Redist/ASCOfficeOdfFile.dll" rename_namespace("ASCOfficeOdfFile"), raw_interfaces_only
COdtFile::COdtFile()
{
......@@ -15,7 +15,7 @@ COdtFile::~COdtFile()
HRESULT COdtFile::FinalConstruct()
{
HRESULT hr = odfFile_.CoCreateInstance(__uuidof(AVSOfficeOdfFile::COfficeOdfFile));
HRESULT hr = odfFile_.CoCreateInstance(__uuidof(ASCOfficeOdfFile::COfficeOdfFile));
return hr;
}
......
ASCOfficeODFFile/ASCOfficeOdtFile/OdtFile.h
View file @ cf611906
......@@ -4,14 +4,14 @@
#include "resource.h" // main symbols
////////////////////////////////////////////////////////////////
// IAVSOfficeFileTemplate
// IASCOfficeFileTemplate
[
object,
uuid("3FC4EC15-9467-4D66-AD6A-A0C0BAEDD3CD"),
dual, helpstring("IAVSOfficeFileTemplate Interface"),
dual, helpstring("IASCOfficeFileTemplate Interface"),
pointer_default(unique)
]
__interface IAVSOfficeFileTemplate : IDispatch
__interface IASCOfficeFileTemplate : IDispatch
{
[id(1), helpstring("method LoadFromFile")] HRESULT LoadFromFile([in] BSTR sSrcFileName, [in] BSTR sDstPath, [in] BSTR sXMLOptions);
[id(2), helpstring("method SaveToFile")] HRESULT SaveToFile([in] BSTR sDstFileName, [in] BSTR sSrcPath, [in] BSTR sXMLOptions);
......@@ -19,14 +19,14 @@ __interface IAVSOfficeFileTemplate : IDispatch
////////////////////////////////////////////////////////////////
// _IAVSOfficeFileTemplateEvents2
// _IASCOfficeFileTemplateEvents2
[
dispinterface,
uuid("9764153E-DAEB-40dd-94D4-A2C39218AF64"),
helpstring("_IAVSOfficeFileTemplateEvents2 Interface")
helpstring("_IASCOfficeFileTemplateEvents2 Interface")
]
__interface _IAVSOfficeFileTemplateEvents2
__interface _IASCOfficeFileTemplateEvents2
{
//Max Value nPercent == 1000000
//Example 23,56 % == 235600
......@@ -46,7 +46,7 @@ __interface _IAVSOfficeFileTemplateEvents2
dual, helpstring("IOdtFile Interface"),
pointer_default(unique)
]
__interface IOdtFile : IAVSOfficeFileTemplate
__interface IOdtFile : IASCOfficeFileTemplate
{
};
......@@ -66,12 +66,12 @@ __interface _IOdtFileEvents
[
coclass,
default(IOdtFile, _IAVSOfficeFileTemplateEvents2),
default(IOdtFile, _IASCOfficeFileTemplateEvents2),
threading(apartment),
support_error_info("IOdtFile"),
event_source(com),
vi_progid("AVSOdtFile.OdtFile"),
progid("AVSOdtFile.OdtFile.1"),
vi_progid("ASCOdtFile.OdtFile"),
progid("ASCOdtFile.OdtFile.1"),
version(1.0),
uuid("04596A11-01C4-48D9-B020-B08E3F443F0F"),
helpstring("OdtFile Class")
......@@ -83,7 +83,7 @@ public:
COdtFile();
~COdtFile();
__event __interface _IAVSOfficeFileTemplateEvents2;
__event __interface _IASCOfficeFileTemplateEvents2;
DECLARE_PROTECT_FINAL_CONSTRUCT()
......@@ -96,7 +96,7 @@ public:
STDMETHOD(SaveToFile)(BSTR sDstFileName, BSTR sSrcPath, BSTR sXMLOptions);
private:
ATL::CComPtr<IAVSOfficeFileTemplate> odfFile_;
ATL::CComPtr<IASCOfficeFileTemplate> odfFile_;
};
ASCOfficeODFFile/ASCOfficeOdtFile/Resource.h
View file @ cf611906
//{{NO_DEPENDENCIES}}
// Microsoft Visual C++ generated include file.
// Used by AVSOfficeOdtFile.rc
// Used by ASCOfficeOdtFile.rc
//
#define IDS_PROJNAME 100
#define IDR_AVSOFFICEODTFILE 101
#define IDR_ASCOFFICEODTFILE 101
// Next default values for new objects
//
......
ASCOfficeODFFile/ASCOfficeOdtFile/stdafx.cpp
View file @ cf611906
// stdafx.cpp : source file that includes just the standard includes
// AVSOfficeOdtFile.pch will be the pre-compiled header
// ASCOfficeOdtFile.pch will be the pre-compiled header
// stdafx.obj will contain the pre-compiled type information
#include "stdafx.h"
ASCOfficeODFFile/cpdocument.sln
View file @ cf611906
......@@ -24,11 +24,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCOfficeOdfFile", "ASCOffi
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCOfficeOdfFileTest", "examples\ASCOfficeOdfFileTest\ASCOfficeOdfFileTest.vcproj", "{C2882DDD-07E6-4314-AD4B-48F43F38D722}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCOfficeOdtFile", "ASCOfficeOdtFile\ASCOfficeOdtFile.vcproj", "{A2EB9389-498F-485D-8426-EDF788304615}"
ProjectSection(ProjectDependencies) = postProject
{64B09C98-22DC-494E-A882-9E2D7D18557C} = {64B09C98-22DC-494E-A882-9E2D7D18557C}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cpformulasconvert", "formulasconvert\formulasconvert.vcproj", "{94954A67-A853-43B1-A727-6EF2774C5A6A}"
EndProject
Global
......@@ -68,9 +63,6 @@ Global
{C2882DDD-07E6-4314-AD4B-48F43F38D722}.Release ASC|Win32.Build.0 = Release|Win32
{C2882DDD-07E6-4314-AD4B-48F43F38D722}.Release|Win32.ActiveCfg = Release|Win32
{C2882DDD-07E6-4314-AD4B-48F43F38D722}.Release|Win32.Build.0 = Release|Win32
{A2EB9389-498F-485D-8426-EDF788304615}.Debug|Win32.ActiveCfg = Debug|Win32
{A2EB9389-498F-485D-8426-EDF788304615}.Release ASC|Win32.ActiveCfg = Release|Win32
{A2EB9389-498F-485D-8426-EDF788304615}.Release|Win32.ActiveCfg = Release|Win32
{94954A67-A853-43B1-A727-6EF2774C5A6A}.Debug|Win32.ActiveCfg = Debug|Win32
{94954A67-A853-43B1-A727-6EF2774C5A6A}.Debug|Win32.Build.0 = Debug|Win32
{94954A67-A853-43B1-A727-6EF2774C5A6A}.Release ASC|Win32.ActiveCfg = Release|Win32
......
ASCOfficeODFFile/examples/ASCOfficeOdfFileTest/ASCOfficeOdfFileTest.cpp
View file @ cf611906
......@@ -6,15 +6,15 @@
#include <iostream>
#include <string>
#import "libid:9AEF1F19-91CE-46C0-A380-06A7F56CE4AE" rename_namespace("AVSOfficeOdfFile"), raw_interfaces_only
#import "../../../Redist/ASCOfficeOdfFile.dll" rename_namespace("ASCOfficeOdfFile"), raw_interfaces_only
#define HR_RET(HR) if FAILED(hr = (HR)) { _ASSERTE(false); return -1; }
int ConvertSingle(int argc, _TCHAR* argv[])
{
ATL::CComPtr<AVSOfficeOdfFile::IAVSOfficeFileTemplate> officeOdfFile;
ATL::CComPtr<ASCOfficeOdfFile::IASCOfficeFileTemplate> officeOdfFile;
HRESULT hr;
HR_RET(officeOdfFile.CoCreateInstance(__uuidof(AVSOfficeOdfFile::COfficeOdfFile)));
HR_RET(officeOdfFile.CoCreateInstance(__uuidof(ASCOfficeOdfFile::COfficeOdfFile)));
boost::timer t1;
officeOdfFile->LoadFromFile(ATL::CComBSTR(argv[1]), ATL::CComBSTR(argv[2]), NULL);
......@@ -24,9 +24,9 @@ int ConvertSingle(int argc, _TCHAR* argv[])
int ConvertMulti(int argc, _TCHAR* argv[])
{
ATL::CComPtr<AVSOfficeOdfFile::IAVSOfficeFileTemplate> officeOdfFile;
ATL::CComPtr<ASCOfficeOdfFile::IASCOfficeFileTemplate> officeOdfFile;
HRESULT hr;
HR_RET(officeOdfFile.CoCreateInstance(__uuidof(AVSOfficeOdfFile::COfficeOdfFile)));
HR_RET(officeOdfFile.CoCreateInstance(__uuidof(ASCOfficeOdfFile::COfficeOdfFile)));
boost::timer t1;
......
ASCOfficeODFFile/examples/ASCOfficeOdfFileTest/stdafx.cpp
View file @ cf611906
// stdafx.cpp : source file that includes just the standard includes
// AVSOfficeOdfFileTest.pch will be the pre-compiled header
// ASCOfficeOdfFileTest.pch will be the pre-compiled header
// stdafx.obj will contain the pre-compiled type information
#include "stdafx.h"
......
ASCOfficeODFFile/include/cpdoccore/xml/sax.h
View file @ cf611906
/// \brief Simple API XML
/// \author pogorskiy@gmail.com (@avsmedia.net)
#ifndef _CPDOCCORE_XML_SAX_H_
#define _CPDOCCORE_XML_SAX_H_
......
ASCOfficeODFFile/include/cpdoccore/xml/simple_xml_writer.h
View file @ cf611906
/*
Copyright (C) 2010, Ferruccio Barletta (ferruccio.barletta@gmail.com)
modified nikolay.pogorskiy@avsmedia.net (@gmail.com)
*/
......
ASCOfficeODFFile/src/docx/measuredigits.cpp
View file @ cf611906
......@@ -6,7 +6,7 @@
#include <atlbase.h>
#include <boost/lexical_cast.hpp>
#include <logging.h>
#import "libid:AB5F2678-2773-44c4-A637-33DFBC51233B" rename_namespace("AVSGraphics")
#import "../../../Redist/ASCGraphics.dll" rename_namespace("ASCGraphics")
namespace cpdoccore {
namespace utils {
......@@ -20,12 +20,12 @@ namespace
std::pair<float,float> GetMaxDigitSizePixelsImpl(const wchar_t * fontName, float fontSize, float dpi, long fontStyle)
{
ATL::CComPtr<AVSGraphics::IAVSFontManager> fontMan;
ATL::CComPtr<ASCGraphics::IASCFontManager> fontMan;
HRESULT hr;
try
{
if (FAILED(hr = fontMan.CoCreateInstance(__uuidof(AVSGraphics::CAVSFontManager))))
if (FAILED(hr = fontMan.CoCreateInstance(__uuidof(ASCGraphics::CASCFontManager))))
throw;
if (S_OK != (hr = fontMan->Initialize(L"")))
......
ASCOfficeODFFile/src/xml/sax.cpp
View file @ cf611906
/// \author pogorskiy@gmail.com (@avsmedia.net)
#include "precompiled_cpxml.h"
......
ASCOfficeODFFile/src/xml/sax_win32_xmllite.cpp
View file @ cf611906
/// \file sax_win32_xmllite.cpp
/// \brief SAX XmlLite
/// \author pogorskiy@gmail.com (@avsmedia.net)
#include "precompiled_cpxml.h"
......
ASCOfficeODFFile/src/xml/sax_win32_xmllite.h
View file @ cf611906
/// \file sax_win32_xmllite.h
/// \brief SAX XmlLite
/// \author pogorskiy@gmail.com (@avsmedia.net)
#ifndef _CPDOCCORE_XML_SAX_WIN32_XMLLITE_H_
#define _CPDOCCORE_XML_SAX_WIN32_XMLLITE_H_
......
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