sw/source/ui/dialog/docstdlg.cxx | 3 sw/uiconfig/swriter/ui/statisticsinfopage.ui | 164 +++++++++++++-------------- 2 files changed, 84 insertions(+), 83 deletions(-)
New commits: commit 416c6093ac7ac2a15632d5aef44b23525f63c73b Author: Caolán McNamara <[email protected]> AuthorDate: Fri Dec 8 09:47:59 2023 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Fri Dec 8 12:10:07 2023 +0100 resave with latest glade Change-Id: Ieec096149d581e523cbd54e1ec9e97b8eab92785 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160456 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/sw/uiconfig/swriter/ui/statisticsinfopage.ui b/sw/uiconfig/swriter/ui/statisticsinfopage.ui index ad4d8a04b320..a6e490dae622 100644 --- a/sw/uiconfig/swriter/ui/statisticsinfopage.ui +++ b/sw/uiconfig/swriter/ui/statisticsinfopage.ui @@ -1,261 +1,261 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.36.0 --> +<!-- Generated with glade 3.40.0 --> <interface domain="sw"> <requires lib="gtk+" version="3.20"/> - <!-- n-columns=1 n-rows=1 --> + <!-- n-columns=2 n-rows=10 --> <object class="GtkGrid" id="StatisticsInfoPage"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="border_width">12</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> + <property name="can-focus">False</property> + <property name="border-width">12</property> + <property name="row-spacing">6</property> + <property name="column-spacing">12</property> <child> <object class="GtkLabel" id="label4"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">end</property> <property name="label" translatable="yes" context="statisticsinfopage|label4">Pages:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">nopages</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">nopages</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="left-attach">0</property> + <property name="top-attach">0</property> </packing> </child> <child> <object class="GtkLabel" id="label5"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">end</property> <property name="label" translatable="yes" context="statisticsinfopage|label5">Tables:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">notables</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">notables</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="left-attach">0</property> + <property name="top-attach">1</property> </packing> </child> <child> <object class="GtkLabel" id="label6"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">end</property> <property name="label" translatable="yes" context="statisticsinfopage|label6">Images:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">nogrfs</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">nogrfs</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> + <property name="left-attach">0</property> + <property name="top-attach">2</property> </packing> </child> <child> <object class="GtkLabel" id="label31"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">end</property> <property name="label" translatable="yes" context="statisticsinfopage|label31">OLE objects:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">nooles</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">nooles</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> + <property name="left-attach">0</property> + <property name="top-attach">3</property> </packing> </child> <child> <object class="GtkLabel" id="label32"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">end</property> <property name="label" translatable="yes" context="statisticsinfopage|label32">Paragraphs:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">noparas</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">noparas</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">4</property> + <property name="left-attach">0</property> + <property name="top-attach">4</property> </packing> </child> <child> <object class="GtkLabel" id="label33"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">end</property> <property name="label" translatable="yes" context="statisticsinfopage|label33">Words:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">nowords</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">nowords</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">5</property> + <property name="left-attach">0</property> + <property name="top-attach">5</property> </packing> </child> <child> <object class="GtkLabel" id="label34"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">end</property> <property name="label" translatable="yes" context="statisticsinfopage|label34">Characters:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">nochars</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">nochars</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">6</property> + <property name="left-attach">0</property> + <property name="top-attach">6</property> </packing> </child> <child> <object class="GtkLabel" id="label35"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">end</property> <property name="label" translatable="yes" context="statisticsinfopage|label35">Characters excluding spaces:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">nocharsexspaces</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">nocharsexspaces</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">7</property> + <property name="left-attach">0</property> + <property name="top-attach">7</property> </packing> </child> <child> <object class="GtkLabel" id="lineft"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">end</property> <property name="label" translatable="yes" context="statisticsinfopage|lineft">Lines:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">nolines</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">nolines</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">8</property> + <property name="left-attach">0</property> + <property name="top-attach">8</property> </packing> </child> <child> <object class="GtkLabel" id="nopages"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="selectable">True</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> + <property name="left-attach">1</property> + <property name="top-attach">0</property> </packing> </child> <child> <object class="GtkLabel" id="notables"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="selectable">True</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> + <property name="left-attach">1</property> + <property name="top-attach">1</property> </packing> </child> <child> <object class="GtkLabel" id="nogrfs"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="selectable">True</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> + <property name="left-attach">1</property> + <property name="top-attach">2</property> </packing> </child> <child> <object class="GtkLabel" id="nooles"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="selectable">True</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</property> + <property name="left-attach">1</property> + <property name="top-attach">3</property> </packing> </child> <child> <object class="GtkLabel" id="noparas"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="selectable">True</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">4</property> + <property name="left-attach">1</property> + <property name="top-attach">4</property> </packing> </child> <child> <object class="GtkLabel" id="nowords"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="selectable">True</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">5</property> + <property name="left-attach">1</property> + <property name="top-attach">5</property> </packing> </child> <child> <object class="GtkLabel" id="nochars"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="selectable">True</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">6</property> + <property name="left-attach">1</property> + <property name="top-attach">6</property> </packing> </child> <child> <object class="GtkLabel" id="nocharsexspaces"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="selectable">True</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">7</property> + <property name="left-attach">1</property> + <property name="top-attach">7</property> </packing> </child> <child> <object class="GtkLabel" id="nolines"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="label">...</property> <property name="selectable">True</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">8</property> + <property name="left-attach">1</property> + <property name="top-attach">8</property> </packing> </child> <child> <object class="GtkButton" id="update"> <property name="label" translatable="yes" context="statisticsinfopage|update">Update</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> <property name="halign">start</property> <property name="use-underline">True</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">9</property> + <property name="left-attach">1</property> + <property name="top-attach">9</property> </packing> </child> <child> commit b4fe46c0c2826a46ba66349c4e2b1653f535943f Author: Caolán McNamara <[email protected]> AuthorDate: Fri Dec 8 09:42:43 2023 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Fri Dec 8 12:10:00 2023 +0100 use same formatting for "Lines" as the other numbers in doc statistics Change-Id: I16991ceab68a33f154975e47145f50795ddfbcc9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160455 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/sw/source/ui/dialog/docstdlg.cxx b/sw/source/ui/dialog/docstdlg.cxx index 70a653dcbefe..1b300206fc8e 100644 --- a/sw/source/ui/dialog/docstdlg.cxx +++ b/sw/source/ui/dialog/docstdlg.cxx @@ -121,7 +121,8 @@ IMPL_LINK_NOARG(SwDocStatPage, UpdateHdl, weld::Button&, void) SwFEShell* pFEShell = pDocShell ? pDocShell->GetFEShell() : nullptr; if (pFEShell) { - OUString sLineCount = OUString::number(pFEShell->GetLineCount()); + const LocaleDataWrapper& rLocaleData = Application::GetSettings().GetUILocaleDataWrapper(); + OUString sLineCount = rLocaleData.getNum(pFEShell->GetLineCount(), 0); m_xLineNo->set_label(sLineCount); m_xLineNo->set_size_request(m_xLineNo->get_approximate_digit_width() * sLineCount.getLength(), -1); }
