diff options
author | Miklos Vajna <vmiklos@collabora.com> | 2020-02-07 17:54:50 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.com> | 2020-02-08 09:04:40 +0100 |
commit | b03504bf054bd4094b985ef8ebb9ac55fa69a487 (patch) | |
tree | 8821f95b3cb7af14ca675e1878c8233d94580123 /sw/CppunitTest_sw_uibase_shells.mk | |
parent | 9a3810ba9b8b52096bee29e83d1eb5ce57512270 (diff) |
tdf#130482 sw: fix text alignment in shape text
Regression from commit a3c7a8282ddd08c7ed4a15d23089d09e418f8fae
(jsdialogs: apply .uno:Color and CharBackColor to floating text frames,
2019-11-08), the problem was that the original code populated aNewAttr, while
SetAttrToMarked() was only invoked in case there were arguments.
Fix this by making pNewAttrs a copy, so lcl_convertStringArguments() can
work on it in place, and then restore the old code that copied from
pNewAttrs to aNewAttr. This fixes the no-arguments case and keeps the
lcl_convertStringArguments() case working.
Change-Id: If7bf2d7b21e48d513a512ec6127b61ee74635ef5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88227
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
Diffstat (limited to 'sw/CppunitTest_sw_uibase_shells.mk')
-rw-r--r-- | sw/CppunitTest_sw_uibase_shells.mk | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sw/CppunitTest_sw_uibase_shells.mk b/sw/CppunitTest_sw_uibase_shells.mk index a4bb21c3d67e..9734b395bca6 100644 --- a/sw/CppunitTest_sw_uibase_shells.mk +++ b/sw/CppunitTest_sw_uibase_shells.mk @@ -21,9 +21,12 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_uibase_shells, \ comphelper \ cppu \ cppuhelper \ + editeng \ sal \ sfx \ svl \ + svx \ + svxcore \ sw \ test \ unotest \ |