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

[Caolán McNamara (via logerrit)]

 sc/source/ui/inc/textdlgs.hxx      |    3 ++-
 sc/source/ui/miscdlgs/textdlgs.cxx |    9 ++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

New commits:
commit e46e663cc350d89e4997095466d675b875eb2e04
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Mon Aug 21 21:24:54 2023 +0100
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Tue Aug 22 16:30:52 2023 +0200

    Related: tdf#98367 allow drawing shapes in calc to have smallcaps
    
    which is something excel allows, so allow this too
    
    Change-Id: I084969f09030999d623da80d1bd46bdf1f8aa897
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155907
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/sc/source/ui/inc/textdlgs.hxx b/sc/source/ui/inc/textdlgs.hxx
index 61cdfdb170ff..3d01bdc43433 100644
--- a/sc/source/ui/inc/textdlgs.hxx
+++ b/sc/source/ui/inc/textdlgs.hxx
@@ -26,7 +26,8 @@ class SfxObjectShell;
 class ScCharDlg : public SfxTabDialogController
 {
 private:
-    const SfxObjectShell& rDocShell;
+    const SfxObjectShell& m_rDocShell;
+    bool m_bDrawText;
 
     virtual void PageCreated(const OUString& rId, SfxTabPage& rPage) override;
 
diff --git a/sc/source/ui/miscdlgs/textdlgs.cxx 
b/sc/source/ui/miscdlgs/textdlgs.cxx
index 04c4db957db8..2cf70d8f5705 100644
--- a/sc/source/ui/miscdlgs/textdlgs.cxx
+++ b/sc/source/ui/miscdlgs/textdlgs.cxx
@@ -32,7 +32,8 @@
 
 ScCharDlg::ScCharDlg(weld::Window* pParent, const SfxItemSet* pAttr, const 
SfxObjectShell* pDocShell, bool bDrawText)
     : SfxTabDialogController(pParent, "modules/scalc/ui/chardialog.ui", 
"CharDialog", pAttr)
-    , rDocShell(*pDocShell)
+    , m_rDocShell(*pDocShell)
+    , m_bDrawText(bDrawText)
 {
     AddTabPage("font", RID_SVXPAGE_CHAR_NAME);
     AddTabPage("fonteffects", RID_SVXPAGE_CHAR_EFFECTS);
@@ -50,14 +51,16 @@ void ScCharDlg::PageCreated(const OUString& rId, SfxTabPage 
&rPage)
     if (rId == "font")
     {
         SvxFontListItem aItem(*static_cast<const SvxFontListItem*>(
-            ( rDocShell.GetItem( SID_ATTR_CHAR_FONTLIST) ) ) );
+            ( m_rDocShell.GetItem( SID_ATTR_CHAR_FONTLIST) ) ) );
 
         aSet.Put (SvxFontListItem( aItem.GetFontList(), 
SID_ATTR_CHAR_FONTLIST));
         rPage.PageCreated(aSet);
     }
     else if (rId == "fonteffects")
     {
-        aSet.Put (SfxUInt16Item(SID_DISABLE_CTL,DISABLE_CASEMAP));
+        // Allow CaseMap in drawings, but not in normal text
+        if (!m_bDrawText)
+            aSet.Put (SfxUInt16Item(SID_DISABLE_CTL,DISABLE_CASEMAP));
         rPage.PageCreated(aSet);
     }
     else if (rId == "background")