sw/UIConfig_swriter.mk | 1 sw/inc/helpid.h | 1 sw/source/ui/config/mailconfigpage.src | 1 sw/uiconfig/swriter/ui/testmailsettings.ui | 177 +++++++++++++++++++++++++++++ vcl/inc/outdev.h | 2 vcl/source/app/svmain.cxx | 1 vcl/source/gdi/outdev3.cxx | 4 7 files changed, 178 insertions(+), 9 deletions(-)
New commits: commit abe21b68fa7d384085a5e2788dcb32bba15025f1 Author: Caolán McNamara <[email protected]> Date: Tue Sep 17 11:50:48 2013 +0100 I think the CWS-gfbfcfg dust has safely settled by now Change-Id: I23201c96fff514cf5eaaf69f9841d3ea6ade6070 diff --git a/vcl/inc/outdev.h b/vcl/inc/outdev.h index fdeae8b..6291866 100644 --- a/vcl/inc/outdev.h +++ b/vcl/inc/outdev.h @@ -245,8 +245,6 @@ struct ImplOutDevData basegfx::B2DHomMatrix* mpInverseViewTransform; }; -void ImplFreeOutDevFontData(); - #endif // _SV_OUTDEV_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx index fdfe580..5bae2df 100644 --- a/vcl/source/app/svmain.cxx +++ b/vcl/source/app/svmain.cxx @@ -550,7 +550,6 @@ void DeInitVCL() pSVData->maGDIData.mpScreenFontList = NULL; delete pSVData->maGDIData.mpScreenFontCache; pSVData->maGDIData.mpScreenFontCache = NULL; - ImplFreeOutDevFontData(); if ( pSVData->mpResMgr ) { diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx index 084d62d..2a0a3b6 100644 --- a/vcl/source/gdi/outdev3.cxx +++ b/vcl/source/gdi/outdev3.cxx @@ -288,10 +288,6 @@ void OutputDevice::ImplUpdateAllFontData( bool bNewFontLists ) } } -// TODO: remove this method when the CWS-gfbfcfg dust has settled -void ImplFreeOutDevFontData() -{} - void OutputDevice::BeginFontSubstitution() { ImplSVData* pSVData = ImplGetSVData(); commit cedb2fb971cafee49a2f545ea29aa2257e14de06 Author: Caolán McNamara <[email protected]> Date: Tue Sep 17 09:10:07 2013 +0100 convert test email account settings to .ui Change-Id: I0582dc7e437382c5802acc45fa3da396e254e0a3 diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk index 9df8021..8160b80 100644 --- a/sw/UIConfig_swriter.mk +++ b/sw/UIConfig_swriter.mk @@ -183,6 +183,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\ sw/uiconfig/swriter/ui/splittable \ sw/uiconfig/swriter/ui/statisticsinfopage \ sw/uiconfig/swriter/ui/stringinput \ + sw/uiconfig/swriter/ui/testmailsettings \ sw/uiconfig/swriter/ui/tocdialog \ sw/uiconfig/swriter/ui/tocentriespage \ sw/uiconfig/swriter/ui/tocindexpage \ diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h index 344a790..5e2c42a 100644 --- a/sw/inc/helpid.h +++ b/sw/inc/helpid.h @@ -382,7 +382,6 @@ #define HID_MM_ASSIGNFIELDS "SW_HID_MM_ASSIGNFIELDS" #define HID_MM_LAYOUT_PAGE "SW_HID_MM_LAYOUT_PAGE" #define HID_MM_ADDRESSLIST_HB "SW_HID_MM_ADDRESSLIST_HB" -#define HID_MM_TESTACCOUNTSETTINGS "SW_HID_MM_TESTACCOUNTSETTINGS" #define HID_MM_TESTACCOUNTSETTINGS_TLB "SW_HID_MM_TESTACCOUNTSETTINGS_TLB" #define HID_MM_TESTACCOUNTSETTINGS_HB "SW_HID_MM_TESTACCOUNTSETTINGS_HB" #define HID_MM_MAILBODY "SW_HID_MM_MAILBODY" diff --git a/sw/source/ui/config/mailconfigpage.src b/sw/source/ui/config/mailconfigpage.src index aaf1588..11b1c91 100644 --- a/sw/source/ui/config/mailconfigpage.src +++ b/sw/source/ui/config/mailconfigpage.src @@ -28,7 +28,6 @@ ModalDialog DLG_MM_TESTACCOUNTSETTINGS { OutputSize = TRUE ; SVLook = TRUE ; - HelpID = HID_MM_TESTACCOUNTSETTINGS; Size = MAP_APPFONT ( 250 , 176 ) ; Moveable = TRUE ; diff --git a/sw/uiconfig/swriter/ui/testmailsettings.ui b/sw/uiconfig/swriter/ui/testmailsettings.ui new file mode 100644 index 0000000..1307d52 --- /dev/null +++ b/sw/uiconfig/swriter/ui/testmailsettings.ui @@ -0,0 +1,177 @@ +<?xml version="1.0" encoding="UTF-8"?> +<interface> + <!-- interface-requires gtk+ 3.0 --> + <object class="GtkDialog" id="TestMailSettings"> + <property name="can_focus">False</property> + <property name="border_width">6</property> + <property name="title" translatable="yes">Test Account Settings</property> + <property name="type_hint">dialog</property> + <child internal-child="vbox"> + <object class="GtkBox" id="dialog-vbox1"> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <property name="spacing">12</property> + <child> + <object class="GtkFrame" id="frame2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> + <child> + <object class="GtkAlignment" id="alignment2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="top_padding">6</property> + <property name="left_padding">12</property> + <child> + <object class="svtlo-SvTabListBox" id="tests"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + </object> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel" id="label8"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label">%PRODUCTNAME is testing the e-mail account settings...</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child internal-child="action_area"> + <object class="GtkButtonBox" id="dialog-action_area1"> + <property name="can_focus">False</property> + <property name="layout_style">end</property> + <child> + <object class="GtkButton" id="stop"> + <property name="label">gtk-stop</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="has_default">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="cancel"> + <property name="label">gtk-cancel</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="help"> + <property name="label">gtk-help</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack_type">end</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkFrame" id="frame1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> + <child> + <object class="GtkAlignment" id="alignment1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="top_padding">6</property> + <property name="left_padding">12</property> + <child> + <object class="GtkScrolledWindow" id="scrolledwindow1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="hscrollbar_policy">always</property> + <property name="vscrollbar_policy">always</property> + <property name="shadow_type">in</property> + <child> + <object class="GtkTextView" id="errors"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="editable">False</property> + <property name="cursor_visible">False</property> + </object> + </child> + </object> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel" id="label1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label">Errors</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + </child> + <action-widgets> + <action-widget response="0">stop</action-widget> + <action-widget response="0">cancel</action-widget> + <action-widget response="0">help</action-widget> + </action-widgets> + </object> +</interface>
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
