From 5d0796bc14c43fa6c3e1417046e241db89306fed Mon Sep 17 00:00:00 2001

From: Stephan Bergmann <sbergman@redhat.com>

Date: Fri, 7 Jun 2019 09:28:12 +0200

Subject: [PATCH] More uses of referer URL with SvxBrushItem

Reviewed-on: https://gerrit.libreoffice.org/73643

Tested-by: Jenkins

Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

(cherry picked from commit b518882de8213ef71a8003f95fbdf7689069c06d)

Conflicts:

	sw/source/core/text/porfld.cxx

	sw/source/core/unocore/unosett.cxx

Change-Id: I04b524784df4ef453d8b1feec13b62f183a17e23

Reviewed-on: https://gerrit.libreoffice.org/73860

Tested-by: Jenkins

Reviewed-by: Miklos Vajna <vmiklos@collabora.com>

---

 sw/inc/unosett.hxx                                |  2 +-

 sw/source/core/text/porfld.cxx                    |  4 ++--

 sw/source/core/text/porfld.hxx                    |  1 +

 sw/source/core/text/txtfld.cxx                    | 12 +++++++++++-

 sw/source/core/unocore/unosett.cxx                | 15 ++++++++++++---

 .../uibase/config/StoredChapterNumbering.cxx      |  2 +-

 6 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/sw/inc/unosett.hxx b/sw/inc/unosett.hxx

index 6386f4f..e90797e 100644

--- a/sw/inc/unosett.hxx

+++ b/sw/inc/unosett.hxx

@@ -208,7 +208,7 @@ public:

     static css::uno::Sequence<css::beans::PropertyValue> GetPropertiesForNumFormat(

             const SwNumFormat& rFormat, OUString const& rCharFormatName,

-            OUString const* pHeadingStyleName);

+            OUString const* pHeadingStyleName, OUString const & referer);

     static void SetPropertiesToNumFormat(

             SwNumFormat & aFormat,

             OUString & rCharStyleName,

diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx

index 4f24e63..ba60112 100644

--- a/sw/source/core/text/porfld.cxx

+++ b/sw/source/core/text/porfld.cxx

@@ -756,7 +756,7 @@ SwBulletPortion::SwBulletPortion( const sal_Unicode cBullet,

 SwGrfNumPortion::SwGrfNumPortion(

         SwFrame*,

         const OUString& rGraphicFollowedBy,

-        const SvxBrushItem* pGrfBrush,

+        const SvxBrushItem* pGrfBrush, OUString const & referer,

         const SwFormatVertOrient* pGrfOrient, const Size& rGrfSize,

         const bool bLft, const bool bCntr, const sal_uInt16 nMinDst,

         const bool bLabelAlignmentPosAndSpaceModeActive ) :

@@ -770,7 +770,7 @@ SwGrfNumPortion::SwGrfNumPortion(

     if( pGrfBrush )

     {

         *pBrush = *pGrfBrush;

-        const Graphic* pGraph = pGrfBrush->GetGraphic();

+        const Graphic* pGraph = pGrfBrush->GetGraphic(referer);

         if( pGraph )

             SetAnimated( pGraph->IsAnimated() );

         else

diff --git a/sw/source/core/text/porfld.hxx b/sw/source/core/text/porfld.hxx

index 740c2d9..d648a0f 100644

--- a/sw/source/core/text/porfld.hxx

+++ b/sw/source/core/text/porfld.hxx

@@ -170,6 +170,7 @@ public:

     SwGrfNumPortion( SwFrame *pFrame,

                      const OUString& rGraphicFollowedBy,

                      const SvxBrushItem* pGrfBrush,

+                     OUString const & referer,

                      const SwFormatVertOrient* pGrfOrient,

                      const Size& rGrfSize,

                      const bool bLeft,

diff --git a/sw/source/core/text/txtfld.cxx b/sw/source/core/text/txtfld.cxx

index 239e2a3..b6f2c5e 100644

--- a/sw/source/core/text/txtfld.cxx

+++ b/sw/source/core/text/txtfld.cxx

@@ -52,6 +52,7 @@

 #include "flddat.hxx"

 #include "fmtautofmt.hxx"

 #include <IDocumentSettingAccess.hxx>

+#include <sfx2/docfile.hxx>

 #include <svl/itemiter.hxx>

 static bool lcl_IsInBody( SwFrame *pFrame )

@@ -478,9 +479,18 @@ SwNumberPortion *SwTextFormatter::NewNumberPortion( SwTextFormatInfo &rInf ) con

         if( SVX_NUM_BITMAP == rNumFormat.GetNumberingType() )

         {

+            OUString referer;

+            if (auto const sh1 = rInf.GetVsh()) {

+                if (auto const doc = sh1->GetDoc()) {

+                    auto const sh2 = doc->GetPersist();

+                    if (sh2 != nullptr && sh2->HasName()) {

+                        referer = sh2->GetMedium()->GetName();

+                    }

+                }

+            }

             pRet = new SwGrfNumPortion( const_cast<SwTextFrame*>(GetTextFrame()),

                                         pTextNd->GetLabelFollowedBy(),

-                                        rNumFormat.GetBrush(),

+                                        rNumFormat.GetBrush(), referer,

                                         rNumFormat.GetGraphicOrientation(),

                                         rNumFormat.GetGraphicSize(),

                                         bLeft, bCenter, nMinDist,

diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx

index 716ab9d..13dc05f 100644

--- a/sw/source/core/unocore/unosett.cxx

+++ b/sw/source/core/unocore/unosett.cxx

@@ -53,6 +53,7 @@

 #include <com/sun/star/style/VerticalAlignment.hpp>

 #include <o3tl/any.hxx>

 #include <vcl/font.hxx>

+#include <sfx2/docfile.hxx>

 #include <editeng/flstitem.hxx>

 #include <vcl/metric.hxx>

 #include <svtools/ctrltool.hxx>

@@ -1342,13 +1343,21 @@ uno::Sequence<beans::PropertyValue> SwXNumberingRules::GetNumberingRuleByIndex(

         SwStyleNameMapper::FillProgName(sValue, aUString, SwGetPoolIdFromName::TxtColl, true);

     }

-    return GetPropertiesForNumFormat(rFormat, CharStyleName, (pDocShell) ? & aUString : nullptr);

+    OUString referer;

+    if (pDoc != nullptr) {

+        auto const sh = pDoc->GetPersist();

+        if (sh != nullptr && sh->HasName()) {

+            referer = sh->GetMedium()->GetName();

+        }

+    }

+    return GetPropertiesForNumFormat(

+        rFormat, CharStyleName, (pDocShell) ? & aUString : nullptr, referer);

 }

 uno::Sequence<beans::PropertyValue> SwXNumberingRules::GetPropertiesForNumFormat(

         const SwNumFormat& rFormat, OUString const& rCharFormatName,

-        OUString const*const pHeadingStyleName)

+        OUString const*const pHeadingStyleName, OUString const & referer)

 {

     bool bChapterNum = pHeadingStyleName != nullptr;

@@ -1480,7 +1489,7 @@ uno::Sequence<beans::PropertyValue> SwXNumberingRules::GetPropertiesForNumFormat

             //graphicbitmap

             const Graphic* pGraphic = nullptr;

             if(pBrush )

-                pGraphic = pBrush->GetGraphic();

+                pGraphic = pBrush->GetGraphic(referer);

             if(pGraphic)

             {

                 uno::Reference<awt::XBitmap> xBmp = VCLUnoHelper::CreateBitmap( pGraphic->GetBitmapEx() );

diff --git a/sw/source/uibase/config/StoredChapterNumbering.cxx b/sw/source/uibase/config/StoredChapterNumbering.cxx

index 2464878..a56aeeb 100644

--- a/sw/source/uibase/config/StoredChapterNumbering.cxx

+++ b/sw/source/uibase/config/StoredChapterNumbering.cxx

@@ -135,7 +135,7 @@ public:

         OUString dummy; // pass in empty HeadingStyleName - can't import anyway

         uno::Sequence<beans::PropertyValue> const ret(

             SwXNumberingRules::GetPropertiesForNumFormat(

-                *pNumFormat, *pCharStyleName, &dummy));

+                *pNumFormat, *pCharStyleName, &dummy, ""));

         return uno::makeAny(ret);

     }

-- 

2.20.1