[Libreoffice-commits] core.git: include/svx svx/inc svx/source sw/source
Noel Grandin
noel.grandin at collabora.co.uk
Mon Oct 30 10:59:18 UTC 2017
include/svx/gallery.hxx | 3 -
include/svx/hdft.hxx | 3 -
include/svx/sdr/primitive2d/sdrdecompositiontools.hxx | 3 -
include/svx/svddrag.hxx | 2
include/svx/svdmodel.hxx | 2
svx/inc/sdr/overlay/overlaymanagerbuffered.hxx | 3 -
svx/source/customshapes/EnhancedCustomShape3d.cxx | 12 +---
svx/source/dialog/hdft.cxx | 5 -
svx/source/gallery2/galexpl.cxx | 5 -
svx/source/inc/cell.hxx | 2
svx/source/sdr/overlay/overlaymanagerbuffered.cxx | 5 -
svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx | 1
svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx | 1
svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx | 3 -
svx/source/sdr/primitive2d/sdrdecompositiontools.cxx | 5 -
svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx | 2
svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx | 1
svx/source/sdr/primitive2d/sdrole2primitive2d.cxx | 1
svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx | 1
svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx | 1
svx/source/svdraw/sdrpaintwindow.cxx | 2
svx/source/svdraw/svddrag.cxx | 7 +-
svx/source/svdraw/svdmodel.cxx | 5 -
svx/source/svdraw/svdobj.cxx | 44 ++++++---------
svx/source/table/cell.cxx | 4 -
svx/source/table/svdotable.cxx | 2
svx/source/table/viewcontactoftableobj.cxx | 1
svx/source/unodraw/UnoGraphicExporter.cxx | 4 -
svx/source/unodraw/UnoGraphicExporter.hxx | 2
svx/source/unodraw/tableshape.cxx | 2
sw/source/uibase/docvw/HeaderFooterWin.cxx | 2
31 files changed, 54 insertions(+), 82 deletions(-)
New commits:
commit 6f45913394a931f2053c7b1cba52bdfd79a3093b
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Mon Oct 30 11:24:41 2017 +0200
loplugin:constantparam in svx
Change-Id: Ifaad1083b1561b2bd908e798e06fbff8bbabbe60
Reviewed-on: https://gerrit.libreoffice.org/44048
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/include/svx/gallery.hxx b/include/svx/gallery.hxx
index 4d5b1e8b2fa6..ab351e1f1e2e 100644
--- a/include/svx/gallery.hxx
+++ b/include/svx/gallery.hxx
@@ -121,8 +121,7 @@ public:
Graphic* pGraphic, BitmapEx* pThumb = nullptr,
bool bProgress = false );
static bool GetGraphicObj( sal_uInt32 nThemeId, sal_uInt32 nPos,
- Graphic* pGraphic, BitmapEx* pThumb = nullptr,
- bool bProgress = false );
+ Graphic* pGraphic );
static sal_uInt32 GetSdrObjCount( const OUString& rThemeName );
static sal_uInt32 GetSdrObjCount( sal_uInt32 nThemeId );
diff --git a/include/svx/hdft.hxx b/include/svx/hdft.hxx
index 335f7aa74abb..3531cafb3046 100644
--- a/include/svx/hdft.hxx
+++ b/include/svx/hdft.hxx
@@ -31,8 +31,7 @@
namespace svx
{
- SVX_DLLPUBLIC bool ShowBorderBackgroundDlg( vcl::Window* pParent, SfxItemSet* pBBSet,
- bool bEnableBackgroundSelector );
+ SVX_DLLPUBLIC bool ShowBorderBackgroundDlg( vcl::Window* pParent, SfxItemSet* pBBSet );
}
// class SvxHFPage ------------------------------------------------------
diff --git a/include/svx/sdr/primitive2d/sdrdecompositiontools.hxx b/include/svx/sdr/primitive2d/sdrdecompositiontools.hxx
index 3811f32234ad..da3c54650746 100644
--- a/include/svx/sdr/primitive2d/sdrdecompositiontools.hxx
+++ b/include/svx/sdr/primitive2d/sdrdecompositiontools.hxx
@@ -67,8 +67,7 @@ namespace drawinglayer
const attribute::SdrTextAttribute& rText,
const attribute::SdrLineAttribute& rStroke,
bool bCellText,
- bool bWordWrap,
- bool bClipOnBounds);
+ bool bWordWrap);
Primitive2DContainer SVX_DLLPUBLIC createEmbeddedShadowPrimitive(
const Primitive2DContainer& rContent,
diff --git a/include/svx/svddrag.hxx b/include/svx/svddrag.hxx
index 278bbc0a621c..fab14eb2230a 100644
--- a/include/svx/svddrag.hxx
+++ b/include/svx/svddrag.hxx
@@ -75,7 +75,7 @@ class SVX_DLLPUBLIC SdrDragStat final
SdrDragMethod* pDragMethod;
std::unique_ptr<SdrDragStatUserData> mpUserData; // Userdata
- void Clear(bool bLeaveOne);
+ void Clear();
Point& Pnt(sal_uIntPtr nNum) { return mvPnts[nNum]; }
public:
diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx
index 79ce5d78085c..4a38209b561d 100644
--- a/include/svx/svdmodel.hxx
+++ b/include/svx/svdmodel.hxx
@@ -354,7 +354,7 @@ public:
static void TakeUnitStr(FieldUnit eUnit, OUString& rStr);
void TakeMetricStr(long nVal, OUString& rStr, bool bNoUnitChars = false, sal_Int32 nNumDigits = -1) const;
- static void TakeAngleStr(long nAngle, OUString& rStr, bool bNoDegChar = false);
+ static void TakeAngleStr(long nAngle, OUString& rStr);
static void TakePercentStr(const Fraction& rVal, OUString& rStr);
// RecalcPageNums is ordinarily only called by the Page.
diff --git a/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx b/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx
index 0810927a965e..977ce71be4b1 100644
--- a/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx
+++ b/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx
@@ -65,8 +65,7 @@ namespace sdr
virtual ~OverlayManagerBuffered() override;
public:
- static rtl::Reference<OverlayManager> create(OutputDevice& rOutputDevice,
- bool bRefreshWithPreRendering);
+ static rtl::Reference<OverlayManager> create(OutputDevice& rOutputDevice);
// complete redraw
virtual void completeRedraw(const vcl::Region& rRegion, OutputDevice* pPreRenderDevice = nullptr) const override;
diff --git a/svx/source/customshapes/EnhancedCustomShape3d.cxx b/svx/source/customshapes/EnhancedCustomShape3d.cxx
index 09ca5d7d46c7..6d65bcc0ff63 100644
--- a/svx/source/customshapes/EnhancedCustomShape3d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape3d.cxx
@@ -122,14 +122,12 @@ void GetExtrusionDepth( const SdrCustomShapeGeometryItem& rItem, const double* p
}
}
-double GetDouble( const SdrCustomShapeGeometryItem& rItem, const OUString& rPropertyName, double fDefault, const double* pMap )
+double GetDouble( const SdrCustomShapeGeometryItem& rItem, const OUString& rPropertyName, double fDefault )
{
double fRetValue = fDefault;
const Any* pAny = rItem.GetPropertyValueByName( "Extrusion", rPropertyName );
if ( pAny )
*pAny >>= fRetValue;
- if ( pMap )
- fRetValue *= *pMap;
return fRetValue;
}
@@ -652,14 +650,14 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con
// light
- double fAmbientIntensity = GetDouble( rGeometryItem, "Brightness", 22178.0 / 655.36, nullptr ) / 100.0;
+ double fAmbientIntensity = GetDouble( rGeometryItem, "Brightness", 22178.0 / 655.36 ) / 100.0;
drawing::Direction3D aFirstLightDirectionDefault( 50000, 0, 10000 );
drawing::Direction3D aFirstLightDirection( GetDirection3D( rGeometryItem, "FirstLightDirection", aFirstLightDirectionDefault ) );
if ( aFirstLightDirection.DirectionZ == 0.0 )
aFirstLightDirection.DirectionZ = 1.0;
- double fLightIntensity = GetDouble( rGeometryItem, "FirstLightLevel", 43712.0 / 655.36, nullptr ) / 100.0;
+ double fLightIntensity = GetDouble( rGeometryItem, "FirstLightLevel", 43712.0 / 655.36 ) / 100.0;
/* sal_Bool bFirstLightHarsh = */ GetBool( rGeometryItem, "FirstLightHarsh", false );
@@ -668,7 +666,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con
if ( aSecondLightDirection.DirectionZ == 0.0 )
aSecondLightDirection.DirectionZ = -1;
- double fLight2Intensity = GetDouble( rGeometryItem, "SecondLightLevel", 43712.0 / 655.36, nullptr ) / 100.0;
+ double fLight2Intensity = GetDouble( rGeometryItem, "SecondLightLevel", 43712.0 / 655.36 ) / 100.0;
/* sal_Bool bLight2Harsh = */ GetBool( rGeometryItem, "SecondLightHarsh", false );
/* sal_Bool bLightFace = */ GetBool( rGeometryItem, "LightFace", false );
@@ -702,7 +700,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con
pScene->GetProperties().SetObjectItem( makeSvx3DLightcolor3Item( aAmbientSpot3Color ) );
pScene->GetProperties().SetObjectItem( makeSvx3DLightDirection3Item( aSpotLight3 ) );
- double fSpecular = GetDouble( rGeometryItem, "Specularity", 0, nullptr ) / 100;
+ double fSpecular = GetDouble( rGeometryItem, "Specularity", 0 ) / 100;
bool bMetal = GetBool( rGeometryItem, "Metal", false );
Color aSpecularCol( 225,225,225 );
diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx
index e15a422f4886..f96dbe2cdb24 100644
--- a/svx/source/dialog/hdft.cxx
+++ b/svx/source/dialog/hdft.cxx
@@ -87,14 +87,13 @@ const sal_uInt16 SvxHFPage::pRanges[] =
namespace svx {
- bool ShowBorderBackgroundDlg( vcl::Window* pParent, SfxItemSet* pBBSet,
- bool bEnableBackgroundSelector )
+ bool ShowBorderBackgroundDlg( vcl::Window* pParent, SfxItemSet* pBBSet )
{
bool bRes = false;
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact)
{
- ScopedVclPtr<SfxAbstractTabDialog> pDlg(pFact->CreateSvxBorderBackgroundDlg( pParent, *pBBSet, bEnableBackgroundSelector ));
+ ScopedVclPtr<SfxAbstractTabDialog> pDlg(pFact->CreateSvxBorderBackgroundDlg( pParent, *pBBSet, true/*bEnableBackgroundSelector*/ ));
DBG_ASSERT(pDlg, "Dialog creation failed!");
if ( pDlg->Execute() == RET_OK && pDlg->GetOutputItemSet() )
{
diff --git a/svx/source/gallery2/galexpl.cxx b/svx/source/gallery2/galexpl.cxx
index f99c3f652f7d..e1ecfd33796e 100644
--- a/svx/source/gallery2/galexpl.cxx
+++ b/svx/source/gallery2/galexpl.cxx
@@ -163,11 +163,10 @@ bool GalleryExplorer::GetGraphicObj( const OUString& rThemeName, sal_uInt32 nPos
}
bool GalleryExplorer::GetGraphicObj( sal_uInt32 nThemeId, sal_uInt32 nPos,
- Graphic* pGraphic, BitmapEx* pThumb,
- bool bProgress )
+ Graphic* pGraphic )
{
Gallery* pGal = ::Gallery::GetGalleryInstance();
- return pGal && GetGraphicObj( pGal->GetThemeName( nThemeId ), nPos, pGraphic, pThumb, bProgress );
+ return pGal && GetGraphicObj( pGal->GetThemeName( nThemeId ), nPos, pGraphic, nullptr/*pThumb*/, false/*bProgress*/ );
}
sal_uInt32 GalleryExplorer::GetSdrObjCount( const OUString& rThemeName )
diff --git a/svx/source/inc/cell.hxx b/svx/source/inc/cell.hxx
index b7905acf7b70..47a1f0f8bc4a 100644
--- a/svx/source/inc/cell.hxx
+++ b/svx/source/inc/cell.hxx
@@ -55,7 +55,7 @@ class SVX_DLLPUBLIC Cell : public SdrText,
friend class CellUndo;
public:
- SVX_DLLPRIVATE static rtl::Reference< Cell > create( SdrTableObj& rTableObj, OutlinerParaObject* pOutlinerParaObject );
+ SVX_DLLPRIVATE static rtl::Reference< Cell > create( SdrTableObj& rTableObj );
// private
SVX_DLLPRIVATE void dispose();
diff --git a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
index b16ccbe92aa4..a718970689f4 100644
--- a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
+++ b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
@@ -389,11 +389,10 @@ namespace sdr
}
rtl::Reference<OverlayManager> OverlayManagerBuffered::create(
- OutputDevice& rOutputDevice,
- bool bRefreshWithPreRendering)
+ OutputDevice& rOutputDevice)
{
return rtl::Reference<OverlayManager>(new OverlayManagerBuffered(rOutputDevice,
- bRefreshWithPreRendering));
+ true/*bRefreshWithPreRendering*/));
}
OverlayManagerBuffered::~OverlayManagerBuffered()
diff --git a/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx
index 2010c616b426..7e0e80dcfbf5 100644
--- a/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx
@@ -110,7 +110,6 @@ namespace drawinglayer
getSdrLFSTAttribute().getText(),
getSdrLFSTAttribute().getLine(),
false,
- false,
false));
}
diff --git a/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx
index b40dda55e69c..88f64cf92bb2 100644
--- a/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx
@@ -64,7 +64,6 @@ namespace drawinglayer
getSdrLSTAttribute().getText(),
getSdrLSTAttribute().getLine(),
false,
- false,
false));
}
diff --git a/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx
index 06724bfee652..b589d6156fb3 100644
--- a/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx
@@ -49,8 +49,7 @@ namespace drawinglayer
getSdrSTAttribute().getText(),
attribute::SdrLineAttribute(),
false,
- getWordWrap(),
- false/*ForceTextClipToTextRange*/));
+ getWordWrap()));
}
// add shadow
diff --git a/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx b/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx
index 1c409b89d9d3..159599cd5cf9 100644
--- a/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx
+++ b/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx
@@ -192,8 +192,7 @@ namespace drawinglayer
const attribute::SdrTextAttribute& rText,
const attribute::SdrLineAttribute& rStroke,
bool bCellText,
- bool bWordWrap,
- bool bClipOnBounds)
+ bool bWordWrap)
{
basegfx::B2DHomMatrix aAnchorTransform(rObjectTransform);
SdrTextPrimitive2D* pNew = nullptr;
@@ -334,7 +333,7 @@ namespace drawinglayer
rText.isScroll(),
bCellText,
bWordWrap,
- bClipOnBounds);
+ false/*bClipOnBounds*/);
}
}
diff --git a/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx
index 75d2bd8f8aea..aa6589abec40 100644
--- a/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx
@@ -97,7 +97,6 @@ namespace drawinglayer
getSdrLFSTAttribute().getText(),
getSdrLFSTAttribute().getLine(),
false,
- false,
false));
}
@@ -216,7 +215,6 @@ namespace drawinglayer
getSdrLFSTAttribute().getText(),
getSdrLFSTAttribute().getLine(),
false,
- false,
false));
}
diff --git a/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx
index 4f0cca8de993..76c274881bd3 100644
--- a/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx
@@ -114,7 +114,6 @@ namespace drawinglayer
getSdrLFSTAttribute().getText(),
getSdrLFSTAttribute().getLine(),
false,
- false,
false));
}
diff --git a/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx b/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx
index f687ddbe722e..509eaaf92bad 100644
--- a/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx
@@ -157,7 +157,6 @@ namespace drawinglayer
getSdrLFSTAttribute().getText(),
getSdrLFSTAttribute().getLine(),
false,
- false,
false));
}
diff --git a/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx
index 9f7e1bcdc1f9..37d4f5850b05 100644
--- a/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx
@@ -90,7 +90,6 @@ namespace drawinglayer
getSdrLFSTAttribute().getText(),
getSdrLFSTAttribute().getLine(),
false,
- false,
false));
}
diff --git a/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx
index 7e7cc221a694..9d1b2c667d7d 100644
--- a/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx
@@ -99,7 +99,6 @@ namespace drawinglayer
getSdrLFSTAttribute().getText(),
getSdrLFSTAttribute().getLine(),
false,
- false,
false));
}
diff --git a/svx/source/svdraw/sdrpaintwindow.cxx b/svx/source/svdraw/sdrpaintwindow.cxx
index e6dd9feb0826..5373093eb5b4 100644
--- a/svx/source/svdraw/sdrpaintwindow.cxx
+++ b/svx/source/svdraw/sdrpaintwindow.cxx
@@ -204,7 +204,7 @@ void SdrPaintWindow::impCreateOverlayManager()
// whether that refresh itself will use a 2nd vdev to avoid flickering.
// Also hand over the old OverlayManager if existent; this means to take over
// the registered OverlayObjects from it
- mxOverlayManager = sdr::overlay::OverlayManagerBuffered::create(GetOutputDevice(), true);
+ mxOverlayManager = sdr::overlay::OverlayManagerBuffered::create(GetOutputDevice());
}
else
{
diff --git a/svx/source/svdraw/svddrag.cxx b/svx/source/svdraw/svddrag.cxx
index 76a7e59bceec..6d16aa3ccb0f 100644
--- a/svx/source/svdraw/svddrag.cxx
+++ b/svx/source/svdraw/svddrag.cxx
@@ -26,12 +26,11 @@ SdrDragStat::~SdrDragStat()
{
}
-void SdrDragStat::Clear(bool bLeaveOne)
+void SdrDragStat::Clear()
{
mpUserData.reset();
mvPnts.clear();
- if (bLeaveOne)
- mvPnts.emplace_back();
+ mvPnts.emplace_back();
}
void SdrDragStat::Reset()
@@ -52,7 +51,7 @@ void SdrDragStat::Reset()
bEndDragChangesGeoAndAttributes=false;
mbEndDragChangesLayout=false;
bMouseIsUp=false;
- Clear(true);
+ Clear();
aActionRect=tools::Rectangle();
}
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index 3c5d2fb245b8..61e580d1f41a 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -1285,7 +1285,7 @@ void SdrModel::TakeMetricStr(long nVal, OUString& rStr, bool bNoUnitChars, sal_I
rStr = aBuf.makeStringAndClear();
}
-void SdrModel::TakeAngleStr(long nAngle, OUString& rStr, bool bNoDegChar)
+void SdrModel::TakeAngleStr(long nAngle, OUString& rStr)
{
bool bNeg = nAngle < 0;
@@ -1310,8 +1310,7 @@ void SdrModel::TakeAngleStr(long nAngle, OUString& rStr, bool bNoDegChar)
if(bNeg)
aBuf.insert(0, '-');
- if(!bNoDegChar)
- aBuf.append(DEGREE_CHAR);
+ aBuf.append(DEGREE_CHAR);
rStr = aBuf.makeStringAndClear();
}
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 27783e1c9111..d5ef63b3c842 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -2129,53 +2129,47 @@ void SdrObject::NbcApplyNotPersistAttr(const SfxItemSet& rAttr)
}
}
-static void lcl_SetItem(SfxItemSet& rAttr, bool bMerge, const SfxPoolItem& rItem)
-{
- if (bMerge) rAttr.MergeValue(rItem,true);
- else rAttr.Put(rItem);
-}
-
void SdrObject::TakeNotPersistAttr(SfxItemSet& rAttr) const
{
const tools::Rectangle& rSnap=GetSnapRect();
const tools::Rectangle& rLogic=GetLogicRect();
- lcl_SetItem(rAttr,false,SdrYesNoItem(SDRATTR_OBJMOVEPROTECT, IsMoveProtect()));
- lcl_SetItem(rAttr,false,SdrYesNoItem(SDRATTR_OBJSIZEPROTECT, IsResizeProtect()));
- lcl_SetItem(rAttr,false,SdrObjPrintableItem(IsPrintable()));
- lcl_SetItem(rAttr,false,SdrObjVisibleItem(IsVisible()));
- lcl_SetItem(rAttr,false,SdrAngleItem(SDRATTR_ROTATEANGLE, GetRotateAngle()));
- lcl_SetItem(rAttr,false,SdrShearAngleItem(GetShearAngle()));
- lcl_SetItem(rAttr,false,SdrOneSizeWidthItem(rSnap.GetWidth()-1));
- lcl_SetItem(rAttr,false,SdrOneSizeHeightItem(rSnap.GetHeight()-1));
- lcl_SetItem(rAttr,false,SdrOnePositionXItem(rSnap.Left()));
- lcl_SetItem(rAttr,false,SdrOnePositionYItem(rSnap.Top()));
+ rAttr.Put(SdrYesNoItem(SDRATTR_OBJMOVEPROTECT, IsMoveProtect()));
+ rAttr.Put(SdrYesNoItem(SDRATTR_OBJSIZEPROTECT, IsResizeProtect()));
+ rAttr.Put(SdrObjPrintableItem(IsPrintable()));
+ rAttr.Put(SdrObjVisibleItem(IsVisible()));
+ rAttr.Put(SdrAngleItem(SDRATTR_ROTATEANGLE, GetRotateAngle()));
+ rAttr.Put(SdrShearAngleItem(GetShearAngle()));
+ rAttr.Put(SdrOneSizeWidthItem(rSnap.GetWidth()-1));
+ rAttr.Put(SdrOneSizeHeightItem(rSnap.GetHeight()-1));
+ rAttr.Put(SdrOnePositionXItem(rSnap.Left()));
+ rAttr.Put(SdrOnePositionYItem(rSnap.Top()));
if (rLogic.GetWidth()!=rSnap.GetWidth()) {
- lcl_SetItem(rAttr,false,SdrLogicSizeWidthItem(rLogic.GetWidth()-1));
+ rAttr.Put(SdrLogicSizeWidthItem(rLogic.GetWidth()-1));
}
if (rLogic.GetHeight()!=rSnap.GetHeight()) {
- lcl_SetItem(rAttr,false,SdrLogicSizeHeightItem(rLogic.GetHeight()-1));
+ rAttr.Put(SdrLogicSizeHeightItem(rLogic.GetHeight()-1));
}
OUString aName(GetName());
if (!aName.isEmpty())
{
- lcl_SetItem(rAttr, false, SfxStringItem(SDRATTR_OBJECTNAME, aName));
+ rAttr.Put(SfxStringItem(SDRATTR_OBJECTNAME, aName));
}
- lcl_SetItem(rAttr,false,SdrLayerIdItem(GetLayer()));
+ rAttr.Put(SdrLayerIdItem(GetLayer()));
const SdrLayerAdmin* pLayAd=pPage!=nullptr ? &pPage->GetLayerAdmin() : pModel!=nullptr ? &pModel->GetLayerAdmin() : nullptr;
if (pLayAd!=nullptr) {
const SdrLayer* pLayer=pLayAd->GetLayerPerID(GetLayer());
if (pLayer!=nullptr) {
- lcl_SetItem(rAttr,false,SdrLayerNameItem(pLayer->GetName()));
+ rAttr.Put(SdrLayerNameItem(pLayer->GetName()));
}
}
Point aRef1(rSnap.Center());
Point aRef2(aRef1); aRef2.Y()++;
- lcl_SetItem(rAttr,false,SdrTransformRef1XItem(aRef1.X()));
- lcl_SetItem(rAttr,false,SdrTransformRef1YItem(aRef1.Y()));
- lcl_SetItem(rAttr,false,SdrTransformRef2XItem(aRef2.X()));
- lcl_SetItem(rAttr,false,SdrTransformRef2YItem(aRef2.Y()));
+ rAttr.Put(SdrTransformRef1XItem(aRef1.X()));
+ rAttr.Put(SdrTransformRef1YItem(aRef1.Y()));
+ rAttr.Put(SdrTransformRef2XItem(aRef2.X()));
+ rAttr.Put(SdrTransformRef2YItem(aRef2.Y()));
}
SfxStyleSheet* SdrObject::GetStyleSheet() const
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index 234b4665bb85..f8a4855c66ad 100644
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -380,9 +380,9 @@ namespace sdr { namespace table {
// Cell
-rtl::Reference< Cell > Cell::create( SdrTableObj& rTableObj, OutlinerParaObject* pOutlinerParaObject )
+rtl::Reference< Cell > Cell::create( SdrTableObj& rTableObj )
{
- rtl::Reference< Cell > xCell( new Cell( rTableObj, pOutlinerParaObject ) );
+ rtl::Reference< Cell > xCell( new Cell( rTableObj, nullptr ) );
if( xCell->mxTable.is() )
{
Reference< XEventListener > xListener( xCell.get() );
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index 1e8b2a59e6bf..78f6261c43a2 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -2309,7 +2309,7 @@ Pointer SdrTableObj::GetCreatePointer() const
void SdrTableObj::createCell( CellRef& xNewCell )
{
- xNewCell = Cell::create( *this, nullptr );
+ xNewCell = Cell::create( *this );
}
diff --git a/svx/source/table/viewcontactoftableobj.cxx b/svx/source/table/viewcontactoftableobj.cxx
index e84aee4e3219..2f818e5ee7f2 100644
--- a/svx/source/table/viewcontactoftableobj.cxx
+++ b/svx/source/table/viewcontactoftableobj.cxx
@@ -119,7 +119,6 @@ namespace drawinglayer
getSdrFTAttribute().getText(),
attribute::SdrLineAttribute(),
true,
- false,
false));
}
}
diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx
index 6da4491a778e..2188da8154b5 100644
--- a/svx/source/unodraw/UnoGraphicExporter.cxx
+++ b/svx/source/unodraw/UnoGraphicExporter.cxx
@@ -1238,7 +1238,7 @@ Sequence< OUString > SAL_CALL GraphicExporter::getSupportedMimeTypeNames( )
}
-Graphic SvxGetGraphicForShape( SdrObject& rShape, bool bVector )
+Graphic SvxGetGraphicForShape( SdrObject& rShape )
{
Graphic aGraphic;
try
@@ -1247,7 +1247,7 @@ Graphic SvxGetGraphicForShape( SdrObject& rShape, bool bVector )
Reference< XComponent > xComp( rShape.getUnoShape(), UNO_QUERY_THROW );
xExporter->setSourceDocument( xComp );
ExportSettings aSettings( rShape.GetModel() );
- xExporter->GetGraphic( aSettings, aGraphic, bVector );
+ xExporter->GetGraphic( aSettings, aGraphic, true/*bVector*/ );
}
catch( Exception& )
{
diff --git a/svx/source/unodraw/UnoGraphicExporter.hxx b/svx/source/unodraw/UnoGraphicExporter.hxx
index dafb10e3c6c7..cbfd3f2f7d84 100644
--- a/svx/source/unodraw/UnoGraphicExporter.hxx
+++ b/svx/source/unodraw/UnoGraphicExporter.hxx
@@ -26,7 +26,7 @@
class SdrObject;
-Graphic SvxGetGraphicForShape( SdrObject& rShape, bool bVector );
+Graphic SvxGetGraphicForShape( SdrObject& rShape );
#endif
diff --git a/svx/source/unodraw/tableshape.cxx b/svx/source/unodraw/tableshape.cxx
index 2529334735d0..451cf396750e 100644
--- a/svx/source/unodraw/tableshape.cxx
+++ b/svx/source/unodraw/tableshape.cxx
@@ -124,7 +124,7 @@ bool SvxTableShape::getPropertyValueImpl(
{
if( mpObj.is() )
{
- Graphic aGraphic( SvxGetGraphicForShape( *mpObj.get(), true ) );
+ Graphic aGraphic( SvxGetGraphicForShape( *mpObj.get() ) );
rValue <<= aGraphic.GetXGraphic();
}
return true;
diff --git a/sw/source/uibase/docvw/HeaderFooterWin.cxx b/sw/source/uibase/docvw/HeaderFooterWin.cxx
index 71fd89b66af8..23a85053f358 100644
--- a/sw/source/uibase/docvw/HeaderFooterWin.cxx
+++ b/sw/source/uibase/docvw/HeaderFooterWin.cxx
@@ -439,7 +439,7 @@ void SwHeaderFooterWin::ExecuteCommand(const OString& rIdent)
aBoxInfo.SetValid( SvxBoxInfoItemValidFlags::DISABLE );
aSet.Put( aBoxInfo );
- if ( svx::ShowBorderBackgroundDlg( this, &aSet, true ) )
+ if ( svx::ShowBorderBackgroundDlg( this, &aSet ) )
{
const SfxPoolItem* pItem;
if ( SfxItemState::SET == aSet.GetItemState( RES_BACKGROUND, false, &pItem ) ) {
More information about the Libreoffice-commits
mailing list