core.git: 2 commits - comphelper/source include/comphelper include/oox oox/source

[Noel Grandin (via logerrit)]

 comphelper/source/misc/mimeconfighelper.cxx |    4 ++--
 include/comphelper/mimeconfighelper.hxx     |    3 +--
 include/oox/export/drawingml.hxx            |    2 +-
 oox/source/export/ThemeExport.cxx           |    2 +-
 oox/source/export/drawingml.cxx             |    6 +++---
 5 files changed, 8 insertions(+), 9 deletions(-)

New commits:
commit a50045cd9b2a6587f71c1c104c59b1309eeffbb7
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Sat Apr 20 15:11:50 2024 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Mon Apr 22 13:26:46 2024 +0200

    loplugin:constantparam
    
    Change-Id: Ic34679736973ed1f10ced8c9f0846514fa556445
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166421
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx
index 2ea0fa616dac..864aaebbb61c 100644
--- a/include/oox/export/drawingml.hxx
+++ b/include/oox/export/drawingml.hxx
@@ -276,7 +276,7 @@ public:
 
     OUString writeToStorage(Graphic const& rGraphic, bool bRelPathToMedia = 
false, TypeHint eHint = TypeHint::Detect);
 
-    void writeBlip(Graphic const& rGraphic, std::vector<model::BlipEffect> 
const& rEffects, bool bRelPathToMedia = false);
+    void writeBlip(Graphic const& rGraphic, std::vector<model::BlipEffect> 
const& rEffects);
     void writeSvgExtension(OUString const& rSvgRelId);
 };
 
diff --git a/oox/source/export/ThemeExport.cxx 
b/oox/source/export/ThemeExport.cxx
index 6e0efb341ae2..38c4b96ecee3 100644
--- a/oox/source/export/ThemeExport.cxx
+++ b/oox/source/export/ThemeExport.cxx
@@ -619,7 +619,7 @@ void ThemeExport::writeBlip(model::BlipFill const& 
rBlipFill)
         return;
     oox::drawingml::GraphicExport aExporter(mpFS, mpFilterBase, 
meDocumentType);
     Graphic aGraphic(rBlipFill.mxGraphic);
-    aExporter.writeBlip(aGraphic, rBlipFill.maBlipEffects, false);
+    aExporter.writeBlip(aGraphic, rBlipFill.maBlipEffects);
 }
 
 void ThemeExport::writeBlipFill(model::BlipFill const& rBlipFill)
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 68a6d666b85f..01b8c6c2827e 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -1305,9 +1305,9 @@ void GraphicExport::writeSvgExtension(OUString const& 
rSvgRelId)
     mpFS->endElementNS( XML_a, XML_extLst);
 }
 
-void GraphicExport::writeBlip(Graphic const& rGraphic, 
std::vector<model::BlipEffect> const& rEffects, bool bRelPathToMedia)
+void GraphicExport::writeBlip(Graphic const& rGraphic, 
std::vector<model::BlipEffect> const& rEffects)
 {
-    OUString sRelId = writeToStorage(rGraphic, bRelPathToMedia);
+    OUString sRelId = writeToStorage(rGraphic, /*bRelPathToMedia*/false);
 
     mpFS->startElementNS(XML_a, XML_blip, FSNS(XML_r, XML_embed), sRelId);
 
@@ -1315,7 +1315,7 @@ void GraphicExport::writeBlip(Graphic const& rGraphic, 
std::vector<model::BlipEf
 
     if (rVectorGraphicDataPtr && rVectorGraphicDataPtr->getType() == 
VectorGraphicDataType::Svg)
     {
-        OUString sSvgRelId = writeToStorage(rGraphic, bRelPathToMedia, 
TypeHint::SVG);
+        OUString sSvgRelId = writeToStorage(rGraphic, 
/*bRelPathToMedia*/false, TypeHint::SVG);
         writeSvgExtension(sSvgRelId);
     }
 
commit bc94047616aaa22c3cd982ee978c320b897f9629
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Sat Apr 20 15:09:19 2024 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Mon Apr 22 13:26:38 2024 +0200

    loplugin:constantparam
    
    Change-Id: I42e35e3474a222d57cb0b911060710c0c49d0b0f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166420
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/comphelper/source/misc/mimeconfighelper.cxx 
b/comphelper/source/misc/mimeconfighelper.cxx
index 41005f3cbcdd..30881876b925 100644
--- a/comphelper/source/misc/mimeconfighelper.cxx
+++ b/comphelper/source/misc/mimeconfighelper.cxx
@@ -561,7 +561,7 @@ OUString 
MimeConfigurationHelper::GetFactoryNameByMediaType( const OUString& aMe
 
 OUString MimeConfigurationHelper::UpdateMediaDescriptorWithFilterName(
                                         uno::Sequence< beans::PropertyValue >& 
aMediaDescr,
-                                        bool bIgnoreType, bool 
bAllowDeepDetection )
+                                        bool bIgnoreType )
 {
     OUString aFilterName;
 
@@ -581,7 +581,7 @@ OUString 
MimeConfigurationHelper::UpdateMediaDescriptorWithFilterName(
         uno::Sequence< beans::PropertyValue > aTempMD( aMediaDescr );
 
         // get TypeName
-        OUString aTypeName = xTypeDetection->queryTypeByDescriptor(aTempMD, 
bAllowDeepDetection);
+        OUString aTypeName = xTypeDetection->queryTypeByDescriptor(aTempMD, 
/*bAllowDeepDetection*/true);
 
         // get FilterName
         for (const auto& prop : aTempMD)
diff --git a/include/comphelper/mimeconfighelper.hxx 
b/include/comphelper/mimeconfighelper.hxx
index b30bbfa7cb58..5dd99664a70a 100644
--- a/include/comphelper/mimeconfighelper.hxx
+++ b/include/comphelper/mimeconfighelper.hxx
@@ -104,8 +104,7 @@ public:
 
     OUString UpdateMediaDescriptorWithFilterName(
                         css::uno::Sequence< css::beans::PropertyValue >& 
aMediaDescr,
-                        bool bIgnoreType,
-                        bool bAllowDeepFilterDetection = true );
+                        bool bIgnoreType );
     OUString UpdateMediaDescriptorWithFilterName(
                         css::uno::Sequence< css::beans::PropertyValue >& 
aMediaDescr,
                         css::uno::Sequence< css::beans::NamedValue >& aObject 
);