git-svn-id:...

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59064 954022d7-b5bf-4e40-9824-e11837661b57

ASCOfficePPTXFile/PPTXFormat/NotesMaster.h

@@ -84,12 +84,12 @@ namespace PPTX
 
 		void ApplyRels()
 		{
-			Theme = (FileContainer::get(PPTX::FileTypes::ThemePPTX)).smart_dynamic_cast<PPTX::Theme>();
+            theme_= (FileContainer::get(PPTX::FileTypes::ThemePPTX)).smart_dynamic_cast<PPTX::Theme>();
 
-			if (Theme.IsInit())
-				Theme->SetColorMap(clrMap);
+            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
@@ -166,7 +166,7 @@ namespace PPTX
 		}
 
 	public:
-		smart_ptr<Theme>			Theme;
+        smart_ptr<Theme>			theme_;
 		smart_ptr<TableStyles>		tableStyles_;
 
 		Logic::CSld						cSld;
@@ -176,4 +176,4 @@ namespace PPTX
 	};
 } // namespace PPTX
 
-#endif // PPTX_SLIDES_NOTESMASTER_INCLUDE_H_
\ No newline at end of file
+#endif // PPTX_SLIDES_NOTESMASTER_INCLUDE_H_