diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-02-03 10:05:12 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-02-03 10:53:01 +0100 |
commit | 0528012fd0dc4b93645ef7790b0db9d1cecbae66 (patch) | |
tree | e3adb8f0200fc95c06f62205b346244c79ae88ca /svx | |
parent | f612839ed9200a3900ae5c3a2e12beccfa37b11e (diff) |
loplugin:constantparam
Change-Id: If2dee122bf07dc179fd8f6e766442ec1891a5f3d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87845
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx')
-rw-r--r-- | svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx | 5 | ||||
-rw-r--r-- | svx/source/accessibility/DescriptionGenerator.cxx | 12 | ||||
-rw-r--r-- | svx/source/sdr/contact/viewcontactofgraphic.cxx | 1 | ||||
-rw-r--r-- | svx/source/sdr/primitive2d/sdrdecompositiontools.cxx | 3 | ||||
-rw-r--r-- | svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx | 1 | ||||
-rw-r--r-- | svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx | 12 | ||||
-rw-r--r-- | svx/source/svdraw/svdotextdecomposition.cxx | 6 |
7 files changed, 10 insertions, 30 deletions
diff --git a/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx index de54ba0b6d12..e9e534a8f640 100644 --- a/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx +++ b/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx @@ -199,7 +199,6 @@ namespace drawinglayer bool const mbUnlimitedPage : 1; // force layout with no text break bool const mbCellText : 1; // this is a cell text as block text bool const mbWordWrap : 1; // for CustomShapes text layout - bool const mbClipOnBounds : 1; // for CustomShapes text layout // local decomposition. virtual void create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& aViewInformation) const override; @@ -214,8 +213,7 @@ namespace drawinglayer bool bFixedCellHeight, bool bUnlimitedPage, bool bCellText, - bool bWordWrap, - bool bClipOnBounds); + bool bWordWrap); // get data const basegfx::B2DHomMatrix& getTextRangeTransform() const { return maTextRangeTransform; } @@ -225,7 +223,6 @@ namespace drawinglayer bool getUnlimitedPage() const { return mbUnlimitedPage; } bool getCellText() const { return mbCellText; } bool getWordWrap() const { return mbWordWrap; } - bool getClipOnBounds() const { return mbClipOnBounds; } // compare operator virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; diff --git a/svx/source/accessibility/DescriptionGenerator.cxx b/svx/source/accessibility/DescriptionGenerator.cxx index 4b42d96803a2..464968a33e4a 100644 --- a/svx/source/accessibility/DescriptionGenerator.cxx +++ b/svx/source/accessibility/DescriptionGenerator.cxx @@ -133,10 +133,10 @@ void DescriptionGenerator::AddProperty (const OUString& sPropertyName, switch (aType) { case PropertyType::Color: - AddColor (sPropertyName, ""); + AddColor (sPropertyName); break; case PropertyType::Integer: - AddInteger (sPropertyName, ""); + AddInteger (sPropertyName); break; } } @@ -152,10 +152,8 @@ void DescriptionGenerator::AppendString (const OUString& sString) /** Search for the given color in the global color table. If found append its name to the description. Otherwise append its RGB tuple. */ -void DescriptionGenerator::AddColor (const OUString& sPropertyName, - const OUString& sLocalizedName) +void DescriptionGenerator::AddColor (const OUString& sPropertyName) { - msDescription.append(sLocalizedName); msDescription.append('='); try @@ -177,10 +175,8 @@ void DescriptionGenerator::AddColor (const OUString& sPropertyName, } -void DescriptionGenerator::AddInteger (const OUString& sPropertyName, - const OUString& sLocalizedName) +void DescriptionGenerator::AddInteger (const OUString& sPropertyName) { - msDescription.append(sLocalizedName); msDescription.append('='); try diff --git a/svx/source/sdr/contact/viewcontactofgraphic.cxx b/svx/source/sdr/contact/viewcontactofgraphic.cxx index 4af15e3a7ea9..28064f64556c 100644 --- a/svx/source/sdr/contact/viewcontactofgraphic.cxx +++ b/svx/source/sdr/contact/viewcontactofgraphic.cxx @@ -267,7 +267,6 @@ namespace sdr::contact false, false, false, - false, false)); // decompose immediately with neutral ViewInformation. This will diff --git a/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx b/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx index db6e0b1bc38c..86e085ea8581 100644 --- a/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx +++ b/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx @@ -330,8 +330,7 @@ namespace drawinglayer::primitive2d rText.isFixedCellHeight(), rText.isScroll(), bCellText, - bWordWrap, - false/*bClipOnBounds*/)); + bWordWrap)); } } diff --git a/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx index 88a1556b810c..82e2fc502160 100644 --- a/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx @@ -129,7 +129,6 @@ namespace drawinglayer::primitive2d rTextAttribute.isScroll(), false, false, - false, false); aTextRange = xBlockText->getB2DRange(aViewInformation); diff --git a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx index 1b4d0d9b650b..aee14e1b7748 100644 --- a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx @@ -352,8 +352,7 @@ namespace drawinglayer::primitive2d bool bFixedCellHeight, bool bUnlimitedPage, bool bCellText, - bool bWordWrap, - bool bClipOnBounds) + bool bWordWrap) : SdrTextPrimitive2D(pSdrText, rOutlinerParaObject), maTextRangeTransform(rTextRangeTransform), maSdrTextHorzAdjust(aSdrTextHorzAdjust), @@ -361,8 +360,7 @@ namespace drawinglayer::primitive2d mbFixedCellHeight(bFixedCellHeight), mbUnlimitedPage(bUnlimitedPage), mbCellText(bCellText), - mbWordWrap(bWordWrap), - mbClipOnBounds(bClipOnBounds) + mbWordWrap(bWordWrap) { } @@ -378,8 +376,7 @@ namespace drawinglayer::primitive2d && isFixedCellHeight() == rCompare.isFixedCellHeight() && getUnlimitedPage() == rCompare.getUnlimitedPage() && getCellText() == rCompare.getCellText() - && getWordWrap() == rCompare.getWordWrap() - && getClipOnBounds() == rCompare.getClipOnBounds()); + && getWordWrap() == rCompare.getWordWrap()); } return false; @@ -396,8 +393,7 @@ namespace drawinglayer::primitive2d isFixedCellHeight(), getUnlimitedPage(), getCellText(), - getWordWrap(), - getClipOnBounds()); + getWordWrap()); } // provide unique ID diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx index 541827536223..f02e7fa8c14c 100644 --- a/svx/source/svdraw/svdotextdecomposition.cxx +++ b/svx/source/svdraw/svdotextdecomposition.cxx @@ -1108,12 +1108,6 @@ void SdrTextObj::impDecomposeBlockTextPrimitive( // create ClipRange (if needed) basegfx::B2DRange aClipRange; - if(rSdrBlockTextPrimitive.getClipOnBounds()) - { - aClipRange.expand(-aAdjOffset); - aClipRange.expand(basegfx::B2DTuple(aAnchorTextSize.Width(), aAnchorTextSize.Height()) - aAdjOffset); - } - // now break up text primitives. impTextBreakupHandler aConverter(rOutliner); aConverter.decomposeBlockTextPrimitive(aNewTransformA, aNewTransformB, aClipRange); |