correct compile text styles in notes shape

a9da0021 · SergeyLuzyanin · 6dd1dff3 · a9da0021
Commit a9da0021 authored Jul 24, 2017 by SergeyLuzyanin
Hide whitespace changes
Inline Side-by-side

Showing with 28 additions and 23 deletions

common/Drawings/Format/Shape.js common/Drawings/Format/Shape.js +28 -23

No files found.
--- a/common/Drawings/Format/Shape.js
+++ b/common/Drawings/Format/Shape.js
@@ -2386,31 +2386,36 @@ CShape.prototype.recalculateTextStyles = function (level) {
        if (isRealObject(parent_objects.master) && isRealObject(parent_objects.master.txStyles)) {
            var master_ppt_styles;
            master_style = new CStyle("masterStyle", null, null, null, true);
-            if (this.isPlaceholder()) {
+            if(parent_objects.master.kind === AscFormat.TYPE_KIND.NOTES_MASTER){
-                switch (this.getPlaceholderType()) {
+                master_ppt_styles = parent_objects.master.txStyles;
-                    case AscFormat.phType_ctrTitle:
+            }
-                    case AscFormat.phType_title:
+            else{
-                    {
+                if (this.isPlaceholder()) {
-                        master_ppt_styles = parent_objects.master.txStyles.titleStyle;
+                    switch (this.getPlaceholderType()) {
-                        break;
+                        case AscFormat.phType_ctrTitle:
-                    }
+                        case AscFormat.phType_title:
-                    case AscFormat.phType_body:
+                        {
-                    case AscFormat.phType_subTitle:
+                            master_ppt_styles = parent_objects.master.txStyles.titleStyle;
-                    case AscFormat.phType_obj:
+                            break;
-                    case null:
+                        }
-                    {
+                        case AscFormat.phType_body:
-                        master_ppt_styles = parent_objects.master.txStyles.bodyStyle;
+                        case AscFormat.phType_subTitle:
-                        break;
+                        case AscFormat.phType_obj:
-                    }
+                        case null:
-                    default:
+                        {
-                    {
+                            master_ppt_styles = parent_objects.master.txStyles.bodyStyle;
-                        master_ppt_styles = parent_objects.master.txStyles.otherStyle;
+                            break;
-                        break;
+                        }
+                        default:
+                        {
+                            master_ppt_styles = parent_objects.master.txStyles.otherStyle;
+                            break;
+                        }
                    }
                }
-            }
+                else {
-            else {
+                    master_ppt_styles = parent_objects.master.txStyles.otherStyle;
-                master_ppt_styles = parent_objects.master.txStyles.otherStyle;
+                }
            }
            if (isRealObject(master_ppt_styles) && isRealObject(master_ppt_styles.levels) && isRealObject(master_ppt_styles.levels[level])) {