cui/uiconfig/ui/bulletandposition.ui | 368 ++++++++++++++++------------------- sc/source/core/data/table2.cxx | 2 sc/source/ui/unoobj/fmtuno.cxx | 2 3 files changed, 174 insertions(+), 198 deletions(-)
New commits: commit 9ad8f83912e6cf14d7b3b3e1cb2a79d819247c82 Author: Aron Budea <[email protected]> AuthorDate: Sun Jul 28 05:51:40 2019 +0200 Commit: Aron Budea <[email protected]> CommitDate: Tue Jul 30 18:03:33 2019 +0200 tdf#125800: accessing cond format props in UNO throws error These conditions were always evaluated to true: OR should become AND when negated. Regression from 8c637b47d9de4b3a64c33a9c2ffe7ed220be2467 Change-Id: I87038319ed27eff2bed2412da49e01f73ec0a79c Reviewed-on: https://gerrit.libreoffice.org/76493 Reviewed-by: Gülşah Köse <[email protected]> Reviewed-by: Aron Budea <[email protected]> Tested-by: Aron Budea <[email protected]> diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx index 5b182c897b4b..09aa36d30f53 100644 --- a/sc/source/core/data/table2.cxx +++ b/sc/source/core/data/table2.cxx @@ -2191,7 +2191,7 @@ void ScTable::FindMaxRotCol( RowInfo* pRowInfo, SCSIZE nArrCount, SCCOL nX1, SCC for (size_t nEntry=0; nEntry<nEntryCount; nEntry++) { const ScFormatEntry* pEntry = pFormat->GetEntry(nEntry); - if(pEntry->GetType() != ScFormatEntry::Type::Condition || + if(pEntry->GetType() != ScFormatEntry::Type::Condition && pEntry->GetType() != ScFormatEntry::Type::ExtCondition) continue; diff --git a/sc/source/ui/unoobj/fmtuno.cxx b/sc/source/ui/unoobj/fmtuno.cxx index 51f271d42b91..484b011d57b7 100644 --- a/sc/source/ui/unoobj/fmtuno.cxx +++ b/sc/source/ui/unoobj/fmtuno.cxx @@ -161,7 +161,7 @@ ScTableConditionalFormat::ScTableConditionalFormat( { ScCondFormatEntryItem aItem; const ScFormatEntry* pFrmtEntry = pFormat->GetEntry(i); - if(pFrmtEntry->GetType() != ScFormatEntry::Type::Condition || + if(pFrmtEntry->GetType() != ScFormatEntry::Type::Condition && pFrmtEntry->GetType() != ScFormatEntry::Type::ExtCondition) continue; commit 392fe03c2622a69c078adb9b993b5589e8b01d09 Author: Gülşah Köse <[email protected]> AuthorDate: Tue Jul 30 11:55:55 2019 +0300 Commit: Gülşah Köse <[email protected]> CommitDate: Tue Jul 30 18:03:28 2019 +0200 tdf#125642 Fix layout issues for Bullet dialog. Change-Id: Ieacd060a8bfe4e2123e6973e30789e029ab02ca6 Reviewed-on: https://gerrit.libreoffice.org/76587 Tested-by: Jenkins Reviewed-by: Gülşah Köse <[email protected]> diff --git a/cui/uiconfig/ui/bulletandposition.ui b/cui/uiconfig/ui/bulletandposition.ui index c27d72e5dd4e..8e90e6219aab 100644 --- a/cui/uiconfig/ui/bulletandposition.ui +++ b/cui/uiconfig/ui/bulletandposition.ui @@ -403,73 +403,63 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment"> + <object class="GtkGrid"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="left_padding">12</property> + <property name="column_spacing">6</property> <child> - <object class="GtkBox"> - <property name="width_request">350</property> + <object class="GtkLabel" id="prefixft"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="label" translatable="yes" context="bulletandposition|prefixft">Before:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">prefix</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="prefix"> + <property name="width_request">130</property> + <property name="visible">True</property> + <property name="can_focus">True</property> <property name="halign">start</property> - <property name="margin_top">6</property> - <property name="spacing">17</property> - <child> - <object class="GtkLabel" id="prefixft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="bulletandposition|prefixft">Before:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">prefix</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="prefix"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="suffixft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="bulletandposition|suffixft">After:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">suffix</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="suffix"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">3</property> - </packing> - </child> + <property name="activates_default">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="suffixft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="bulletandposition|suffixft">After:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">suffix</property> + <property name="xalign">0</property> </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="suffix"> + <property name="width_request">130</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="halign">start</property> + <property name="activates_default">True</property> + </object> + <packing> + <property name="left_attach">3</property> + <property name="top_attach">0</property> + </packing> </child> </object> </child> @@ -608,7 +598,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="spacing">27</property> + <property name="spacing">15</property> <child> <object class="GtkLabel" id="colorft"> <property name="visible">True</property> @@ -692,94 +682,87 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment"> + <object class="GtkGrid"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="left_padding">12</property> + <property name="margin_top">7</property> + <property name="row_spacing">2</property> + <property name="column_spacing">8</property> <child> - <object class="GtkGrid"> + <object class="GtkLabel" id="indent"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_top">7</property> - <property name="row_spacing">2</property> - <property name="column_spacing">11</property> - <child> - <object class="GtkLabel" id="indent"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes" context="bulletandposition|indent">Indent:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">indentmf</property> - <property name="xalign">1</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="numberingwidth"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes" context="bulletandposition|numberingwidth">Width:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">numberingwidthmf</property> - <property name="xalign">1</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="indentmf"> - <property name="width_request">170</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - <property name="text" translatable="yes" context="bulletandposition|indentmf">0,00</property> - <property name="adjustment">adjustment6</property> - <property name="digits">2</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="numberingwidthmf"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - <property name="text" translatable="yes" context="bulletandposition|numberingwidthmf">0,00</property> - <property name="adjustment">adjustment7</property> - <property name="digits">2</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="relative"> - <property name="label" translatable="yes" context="bulletandposition|relative">Relati_ve</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="halign">end</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> - <property name="height">2</property> - </packing> - </child> + <property name="halign">start</property> + <property name="label" translatable="yes" context="bulletandposition|indent">Indent:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">indentmf</property> + <property name="xalign">1</property> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="numberingwidth"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes" context="bulletandposition|numberingwidth">Width:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">numberingwidthmf</property> + <property name="xalign">1</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="indentmf"> + <property name="width_request">170</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="activates_default">True</property> + <property name="text" translatable="yes" context="bulletandposition|indentmf">0,00</property> + <property name="adjustment">adjustment6</property> + <property name="digits">2</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="numberingwidthmf"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="activates_default">True</property> + <property name="text" translatable="yes" context="bulletandposition|numberingwidthmf">0,00</property> + <property name="adjustment">adjustment7</property> + <property name="digits">2</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="relative"> + <property name="label" translatable="yes" context="bulletandposition|relative">Relati_ve</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="halign">end</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + <property name="height">2</property> + </packing> </child> </object> </child> @@ -897,64 +880,57 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment"> + <object class="GtkGrid"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="left_padding">12</property> + <property name="margin_top">7</property> + <property name="row_spacing">16</property> + <property name="column_spacing">93</property> <child> - <object class="GtkGrid"> + <object class="GtkRadioButton" id="sliderb"> + <property name="label" translatable="yes" context="bulletandposition|sliderb">Slide</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">7</property> - <property name="row_spacing">16</property> - <property name="column_spacing">93</property> - <child> - <object class="GtkRadioButton" id="sliderb"> - <property name="label" translatable="yes" context="bulletandposition|sliderb">Slide</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="halign">start</property> - <property name="active">True</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="selectionrb"> - <property name="label" translatable="yes" context="bulletandposition|selectionrb">Selection</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="halign">start</property> - <property name="active">True</property> - <property name="draw_indicator">True</property> - <property name="group">sliderb</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkToggleButton" id="applytomaster"> - <property name="label" translatable="yes" context="bulletandposition|applytomaster">Apply to Master</property> - <property name="height_request">34</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="valign">center</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - <property name="height">2</property> - </packing> - </child> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="halign">start</property> + <property name="active">True</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="selectionrb"> + <property name="label" translatable="yes" context="bulletandposition|selectionrb">Selection</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="halign">start</property> + <property name="active">True</property> + <property name="draw_indicator">True</property> + <property name="group">sliderb</property> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkToggleButton" id="applytomaster"> + <property name="label" translatable="yes" context="bulletandposition|applytomaster">Apply to Master</property> + <property name="height_request">34</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="valign">center</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + <property name="height">2</property> + </packing> </child> </object> </child> _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
