Skip to content

O
onlyoffice_core
Commit d9c2d9da 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@59044 954022d7-b5bf-4e40-9824-e11837661b57
parent 25b29d30
Hide whitespace changes
Inline Side-by-side
Showing with 90 additions and 43 deletions
ASCOfficePPTXFile/Editor/Converter.h
View file @ d9c2d9da
......@@ -46,13 +46,13 @@ namespace PPTX2EditorAdvanced
_slideMasters.push_back(slideMaster);
// theme
size_t pPointerTh = (size_t)(slideMaster->Theme.operator ->());
size_t pPointerTh = (size_t)(slideMaster->theme.operator ->());
std::map<size_t, LONG>::const_iterator pSearchTh = pCommon->themes.find (pPointerTh);
if (pSearchTh == pCommon->themes.end())
{
LONG lCountTh = (LONG)_themes.size();
pCommon->themes [pPointerTh] = lCountTh;
_themes.push_back(slideMaster->Theme);
_themes.push_back(slideMaster->theme);
oMasterInfo.m_lThemeIndex = lCountTh;
}
else
......
ASCOfficePPTXFile/PPTXFormat/Folder.cpp
View file @ d9c2d9da
......@@ -51,7 +51,7 @@ namespace PPTX
{
smart_ptr<PPTX::Theme> pTheme = pPair->second.smart_dynamic_cast<PPTX::Theme>();
if (pTheme.IsInit())
pTheme->Presentation = _presentation;
pTheme->presentation = _presentation;
}
}
......
ASCOfficePPTXFile/PPTXFormat/Logic/Bg.cpp
View file @ d9c2d9da
......@@ -73,11 +73,11 @@ namespace PPTX
{
ARGB = bgRef->Color.GetARGB();
if(parentFileIs<Slide>())
parentFileAs<Slide>().Theme->themeElements.fmtScheme.GetFillStyle(bgRef->idx.get_value_or(0), bg.Fill);
parentFileAs<Slide>().theme->themeElements.fmtScheme.GetFillStyle(bgRef->idx.get_value_or(0), bg.Fill);
else if(parentFileIs<SlideLayout>())
parentFileAs<SlideLayout>().Theme->themeElements.fmtScheme.GetFillStyle(bgRef->idx.get_value_or(0), bg.Fill);
parentFileAs<SlideLayout>().theme->themeElements.fmtScheme.GetFillStyle(bgRef->idx.get_value_or(0), bg.Fill);
else if(parentFileIs<SlideMaster>())
parentFileAs<SlideMaster>().Theme->themeElements.fmtScheme.GetFillStyle(bgRef->idx.get_value_or(0), bg.Fill);
parentFileAs<SlideMaster>().theme->themeElements.fmtScheme.GetFillStyle(bgRef->idx.get_value_or(0), bg.Fill);
}
}
......
ASCOfficePPTXFile/PPTXFormat/Logic/CxnSp.cpp
View file @ d9c2d9da
......@@ -99,11 +99,11 @@ namespace PPTX
if(style.is_init())
{
if(parentFileIs<PPTX::Slide>())
parentFileAs<PPTX::Slide>().Theme->GetLineStyle(style->lnRef.idx.get_value_or(0), line);
parentFileAs<PPTX::Slide>().theme->GetLineStyle(style->lnRef.idx.get_value_or(0), line);
else if(parentFileIs<PPTX::SlideLayout>())
parentFileAs<PPTX::SlideLayout>().Theme->GetLineStyle(style->lnRef.idx.get_value_or(0), line);
parentFileAs<PPTX::SlideLayout>().theme->GetLineStyle(style->lnRef.idx.get_value_or(0), line);
else if(parentFileIs<PPTX::SlideMaster>())
parentFileAs<PPTX::SlideMaster>().Theme->GetLineStyle(style->lnRef.idx.get_value_or(0), line);
parentFileAs<PPTX::SlideMaster>().theme->GetLineStyle(style->lnRef.idx.get_value_or(0), line);
BGRA = style->lnRef.Color.GetBGRA();
}
......@@ -121,11 +121,11 @@ namespace PPTX
if (style.IsInit())
{
if(parentFileIs<PPTX::Slide>())
parentFileAs<PPTX::Slide>().Theme->GetFillStyle(style->fillRef.idx.get_value_or(0), fill);
parentFileAs<PPTX::Slide>().theme->GetFillStyle(style->fillRef.idx.get_value_or(0), fill);
else if(parentFileIs<PPTX::SlideLayout>())
parentFileAs<PPTX::SlideLayout>().Theme->GetFillStyle(style->fillRef.idx.get_value_or(0), fill);
parentFileAs<PPTX::SlideLayout>().theme->GetFillStyle(style->fillRef.idx.get_value_or(0), fill);
else if(parentFileIs<PPTX::SlideMaster>())
parentFileAs<PPTX::SlideMaster>().Theme->GetFillStyle(style->fillRef.idx.get_value_or(0), fill);
parentFileAs<PPTX::SlideMaster>().theme->GetFillStyle(style->fillRef.idx.get_value_or(0), fill);
BGRA = style->fillRef.Color.GetBGRA();
}
......
ASCOfficePPTXFile/PPTXFormat/Logic/Pic.cpp
View file @ d9c2d9da
......@@ -186,11 +186,11 @@ namespace PPTX
if (style.IsInit())
{
if (parentFileIs<PPTX::Slide>())
parentFileAs<PPTX::Slide>().Theme->GetFillStyle(style->fillRef.idx.get_value_or(0), fill);
parentFileAs<PPTX::Slide>().theme->GetFillStyle(style->fillRef.idx.get_value_or(0), fill);
else if (parentFileIs<PPTX::SlideLayout>())
parentFileAs<PPTX::SlideLayout>().Theme->GetFillStyle(style->fillRef.idx.get_value_or(0), fill);
parentFileAs<PPTX::SlideLayout>().theme->GetFillStyle(style->fillRef.idx.get_value_or(0), fill);
else if (parentFileIs<PPTX::SlideMaster>())
parentFileAs<PPTX::SlideMaster>().Theme->GetFillStyle(style->fillRef.idx.get_value_or(0), fill);
parentFileAs<PPTX::SlideMaster>().theme->GetFillStyle(style->fillRef.idx.get_value_or(0), fill);
BGRA = style->fillRef.Color.GetBGRA();
}
......@@ -208,11 +208,11 @@ namespace PPTX
if (style.is_init())
{
if (parentFileIs<PPTX::Slide>())
parentFileAs<PPTX::Slide>().Theme->GetLineStyle(style->lnRef.idx.get_value_or(0), line);
parentFileAs<PPTX::Slide>().theme->GetLineStyle(style->lnRef.idx.get_value_or(0), line);
else if (parentFileIs<PPTX::SlideLayout>())
parentFileAs<PPTX::SlideLayout>().Theme->GetLineStyle(style->lnRef.idx.get_value_or(0), line);
parentFileAs<PPTX::SlideLayout>().theme->GetLineStyle(style->lnRef.idx.get_value_or(0), line);
else if (parentFileIs<PPTX::SlideMaster>())
parentFileAs<PPTX::SlideMaster>().Theme->GetLineStyle(style->lnRef.idx.get_value_or(0), line);
parentFileAs<PPTX::SlideMaster>().theme->GetLineStyle(style->lnRef.idx.get_value_or(0), line);
BGRA = style->lnRef.Color.GetBGRA();
}
......
ASCOfficePPTXFile/PPTXFormat/Logic/Shape.cpp
View file @ d9c2d9da
......@@ -238,11 +238,11 @@ namespace PPTX
if(style.IsInit())
{
if(parentFileIs<PPTX::Slide>())
parentFileAs<PPTX::Slide>().Theme->GetFillStyle(style->fillRef.idx.get_value_or(0), fill);
parentFileAs<PPTX::Slide>().theme->GetFillStyle(style->fillRef.idx.get_value_or(0), fill);
else if(parentFileIs<PPTX::SlideLayout>())
parentFileAs<PPTX::SlideLayout>().Theme->GetFillStyle(style->fillRef.idx.get_value_or(0), fill);
parentFileAs<PPTX::SlideLayout>().theme->GetFillStyle(style->fillRef.idx.get_value_or(0), fill);
else if(parentFileIs<PPTX::SlideMaster>())
parentFileAs<PPTX::SlideMaster>().Theme->GetFillStyle(style->fillRef.idx.get_value_or(0), fill);
parentFileAs<PPTX::SlideMaster>().theme->GetFillStyle(style->fillRef.idx.get_value_or(0), fill);
if (style->fillRef.Color.is_init())
{
......@@ -281,11 +281,11 @@ namespace PPTX
if(style.IsInit())
{
if(parentFileIs<PPTX::Slide>())
parentFileAs<PPTX::Slide>().Theme->GetLineStyle(style->lnRef.idx.get_value_or(0), line);
parentFileAs<PPTX::Slide>().theme->GetLineStyle(style->lnRef.idx.get_value_or(0), line);
else if(parentFileIs<PPTX::SlideLayout>())
parentFileAs<PPTX::SlideLayout>().Theme->GetLineStyle(style->lnRef.idx.get_value_or(0), line);
parentFileAs<PPTX::SlideLayout>().theme->GetLineStyle(style->lnRef.idx.get_value_or(0), line);
else if(parentFileIs<PPTX::SlideMaster>())
parentFileAs<PPTX::SlideMaster>().Theme->GetLineStyle(style->lnRef.idx.get_value_or(0), line);
parentFileAs<PPTX::SlideMaster>().theme->GetLineStyle(style->lnRef.idx.get_value_or(0), line);
BGRA = style->lnRef.Color.GetBGRA();
}
......
ASCOfficePPTXFile/PPTXFormat/NotesMaster.h
View file @ d9c2d9da
......@@ -89,7 +89,7 @@ namespace PPTX
if (Theme.IsInit())
Theme->SetColorMap(clrMap);
TableStyles = (Theme->Presentation->get(PPTX::FileTypes::TableStyles)).smart_dynamic_cast<PPTX::TableStyles>();
TableStyles = (Theme->presentation->get(PPTX::FileTypes::TableStyles)).smart_dynamic_cast<PPTX::TableStyles>();
}
virtual void toPPTY(NSBinPptxRW::CBinaryFileWriter* pWriter) const
......
ASCOfficePPTXFile/PPTXFormat/Slide.h
View file @ d9c2d9da
......@@ -155,7 +155,7 @@ namespace PPTX
else if(cSld->bg->bgRef.is_init())
{
ARGB = cSld->bg->bgRef->Color.GetARGB();
Theme->themeElements.fmtScheme.GetFillStyle(cSld->bg->bgRef->idx.get_value_or(0), bg.Fill);
theme->themeElements.fmtScheme.GetFillStyle(cSld->bg->bgRef->idx.get_value_or(0), bg.Fill);
}
return true;
}
......@@ -355,7 +355,7 @@ namespace PPTX
smart_ptr<SlideLayout> Layout;
smart_ptr<SlideMaster> Master;
smart_ptr<NotesSlide> Note;
smart_ptr<Theme> Theme;
smart_ptr<Theme> theme;
smart_ptr<VmlDrawing> Vml;
smart_ptr<TableStyles> TableStyles;
......@@ -368,9 +368,9 @@ namespace PPTX
Note = FileContainer::get(PPTX::FileTypes::NotesSlide).smart_dynamic_cast<PPTX::NotesSlide>();
comments = FileContainer::get(PPTX::FileTypes::SlideComments).smart_dynamic_cast<PPTX::Comments>();
Master = Layout->Master;
Theme = Layout->Theme;
theme = Layout->theme;
TableStyles = Theme->Presentation->get(PPTX::FileTypes::TableStyles).smart_dynamic_cast<PPTX::TableStyles>();//boost::shared_dynamic_cast<PPTX::TableStyles, PPTX::File>(Theme->Presentation->get(PPTX::FileTypes::TableStyles));
TableStyles = theme->presentation->get(PPTX::FileTypes::TableStyles).smart_dynamic_cast<PPTX::TableStyles>();//boost::shared_dynamic_cast<PPTX::TableStyles, PPTX::File>(Theme->Presentation->get(PPTX::FileTypes::TableStyles));
if (exist(PPTX::FileTypes::VmlDrawing))
{
......
ASCOfficePPTXFile/PPTXFormat/SlideLayout.h
View file @ d9c2d9da
......@@ -206,7 +206,7 @@ namespace PPTX
else if(cSld.bg->bgRef.is_init())
{
ARGB = cSld.bg->bgRef->Color.GetARGB();
Theme->themeElements.fmtScheme.GetFillStyle(cSld.bg->bgRef->idx.get_value_or(0), bg.Fill);
theme->themeElements.fmtScheme.GetFillStyle(cSld.bg->bgRef->idx.get_value_or(0), bg.Fill);
//bg.SetParentFilePointer(this);
}
}
......@@ -419,7 +419,7 @@ namespace PPTX
nullable_bool userDrawn;
smart_ptr<SlideMaster> Master;
smart_ptr<Theme> Theme;
smart_ptr<Theme> theme;
smart_ptr<TableStyles> TableStyles;
smart_ptr<VmlDrawing> Vml;
......@@ -431,11 +431,11 @@ namespace PPTX
Master = pFile.smart_dynamic_cast<PPTX::SlideMaster>();
if (Master.IsInit())
Theme = Master->Theme;
theme = Master->theme;
if (Theme.IsInit())
if (theme.IsInit())
{
TableStyles = Theme->presentation->get(PPTX::FileTypes::TableStyles).smart_dynamic_cast<PPTX::TableStyles>();
TableStyles = theme->presentation->get(PPTX::FileTypes::TableStyles).smart_dynamic_cast<PPTX::TableStyles>();
}
}
const OOX::CPath GetPathBySpid(const CString& spid)const
......
ASCOfficePPTXFile/PPTXFormat/SlideMaster.h
View file @ d9c2d9da
......@@ -189,9 +189,9 @@ namespace PPTX
}
void FillShapeProperties(Logic::ShapeProperties& props, const CString& type)const
{
if((theme.IsInit()) && (theme->Presentation.IsInit()))
if((theme.IsInit()) && (theme->presentation.IsInit()))
{
PPTX::Presentation* pPres = const_cast<PPTX::Presentation*>(theme->Presentation.operator->());
PPTX::Presentation* pPres = const_cast<PPTX::Presentation*>(theme->presentation.operator->());
pPres->SetClrMap(clrMap);
pPres->SetClrScheme(theme->themeElements.clrScheme);
......@@ -243,9 +243,9 @@ namespace PPTX
}
void FillShapeTextProperties(Logic::CShapeTextProperties& props, const CString& type)const
{
if((theme.IsInit()) && (theme->Presentation.IsInit()))
if((theme.IsInit()) && (theme->presentation.IsInit()))
{
PPTX::Presentation* pPres = const_cast<PPTX::Presentation*>(theme->Presentation.operator->());
PPTX::Presentation* pPres = const_cast<PPTX::Presentation*>(theme->presentation.operator->());
pPres->SetClrMap(clrMap);
pPres->SetClrScheme(theme->themeElements.clrScheme);
......@@ -457,7 +457,7 @@ namespace PPTX
public:
Logic::CSld cSld;
Logic::ClrMap clrMap;
std::vector<Logic::XmlId> sldLayoutIdLst;
std::vector<Logic::XmlId> sldLayoutIdLst;
nullable<Logic::Transition> transition;
nullable<Logic::Timing> timing;
nullable<Logic::HF> hf;
......@@ -476,7 +476,7 @@ namespace PPTX
if (theme.IsInit())
theme->SetColorMap(clrMap);
//Theme->Master.reset((PPTX::WrapperFile*)this);
tableStyles = (theme->Presentation->get(PPTX::FileTypes::TableStyles)).smart_dynamic_cast<PPTX::TableStyles>();
tableStyles = (theme->presentation->get(PPTX::FileTypes::TableStyles)).smart_dynamic_cast<PPTX::TableStyles>();
}
const OOX::CPath GetPathBySpid(const CString& spid)const
{
......
ASCOfficePPTXFile/PPTXLib/Linux/PPTXFormatLib/linux_gdiplus.h
View file @ d9c2d9da
......@@ -196,4 +196,51 @@ public:
REAL Height;
};
class CPoint : public tagPOINT
{
public:
// Constructors
// create an uninitialized point
CPoint() throw();
// create from two integers
CPoint(int initX, int initY) throw();
// create from another point
CPoint(POINT initPt) throw();
// create from a size
CPoint(SIZE initSize) throw();
// create from an LPARAM: x = LOWORD(dw) y = HIWORD(dw)
CPoint(LPARAM dwPoint) throw();
// Operations
// translate the point
void Offset(int xOffset, int yOffset) throw();
void Offset(POINT point) throw();
void Offset(SIZE size) throw();
void SetPoint(int X, int Y) throw();
BOOL operator==(POINT point) const throw();
BOOL operator!=(POINT point) const throw();
void operator+=(SIZE size) throw();
void operator-=(SIZE size) throw();
void operator+=(POINT point) throw();
void operator-=(POINT point) throw();
// Operators returning CPoint values
CPoint operator+(SIZE size) const throw();
CPoint operator-(SIZE size) const throw();
CPoint operator-() const throw();
CPoint operator+(POINT point) const throw();
// Operators returning CSize values
CSize operator-(POINT point) const throw();
// Operators returning CRect values
CRect operator+(const RECT* lpRect) const throw();
CRect operator-(const RECT* lpRect) const throw();
};
}
\ No newline at end of file
ASCOfficePPTXFile/version.h
View file @ d9c2d9da
......@@ -2,6 +2,6 @@
//1
//0
//0
//322
#define INTVER 1,0,0,322
#define STRVER "1,0,0,322\0"
//324
#define INTVER 1,0,0,324
#define STRVER "1,0,0,324\0"
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