summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2016-12-01 14:56:33 +0200
committerJulien Nabet <serval2412@yahoo.fr>2016-12-01 21:47:52 +0000
commit69c3e6bf84d87c072d39660e9451c656c317bead (patch)
treec8fcd68644070095c838f8f15078d24190f04ec8 /svx
parent8cc096b2f43f02186da55050f357e7439350538b (diff)
fix bug in FmFormShell::GetState
Found when attempting an enum conversion. Not sure what effect this will have, it was introduced with commit a0c7b2bc4511da87c776b92aaa77ba7680542fa1 Author: Oliver Bolte <obo@openoffice.org> Date: Tue Nov 16 10:24:21 2004 +0000 INTEGRATION: CWS eforms2 (1.48.52); FILE MERGED which pushed a whole bunch of stuff together. Change-Id: I571fc228c3c0e164aba261e49233ef68ba87e77d Reviewed-on: https://gerrit.libreoffice.org/31491 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Julien Nabet <serval2412@yahoo.fr>
Diffstat (limited to 'svx')
-rw-r--r--svx/source/form/fmshell.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx
index 2b21ee76f259..9aa99864a13e 100644
--- a/svx/source/form/fmshell.cxx
+++ b/svx/source/form/fmshell.cxx
@@ -1027,7 +1027,7 @@ void FmFormShell::GetState(SfxItemSet &rSet)
rSet.DisableItem( nWhich );
else
{
- if ( !GetImpl()->canConvertCurrentSelectionToControl( OBJ_FM_FIXEDTEXT ) )
+ if ( !GetImpl()->canConvertCurrentSelectionToControl( SID_FM_CONVERTTO_FIXEDTEXT ) )
// if it cannot be converted to a fixed text, it is no single control
rSet.DisableItem( nWhich );
}