mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Basic IDE Options code completion tweak."

Browse Source 
This reverts commit 536fcf91de.

Based on a IRC discussion, it seems that a comment is enough to block a patch, and not as defined a -1.

Furthermore this patch caused a core dump on the munich tinderbox, where the cause is very unclear.

Change-Id: I0caeeb354444b33942ea08e056d26ead97264d74
Reviewed-on: https://gerrit.libreoffice.org/20924
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: jan iversen <jani@documentfoundation.org>
This commit is contained in:
jan iversen
2015-12-24 14:47:22 +00:00
parent 321dc29fc5
commit df862448b7
3 changed files with 53 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cui/source/options/optbasic.cxx
View File

@@ -75,8 +75,6 @@ void SvxBasicIDEOptionsPage::LoadConfig()
pAutocloseParenChk->Check( bParenClose );
pAutoCorrectChk->Check( bCorrect );
pUseExtendedTypesChk->Check( bExtended );
pUseExtendedTypesChk->SetToggleHdl( LINK( this, SvxBasicIDEOptionsPage, EnableExtType ) );
pCodeCompleteChk->Enable(pUseExtendedTypesChk->IsChecked());
}
bool SvxBasicIDEOptionsPage::FillItemSet( SfxItemSet* /*rCoreSet*/ )
@@ -160,13 +158,4 @@ void SvxBasicIDEOptionsPage::FillUserData()
SetUserData( aUserData );
}
IMPL_LINK_NOARG_TYPED(SvxBasicIDEOptionsPage, EnableExtType, CheckBox&, void)
{
bool bEnable = pUseExtendedTypesChk->IsChecked();
pCodeCompleteChk->Enable(bEnable);
if (!pUseExtendedTypesChk->IsChecked())
{
pCodeCompleteChk->Check(false);
}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

2
cui/source/options/optbasic.hxx
View File

@@ -35,8 +35,6 @@ private:
VclPtr<CheckBox> pUseExtendedTypesChk;
void LoadConfig();
DECL_LINK_TYPED( EnableExtType, CheckBox&, void );
public:
SvxBasicIDEOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet );

70
cui/uiconfig/ui/optbasicidepage.ui
View File

@@ -8,6 +8,57 @@
<property name="border_width">6</property>
<property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
<object class="GtkFrame" id="frame1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
<object class="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkCheckButton" id="codecomplete_enable">
<property name="label" translatable="yes">Enable code completion</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
</packing>
</child>
</object>
</child>
</object>
</child>
<child type="label">
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Code Completion</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkFrame" id="frame2">
<property name="visible">True</property>
@@ -100,7 +151,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
<property name="position">1</property>
</packing>
</child>
<child>
@@ -134,21 +185,6 @@
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="codecomplete_enable">
<property name="label" translatable="yes">Enable code completion</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="margin_left">25</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
</packing>
</child>
</object>
</child>
</object>
@@ -167,7 +203,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
<property name="position">2</property>
</packing>
</child>
</object>