Fixed SF1 bug 65190, reviewed by mjudge. Removed duplicate define accidentally introduced by branch merge in edprops.h. Approved by brade, don

cmd/winfe/edprops.cpp

@@ -5439,36 +5439,22 @@ void CParagraphPage::OnOK()
     	}
     }
 
-    //TODO: CHECK THIS -- WE MAY NOT WANT TO DO IT
-    // We don't want a container but had one before
-    if( m_pListData && m_iContainerStyle == ED_NO_CONTAINER ){
-        // TODO: SHOULD WE UNDO INDENT FOR LIST ITEMS ALSO?
-//        if ( iTagType == P_BLOCKQUOTE ) {
-            EDT_ListData * pListData;
-            // Repeat removing indent until last Unnumbered list is gone
-            while ( (pListData = EDT_GetListData(m_pMWContext)) ){
-                EDT_FreeListData(pListData);
-                EDT_Outdent(m_pMWContext);
-            }
-//        }
-    }
-
     // We should have been maintaining paragraph style
     //  to match container/list style, so this should work
     // But if "Don't change" style, NEVER set the container style
+    // NOTE: This will remove any list if new container format is not appropriate
     if( m_iParagraphStyle != m_iMixedStyle ){
         TagType NewFormat = FEED_nParagraphTags[m_iParagraphStyle];
         if( m_ParagraphFormat != NewFormat ){
             EDT_MorphContainer( m_pMWContext, NewFormat);
+            // Get the list data for the new list we might have created 
+            //   or if we destroyed the list by changing paragraph style
+            m_pListData = EDT_GetListData(m_pMWContext);
+            // Save the new format 
+            m_ParagraphFormat = NewFormat;
         }
     }
 
-    // We didn't already have a container but want one - create it
-    if( ! m_pListData && m_iContainerStyle != ED_NO_CONTAINER) {
-        EDT_Indent(m_pMWContext);
-        m_pListData = EDT_GetListData(m_pMWContext);
-    }
-
     // Set List type and attributes
     if ( m_pListData ) {
         // If no container, we Outdented above, so don't set data here

cmd/winfe/edprops.h

@@ -98,9 +98,7 @@ extern char * ed_pDontChange;
 // Optionally returns width of longest string found
 extern int wfe_FillFontComboBox(CComboBox * pCombo, int * pMaxWidth = NULL);
 
-// Total font sizes with Netscape extension -- SHOULD GET THIS FROM A COMMON H FILE!
-#define	  MAX_FONT_SIZE            7
-#define	  MIN_FONT_SIZE            7    // XXX I don't know where this is supposed to come from, but it's breaking my build.
+// Note: MIN_FONT_SIZE and MAX_FONT_SIZE are defined in lib\layout\layout.h (copyied to dist/public/lay)
 
 // We map {-2 ... +4} onto absolute sizes {1 ... 7}
 // This is minimum of scale