summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cui/source/inc/helpid.hrc1
-rw-r--r--cui/source/tabpages/paragrph.cxx10
-rw-r--r--cui/uiconfig/ui/asiantypography.ui2
3 files changed, 7 insertions, 6 deletions
diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc
index e67692a9db47..f041f41b1ec3 100644
--- a/cui/source/inc/helpid.hrc
+++ b/cui/source/inc/helpid.hrc
@@ -273,7 +273,6 @@
#define HID_MEASURE_CTL_PREVIEW "CUI_HID_MEASURE_CTL_PREVIEW"
#define HID_FORMAT_PARAGRAPH_EXT "CUI_HID_FORMAT_PARAGRAPH_EXT"
#define HID_FORMAT_PARAGRAPH_ALIGN "CUI_HID_FORMAT_PARAGRAPH_ALIGN"
-#define HID_SVXPAGE_PARA_ASIAN "CUI_HID_SVXPAGE_PARA_ASIAN"
#define HID_SVXPAGE_SWPOSSIZE "CUI_HID_SVXPAGE_SWPOSSIZE"
#define HID_AREA_TRANSPARENCE "CUI_HID_AREA_TRANSPARENCE"
#define HID_AREA_AREA "CUI_HID_AREA_AREA"
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 96753dd7cae8..cf8ded02923a 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -2253,12 +2253,12 @@ sal_uInt16* SvxAsianTabPage::GetRanges()
};
return pRanges;
}
-//FIXME: This crash in Calc, but works in Writer/Draw/Impress
-sal_Bool SvxAsianTabPage::FillItemSet( SfxItemSet& rSet )
+
+sal_Bool SvxAsianTabPage::FillItemSet( SfxItemSet& rSet )
{
sal_Bool bRet = sal_False;
SfxItemPool* pPool = rSet.GetPool();
- if(m_pScriptSpaceCB->IsChecked() != m_pScriptSpaceCB->GetSavedValue())
+ if (m_pScriptSpaceCB->IsEnabled() && m_pScriptSpaceCB->IsChecked() != m_pScriptSpaceCB->GetSavedValue())
{
SfxBoolItem* pNewItem = (SfxBoolItem*)rSet.Get(
pPool->GetWhich(SID_ATTR_PARA_SCRIPTSPACE)).Clone();
@@ -2267,7 +2267,7 @@ sal_Bool SvxAsianTabPage::FillItemSet( SfxItemSet& rSet )
delete pNewItem;
bRet = sal_True;
}
- if(m_pHangingPunctCB->IsChecked() != m_pHangingPunctCB->GetSavedValue())
+ if (m_pHangingPunctCB->IsEnabled() && m_pHangingPunctCB->IsChecked() != m_pHangingPunctCB->GetSavedValue())
{
SfxBoolItem* pNewItem = (SfxBoolItem*)rSet.Get(
pPool->GetWhich(SID_ATTR_PARA_HANGPUNCTUATION)).Clone();
@@ -2276,7 +2276,7 @@ sal_Bool SvxAsianTabPage::FillItemSet( SfxItemSet& rSet )
delete pNewItem;
bRet = sal_True;
}
- if(m_pForbiddenRulesCB->IsChecked() != m_pForbiddenRulesCB->GetSavedValue())
+ if (m_pForbiddenRulesCB->IsEnabled() && m_pForbiddenRulesCB->IsChecked() != m_pForbiddenRulesCB->GetSavedValue())
{
SfxBoolItem* pNewItem = (SfxBoolItem*)rSet.Get(
pPool->GetWhich(SID_ATTR_PARA_FORBIDDEN_RULES)).Clone();
diff --git a/cui/uiconfig/ui/asiantypography.ui b/cui/uiconfig/ui/asiantypography.ui
index eeeb7a432812..012ad372f804 100644
--- a/cui/uiconfig/ui/asiantypography.ui
+++ b/cui/uiconfig/ui/asiantypography.ui
@@ -11,12 +11,14 @@
<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="GtkBox" id="box1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
+ <property name="spacing">6</property>
<child>
<object class="GtkCheckButton" id="checkForbidList">
<property name="label" translatable="yes">Apply list of forbidden characters to the beginning and end of lines</property>