[Libreoffice-commits] core.git: basegfx/source basic/source canvas/source drawinglayer/source filter/source hwpfilter/source idl/inc idl/source include/basegfx include/basic include/drawinglayer include/filter sc/inc sc/source sd/source svx/source sw/source
Noel Grandin
noel at peralex.com
Fri Jun 3 09:09:16 UTC 2016
basegfx/source/curve/b2dcubicbezier.cxx | 4 -
basegfx/source/polygon/b2dpolygontools.cxx | 2
basic/source/sbx/sbxcoll.cxx | 4 -
canvas/source/cairo/cairo_canvas.cxx | 2
canvas/source/cairo/cairo_canvas.hxx | 2
canvas/source/cairo/cairo_canvasbitmap.cxx | 2
canvas/source/cairo/cairo_canvasbitmap.hxx | 2
canvas/source/cairo/cairo_canvascustomsprite.cxx | 15 +----
canvas/source/cairo/cairo_canvascustomsprite.hxx | 2
canvas/source/cairo/cairo_canvashelper.cxx | 2
canvas/source/cairo/cairo_spritecanvas.cxx | 2
canvas/source/cairo/cairo_spritecanvas.hxx | 2
canvas/source/cairo/cairo_surfaceprovider.hxx | 4 -
drawinglayer/source/primitive2d/animatedprimitive2d.cxx | 10 +--
drawinglayer/source/primitive2d/pagepreviewprimitive2d.cxx | 5 -
filter/source/msfilter/escherex.cxx | 8 +-
filter/source/msfilter/eschesdo.cxx | 3 -
filter/source/msfilter/mstoolbar.cxx | 11 +--
filter/source/msfilter/svdfppt.cxx | 35 +++++-------
hwpfilter/source/formula.h | 4 -
idl/inc/bastype.hxx | 2
idl/source/objects/slot.cxx | 16 ++---
include/basegfx/curve/b2dcubicbezier.hxx | 2
include/basic/sbx.hxx | 2
include/drawinglayer/primitive2d/animatedprimitive2d.hxx | 6 --
include/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx | 3 -
include/filter/msfilter/escherex.hxx | 20 ++----
include/filter/msfilter/mstoolbar.hxx | 2
include/filter/msfilter/svdfppt.hxx | 7 --
sc/inc/attarray.hxx | 2
sc/source/core/data/attarray.cxx | 5 -
sc/source/core/data/column.cxx | 2
sc/source/filter/excel/xltoolbar.cxx | 2
sc/source/filter/xcl97/xcl97esc.cxx | 2
sd/source/filter/eppt/epptso.cxx | 2
sd/source/filter/ppt/pptin.cxx | 2
svx/source/sdr/contact/viewobjectcontactofpageobj.cxx | 2
svx/source/sdr/primitive2d/sdrdecompositiontools.cxx | 4 -
sw/source/filter/ww8/ww8toolbar.cxx | 2
39 files changed, 88 insertions(+), 118 deletions(-)
New commits:
commit f3c1d240bd4f32d014db00a9864c56f77b7cb127
Author: Noel Grandin <noel at peralex.com>
Date: Wed Jun 1 12:54:31 2016 +0200
loplugin:constantparams
Change-Id: Ib162ba9297b9d900ea42c7e5216e152d3e58a361
Reviewed-on: https://gerrit.libreoffice.org/25769
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/basegfx/source/curve/b2dcubicbezier.cxx b/basegfx/source/curve/b2dcubicbezier.cxx
index ffa5a6e..996500a 100644
--- a/basegfx/source/curve/b2dcubicbezier.cxx
+++ b/basegfx/source/curve/b2dcubicbezier.cxx
@@ -550,12 +550,12 @@ namespace basegfx
}
}
- void B2DCubicBezier::adaptiveSubdivideByAngle(B2DPolygon& rTarget, double fAngleBound, bool bAllowUnsharpen) const
+ void B2DCubicBezier::adaptiveSubdivideByAngle(B2DPolygon& rTarget, double fAngleBound) const
{
if(isBezier())
{
// use support method #i37443# and allow unsharpen the criteria
- ImpSubDivAngleStart(maStartPoint, maControlPointA, maControlPointB, maEndPoint, rTarget, fAngleBound * F_PI180, bAllowUnsharpen);
+ ImpSubDivAngleStart(maStartPoint, maControlPointA, maControlPointB, maEndPoint, rTarget, fAngleBound * F_PI180, true/*bAllowUnsharpen*/);
}
else
{
diff --git a/basegfx/source/polygon/b2dpolygontools.cxx b/basegfx/source/polygon/b2dpolygontools.cxx
index 4ec182e..6627e3c 100644
--- a/basegfx/source/polygon/b2dpolygontools.cxx
+++ b/basegfx/source/polygon/b2dpolygontools.cxx
@@ -295,7 +295,7 @@ namespace basegfx
if(aBezier.isBezier())
{
// call adaptive subdivide
- aBezier.adaptiveSubdivideByAngle(aRetval, fAngleBound, true);
+ aBezier.adaptiveSubdivideByAngle(aRetval, fAngleBound);
}
else
{
diff --git a/basic/source/sbx/sbxcoll.cxx b/basic/source/sbx/sbxcoll.cxx
index 0f4e312..8971c86 100644
--- a/basic/source/sbx/sbxcoll.cxx
+++ b/basic/source/sbx/sbxcoll.cxx
@@ -238,9 +238,9 @@ bool SbxCollection::LoadData( SvStream& rStrm, sal_uInt16 nVer )
SbxStdCollection::SbxStdCollection
- ( const OUString& rClass, const OUString& rElem, bool b )
+ ( const OUString& rClass, const OUString& rElem )
: SbxCollection( rClass ), aElemClass( rElem ),
- bAddRemoveOk( b )
+ bAddRemoveOk( true )
{}
SbxStdCollection::SbxStdCollection( const SbxStdCollection& r )
diff --git a/canvas/source/cairo/cairo_canvas.cxx b/canvas/source/cairo/cairo_canvas.cxx
index dd65071..d56256d 100644
--- a/canvas/source/cairo/cairo_canvas.cxx
+++ b/canvas/source/cairo/cairo_canvas.cxx
@@ -157,7 +157,7 @@ namespace cairocanvas
return pSurface;
}
- SurfaceSharedPtr Canvas::changeSurface( bool, bool )
+ SurfaceSharedPtr Canvas::changeSurface()
{
// non-modifiable surface here
return SurfaceSharedPtr();
diff --git a/canvas/source/cairo/cairo_canvas.hxx b/canvas/source/cairo/cairo_canvas.hxx
index d353632..fe712e3 100644
--- a/canvas/source/cairo/cairo_canvas.hxx
+++ b/canvas/source/cairo/cairo_canvas.hxx
@@ -135,7 +135,7 @@ namespace cairocanvas
virtual ::cairo::SurfaceSharedPtr getSurface() override;
virtual ::cairo::SurfaceSharedPtr createSurface( const ::basegfx::B2ISize& rSize, int aContent = CAIRO_CONTENT_COLOR_ALPHA ) override;
virtual ::cairo::SurfaceSharedPtr createSurface( ::Bitmap& rBitmap ) override;
- virtual ::cairo::SurfaceSharedPtr changeSurface( bool bHasAlpha, bool bCopyContent ) override;
+ virtual ::cairo::SurfaceSharedPtr changeSurface() override;
virtual OutputDevice* getOutputDevice() override;
private:
diff --git a/canvas/source/cairo/cairo_canvasbitmap.cxx b/canvas/source/cairo/cairo_canvasbitmap.cxx
index 2e5f886..37c8902 100644
--- a/canvas/source/cairo/cairo_canvasbitmap.cxx
+++ b/canvas/source/cairo/cairo_canvasbitmap.cxx
@@ -86,7 +86,7 @@ namespace cairocanvas
return mpSurfaceProvider->createSurface(rBitmap);
}
- SurfaceSharedPtr CanvasBitmap::changeSurface( bool, bool )
+ SurfaceSharedPtr CanvasBitmap::changeSurface()
{
// non-modifiable surface here
return SurfaceSharedPtr();
diff --git a/canvas/source/cairo/cairo_canvasbitmap.hxx b/canvas/source/cairo/cairo_canvasbitmap.hxx
index bf5bd3c0..e6c9f0c 100644
--- a/canvas/source/cairo/cairo_canvasbitmap.hxx
+++ b/canvas/source/cairo/cairo_canvasbitmap.hxx
@@ -95,7 +95,7 @@ namespace cairocanvas
virtual ::cairo::SurfaceSharedPtr getSurface() override;
virtual ::cairo::SurfaceSharedPtr createSurface( const ::basegfx::B2ISize& rSize, int aContent = CAIRO_CONTENT_COLOR_ALPHA ) override;
virtual ::cairo::SurfaceSharedPtr createSurface( ::Bitmap& rBitmap ) override;
- virtual ::cairo::SurfaceSharedPtr changeSurface( bool bHasAlpha, bool bCopyContent ) override;
+ virtual ::cairo::SurfaceSharedPtr changeSurface() override;
virtual OutputDevice* getOutputDevice() override;
// RepaintTarget
diff --git a/canvas/source/cairo/cairo_canvascustomsprite.cxx b/canvas/source/cairo/cairo_canvascustomsprite.cxx
index e527cb4..2fe5fa2 100644
--- a/canvas/source/cairo/cairo_canvascustomsprite.cxx
+++ b/canvas/source/cairo/cairo_canvascustomsprite.cxx
@@ -117,19 +117,14 @@ namespace cairocanvas
return mpSpriteCanvas->createSurface(rBitmap);
}
- SurfaceSharedPtr CanvasCustomSprite::changeSurface( bool bHasAlpha, bool bCopyContent )
+ SurfaceSharedPtr CanvasCustomSprite::changeSurface()
{
- if( !bHasAlpha && !bCopyContent )
- {
- SAL_INFO( "canvas.cairo", "replacing sprite background surface");
+ SAL_INFO( "canvas.cairo", "replacing sprite background surface");
- mpBufferSurface = mpSpriteCanvas->createSurface( maSize, CAIRO_CONTENT_COLOR );
- maSpriteHelper.setSurface( mpBufferSurface );
-
- return mpBufferSurface;
- }
+ mpBufferSurface = mpSpriteCanvas->createSurface( maSize, CAIRO_CONTENT_COLOR );
+ maSpriteHelper.setSurface( mpBufferSurface );
- return SurfaceSharedPtr();
+ return mpBufferSurface;
}
OutputDevice* CanvasCustomSprite::getOutputDevice()
diff --git a/canvas/source/cairo/cairo_canvascustomsprite.hxx b/canvas/source/cairo/cairo_canvascustomsprite.hxx
index a473bf6..d42b68c 100644
--- a/canvas/source/cairo/cairo_canvascustomsprite.hxx
+++ b/canvas/source/cairo/cairo_canvascustomsprite.hxx
@@ -133,7 +133,7 @@ namespace cairocanvas
virtual ::cairo::SurfaceSharedPtr getSurface() override;
virtual ::cairo::SurfaceSharedPtr createSurface( const ::basegfx::B2ISize& rSize, int aContent = CAIRO_CONTENT_COLOR_ALPHA ) override;
virtual ::cairo::SurfaceSharedPtr createSurface( ::Bitmap& rBitmap ) override;
- virtual ::cairo::SurfaceSharedPtr changeSurface( bool bHasAlpha, bool bCopyContent ) override;
+ virtual ::cairo::SurfaceSharedPtr changeSurface() override;
virtual OutputDevice* getOutputDevice() override;
private:
diff --git a/canvas/source/cairo/cairo_canvashelper.cxx b/canvas/source/cairo/cairo_canvashelper.cxx
index 9518f0f..cd9a79e 100644
--- a/canvas/source/cairo/cairo_canvashelper.cxx
+++ b/canvas/source/cairo/cairo_canvashelper.cxx
@@ -1425,7 +1425,7 @@ namespace cairocanvas
{
SAL_INFO( "canvas.cairo","trying to change surface to rgb");
if( mpSurfaceProvider ) {
- SurfaceSharedPtr pNewSurface = mpSurfaceProvider->changeSurface( false, false );
+ SurfaceSharedPtr pNewSurface = mpSurfaceProvider->changeSurface();
if( pNewSurface )
setSurface( pNewSurface, false );
diff --git a/canvas/source/cairo/cairo_spritecanvas.cxx b/canvas/source/cairo/cairo_spritecanvas.cxx
index 9c6dd66..921850d 100644
--- a/canvas/source/cairo/cairo_spritecanvas.cxx
+++ b/canvas/source/cairo/cairo_spritecanvas.cxx
@@ -165,7 +165,7 @@ namespace cairocanvas
return SurfaceSharedPtr();
}
- SurfaceSharedPtr SpriteCanvas::changeSurface( bool, bool )
+ SurfaceSharedPtr SpriteCanvas::changeSurface()
{
// non-modifiable surface here
return SurfaceSharedPtr();
diff --git a/canvas/source/cairo/cairo_spritecanvas.hxx b/canvas/source/cairo/cairo_spritecanvas.hxx
index 95a0e46..8e41026 100644
--- a/canvas/source/cairo/cairo_spritecanvas.hxx
+++ b/canvas/source/cairo/cairo_spritecanvas.hxx
@@ -134,7 +134,7 @@ namespace cairocanvas
virtual ::cairo::SurfaceSharedPtr getSurface() override;
virtual ::cairo::SurfaceSharedPtr createSurface( const ::basegfx::B2ISize& rSize, int aContent = CAIRO_CONTENT_COLOR_ALPHA ) override;
virtual ::cairo::SurfaceSharedPtr createSurface( ::Bitmap& rBitmap ) override;
- virtual ::cairo::SurfaceSharedPtr changeSurface( bool bHasAlpha, bool bCopyContent ) override;
+ virtual ::cairo::SurfaceSharedPtr changeSurface() override;
virtual OutputDevice* getOutputDevice() override;
// RepaintTarget
diff --git a/canvas/source/cairo/cairo_surfaceprovider.hxx b/canvas/source/cairo/cairo_surfaceprovider.hxx
index 5d0f15f..c2156cc 100644
--- a/canvas/source/cairo/cairo_surfaceprovider.hxx
+++ b/canvas/source/cairo/cairo_surfaceprovider.hxx
@@ -57,10 +57,10 @@ namespace cairocanvas
/// create new surface from given bitmap
virtual ::cairo::SurfaceSharedPtr createSurface( ::Bitmap& rBitmap ) = 0;
- /** convert surface between alpha and non-alpha
+ /** convert surface from alpha to non-alpha, does not copy content
channel. returns new surface on success, NULL otherwise
*/
- virtual ::cairo::SurfaceSharedPtr changeSurface( bool bHasAlpha, bool bCopyContent ) = 0;
+ virtual ::cairo::SurfaceSharedPtr changeSurface() = 0;
/** Provides the underlying vcl outputdevice this surface renders on
*/
diff --git a/drawinglayer/source/primitive2d/animatedprimitive2d.cxx b/drawinglayer/source/primitive2d/animatedprimitive2d.cxx
index 03712fb..5533b26 100644
--- a/drawinglayer/source/primitive2d/animatedprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/animatedprimitive2d.cxx
@@ -94,9 +94,8 @@ namespace drawinglayer
{
AnimatedBlinkPrimitive2D::AnimatedBlinkPrimitive2D(
const animation::AnimationEntry& rAnimationEntry,
- const Primitive2DContainer& rChildren,
- bool bIsTextAnimation)
- : AnimatedSwitchPrimitive2D(rAnimationEntry, rChildren, bIsTextAnimation)
+ const Primitive2DContainer& rChildren)
+ : AnimatedSwitchPrimitive2D(rAnimationEntry, rChildren, true/*bIsTextAnimation*/)
{
}
@@ -129,9 +128,8 @@ namespace drawinglayer
AnimatedInterpolatePrimitive2D::AnimatedInterpolatePrimitive2D(
const std::vector< basegfx::B2DHomMatrix >& rmMatrixStack,
const animation::AnimationEntry& rAnimationEntry,
- const Primitive2DContainer& rChildren,
- bool bIsTextAnimation)
- : AnimatedSwitchPrimitive2D(rAnimationEntry, rChildren, bIsTextAnimation),
+ const Primitive2DContainer& rChildren)
+ : AnimatedSwitchPrimitive2D(rAnimationEntry, rChildren, true/*bIsTextAnimation*/),
maMatrixStack()
{
// copy matrices to locally pre-decomposed matrix stack
diff --git a/drawinglayer/source/primitive2d/pagepreviewprimitive2d.cxx b/drawinglayer/source/primitive2d/pagepreviewprimitive2d.cxx
index bfe184a..3c2db2f 100644
--- a/drawinglayer/source/primitive2d/pagepreviewprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/pagepreviewprimitive2d.cxx
@@ -122,15 +122,14 @@ namespace drawinglayer
const basegfx::B2DHomMatrix& rTransform,
double fContentWidth,
double fContentHeight,
- const Primitive2DContainer& rPageContent,
- bool bKeepAspectRatio)
+ const Primitive2DContainer& rPageContent)
: BufferedDecompositionPrimitive2D(),
mxDrawPage(rxDrawPage),
maPageContent(rPageContent),
maTransform(rTransform),
mfContentWidth(fContentWidth),
mfContentHeight(fContentHeight),
- mbKeepAspectRatio(bKeepAspectRatio)
+ mbKeepAspectRatio(true)
{
}
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index 8362b21..3de4007 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -4991,7 +4991,7 @@ void EscherEx::Flush( SvStream* pPicStreamMergeBSE /* = NULL */ )
{
/* The DGG record is still not written. ESCHER_Persist_Dgg seeks
to the place where the complete record has to be inserted. */
- InsertAtCurrentPos( mxGlobal->GetDggAtomSize(), false );
+ InsertAtCurrentPos( mxGlobal->GetDggAtomSize() );
mxGlobal->WriteDggAtom( *mpOutStrm );
if ( mxGlobal->HasGraphics() )
@@ -5002,7 +5002,7 @@ void EscherEx::Flush( SvStream* pPicStreamMergeBSE /* = NULL */ )
sal_uInt32 nBSCSize = mxGlobal->GetBlibStoreContainerSize( pPicStreamMergeBSE );
if ( nBSCSize > 0 )
{
- InsertAtCurrentPos( nBSCSize, false );
+ InsertAtCurrentPos( nBSCSize );
mxGlobal->WriteBlibStoreContainer( *mpOutStrm, pPicStreamMergeBSE );
}
}
@@ -5016,7 +5016,7 @@ void EscherEx::Flush( SvStream* pPicStreamMergeBSE /* = NULL */ )
}
}
-void EscherEx::InsertAtCurrentPos( sal_uInt32 nBytes, bool bExpandEndOfAtom )
+void EscherEx::InsertAtCurrentPos( sal_uInt32 nBytes )
{
sal_uInt32 nSize, nType, nSource, nBufSize, nToCopy, nCurPos = mpOutStrm->Tell();
@@ -5038,7 +5038,7 @@ void EscherEx::InsertAtCurrentPos( sal_uInt32 nBytes, bool bExpandEndOfAtom )
/* Expand the record, if the insertion position is inside, or if the
position is at the end of a container (expands always), or at the
end of an atom and bExpandEndOfAtom is set. */
- if ( (nCurPos < nEndOfRecord) || ((nCurPos == nEndOfRecord) && (bContainer || bExpandEndOfAtom)) )
+ if ( (nCurPos < nEndOfRecord) || ((nCurPos == nEndOfRecord) && bContainer) )
{
mpOutStrm->SeekRel( -4 );
mpOutStrm->WriteUInt32( nSize + nBytes );
diff --git a/filter/source/msfilter/eschesdo.cxx b/filter/source/msfilter/eschesdo.cxx
index 1a3e62a..b7312ee 100644
--- a/filter/source/msfilter/eschesdo.cxx
+++ b/filter/source/msfilter/eschesdo.cxx
@@ -252,8 +252,7 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
sal_uInt32 nSize = pMemStrm->Seek( STREAM_SEEK_TO_END );
aPropOpt.AddOpt( ESCHER_Prop_pihlShape, false, nSize, const_cast<sal_uInt8 *>(pBuf), nSize );
}
- if ( pInteraction->hasInteraction() )
- aPropOpt.AddOpt( ESCHER_Prop_fPrint, 0x00080008 );
+ aPropOpt.AddOpt( ESCHER_Prop_fPrint, 0x00080008 );
}
if ( rObj.GetType() == "drawing.Custom" )
diff --git a/filter/source/msfilter/mstoolbar.cxx b/filter/source/msfilter/mstoolbar.cxx
index 9367e78..af001fb 100644
--- a/filter/source/msfilter/mstoolbar.cxx
+++ b/filter/source/msfilter/mstoolbar.cxx
@@ -120,7 +120,7 @@ OUString CustomToolBarImportHelper::MSOTCIDToOOCommand( sal_Int16 msoTCID )
}
bool
-CustomToolBarImportHelper::createMenu( const OUString& rName, const uno::Reference< container::XIndexAccess >& xMenuDesc, bool bPersist )
+CustomToolBarImportHelper::createMenu( const OUString& rName, const uno::Reference< container::XIndexAccess >& xMenuDesc )
{
bool bRes = true;
try
@@ -145,12 +145,9 @@ CustomToolBarImportHelper::createMenu( const OUString& rName, const uno::Referen
aPopupMenu[3].Value <<= sal_Int32( 0 );
xPopup->insertByIndex( xPopup->getCount(), uno::makeAny( aPopupMenu ) );
- if ( bPersist )
- {
- xCfgManager->insertSettings( sMenuBar, uno::Reference< container::XIndexAccess >( xPopup, uno::UNO_QUERY ) );
- uno::Reference< ui::XUIConfigurationPersistence > xPersistence( xCfgManager, uno::UNO_QUERY_THROW );
- xPersistence->store();
- }
+ xCfgManager->insertSettings( sMenuBar, uno::Reference< container::XIndexAccess >( xPopup, uno::UNO_QUERY ) );
+ uno::Reference< ui::XUIConfigurationPersistence > xPersistence( xCfgManager, uno::UNO_QUERY_THROW );
+ xPersistence->store();
}
}
catch( const uno::Exception& )
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index 6199da6..9c27674 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -1661,8 +1661,7 @@ SdrPowerPointImport::~SdrPowerPointImport()
}
bool PPTConvertOCXControls::ReadOCXStream( tools::SvRef<SotStorage>& rSrc,
- css::uno::Reference< css::drawing::XShape > *pShapeRef,
- bool bFloatingCtrl )
+ css::uno::Reference< css::drawing::XShape > *pShapeRef )
{
bool bRes = false;
uno::Reference< form::XFormComponent > xFComp;
@@ -1671,7 +1670,7 @@ bool PPTConvertOCXControls::ReadOCXStream( tools::SvRef<SotStorage>& rSrc,
if ( xFComp.is() )
{
css::awt::Size aSz; // not used in import
- bRes = InsertControl( xFComp, aSz,pShapeRef,bFloatingCtrl);
+ bRes = InsertControl( xFComp, aSz,pShapeRef, false/*bFloatingCtrl*/);
}
}
return bRes;
@@ -2977,10 +2976,9 @@ sal_uInt16 SdrPowerPointImport::GetMasterPageIndex( sal_uInt16 nPageNum, PptPage
return nIdx;
}
-SdrObject* SdrPowerPointImport::ImportPageBackgroundObject( const SdrPage& rPage, sal_uInt32& nBgFileOffset, bool bForce )
+SdrObject* SdrPowerPointImport::ImportPageBackgroundObject( const SdrPage& rPage, sal_uInt32& nBgFileOffset )
{
SdrObject* pRet = nullptr;
- bool bCreateObj = bForce;
std::unique_ptr<SfxItemSet> pSet;
sal_uLong nFPosMerk = rStCtrl.Tell(); // remember FilePos for restoring it later
DffRecordHeader aPageHd;
@@ -3017,24 +3015,21 @@ SdrObject* SdrPowerPointImport::ImportPageBackgroundObject( const SdrPage& rPage
}
}
rStCtrl.Seek( nFPosMerk ); // restore FilePos
- if ( bCreateObj )
+ if ( !pSet )
{
- if ( !pSet )
- {
- pSet.reset(new SfxItemSet( pSdrModel->GetItemPool() ));
- pSet->Put( XFillStyleItem( drawing::FillStyle_NONE ) );
- }
- pSet->Put( XLineStyleItem( drawing::LineStyle_NONE ) );
- Rectangle aRect( rPage.GetLftBorder(), rPage.GetUppBorder(), rPage.GetWdt()-rPage.GetRgtBorder(), rPage.GetHgt()-rPage.GetLwrBorder() );
- pRet = new SdrRectObj( aRect );
- pRet->SetModel( pSdrModel );
+ pSet.reset(new SfxItemSet( pSdrModel->GetItemPool() ));
+ pSet->Put( XFillStyleItem( drawing::FillStyle_NONE ) );
+ }
+ pSet->Put( XLineStyleItem( drawing::LineStyle_NONE ) );
+ Rectangle aRect( rPage.GetLftBorder(), rPage.GetUppBorder(), rPage.GetWdt()-rPage.GetRgtBorder(), rPage.GetHgt()-rPage.GetLwrBorder() );
+ pRet = new SdrRectObj( aRect );
+ pRet->SetModel( pSdrModel );
- pRet->SetMergedItemSet(*pSet);
+ pRet->SetMergedItemSet(*pSet);
- pRet->SetMarkProtect( true );
- pRet->SetMoveProtect( true );
- pRet->SetResizeProtect( true );
- }
+ pRet->SetMarkProtect( true );
+ pRet->SetMoveProtect( true );
+ pRet->SetResizeProtect( true );
return pRet;
}
diff --git a/hwpfilter/source/formula.h b/hwpfilter/source/formula.h
index a4cddc2..b87f362 100644
--- a/hwpfilter/source/formula.h
+++ b/hwpfilter/source/formula.h
@@ -37,11 +37,11 @@ using namespace ::com::sun::star::xml::sax;
class Formula
{
public:
- Formula(char *_eq, int _ishwpeq = 1)
+ Formula(char *_eq)
: pList(NULL)
{
eq = _eq;
- isHwpEQ = _ishwpeq;
+ isHwpEQ = 1;
trim();
}
virtual ~Formula(){ }
diff --git a/idl/inc/bastype.hxx b/idl/inc/bastype.hxx
index 4e176a5..df04891 100644
--- a/idl/inc/bastype.hxx
+++ b/idl/inc/bastype.hxx
@@ -35,7 +35,7 @@ class SvBOOL
bSet:1;
public:
SvBOOL() { bSet = bVal = false; }
- SvBOOL( bool b, bool bSetP ) : bVal( b ), bSet( bSetP ) {}
+ SvBOOL( bool b ) : bVal( b ), bSet( false) {}
SvBOOL & operator = ( bool n ) { bVal = n; bSet = true; return *this; }
operator bool() const { return bVal; }
diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx
index 22702f1..c17926a 100644
--- a/idl/source/objects/slot.cxx
+++ b/idl/source/objects/slot.cxx
@@ -33,27 +33,27 @@ SvMetaObject *SvMetaSlot::MakeClone() const
}
SvMetaSlot::SvMetaSlot()
- : aRecordPerSet( true, false )
- , aRecordAbsolute( false, false )
+ : aRecordPerSet( true )
+ , aRecordAbsolute( false )
, pLinkedSlot(nullptr)
, pNextSlot(nullptr)
, nListPos(0)
, pEnumValue(nullptr)
- , aReadOnlyDoc ( true, false )
- , aExport( true, false )
+ , aReadOnlyDoc ( true )
+ , aExport( true )
{
}
SvMetaSlot::SvMetaSlot( SvMetaType * pType )
: SvMetaAttribute( pType )
- , aRecordPerSet( true, false )
- , aRecordAbsolute( false, false )
+ , aRecordPerSet( true )
+ , aRecordAbsolute( false )
, pLinkedSlot(nullptr)
, pNextSlot(nullptr)
, nListPos(0)
, pEnumValue(nullptr)
- , aReadOnlyDoc ( true, false )
- , aExport( true, false )
+ , aReadOnlyDoc ( true )
+ , aExport( true )
{
}
diff --git a/include/basegfx/curve/b2dcubicbezier.hxx b/include/basegfx/curve/b2dcubicbezier.hxx
index 423e138..f97ac29 100644
--- a/include/basegfx/curve/b2dcubicbezier.hxx
+++ b/include/basegfx/curve/b2dcubicbezier.hxx
@@ -116,7 +116,7 @@ namespace basegfx
and the end point
#i37443# allow the criteria to get unsharp in recursions
*/
- void adaptiveSubdivideByAngle(B2DPolygon& rTarget, double fAngleBound, bool bAllowUnsharpen) const;
+ void adaptiveSubdivideByAngle(B2DPolygon& rTarget, double fAngleBound) const;
/** #i37443# adaptive subdivide by nCount subdivisions
no start point is added, but all necessary created edges
diff --git a/include/basic/sbx.hxx b/include/basic/sbx.hxx
index 96dc1ac..91351ac 100644
--- a/include/basic/sbx.hxx
+++ b/include/basic/sbx.hxx
@@ -246,7 +246,7 @@ protected:
virtual void CollRemove( SbxArray* pPar ) override;
public:
SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_FIXCOLLECTION,1);
- SbxStdCollection( const OUString& rClassname, const OUString& rElemClass, bool=true );
+ SbxStdCollection( const OUString& rClassname, const OUString& rElemClass );
SbxStdCollection( const SbxStdCollection& );
SbxStdCollection& operator=( const SbxStdCollection& );
virtual void Insert( SbxVariable* ) override;
diff --git a/include/drawinglayer/primitive2d/animatedprimitive2d.hxx b/include/drawinglayer/primitive2d/animatedprimitive2d.hxx
index 7050cbb..381cfd9 100644
--- a/include/drawinglayer/primitive2d/animatedprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/animatedprimitive2d.hxx
@@ -114,8 +114,7 @@ namespace drawinglayer
/// constructor
AnimatedBlinkPrimitive2D(
const animation::AnimationEntry& rAnimationEntry,
- const Primitive2DContainer& rChildren,
- bool bIsTextAnimation);
+ const Primitive2DContainer& rChildren);
/// create local decomposition
virtual Primitive2DContainer get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override;
@@ -150,8 +149,7 @@ namespace drawinglayer
AnimatedInterpolatePrimitive2D(
const std::vector< basegfx::B2DHomMatrix >& rmMatrixStack,
const animation::AnimationEntry& rAnimationEntry,
- const Primitive2DContainer& rChildren,
- bool bIsTextAnimation);
+ const Primitive2DContainer& rChildren);
/// create local decomposition
virtual Primitive2DContainer get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override;
diff --git a/include/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx b/include/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx
index f8d888a..43c092d 100644
--- a/include/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx
@@ -73,8 +73,7 @@ namespace drawinglayer
const basegfx::B2DHomMatrix& rTransform,
double fContentWidth,
double fContentHeight,
- const Primitive2DContainer& rPageContent,
- bool bKeepAspectRatio);
+ const Primitive2DContainer& rPageContent);
/// data read access
const css::uno::Reference< css::drawing::XDrawPage >& getXDrawPage() const { return mxDrawPage; }
diff --git a/include/filter/msfilter/escherex.hxx b/include/filter/msfilter/escherex.hxx
index ab4cedf..aa4cd54 100644
--- a/include/filter/msfilter/escherex.hxx
+++ b/include/filter/msfilter/escherex.hxx
@@ -993,15 +993,13 @@ public:
class InteractionInfo
{
- bool mbHasInteraction;
std::unique_ptr<SvMemoryStream> mpHyperlinkRecord;
public:
- InteractionInfo( SvMemoryStream* pStream, bool bInteraction ) : mbHasInteraction( bInteraction )
+ InteractionInfo( SvMemoryStream* pStream )
{
mpHyperlinkRecord.reset( pStream );
}
- bool hasInteraction() { return mbHasInteraction; }
const std::unique_ptr< SvMemoryStream >& getHyperlinkRecord() { return mpHyperlinkRecord; }
};
@@ -1191,16 +1189,14 @@ public:
@param nBytes The number of bytes to be inserted into the stream.
- @param bExpandEndOfAtom If set to true, an atom that currently ends
- exactly at the current stream position will be expanded to include
- the inserted data. If set to false, an atom that currently ends
- exactly at the current stream position will not be expanded to
- include the inserted data (used to insert e.g. a new atom after an
- existing atom). Note that containers that end exactly at the
- current stream position are always expanded to include the inserted
- data.
+ An atom that currently ends
+ exactly at the current stream position will not be expanded to
+ include the inserted data (used to insert e.g. a new atom after an
+ existing atom). Note that containers that end exactly at the
+ current stream position are always expanded to include the inserted
+ data.
*/
- void InsertAtCurrentPos( sal_uInt32 nBytes, bool bExpandEndOfAtom );
+ void InsertAtCurrentPos( sal_uInt32 nBytes );
void InsertPersistOffset( sal_uInt32 nKey, sal_uInt32 nOffset ); // It is not being checked if this key is already in the PersistantTable
void ReplacePersistOffset( sal_uInt32 nKey, sal_uInt32 nOffset );
diff --git a/include/filter/msfilter/mstoolbar.hxx b/include/filter/msfilter/mstoolbar.hxx
index a1ff72c..2696ae8 100644
--- a/include/filter/msfilter/mstoolbar.hxx
+++ b/include/filter/msfilter/mstoolbar.hxx
@@ -62,7 +62,7 @@ public:
OUString MSOCommandToOOCommand( sal_Int16 msoCmd );
OUString MSOTCIDToOOCommand( sal_Int16 msoTCID );
SfxObjectShell& GetDocShell() { return mrDocSh; }
- bool createMenu( const OUString& rName, const css::uno::Reference< css::container::XIndexAccess >& xMenuDesc, bool bPersist );
+ bool createMenu( const OUString& rName, const css::uno::Reference< css::container::XIndexAccess >& xMenuDesc );
};
class MSFILTER_DLLPUBLIC TBBase
diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx
index 4bef189..5efa503 100644
--- a/include/filter/msfilter/svdfppt.hxx
+++ b/include/filter/msfilter/svdfppt.hxx
@@ -600,8 +600,7 @@ public:
Size GetPageSize() const;
SdrObject* ImportPageBackgroundObject(
const SdrPage& rPage,
- sal_uInt32& nBgFileOffset,
- bool bForce
+ sal_uInt32& nBgFileOffset
);
bool IsNoteOrHandout( sal_uInt16 nPageNum, PptPageKind ePageKind ) const;
bool HasMasterPage(
@@ -1289,9 +1288,7 @@ public:
mpPPTImporter ( pPPTImporter )
{};
bool ReadOCXStream( tools::SvRef<SotStorage>& rSrc1,
- css::uno::Reference<
- css::drawing::XShape > *pShapeRef=nullptr,
- bool bFloatingCtrl=false );
+ css::uno::Reference<css::drawing::XShape > *pShapeRef=nullptr );
virtual bool InsertControl(
const css::uno::Reference< css::form::XFormComponent > &rFComp,
const css::awt::Size& rSize,
diff --git a/sc/inc/attarray.hxx b/sc/inc/attarray.hxx
index afff019..c1f5c2a 100644
--- a/sc/inc/attarray.hxx
+++ b/sc/inc/attarray.hxx
@@ -163,7 +163,7 @@ public:
void RemoveAreaMerge( SCROW nStartRow, SCROW nEndRow );
void FindStyleSheet( const SfxStyleSheetBase* pStyleSheet, ScFlatBoolRowSegments& rUsedRows, bool bReset );
- bool IsStyleSheetUsed( const ScStyleSheet& rStyle, bool bGatherAllStyles ) const;
+ bool IsStyleSheetUsed( const ScStyleSheet& rStyle ) const;
void DeleteAreaSafe(SCROW nStartRow, SCROW nEndRow);
void SetPatternAreaSafe( SCROW nStartRow, SCROW nEndRow,
diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx
index d22b868..f122b28 100644
--- a/sc/source/core/data/attarray.cxx
+++ b/sc/source/core/data/attarray.cxx
@@ -1752,8 +1752,7 @@ void ScAttrArray::FindStyleSheet( const SfxStyleSheetBase* pStyleSheet, ScFlatBo
}
}
-bool ScAttrArray::IsStyleSheetUsed( const ScStyleSheet& rStyle,
- bool bGatherAllStyles ) const
+bool ScAttrArray::IsStyleSheetUsed( const ScStyleSheet& rStyle ) const
{
bool bIsUsed = false;
SCSIZE nPos = 0;
@@ -1766,8 +1765,6 @@ bool ScAttrArray::IsStyleSheetUsed( const ScStyleSheet& rStyle,
pStyle->SetUsage( ScStyleSheet::USED );
if ( pStyle == &rStyle )
{
- if ( !bGatherAllStyles )
- return true;
bIsUsed = true;
}
}
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 8b6d1aa..548efca 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -665,7 +665,7 @@ void ScColumn::FindStyleSheet( const SfxStyleSheetBase* pStyleSheet, ScFlatBoolR
bool ScColumn::IsStyleSheetUsed( const ScStyleSheet& rStyle ) const
{
- return pAttrArray->IsStyleSheetUsed( rStyle, true/*bGatherAllStyles*/ );
+ return pAttrArray->IsStyleSheetUsed( rStyle );
}
bool ScColumn::ApplyFlags( SCROW nStartRow, SCROW nEndRow, ScMF nFlags )
diff --git a/sc/source/filter/excel/xltoolbar.cxx b/sc/source/filter/excel/xltoolbar.cxx
index 8d7fc32..8ac0602 100644
--- a/sc/source/filter/excel/xltoolbar.cxx
+++ b/sc/source/filter/excel/xltoolbar.cxx
@@ -282,7 +282,7 @@ bool ScTBC::ImportToolBarControl( ScCTBWrapper& rWrapper, const css::uno::Refere
return false;
if ( !bIsMenuToolbar )
{
- if ( !helper.createMenu( pMenu->Name(), uno::Reference< container::XIndexAccess >( xMenuDesc, uno::UNO_QUERY ), true ) )
+ if ( !helper.createMenu( pMenu->Name(), uno::Reference< container::XIndexAccess >( xMenuDesc, uno::UNO_QUERY ) ) )
return false;
}
else
diff --git a/sc/source/filter/xcl97/xcl97esc.cxx b/sc/source/filter/xcl97/xcl97esc.cxx
index 0333afb..dedab77 100644
--- a/sc/source/filter/xcl97/xcl97esc.cxx
+++ b/sc/source/filter/xcl97/xcl97esc.cxx
@@ -568,7 +568,7 @@ ShapeInteractionHelper::PopulateShapeInteractionInfo( XclExpObjectManager& rObjM
hExpHlink.WriteEmbeddedData( tmpStream );
}
if ( !sHyperLink.isEmpty() || !sMacro.isEmpty() )
- rHostAppData.SetInteractionInfo( new InteractionInfo( pMemStrm, true ) );
+ rHostAppData.SetInteractionInfo( new InteractionInfo( pMemStrm ) );
}
catch( Exception& )
{
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index 97c02fc..b12239b 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -438,7 +438,7 @@ bool PPTWriter::ImplCloseDocument()
nBytesToInsert += ImplDocumentListContainer();
// insert nBytes into stream and adjust depending container
- mpPptEscherEx->InsertAtCurrentPos( nBytesToInsert, false );
+ mpPptEscherEx->InsertAtCurrentPos( nBytesToInsert );
// CREATE HYPERLINK CONTAINER
if ( nExEmbedSize )
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 8eac912..f8d2d04 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -764,7 +764,7 @@ bool ImplSdPPTImport::Import()
break;
}
}
- SdrObject* pObj = ImportPageBackgroundObject( *pMPage, pE->nBackgroundOffset, true ); // import background
+ SdrObject* pObj = ImportPageBackgroundObject( *pMPage, pE->nBackgroundOffset ); // import background
if ( pObj )
pMPage->NbcInsertObject( pObj );
diff --git a/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx b/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx
index c6c1757..15ebcfb 100644
--- a/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx
@@ -270,7 +270,7 @@ drawinglayer::primitive2d::Primitive2DContainer ViewObjectContactOfPageObj::crea
{
const uno::Reference< drawing::XDrawPage > xDrawPage(GetXDrawPageForSdrPage(const_cast< SdrPage*>(pPage)));
const drawinglayer::primitive2d::Primitive2DReference xPagePreview(new drawinglayer::primitive2d::PagePreviewPrimitive2D(
- xDrawPage, aPageObjectTransform, fPageWidth, fPageHeight, xPageContent, true));
+ xDrawPage, aPageObjectTransform, fPageWidth, fPageHeight, xPageContent));
xRetval = drawinglayer::primitive2d::Primitive2DContainer { xPagePreview };
}
}
diff --git a/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx b/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx
index bc27dbc..39cef1e 100644
--- a/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx
+++ b/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx
@@ -353,7 +353,7 @@ namespace drawinglayer
const Primitive2DContainer aContent { xRefA };
// create and add animated switch primitive
- return Primitive2DReference(new AnimatedBlinkPrimitive2D(aAnimationList, aContent, true));
+ return Primitive2DReference(new AnimatedBlinkPrimitive2D(aAnimationList, aContent));
}
else
{
@@ -445,7 +445,7 @@ namespace drawinglayer
std::vector< basegfx::B2DHomMatrix > aMatrixStack;
aMatrixStack.push_back(aLeft);
aMatrixStack.push_back(aRight);
- const Primitive2DReference xRefA(new AnimatedInterpolatePrimitive2D(aMatrixStack, aAnimationList, aAnimSequence, true));
+ const Primitive2DReference xRefA(new AnimatedInterpolatePrimitive2D(aMatrixStack, aAnimationList, aAnimSequence));
const Primitive2DContainer aContent { xRefA };
// scrolling needs an encapsulating clipping primitive
diff --git a/sw/source/filter/ww8/ww8toolbar.cxx b/sw/source/filter/ww8/ww8toolbar.cxx
index 056839a..85480f5 100644
--- a/sw/source/filter/ww8/ww8toolbar.cxx
+++ b/sw/source/filter/ww8/ww8toolbar.cxx
@@ -727,7 +727,7 @@ SwTBC::ImportToolBarControl( SwCTBWrapper& rWrapper, const css::uno::Reference<
return false;
if ( !bIsMenuBar )
{
- if ( !helper.createMenu( pMenu->Name(), uno::Reference< container::XIndexAccess >( xMenuDesc, uno::UNO_QUERY ), true ) )
+ if ( !helper.createMenu( pMenu->Name(), uno::Reference< container::XIndexAccess >( xMenuDesc, uno::UNO_QUERY ) ) )
return false;
}
else
More information about the Libreoffice-commits
mailing list