diff --git a/src/main/java/writer2latex/xhtml/style/FrameStyleParser.java b/src/main/java/writer2latex/xhtml/style/FrameStyleParser.java
index 80772b5..00ab630 100644
--- a/src/main/java/writer2latex/xhtml/style/FrameStyleParser.java
+++ b/src/main/java/writer2latex/xhtml/style/FrameStyleParser.java
@@ -62,39 +62,45 @@ public class FrameStyleParser extends StyleWithPropertiesParser {
      *  @param sIndent a String of spaces to add before each line
      */
   	public String composeStyleDeclarations() {
-  		if (bConvertStyles) {
-  			StringBuilder buf = new StringBuilder();
-  			buf.append(super.composeStyleDeclarations());
-  			Enumeration<String> names = styleNames.keys();
-  			while (names.hasMoreElements()) {
-  				String sDisplayName = names.nextElement();
-  				StyleWithProperties style = (StyleWithProperties) getStyles().getStyleByDisplayName(sDisplayName);
-  				if (!style.isAutomatic()) {
-  					// Apply style to paragraphs contained in this frame
-  					CSVList props = new CSVList(";");
-  					getFrameSc().cssMargins(style, props, true);
-  					getParSc().cssPar(style, props, true);
-  					getTextSc().cssTextCommon(style, props, true);
-  					if (!props.isEmpty()) {
-  						buf.append(indent);
-  						buf.append(getStyleTag());
-  						buf.append(".");
-  						buf.append(getClassNamePrefix());
-  						styleNames.addName(sDisplayName);
-  						buf.append(styleNames.getName(sDisplayName));
-  						buf.append(" p {");
-  						buf.append(props.toString());
-  						buf.append("}");
-  						buf.append(config.prettyPrint() ? "\n" : " ");
-  					}
-  				}
-  			}
-  			return buf.toString();
-  		} else {
+  		if (!bConvertStyles) {
   			return "";
   		}
+  		StringBuilder buf = new StringBuilder();
+  		buf.append(super.composeStyleDeclarations());
+  		Enumeration<String> names = styleNames.keys();
+  		while (names.hasMoreElements()) {
+  			String displayName = names.nextElement();
+  			buf.append(composeDeclaration(displayName));
+  		}
+  		return buf.toString();
+  
   	}
 
+		private String composeDeclaration(String displayName) {
+			String declaration = "";
+			StyleWithProperties style = (StyleWithProperties) getStyles().getStyleByDisplayName(displayName);
+			String declarationBlock = composeDeclarationBlock(displayName);
+			String selector = composeSelector(displayName);
+			if (!style.isAutomatic() && !selector.isEmpty() && !declarationBlock.isEmpty()) {
+				declaration = indent + selector + "{" + declarationBlock + "}" + (prettyPrint ? "\n" : " ");
+			}
+			return declaration;
+		}
+
+		private String composeSelector(String displayName) {
+			styleNames.addName(displayName);
+			return getStyleTag() + "." + getClassNamePrefix() + styleNames.getName(displayName) + " p ";
+		}
+
+		private String composeDeclarationBlock( String sDisplayName) {
+			StyleWithProperties style = (StyleWithProperties) getStyles().getStyleByDisplayName(sDisplayName);
+			CSVList props = new CSVList(";");
+			getFrameSc().cssMargins(style, props, true);
+			getParSc().cssPar(style, props, true);
+			getTextSc().cssTextCommon(style, props, true);	
+			return props.toString();
+		}
+
     /** Return a prefix to be used in generated css class names
      *  @return the prefix
      */
diff --git a/src/main/java/writer2latex/xhtml/style/PresentationStyleParser.java b/src/main/java/writer2latex/xhtml/style/PresentationStyleParser.java
index 77a3d78..8fb221c 100644
--- a/src/main/java/writer2latex/xhtml/style/PresentationStyleParser.java
+++ b/src/main/java/writer2latex/xhtml/style/PresentationStyleParser.java
@@ -94,30 +94,39 @@ public class PresentationStyleParser extends FrameStyleParser {
   		buf.append(super.composeStyleDeclarations());
   		Enumeration<String> names = outlineStyleNames.keys();
   		while (names.hasMoreElements()) {
-  			String sDisplayName = names.nextElement();
-  			StyleWithProperties style = (StyleWithProperties) getStyles().getStyleByDisplayName(sDisplayName);
-  			if (!style.isAutomatic()) {
-  				// Apply style to paragraphs within a list item with this class
-  				CSVList props = new CSVList(";");
-  				getFrameSc().cssMargins(style, props, true);
-  				getParSc().cssPar(style, props, true);
-  				getTextSc().cssTextCommon(style, props, true);
-  				if (!props.isEmpty()) {
-  					buf.append(indent);
-  					buf.append("li.outline");
-  					styleNames.addName(sDisplayName);
-  					buf.append(styleNames.getName(sDisplayName));
-  					buf.append(" p {");
-  					buf.append(props.toString());
-  					buf.append("}");
-  					buf.append(config.prettyPrint() ? "\n" : " ");
-  				}
-  			}
+  			String displayName = names.nextElement();
+  			buf.append(composeDeclaration(displayName));
   		}
   		return buf.toString();
   
   	}
 
+		private String composeDeclaration(String displayName) {
+			String declaration = "";
+			StyleWithProperties style = (StyleWithProperties) getStyles().getStyleByDisplayName(displayName);
+			String declarationBlock = composeDeclarationBlock(displayName);
+			String selector = composeSelector(displayName);;
+			if (!style.isAutomatic() && !selector.isEmpty() && !declarationBlock.isEmpty()) {
+				// Apply style to paragraphs within a list item with this class
+					declaration = indent + selector + "{" + declarationBlock + "}" + (prettyPrint ? "\n" : " ");
+			}
+			return declaration;
+		}
+
+		private String composeSelector(String displayName) {
+			styleNames.addName(displayName);
+			return "li.outline" + styleNames.getName(displayName) + " p ";
+		}
+
+		private String composeDeclarationBlock(String displayName) {
+			StyleWithProperties style = (StyleWithProperties) getStyles().getStyleByDisplayName(displayName);
+			CSVList props = new CSVList(";");
+			getFrameSc().cssMargins(style, props, true);
+			getParSc().cssPar(style, props, true);
+			getTextSc().cssTextCommon(style, props, true);
+			return props.toString();
+		}
+
 	
     public void enterOutline(String sStyleName) {
         sCurrentOutlineStyle = sStyleName;
diff --git a/src/main/java/writer2latex/xhtml/style/StyleWithPropertiesParser.java b/src/main/java/writer2latex/xhtml/style/StyleWithPropertiesParser.java
index 1446047..8ff8a2d 100644
--- a/src/main/java/writer2latex/xhtml/style/StyleWithPropertiesParser.java
+++ b/src/main/java/writer2latex/xhtml/style/StyleWithPropertiesParser.java
@@ -103,39 +103,32 @@ public abstract class StyleWithPropertiesParser extends StyleParser {
   		Enumeration<String> names = styleNames.keys();
   		while (names.hasMoreElements()) {
   			String sDisplayName = names.nextElement();
-  			buf.append(composeStyleDeclaration(sDisplayName));
+  			buf.append(composeDeclaration(sDisplayName));
   		}
   		return buf.toString();
   	}
 
-		private String composeStyleDeclaration( String displayName) {
-  		StringBuilder declaration = new StringBuilder();
+		private String composeDeclaration( String displayName) {
+  		String declaration = "";
 			StyleWithProperties style = (StyleWithProperties) getStyles().getStyleByDisplayName(displayName);
-			if (!style.isAutomatic()) {
-				
-				declaration.append(indent);
-				
-				declaration.append(selector(displayName));
-				
-				declaration.append(" {");
-				
-				declaration.append(declarations(displayName));
-				
-				declaration.append("}" + (prettyPrint ? "\n" : " "));
+			String selector = composeSelector(displayName);
+			String declarationBlock = composeDeclarationBlock(displayName);
+			if (!style.isAutomatic() && !selector.isEmpty() && !declarationBlock.isEmpty()) {
+				declaration = indent + selector + " {" + declarationBlock + "}" + (prettyPrint ? "\n" : " ");
 				// TODO: Create a method "getStyleDeclarationsInner"
 				// to be used by eg. FrameStyleConverter
 			}
 			return declaration.toString();
 		}
 
-		private String declarations(String displayName) {
+		private String composeDeclarationBlock(String displayName) {
 			StyleWithProperties style = (StyleWithProperties) getStyles().getStyleByDisplayName(displayName);
 			CSVList props = new CSVList(";");
 			applyProperties(style, props, true);
 			return props.toString();
 		}
 
-		private String selector(String displayName) {
+		private String composeSelector(String displayName) {
 			styleNames.addName(displayName);
 			return getStyleTag() + "." + getClassNamePrefix() + styleNames.getName(displayName);
 		}