[Libreoffice-commits] core.git: 2 commits - sc/source svx/source

[Tomaž Vajngerl (via logerrit)]

 sc/source/ui/drawfunc/drawsh.cxx       |    6 +++---
 svx/source/tbxctrls/PaletteManager.cxx |    2 --
 2 files changed, 3 insertions(+), 5 deletions(-)

New commits:
commit 548e5b6d825606bd218ef18591df642872e6acd0
Author:     Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
AuthorDate: Tue Jul 4 00:38:01 2023 +0900
Commit:     Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Tue Jul 4 03:51:41 2023 +0200

    sc: fix failed assert in when setting a color on a shape
    
    When setting a color with a colorpicker, and assert failed,
    because it's not possible to clone a SfxItemSet by value - use
    a plane Clone instead, which clones into a SfxItemSet.
    
    Change-Id: I8780ed42d3807e9802d3f4fa1d68e16bd5d5a5e6
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153937
    Tested-by: Jenkins
    Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>

diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx
index 52ec9d9d438a..fde34e9d6686 100644
--- a/sc/source/ui/drawfunc/drawsh.cxx
+++ b/sc/source/ui/drawfunc/drawsh.cxx
@@ -260,9 +260,9 @@ void ScDrawShell::ExecDrawAttr( SfxRequest& rReq )
 
                 if( pView->AreObjectsMarked() )
                 {
-                    SfxItemSet aNewArgs = rReq.GetArgs()->CloneAsValue();
-                    lcl_convertStringArguments(aNewArgs);
-                    pView->SetAttrToMarked( aNewArgs, false );
+                    std::unique_ptr<SfxItemSet> aNewArgs = 
rReq.GetArgs()->Clone();
+                    lcl_convertStringArguments(*aNewArgs);
+                    pView->SetAttrToMarked(*aNewArgs, false);
                 }
                 else
                     pView->SetDefaultAttr( *rReq.GetArgs(), false);
commit cbc45a7f713ea1f2c44ed27b371e342ed7547e05
Author:     Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
AuthorDate: Tue Jul 4 00:37:30 2023 +0900
Commit:     Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Tue Jul 4 03:51:33 2023 +0200

    svx: PaletteManager - remove printf
    
    Change-Id: I7d631352d423b6465d8bea4b09561f33d2ad98f6
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153936
    Tested-by: Jenkins
    Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>

diff --git a/svx/source/tbxctrls/PaletteManager.cxx 
b/svx/source/tbxctrls/PaletteManager.cxx
index 7735e09d44e8..607bd60df921 100644
--- a/svx/source/tbxctrls/PaletteManager.cxx
+++ b/svx/source/tbxctrls/PaletteManager.cxx
@@ -430,8 +430,6 @@ void PaletteManager::DispatchColorCommand(const OUString& 
aCommand, const NamedC
         comphelper::makePropertyValue(aObj.GetURLPath()+ ".Color", 
sal_Int32(rColor.m_aColor)),
     };
 
-    printf ("Sending: %s\n", aObj.GetURLPath().toUtf8().getStr());
-
     if (rColor.m_nThemeIndex != -1)
     {
         model::ComplexColor aComplexColor;