cleaned up WRITERFILTERSTATUS comments

1 files changed, 275 insertions, 699 deletions

diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx
index 5a8bfabb0e59..0f33171a2c2b 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -381,46 +381,40 @@ void GraphicImport::attribute(Id nName, Value & val)
     /* WRITERFILTERSTATUS: table: PICFattribute */
     switch( nName )
     {
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
         case NS_rtf::LN_LCB: break;//byte count
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
         case NS_rtf::LN_CBHEADER: break;//ignored
-        /* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */
         case NS_rtf::LN_MFP: //MetafilePict
-        /* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */
         case NS_rtf::LN_DffRecord: //dff record - expands to an sprm which expands to ...
-        /* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */
         case NS_rtf::LN_shpopt: //shape options
-        /* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */
         case NS_rtf::LN_shpfbse: //BLIP store entry
-        /* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */
         case NS_rtf::LN_BRCTOP: //top border
-        /* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */
         case NS_rtf::LN_BRCLEFT: //left border
-        /* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */
         case NS_rtf::LN_BRCBOTTOM: //bottom border
-        /* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */
         case NS_rtf::LN_BRCRIGHT: //right border
-        /* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */
         case NS_rtf::LN_shape: //shape
-        /* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */
         case NS_rtf::LN_blip: //the binary graphic data in a shape
+            /* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */
             {
                 switch(nName)
                 {
                     case NS_rtf::LN_BRCTOP: //top border
+                        /* WRITERFILTERSTATUS: */
                         m_pImpl->nCurrentBorderLine = BORDER_TOP;
                     break;
                     case NS_rtf::LN_BRCLEFT: //left border
+                        /* WRITERFILTERSTATUS: */
                         m_pImpl->nCurrentBorderLine = BORDER_LEFT;
                     break;
                     case NS_rtf::LN_BRCBOTTOM: //bottom border
+                        /* WRITERFILTERSTATUS: */
                         m_pImpl->nCurrentBorderLine = BORDER_BOTTOM;
                     break;
                     case NS_rtf::LN_BRCRIGHT: //right border
+                        /* WRITERFILTERSTATUS: */
                         m_pImpl->nCurrentBorderLine = BORDER_RIGHT;
                     break;
                     case NS_rtf::LN_shpopt:
+                        /* WRITERFILTERSTATUS: */
                         m_pImpl->bInShapeOptionMode = true;
                     break;
                     default:;
@@ -433,6 +427,7 @@ void GraphicImport::attribute(Id nName, Value & val)
                 switch(nName)
                 {
                     case NS_rtf::LN_shpopt:
+                        /* WRITERFILTERSTATUS: */
                         m_pImpl->bInShapeOptionMode = false;
                     break;
                     default:;
@@ -440,80 +435,97 @@ void GraphicImport::attribute(Id nName, Value & val)
         }
         break;
         case NS_rtf::LN_payload :
+            /* WRITERFILTERSTATUS: done: 100, planned: 0.5, spent: 0 */
         {
             writerfilter::Reference<BinaryObj>::Pointer_t pPictureData = val.getBinary();
             if( pPictureData.get())
                 pPictureData->resolve(*this);
         }
         break;
-        /* WRITERFILTERSTATUS: done: 0, planned: 0.5, spent: 0 */
         case NS_rtf::LN_BM_RCWINMF: //windows bitmap structure - if it's a bitmap
+            /* WRITERFILTERSTATUS: done: 0, planned: 0.5, spent: 0 */
         break;
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
         case NS_rtf::LN_DXAGOAL: //x-size in twip
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
         case NS_rtf::LN_DYAGOAL: //y-size in twip
+            /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
             break;
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-        case NS_rtf::LN_MX: m_pImpl->nHoriScaling = nIntValue; break;// hori scaling in 0.001%
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-        case NS_rtf::LN_MY: m_pImpl->nVertScaling = nIntValue; break;// vert scaling in 0.001%
-        /* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */
-        case NS_rtf::LN_DXACROPLEFT:    m_pImpl->nLeftCrop  = ConversionHelper::convertTwipToMM100(nIntValue); break;// left crop in twips
-        /* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */
-        case NS_rtf::LN_DYACROPTOP:     m_pImpl->nTopCrop   = ConversionHelper::convertTwipToMM100(nIntValue); break;// top crop in twips
-        /* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */
-        case NS_rtf::LN_DXACROPRIGHT:   m_pImpl->nRightCrop = ConversionHelper::convertTwipToMM100(nIntValue); break;// right crop in twips
-        /* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */
-        case NS_rtf::LN_DYACROPBOTTOM:  m_pImpl->nBottomCrop = ConversionHelper::convertTwipToMM100(nIntValue); break;// bottom crop in twips
-        /* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */
-        case NS_rtf::LN_BRCL:           break;//border type - legacy -
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-        case NS_rtf::LN_FFRAMEEMPTY:    break;// picture consists of a single frame
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
+        case NS_rtf::LN_MX:
+            /* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */
+            m_pImpl->nHoriScaling = nIntValue;
+            break;// hori scaling in 0.001%
+        case NS_rtf::LN_MY:
+            /* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */
+            m_pImpl->nVertScaling = nIntValue;
+            break;// vert scaling in 0.001%
+        case NS_rtf::LN_DXACROPLEFT:
+            /* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */
+            m_pImpl->nLeftCrop  = ConversionHelper::convertTwipToMM100(nIntValue);
+            break;// left crop in twips
+        case NS_rtf::LN_DYACROPTOP:
+            /* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */
+            m_pImpl->nTopCrop   = ConversionHelper::convertTwipToMM100(nIntValue);
+            break;// top crop in twips
+        case NS_rtf::LN_DXACROPRIGHT:
+            /* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */
+            m_pImpl->nRightCrop = ConversionHelper::convertTwipToMM100(nIntValue);
+            break;// right crop in twips
+        case NS_rtf::LN_DYACROPBOTTOM:
+            /* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */
+            m_pImpl->nBottomCrop = ConversionHelper::convertTwipToMM100(nIntValue);
+            break;// bottom crop in twips
+        case NS_rtf::LN_BRCL:
+            /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
+            break;//border type - legacy -
+        case NS_rtf::LN_FFRAMEEMPTY:
+            /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
+            break;// picture consists of a single frame
         case NS_rtf::LN_FBITMAP:
+            /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
             m_pImpl->bIsBitmap = nIntValue > 0 ? true : false;
         break;//1 if it's a bitmap ???
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-        case NS_rtf::LN_FDRAWHATCH:     break;//1 if it's an active OLE object
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-        case NS_rtf::LN_FERROR:         break;// 1 if picture is an error message
-        /* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */
-        case NS_rtf::LN_BPP: m_pImpl->nBitsPerPixel = nIntValue; break;//bits per pixel 0 - unknown, 1- mono, 4 - VGA
+        case NS_rtf::LN_FDRAWHATCH:
+            /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
+            break;//1 if it's an active OLE object
+        case NS_rtf::LN_FERROR:
+            /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
+            break;// 1 if picture is an error message
+        case NS_rtf::LN_BPP:
+            /* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */
+            m_pImpl->nBitsPerPixel = nIntValue;
+            break;//bits per pixel 0 - unknown, 1- mono, 4 - VGA
 
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
         case NS_rtf::LN_DXAORIGIN: //horizontal offset of hand annotation origin
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
         case NS_rtf::LN_DYAORIGIN: //vertical offset of hand annotation origin
+            /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
         break;
-        /* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */
         case NS_rtf::LN_CPROPS:break;// unknown - ignored
+            /* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */
         //metafilepict
-        /* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */
         case NS_rtf::LN_MM:
+            /* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */
 //      according to the documentation 99 or 98 are provided - but they are not!
 //            m_pImpl->bIsBitmap = 99 == nIntValue ? true : false;
 //            m_pImpl->bIsTiff = 98 == nIntValue ? true : false;
 
         break; //mapmode
-        /* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */
         case NS_rtf::LN_XEXT:
+            /* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */
             m_pImpl->setXSize(nIntValue);
             break; // x-size
-        /* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */
         case NS_rtf::LN_YEXT:
+            /* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */
             m_pImpl->setYSize(nIntValue);
             break; // y-size
-        /* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */
         case NS_rtf::LN_HMF: break; //identifier - ignored
+            /* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */
 
         //sprm 0xf004 and 0xf008, 0xf00b
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
         case NS_rtf::LN_dfftype://
+            /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
             m_pImpl->nDffType = nIntValue;
         break;
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
         case NS_rtf::LN_dffinstance:
+            /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
             //todo: does this still work for PICF?
             //in case of LN_dfftype == 0xf01f the instance contains the bitmap type:
             if(m_pImpl->nDffType == 0xf01f)
@@ -551,62 +563,80 @@ void GraphicImport::attribute(Id nName, Value & val)
 
                 }
         break;
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
         case NS_rtf::LN_dffversion://  ignored
+            /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
         break;
 
         //sprm 0xf008
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-        case NS_rtf::LN_shptype:        break;
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-        case NS_rtf::LN_shpid:          break;
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-        case NS_rtf::LN_shpfGroup:      break;// This shape is a group shape
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-        case NS_rtf::LN_shpfChild:      break;// Not a top-level shape
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-        case NS_rtf::LN_shpfPatriarch:  break;// This is the topmost group shape. Exactly one of these per drawing.
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-        case NS_rtf::LN_shpfDeleted:    break;// The shape has been deleted
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-        case NS_rtf::LN_shpfOleShape:   break;// The shape is an OLE object
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-        case NS_rtf::LN_shpfHaveMaster: break;// Shape has a hspMaster property
-        /* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */
+        case NS_rtf::LN_shptype:
+            /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
+            break;
+        case NS_rtf::LN_shpid:
+            /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
+            break;
+        case NS_rtf::LN_shpfGroup:
+            /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
+            break;// This shape is a group shape
+        case NS_rtf::LN_shpfChild:
+            /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
+            break;// Not a top-level shape
+        case NS_rtf::LN_shpfPatriarch:
+            /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
+            break;// This is the topmost group shape. Exactly one of these per drawing.
+        case NS_rtf::LN_shpfDeleted:
+            /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
+            break;// The shape has been deleted
+        case NS_rtf::LN_shpfOleShape:
+            /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
+            break;// The shape is an OLE object
+        case NS_rtf::LN_shpfHaveMaster:
+            /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
+            break;// Shape has a hspMaster property
         case NS_rtf::LN_shpfFlipH:       // Shape is flipped horizontally
+            /* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */
             m_pImpl->bHoriFlip = nIntValue ? true : false;
         break;
-        /* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */
         case NS_rtf::LN_shpfFlipV:       // Shape is flipped vertically
+            /* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */
             m_pImpl->bVertFlip = nIntValue ? true : false;
         break;
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-        case NS_rtf::LN_shpfConnector:   break;// Connector type of shape
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-        case NS_rtf::LN_shpfHaveAnchor:  break;// Shape has an anchor of some kind
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-        case NS_rtf::LN_shpfBackground:  break;// Background shape
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-        case NS_rtf::LN_shpfHaveSpt:     break;// Shape has a shape type property
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-        case NS_rtf::LN_shptypename: break;// shape type name
-        /* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */
-        case NS_rtf::LN_shppid:     m_pImpl->nShapeOptionType = nIntValue; break; //type of shape option
-        /* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */
-        case NS_rtf::LN_shpfBid:    break; //ignored
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-        case NS_rtf::LN_shpfComplex:break;
-        /* WRITERFILTERSTATUS: done: 50, planned: 10, spent: 5 */
+        case NS_rtf::LN_shpfConnector:
+            /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
+            break;// Connector type of shape
+        case NS_rtf::LN_shpfHaveAnchor:
+            /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
+            break;// Shape has an anchor of some kind
+        case NS_rtf::LN_shpfBackground:
+            /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
+            break;// Background shape
+        case NS_rtf::LN_shpfHaveSpt:
+            /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
+            break;// Shape has a shape type property
+        case NS_rtf::LN_shptypename:
+            /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
+            break;// shape type name
+        case NS_rtf::LN_shppid:
+            /* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */
+            m_pImpl->nShapeOptionType = nIntValue;
+            break; //type of shape option
+        case NS_rtf::LN_shpfBid:
+            /* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */
+            break; //ignored
+        case NS_rtf::LN_shpfComplex:
+            /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
+            break;
         case NS_rtf::LN_shpop:
+            /* WRITERFILTERSTATUS: done: 50, planned: 10, spent: 5 */
         {
             if(NS_dff::LN_shpwzDescription != sal::static_int_cast<Id>(m_pImpl->nShapeOptionType) )
                 ProcessShapeOptions( val );
         }
         break;
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-        case NS_rtf::LN_shpname:    break;
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
+        case NS_rtf::LN_shpname:
+            /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
+            break;
         case NS_rtf::LN_shpvalue:
+            /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
         {
             if( NS_dff::LN_shpwzDescription == sal::static_int_cast<Id>(m_pImpl->nShapeOptionType) )
                 ProcessShapeOptions( val );
@@ -614,95 +644,94 @@ void GraphicImport::attribute(Id nName, Value & val)
         break;
 
         //BLIP store entry
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-        case NS_rtf::LN_shpbtWin32: break;
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-        case NS_rtf::LN_shpbtMacOS: break;
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-        case NS_rtf::LN_shprgbUid:  break;
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-        case NS_rtf::LN_shptag:     break;
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-        case NS_rtf::LN_shpsize:    break;
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-        case NS_rtf::LN_shpcRef:    break;
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-        case NS_rtf::LN_shpfoDelay: break;
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-        case NS_rtf::LN_shpusage:   break;
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-        case NS_rtf::LN_shpcbName:  break;
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-        case NS_rtf::LN_shpunused2: break;
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-        case NS_rtf::LN_shpunused3: break;
+        case NS_rtf::LN_shpbtWin32:
+            /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
+            break;
+        case NS_rtf::LN_shpbtMacOS:
+            /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
+            break;
+        case NS_rtf::LN_shprgbUid:
+            /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
+            break;
+        case NS_rtf::LN_shptag:
+            /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
+            break;
+        case NS_rtf::LN_shpsize:
+            /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
+            break;
+        case NS_rtf::LN_shpcRef:
+            /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
+            break;
+        case NS_rtf::LN_shpfoDelay:
+            /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
+            break;
+        case NS_rtf::LN_shpusage:
+            /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
+            break;
+        case NS_rtf::LN_shpcbName:
+            /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
+            break;
+        case NS_rtf::LN_shpunused2:
+            /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
+            break;
+        case NS_rtf::LN_shpunused3:
+            /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
+            break;
 
         //border properties
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-        case NS_rtf::LN_shpblipbname : break;
+        case NS_rtf::LN_shpblipbname :
+            /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
+        break;
 
-        /* WRITERFILTERSTATUS: done: 100, planned: 1, spent: 1 */
         case NS_rtf::LN_DPTLINEWIDTH:  // 0x1759
+        /* WRITERFILTERSTATUS: done: 100, planned: 1, spent: 1 */
             m_pImpl->aBorders[m_pImpl->nCurrentBorderLine].nLineWidth = nIntValue;
         break;
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
         case NS_rtf::LN_BRCTYPE:   // 0x175a
+        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
             //graphic borders don't support different line types
             //m_pImpl->aBorders[m_pImpl->nCurrentBorderLine].nLineType = nIntValue;
         break;
-        /* WRITERFILTERSTATUS: done: 100, planned: 1, spent: 1 */
         case NS_rtf::LN_ICO:   // 0x175b
+        /* WRITERFILTERSTATUS: done: 100, planned: 1, spent: 1 */
             m_pImpl->aBorders[m_pImpl->nCurrentBorderLine].nLineColor = ConversionHelper::ConvertColor( nIntValue );
         break;
-        /* WRITERFILTERSTATUS: done: 100, planned: 1, spent: 1 */
         case NS_rtf::LN_DPTSPACE:  // 0x175c
+        /* WRITERFILTERSTATUS: done: 100, planned: 1, spent: 1 */
             m_pImpl->aBorders[m_pImpl->nCurrentBorderLine].nLineDistance = nIntValue;
         break;
-        /* WRITERFILTERSTATUS: done: 0, planned: 1, spent: 0 */
         case NS_rtf::LN_FSHADOW:   // 0x175d
+        /* WRITERFILTERSTATUS: done: 0, planned: 1, spent: 0 */
             m_pImpl->aBorders[m_pImpl->nCurrentBorderLine].bHasShadow = nIntValue ? true : false;
         break;
-        /* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */
         case NS_rtf::LN_FFRAME:            // ignored
         /* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */
-        case NS_rtf::LN_UNUSED2_15: break;// ignored
-
-//    const QName_t LN_shpoptextraoffset = 20028;
-//    const QName_t LN_shptypename = 20029;
-//    const QName_t LN_shpblipbname = 20031;
-//    const QName_t LN_binary = 20032;
-
-
-
-//    case NS_rtf::LN_shpblipbname = 20031;
-//    case NS_rtf::LN_binary = 20032;
-//    case NS_rtf::LN_shpdgg = 10492;
-//    case NS_rtf::LN_shpfbse = 10493;
-
-
-//    case NS_rtf::LN_CPROPS: //unused
-
-
-
-//    case NS_rtf::LN_LINECOLOR = 10372;
-//    case NS_rtf::LN_LINEWIDTH = 10373;
-//    case NS_rtf::LN_LINETYPE = 10374;
-
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-        case NS_rtf::LN_SPID: break;
-        /* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */
-        case NS_rtf::LN_XALEFT: m_pImpl->nLeftPosition = ConversionHelper::convertTwipToMM100(nIntValue); break; //left position
-        /* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */
-        case NS_rtf::LN_YATOP:  m_pImpl->nTopPosition = ConversionHelper::convertTwipToMM100(nIntValue); break; //top position
-        /* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */
-        case NS_rtf::LN_XARIGHT:  m_pImpl->nRightPosition = ConversionHelper::convertTwipToMM100(nIntValue); break; //right position
+        case NS_rtf::LN_UNUSED2_15: // ignored
         /* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */
-        case NS_rtf::LN_YABOTTOM: m_pImpl->nBottomPosition = ConversionHelper::convertTwipToMM100(nIntValue); break;//bottom position
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
+            break;
+
+        case NS_rtf::LN_SPID:
+            /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
+            break;
+        case NS_rtf::LN_XALEFT:
+            /* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */
+            m_pImpl->nLeftPosition = ConversionHelper::convertTwipToMM100(nIntValue);
+            break; //left position
+        case NS_rtf::LN_YATOP:
+            /* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */
+            m_pImpl->nTopPosition = ConversionHelper::convertTwipToMM100(nIntValue);
+            break; //top position
+        case NS_rtf::LN_XARIGHT:
+            /* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */
+            m_pImpl->nRightPosition = ConversionHelper::convertTwipToMM100(nIntValue);
+            break; //right position
+        case NS_rtf::LN_YABOTTOM:
+            /* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */
+            m_pImpl->nBottomPosition = ConversionHelper::convertTwipToMM100(nIntValue);
+            break;//bottom position
         case NS_rtf::LN_FHDR:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
         case NS_rtf::LN_XAlign:
+        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
 /*
         static const SwHoriOrient aHoriOriTab[ nCntXAlign ] =
         {
@@ -731,6 +760,7 @@ void GraphicImport::attribute(Id nName, Value & val)
             }
         break;
         case NS_rtf::LN_YAlign:
+            /* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */
 /*
         static const SwVertOrient aVertOriTab[ nCntYAlign ] =
         {
@@ -797,9 +827,10 @@ void GraphicImport::attribute(Id nName, Value & val)
                 default:m_pImpl->nHoriRelation = text::RelOrientation::CHAR;
             }
         break;
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
         case NS_rtf::LN_YRelTo:
+        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
         case NS_rtf::LN_BY: //vert orient relation
+        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
             switch( nIntValue )
             {
                 case  0: m_pImpl->nVertRelation = text::RelOrientation::PAGE_PRINT_AREA; break;
@@ -810,8 +841,8 @@ void GraphicImport::attribute(Id nName, Value & val)
             }
 
         break;
-        /* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */
         case NS_rtf::LN_WR: //wrapping
+        /* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */
             switch( nIntValue )
             {
                 case 0: //0 like 2, but doesn't require absolute object
@@ -834,8 +865,8 @@ void GraphicImport::attribute(Id nName, Value & val)
                 default:;
             }
         break;
-        /* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */
         case NS_rtf::LN_WRK:
+        /* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */
             if( !m_pImpl->bIgnoreWRK )
                 switch( nIntValue )
                 {
@@ -857,21 +888,18 @@ void GraphicImport::attribute(Id nName, Value & val)
                     default:;
                 }
         break;
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
         case NS_rtf::LN_FRCASIMPLE:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
         case NS_rtf::LN_FBELOWTEXT:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
         case NS_rtf::LN_FANCHORLOCK:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
         case NS_rtf::LN_CTXBX:
+        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
 //        {
 //            sal_Int32 nValue1 = val.getInt();
 //            nValue1++;
 //        }
         break;
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
         case NS_rtf::LN_shptxt:
+        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
             //todo: text content
         break;
     /*    case NS_rtf::LN_CH = 10421;
@@ -883,6 +911,7 @@ void GraphicImport::attribute(Id nName, Value & val)
         case NS_rtf::LN_dffheader: break;
         case NS_ooxml::LN_CT_PositiveSize2D_cx:// 90407;
         case NS_ooxml::LN_CT_PositiveSize2D_cy:// 90408;
+            /* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */
         {
             sal_Int32 nDim = ConversionHelper::convertEMUToMM100( nIntValue );
             if( nName == NS_ooxml::LN_CT_PositiveSize2D_cx )
@@ -895,46 +924,58 @@ void GraphicImport::attribute(Id nName, Value & val)
         case NS_ooxml::LN_CT_EffectExtent_t:// 90908;
         case NS_ooxml::LN_CT_EffectExtent_r:// 90909;
         case NS_ooxml::LN_CT_EffectExtent_b:// 90910;
+            /* WRITERFILTERSTATUS: done: 0, planned: 0.5, spent: 0 */
             //todo: extends the wrapping size of the object, e.g. if shadow is added
         break;
         case NS_ooxml::LN_CT_NonVisualDrawingProps_id:// 90650;
+            /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
             //id of the object - ignored
         break;
         case NS_ooxml::LN_CT_NonVisualDrawingProps_name:// 90651;
+            /* WRITERFILTERSTATUS: done: 100, planned: 0.5, spent: 0 */
             //name of the object
             m_pImpl->sName = val.getString();
         break;
         case NS_ooxml::LN_CT_NonVisualDrawingProps_descr:// 90652;
+            /* WRITERFILTERSTATUS: done: 100, planned: 0.5, spent: 0 */
             //alternative text
             m_pImpl->sAlternativeText = val.getString();
         break;
         case NS_ooxml::LN_CT_GraphicalObjectFrameLocking_noChangeAspect://90644;
+            /* WRITERFILTERSTATUS: done: 100, planned: 0.5, spent: 0 */
             //disallow aspect ratio change - ignored
         break;
         case NS_ooxml::LN_CT_GraphicalObjectFrameLocking_noMove:// 90645;
+            /* WRITERFILTERSTATUS: done: 100, planned: 0.5, spent: 0 */
             m_pImpl->bPositionProtected = true;
         break;
         case NS_ooxml::LN_CT_GraphicalObjectFrameLocking_noResize: // 90646;
+            /* WRITERFILTERSTATUS: done: 100, planned: 0.5, spent: 0 */
             m_pImpl->bSizeProtected = true;
         break;
         case NS_ooxml::LN_CT_Anchor_distT: // 90983;
         case NS_ooxml::LN_CT_Anchor_distB: // 90984;
         case NS_ooxml::LN_CT_Anchor_distL: // 90985;
         case NS_ooxml::LN_CT_Anchor_distR: // 90986;
+            /* WRITERFILTERSTATUS: done: 100, planned: 0.5, spent: 0 */
         {
             //redirect to shape option processing
             switch( nName )
             {
                 case NS_ooxml::LN_CT_Anchor_distT: // 90983;
+                    /* WRITERFILTERSTATUS: */
                     m_pImpl->nShapeOptionType = NS_dff::LN_shpdyWrapDistTop;
                 break;
                 case NS_ooxml::LN_CT_Anchor_distB: // 90984;
+                    /* WRITERFILTERSTATUS: */
                     m_pImpl->nShapeOptionType = NS_dff::LN_shpdyWrapDistBottom;
                 break;
                 case NS_ooxml::LN_CT_Anchor_distL: // 90985;
+                    /* WRITERFILTERSTATUS: */
                     m_pImpl->nShapeOptionType = NS_dff::LN_shpdxWrapDistLeft;
                 break;
                 case NS_ooxml::LN_CT_Anchor_distR: // 90986;
+                    /* WRITERFILTERSTATUS: */
                     m_pImpl->nShapeOptionType = NS_dff::LN_shpdxWrapDistRight;
                 break;
                 //m_pImpl->nShapeOptionType = NS_dff::LN_shpcropFromTop
@@ -944,25 +985,30 @@ void GraphicImport::attribute(Id nName, Value & val)
         }
         break;
         case NS_ooxml::LN_CT_Anchor_simplePos_attr: // 90987;
+            /* WRITERFILTERSTATUS: done: 100, planned: 0.5, spent: 0 */
             m_pImpl->bUseSimplePos = nIntValue > 0;
         break;
         case NS_ooxml::LN_CT_Anchor_relativeHeight: // 90988;
+            /* WRITERFILTERSTATUS: done: 0, planned: 0.5, spent: 0 */
             //z-order
         break;
         case NS_ooxml::LN_CT_Anchor_behindDoc: // 90989; - in background
+            /* WRITERFILTERSTATUS: done: 100, planned: 0.5, spent: 0 */
             if( nIntValue > 0 )
                     m_pImpl->bOpaque = false;
         break;
         case NS_ooxml::LN_CT_Anchor_locked: // 90990; - ignored
         case NS_ooxml::LN_CT_Anchor_layoutInCell: // 90991; - ignored
-            //true: inside cell, cell resizes, false: table is resized or relocated, object might be outside of the table
         case NS_ooxml::LN_CT_Anchor_hidden: // 90992; - ignored
+            /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
         break;
         case NS_ooxml::LN_CT_Anchor_allowOverlap: // 90993;
+            /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
             //enable overlapping - ignored
         break;
         case NS_ooxml::LN_CT_Point2D_x: // 90405;
         case NS_ooxml::LN_CT_Point2D_y: // 90406;
+            /* WRITERFILTERSTATUS: done: 100, planned: 0.5, spent: 0 */
             if( m_pImpl->bUseSimplePos )
             {
                 //todo: absolute positioning
@@ -972,9 +1018,11 @@ void GraphicImport::attribute(Id nName, Value & val)
             }
         break;
         case NS_ooxml::LN_CT_WrapTight_wrapText: // 90934;
+            /* WRITERFILTERSTATUS: done: 100, planned: 0.5, spent: 0 */
             m_pImpl->bContour = true;
             //no break;
         case NS_ooxml::LN_CT_WrapSquare_wrapText: //90928;
+            /* WRITERFILTERSTATUS: done: 100, planned: 0.5, spent: 0 */
             switch ( val.getInt() )
             {
                 case NS_ooxml::LN_Value_wordprocessingDrawing_ST_WrapText_bothSides: // 90920;
@@ -993,7 +1041,7 @@ void GraphicImport::attribute(Id nName, Value & val)
             }
         break;
         case NS_ooxml::LN_shape:
-            /* WRITERFILTERSTATUS: done: 0, planned: 0.5, spent: 0 */
+            /* WRITERFILTERSTATUS: done: 100, planned: 0.5, spent: 0 */
             {
                 val.getAny() >>= m_xShape;
 
@@ -1028,16 +1076,14 @@ void GraphicImport::attribute(Id nName, Value & val)
             }
         break;
         case NS_ooxml::LN_CT_Inline_distT:
-            /* WRITERFILTERSTATUS: done: 0, planned: 0.5, spent: 0 */
         case NS_ooxml::LN_CT_Inline_distB:
-            /* WRITERFILTERSTATUS: done: 0, planned: 0.5, spent: 0 */
         case NS_ooxml::LN_CT_Inline_distL:
-            /* WRITERFILTERSTATUS: done: 0, planned: 0.5, spent: 0 */
         case NS_ooxml::LN_CT_Inline_distR:
             /* WRITERFILTERSTATUS: done: 0, planned: 0.5, spent: 0 */
             //TODO: need to be handled
         break;
         case NS_ooxml::LN_CT_GraphicalObjectData_uri:
+            /* WRITERFILTERSTATUS: done: 50, planned: 0.5, spent: 0 */
             val.getString();
             //TODO: does it need to be handled?
         break;
@@ -1080,121 +1126,30 @@ void GraphicImport::ProcessShapeOptions(Value& val)
     /* WRITERFILTERSTATUS: table: ShapeOptionsAttribute */
     switch( m_pImpl->nShapeOptionType )
     {
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shprotation /*4*/:              break;
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfLockRotation /*119*/:       break;
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfLockAspectRatio /*120*/:    break;
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfLockPosition /*121*/:       break;
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfLockAgainstSelect /*122*/:  break;
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfLockCropping /*123*/:       break;
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfLockVertices /*124*/:       break;
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfLockText /*125*/:          break;
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfLockAdjustHandles /*126*/: break;
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfLockAgainstGrouping /*127*/: break;
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfLockAgainstGrouping /*127*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shplTxid /*128*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpdxTextLeft /*129*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpdyTextTop /*130*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpdxTextRight /*131*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpdyTextBottom /*132*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpWrapText /*133*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpscaleText /*134*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpanchorText /*135*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shptxflTextFlow /*136*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpcdirFont /*137*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shphspNext /*138*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shptxdir /*139*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfSelectText /*187*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfAutoTextMargin /*188*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfRotateText /*189*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfFitShapeToText /*190*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfFitTextToShape /*191*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpgtextUNICODE /*192*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpgtextRTF /*193*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpgtextAlign /*194*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpgtextSize /*195*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpgtextSpacing /*196*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpgtextFont /*197*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpgtextFReverseRows /*240*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfGtext /*241*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpgtextFVertical /*242*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpgtextFKern /*243*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpgtextFTight /*244*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpgtextFStretch /*245*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpgtextFShrinkFit /*246*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpgtextFBestFit /*247*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpgtextFNormalize /*248*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpgtextFDxMeasure /*249*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpgtextFBold /*250*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpgtextFItalic /*251*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpgtextFUnderline /*252*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpgtextFShadow /*253*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpgtextFSmallcaps /*254*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpgtextFStrikethrough /*255*/:
-
-        /* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */
-        case NS_dff::LN_shpcropFromTop /*256*/ : m_pImpl->nTopCrop   = nTwipValue; break;// rtf:shpcropFromTop
-        /* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */
-        case NS_dff::LN_shpcropFromBottom /*257*/ : m_pImpl->nBottomCrop= nTwipValue; break;// rtf:shpcropFromBottom
-        /* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */
-        case NS_dff::LN_shpcropFromLeft   /*258*/ : m_pImpl->nLeftCrop  = nTwipValue; break;// rtf:shpcropFromLeft
-        /* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */
-        case NS_dff::LN_shpcropFromRight/*259*/ : m_pImpl->nRightCrop = nTwipValue;break;// rtf:shpcropFromRight
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-        case NS_dff::LN_shppib/*260*/:  break;  // rtf:shppib
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-        case NS_dff::LN_shppibName/*261*/:  break;  // rtf:shppibName
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
+        case NS_dff::LN_shpcropFromTop /*256*/ :
+            /* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */
+            m_pImpl->nTopCrop   = nTwipValue;
+            break;// rtf:shpcropFromTop
+        case NS_dff::LN_shpcropFromBottom /*257*/ :
+            /* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */
+            m_pImpl->nBottomCrop= nTwipValue;
+            break;// rtf:shpcropFromBottom
+        case NS_dff::LN_shpcropFromLeft   /*258*/ :
+            /* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */
+            m_pImpl->nLeftCrop  = nTwipValue;
+            break;// rtf:shpcropFromLeft
+        case NS_dff::LN_shpcropFromRight/*259*/ :
+            /* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */
+            m_pImpl->nRightCrop = nTwipValue;
+            break;// rtf:shpcropFromRight
+        case NS_dff::LN_shppib/*260*/:
+            /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
+            break;  // rtf:shppib
+        case NS_dff::LN_shppibName/*261*/:
+            /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
+            break;  // rtf:shppibName
         case NS_dff::LN_shppibFlags/*262*/:  // rtf:shppibFlags
+        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
         /*
          * // MSOBLIPFLAGS ñ flags for pictures
             typedef enum
@@ -1216,10 +1171,8 @@ void GraphicImport::ProcessShapeOptions(Value& val)
                              *
          * */
         break;
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shppictureTransparent /*263*/:
-        /* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */
         case NS_dff::LN_shppictureContrast/*264*/: // rtf:shppictureContrast docu: "1<<16"
+        /* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */
             /*
             0x10000 is msoffice 50%
             < 0x10000 is in units of 1/50th of 0x10000 per 1%
@@ -1249,38 +1202,30 @@ void GraphicImport::ProcessShapeOptions(Value& val)
                 m_pImpl->nContrast -= 100;
             }
         break;
-        /* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */
         case NS_dff::LN_shppictureBrightness/*265*/:  // rtf:shppictureBrightness
+        /* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */
             m_pImpl->nBrightness     = ( (sal_Int32) nIntValue / 327 );
         break;
-        /* WRITERFILTERSTATUS: done: 50, planned: 0, spent: 0 */
         case NS_dff::LN_shppictureGamma/*266*/: // rtf:shppictureGamma
+        /* WRITERFILTERSTATUS: done: 50, planned: 0, spent: 0 */
             //todo check gamma value with _real_ document
             m_pImpl->fGamma = double(nIntValue/655);
         break;
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-        case NS_dff::LN_shppictureId        /*267*/:  break;  // rtf:shppictureId
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-        case NS_dff::LN_shppictureDblCrMod  /*268*/:  break;  // rtf:shppictureDblCrMod
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-        case NS_dff::LN_shppictureFillCrMod /*269*/:  break;  // rtf:shppictureFillCrMod
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-        case NS_dff::LN_shppictureLineCrMod /*270*/:  break;  // rtf:shppictureLineCrMod
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shppibPrint /*271*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shppibPrintName /*272*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shppibPrintFlags /*273*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfNoHitTestPicture /*316*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shppictureGray /*317*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shppictureBiLevel /*318*/:
+        case NS_dff::LN_shppictureId        /*267*/:
+            /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
+            break;  // rtf:shppictureId
+        case NS_dff::LN_shppictureDblCrMod  /*268*/:
+            /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
+            break;  // rtf:shppictureDblCrMod
+        case NS_dff::LN_shppictureFillCrMod /*269*/:
+            /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
+            break;  // rtf:shppictureFillCrMod
+        case NS_dff::LN_shppictureLineCrMod /*270*/:
+            /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
+            break;  // rtf:shppictureLineCrMod
 
-        /* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */
         case NS_dff::LN_shppictureActive/*319*/: // rtf:shppictureActive
+        /* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */
             switch( nIntValue & 0x06 )
             {
                 case 0 : m_pImpl->eColorMode = drawing::ColorMode_STANDARD; break;
@@ -1289,162 +1234,31 @@ void GraphicImport::ProcessShapeOptions(Value& val)
                 default:;
             }
         break;
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpgeoLeft /*320*/:
-          /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpgeoTop /*321*/:
-          /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpgeoRight /*322*/:
-          /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpgeoBottom /*323*/:
-          /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpshapePath /*324*/:
-          /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shppVertices /*325*/:
-          /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shppSegmentInfo /*326*/:
-          /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpadjustValue /*327*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpadjust2Value /*328*/:
-          /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpadjust3Value /*329*/:
-          /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpadjust4Value /*330*/:
-          /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpadjust5Value /*331*/:
-          /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpadjust6Value /*332*/:
-          /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpadjust7Value /*333*/:
-          /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpadjust8Value /*334*/:
-          /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpadjust9Value /*335*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpadjust10Value /*336*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfShadowOK /*378*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpf3DOK /*379*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfLineOK /*380*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfGtextOK /*381*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfFillShadeShapeOK /*382*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfFillOK /*383*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfillType /*384*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
         case NS_dff::LN_shpfillColor           /*385*/:
+        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
             m_pImpl->nFillColor = (m_pImpl->nFillColor & 0xff000000) + ConversionHelper::ConvertColor( nIntValue );
         break;
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
         case NS_dff::LN_shpfillOpacity         /*386*/:
+        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
         {
             sal_Int32 nTrans = 0xff - ( nIntValue * 0xff ) / 0xffff;
             m_pImpl->nFillColor = (nTrans << 0x18 ) + (m_pImpl->nFillColor & 0xffffff);
         }
         break;
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfillBackColor /*387*/:
-          /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfillBackOpacity /*388*/:
-          /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfillCrMod /*389*/:
-          /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfillBlip /*390*/:
-          /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfillBlipName /*391*/:
-          /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfillBlipFlags /*392*/:
-          /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfillWidth /*393*/:
-          /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfillHeight /*394*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfillAngle /*395*/:
-          /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfillFocus /*396*/:
-          /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfillToLeft /*397*/:
-          /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfillToTop /*398*/:
-          /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfillToRight /*399*/:
-          /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfillToBottom /*400*/:
-          /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfillRectLeft /*401*/:
-          /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfillRectTop /*402*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfillRectRight /*403*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfillRectBottom /*404*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfillDztype /*405*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfillShadePreset /*406*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfillShadeColors /*407*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfillOriginX /*408*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfillOriginY /*409*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfillShapeOriginX /*410*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfillShapeOriginY /*411*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfillShadeType /*412*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfFilled /*443*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfHitTestFill /*444*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfillShape /*445*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfillUseRect /*446*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-        case NS_dff::LN_shpfNoFillHitTest      /*447*/:  break;  // rtf:shpfNoFillHitTest
-        /* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */
+        case NS_dff::LN_shpfNoFillHitTest      /*447*/:
+            /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
+            break;  // rtf:shpfNoFillHitTest
         case NS_dff::LN_shplineColor           /*448*/:
+        /* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */
             m_pImpl->aBorders[m_pImpl->nCurrentBorderLine].nLineColor = ConversionHelper::ConvertColor( nIntValue );
         break;
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shplineOpacity /*449*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shplineBackColor /*450*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shplineCrMod /*451*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shplineType /*452*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shplineFillBlip /*453*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shplineFillBlipName /*454*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shplineFillBlipFlags /*455*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shplineFillWidth /*456*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shplineFillHeight /*457*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shplineFillDztype /*458*/:
-        /* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */
         case NS_dff::LN_shplineWidth           /*459*/:
+        /* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 0 */
             //1pt == 12700 units
             m_pImpl->aBorders[m_pImpl->nCurrentBorderLine].nLineWidth = ConversionHelper::convertTwipToMM100(nIntValue / 635);
         break;
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shplineMiterLimit /*460*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shplineStyle /*461*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
         case NS_dff::LN_shplineDashing         /*462*/:
+        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
             //graphic borders don't support different dashing
             /*MSOLINEDASHING
                 msolineSolid,              // Solid (continuous) pen
@@ -1460,283 +1274,40 @@ void GraphicImport::ProcessShapeOptions(Value& val)
                 msolineLongDashDotDotGEL   // long dash short dash short dash*/
             //m_pImpl->aBorders[nCurrentBorderLine].nLineType = nIntValue;
         break;
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shplineDashStyle /*463*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shplineStartArrowhead /*464*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shplineEndArrowhead /*465*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shplineStartArrowWidth /*466*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shplineStartArrowLength /*467*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shplineEndArrowWidth /*468*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shplineEndArrowLength /*469*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shplineJoinStyle /*470*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shplineEndCapStyle /*471*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfArrowheadsOK /*507*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfLine /*508*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfHitTestLine /*509*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shplineFillShape /*510*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-        case NS_dff::LN_shpfNoLineDrawDash     /*511*/:  break;  // rtf:shpfNoLineDrawDash
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpshadowType /*512*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpshadowColor /*513*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpshadowHighlight /*514*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpshadowCrMod /*515*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpshadowOpacity /*516*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpshadowOffsetX /*517*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpshadowOffsetY /*518*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpshadowSecondOffsetX /*519*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpshadowSecondOffsetY /*520*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpshadowScaleXToX /*521*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpshadowScaleYToX /*522*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpshadowScaleXToY /*523*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpshadowScaleYToY /*524*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpshadowPerspectiveX /*525*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpshadowPerspectiveY /*526*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpshadowWeight /*527*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpshadowOriginX /*528*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpshadowOriginY /*529*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfShadow /*574*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfshadowObscured /*575*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpperspectiveType /*576*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpperspectiveOffsetX /*577*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpperspectiveOffsetY /*578*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpperspectiveScaleXToX /*579*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpperspectiveScaleYToX /*580*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpperspectiveScaleXToY /*581*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpperspectiveScaleYToY /*582*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpperspectivePerspectiveX /*583*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpperspectivePerspectiveY /*584*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpperspectiveWeight /*585*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpperspectiveOriginX /*586*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpperspectiveOriginY /*587*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfPerspective /*639*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpc3DSpecularAmt /*640*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpc3DDiffuseAmt /*641*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpc3DShininess /*642*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpc3DEdgeThickness /*643*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpc3DExtrudeForward /*644*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpc3DExtrudeBackward /*645*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpc3DExtrudePlane /*646*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpc3DExtrusionColor /*647*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpc3DCrMod /*648*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpf3D /*700*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfc3DMetallic /*701*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfc3DUseExtrusionColor /*702*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfc3DLightFace /*703*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpc3DYRotationAngle /*704*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpc3DXRotationAngle /*705*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpc3DRotationAxisX /*706*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpc3DRotationAxisY /*707*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpc3DRotationAxisZ /*708*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpc3DRotationAngle /*709*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpc3DRotationCenterX /*710*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpc3DRotationCenterY /*711*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpc3DRotationCenterZ /*712*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpc3DRenderMode /*713*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpc3DTolerance /*714*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpc3DXViewpoint /*715*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpc3DYViewpoint /*716*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpc3DZViewpoint /*717*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpc3DOriginX /*718*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpc3DOriginY /*719*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpc3DSkewAngle /*720*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpc3DSkewAmount /*721*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpc3DAmbientIntensity /*722*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpc3DKeyX /*723*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpc3DKeyY /*724*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpc3DKeyZ /*725*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpc3DKeyIntensity /*726*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpc3DFillX /*727*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpc3DFillY /*728*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpc3DFillZ /*729*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpc3DFillIntensity /*730*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfc3DConstrainRotation /*763*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfc3DRotationCenterAuto /*764*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfc3DParallel /*765*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfc3DKeyHarsh /*766*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfc3DFillHarsh /*767*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shphspMaster /*769*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpcxstyle /*771*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpbWMode /*772*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpbWModePureBW /*773*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpbWModeBW /*774*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfOleIcon /*826*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfPreferRelativeResize /*827*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfLockShapeType /*828*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfDeleteAttachedObject /*830*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfBackground /*831*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpspcot /*832*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpdxyCalloutGap /*833*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpspcoa /*834*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpspcod /*835*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpdxyCalloutDropSpecified /*836*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpdxyCalloutLengthSpecified /*837*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfCallout /*889*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfCalloutAccentBar /*890*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfCalloutTextBorder /*891*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfCalloutMinusX /*892*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfCalloutMinusY /*893*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfCalloutDropAuto /*894*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfCalloutLengthSpecified /*895*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpwzName /*896*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
+        case NS_dff::LN_shpfNoLineDrawDash     /*511*/:
+            /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
+        break;  // rtf:shpfNoLineDrawDash
         case NS_dff::LN_shpwzDescription /*897*/: //alternative text
+        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
             m_pImpl->sAlternativeText = val.getString();
         break;
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
 //        case NS_dff::LN_shppihlShape /*898*/:
-        case NS_dff::LN_shppWrapPolygonVertices/*899*/:  break;  // rtf:shppWrapPolygonVertices
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
+        case NS_dff::LN_shppWrapPolygonVertices/*899*/:
+            /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
+            break;  // rtf:shppWrapPolygonVertices
         case NS_dff::LN_shpdxWrapDistLeft /*900*/: // contains a twip/635 value
+        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
             //todo: changes have to be applied depending on the orientation, see SwWW8ImplReader::AdjustLRWrapForWordMargins()
             m_pImpl->nLeftMargin = nIntValue / 360;
         break;
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
         case NS_dff::LN_shpdyWrapDistTop /*901*/:  // contains a twip/635 value
+        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
             //todo: changes have to be applied depending on the orientation, see SwWW8ImplReader::AdjustULWrapForWordMargins()
             m_pImpl->nTopMargin = nIntValue / 360;
         break;
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
         case NS_dff::LN_shpdxWrapDistRight /*902*/:// contains a twip/635 value
+        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
             //todo: changes have to be applied depending on the orientation, see SwWW8ImplReader::AdjustLRWrapForWordMargins()
             m_pImpl->nRightMargin = nIntValue / 360;
         break;
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
         case NS_dff::LN_shpdyWrapDistBottom /*903*/:// contains a twip/635 value
+        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
             //todo: changes have to be applied depending on the orientation, see SwWW8ImplReader::AdjustULWrapForWordMargins()
             m_pImpl->nBottomMargin = nIntValue / 360;
         break;
+        case NS_dff::LN_shpfPrint              /*959*/:
         /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shplidRegroup /*904*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfEditedWrap /*953*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfBehindDocument /*954*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfOnDblClickNotify /*955*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfIsButton /*956*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfOneD /*957*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-//        case NS_dff::LN_shpfHidden /*958*/:
-        /* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
-        case NS_dff::LN_shpfPrint              /*959*/:  break;  // rtf:shpfPrint
-
+            break;  // rtf:shpfPrint
         default:
             OSL_ENSURE( false, "shape option unsupported?");
     }
@@ -1783,6 +1354,7 @@ void GraphicImport::sprm(Sprm & rSprm)
         case NS_ooxml::LN_CT_WrapTight_wrapPolygon: // 90933;
         case NS_ooxml::LN_graphic_graphic:
         case NS_ooxml::LN_pic_pic:
+            /* WRITERFILTERSTATUS: done: 100, planned: 0.5, spent: 0 */
         {
             writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps();
             if( pProperties.get())
@@ -1803,13 +1375,16 @@ void GraphicImport::sprm(Sprm & rSprm)
         }
         break;
         case NS_ooxml::LN_EG_WrapType_wrapNone: // 90944; - doesn't contain attributes
+            /* WRITERFILTERSTATUS: done: 100, planned: 0.5, spent: 0 */
             //depending on the behindDoc attribute text wraps through behind or in fron of the object
             m_pImpl->nWrap = text::WrapTextMode_THROUGHT;
         break;
         case NS_ooxml::LN_EG_WrapType_wrapTopAndBottom: // 90948;
+            /* WRITERFILTERSTATUS: done: 100, planned: 0.5, spent: 0 */
             m_pImpl->nWrap = text::WrapTextMode_NONE;
         break;
         case NS_ooxml::LN_EG_WrapType_wrapThrough: // 90947;
+            /* WRITERFILTERSTATUS: done: 100, planned: 0.5, spent: 0 */
             m_pImpl->nWrap = text::WrapTextMode_THROUGHT;
         break;
         case 0xf010:
@@ -1817,6 +1392,7 @@ void GraphicImport::sprm(Sprm & rSprm)
             //ignore - doesn't contain useful members
         break;
         case NS_ooxml::LN_CT_GraphicalObject_graphicData:// 90660;
+            /* WRITERFILTERSTATUS: done: 100, planned: 0.5, spent: 0 */
             {
                 m_pImpl->bIsGraphic = true;