sw/source/ui/frmdlg/frmpage.cxx | 5 +++++ sw/source/ui/inc/frmpage.hxx | 1 + sw/uiconfig/swriter/ui/frmaddpage.ui | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-)
New commits: commit 2d3caece27d2353d0e7d82917c32aceba45859c5 Author: Olivier Hallot <olivier.hal...@edx.srv.br> Date: Sun Jul 14 19:39:19 2013 -0300 Remove a glitch left in sweb frame dialog widget UI Under Writer Web, Pictures and OLE objects have no properties Change-Id: I18bf1820512a54181181d32b89356aebd0dfa4cb Reviewed-on: https://gerrit.libreoffice.org/4905 Tested-by: Caolán McNamara <caol...@redhat.com> Reviewed-by: Caolán McNamara <caol...@redhat.com> diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index 4240747..1045e27 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -2752,6 +2752,7 @@ SwFrmAddPage::SwFrmAddPage(Window *pParent, const SfxItemSet &rSet ) : get(pProtectFrameCB,"protectframe"); get(pProtectSizeCB,"protectsize"); + get(pPropertiesFrame,"properties"); get(pEditInReadonlyCB,"editinreadonly"); get(pPrintFrameCB,"printframe"); get(pTextFlowFT,"textflow_label"); @@ -2782,6 +2783,10 @@ void SwFrmAddPage::Reset(const SfxItemSet &rSet ) if ( DLG_FRM_GRF == nDlgType || DLG_FRM_OLE == nDlgType ) { pEditInReadonlyCB->Hide(); + if (bHtmlMode) + { + pPropertiesFrame->Hide(); + } } if(SFX_ITEM_SET == rSet.GetItemState(FN_SET_FRM_ALT_NAME, sal_False, &pItem)) diff --git a/sw/source/ui/inc/frmpage.hxx b/sw/source/ui/inc/frmpage.hxx index 4a7ab7d..4858bbd 100644 --- a/sw/source/ui/inc/frmpage.hxx +++ b/sw/source/ui/inc/frmpage.hxx @@ -284,6 +284,7 @@ class SwFrmAddPage : public SfxTabPage CheckBox* pProtectFrameCB; CheckBox* pProtectSizeCB; + VclContainer* pPropertiesFrame; CheckBox* pEditInReadonlyCB; CheckBox* pPrintFrameCB; FixedText* pTextFlowFT; diff --git a/sw/uiconfig/swriter/ui/frmaddpage.ui b/sw/uiconfig/swriter/ui/frmaddpage.ui index 168dac7..96e6fa6 100644 --- a/sw/uiconfig/swriter/ui/frmaddpage.ui +++ b/sw/uiconfig/swriter/ui/frmaddpage.ui @@ -271,7 +271,7 @@ </packing> </child> <child> - <object class="GtkFrame" id="frame3"> + <object class="GtkFrame" id="properties"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property>
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits