[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - 2 commits - i18npool/source sfx2/source

Heiko Tietze (via logerrit) logerrit at kemper.freedesktop.org
Wed Jul 7 19:59:34 UTC 2021


 i18npool/source/localedata/data/en_US.xml           |    4 ++--
 sfx2/source/devtools/ObjectInspectorTreeHandler.cxx |    6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit b2d93a34ce83e9442ba12c4f11586c9a02e63119
Author:     Heiko Tietze <tietze.heiko at gmail.com>
AuthorDate: Mon Jul 5 14:26:22 2021 +0200
Commit:     Xisco Fauli <xiscofauli at libreoffice.org>
CommitDate: Wed Jul 7 21:59:13 2021 +0200

    Resolves tdf#137160 - Thin space before f./ff. in en_US
    
    Change-Id: I3a2f2206d9784de2da6af8ea2b882e1ebe6205e0
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118439
    Tested-by: Jenkins
    Reviewed-by: Heiko Tietze <heiko.tietze at documentfoundation.org>
    (cherry picked from commit 06e48b4beb0f898483211c77adbb2e83d8908cee)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118426
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>

diff --git a/i18npool/source/localedata/data/en_US.xml b/i18npool/source/localedata/data/en_US.xml
index a96750aab17d..9e852f743125 100644
--- a/i18npool/source/localedata/data/en_US.xml
+++ b/i18npool/source/localedata/data/en_US.xml
@@ -258,8 +258,8 @@
     <IndexKey phonetic="false" default="true" unoid="alphanumeric">A-Z</IndexKey>
     <UnicodeScript>0</UnicodeScript>
     <UnicodeScript>1</UnicodeScript>
-    <FollowPageWord>f.</FollowPageWord>
-    <FollowPageWord>ff.</FollowPageWord>
+    <FollowPageWord> f.</FollowPageWord>
+    <FollowPageWord> ff.</FollowPageWord>
   </LC_INDEX>
   <LC_CALENDAR>
     <Calendar unoid="gregorian" default="true">
commit 419e70876f19787e0bf1cf99178fc2e00fc4dcc6
Author:     Gizem Ozgun <gizemozguun at gmail.com>
AuthorDate: Mon Jun 28 23:55:42 2021 +0300
Commit:     Xisco Fauli <xiscofauli at libreoffice.org>
CommitDate: Wed Jul 7 21:59:01 2021 +0200

    tdf#142459 Fixed long class names are truncated(gen)
    
    Change-Id: I9c88beb3fc83c23b2e866824985d50567b056f7f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118035
    Tested-by: Jenkins
    Reviewed-by: Gülşah Köse <gulsah.kose at collabora.com>
    (cherry picked from commit 1c8483d2174bc6419829dface97627a4304c8912)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118430
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>

diff --git a/sfx2/source/devtools/ObjectInspectorTreeHandler.cxx b/sfx2/source/devtools/ObjectInspectorTreeHandler.cxx
index d7d4895e5d6b..362907e92a4b 100644
--- a/sfx2/source/devtools/ObjectInspectorTreeHandler.cxx
+++ b/sfx2/source/devtools/ObjectInspectorTreeHandler.cxx
@@ -1322,6 +1322,12 @@ void ObjectInspectorTreeHandler::inspectObject(uno::Reference<uno::XInterface> c
     // Set implementation name
     OUString aImplementationName = getInterfaceImplementationClass(xInterface);
     mpObjectInspectorWidgets->mpClassNameLabel->set_label(aImplementationName);
+    sal_Int32 nStrLen = aImplementationName.getLength();
+    sal_Int32 nDigitWidth
+        = mpObjectInspectorWidgets->mpClassNameLabel->get_approximate_digit_width();
+
+    //get_about_digit_width() returns an approximate value. To always see the full class name (nStrLen+2)
+    mpObjectInspectorWidgets->mpClassNameLabel->set_size_request((nStrLen + 2) * nDigitWidth, -1);
 
     // Fire entering the current opened page manually
     auto rPageId = mpObjectInspectorWidgets->mpNotebook->get_current_page_ident();


More information about the Libreoffice-commits mailing list