3 files changed, 10 insertions, 5 deletions
diff --git a/svx/inc/sdr/primitive2d/sdrattributecreator.hxx b/svx/inc/sdr/primitive2d/sdrattributecreator.hxx
index f372741fa68c..92a2b102ffdb 100644
--- a/svx/inc/sdr/primitive2d/sdrattributecreator.hxx
+++ b/svx/inc/sdr/primitive2d/sdrattributecreator.hxx
@@ -93,7 +93,8 @@ namespace drawinglayer::primitive2d
         attribute::SdrLineFillEffectsTextAttribute createNewSdrLineFillEffectsTextAttribute(
             const SfxItemSet& rSet,
             const SdrText* pText,
-            bool bHasContent); // used from OLE and graphic
+            bool bHasContent, // used from OLE and graphic
+            bool bSuppressShadow = false); // used from SC notes
 
         attribute::SdrLineFillShadowAttribute3D createNewSdrLineFillShadowAttribute(
             const SfxItemSet& rSet,
diff --git a/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx b/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx
index daadd83c5942..b03056ec5944 100644
--- a/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx
@@ -35,6 +35,7 @@
 #include <svx/xfltrit.hxx>
 #include <svx/xlineit0.hxx>
 #include <svx/sdmetitm.hxx>
+#include <svx/sdooitm.hxx>
 #include <svx/sdprcitm.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <sdr/primitive2d/sdrdecompositiontools.hxx>
@@ -62,7 +63,7 @@ namespace sdr::contact
                 drawinglayer::primitive2d::createNewSdrLineFillEffectsTextAttribute(
                     rItemSet,
                     rCaptionObj.getText(0),
-                    false));
+                    false, rCaptionObj.GetSpecialTextBoxShadow()));
 
             // take unrotated snap rect (direct model data) for position and size
             const tools::Rectangle aRectangle(rCaptionObj.GetGeoRect());
@@ -134,10 +135,11 @@ namespace sdr::contact
                 if(!aFill.isDefault() && 1.0 != aFill.getTransparence())
                 {
                     // add shadow offset to object matrix
+                    const bool bShadow(rItemSet.Get(SDRATTR_SHADOW).GetValue());
                     const sal_uInt32 nXDist(rItemSet.Get(SDRATTR_SHADOWXDIST).GetValue());
                     const sal_uInt32 nYDist(rItemSet.Get(SDRATTR_SHADOWYDIST).GetValue());
 
-                    if(nXDist || nYDist)
+                    if (bShadow && (nXDist || nYDist))
                     {
                         // #119750# create object and shadow outline, clip shadow outline
                         // on object outline. If there is a rest, create shadow. Do this to
diff --git a/svx/source/sdr/primitive2d/sdrattributecreator.cxx b/svx/source/sdr/primitive2d/sdrattributecreator.cxx
index 89493e4d5a45..e1f6fc10c45a 100644
--- a/svx/source/sdr/primitive2d/sdrattributecreator.cxx
+++ b/svx/source/sdr/primitive2d/sdrattributecreator.cxx
@@ -1121,7 +1121,8 @@ namespace drawinglayer::primitive2d
         attribute::SdrLineFillEffectsTextAttribute createNewSdrLineFillEffectsTextAttribute(
             const SfxItemSet& rSet,
             const SdrText* pText,
-            bool bHasContent)
+            bool bHasContent,
+            bool bSuppressShadow)
         {
             attribute::SdrLineAttribute aLine;
             attribute::SdrFillAttribute aFill;
@@ -1171,7 +1172,8 @@ namespace drawinglayer::primitive2d
             if(bHasContent || !aLine.isDefault() || !aFill.isDefault() || !aText.isDefault())
             {
                 // try shadow
-                const attribute::SdrShadowAttribute aShadow = createNewSdrShadowAttribute(rSet);
+                const attribute::SdrShadowAttribute aShadow = !bSuppressShadow ?
+                    createNewSdrShadowAttribute(rSet) : attribute::SdrShadowAttribute();
 
                 // glow
                 const attribute::SdrGlowAttribute aGlow = createNewSdrGlowAttribute(rSet);