[PATCH 4/4] Spelling mistakes and code removal

Wol anthony at youngman.org.uk
Wed Nov 10 04:51:50 PST 2010


---
 dbaccess/source/filter/xml/xmlExport.cxx |    8 ++------
 dbaccess/source/filter/xml/xmlHelper.cxx |   28 ----------------------------
 dbaccess/source/filter/xml/xmlfilter.cxx |    4 ++--
 3 files changed, 4 insertions(+), 36 deletions(-)

diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx
index b299a6a..a9cf210 100644
--- a/dbaccess/source/filter/xml/xmlExport.cxx
+++ b/dbaccess/source/filter/xml/xmlExport.cxx
@@ -241,10 +241,6 @@ ODBExport::ODBExport(const Reference< XMultiServiceFactory >& _rxMSF,sal_uInt16
     m_xExportHelper = new SvXMLExportPropertyMapper(GetTableStylesPropertySetMapper());
     m_xColumnExportHelper = new OSpecialHanldeXMLExportPropertyMapper(GetColumnStylesPropertySetMapper());
 
-    //UniReference < XMLPropertySetMapper > xCellStylesPropertySetMapper = new XMLPropertySetMapper(OXMLHelper::GetCellStylesPropertySetMapper(),m_xPropHdlFactory);
-    //m_xCellExportHelper = new OSpecialHanldeXMLExportPropertyMapper(xCellStylesPropertySetMapper);
-    //m_xCellExportHelper = new OSpecialHanldeXMLExportPropertyMapper(GetCellStylesPropertySetMapper());
-    //m_xCellExportHelper->ChainExportMapper(XMLTextParagraphExport::CreateParaExtPropMapper(*this));
     m_xCellExportHelper = new OSpecialHanldeXMLExportPropertyMapper(GetCellStylesPropertySetMapper());
     m_xRowExportHelper = new OSpecialHanldeXMLExportPropertyMapper(OXMLHelper::GetRowStylesPropertySetMapper());
 
@@ -1234,9 +1230,9 @@ void ODBExport::exportAutoStyle(XPropertySet* _xProp)
                         }
                     }
                     ++aItr;
-                } // while ( aItr != aEnd )
+                }
 
-            } // if ( !aPropStates.empty() )
+            }
             if ( XML_STYLE_FAMILY_TABLE_CELL == pExportHelper[i].second.second )
                 ::std::copy( m_aCurrentPropertyStates.begin(), m_aCurrentPropertyStates.end(), ::std::back_inserter( aPropStates ));
             if ( !aPropStates.empty() )
diff --git a/dbaccess/source/filter/xml/xmlHelper.cxx b/dbaccess/source/filter/xml/xmlHelper.cxx
index b5fa3c9..bc11046 100644
--- a/dbaccess/source/filter/xml/xmlHelper.cxx
+++ b/dbaccess/source/filter/xml/xmlHelper.cxx
@@ -91,34 +91,6 @@ UniReference < XMLPropertySetMapper > OXMLHelper::GetTableStylesPropertySetMappe
 {
     static const XMLPropertyMapEntry s_aTableStylesProperties[] =
     {
-        //MAP_CONST( PROPERTY_FONTNAME,			XML_NAMESPACE_STYLE,	XML_FONT_NAME,   			XML_TYPE_STRING, 0 ),
-        //MAP_CONST( PROPERTY_TEXTCOLOR,			XML_NAMESPACE_FO,		XML_COLOR,					XML_TYPE_COLOR, 0 ),
-        //MAP_CONST( PROPERTY_TEXTLINECOLOR,		XML_NAMESPACE_STYLE,	XML_TEXT_UNDERLINE_COLOR,	XML_TYPE_TEXT_UNDERLINE_COLOR|MID_FLAG_MULTI_PROPERTY, 0 ),
-
-        //MAP_CONST( PROPERTY_TEXTRELIEF,			XML_NAMESPACE_STYLE,	XML_FONT_RELIEF,			    XML_TYPE_TEXT_FONT_RELIEF|MID_FLAG_MULTI_PROPERTY, 0 ),
-        //MAP_CONST( PROPERTY_TEXTEMPHASIS,		XML_NAMESPACE_STYLE,	XML_TEXT_EMPHASIZE, 		    XML_TYPE_CONTROL_TEXT_EMPHASIZE, 0 ),
-        //MAP_CONST( PROPERTY_FONTCHARWIDTH,		XML_NAMESPACE_STYLE,	XML_FONT_CHAR_WIDTH,		    XML_TYPE_NUMBER16, 0 ),
-        //MAP_CONST( PROPERTY_FONTCHARSET,		XML_NAMESPACE_STYLE,	XML_FONT_CHARSET,			    XML_TYPE_TEXT_FONTENCODING, 0 ),
-        //MAP_CONST( PROPERTY_FONTFAMILY,			XML_NAMESPACE_STYLE,	XML_FONT_FAMILY_GENERIC,	    XML_TYPE_TEXT_FONTFAMILY, 0 ),
-        //MAP_CONST( PROPERTY_FONTHEIGHT,			XML_NAMESPACE_FO,		XML_FONT_SIZE,				    XML_TYPE_MEASURE16, 0 ),
-        //MAP_CONST( PROPERTY_FONTKERNING,		XML_NAMESPACE_STYLE,	XML_LETTER_KERNING, 		    XML_TYPE_BOOL, 0 ),
-        //
-        //MAP_CONST( PROPERTY_FONTORIENTATION,	XML_NAMESPACE_STYLE,	XML_ROTATION_ANGLE, 		    XML_TYPE_ROTATION_ANGLE, 0 ),
-        //MAP_CONST( PROPERTY_FONTPITCH,			XML_NAMESPACE_STYLE,	XML_FONT_PITCH, 			    XML_TYPE_TEXT_FONTPITCH, 0 ),
-        //MAP_CONST( PROPERTY_FONTSLANT,			XML_NAMESPACE_FO,		XML_FONT_STYLE, 			    XML_TYPE_TEXT_POSTURE, 0 ),
-        //MAP_CONST_ASCII( "CharStrikeout",		XML_NAMESPACE_STYLE,	XML_TEXT_LINE_THROUGH_STYLE, 	XML_TYPE_TEXT_CROSSEDOUT_STYLE|MID_FLAG_MERGE_PROPERTY,	0),
-        //MAP_CONST_ASCII( "CharStrikeout",		XML_NAMESPACE_STYLE,	XML_TEXT_LINE_THROUGH_TYPE, 	XML_TYPE_TEXT_CROSSEDOUT_TYPE|MID_FLAG_MERGE_PROPERTY,	0),
-        //MAP_CONST_ASCII( "CharStrikeout",		XML_NAMESPACE_STYLE,	XML_TEXT_LINE_THROUGH_WIDTH, 	XML_TYPE_TEXT_CROSSEDOUT_WIDTH|MID_FLAG_MERGE_PROPERTY,	0),
-        //MAP_CONST_ASCII( "CharStrikeout",		XML_NAMESPACE_STYLE,	XML_TEXT_LINE_THROUGH_TEXT, 	XML_TYPE_TEXT_CROSSEDOUT_TEXT|MID_FLAG_MERGE_PROPERTY,	0),
-        //MAP_CONST( PROPERTY_FONTSTYLENAME,		XML_NAMESPACE_STYLE,	XML_FONT_STYLE_NAME,		    XML_TYPE_STRING, 0 ),
-        //MAP_CONST_ASCII( "CharUnderline",		XML_NAMESPACE_STYLE,	XML_TEXT_UNDERLINE_STYLE,		XML_TYPE_TEXT_UNDERLINE_STYLE|MID_FLAG_MERGE_PROPERTY, 0 ),
-        //MAP_CONST_ASCII( "CharUnderline",		XML_NAMESPACE_STYLE,	XML_TEXT_UNDERLINE_TYPE,		XML_TYPE_TEXT_UNDERLINE_TYPE|MID_FLAG_MERGE_PROPERTY, 0 ),
-        //MAP_CONST_ASCII( "CharUnderline",		XML_NAMESPACE_STYLE,	XML_TEXT_UNDERLINE_WIDTH,		XML_TYPE_TEXT_UNDERLINE_WIDTH|MID_FLAG_MERGE_PROPERTY, 0 ),
-        //MAP_CONST_ASCII( "CharUnderlineColor",	XML_NAMESPACE_STYLE,	XML_TEXT_UNDERLINE_COLOR,		XML_TYPE_TEXT_UNDERLINE_COLOR|MID_FLAG_MULTI_PROPERTY, 0	),
-        //MAP_CONST_ASCII( "CharUnderlineHasColor",XML_NAMESPACE_STYLE,	XML_TEXT_UNDERLINE_COLOR,		XML_TYPE_TEXT_UNDERLINE_HASCOLOR|MID_FLAG_MERGE_ATTRIBUTE, 0	),
-        //MAP_CONST( PROPERTY_FONTWEIGHT,			XML_NAMESPACE_FO,		XML_FONT_WEIGHT,			    XML_TYPE_TEXT_WEIGHT, 0 ),
-        //MAP_CONST( PROPERTY_FONTWIDTH,			XML_NAMESPACE_STYLE,	XML_FONT_WIDTH, 			    XML_TYPE_FONT_WIDTH, 0 ),
-        //MAP_CONST( PROPERTY_FONTWORDLINEMODE,	XML_NAMESPACE_STYLE,	XML_TEXT_UNDERLINE_MODE,		XML_TYPE_TEXT_LINE_MODE, 0 ),
         MAP_END()
     };
     UniReference < XMLPropertyHandlerFactory> xFac = new ::xmloff::OControlPropertyHandlerFactory();
diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx
index 9805eda..53d1c57 100644
--- a/dbaccess/source/filter/xml/xmlfilter.cxx
+++ b/dbaccess/source/filter/xml/xmlfilter.cxx
@@ -124,8 +124,8 @@ namespace dbaxml
                         (void)ex;
                         OSL_ASSERT(0);
                     }
-                } // if ( s_bFirstTime )
-            } // if ( m_eWhat == E_JAVA )
+                }
+            }
             else if ( m_eWhat == E_CALC )
             {
                 static bool s_bFirstTime = true;
-- 
1.7.2.2


--------------070708070002000903060809--


More information about the LibreOffice mailing list