[Libreoffice-commits] libmspub.git: src/lib

[Fridrich Å trba]

 src/lib/FillType.h      |   16 +++++++++-------
 src/lib/MSPUBParser.cpp |    1 +
 2 files changed, 10 insertions(+), 7 deletions(-)

New commits:
commit e5e507286213ae90072ac75fa594b80505340fdf
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Tue Apr 16 10:28:48 2013 +0200

    Make the enum complete

diff --git a/src/lib/FillType.h b/src/lib/FillType.h
index b08e6a3..b0d35f2 100644
--- a/src/lib/FillType.h
+++ b/src/lib/FillType.h
@@ -33,17 +33,19 @@ namespace libmspub
 {
 enum FillType
 {
-  SOLID,
+  SOLID = 0x00,
+  PATTERN = 0x01,
+  TEXTURE = 0x02,
+  BITMAP = 0x03,
+  SHADE = 0x04, // msofillShade       Shade from start to end points
+  SHADE_CENTER = 0x05,  // msofillShadeCenter Shade from bounding rectangle to end point
+  SHADE_SHAPE = 0x06, // msofillShadeShape  Shade from shape outline to end point
   SHADE_SCALE = 0x07, // msofillShadeScale Similar to msofillShade, but the fillAngle
   // is additionally scaled by the aspect ratio of
   // the shape. If shape is square, it is the
   // same as msofillShade
-  SHADE_SHAPE = 0x06, // msofillShadeShape  Shade from shape outline to end point
-  SHADE_CENTER = 0x05,  // msofillShadeCenter Shade from bounding rectangle to end point
-  SHADE = 0x04, // msofillShade       Shade from start to end points
-  BITMAP = 0x03,
-  TEXTURE = 0x02,
-  PATTERN = 0x01
+  SHADE_TITLE = 0x08,
+  BACKGROUND = 0x09
 };
 } // libmspub
 #endif /* __FILLTYPE_H__ */
diff --git a/src/lib/MSPUBParser.cpp b/src/lib/MSPUBParser.cpp
index 888686a..9851ec6 100644
--- a/src/lib/MSPUBParser.cpp
+++ b/src/lib/MSPUBParser.cpp
@@ -1992,6 +1992,7 @@ boost::shared_ptr<libmspub::Fill> libmspub::MSPUBParser::getNewFill(const std::m
       return boost::shared_ptr<Fill>(new PatternFill(m_escherDelayIndices[*ptr_bgPxId - 1], m_collector, fill, back));
     }
   }
+  case BACKGROUND:
   default:
     return boost::shared_ptr<Fill>();
   }