svx/source/form/fmshell.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 69c3e6bf84d87c072d39660e9451c656c317bead
Author: Noel Grandin <noel.gran...@collabora.co.uk>
Date: Thu Dec 1 14:56:33 2016 +0200
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 <o...@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 <c...@libreoffice.org>
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
Tested-by: Julien Nabet <serval2...@yahoo.fr>
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx
index 2b21ee7..9aa9986 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 );
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
