Kaydet (Commit) 9897942d authored tarafından Caolán McNamara's avatar Caolán McNamara

Tweak hyphen as a togglable option after all

In a65f48f3 I wondered why hyphenation was set
to be a toggle able feature when it opens a non-modal dialog.

Looking closer, it *is* a toggable feature on/off for draw/impress, but this
isn't the case for writer. Reverted it for calc too, although apparently
not toggable there.

Change-Id: If02568d58253c380e6d668a728f9c3ae6acf1128
üst 1b66ced2
...@@ -3439,7 +3439,7 @@ SfxVoidItem Hyphenate SID_ENABLE_HYPHENATION ...@@ -3439,7 +3439,7 @@ SfxVoidItem Hyphenate SID_ENABLE_HYPHENATION
HasCoreId = FALSE, HasCoreId = FALSE,
HasDialog = TRUE, HasDialog = TRUE,
ReadOnlyDoc = FALSE, ReadOnlyDoc = FALSE,
Toggle = FALSE, Toggle = TRUE,
Container = FALSE, Container = FALSE,
RecordAbsolute = FALSE, RecordAbsolute = FALSE,
RecordPerSet; RecordPerSet;
......
...@@ -3260,7 +3260,7 @@ SfxBoolItem Hyphenation SID_HYPHENATION ...@@ -3260,7 +3260,7 @@ SfxBoolItem Hyphenation SID_HYPHENATION
HasCoreId = FALSE, HasCoreId = FALSE,
HasDialog = FALSE, HasDialog = FALSE,
ReadOnlyDoc = FALSE, ReadOnlyDoc = FALSE,
Toggle = FALSE, Toggle = TRUE,
Container = FALSE, Container = FALSE,
RecordAbsolute = FALSE, RecordAbsolute = FALSE,
RecordPerSet; RecordPerSet;
......
...@@ -247,15 +247,6 @@ void SwView::GetState(SfxItemSet &rSet) ...@@ -247,15 +247,6 @@ void SwView::GetState(SfxItemSet &rSet)
rSet.Put((const SvxLanguageItem&) rSet.Put((const SvxLanguageItem&)
pWrtShell->GetDefault(RES_CHRATR_CTL_LANGUAGE), RES_CHRATR_CTL_LANGUAGE); pWrtShell->GetDefault(RES_CHRATR_CTL_LANGUAGE), RES_CHRATR_CTL_LANGUAGE);
break; break;
case FN_HYPHENATE_OPT_DLG:
{
sal_Bool bCheck = sal_False;
if (pWrtShell->GetSelectionType() & (nsSelectionType::SEL_DRW_TXT|nsSelectionType::SEL_DRW))
bCheck = IsDrawTextHyphenate();
rSet.Put(SfxBoolItem(nWhich, bCheck));
}
break;
case FN_REDLINE_ON: case FN_REDLINE_ON:
rSet.Put( SfxBoolItem( nWhich, GetDocShell()->IsChangeRecording() ) ); rSet.Put( SfxBoolItem( nWhich, GetDocShell()->IsChangeRecording() ) );
break; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment