From 424f586be43216c7da41aba92ebc7d4022cd4a10 Mon Sep 17 00:00:00 2001 From: "Elen.Subbotina" Date: Sat, 22 Feb 2014 09:03:01 +0000 Subject: [PATCH] =?UTF-8?q?(1.0.1.111):=20ASCOfficeOdtFile=20=D1=81=D0=BE?= =?UTF-8?q?=D0=B1=D1=80=D0=B0=D0=BD=20=D1=81=20=D0=BD=D0=BE=D0=B2=D1=8B?= =?UTF-8?q?=D0=BC=20=D1=88=D0=B0=D0=B1=D0=BB=D0=BE=D0=BD=D0=BE=D0=BC=20(?= =?UTF-8?q?=D0=B2=D1=8B=D1=82=D0=B5=D1=80=D1=82=20=D1=80=D1=83=D1=81=D1=81?= =?UTF-8?q?=D0=BA=D0=B8=D0=B9,=20=D1=83=D0=B1=D1=80=D0=B0=D0=BD=20=D0=B1?= =?UTF-8?q?=D0=B0=D0=BB=D0=B0=D1=81=D1=82,=20=D0=B2=D1=81=D1=82=D0=B0?= =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=D1=8B=20=D0=BC=D0=B5=D1=82=D0=BA=D0=B8?= =?UTF-8?q?=20TeamLab)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@54578 954022d7-b5bf-4e40-9824-e11837661b57 --- ASCOfficeOdtFile/ASCOfficeOdtFile.rc | 2 +- ASCOfficeOdtFile/OdtFile.cpp | 2 +- ASCOfficeOdtFile/Resource/OdtTemplate.odt | Bin 4081 -> 4020 bytes ASCOfficeOdtFile/version.h | 6 +++--- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ASCOfficeOdtFile/ASCOfficeOdtFile.rc b/ASCOfficeOdtFile/ASCOfficeOdtFile.rc index 89d86118bb..9bc67947ad 100644 --- a/ASCOfficeOdtFile/ASCOfficeOdtFile.rc +++ b/ASCOfficeOdtFile/ASCOfficeOdtFile.rc @@ -11,7 +11,7 @@ // Generated from the TEXTINCLUDE 2 resource. // #include "winres.h" - + ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS diff --git a/ASCOfficeOdtFile/OdtFile.cpp b/ASCOfficeOdtFile/OdtFile.cpp index 7bd30bda75..14b9d43b95 100644 --- a/ASCOfficeOdtFile/OdtFile.cpp +++ b/ASCOfficeOdtFile/OdtFile.cpp @@ -256,7 +256,7 @@ void COdtFile::createOriginOdt(const boost::filesystem::wpath& path) const const unsigned long COdtFile::LoadFromResource(LPCWSTR lpResName, LPCWSTR lpResType, LPCWSTR fileName) const { - HMODULE hMod = GetModuleHandle(_T("ASCOfficeOdtFile.dll")); + HMODULE hMod = _AtlBaseModule.GetModuleInstance(); if (hMod) { HRSRC hRes = FindResource(hMod, lpResName, lpResType); diff --git a/ASCOfficeOdtFile/Resource/OdtTemplate.odt b/ASCOfficeOdtFile/Resource/OdtTemplate.odt index 04761a877eacaa0331a9d3e0c0c3010528893634..96f51b8242d37357286fe443579554c0518202c9 100644 GIT binary patch delta 2366 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 E08jd3KL7v# diff --git a/ASCOfficeOdtFile/version.h b/ASCOfficeOdtFile/version.h index 847492f4b9..6b13c551b0 100644 --- a/ASCOfficeOdtFile/version.h +++ b/ASCOfficeOdtFile/version.h @@ -2,6 +2,6 @@ //1 //0 //1 -//110 -#define INTVER 1,0,1,110 -#define STRVER "1,0,1,110\0" +//112 +#define INTVER 1,0,1,112 +#define STRVER "1,0,1,112\0"