drop AutoColorInvalid/SID_ATTR_AUTO_COLOR_INVALID
it doesn't appear to exist/be implemented and makes
the reportdesigner font dialog from conditional
formatting crash
Change-Id: Iad929fec8aedfa31f6e8f9dfaa0055d61a9ff6f3
diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc
index 919259e1..8a7f7c5 100644
--- a/include/svx/svxids.hrc
+++ b/include/svx/svxids.hrc
@@ -750,7 +750,7 @@
#define SID_READONLY_MODE ( SID_SVX_START + 930 )
#define SID_ATTR_ALIGN_HYPHENATION ( SID_SVX_START + 931 )
#define SID_ATTR_NUMBERFORMAT_SOURCE ( SID_SVX_START + 932 )
#define SID_ATTR_AUTO_COLOR_INVALID ( SID_SVX_START + 933 )
#define SID_RULER_BORDER_DISTANCE ( SID_SVX_START + 935 )
#define SID_INSERT_DATEFIELD ( SID_SVX_START + 936 )
#define SID_INSERT_TIMEFIELD ( SID_SVX_START + 937 )
diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index 0693af6..2e8b2f6 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -3596,25 +3596,6 @@ SfxBoolItem Freeline_Unfilled SID_DRAW_FREELINE_NOFILL
]
SfxBoolItem AutoColorInvalid SID_ATTR_AUTO_COLOR_INVALID
[
AutoUpdate = TRUE,
FastCall = FALSE,
ReadOnlyDoc = FALSE,
Toggle = FALSE,
Container = TRUE,
RecordAbsolute = FALSE,
RecordPerSet;
AccelConfig = FALSE,
MenuConfig = FALSE,
ToolBoxConfig = FALSE,
GroupId = GID_INSERT;
]
SfxVoidItem Gallery SID_GALLERY
[
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 800e53a..b754581 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -1298,15 +1298,7 @@ SvxColorWindow::SvxColorWindow(const OUString& rCommand,
case SID_ATTR_CHAR_COLOR2:
case SID_EXTRUSION_3D_COLOR:
{
SfxPoolItem* pDummy;
Reference< XDispatchProvider > aDisp( GetFrame()->getController(), UNO_QUERY );
SfxQueryStatus aQueryStatus( aDisp,
SID_ATTR_AUTO_COLOR_INVALID,
OUString( ".uno:AutoColorInvalid" ));
SfxItemState eState = aQueryStatus.QueryState( pDummy );
if( (SfxItemState::DEFAULT > eState) || ( SID_EXTRUSION_3D_COLOR == theSlotId ) )
mpButtonAutoColor->SetText( SVX_RESSTR( RID_SVXSTR_AUTOMATIC ) );
mpButtonAutoColor->SetText( SVX_RESSTR( RID_SVXSTR_AUTOMATIC ) );
break;
}
default:
