sfx2/source/dialog/templdlg.cxx | 12 ++++++++---- sw/source/core/layout/frmtool.cxx | 3 +++ 2 files changed, 11 insertions(+), 4 deletions(-)
New commits: commit 66f8bbc1b2e7397557d0d6434b90bc5af561acbd Author: Michael Stahl <[email protected]> Date: Tue Feb 5 00:36:10 2013 +0100 SfxCommonTemplateDialog_Impl::SelectStyle: Deselect everything before selecting a style. Fixes the problem that travelling around with the cursor leads to accumulating multiple selection of every style the cursor runs across. (regression from 439ac45925039aa7a537feedab3e731e8a60a8e5) Change-Id: I5d51122a719a160c6428e196b32264a90f984579 diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 31920f2..c5f2870 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -1045,10 +1045,14 @@ void SfxCommonTemplateDialog_Impl::SelectStyle(const String &rStr) bSelect = sal_False; else { - aFmtLb.MakeVisible( pEntry ); - aFmtLb.Select( pEntry ); - bWaterDisabled = (aFmtLb.GetSelectionCount() <=1 ? sal_False : sal_True); - FmtSelectHdl( NULL ); + if (!aFmtLb.IsSelected(pEntry)) + { + aFmtLb.MakeVisible( pEntry ); + aFmtLb.SelectAll(false); + aFmtLb.Select( pEntry ); + bWaterDisabled = (aFmtLb.GetSelectionCount() <=1 ? sal_False : sal_True); + FmtSelectHdl( NULL ); + } } } commit 2fc87188bd4a73d25b64b32e0287cee5d6ee4a48 Author: Michael Stahl <[email protected]> Date: Mon Feb 4 23:26:50 2013 +0100 fdo#60250: InsertNewPage: copy margins for mirrored pages When there is no explicit first page, set the proper left or right margins, which are different for mirrored page styles. (regression from a964cf666abb0c4df4e29ea8709532b7d45c104f) Change-Id: I56ccc6f7987accefc27d627d2427ee37d83bd758 diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx index db4ef96..f0bafde 100644 --- a/sw/source/core/layout/frmtool.cxx +++ b/sw/source/core/layout/frmtool.cxx @@ -2729,11 +2729,14 @@ SwPageFrm * InsertNewPage( SwPageDesc &rDesc, SwFrm *pUpper, { rDesc.GetFirst().SetFmtAttr( rDesc.GetMaster().GetHeader() ); rDesc.GetFirst().SetFmtAttr( rDesc.GetMaster().GetFooter() ); + // fdo#60250 copy margins for mirrored pages + rDesc.GetFirst().SetFmtAttr( rDesc.GetMaster().GetLRSpace() ); } else { rDesc.GetFirst().SetFmtAttr( rDesc.GetLeft().GetHeader() ); rDesc.GetFirst().SetFmtAttr( rDesc.GetLeft().GetFooter() ); + rDesc.GetFirst().SetFmtAttr( rDesc.GetLeft().GetLRSpace() ); } } pFmt = rDesc.GetFirstFmt(); _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
