svx/source/dialog/fontwork.cxx | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-)
New commits: commit 77191f727fdf844e3780d5c1aec8225b344718e7 Author: Regina Henschel <rb.hensc...@t-online.de> Date: Thu May 5 23:25:53 2016 +0200 tdf#94221 repair dialog for text along path This corrects some errors in converting old kind dialog to glade. Separator items are count too, but were not considered. Therefore button and action were not sync. Two RADIOCHECK and CHECKABLE were wrong. Change-Id: Ie2c2f2febe7f7264fd08b8847dc72c3ee8d49a8c Reviewed-on: https://gerrit.libreoffice.org/24684 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Maxim Monastirsky <momonas...@gmail.com> (cherry picked from commit b8528dcb9c0c5ee75742df3c0e5ee9f373fbf154) Reviewed-on: https://gerrit.libreoffice.org/24795 diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx index 89e9026..9b4a886 100644 --- a/svx/source/dialog/fontwork.cxx +++ b/svx/source/dialog/fontwork.cxx @@ -194,37 +194,40 @@ SvxFontWorkDialog::SvxFontWorkDialog(SfxBindings *pBindinx, get(m_pTbxStyle, "style"); nStyleOffId = m_pTbxStyle->GetItemId(0); m_pTbxStyle->SetItemBits(nStyleOffId, ToolBoxItemBits::AUTOCHECK); - nStyleRotateId = m_pTbxStyle->GetItemId(1); + // separator is item "1" + nStyleRotateId = m_pTbxStyle->GetItemId(2); m_pTbxStyle->SetItemBits(nStyleRotateId, ToolBoxItemBits::AUTOCHECK|ToolBoxItemBits::RADIOCHECK); - nStyleUprightId = m_pTbxStyle->GetItemId(2); + nStyleUprightId = m_pTbxStyle->GetItemId(3); m_pTbxStyle->SetItemBits(nStyleUprightId, ToolBoxItemBits::AUTOCHECK|ToolBoxItemBits::RADIOCHECK); - nStyleSlantXId = m_pTbxStyle->GetItemId(3); + nStyleSlantXId = m_pTbxStyle->GetItemId(4); m_pTbxStyle->SetItemBits(nStyleSlantXId, ToolBoxItemBits::AUTOCHECK|ToolBoxItemBits::RADIOCHECK); - nStyleSlantYId = m_pTbxStyle->GetItemId(4); + nStyleSlantYId = m_pTbxStyle->GetItemId(5); m_pTbxStyle->SetItemBits(nStyleSlantYId, ToolBoxItemBits::AUTOCHECK|ToolBoxItemBits::RADIOCHECK); get(m_pTbxShadow, "shadow"); nShowFormId = m_pTbxShadow->GetItemId(0); m_pTbxShadow->SetItemBits(nShowFormId, ToolBoxItemBits::AUTOCHECK|ToolBoxItemBits::CHECKABLE); nOutlineId = m_pTbxShadow->GetItemId(1); - m_pTbxShadow->SetItemBits(nOutlineId, ToolBoxItemBits::AUTOCHECK|ToolBoxItemBits::RADIOCHECK); - nShadowOffId = m_pTbxShadow->GetItemId(2); + m_pTbxShadow->SetItemBits(nOutlineId, ToolBoxItemBits::AUTOCHECK|ToolBoxItemBits::CHECKABLE); + // separator is item "2" + nShadowOffId = m_pTbxShadow->GetItemId(3); m_pTbxShadow->SetItemBits(nShadowOffId, ToolBoxItemBits::AUTOCHECK|ToolBoxItemBits::RADIOCHECK); - nShadowNormalId = m_pTbxShadow->GetItemId(3); + nShadowNormalId = m_pTbxShadow->GetItemId(4); m_pTbxShadow->SetItemBits(nShadowNormalId, ToolBoxItemBits::AUTOCHECK|ToolBoxItemBits::RADIOCHECK); - nShadowSlantId = m_pTbxShadow->GetItemId(4); + nShadowSlantId = m_pTbxShadow->GetItemId(5); m_pTbxShadow->SetItemBits(nShadowSlantId, ToolBoxItemBits::AUTOCHECK|ToolBoxItemBits::RADIOCHECK); get(m_pTbxAdjust, "adjust"); nAdjustMirrorId = m_pTbxAdjust->GetItemId(0); m_pTbxAdjust->SetItemBits(nAdjustMirrorId, ToolBoxItemBits::AUTOCHECK|ToolBoxItemBits::CHECKABLE); - nAdjustLeftId = m_pTbxAdjust->GetItemId(1); - m_pTbxAdjust->SetItemBits(nAdjustLeftId, ToolBoxItemBits::AUTOCHECK|ToolBoxItemBits::CHECKABLE); - nAdjustCenterId = m_pTbxAdjust->GetItemId(2); + // separator is item "1" + nAdjustLeftId = m_pTbxAdjust->GetItemId(2); + m_pTbxAdjust->SetItemBits(nAdjustLeftId, ToolBoxItemBits::AUTOCHECK|ToolBoxItemBits::RADIOCHECK); + nAdjustCenterId = m_pTbxAdjust->GetItemId(3); m_pTbxAdjust->SetItemBits(nAdjustCenterId, ToolBoxItemBits::AUTOCHECK|ToolBoxItemBits::RADIOCHECK); - nAdjustRightId = m_pTbxAdjust->GetItemId(3); + nAdjustRightId = m_pTbxAdjust->GetItemId(4); m_pTbxAdjust->SetItemBits(nAdjustRightId, ToolBoxItemBits::AUTOCHECK|ToolBoxItemBits::RADIOCHECK); - nAdjustAutoSizeId = m_pTbxAdjust->GetItemId(4); + nAdjustAutoSizeId = m_pTbxAdjust->GetItemId(5); m_pTbxAdjust->SetItemBits(nAdjustAutoSizeId, ToolBoxItemBits::AUTOCHECK|ToolBoxItemBits::RADIOCHECK); ApplyImageList(); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits