[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - sw/source

[Caolán McNamara (via logerrit)]

 sw/source/uibase/shells/txtattr.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit ccf73c63d4638278b458e3d27c2a8c572bb0cb13
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Apr 25 17:22:28 2019 +0100
Commit:     Michael Stahl <Michael.Stahl at cib.de>
CommitDate: Fri Apr 26 11:22:45 2019 +0200

    Resolves: tdf#124919 fontsize grow/shrink unable to use SwShellTableCursor
    
    so if that's active fallback to creating a vector of simple pams
    
    Change-Id: I282bd9f9675985ddbd88ba088aee81609e14d101
    Reviewed-on: https://gerrit.libreoffice.org/71345
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>

diff --git a/sw/source/uibase/shells/txtattr.cxx b/sw/source/uibase/shells/txtattr.cxx
index 3832812c30c0..5fd7607d6bd9 100644
--- a/sw/source/uibase/shells/txtattr.cxx
+++ b/sw/source/uibase/shells/txtattr.cxx
@@ -251,7 +251,9 @@ void SwTextShell::ExecCharAttrArgs(SfxRequest &rReq)
             const SvxFontHeightItem* pSize( static_cast<const SvxFontHeightItem*>(
                                         aSetItem.GetItemOfScript( nScriptTypes ) ) );
             std::vector<std::pair< const SfxPoolItem*, std::unique_ptr<SwPaM> >> vItems;
-            if ( pSize ) // selected text has one size
+            // simple case where selected text has one size and
+            // (tdf#124919) selection is not multiple table cells
+            if (pSize && !rWrtSh.IsTableMode())
             {
                 // must create new one, otherwise document is without pam
                 SwPaM* pPaM = rWrtSh.GetCursor();