[Libreoffice-commits] core.git: include/svx svx/inc svx/source
Noel Grandin
noel.grandin at collabora.co.uk
Fri May 5 06:42:26 UTC 2017
include/svx/charthelper.hxx | 3 -
include/svx/galtheme.hxx | 4 +-
include/svx/sdr/properties/properties.hxx | 4 --
include/svx/svdcrtv.hxx | 2 -
svx/inc/GalleryControl.hxx | 6 +--
svx/inc/galbrws2.hxx | 10 ++---
svx/inc/galobj.hxx | 6 +--
svx/inc/sdr/properties/emptyproperties.hxx | 3 -
svx/source/gallery2/GalleryControl.cxx | 7 +--
svx/source/gallery2/galbrws2.cxx | 16 ++++----
svx/source/gallery2/galctrl.cxx | 34 +++++++++---------
svx/source/gallery2/galexpl.cxx | 2 -
svx/source/gallery2/galobj.cxx | 9 ++--
svx/source/gallery2/galtheme.cxx | 16 ++++----
svx/source/sdr/contact/viewobjectcontactofpageobj.cxx | 8 ++--
svx/source/sdr/properties/emptyproperties.cxx | 10 -----
svx/source/sdr/properties/pageproperties.cxx | 4 +-
svx/source/sdr/properties/properties.cxx | 5 --
svx/source/sidebar/PanelFactory.cxx | 2 -
svx/source/svdraw/charthelper.cxx | 3 -
svx/source/svdraw/svdcrtv.cxx | 4 +-
svx/source/svdraw/svdoedge.cxx | 4 +-
22 files changed, 68 insertions(+), 94 deletions(-)
New commits:
commit 44bc7fc5609a4930e7236b43cf445920a2a3bc77
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Thu May 4 12:21:07 2017 +0200
loplugin:checkunusedparams in svx(part2)
Change-Id: I608d504b64336e1cb2fc32a46908bef0cffed3bd
Reviewed-on: https://gerrit.libreoffice.org/37229
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/include/svx/charthelper.hxx b/include/svx/charthelper.hxx
index f7c70bd192cf..acc1349c93c5 100644
--- a/include/svx/charthelper.hxx
+++ b/include/svx/charthelper.hxx
@@ -57,8 +57,7 @@ public:
// since this would not be saved/loaded, thus the compatibility will be better when setting it at
// newly created charts using this method
static void AdaptDefaultsForChart(
- const css::uno::Reference < css::embed::XEmbeddedObject > & xEmbObj,
- bool bNoFillStyle = true);
+ const css::uno::Reference < css::embed::XEmbeddedObject > & xEmbObj);
};
#endif // INCLUDED_SVX_CHARTHELPER_HXX
diff --git a/include/svx/galtheme.hxx b/include/svx/galtheme.hxx
index 003c013fe365..2b6b15ce9236 100644
--- a/include/svx/galtheme.hxx
+++ b/include/svx/galtheme.hxx
@@ -181,12 +181,12 @@ public:
return ImplGetGalleryObject( nPos )->aURL;
}
- SAL_DLLPRIVATE bool GetThumb( sal_uIntPtr nPos, BitmapEx& rBmp, bool bProgress = false );
+ SAL_DLLPRIVATE bool GetThumb( sal_uIntPtr nPos, BitmapEx& rBmp );
bool GetGraphic( sal_uIntPtr nPos, Graphic& rGraphic, bool bProgress = false );
bool InsertGraphic( const Graphic& rGraphic, sal_uIntPtr nInsertPos );
- bool GetModel( sal_uIntPtr nPos, SdrModel& rModel, bool bProgress = false );
+ bool GetModel( sal_uIntPtr nPos, SdrModel& rModel );
bool InsertModel( const FmFormModel& rModel, sal_uIntPtr nInsertPos );
SAL_DLLPRIVATE bool GetModelStream( sal_uIntPtr nPos, tools::SvRef<SotStorageStream>& rModelStreamRef );
diff --git a/include/svx/sdr/properties/properties.hxx b/include/svx/sdr/properties/properties.hxx
index e1b9a5f269cb..3a49400f5d76 100644
--- a/include/svx/sdr/properties/properties.hxx
+++ b/include/svx/sdr/properties/properties.hxx
@@ -79,10 +79,6 @@ namespace sdr
// basic constructor, used from SdrObject.
explicit BaseProperties(SdrObject& rObj);
- // constructor for copying, but using new object. Used from the Clone()
- // method.
- BaseProperties(const BaseProperties& rProps, SdrObject& rObj);
-
// destructor
virtual ~BaseProperties();
diff --git a/include/svx/svdcrtv.hxx b/include/svx/svdcrtv.hxx
index 928006172ee2..419193dcadca 100644
--- a/include/svx/svdcrtv.hxx
+++ b/include/svx/svdcrtv.hxx
@@ -143,7 +143,7 @@ public:
// Default = sal_False;
bool IsUseIncompatiblePathCreateInterface() const { return bUseIncompatiblePathCreateInterface; }
void SetUseIncompatiblePathCreateInterface(bool bOn) { bUseIncompatiblePathCreateInterface = bOn; }
- void SetConnectMarker(const SdrObjConnection& rCon, const SdrPageView& rPV);
+ void SetConnectMarker(const SdrObjConnection& rCon);
void HideConnectMarker();
// Attributes of the object that is in the process of being created
diff --git a/svx/inc/GalleryControl.hxx b/svx/inc/GalleryControl.hxx
index afd77c7dbc3d..2fa7040f56f3 100644
--- a/svx/inc/GalleryControl.hxx
+++ b/svx/inc/GalleryControl.hxx
@@ -39,11 +39,9 @@ namespace svx { namespace sidebar {
class SVX_DLLPUBLIC GalleryControl : public vcl::Window
{
public:
- GalleryControl (
- SfxBindings* pBindings,
- vcl::Window* pParentWindow);
+ GalleryControl( vcl::Window* pParentWindow );
- bool GalleryKeyInput( const KeyEvent& rKEvt, vcl::Window* pWindow);
+ bool GalleryKeyInput( const KeyEvent& rKEvt );
private:
Gallery* mpGallery;
diff --git a/svx/inc/galbrws2.hxx b/svx/inc/galbrws2.hxx
index ab92f8adafc1..422a9c76cd25 100644
--- a/svx/inc/galbrws2.hxx
+++ b/svx/inc/galbrws2.hxx
@@ -152,11 +152,11 @@ public:
INetURLObject GetURL() const;
OUString GetFilterName() const;
- sal_Int8 AcceptDrop( DropTargetHelper& rTarget, const AcceptDropEvent& rEvt );
- sal_Int8 ExecuteDrop( DropTargetHelper& rTarget, const ExecuteDropEvent& rEvt );
- void StartDrag( vcl::Window* pWindow, const Point* pDragPoint = nullptr );
- void TogglePreview( vcl::Window* pWindow, const Point* pPreviewPoint = nullptr );
- void ShowContextMenu( vcl::Window* pWindow, const Point* pContextPoint );
+ sal_Int8 AcceptDrop( DropTargetHelper& rTarget );
+ sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt );
+ void StartDrag( const Point* pDragPoint = nullptr );
+ void TogglePreview();
+ void ShowContextMenu( const Point* pContextPoint );
bool KeyInput( const KeyEvent& rEvt, vcl::Window* pWindow );
static css::uno::Reference< css::frame::XFrame > GetFrame();
diff --git a/svx/inc/galobj.hxx b/svx/inc/galobj.hxx
index ba93c31d386f..aeeab93e1187 100644
--- a/svx/inc/galobj.hxx
+++ b/svx/inc/galobj.hxx
@@ -143,7 +143,7 @@ public:
SgaObjectBmp();
SgaObjectBmp( const INetURLObject& rURL );
- SgaObjectBmp( const Graphic& rGraphic, const INetURLObject& rURL, const OUString& rFormat );
+ SgaObjectBmp( const Graphic& rGraphic, const INetURLObject& rURL );
virtual SgaObjKind GetObjKind() const override { return SgaObjKind::Bitmap; }
};
@@ -153,7 +153,7 @@ class SgaObjectAnim : public SgaObjectBmp
public:
SgaObjectAnim();
- SgaObjectAnim( const Graphic& rGraphic, const INetURLObject& rURL, const OUString& rFormatName );
+ SgaObjectAnim( const Graphic& rGraphic, const INetURLObject& rURL );
virtual SgaObjKind GetObjKind() const override { return SgaObjKind::Animation; }
};
@@ -163,7 +163,7 @@ class SgaObjectINet : public SgaObjectAnim
public:
SgaObjectINet();
- SgaObjectINet( const Graphic& rGraphic, const INetURLObject& rURL, const OUString& rFormatName );
+ SgaObjectINet( const Graphic& rGraphic, const INetURLObject& rURL );
virtual SgaObjKind GetObjKind() const override { return SgaObjKind::Inet; }
};
diff --git a/svx/inc/sdr/properties/emptyproperties.hxx b/svx/inc/sdr/properties/emptyproperties.hxx
index d8c1f3e18499..dad630be6fe9 100644
--- a/svx/inc/sdr/properties/emptyproperties.hxx
+++ b/svx/inc/sdr/properties/emptyproperties.hxx
@@ -52,9 +52,6 @@ namespace sdr
// basic constructor
explicit EmptyProperties(SdrObject& rObj);
- // constructor for copying, but using new object
- EmptyProperties(const EmptyProperties& rProps, SdrObject& rObj);
-
// destructor
virtual ~EmptyProperties() override;
diff --git a/svx/source/gallery2/GalleryControl.cxx b/svx/source/gallery2/GalleryControl.cxx
index 0857cdb57431..8228852dba7d 100644
--- a/svx/source/gallery2/GalleryControl.cxx
+++ b/svx/source/gallery2/GalleryControl.cxx
@@ -34,7 +34,6 @@ namespace svx { namespace sidebar {
static const sal_Int32 gnInitialVerticalSplitPosition (150);
GalleryControl::GalleryControl (
- SfxBindings* /*pBindings*/,
vcl::Window* pParentWindow)
: Window(pParentWindow, WB_SIZEABLE|WB_MOVEABLE|WB_CLOSEABLE|WB_HIDE),
mpGallery (Gallery::GetGalleryInstance()),
@@ -45,8 +44,8 @@ GalleryControl::GalleryControl (
mpBrowser1(VclPtr<GalleryBrowser1>::Create(
this,
mpGallery,
- [this] (KeyEvent const& rEvent, vcl::Window *const pWindow)
- { return this->GalleryKeyInput(rEvent, pWindow); },
+ [this] (KeyEvent const& rEvent, vcl::Window *const /*pWindow*/)
+ { return this->GalleryKeyInput(rEvent); },
[this] ()
{ return mpBrowser2->SelectTheme(mpBrowser1->GetSelectedTheme()); })),
mpBrowser2(VclPtr<GalleryBrowser2>::Create(this, mpGallery)),
@@ -177,7 +176,7 @@ void GalleryControl::Resize()
maLastSize = aNewSize;
}
-bool GalleryControl::GalleryKeyInput( const KeyEvent& rKEvt, vcl::Window* )
+bool GalleryControl::GalleryKeyInput( const KeyEvent& rKEvt )
{
const sal_uInt16 nCode = rKEvt.GetKeyCode().GetCode();
bool bRet = ( !rKEvt.GetKeyCode().IsMod1() &&
diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index 332e414ad3c0..1b2d3c9d3fd1 100644
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -530,7 +530,7 @@ void GalleryBrowser2::Notify( SfxBroadcaster&, const SfxHint& rHint )
}
}
-sal_Int8 GalleryBrowser2::AcceptDrop( DropTargetHelper& rTarget, const AcceptDropEvent& )
+sal_Int8 GalleryBrowser2::AcceptDrop( DropTargetHelper& rTarget )
{
sal_Int8 nRet = DND_ACTION_NONE;
@@ -555,7 +555,7 @@ sal_Int8 GalleryBrowser2::AcceptDrop( DropTargetHelper& rTarget, const AcceptDro
return nRet;
}
-sal_Int8 GalleryBrowser2::ExecuteDrop( DropTargetHelper&, const ExecuteDropEvent& rEvt )
+sal_Int8 GalleryBrowser2::ExecuteDrop( const ExecuteDropEvent& rEvt )
{
sal_Int8 nRet = DND_ACTION_NONE;
@@ -574,7 +574,7 @@ sal_Int8 GalleryBrowser2::ExecuteDrop( DropTargetHelper&, const ExecuteDropEvent
return nRet;
}
-void GalleryBrowser2::StartDrag( vcl::Window*, const Point* pDragPoint )
+void GalleryBrowser2::StartDrag( const Point* pDragPoint )
{
if( mpCurTheme )
{
@@ -586,13 +586,13 @@ void GalleryBrowser2::StartDrag( vcl::Window*, const Point* pDragPoint )
}
}
-void GalleryBrowser2::TogglePreview( vcl::Window*, const Point* )
+void GalleryBrowser2::TogglePreview()
{
SetMode( ( GALLERYBROWSERMODE_PREVIEW != GetMode() ) ? GALLERYBROWSERMODE_PREVIEW : meLastMode );
GetViewWindow()->GrabFocus();
}
-void GalleryBrowser2::ShowContextMenu( vcl::Window*, const Point* pContextPoint )
+void GalleryBrowser2::ShowContextMenu( const Point* pContextPoint )
{
Point aSelPos;
const sal_uIntPtr nItemId = ImplGetSelectedItemId( pContextPoint, aSelPos );
@@ -616,14 +616,14 @@ void GalleryBrowser2::ShowContextMenu( vcl::Window*, const Point* pContextPoint
}
}
-bool GalleryBrowser2::KeyInput( const KeyEvent& rKEvt, vcl::Window* pWindow )
+bool GalleryBrowser2::KeyInput( const KeyEvent& rKEvt, vcl::Window* /*pWindow*/ )
{
Point aSelPos;
const sal_uIntPtr nItemId = ImplGetSelectedItemId( nullptr, aSelPos );
bool bRet = false;
svx::sidebar::GalleryControl* pParentControl = dynamic_cast<svx::sidebar::GalleryControl*>(GetParent());
if (pParentControl != nullptr)
- bRet = pParentControl->GalleryKeyInput(rKEvt, pWindow);
+ bRet = pParentControl->GalleryKeyInput(rKEvt);
if( !bRet && !maViewBox->HasFocus() && nItemId && mpCurTheme )
{
@@ -651,7 +651,7 @@ bool GalleryBrowser2::KeyInput( const KeyEvent& rKEvt, vcl::Window* pWindow )
{
if( bPreview )
{
- TogglePreview( pWindow );
+ TogglePreview();
bRet = true;
}
}
diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx
index ce43b484ad47..ad58f46cdc3b 100644
--- a/svx/source/gallery2/galctrl.cxx
+++ b/svx/source/gallery2/galctrl.cxx
@@ -144,7 +144,7 @@ void GalleryPreview::Paint(vcl::RenderContext& rRenderContext, const tools::Rect
void GalleryPreview::MouseButtonDown(const MouseEvent& rMEvt)
{
if (mpTheme && (rMEvt.GetClicks() == 2))
- static_cast<GalleryBrowser2*>(GetParent())->TogglePreview(this);
+ static_cast<GalleryBrowser2*>(GetParent())->TogglePreview();
}
void GalleryPreview::Command(const CommandEvent& rCEvt)
@@ -154,7 +154,7 @@ void GalleryPreview::Command(const CommandEvent& rCEvt)
if (mpTheme && (rCEvt.GetCommand() == CommandEventId::ContextMenu))
{
GalleryBrowser2* pGalleryBrowser = static_cast<GalleryBrowser2*>(GetParent());
- pGalleryBrowser->ShowContextMenu(this, (rCEvt.IsMouseEvent() ? &rCEvt.GetMousePosPixel() : nullptr));
+ pGalleryBrowser->ShowContextMenu(rCEvt.IsMouseEvent() ? &rCEvt.GetMousePosPixel() : nullptr);
}
}
@@ -167,7 +167,7 @@ void GalleryPreview::KeyInput(const KeyEvent& rKEvt)
switch( rKEvt.GetKeyCode().GetCode() )
{
case KEY_BACKSPACE:
- pBrowser->TogglePreview( this );
+ pBrowser->TogglePreview();
break;
case KEY_HOME:
@@ -202,12 +202,12 @@ void GalleryPreview::KeyInput(const KeyEvent& rKEvt)
}
}
-sal_Int8 GalleryPreview::AcceptDrop( const AcceptDropEvent& rEvt )
+sal_Int8 GalleryPreview::AcceptDrop( const AcceptDropEvent& /*rEvt*/ )
{
sal_Int8 nRet;
if (mpTheme)
- nRet = static_cast<GalleryBrowser2*>(GetParent())->AcceptDrop(*this, rEvt);
+ nRet = static_cast<GalleryBrowser2*>(GetParent())->AcceptDrop(*this);
else
nRet = DND_ACTION_NONE;
@@ -219,7 +219,7 @@ sal_Int8 GalleryPreview::ExecuteDrop( const ExecuteDropEvent& rEvt )
sal_Int8 nRet;
if (mpTheme)
- nRet = static_cast<GalleryBrowser2*>(GetParent())->ExecuteDrop(*this, rEvt);
+ nRet = static_cast<GalleryBrowser2*>(GetParent())->ExecuteDrop(rEvt);
else
nRet = DND_ACTION_NONE;
@@ -229,7 +229,7 @@ sal_Int8 GalleryPreview::ExecuteDrop( const ExecuteDropEvent& rEvt )
void GalleryPreview::StartDrag( sal_Int8, const Point& )
{
if(mpTheme)
- static_cast<GalleryBrowser2*>(GetParent())->StartDrag(this);
+ static_cast<GalleryBrowser2*>(GetParent())->StartDrag();
}
void GalleryPreview::PreviewMedia( const INetURLObject& rURL )
@@ -359,7 +359,7 @@ void GalleryIconView::MouseButtonDown(const MouseEvent& rMEvt)
ValueSet::MouseButtonDown(rMEvt);
if (rMEvt.GetClicks() == 2)
- static_cast<GalleryBrowser2*>(GetParent())->TogglePreview(this, &rMEvt.GetPosPixel());
+ static_cast<GalleryBrowser2*>(GetParent())->TogglePreview();
}
void GalleryIconView::Command(const CommandEvent& rCEvt)
@@ -369,7 +369,7 @@ void GalleryIconView::Command(const CommandEvent& rCEvt)
if (rCEvt.GetCommand() == CommandEventId::ContextMenu)
{
GalleryBrowser2* pGalleryBrowser = static_cast<GalleryBrowser2*>(GetParent());
- pGalleryBrowser->ShowContextMenu(this, (rCEvt.IsMouseEvent() ? &rCEvt.GetMousePosPixel() : nullptr));
+ pGalleryBrowser->ShowContextMenu(rCEvt.IsMouseEvent() ? &rCEvt.GetMousePosPixel() : nullptr);
}
}
@@ -379,14 +379,14 @@ void GalleryIconView::KeyInput(const KeyEvent& rKEvt)
ValueSet::KeyInput(rKEvt);
}
-sal_Int8 GalleryIconView::AcceptDrop(const AcceptDropEvent& rEvt)
+sal_Int8 GalleryIconView::AcceptDrop(const AcceptDropEvent& /*rEvt*/)
{
- return(static_cast<GalleryBrowser2*>(GetParent())->AcceptDrop(*this, rEvt));
+ return(static_cast<GalleryBrowser2*>(GetParent())->AcceptDrop(*this));
}
sal_Int8 GalleryIconView::ExecuteDrop(const ExecuteDropEvent& rEvt)
{
- return(static_cast<GalleryBrowser2*>(GetParent())->ExecuteDrop(*this, rEvt));
+ return(static_cast<GalleryBrowser2*>(GetParent())->ExecuteDrop(rEvt));
}
void GalleryIconView::StartDrag(sal_Int8, const Point&)
@@ -396,7 +396,7 @@ void GalleryIconView::StartDrag(sal_Int8, const Point&)
// call this to initiate dragging for ValueSet
ValueSet::StartDrag(aEvt, aRegion);
- static_cast<GalleryBrowser2*>(GetParent())->StartDrag(this);
+ static_cast<GalleryBrowser2*>(GetParent())->StartDrag();
}
GalleryListView::GalleryListView( GalleryBrowser2* pParent, GalleryTheme* pTheme ) :
@@ -552,7 +552,7 @@ void GalleryListView::Command( const CommandEvent& rCEvt )
if( rCEvt.IsMouseEvent() && ( GetRowAtYPosPixel( rCEvt.GetMousePosPixel().Y() ) != BROWSER_ENDOFSELECTION ) )
pPos = &rCEvt.GetMousePosPixel();
- static_cast<GalleryBrowser2*>( GetParent() )->ShowContextMenu( this, pPos );
+ static_cast<GalleryBrowser2*>( GetParent() )->ShowContextMenu( pPos );
}
}
@@ -567,7 +567,7 @@ void GalleryListView::DoubleClick( const BrowserMouseEvent& rEvt )
BrowseBox::DoubleClick( rEvt );
if( rEvt.GetRow() != BROWSER_ENDOFSELECTION )
- static_cast<GalleryBrowser2*>( GetParent() )->TogglePreview( this, &rEvt.GetPosPixel() );
+ static_cast<GalleryBrowser2*>( GetParent() )->TogglePreview();
}
void GalleryListView::Select()
@@ -591,12 +591,12 @@ sal_Int8 GalleryListView::ExecuteDrop( const BrowserExecuteDropEvent& rEvt )
aEvt.maPosPixel.Y() += GetTitleHeight();
- return( static_cast<GalleryBrowser2*>( GetParent() )->ExecuteDrop( *this, aEvt ) );
+ return( static_cast<GalleryBrowser2*>( GetParent() )->ExecuteDrop( aEvt ) );
}
void GalleryListView::StartDrag( sal_Int8, const Point& rPosPixel )
{
- static_cast<GalleryBrowser2*>( GetParent() )->StartDrag( this, &rPosPixel );
+ static_cast<GalleryBrowser2*>( GetParent() )->StartDrag( &rPosPixel );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/gallery2/galexpl.cxx b/svx/source/gallery2/galexpl.cxx
index 682d14e748c6..5d05b80d7a61 100644
--- a/svx/source/gallery2/galexpl.cxx
+++ b/svx/source/gallery2/galexpl.cxx
@@ -153,7 +153,7 @@ bool GalleryExplorer::GetGraphicObj( const OUString& rThemeName, sal_uInt32 nPos
bRet = bRet || pTheme->GetGraphic( nPos, *pGraphic, bProgress );
if( pThumb )
- bRet = bRet || pTheme->GetThumb( nPos, *pThumb, bProgress );
+ bRet = bRet || pTheme->GetThumb( nPos, *pThumb );
pGal->ReleaseTheme( pTheme, aListener );
}
diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx
index 5f829bd19dbf..a28047a740db 100644
--- a/svx/source/gallery2/galobj.cxx
+++ b/svx/source/gallery2/galobj.cxx
@@ -282,7 +282,7 @@ SgaObjectBmp::SgaObjectBmp( const INetURLObject& rURL )
Init( aGraphic, rURL );
}
-SgaObjectBmp::SgaObjectBmp( const Graphic& rGraphic, const INetURLObject& rURL, const OUString& )
+SgaObjectBmp::SgaObjectBmp( const Graphic& rGraphic, const INetURLObject& rURL )
{
if( FileExists( rURL ) )
Init( rGraphic, rURL );
@@ -391,8 +391,7 @@ SgaObjectAnim::SgaObjectAnim()
}
SgaObjectAnim::SgaObjectAnim( const Graphic& rGraphic,
- const INetURLObject& rURL,
- const OUString& )
+ const INetURLObject& rURL )
{
aURL = rURL;
bIsValid = CreateThumb( rGraphic );
@@ -402,8 +401,8 @@ SgaObjectINet::SgaObjectINet()
{
}
-SgaObjectINet::SgaObjectINet( const Graphic& rGraphic, const INetURLObject& rURL, const OUString& rFormatName ) :
- SgaObjectAnim ( rGraphic, rURL, rFormatName )
+SgaObjectINet::SgaObjectINet( const Graphic& rGraphic, const INetURLObject& rURL ) :
+ SgaObjectAnim ( rGraphic, rURL )
{
}
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx
index 9ec3adf6333f..96028160a949 100644
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@@ -554,11 +554,11 @@ void GalleryTheme::Actualize( const Link<const INetURLObject&, void>& rActualize
std::unique_ptr<SgaObject> pNewObj;
if ( SgaObjKind::Inet == pEntry->eObjKind )
- pNewObj.reset(static_cast<SgaObject*>(new SgaObjectINet( aGraphic, aURL, aFormat )));
+ pNewObj.reset(static_cast<SgaObject*>(new SgaObjectINet( aGraphic, aURL )));
else if ( aGraphic.IsAnimated() )
- pNewObj.reset(static_cast<SgaObject*>(new SgaObjectAnim( aGraphic, aURL, aFormat )));
+ pNewObj.reset(static_cast<SgaObject*>(new SgaObjectAnim( aGraphic, aURL )));
else
- pNewObj.reset(static_cast<SgaObject*>(new SgaObjectBmp( aGraphic, aURL, aFormat )));
+ pNewObj.reset(static_cast<SgaObject*>(new SgaObjectBmp( aGraphic, aURL )));
if( !InsertObject( *pNewObj ) )
pEntry->mbDelete = true;
@@ -751,7 +751,7 @@ GalleryThemeEntry* GalleryTheme::CreateThemeEntry( const INetURLObject& rURL, bo
return pRet;
}
-bool GalleryTheme::GetThumb( sal_uIntPtr nPos, BitmapEx& rBmp, bool )
+bool GalleryTheme::GetThumb( sal_uIntPtr nPos, BitmapEx& rBmp )
{
SgaObject* pObj = AcquireObject( nPos );
bool bRet = false;
@@ -792,7 +792,7 @@ bool GalleryTheme::GetGraphic( sal_uIntPtr nPos, Graphic& rGraphic, bool bProgre
if( aModel.GetModel() )
{
- if( GetModel( nPos, *aModel.GetModel(), bProgress ) )
+ if( GetModel( nPos, *aModel.GetModel() ) )
{
ImageMap aIMap;
@@ -921,7 +921,7 @@ bool GalleryTheme::InsertGraphic( const Graphic& rGraphic, sal_uIntPtr nInsertPo
return bRet;
}
-bool GalleryTheme::GetModel( sal_uIntPtr nPos, SdrModel& rModel, bool )
+bool GalleryTheme::GetModel( sal_uIntPtr nPos, SdrModel& rModel )
{
const GalleryObject* pObject = ImplGetGalleryObject( nPos );
bool bRet = false;
@@ -1103,9 +1103,9 @@ bool GalleryTheme::InsertURL( const INetURLObject& rURL, sal_uIntPtr nInsertPos
if( nImportRet != GalleryGraphicImportRet::IMPORT_NONE )
{
if ( aGraphic.IsAnimated() )
- pNewObj.reset(static_cast<SgaObject*>(new SgaObjectAnim( aGraphic, rURL, aFormat )));
+ pNewObj.reset(static_cast<SgaObject*>(new SgaObjectAnim( aGraphic, rURL )));
else
- pNewObj.reset(static_cast<SgaObject*>(new SgaObjectBmp( aGraphic, rURL, aFormat )));
+ pNewObj.reset(static_cast<SgaObject*>(new SgaObjectBmp( aGraphic, rURL )));
}
#if HAVE_FEATURE_AVMEDIA
else if( ::avmedia::MediaWindow::isMediaURL( rURL.GetMainURL( INetURLObject::DecodeMechanism::Unambiguous ), ""/*TODO?*/ ) )
diff --git a/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx b/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx
index a6c3e63ba912..3c33a3ee8e93 100644
--- a/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx
@@ -57,7 +57,7 @@ public:
virtual void Invoke() final override;
// get primitive visualization
- drawinglayer::primitive2d::Primitive2DContainer createPrimitive2DSequenceForPage(const DisplayInfo& rDisplayInfo);
+ drawinglayer::primitive2d::Primitive2DContainer createPrimitive2DSequenceForPage();
// Own reaction on changes which will be forwarded to the OC of the owner-VOC
virtual void InvalidatePartOfView(const basegfx::B2DRange& rRange) const override;
@@ -117,7 +117,7 @@ void PagePrimitiveExtractor::Invoke()
}
}
-drawinglayer::primitive2d::Primitive2DContainer PagePrimitiveExtractor::createPrimitive2DSequenceForPage(const DisplayInfo& /*rDisplayInfo*/)
+drawinglayer::primitive2d::Primitive2DContainer PagePrimitiveExtractor::createPrimitive2DSequenceForPage()
{
drawinglayer::primitive2d::Primitive2DContainer xRetval;
SdrPage* pStartPage = GetStartPage();
@@ -187,7 +187,7 @@ bool PagePrimitiveExtractor::isDrawModeHighContrast() const { return mrViewObjec
SdrPageView* PagePrimitiveExtractor::TryToGetSdrPageView() const { return mrViewObjectContactOfPageObj.GetObjectContact().TryToGetSdrPageView(); }
OutputDevice* PagePrimitiveExtractor::TryToGetOutputDevice() const { return mrViewObjectContactOfPageObj.GetObjectContact().TryToGetOutputDevice(); }
-drawinglayer::primitive2d::Primitive2DContainer ViewObjectContactOfPageObj::createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const
+drawinglayer::primitive2d::Primitive2DContainer ViewObjectContactOfPageObj::createPrimitive2DSequence(const DisplayInfo& /*rDisplayInfo*/) const
{
drawinglayer::primitive2d::Primitive2DContainer xRetval;
const SdrPageObj& rPageObject((static_cast< ViewContactOfPageObj& >(GetViewContact())).GetPageObj());
@@ -255,7 +255,7 @@ drawinglayer::primitive2d::Primitive2DContainer ViewObjectContactOfPageObj::crea
mpExtractor->SetViewObjectContactRedirector(GetObjectContact().GetViewObjectContactRedirector());
// create page content
- xPageContent = mpExtractor->createPrimitive2DSequenceForPage(rDisplayInfo);
+ xPageContent = mpExtractor->createPrimitive2DSequenceForPage();
// #i105548# reset VOCRedirector to not accidentally have a pointer to a
// temporary class, so calls to it are avoided safely
diff --git a/svx/source/sdr/properties/emptyproperties.cxx b/svx/source/sdr/properties/emptyproperties.cxx
index d44826f30d07..0eb4b8e0cd8f 100644
--- a/svx/source/sdr/properties/emptyproperties.cxx
+++ b/svx/source/sdr/properties/emptyproperties.cxx
@@ -44,14 +44,6 @@ namespace sdr
{
}
- EmptyProperties::EmptyProperties(const EmptyProperties& rProps, SdrObject& rObj)
- : BaseProperties(rProps, rObj),
- mpEmptyItemSet(nullptr)
- {
- // do not gererate an assert, else derivations like PageProperties will generate an assert
- // using the Clone() operator path.
- }
-
EmptyProperties::~EmptyProperties()
{
if(mpEmptyItemSet)
@@ -63,7 +55,7 @@ namespace sdr
BaseProperties& EmptyProperties::Clone(SdrObject& rObj) const
{
- return *(new EmptyProperties(*this, rObj));
+ return *(new EmptyProperties(rObj));
}
const SfxItemSet& EmptyProperties::GetObjectItemSet() const
diff --git a/svx/source/sdr/properties/pageproperties.cxx b/svx/source/sdr/properties/pageproperties.cxx
index 2250aa2156de..f2ac2d192583 100644
--- a/svx/source/sdr/properties/pageproperties.cxx
+++ b/svx/source/sdr/properties/pageproperties.cxx
@@ -40,8 +40,8 @@ namespace sdr
{
}
- PageProperties::PageProperties(const PageProperties& rProps, SdrObject& rObj)
- : EmptyProperties(rProps, rObj)
+ PageProperties::PageProperties(const PageProperties& /*rProps*/, SdrObject& rObj)
+ : EmptyProperties(rObj)
{
}
diff --git a/svx/source/sdr/properties/properties.cxx b/svx/source/sdr/properties/properties.cxx
index 9c4c8fc3585f..482af2ecdfb9 100644
--- a/svx/source/sdr/properties/properties.cxx
+++ b/svx/source/sdr/properties/properties.cxx
@@ -36,11 +36,6 @@ namespace sdr
{
}
- BaseProperties::BaseProperties(const BaseProperties& /*rProps*/, SdrObject& rObj)
- : mrObject(rObj)
- {
- }
-
BaseProperties::~BaseProperties()
{
}
diff --git a/svx/source/sidebar/PanelFactory.cxx b/svx/source/sidebar/PanelFactory.cxx
index 0ab3df555da4..2a1787e2013b 100644
--- a/svx/source/sidebar/PanelFactory.cxx
+++ b/svx/source/sidebar/PanelFactory.cxx
@@ -161,7 +161,7 @@ Reference<ui::XUIElement> SAL_CALL PanelFactory::createUIElement (
}
else if (rsResourceURL.endsWith("/GalleryPanel"))
{
- pControl.reset(VclPtr<GalleryControl>::Create(pBindings, pParentWindow));
+ pControl.reset(VclPtr<GalleryControl>::Create(pParentWindow));
aLayoutSize = ui::LayoutSize(300,-1,400);
}
else if (rsResourceURL.endsWith("/StyleListPanel"))
diff --git a/svx/source/svdraw/charthelper.cxx b/svx/source/svdraw/charthelper.cxx
index 0fc62bb4b7e4..255c0c03832b 100644
--- a/svx/source/svdraw/charthelper.cxx
+++ b/svx/source/svdraw/charthelper.cxx
@@ -150,8 +150,7 @@ drawinglayer::primitive2d::Primitive2DContainer ChartHelper::tryToGetChartConten
}
void ChartHelper::AdaptDefaultsForChart(
- const uno::Reference < embed::XEmbeddedObject > & xEmbObj,
- bool /* bNoFillStyle */)
+ const uno::Reference < embed::XEmbeddedObject > & xEmbObj)
{
if( xEmbObj.is())
{
diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx
index 28c6a9cad4ea..88577c27d3a9 100644
--- a/svx/source/svdraw/svdcrtv.cxx
+++ b/svx/source/svdraw/svdcrtv.cxx
@@ -279,7 +279,7 @@ bool SdrCreateView::CheckEdgeMode()
}
}
-void SdrCreateView::SetConnectMarker(const SdrObjConnection& rCon, const SdrPageView& /*rPV*/)
+void SdrCreateView::SetConnectMarker(const SdrObjConnection& rCon)
{
SdrObject* pTargetObject = rCon.pObj;
@@ -320,7 +320,7 @@ bool SdrCreateView::MouseMove(const MouseEvent& rMEvt, vcl::Window* pWin)
bool bMarkHit=PickHandle(aPos)!=nullptr || IsMarkedObjHit(aPos);
SdrObjConnection aCon;
if (!bMarkHit) SdrEdgeObj::ImpFindConnector(aPos,*pPV,aCon,nullptr,pWin);
- SetConnectMarker(aCon,*pPV);
+ SetConnectMarker(aCon);
}
}
return SdrDragView::MouseMove(rMEvt,pWin);
diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx
index e7d04d1fe005..b6b4d7a7164d 100644
--- a/svx/source/svdraw/svdoedge.cxx
+++ b/svx/source/svdraw/svdoedge.cxx
@@ -1880,7 +1880,7 @@ bool SdrEdgeObj::applySpecialDrag(SdrDragStat& rDragStat)
{
// show IA helper, but only do this during IA, so not when the original
// Edge gets modified in the last call
- rDragStat.GetView()->SetConnectMarker(*pDraggedOne, *rDragStat.GetPageView());
+ rDragStat.GetView()->SetConnectMarker(*pDraggedOne);
}
}
@@ -2037,7 +2037,7 @@ bool SdrEdgeObj::MovCreate(SdrDragStat& rDragStat)
(*pEdgeTrack)[nMax-1]=rDragStat.GetNow();
if (rDragStat.GetPageView()!=nullptr) {
ImpFindConnector(rDragStat.GetNow(),*rDragStat.GetPageView(),aCon2,this);
- rDragStat.GetView()->SetConnectMarker(aCon2,*rDragStat.GetPageView());
+ rDragStat.GetView()->SetConnectMarker(aCon2);
}
SetBoundRectDirty();
bSnapRectDirty=true;
More information about the Libreoffice-commits
mailing list