cui/uiconfig/ui/connpooloptions.ui | 92 +-- sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx | 2 sd/source/ui/view/drviews1.cxx | 14 sd/source/ui/view/drviews2.cxx | 18 sd/source/ui/view/drviews3.cxx | 29 - sd/source/ui/view/drviews4.cxx | 6 sd/source/ui/view/drviews7.cxx | 29 - sd/source/ui/view/drviewsb.cxx | 6 sw/uiconfig/swriter/ui/optredlinepage.ui | 392 +++++++------- ucb/source/ucp/ftp/ftpurl.hxx | 6 10 files changed, 339 insertions(+), 255 deletions(-)
New commits: commit c923b15cd99672e5b93d1ab6314c66caa417c738 Author: Caolán McNamara <[email protected]> Date: Fri Feb 28 13:31:35 2014 +0000 Resolves: fdo#73851 promote labels to headings Change-Id: Ia12b32abfad987bfaecc54005a73ccbeb158f61b diff --git a/sw/uiconfig/swriter/ui/optredlinepage.ui b/sw/uiconfig/swriter/ui/optredlinepage.ui index 3cd59bf..c54bc5e 100644 --- a/sw/uiconfig/swriter/ui/optredlinepage.ui +++ b/sw/uiconfig/swriter/ui/optredlinepage.ui @@ -1,13 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.16.1 --> <interface> - <!-- interface-requires gtk+ 3.0 --> + <requires lib="gtk+" version="3.0"/> <!-- interface-requires LibreOffice 1.0 --> - <object class="GtkBox" id="OptRedLinePage"> + <object class="GtkGrid" id="OptRedLinePage"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> <property name="border_width">6</property> - <property name="orientation">vertical</property> - <property name="spacing">12</property> + <property name="row_spacing">12</property> <child> <object class="GtkFrame" id="frame1"> <property name="visible">True</property> @@ -24,74 +26,79 @@ <property name="top_padding">6</property> <property name="left_padding">12</property> <child> - <object class="GtkGrid" id="grid1"> + <object class="GtkGrid" id="grid3"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="row_spacing">6</property> <property name="column_spacing">12</property> <child> - <object class="GtkLabel" id="label2"> + <object class="GtkLabel" id="insert_label"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Insertions</property> + <property name="label" translatable="yes">_Attributes:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">insert</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">3</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="svtlo-ColorListBox" id="insertcolor"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> <property name="width">1</property> <property name="height">1</property> </packing> </child> <child> - <object class="svtlo-ColorListBox" id="deletedcolor"> + <object class="GtkLabel" id="insertcolor_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">center</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Co_lor:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">insertcolor</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">5</property> + <property name="left_attach">0</property> + <property name="top_attach">1</property> <property name="width">1</property> <property name="height">1</property> </packing> </child> <child> - <object class="GtkComboBox" id="changed"> + <object class="GtkComboBoxText" id="insert"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> + <items> + <item translatable="yes">[None]</item> + <item translatable="yes">Bold</item> + <item translatable="yes">Italic</item> + <item translatable="yes">Underlined</item> + <item translatable="yes">Underlined: double</item> + <item translatable="yes">Strikethrough</item> + <item translatable="yes">Uppercase</item> + <item translatable="yes">Lowercase</item> + <item translatable="yes">Small caps</item> + <item translatable="yes">Title font</item> + <item translatable="yes">Background color</item> + </items> </object> <packing> <property name="left_attach">1</property> - <property name="top_attach">7</property> + <property name="top_attach">0</property> <property name="width">1</property> <property name="height">1</property> </packing> </child> <child> - <object class="svtlo-ColorListBox" id="changedcolor"> + <object class="svtlo-ColorListBox" id="insertcolor"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> </object> <packing> <property name="left_attach">1</property> - <property name="top_attach">8</property> + <property name="top_attach">1</property> <property name="width">1</property> <property name="height">1</property> </packing> @@ -101,229 +108,227 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> - <property name="text" translatable="yes">Insert</property> + <property name="text">Insert</property> </object> <packing> <property name="left_attach">2</property> - <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">2</property> - </packing> - </child> - <child> - <object class="svxlo-SvxFontPrevWindow" id="deletedpreview:border"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="text" translatable="yes">Delete</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">4</property> - <property name="width">1</property> - <property name="height">2</property> - </packing> - </child> - <child> - <object class="svxlo-SvxFontPrevWindow" id="changedpreview:border"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="text" translatable="yes">Attributes</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">7</property> + <property name="top_attach">0</property> <property name="width">1</property> <property name="height">2</property> </packing> </child> + </object> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel" id="label2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Insertions</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkFrame" id="frame3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> + <child> + <object class="GtkAlignment" id="alignment3"> + <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="GtkGrid" id="grid4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> <child> - <object class="GtkAlignment" id="alignment3"> + <object class="GtkLabel" id="deleted_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="left_padding">12</property> - <child> - <object class="GtkLabel" id="insert_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">_Attributes:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">insert</property> - </object> - </child> + <property name="xalign">0</property> + <property name="label" translatable="yes">Attri_butes:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">deleted</property> </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="top_attach">0</property> <property name="width">1</property> <property name="height">1</property> </packing> </child> <child> - <object class="GtkAlignment" id="alignment4"> + <object class="GtkLabel" id="deletedcolor_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="left_padding">12</property> - <child> - <object class="GtkLabel" id="insertcolor_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Co_lor:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">insertcolor</property> - </object> - </child> + <property name="xalign">0</property> + <property name="label" translatable="yes">Col_or:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">deletedcolor</property> </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">2</property> + <property name="top_attach">1</property> <property name="width">1</property> <property name="height">1</property> </packing> </child> <child> - <object class="GtkAlignment" id="alignment5"> + <object class="GtkComboBox" id="deleted"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="left_padding">12</property> - <child> - <object class="GtkLabel" id="deleted_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Attri_butes:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">deleted</property> - </object> - </child> + <property name="valign">center</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">4</property> + <property name="left_attach">1</property> + <property name="top_attach">0</property> <property name="width">1</property> <property name="height">1</property> </packing> </child> <child> - <object class="GtkAlignment" id="alignment7"> + <object class="svtlo-ColorListBox" id="deletedcolor"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="left_padding">12</property> - <child> - <object class="GtkLabel" id="deletedcolor_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Col_or:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">deletedcolor</property> - </object> - </child> + <property name="valign">center</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">5</property> + <property name="left_attach">1</property> + <property name="top_attach">1</property> <property name="width">1</property> <property name="height">1</property> </packing> </child> <child> - <object class="GtkAlignment" id="alignment8"> + <object class="svxlo-SvxFontPrevWindow" id="deletedpreview:border"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="left_padding">12</property> - <child> - <object class="GtkLabel" id="changed_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Attrib_utes:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">changed</property> - </object> - </child> + <property name="hexpand">True</property> + <property name="text">Delete</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">7</property> + <property name="left_attach">2</property> + <property name="top_attach">0</property> <property name="width">1</property> - <property name="height">1</property> + <property name="height">2</property> </packing> </child> + </object> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel" id="label3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Deletions</property> + <attributes> + <attribute name="weight" value="semibold"/> + </attributes> + </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkFrame" id="frame4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> + <child> + <object class="GtkAlignment" id="alignment4"> + <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="GtkGrid" id="grid5"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> <child> - <object class="GtkAlignment" id="alignment9"> + <object class="GtkLabel" id="changed_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="left_padding">12</property> - <child> - <object class="GtkLabel" id="changedcolor_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Colo_r:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">changedcolor</property> - </object> - </child> + <property name="xalign">0</property> + <property name="label" translatable="yes">Attrib_utes:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">changed</property> </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">8</property> + <property name="top_attach">0</property> <property name="width">1</property> <property name="height">1</property> </packing> </child> <child> - <object class="GtkLabel" id="label4"> + <object class="GtkLabel" id="changedcolor_label"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Changed attributes</property> + <property name="label" translatable="yes">Colo_r:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">changedcolor</property> </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">6</property> - <property name="width">3</property> + <property name="top_attach">1</property> + <property name="width">1</property> <property name="height">1</property> </packing> </child> <child> - <object class="GtkLabel" id="label3"> + <object class="GtkComboBox" id="changed"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Deletions</property> + <property name="valign">center</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - <property name="width">3</property> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + <property name="width">1</property> <property name="height">1</property> </packing> </child> <child> - <object class="GtkComboBoxText" id="insert"> + <object class="svtlo-ColorListBox" id="changedcolor"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> - <property name="entry_text_column">0</property> - <property name="id_column">1</property> - <items> - <item translatable="yes">[None]</item> - <item translatable="yes">Bold</item> - <item translatable="yes">Italic</item> - <item translatable="yes">Underlined</item> - <item translatable="yes">Underlined: double</item> - <item translatable="yes">Strikethrough</item> - <item translatable="yes">Uppercase</item> - <item translatable="yes">Lowercase</item> - <item translatable="yes">Small caps</item> - <item translatable="yes">Title font</item> - <item translatable="yes">Background color</item> - </items> </object> <packing> <property name="left_attach">1</property> @@ -333,16 +338,17 @@ </packing> </child> <child> - <object class="GtkComboBox" id="deleted"> + <object class="svxlo-SvxFontPrevWindow" id="changedpreview:border"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="valign">center</property> + <property name="hexpand">True</property> + <property name="text">Attributes</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">4</property> + <property name="left_attach">2</property> + <property name="top_attach">0</property> <property name="width">1</property> - <property name="height">1</property> + <property name="height">2</property> </packing> </child> </object> @@ -350,10 +356,11 @@ </object> </child> <child type="label"> - <object class="GtkLabel" id="label1"> + <object class="GtkLabel" id="label4"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Text display</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Changed attributes</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -361,9 +368,10 @@ </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + <property name="width">1</property> + <property name="height">1</property> </packing> </child> <child> @@ -451,8 +459,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> - <property name="entry_text_column">0</property> - <property name="id_column">1</property> <items> <item translatable="yes">[None]</item> <item translatable="yes">Left margin</item> @@ -484,9 +490,10 @@ </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + <property name="width">1</property> + <property name="height">1</property> </packing> </child> <child> @@ -497,32 +504,33 @@ <property name="use_underline">True</property> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> + <property name="left_attach">0</property> + <property name="top_attach">4</property> + <property name="width">1</property> + <property name="height">1</property> </packing> </child> </object> <object class="GtkSizeGroup" id="sizegroup1"> <widgets> - <widget name="alignment3"/> - <widget name="alignment4"/> - <widget name="alignment5"/> - <widget name="alignment7"/> - <widget name="alignment8"/> - <widget name="alignment9"/> + <widget name="insert_label"/> + <widget name="insertcolor_label"/> + <widget name="deleted_label"/> + <widget name="deletedcolor_label"/> + <widget name="changed_label"/> + <widget name="changedcolor_label"/> <widget name="markpos_label"/> <widget name="markcolor_label"/> </widgets> </object> <object class="GtkSizeGroup" id="sizegroup2"> <widgets> + <widget name="insert"/> <widget name="insertcolor"/> + <widget name="deleted"/> <widget name="deletedcolor"/> <widget name="changed"/> <widget name="changedcolor"/> - <widget name="insert"/> - <widget name="deleted"/> <widget name="markcolor"/> <widget name="markpos"/> </widgets> commit c8cd1c61ee3f491e170086f740ffde65a8a63f83 Author: Caolán McNamara <[email protected]> Date: Fri Feb 28 13:20:22 2014 +0000 Related: fdo#73851 select driver list widget to shrink/expand Change-Id: I3f2013ab8e0b188e74da99d2f1ff8bc842f60f50 diff --git a/cui/uiconfig/ui/connpooloptions.ui b/cui/uiconfig/ui/connpooloptions.ui index 811e49d..8571a5b 100644 --- a/cui/uiconfig/ui/connpooloptions.ui +++ b/cui/uiconfig/ui/connpooloptions.ui @@ -1,18 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.16.0 on Thu Jan 9 14:52:53 2014 --> +<!-- Generated with glade 3.16.1 --> <interface> - <!-- interface-requires gtk+ 3.0 --> + <requires lib="gtk+" version="3.0"/> <!-- interface-requires LibreOffice 1.0 --> - <object class="GtkAdjustment" id="adjustment1"> - <property name="lower">30</property> - <property name="upper">600</property> - <property name="value">60</property> - <property name="step_increment">1</property> - <property name="page_increment">10</property> - </object> <object class="GtkGrid" id="ConnPoolPage"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> <property name="border_width">6</property> <property name="row_spacing">12</property> <child> @@ -20,6 +15,7 @@ <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> @@ -28,14 +24,16 @@ <property name="can_focus">False</property> <property name="margin_top">6</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="GtkBox" id="box1"> + <object class="GtkGrid" id="grid1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">12</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="row_spacing">6</property> <child> <object class="GtkCheckButton" id="connectionpooling"> <property name="label" translatable="yes">Connection pooling enabled</property> @@ -48,41 +46,48 @@ <property name="draw_indicator">True</property> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> </packing> </child> <child> - <object class="GtkBox" id="box2"> + <object class="GtkGrid" id="grid2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_left">12</property> - <property name="orientation">vertical</property> - <property name="spacing">12</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="row_spacing">6</property> <child> <object class="GtkLabel" id="driverslabel"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">Drivers known in %PRODUCTNAME</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">driverlist</property> + <property name="ellipsize">start</property> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> </packing> </child> <child> <object class="cuilo-DriverListControl" id="driverlist"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> <property name="vexpand">True</property> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + <property name="width">1</property> + <property name="height">1</property> </packing> </child> <child> @@ -118,9 +123,10 @@ </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + <property name="width">1</property> + <property name="height">1</property> </packing> </child> <child> @@ -134,9 +140,10 @@ <property name="draw_indicator">True</property> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">3</property> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + <property name="width">1</property> + <property name="height">1</property> </packing> </child> <child> @@ -165,7 +172,9 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="invisible_char">â</property> + <property name="text" translatable="yes">60</property> <property name="adjustment">adjustment1</property> + <property name="value">60</property> </object> <packing> <property name="expand">False</property> @@ -175,16 +184,18 @@ </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">4</property> + <property name="left_attach">0</property> + <property name="top_attach">4</property> + <property name="width">1</property> + <property name="height">1</property> </packing> </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + <property name="width">1</property> + <property name="height">1</property> </packing> </child> </object> @@ -210,4 +221,11 @@ </packing> </child> </object> + <object class="GtkAdjustment" id="adjustment1"> + <property name="lower">30</property> + <property name="upper">600</property> + <property name="value">60</property> + <property name="step_increment">1</property> + <property name="page_increment">10</property> + </object> </interface> commit de485196def4a0b454abc46af64a2f19bf78c40d Author: Caolán McNamara <[email protected]> Date: Fri Feb 28 14:33:01 2014 +0000 coverity#1187853 Uncaught exception Change-Id: I43686bd2444619064e8097cfc161d59b903e3fc9 diff --git a/ucb/source/ucp/ftp/ftpurl.hxx b/ucb/source/ucp/ftp/ftpurl.hxx index b82adb3..00f29a3 100644 --- a/ucb/source/ucp/ftp/ftpurl.hxx +++ b/ucb/source/ucp/ftp/ftpurl.hxx @@ -51,11 +51,9 @@ namespace ftp { FOLDER_MIGHT_EXIST_DURING_INSERT, FILE_MIGHT_EXIST_DURING_INSERT }; + class malformed_exception : public std::exception { }; - class malformed_exception { }; - - - class curl_exception + class curl_exception : public std::exception { public: commit b1cf64fe51fd0bb1e9bc8c3bb38d5cc7254d8d5f Author: Armin Le Grand <[email protected]> Date: Fri Feb 28 02:15:29 2014 +0000 Resolves: #i87182# secured usage of LayerTabBar in Draw... ensured initialization when used as OLE (cherry picked from commit 903afaa8ea0766e01ba41a227d2794c2c40b129a) Conflicts: sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx sd/source/ui/view/drviews3.cxx sd/source/ui/view/drviews7.cxx sd/source/ui/view/drviewsb.cxx Change-Id: I86bb17bf422356247a319f89e54d1ead97b368b8 diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx index 3435519..4f688ff 100644 --- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx +++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx @@ -862,7 +862,7 @@ uno::Any SAL_CALL AccessibleDocumentViewBase::getExtendedAttributes() sValue += sName; sValue += OUString::number(pDrViewSh->GetPageTabControl()->GetPageCount()) ; sValue += ";"; - if(pDrViewSh->IsLayerModeActive() ) + if(pDrViewSh->IsLayerModeActive() && pDrViewSh->GetLayerTabControl()) // #i87182# { sName = "page-name:"; sValue = sName; diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx index 146aea8..82d86c9 100644 --- a/sd/source/ui/view/drviews1.cxx +++ b/sd/source/ui/view/drviews1.cxx @@ -344,7 +344,13 @@ void DrawViewShell::ChangeEditMode(EditMode eEMode, bool bIsLayerModeActive) GetViewShellBase().GetDrawController().BroadcastContextChange(); meEditMode = eEMode; - mbIsLayerModeActive = bIsLayerModeActive; + + if(pLayerBar) + { + // #i87182# only switch activation mode of LayerTabBar when there is one, + // else it will not get initialized with the current set of Layers as needed + mbIsLayerModeActive = bIsLayerModeActive; + } // Determine whether to show the master view toolbar. The master // page mode has to be active and the shell must not be a handout @@ -593,7 +599,11 @@ IMPL_LINK( DrawViewShell, TabSplitHdl, TabBar *, pTab ) aTabSize.Width() = std::min(pTab->GetSplitSize(), (long)(nMax-1)); maTabControl.SetSizePixel(aTabSize); - GetLayerTabControl()->SetSizePixel(aTabSize); + + if(GetLayerTabControl()) // #i87182# + { + GetLayerTabControl()->SetSizePixel(aTabSize); + } Point aPos = maTabControl.GetPosPixel(); aPos.X() += aTabSize.Width(); diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index b0eeb9e..faad29a 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -1538,6 +1538,14 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) case SID_MODIFYLAYER: { + if(!GetLayerTabControl()) // #i87182# + { + OSL_ENSURE(false, "No LayerTabBar (!)"); + Cancel(); + rReq.Ignore(); + break; + } + if ( mpDrawView->IsTextEdit() ) { mpDrawView->SdrEndTextEdit(); @@ -1694,8 +1702,14 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) mpDrawView->SdrEndTextEdit(); } - GetLayerTabControl()->StartEditMode( - GetLayerTabControl()->GetCurPageId() ); + if(GetLayerTabControl()) // #i87182# + { + GetLayerTabControl()->StartEditMode(GetLayerTabControl()->GetCurPageId()); + } + else + { + OSL_ENSURE(false, "No LayerTabBar (!)"); + } Cancel(); rReq.Ignore (); diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx index 89e6ac9..813138c 100644 --- a/sd/source/ui/view/drviews3.cxx +++ b/sd/source/ui/view/drviews3.cxx @@ -199,17 +199,34 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq) case SID_SWITCHLAYER: // BASIC { const SfxItemSet *pArgs = rReq.GetArgs (); - sal_uInt16 nCurPage = GetLayerTabControl()->GetCurPageId (); - if( pArgs && pArgs->Count () == 1) + // #i87182# + bool bCurPageValid(false); + sal_uInt16 nCurPage(0); + + if(GetLayerTabControl()) + { + nCurPage = GetLayerTabControl()->GetCurPageId(); + bCurPageValid = true; + } + + if(pArgs && 1 == pArgs->Count()) { SFX_REQUEST_ARG (rReq, pWhatLayer, SfxUInt32Item, ID_VAL_WHATLAYER, false); - if( pWhatLayer ) - nCurPage = (short) pWhatLayer->GetValue (); + + if(pWhatLayer) + { + nCurPage = (short)pWhatLayer->GetValue(); + bCurPageValid = true; + } + } + + if(bCurPageValid) + { + mpDrawView->SetActiveLayer( GetLayerTabControl()->GetPageText(nCurPage) ); + Invalidate(); } - mpDrawView->SetActiveLayer( GetLayerTabControl()->GetPageText(nCurPage) ); - Invalidate(); rReq.Done (); break; diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx index 21a8b4f..0141322 100644 --- a/sd/source/ui/view/drviews4.cxx +++ b/sd/source/ui/view/drviews4.cxx @@ -95,6 +95,12 @@ void DrawViewShell::DeleteActualPage() void DrawViewShell::DeleteActualLayer() { + if(!GetLayerTabControl()) // #i87182# + { + OSL_ENSURE(false, "No LayerTabBar (!)"); + return; + } + SdrLayerAdmin& rAdmin = GetDoc()->GetLayerAdmin(); const OUString& rName = GetLayerTabControl()->GetPageText(GetLayerTabControl()->GetCurPageId()); OUString aString(SD_RESSTR(STR_ASK_DELETE_LAYER)); diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx index 26d6b95..2b7d3c5 100644 --- a/sd/source/ui/view/drviews7.cxx +++ b/sd/source/ui/view/drviews7.cxx @@ -894,20 +894,27 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) // is it allowed to delete the current layer? if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_DELETE_LAYER ) ) { - sal_uInt16 nCurrentLayer = GetLayerTabControl()->GetCurPageId(); - const OUString& rName = GetLayerTabControl()->GetPageText(nCurrentLayer); + if(GetLayerTabControl()) // #i87182# + { + sal_uInt16 nCurrentLayer = GetLayerTabControl()->GetCurPageId(); + const OUString& rName = GetLayerTabControl()->GetPageText(nCurrentLayer); - bool bDisableIt = !IsLayerModeActive(); - bDisableIt |= (rName == SD_RESSTR(STR_LAYER_LAYOUT)); - bDisableIt |= (rName == SD_RESSTR(STR_LAYER_BCKGRND)); - bDisableIt |= (rName == SD_RESSTR(STR_LAYER_BCKGRNDOBJ)); - bDisableIt |= (rName == SD_RESSTR(STR_LAYER_CONTROLS)); - bDisableIt |= (rName == SD_RESSTR(STR_LAYER_MEASURELINES)); + bool bDisableIt = !IsLayerModeActive(); + bDisableIt |= (rName == SD_RESSTR(STR_LAYER_LAYOUT)); + bDisableIt |= (rName == SD_RESSTR(STR_LAYER_BCKGRND)); + bDisableIt |= (rName == SD_RESSTR(STR_LAYER_BCKGRNDOBJ)); + bDisableIt |= (rName == SD_RESSTR(STR_LAYER_CONTROLS)); + bDisableIt |= (rName == SD_RESSTR(STR_LAYER_MEASURELINES)); - if (bDisableIt) + if (bDisableIt) + { + rSet.DisableItem(SID_DELETE_LAYER); + rSet.DisableItem(SID_RENAMELAYER); + } + } + else { - rSet.DisableItem(SID_DELETE_LAYER); - rSet.DisableItem(SID_RENAMELAYER); + OSL_ENSURE(false, "No LayerTabBar (!)"); } } diff --git a/sd/source/ui/view/drviewsb.cxx b/sd/source/ui/view/drviewsb.cxx index d6dddd5..eeb5b7d 100644 --- a/sd/source/ui/view/drviewsb.cxx +++ b/sd/source/ui/view/drviewsb.cxx @@ -166,6 +166,12 @@ void DrawViewShell::ModifyLayer ( bool bIsLocked, bool bIsPrintable) { + if(!GetLayerTabControl()) // #i87182# + { + OSL_ENSURE(false, "No LayerTabBar (!)"); + return; + } + if( pLayer ) { const sal_uInt16 nPageCount = GetLayerTabControl()->GetPageCount();
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
