This commit is contained in:
Kamil Kerimov
2023-11-02 14:45:11 +05:00
parent cbadfac9dd
commit 7b65e3d24c
3 changed files with 8 additions and 8 deletions

View File

@ -42,10 +42,10 @@
#include "Writer/Converter/PptxConverter.h"
#include "Writer/Format/office_elements.h"
boost::shared_ptr<cpdoccore::oox::pptx_conversion_context> ODP2OOX_AnimationEtranceEnvironment::sConverionContext;
boost::shared_ptr<cpdoccore::odf_reader::odf_document> ODP2OOX_AnimationEtranceEnvironment::sInputOdf;
boost::shared_ptr<cpdoccore::oox::pptx_conversion_context> ODP2OOX_AnimationEntranceEnvironment::sConverionContext;
boost::shared_ptr<cpdoccore::odf_reader::odf_document> ODP2OOX_AnimationEntranceEnvironment::sInputOdf;
ODP2OOX_AnimationEtranceEnvironment::ODP2OOX_AnimationEtranceEnvironment()
ODP2OOX_AnimationEntranceEnvironment::ODP2OOX_AnimationEntranceEnvironment()
: ODP2OOX_AnimationEnvironment(
L"ExampleFiles" FILE_SEPARATOR_STR "entrance.odp",
&sInputOdf,
@ -54,14 +54,14 @@ ODP2OOX_AnimationEtranceEnvironment::ODP2OOX_AnimationEtranceEnvironment()
}
const cpdoccore::oox::pptx_animation_context& ODP2OOX_AnimationEtranceEnvironment::GetAnimationContext()
const cpdoccore::oox::pptx_animation_context& ODP2OOX_AnimationEntranceEnvironment::GetAnimationContext()
{
return sConverionContext->get_slide_context().get_animation_context();
}
void ODP2OOX_EntranceAnimationTest::SetUp()
{
mAnimationContext = &ODP2OOX_AnimationEtranceEnvironment::GetAnimationContext();
mAnimationContext = &ODP2OOX_AnimationEntranceEnvironment::GetAnimationContext();
}
const cpdoccore::oox::pptx_animation_context::Impl::_par_animation_ptr& ODP2OOX_EntranceAnimationTest::GetInnerPar(const cpdoccore::oox::pptx_animation_context::Impl::_par_animation_ptr& par)

View File

@ -43,10 +43,10 @@
#include "Writer/Format/anim_elements.h"
#include "Writer/Format/draw_page.h"
class ODP2OOX_AnimationEtranceEnvironment : public ODP2OOX_AnimationEnvironment
class ODP2OOX_AnimationEntranceEnvironment : public ODP2OOX_AnimationEnvironment
{
public:
ODP2OOX_AnimationEtranceEnvironment();
ODP2OOX_AnimationEntranceEnvironment();
static const cpdoccore::oox::pptx_animation_context& GetAnimationContext();

View File

@ -41,7 +41,7 @@ int main(int argc, char* argv[])
{
::testing::InitGoogleTest(&argc, argv);
::testing::AddGlobalTestEnvironment(new ODP2OOX_AnimationEtranceEnvironment);
::testing::AddGlobalTestEnvironment(new ODP2OOX_AnimationEntranceEnvironment);
::testing::AddGlobalTestEnvironment(new ODP2OOX_AnimationMotionEnvironment);
::testing::AddGlobalTestEnvironment(new ODP2OOX_AnimationAudioEnvironment);