diff options
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/CellColorHandler.cxx | 4 | ||||
| -rw-r--r-- | writerfilter/source/dmapper/TablePropertiesHandler.cxx | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/writerfilter/source/dmapper/CellColorHandler.cxx b/writerfilter/source/dmapper/CellColorHandler.cxx index a830b5783116..f96737efd082 100644 --- a/writerfilter/source/dmapper/CellColorHandler.cxx +++ b/writerfilter/source/dmapper/CellColorHandler.cxx @@ -201,7 +201,7 @@ TablePropertyMapPtr CellColorHandler::getProperties() case NS_ooxml::LN_Value_ST_Shd_pct85: nWW8BrushStyle = 850; break; case NS_ooxml::LN_Value_ST_Shd_pct87: nWW8BrushStyle = 875; break; case NS_ooxml::LN_Value_ST_Shd_pct95: nWW8BrushStyle = 950; break; - }; + } sal_Int32 nApplyColor = 0; if( !nWW8BrushStyle ) @@ -270,7 +270,7 @@ TablePropertyMapPtr CellColorHandler::getProperties() case NS_ooxml::LN_Value_ST_Shd_pct85: nShadingPattern = drawing::ShadingPattern::PCT85; break; case NS_ooxml::LN_Value_ST_Shd_pct87: nShadingPattern = drawing::ShadingPattern::PCT87; break; case NS_ooxml::LN_Value_ST_Shd_pct95: nShadingPattern = drawing::ShadingPattern::PCT95; break; - }; + } // Write the shading pattern property pPropertyMap->Insert(PROP_CHAR_SHADING_VALUE, uno::makeAny( nShadingPattern )); diff --git a/writerfilter/source/dmapper/TablePropertiesHandler.cxx b/writerfilter/source/dmapper/TablePropertiesHandler.cxx index 2ae01bdeb742..339727689782 100644 --- a/writerfilter/source/dmapper/TablePropertiesHandler.cxx +++ b/writerfilter/source/dmapper/TablePropertiesHandler.cxx @@ -100,7 +100,7 @@ namespace dmapper { case NS_ooxml::LN_CT_TrPr_del: nToken = XML_tableRowDelete; break; - }; + } std::shared_ptr<TrackChangesHandler> pTrackChangesHandler( new TrackChangesHandler( nToken ) ); pProperties->resolve(*pTrackChangesHandler); TablePropertyMapPtr pPropMap( new TablePropertyMap ); @@ -131,7 +131,7 @@ namespace dmapper { default: throw lang::IllegalArgumentException("illegal redline token type", nullptr, 0); break; - }; + } std::shared_ptr<TrackChangesHandler> pTrackChangesHandler( new TrackChangesHandler( nToken ) ); pProperties->resolve(*pTrackChangesHandler); TablePropertyMapPtr pPropMap( new TablePropertyMap ); @@ -160,7 +160,7 @@ namespace dmapper { case NS_ooxml::LN_Value_ST_VerticalJc_center: nVertOrient = text::VertOrientation::CENTER; break; case NS_ooxml::LN_Value_ST_VerticalJc_bottom: nVertOrient = text::VertOrientation::BOTTOM; break; default:; - }; + } TablePropertyMapPtr pCellPropMap( new TablePropertyMap() ); pCellPropMap->Insert( PROP_VERT_ORIENT, uno::makeAny( nVertOrient ) ); //todo: in ooxml import the value of m_ncell is wrong @@ -174,7 +174,7 @@ namespace dmapper { case NS_ooxml::LN_Value_ST_VerticalJc_center: aVertOrient = "center"; break; case NS_ooxml::LN_Value_ST_VerticalJc_both: aVertOrient = "both"; break; case NS_ooxml::LN_Value_ST_VerticalJc_bottom: aVertOrient = "bottom"; break; - }; + } if (!aVertOrient.isEmpty()) { beans::PropertyValue aValue; |