[Libreoffice-commits] core.git: sfx2/source

Tor Lillqvist tml at collabora.com
Wed Sep 10 09:08:09 PDT 2014


 sfx2/source/toolbox/tbxitem.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 71f75fcac9d3696010f7cda16115c4392559ff4b
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Sep 10 19:04:33 2014 +0300

    no member named 'UNKNOWN' in 'SfxItemState'
    
    Change-Id: Ice3d2bc4a575b324377273cdb655e06577f6a4a2

diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index 22a36a7..0e559cb 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -549,7 +549,7 @@ throw ( ::com::sun::star::uno::RuntimeException, std::exception )
                     rEvent.State >>= aItemStatus;
                     SfxItemState tmpState = (SfxItemState) aItemStatus.State;
                     // make sure no-one tries to send us a combination of states
-                    if (eState != SfxItemState::UNKNOWN && eState != SFX_ITEM_DISABLED &&
+                    if (eState != SFX_ITEM_UNKNOWN && eState != SFX_ITEM_DISABLED &&
                         eState != SFX_ITEM_READONLY && eState != SFX_ITEM_DONTCARE &&
                         eState != SFX_ITEM_DEFAULT && eState != SFX_ITEM_SET)
                         throw ::com::sun::star::uno::RuntimeException("unknown status");
@@ -1103,7 +1103,7 @@ throw ( ::com::sun::star::uno::RuntimeException, std::exception )
                     rEvent.State >>= aItemStatus;
                     SfxItemState tmpState = (SfxItemState) aItemStatus.State;
                     // make sure no-one tries to send us a combination of states
-                    if (eState != SfxItemState::UNKNOWN && eState != SFX_ITEM_DISABLED &&
+                    if (eState != SFX_ITEM_UNKNOWN && eState != SFX_ITEM_DISABLED &&
                         eState != SFX_ITEM_READONLY && eState != SFX_ITEM_DONTCARE &&
                         eState != SFX_ITEM_DEFAULT && eState != SFX_ITEM_SET)
                         throw ::com::sun::star::uno::RuntimeException("unknown status");


More information about the Libreoffice-commits mailing list