diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2018-02-25 21:00:07 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2018-02-26 09:49:53 +0100 |
| commit | 074fc4a1499aac6eb67cd0b2dca00a51071cff0e (patch) | |
| tree | d36569cff20ecfdea219578904e04c763ed6401f /sw/source/uibase/app/docst.cxx | |
| parent | 8e157d2608715c0b871bffcb32d79d00ccb72061 (diff) | |
tdf#116020: use actual whichIds in dialogs for character properties
... instead of converting back and forth between character-specific
whichIds and generic. This eliminates creating duplicate properties
in the set passed to dialog.
A temporary GrabBag entry "DialogUseCharAttr" is used to indicate
that dialogs should use character-specific Ids. This simplifies and
unifies preparation of the set for different dialogs.
Change-Id: I41b982ff05d54b0dfc283c07aef806f51c87209c
Reviewed-on: https://gerrit.libreoffice.org/50339
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'sw/source/uibase/app/docst.cxx')
| -rw-r--r-- | sw/source/uibase/app/docst.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/uibase/app/docst.cxx b/sw/source/uibase/app/docst.cxx index ab91f5e13f26..9b785bf31c9a 100644 --- a/sw/source/uibase/app/docst.cxx +++ b/sw/source/uibase/app/docst.cxx @@ -601,7 +601,7 @@ IMPL_LINK_NOARG(ApplyStyle, ApplyHdl, LinkParamNone*, void) SfxItemSet aTmpSet( *m_pDlg->GetOutputItemSet() ); if( SfxStyleFamily::Char == m_nFamily ) { - ::ConvertAttrGenToChar(aTmpSet, m_xTmp->GetItemSet(), CONV_ATTR_STD); + ::ConvertAttrGenToChar(aTmpSet, m_xTmp->GetItemSet()); } m_xTmp->SetItemSet( aTmpSet ); @@ -784,7 +784,7 @@ void SwDocShell::Edit( } else if( SfxStyleFamily::Char == nFamily ) { - ::ConvertAttrCharToGen(xTmp->GetItemSet(), CONV_ATTR_STD); + ::ConvertAttrCharToGen(xTmp->GetItemSet()); } if(SfxStyleFamily::Page == nFamily || SfxStyleFamily::Para == nFamily) @@ -880,7 +880,7 @@ void SwDocShell::Edit( ::SfxToSwPageDescAttr( *GetWrtShell(), xTmp->GetItemSet() ); else { - ::ConvertAttrGenToChar(xTmp->GetItemSet(), xTmp->GetItemSet(), CONV_ATTR_STD); + ::ConvertAttrGenToChar(xTmp->GetItemSet(), xTmp->GetItemSet()); } if(SfxStyleFamily::Page == nFamily) m_pView->InvalidateRulerPos(); |