[Libreoffice-commits] core.git: filter/source include/svx

[Stephan Bergmann]

 filter/source/msfilter/msdffimp.cxx |    2 +-
 include/svx/msdffdef.hxx            |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 60eeeb9d2fae66f2f2e85ef05feda8022a5af1cf
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Aug 21 14:51:11 2014 +0200

    Avoid undefined MSO_LineStyle values outside the enum's value range
    
    Change-Id: Ie9eee91374818cbfbb10a7d91e0fb2114ce140b4

diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 4764533..9f01e10 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -5357,7 +5357,7 @@ SdrObject* SvxMSDffManager::ProcessObj(SvStream& rSt,
                             ? (MSO_LineStyle)GetPropertyValue(
                                                 DFF_Prop_lineStyle,
                                                 mso_lineSimple )
-                            : (MSO_LineStyle)USHRT_MAX;
+                            : MSO_LineStyle_NONE;
         pTextImpRec->eLineStyle = pImpRec->eLineStyle;
 
         pImpRec->eLineDashing = (MSO_LineDashing)GetPropertyValue(
diff --git a/include/svx/msdffdef.hxx b/include/svx/msdffdef.hxx
index 924ac98..420b247 100644
--- a/include/svx/msdffdef.hxx
+++ b/include/svx/msdffdef.hxx
@@ -1002,7 +1002,8 @@ enum MSO_LineStyle {
    mso_lineDouble,          // Double lines of equal width
    mso_lineThickThin,       // Double lines, one thick, one thin
    mso_lineThinThick,       // Double lines, reverse order
-   mso_lineTriple           // Three lines, thin, thick, thin
+   mso_lineTriple,          // Three lines, thin, thick, thin
+   MSO_LineStyle_NONE = USHRT_MAX
 };
 
 // MSO_LINETYPE - how to "fill" the line contour