[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - include/svl

[Andras Timar]

 include/svl/poolitem.hxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit a78f63f513cee4e1caeb730dae270e76b1009e14
Author: Andras Timar <andras.timar at collabora.com>
Date:   Mon Jun 8 16:34:39 2015 +0200

    tdf#90804 Revert "remove unused values from SfxFieldUnit enum"
    
    This reverts commit b78d881520f2eb658180e2c90ffee3d30a80f0ae.
    
    Change-Id: I68340831d2397b1d3e2fc44c07ba01bacdd93162
    Reviewed-on: https://gerrit.libreoffice.org/16162
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/include/svl/poolitem.hxx b/include/svl/poolitem.hxx
index df4b6fb..ad8807a 100644
--- a/include/svl/poolitem.hxx
+++ b/include/svl/poolitem.hxx
@@ -85,7 +85,9 @@ inline ::com::sun::star::uno::Any Bool2Any( bool bValue )
 //! Notloesung!!!
 enum SfxFieldUnit
 {
-    SFX_FUNIT_NONE, SFX_FUNIT_TWIP
+    SFX_FUNIT_NONE, SFX_FUNIT_MM, SFX_FUNIT_CM, SFX_FUNIT_M, SFX_FUNIT_KM,
+    SFX_FUNIT_TWIP, SFX_FUNIT_POINT, SFX_FUNIT_PICA,
+    SFX_FUNIT_INCH, SFX_FUNIT_FOOT, SFX_FUNIT_MILE, SFX_FUNIT_CHAR, SFX_FUNIT_LINE, SFX_FUNIT_CUSTOM
 };
 
 enum SfxMapUnit