[Libreoffice-commits] core.git: cui/source include/svx sc/inc sc/source sd/source svx/inc svx/source sw/inc sw/source
Noel Grandin
noel at peralex.com
Thu Jul 16 05:19:09 PDT 2015
cui/source/factory/dlgfact.cxx | 139 -----------
cui/source/factory/dlgfact.hxx | 28 --
include/svx/EnhancedCustomShape2d.hxx | 1
include/svx/camera3d.hxx | 3
include/svx/cube3d.hxx | 2
include/svx/deflt3d.hxx | 17 -
include/svx/e3ditem.hxx | 4
include/svx/fmmodel.hxx | 1
include/svx/fmview.hxx | 1
include/svx/galctrl.hxx | 2
include/svx/gallery1.hxx | 3
include/svx/galleryitem.hxx | 2
include/svx/galtheme.hxx | 1
include/svx/ipolypolygoneditorcontroller.hxx | 1
include/svx/langbox.hxx | 3
include/svx/obj3d.hxx | 57 ----
include/svx/pageitem.hxx | 1
include/svx/scene3d.hxx | 70 -----
include/svx/sdasaitm.hxx | 6
include/svx/sdr/contact/objectcontact.hxx | 3
include/svx/sdr/contact/viewcontact.hxx | 9
include/svx/sdr/contact/viewobjectcontact.hxx | 3
include/svx/sdr/overlay/overlaymanager.hxx | 3
include/svx/sdr/overlay/overlaypolypolygon.hxx | 1
include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx | 5
include/svx/sdrpaintwindow.hxx | 1
include/svx/svdcrtv.hxx | 5
include/svx/svddrag.hxx | 4
include/svx/svddrgmt.hxx | 1
include/svx/svddrgv.hxx | 16 -
include/svx/svdedtv.hxx | 9
include/svx/svdedxv.hxx | 3
include/svx/svdetc.hxx | 2
include/svx/svdglev.hxx | 11
include/svx/svdglue.hxx | 1
include/svx/svdhdl.hxx | 2
include/svx/svdhlpln.hxx | 5
include/svx/svdlayer.hxx | 55 +---
include/svx/svdmark.hxx | 18 -
include/svx/svdmodel.hxx | 66 -----
include/svx/svdmrkv.hxx | 16 -
include/svx/svdobj.hxx | 11
include/svx/svdoedge.hxx | 2
include/svx/svdogrp.hxx | 3
include/svx/svdopath.hxx | 1
include/svx/svdotext.hxx | 1
include/svx/svdpage.hxx | 36 --
include/svx/svdpagv.hxx | 2
include/svx/svdpntv.hxx | 17 -
include/svx/svdpoev.hxx | 1
include/svx/svdsnpv.hxx | 16 -
include/svx/svdtrans.hxx | 4
include/svx/svdundo.hxx | 9
include/svx/svdview.hxx | 5
include/svx/svdxcgv.hxx | 1
include/svx/svxdlg.hxx | 40 ---
include/svx/view3d.hxx | 120 ---------
include/svx/viewpt3d.hxx | 7
include/svx/xit.hxx | 1
include/svx/xpoly.hxx | 1
include/svx/xtable.hxx | 1
sc/inc/drwlayer.hxx | 3
sc/source/core/data/drwlayer.cxx | 16 -
sd/source/ui/animations/motionpathtag.cxx | 5
sd/source/ui/animations/motionpathtag.hxx | 1
svx/inc/dragmt3d.hxx | 2
svx/inc/galbrws2.hxx | 4
svx/inc/galobj.hxx | 1
svx/inc/sdr/contact/objectcontactofpageview.hxx | 3
svx/inc/sdr/contact/viewcontactofsdrpage.hxx | 3
svx/inc/sdr/overlay/overlaymanagerbuffered.hxx | 3
svx/source/customshapes/EnhancedCustomShape2d.cxx | 17 -
svx/source/dialog/langbox.cxx | 11
svx/source/form/fmmodel.cxx | 6
svx/source/gallery2/galbrws1.hxx | 1
svx/source/gallery2/galbrws2.cxx | 8
svx/source/sdr/contact/objectcontact.cxx | 6
svx/source/sdr/contact/objectcontactofpageview.cxx | 7
svx/source/sdr/contact/viewcontact.cxx | 6
svx/source/sdr/contact/viewcontactofsdrpage.cxx | 6
svx/source/sdr/overlay/overlaymanager.cxx | 6
svx/source/sdr/overlay/overlaymanagerbuffered.cxx | 7
svx/source/svdraw/svdedtv2.cxx | 14 -
svx/source/svdraw/svdobj.cxx | 19 -
svx/source/svdraw/svdoedge.cxx | 5
svx/source/svdraw/svdogrp.cxx | 19 -
svx/source/svdraw/svdpage.cxx | 2
svx/source/svdraw/svdpoev.cxx | 42 ---
svx/source/svdraw/svdundo.cxx | 7
sw/inc/drawdoc.hxx | 3
sw/source/core/draw/drawdoc.cxx | 6
91 files changed, 40 insertions(+), 1059 deletions(-)
New commits:
commit 1d852b32d7ad89b2317c04958060f366f8922ca4
Author: Noel Grandin <noel at peralex.com>
Date: Thu Jul 16 09:49:37 2015 +0200
loplugin:unusedmethods svx
Change-Id: I92158457b3ffaaf7c84c6f4c87708d766c8c9f61
Reviewed-on: https://gerrit.libreoffice.org/17117
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
Tested-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index b481e00..4825e95 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -399,16 +399,6 @@ const SfxItemSet* AbstractSvxZoomDialog_Impl::GetOutputItemSet() const
return pDlg->GetOutputItemSet();
}
-void AbstractSpellDialog_Impl::SetLanguage( sal_uInt16 nLang )
-{
- pDlg->SetLanguage(nLang);
-}
-
-bool AbstractSpellDialog_Impl::Close()
-{
- return pDlg->Close();
-}
-
void AbstractSpellDialog_Impl::Invalidate()
{
pDlg->InvalidateDialog();
@@ -429,35 +419,11 @@ void AbstractSearchProgress_Impl::Update()
pDlg->Update();
}
-void AbstractSearchProgress_Impl::SetFileType( const OUString& rType )
-{
- pDlg->SetFileType( rType );
-}
-
-void AbstractSearchProgress_Impl::SetDirectory( const INetURLObject& rURL )
-{
- pDlg->SetDirectory( rURL );
-}
-PLinkStub AbstractSearchProgress_Impl::GetLinkStubCleanUpHdl()
-{
- return SearchProgress::LinkStubCleanUpHdl;
-}
-
void AbstractTakeProgress_Impl::Update()
{
pDlg->Update();
}
-void AbstractTakeProgress_Impl::SetFile( const INetURLObject& rURL )
-{
- pDlg->SetFile( rURL );
-}
-
-PLinkStub AbstractTakeProgress_Impl::GetLinkStubCleanUpHdl()
-{
- return TakeProgress::LinkStubCleanUpHdl;
-}
-
OUString AbstractTitleDialog_Impl::GetTitle() const
{
return pDlg->GetTitle();
@@ -498,56 +464,6 @@ OUString AbstractURLDlg_Impl::GetName() const
return pDlg->GetName();
}
-void AbstractSvxHlinkDlgMarkWnd_Impl::Hide()
-{
- static_cast<vcl::Window*>(pDlg)->Hide();
-}
-
-void AbstractSvxHlinkDlgMarkWnd_Impl::SetSizePixel( const Size& rNewSize )
-{
- pDlg->SetSizePixel( rNewSize );
-}
-
-Size AbstractSvxHlinkDlgMarkWnd_Impl::GetSizePixel() const
-{
- return pDlg->GetSizePixel();
-}
-
-bool AbstractSvxHlinkDlgMarkWnd_Impl::IsVisible( ) const
-{
- return static_cast<vcl::Window*>(pDlg)->IsVisible();
-}
-
-void AbstractSvxHlinkDlgMarkWnd_Impl::Invalidate( InvalidateFlags nFlags )
-{
- static_cast<vcl::Window*>(pDlg)->Invalidate(nFlags);
-}
-
-bool AbstractSvxHlinkDlgMarkWnd_Impl::MoveTo( Point aNewPos )const
-{
- return pDlg->MoveTo(aNewPos);
-}
-
-bool AbstractSvxHlinkDlgMarkWnd_Impl::ConnectToDialog( bool bDoit )const
-{
- return pDlg->ConnectToDialog(bDoit);
-}
-
-void AbstractSvxHlinkDlgMarkWnd_Impl::RefreshTree ( const OUString& aStrURL )
-{
- pDlg->RefreshTree(aStrURL);
-}
-
-void AbstractSvxHlinkDlgMarkWnd_Impl::SelectEntry ( const OUString& aStrMark )
-{
- pDlg->SelectEntry(aStrMark);
-}
-
-sal_uInt16 AbstractSvxHlinkDlgMarkWnd_Impl::SetError( sal_uInt16 nError)
-{
- return pDlg->SetError(nError);
-}
-
sal_uInt16 AbstractSvxSearchSimilarityDialog_Impl::GetOther()
{
return pDlg->GetOther();
@@ -738,11 +654,6 @@ void AbstractSvxObjectTitleDescDialog_Impl::GetDescription(OUString& rDescriptio
pDlg->GetDescription(rDescription);
}
-void AbstractSvxMessDialog_Impl::SetButtonText( sal_uInt16 nBtnId, const OUString& rNewTxt )
-{
- pDlg->SetButtonText( nBtnId, rNewTxt );
-}
-
OUString AbstractSvxMultiPathDialog_Impl::GetPath() const
{
return pDlg->GetPath();
@@ -869,14 +780,6 @@ void AbstractSvxPostItDialog_Impl::HideAuthor()
{
pDlg->HideAuthor();
}
-void AbstractSvxPostItDialog_Impl::SetReadonlyPostIt(bool bDisable)
-{
- pDlg->SetReadonlyPostIt( bDisable );
-}
-bool AbstractSvxPostItDialog_Impl::IsOkEnabled() const
-{
- return pDlg->IsOkEnabled();
-}
void AbstractSvxPostItDialog_Impl::SetNextHdl( const Link<>& rLink )
{
aNextHdl = rLink;
@@ -1121,19 +1024,6 @@ VclAbstractRefreshableDialog * AbstractDialogFactory_Impl::CreateActualizeProgre
return new VclAbstractRefreshableDialog_Impl( pDlg );
}
-AbstractSearchProgress * AbstractDialogFactory_Impl::CreateSearchProgressDialog( vcl::Window* pParent,
- const INetURLObject& rStartURL )
-{
- SearchProgress* pDlg = VclPtr<SearchProgress>::Create( pParent, rStartURL);
- return new AbstractSearchProgress_Impl( pDlg );
-}
-
-AbstractTakeProgress * AbstractDialogFactory_Impl::CreateTakeProgressDialog( vcl::Window* pParent )
-{
- VclPtrInstance<TakeProgress> pDlg( pParent );
- return new AbstractTakeProgress_Impl( pDlg );
-}
-
VclAbstractDialog*
AbstractDialogFactory_Impl::CreateScriptErrorDialog(
vcl::Window* pParent, const ::com::sun::star::uno::Any& rException)
@@ -1202,23 +1092,6 @@ AbstractURLDlg * AbstractDialogFactory_Impl::CreateURLDialog( vcl::Window* pPare
return new AbstractURLDlg_Impl( pDlg );
}
-AbstractSvxHlinkDlgMarkWnd* AbstractDialogFactory_Impl::CreateSvxHlinkDlgMarkWndDialog( SvxHyperlinkTabPageBase* pParent, sal_uInt32 nResId )
-{
- SvxHlinkDlgMarkWnd* pDlg=NULL;
- switch ( nResId )
- {
- case RID_SVXFLOAT_HYPERLINK_MARKWND :
- pDlg = VclPtr<SvxHlinkDlgMarkWnd>::Create ( pParent );
- break;
- default:
- break;
- }
-
- if ( pDlg )
- return new AbstractSvxHlinkDlgMarkWnd_Impl( pDlg );
- return 0;
-}
-
SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateTabItemDialog(vcl::Window* pParent,
const SfxItemSet& rSet)
{
@@ -1359,13 +1232,6 @@ AbstractSvxObjectTitleDescDialog* AbstractDialogFactory_Impl::CreateSvxObjectTit
return new AbstractSvxObjectTitleDescDialog_Impl(VclPtr<SvxObjectTitleDescDialog>::Create(pParent, rTitle, rDescription));
}
-AbstractSvxMessDialog * AbstractDialogFactory_Impl::CreateSvxMessDialog( vcl::Window* pParent, sal_uInt32,
- const OUString& rText, const OUString& rDesc, Image* pImg )
-{
- VclPtrInstance<SvxMessDialog> pDlg( pParent, rText, rDesc, pImg );
- return new AbstractSvxMessDialog_Impl( pDlg );
-}
-
AbstractSvxMultiPathDialog * AbstractDialogFactory_Impl::CreateSvxMultiPathDialog(vcl::Window* pParent)
{
VclPtrInstance<SvxMultiPathDialog> pDlg(pParent);
@@ -1643,11 +1509,6 @@ CreateTabPage AbstractDialogFactory_Impl::GetTabPageCreatorFunc( sal_uInt16 nId
return 0;
}
-CreateSvxDistributePage AbstractDialogFactory_Impl::GetSvxDistributePageCreatorFunc()
-{
- return SvxDistributePage::Create;
-}
-
DialogGetRanges AbstractDialogFactory_Impl::GetDialogGetRangesFunc()
{
return SvxPostItDialog::GetRanges;
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index 8e86679..90e412d 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -196,8 +196,6 @@ class AbstractSpellDialog_Impl : public AbstractSpellDialog
{
public:
DECL_ABSTDLG_BASE(AbstractSpellDialog_Impl, svx::SpellDialog)
- virtual void SetLanguage( sal_uInt16 nLang ) SAL_OVERRIDE;
- virtual bool Close() SAL_OVERRIDE;
virtual void Invalidate() SAL_OVERRIDE;
virtual vcl::Window* GetWindow() SAL_OVERRIDE;
virtual SfxBindings& GetBindings() SAL_OVERRIDE;
@@ -208,9 +206,6 @@ class AbstractSearchProgress_Impl : public AbstractSearchProgress
{
DECL_ABSTDLG_BASE(AbstractSearchProgress_Impl,SearchProgress)
virtual void Update() SAL_OVERRIDE ;
- virtual void SetFileType( const OUString& rType ) SAL_OVERRIDE ;
- virtual void SetDirectory( const INetURLObject& rURL ) SAL_OVERRIDE ;
- virtual PLinkStub GetLinkStubCleanUpHdl() SAL_OVERRIDE ;
};
@@ -219,8 +214,6 @@ class AbstractTakeProgress_Impl : public AbstractTakeProgress
{
DECL_ABSTDLG_BASE(AbstractTakeProgress_Impl,TakeProgress)
virtual void Update() SAL_OVERRIDE ;
- virtual void SetFile( const INetURLObject& rURL ) SAL_OVERRIDE ;
- virtual PLinkStub GetLinkStubCleanUpHdl() SAL_OVERRIDE ;
};
@@ -266,16 +259,6 @@ class SvxHlinkDlgMarkWnd;
class AbstractSvxHlinkDlgMarkWnd_Impl : public AbstractSvxHlinkDlgMarkWnd
{
DECL_ABSTDLG_BASE(AbstractSvxHlinkDlgMarkWnd_Impl,SvxHlinkDlgMarkWnd)
- virtual void Hide() SAL_OVERRIDE;
- virtual bool IsVisible() const SAL_OVERRIDE ;
- virtual void Invalidate( InvalidateFlags nFlags = InvalidateFlags::NONE ) SAL_OVERRIDE;
- virtual void SetSizePixel( const Size& rNewSize ) SAL_OVERRIDE;
- virtual Size GetSizePixel() const SAL_OVERRIDE;
- virtual bool MoveTo( Point aNewPos ) const SAL_OVERRIDE;
- virtual bool ConnectToDialog( bool bDoit = true ) const SAL_OVERRIDE;
- virtual void RefreshTree ( const OUString& aStrURL ) SAL_OVERRIDE;
- virtual void SelectEntry ( const OUString& aStrMark ) SAL_OVERRIDE;
- virtual sal_uInt16 SetError( sal_uInt16 nError) SAL_OVERRIDE ;
};
@@ -377,7 +360,6 @@ class SvxMessDialog;
class AbstractSvxMessDialog_Impl :public AbstractSvxMessDialog
{
DECL_ABSTDLG_BASE(AbstractSvxMessDialog_Impl,SvxMessDialog)
- virtual void SetButtonText( sal_uInt16 nBtnId, const OUString& rNewTxt ) SAL_OVERRIDE;
};
class SvxMultiPathDialog;
@@ -474,8 +456,6 @@ class AbstractSvxPostItDialog_Impl :public AbstractSvxPostItDialog
virtual void ShowLastAuthor(const OUString& rAuthor, const OUString& rDate) SAL_OVERRIDE ;
virtual void DontChangeAuthor() SAL_OVERRIDE ;
virtual void HideAuthor() SAL_OVERRIDE ;
- virtual void SetReadonlyPostIt(bool bDisable) SAL_OVERRIDE ;
- virtual bool IsOkEnabled() const SAL_OVERRIDE;
virtual vcl::Window * GetWindow() SAL_OVERRIDE;
private:
Link<> aNextHdl;
@@ -581,9 +561,6 @@ public:
svx::SpellDialogChildWindow* pSpellChildWindow ) SAL_OVERRIDE;
virtual VclAbstractRefreshableDialog * CreateActualizeProgressDialog( vcl::Window* pParent, GalleryTheme* pThm ) SAL_OVERRIDE;
- virtual AbstractSearchProgress * CreateSearchProgressDialog( vcl::Window* pParent,
- const INetURLObject& rStartURL) SAL_OVERRIDE;
- virtual AbstractTakeProgress * CreateTakeProgressDialog( vcl::Window* pParent ) SAL_OVERRIDE;
virtual AbstractTitleDialog * CreateTitleDialog( vcl::Window* pParent,
const OUString& rOldText) SAL_OVERRIDE;
virtual AbstractGalleryIdDialog * CreateGalleryIdDialog( vcl::Window* pParent,
@@ -595,7 +572,6 @@ public:
const OUString& rURL, const OUString& rAltText, const OUString& rDescription,
const OUString& rTarget, const OUString& rName,
TargetList& rTargetList ) SAL_OVERRIDE;
- virtual AbstractSvxHlinkDlgMarkWnd* CreateSvxHlinkDlgMarkWndDialog( SvxHyperlinkTabPageBase* pParent, sal_uInt32 nResId ) SAL_OVERRIDE;
virtual VclAbstractDialog* CreateSvxSearchAttributeDialog( vcl::Window* pParent,
SearchAttrItemList& rLst,
@@ -621,9 +597,6 @@ public:
virtual AbstractSvxObjectNameDialog* CreateSvxObjectNameDialog(vcl::Window* pParent, const OUString& rName ) SAL_OVERRIDE;
virtual AbstractSvxObjectTitleDescDialog* CreateSvxObjectTitleDescDialog(vcl::Window* pParent, const OUString& rTitle, const OUString& rDescription) SAL_OVERRIDE;
- virtual AbstractSvxMessDialog * CreateSvxMessDialog( vcl::Window* pParent, sal_uInt32 nResId,
- const OUString& rText, const OUString& rDesc,
- Image* pImg = NULL ) SAL_OVERRIDE;
virtual AbstractSvxMultiPathDialog * CreateSvxMultiPathDialog(vcl::Window* pParent) SAL_OVERRIDE;
virtual AbstractSvxMultiPathDialog * CreateSvxPathSelectDialog(vcl::Window* pParent) SAL_OVERRIDE;
virtual AbstractSvxHpLinkDlg * CreateSvxHpLinkDlg (vcl::Window* pParent,
@@ -662,7 +635,6 @@ public:
// For TabPage
virtual CreateTabPage GetTabPageCreatorFunc( sal_uInt16 nId ) SAL_OVERRIDE;
- virtual CreateSvxDistributePage GetSvxDistributePageCreatorFunc() SAL_OVERRIDE;
virtual GetTabPageRanges GetTabPageRangesFunc( sal_uInt16 nId ) SAL_OVERRIDE;
virtual DialogGetRanges GetDialogGetRangesFunc() SAL_OVERRIDE;
diff --git a/include/svx/EnhancedCustomShape2d.hxx b/include/svx/EnhancedCustomShape2d.hxx
index 09cac8a..1a02605 100644
--- a/include/svx/EnhancedCustomShape2d.hxx
+++ b/include/svx/EnhancedCustomShape2d.hxx
@@ -220,7 +220,6 @@ class SVX_DLLPUBLIC EnhancedCustomShape2d : public SfxItemSet
SAL_DLLPRIVATE double GetAdjustValueAsDouble( const sal_Int32 nIndex ) const;
SAL_DLLPRIVATE double GetEquationValueAsDouble( const sal_Int32 nIndex ) const;
- SAL_DLLPRIVATE sal_Int32 GetAdjustValueAsInteger( const sal_Int32 nIndex, const sal_Int32 nDefault = 0 ) const;
static OUString GetEquation( const sal_uInt16 nFlags, sal_Int32 nPara1, sal_Int32 nPara2, sal_Int32 nPara3 );
diff --git a/include/svx/camera3d.hxx b/include/svx/camera3d.hxx
index 66133e6..0225063 100644
--- a/include/svx/camera3d.hxx
+++ b/include/svx/camera3d.hxx
@@ -57,7 +57,6 @@ class SVX_DLLPUBLIC SAL_WARN_UNUSED Camera3D : public Viewport3D
void SetPosition(const basegfx::B3DPoint& rNewPos);
const basegfx::B3DPoint& GetPosition() const { return aPosition; }
void SetLookAt(const basegfx::B3DPoint& rNewLookAt);
- const basegfx::B3DPoint& GetLookAt() const { return aLookAt; }
void SetPosAndLookAt(const basegfx::B3DPoint& rNewPos, const basegfx::B3DPoint& rNewLookAt);
// Focal length in mm
@@ -66,11 +65,9 @@ class SVX_DLLPUBLIC SAL_WARN_UNUSED Camera3D : public Viewport3D
// Bank angle links/rechts
void SetBankAngle(double fAngle);
- double GetBankAngle() const { return fBankAngle; }
void SetAutoAdjustProjection(bool bAdjust = true)
{ bAutoAdjustProjection = bAdjust; }
- bool IsAutoAdjustProjection() const { return bAutoAdjustProjection; }
};
#endif // INCLUDED_SVX_CAMERA3D_HXX
diff --git a/include/svx/cube3d.hxx b/include/svx/cube3d.hxx
index 7fcdd0b..5a6f246 100644
--- a/include/svx/cube3d.hxx
+++ b/include/svx/cube3d.hxx
@@ -76,8 +76,6 @@ public:
void SetPosIsCenter(bool bNew);
bool GetPosIsCenter() const { return bPosIsCenter; }
- sal_uInt16 GetSideFlags() { return nSideFlags; }
-
// TakeObjName...() is for the display in the UI, for example "3 frames selected".
virtual OUString TakeObjNameSingul() const SAL_OVERRIDE;
virtual OUString TakeObjNamePlural() const SAL_OVERRIDE;
diff --git a/include/svx/deflt3d.hxx b/include/svx/deflt3d.hxx
index 29cba8a..d76ad0b 100644
--- a/include/svx/deflt3d.hxx
+++ b/include/svx/deflt3d.hxx
@@ -74,48 +74,31 @@ public:
// Getter/Setter for default values of all 3D objects
// Compound object
const Color& GetDefaultAmbientColor() { return aDefaultAmbientColor; }
- void SetDefaultAmbientColor(const Color& rNew) { aDefaultAmbientColor = rNew; }
bool GetDefaultCreateNormals() const { return bDefaultCreateNormals; }
- void SetDefaultCreateNormals(const bool bNew) { bDefaultCreateNormals = bNew; }
bool GetDefaultCreateTexture() const { return bDefaultCreateTexture; }
- void SetDefaultCreateTexture(const bool bNew) { bDefaultCreateTexture = bNew; }
// Cube object
const basegfx::B3DPoint& GetDefaultCubePos() { return aDefaultCubePos; }
- void SetDefaultCubePos(const basegfx::B3DPoint& rNew) { aDefaultCubePos = rNew; }
const basegfx::B3DVector& GetDefaultCubeSize() { return aDefaultCubeSize; }
- void SetDefaultCubeSize(const basegfx::B3DVector& rNew) { aDefaultCubeSize = rNew; }
sal_uInt16 GetDefaultCubeSideFlags() const { return nDefaultCubeSideFlags; }
- void SetDefaultCubeSideFlags(const sal_uInt16 nNew) { nDefaultCubeSideFlags = nNew; }
bool GetDefaultCubePosIsCenter() const { return bDefaultCubePosIsCenter; }
- void SetDefaultCubePosIsCenter(const bool bNew) { bDefaultCubePosIsCenter = bNew; }
// Sphere object
const basegfx::B3DPoint& GetDefaultSphereCenter() { return aDefaultSphereCenter; }
- void SetDefaultSphereCenter(const basegfx::B3DPoint& rNew) { aDefaultSphereCenter = rNew; }
const basegfx::B3DVector& GetDefaultSphereSize() { return aDefaultSphereSize; }
- void SetDefaultSphereSize(const basegfx::B3DPoint& rNew) { aDefaultSphereSize = rNew; }
// Lathe object
- long GetDefaultLatheEndAngle() const { return nDefaultLatheEndAngle; }
- void SetDefaultLatheEndAngle(const long nNew) { nDefaultLatheEndAngle = nNew; }
bool GetDefaultLatheSmoothed() const { return bDefaultLatheSmoothed; }
- void SetDefaultLatheSmoothed(const bool bNew) { bDefaultLatheSmoothed = bNew; }
bool GetDefaultLatheSmoothFrontBack() const { return bDefaultLatheSmoothFrontBack; }
- void SetDefaultLatheSmoothFrontBack(const bool bNew) { bDefaultLatheSmoothFrontBack = bNew; }
bool GetDefaultLatheCharacterMode() const { return bDefaultLatheCharacterMode; }
void SetDefaultLatheCharacterMode(const bool bNew) { bDefaultLatheCharacterMode = bNew; }
bool GetDefaultLatheCloseFront() const { return bDefaultLatheCloseFront; }
- void SetDefaultLatheCloseFront(const bool bNew) { bDefaultLatheCloseFront = bNew; }
bool GetDefaultLatheCloseBack() const { return bDefaultLatheCloseBack; }
- void SetDefaultLatheCloseBack(const bool bNew) { bDefaultLatheCloseBack = bNew; }
// Extrude object
bool GetDefaultExtrudeSmoothed() const { return bDefaultExtrudeSmoothed; }
- void SetDefaultExtrudeSmoothed(const bool bNew) { bDefaultExtrudeSmoothed = bNew; }
bool GetDefaultExtrudeSmoothFrontBack() const { return bDefaultExtrudeSmoothFrontBack; }
- void SetDefaultExtrudeSmoothFrontBack(const bool bNew) { bDefaultExtrudeSmoothFrontBack = bNew; }
bool GetDefaultExtrudeCharacterMode() const { return bDefaultExtrudeCharacterMode; }
void SetDefaultExtrudeCharacterMode(const bool bNew) { bDefaultExtrudeCharacterMode = bNew; }
bool GetDefaultExtrudeCloseFront() const { return bDefaultExtrudeCloseFront; }
diff --git a/include/svx/e3ditem.hxx b/include/svx/e3ditem.hxx
index 15dd162..ae6bf2dd 100644
--- a/include/svx/e3ditem.hxx
+++ b/include/svx/e3ditem.hxx
@@ -46,10 +46,6 @@ public:
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE;
const basegfx::B3DVector& GetValue() const { return aVal; }
- void SetValue( const basegfx::B3DVector& rNewVal ) {
- DBG_ASSERT( GetRefCount() == 0, "SetValue() with pooled item" );
- aVal = rNewVal;
- }
virtual sal_uInt16 GetVersion (sal_uInt16 nFileFormatVersion) const SAL_OVERRIDE;
};
diff --git a/include/svx/fmmodel.hxx b/include/svx/fmmodel.hxx
index 03f65df..2260085 100644
--- a/include/svx/fmmodel.hxx
+++ b/include/svx/fmmodel.hxx
@@ -63,7 +63,6 @@ public:
virtual void InsertMasterPage(SdrPage* pPage, sal_uInt16 nPos=0xFFFF) SAL_OVERRIDE;
virtual SdrPage* RemoveMasterPage(sal_uInt16 nPgNum) SAL_OVERRIDE;
- virtual SdrLayerID GetControlExportLayerId( const SdrObject& rObj ) const;
SfxObjectShell* GetObjectShell() const { return m_pObjShell; }
void SetObjectShell( SfxObjectShell* pShell );
diff --git a/include/svx/fmview.hxx b/include/svx/fmview.hxx
index 92328e1..6d5f610 100644
--- a/include/svx/fmview.hxx
+++ b/include/svx/fmview.hxx
@@ -151,7 +151,6 @@ public:
SVX_DLLPRIVATE bool checkUnMarkAll(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xSource);
private:
- SVX_DLLPRIVATE void AdjustMarks(const SdrMarkList& rMarkList);
SVX_DLLPRIVATE FmFormObj* getMarkedGrid() const;
protected:
using E3dView::SetMoveOutside;
diff --git a/include/svx/galctrl.hxx b/include/svx/galctrl.hxx
index fa9f5da..466cfa5 100644
--- a/include/svx/galctrl.hxx
+++ b/include/svx/galctrl.hxx
@@ -67,8 +67,6 @@ private:
// DragSourceHelper
SVX_DLLPRIVATE virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ) SAL_OVERRIDE;
- DECL_LINK( MenuSelectHdl, Menu* );
-
public:
GalleryPreview(vcl::Window* pParent,
diff --git a/include/svx/gallery1.hxx b/include/svx/gallery1.hxx
index 2a26807..fd91e6254 100644
--- a/include/svx/gallery1.hxx
+++ b/include/svx/gallery1.hxx
@@ -115,7 +115,6 @@ private:
SAL_DLLPRIVATE void ImplLoadSubDirs( const INetURLObject& rBaseURL, bool& rbIsReadOnly );
GalleryThemeEntry* ImplGetThemeEntry( const OUString& rThemeName );
- SAL_DLLPRIVATE GalleryThemeEntry* ImplGetThemeEntry( sal_uIntPtr nThemeId );
SAL_DLLPRIVATE GalleryTheme* ImplGetCachedTheme( const GalleryThemeEntry* pThemeEntry );
SAL_DLLPRIVATE void ImplDeleteCachedTheme( GalleryTheme* pTheme );
@@ -146,8 +145,6 @@ public:
SAL_DLLPRIVATE const INetURLObject& GetUserURL() const { return aUserURL; }
SAL_DLLPRIVATE const INetURLObject& GetRelativeURL() const { return aRelURL; }
-
- SAL_DLLPRIVATE bool IsMultiPath() const { return bMultiPath; }
};
#endif // INCLUDED_SVX_GALLERY1_HXX
diff --git a/include/svx/galleryitem.hxx b/include/svx/galleryitem.hxx
index 9d9b48c..273c149 100644
--- a/include/svx/galleryitem.hxx
+++ b/include/svx/galleryitem.hxx
@@ -53,8 +53,6 @@ public:
sal_Int8 GetType() const { return m_nType; }
const rtl::OUString GetURL() const { return m_aURL; }
- const rtl::OUString GetFilterName() const { return m_aFilterName; }
- const com::sun::star::uno::Reference< com::sun::star::lang::XComponent > GetDrawing() const { return m_xDrawing; }
const com::sun::star::uno::Reference< com::sun::star::graphic::XGraphic > GetGraphic() const { return m_xGraphic; }
// pure virtual methods from SfxPoolItem
diff --git a/include/svx/galtheme.hxx b/include/svx/galtheme.hxx
index 4a00c8c..d3e9cbf 100644
--- a/include/svx/galtheme.hxx
+++ b/include/svx/galtheme.hxx
@@ -149,7 +149,6 @@ public:
SAL_DLLPRIVATE const OUString& GetRealName() const;
// used for building gallery themes during compilation:
- SAL_DLLPRIVATE const OUString& GetDestDir() const { return m_aDestDir; }
SAL_DLLPRIVATE void SetDestDir(const OUString& rDestDir, bool bRelative = true)
{ m_aDestDir = rDestDir; m_bDestDirRelative = bRelative; }
diff --git a/include/svx/ipolypolygoneditorcontroller.hxx b/include/svx/ipolypolygoneditorcontroller.hxx
index 0f89eca..b2efe7fb 100644
--- a/include/svx/ipolypolygoneditorcontroller.hxx
+++ b/include/svx/ipolypolygoneditorcontroller.hxx
@@ -59,7 +59,6 @@ public:
virtual SdrPathSmoothKind GetMarkedPointsSmooth() const = 0;
virtual void SetMarkedPointsSmooth(SdrPathSmoothKind eKind) = 0;
- virtual void CloseMarkedObjects(bool bToggle, bool bOpen ) = 0;
virtual bool IsOpenCloseMarkedObjectsPossible() const = 0;
virtual SdrObjClosedKind GetMarkedObjectsClosedState() const = 0;
diff --git a/include/svx/langbox.hxx b/include/svx/langbox.hxx
index 4c0dc57..0fcee6f 100644
--- a/include/svx/langbox.hxx
+++ b/include/svx/langbox.hxx
@@ -111,7 +111,6 @@ protected:
SVX_DLLPRIVATE virtual void ImplSelectEntryPos( sal_Int32 nPos, bool bSelect ) = 0;
SVX_DLLPRIVATE virtual bool ImplIsEntryPosSelected( sal_Int32 nPos ) const = 0;
SVX_DLLPRIVATE virtual sal_Int32 ImplGetEntryPos( const void* pData ) const = 0;
- SVX_DLLPRIVATE virtual sal_Int32 ImplGetEntryCount() const = 0;
SVX_DLLPRIVATE virtual void ImplSetNoSelection() = 0;
SVX_DLLPRIVATE virtual void ImplHide() = 0;
SVX_DLLPRIVATE virtual void ImplDisable() = 0;
@@ -137,7 +136,6 @@ private:
SVX_DLLPRIVATE virtual void ImplSelectEntryPos( sal_Int32 nPos, bool bSelect ) SAL_OVERRIDE;
SVX_DLLPRIVATE virtual bool ImplIsEntryPosSelected( sal_Int32 nPos ) const SAL_OVERRIDE;
SVX_DLLPRIVATE virtual sal_Int32 ImplGetEntryPos( const void* pData ) const SAL_OVERRIDE;
- SVX_DLLPRIVATE virtual sal_Int32 ImplGetEntryCount() const SAL_OVERRIDE;
SVX_DLLPRIVATE virtual void ImplSetNoSelection() SAL_OVERRIDE;
SVX_DLLPRIVATE virtual void ImplHide() SAL_OVERRIDE;
SVX_DLLPRIVATE virtual void ImplDisable() SAL_OVERRIDE;
@@ -177,7 +175,6 @@ private:
SVX_DLLPRIVATE virtual void ImplSelectEntryPos( sal_Int32 nPos, bool bSelect ) SAL_OVERRIDE;
SVX_DLLPRIVATE virtual bool ImplIsEntryPosSelected( sal_Int32 nPos ) const SAL_OVERRIDE;
SVX_DLLPRIVATE virtual sal_Int32 ImplGetEntryPos( const void* pData ) const SAL_OVERRIDE;
- SVX_DLLPRIVATE virtual sal_Int32 ImplGetEntryCount() const SAL_OVERRIDE;
SVX_DLLPRIVATE virtual void ImplSetNoSelection() SAL_OVERRIDE;
SVX_DLLPRIVATE virtual void ImplHide() SAL_OVERRIDE;
SVX_DLLPRIVATE virtual void ImplDisable() SAL_OVERRIDE;
diff --git a/include/svx/obj3d.hxx b/include/svx/obj3d.hxx
index 4a0d497..0f2dacb 100644
--- a/include/svx/obj3d.hxx
+++ b/include/svx/obj3d.hxx
@@ -254,68 +254,11 @@ public :
virtual sal_uInt32 GetHdlCount() const SAL_OVERRIDE;
virtual void AddToHdlList(SdrHdlList& rHdlList) const SAL_OVERRIDE;
- // DoubleSided: sal_True/FALSE
- bool GetDoubleSided() const
- { return static_cast<const SfxBoolItem&>(GetObjectItemSet().Get(SDRATTR_3DOBJ_DOUBLE_SIDED)).GetValue(); }
-
- // NormalsKind: 0 == sal_False/sal_False, 1 == sal_True/sal_False, else == sal_True/TRUE
- sal_uInt16 GetNormalsKind() const
- { return static_cast<const Svx3DNormalsKindItem&>(GetObjectItemSet().Get(SDRATTR_3DOBJ_NORMALS_KIND)).GetValue(); }
-
- // NormalsInvert: sal_True/FALSE
- bool GetNormalsInvert() const
- { return static_cast<const SfxBoolItem&>(GetObjectItemSet().Get(SDRATTR_3DOBJ_NORMALS_INVERT)).GetValue(); }
-
- // TextureProjX: 0 == sal_False/sal_False, 1 == sal_True/sal_False, else == sal_True/TRUE
- sal_uInt16 GetTextureProjectionX() const
- { return static_cast<const Svx3DTextureProjectionXItem&>(GetObjectItemSet().Get(SDRATTR_3DOBJ_TEXTURE_PROJ_X)).GetValue(); }
-
- // TextureProjY: 0 == sal_False/sal_False, 1 == sal_True/sal_False, else == sal_True/TRUE
- sal_uInt16 GetTextureProjectionY() const
- { return static_cast<const Svx3DTextureProjectionYItem&>(GetObjectItemSet().Get(SDRATTR_3DOBJ_TEXTURE_PROJ_Y)).GetValue(); }
-
- // Shadow3D: sal_True/FALSE
- bool GetShadow3D() const
- { return static_cast<const SfxBoolItem&>(GetObjectItemSet().Get(SDRATTR_3DOBJ_SHADOW_3D)).GetValue(); }
-
- // MaterialColor: Color
- Color GetMaterialColor() const
- { return static_cast<const SvxColorItem&>(GetObjectItemSet().Get(SDRATTR_3DOBJ_MAT_COLOR)).GetValue(); }
-
- // MaterialEmission: Color
- Color GetMaterialEmission() const
- { return static_cast<const SvxColorItem&>(GetObjectItemSet().Get(SDRATTR_3DOBJ_MAT_EMISSION)).GetValue(); }
-
- // MaterialSpecular: Color
- Color GetMaterialSpecular() const
- { return static_cast<const SvxColorItem&>(GetObjectItemSet().Get(SDRATTR_3DOBJ_MAT_SPECULAR)).GetValue(); }
-
- // MaterialSpecularIntensity:
- sal_uInt16 GetMaterialSpecularIntensity() const
- { return static_cast<const SfxUInt16Item&>(GetObjectItemSet().Get(SDRATTR_3DOBJ_MAT_SPECULAR_INTENSITY)).GetValue(); }
-
- // TextureFilter: sal_True/FALSE
- bool GetTextureFilter() const
- { return static_cast<const SfxBoolItem&>(GetObjectItemSet().Get(SDRATTR_3DOBJ_TEXTURE_FILTER)).GetValue(); }
-
- // #i28528#
- // Added extra Item (Bool) for chart2 to be able to show reduced line geometry
- bool GetReducedLineGeometry() const
- { return static_cast<const Svx3DReducedLineGeometryItem&>(GetObjectItemSet().Get(SDRATTR_3DOBJ_REDUCED_LINE_GEOMETRY)).GetValue(); }
-
virtual sal_uInt16 GetObjIdentifier() const SAL_OVERRIDE;
virtual void RecalcSnapRect() SAL_OVERRIDE;
- // set/get parameters for geometry creation
- bool GetCreateNormals() const { return bCreateNormals; }
-
- bool GetCreateTexture() const { return bCreateTexture; }
-
virtual E3dCompoundObject* Clone() const SAL_OVERRIDE;
- // material of the object
- const Color& GetMaterialAmbientColor() const { return aMaterialAmbientColor; }
-
bool IsAOrdNumRemapCandidate(E3dScene*& prScene) const;
};
diff --git a/include/svx/pageitem.hxx b/include/svx/pageitem.hxx
index 76260eb..00359b7 100644
--- a/include/svx/pageitem.hxx
+++ b/include/svx/pageitem.hxx
@@ -97,7 +97,6 @@ public:
void SetNumType(SvxNumType eNum) { eNumType = eNum; }
// name of the descriptor
- const OUString& GetDescName() const { return aDescName; }
void SetDescName(const OUString& rStr) { aDescName = rStr; }
};
diff --git a/include/svx/scene3d.hxx b/include/svx/scene3d.hxx
index aa24245..f313ec2 100644
--- a/include/svx/scene3d.hxx
+++ b/include/svx/scene3d.hxx
@@ -114,76 +114,6 @@ public:
double GetFocalLength() const
{ return static_cast<const SfxUInt32Item&>(GetObjectItemSet().Get(SDRATTR_3DSCENE_FOCAL_LENGTH)).GetValue(); }
- // Two sided lighting:
- bool GetTwoSidedLighting() const
- { return static_cast<const SfxBoolItem&>(GetObjectItemSet().Get(SDRATTR_3DSCENE_TWO_SIDED_LIGHTING)).GetValue(); }
-
- // Lightcolor:
- Color GetLightColor1() const
- { return static_cast<const SvxColorItem&>(GetObjectItemSet().Get(SDRATTR_3DSCENE_LIGHTCOLOR_1)).GetValue(); }
- Color GetLightColor2() const
- { return static_cast<const SvxColorItem&>(GetObjectItemSet().Get(SDRATTR_3DSCENE_LIGHTCOLOR_2)).GetValue(); }
- Color GetLightColor3() const
- { return static_cast<const SvxColorItem&>(GetObjectItemSet().Get(SDRATTR_3DSCENE_LIGHTCOLOR_3)).GetValue(); }
- Color GetLightColor4() const
- { return static_cast<const SvxColorItem&>(GetObjectItemSet().Get(SDRATTR_3DSCENE_LIGHTCOLOR_4)).GetValue(); }
- Color GetLightColor5() const
- { return static_cast<const SvxColorItem&>(GetObjectItemSet().Get(SDRATTR_3DSCENE_LIGHTCOLOR_5)).GetValue(); }
- Color GetLightColor6() const
- { return static_cast<const SvxColorItem&>(GetObjectItemSet().Get(SDRATTR_3DSCENE_LIGHTCOLOR_6)).GetValue(); }
- Color GetLightColor7() const
- { return static_cast<const SvxColorItem&>(GetObjectItemSet().Get(SDRATTR_3DSCENE_LIGHTCOLOR_7)).GetValue(); }
- Color GetLightColor8() const
- { return static_cast<const SvxColorItem&>(GetObjectItemSet().Get(SDRATTR_3DSCENE_LIGHTCOLOR_8)).GetValue(); }
-
- // Ambient color:
- Color GetGlobalAmbientColor() const
- { return static_cast<const SvxColorItem&>(GetObjectItemSet().Get(SDRATTR_3DSCENE_AMBIENTCOLOR)).GetValue(); }
-
- // Light on/off:
- bool GetLightOnOff1() const
- { return static_cast<const SfxBoolItem&>(GetObjectItemSet().Get(SDRATTR_3DSCENE_LIGHTON_1)).GetValue(); }
- bool GetLightOnOff2() const
- { return static_cast<const SfxBoolItem&>(GetObjectItemSet().Get(SDRATTR_3DSCENE_LIGHTON_2)).GetValue(); }
- bool GetLightOnOff3() const
- { return static_cast<const SfxBoolItem&>(GetObjectItemSet().Get(SDRATTR_3DSCENE_LIGHTON_3)).GetValue(); }
- bool GetLightOnOff4() const
- { return static_cast<const SfxBoolItem&>(GetObjectItemSet().Get(SDRATTR_3DSCENE_LIGHTON_4)).GetValue(); }
- bool GetLightOnOff5() const
- { return static_cast<const SfxBoolItem&>(GetObjectItemSet().Get(SDRATTR_3DSCENE_LIGHTON_5)).GetValue(); }
- bool GetLightOnOff6() const
- { return static_cast<const SfxBoolItem&>(GetObjectItemSet().Get(SDRATTR_3DSCENE_LIGHTON_6)).GetValue(); }
- bool GetLightOnOff7() const
- { return static_cast<const SfxBoolItem&>(GetObjectItemSet().Get(SDRATTR_3DSCENE_LIGHTON_7)).GetValue(); }
- bool GetLightOnOff8() const
- { return static_cast<const SfxBoolItem&>(GetObjectItemSet().Get(SDRATTR_3DSCENE_LIGHTON_8)).GetValue(); }
-
- // Light direction:
- basegfx::B3DVector GetLightDirection1() const
- { return static_cast<const SvxB3DVectorItem&>(GetObjectItemSet().Get(SDRATTR_3DSCENE_LIGHTDIRECTION_1)).GetValue(); }
- basegfx::B3DVector GetLightDirection2() const
- { return static_cast<const SvxB3DVectorItem&>(GetObjectItemSet().Get(SDRATTR_3DSCENE_LIGHTDIRECTION_2)).GetValue(); }
- basegfx::B3DVector GetLightDirection3() const
- { return static_cast<const SvxB3DVectorItem&>(GetObjectItemSet().Get(SDRATTR_3DSCENE_LIGHTDIRECTION_3)).GetValue(); }
- basegfx::B3DVector GetLightDirection4() const
- { return static_cast<const SvxB3DVectorItem&>(GetObjectItemSet().Get(SDRATTR_3DSCENE_LIGHTDIRECTION_4)).GetValue(); }
- basegfx::B3DVector GetLightDirection5() const
- { return static_cast<const SvxB3DVectorItem&>(GetObjectItemSet().Get(SDRATTR_3DSCENE_LIGHTDIRECTION_5)).GetValue(); }
- basegfx::B3DVector GetLightDirection6() const
- { return static_cast<const SvxB3DVectorItem&>(GetObjectItemSet().Get(SDRATTR_3DSCENE_LIGHTDIRECTION_6)).GetValue(); }
- basegfx::B3DVector GetLightDirection7() const
- { return static_cast<const SvxB3DVectorItem&>(GetObjectItemSet().Get(SDRATTR_3DSCENE_LIGHTDIRECTION_7)).GetValue(); }
- basegfx::B3DVector GetLightDirection8() const
- { return static_cast<const SvxB3DVectorItem&>(GetObjectItemSet().Get(SDRATTR_3DSCENE_LIGHTDIRECTION_8)).GetValue(); }
-
- // ShadowSlant:
- sal_uInt16 GetShadowSlant() const
- { return static_cast<const SfxUInt16Item&>(GetObjectItemSet().Get(SDRATTR_3DSCENE_SHADOW_SLANT)).GetValue(); }
-
- // ShadeMode: 0 == FLAT, 1 == PHONG, 2 == SMOOTH, 3 == ForceDraft
- sal_uInt16 GetShadeMode() const
- { return static_cast<const Svx3DShadeModeItem&>(GetObjectItemSet().Get(SDRATTR_3DSCENE_SHADE_MODE)).GetValue(); }
-
// set flag to draw only selected
void SetDrawOnlySelected(bool bNew) { bDrawOnlySelected = bNew; }
bool GetDrawOnlySelected() const { return bDrawOnlySelected; }
diff --git a/include/svx/sdasaitm.hxx b/include/svx/sdasaitm.hxx
index 733b4e7..f3d5277 100644
--- a/include/svx/sdasaitm.hxx
+++ b/include/svx/sdasaitm.hxx
@@ -29,12 +29,6 @@ class SdrCustomShapeAdjustmentValue
sal_uInt32 nValue;
friend class SdrCustomShapeAdjustmentItem;
-
- public :
-
- void SetValue( sal_Int32 nVal ) { nValue = nVal; };
- sal_Int32 GetValue() const { return nValue; };
-
};
class SdrCustomShapeAdjustmentItem : public SfxPoolItem
diff --git a/include/svx/sdr/contact/objectcontact.hxx b/include/svx/sdr/contact/objectcontact.hxx
index 61db820..e09e883 100644
--- a/include/svx/sdr/contact/objectcontact.hxx
+++ b/include/svx/sdr/contact/objectcontact.hxx
@@ -155,9 +155,6 @@ public:
ViewObjectContactRedirector* GetViewObjectContactRedirector() const { return mpViewObjectContactRedirector; }
void SetViewObjectContactRedirector(ViewObjectContactRedirector* pNew);
- // check if buffering of MasterPages is allowed. Default is sal_False.
- virtual bool IsMasterPageBufferingAllowed() const;
-
// print? Default is false
virtual bool isOutputToPrinter() const;
diff --git a/include/svx/sdr/contact/viewcontact.hxx b/include/svx/sdr/contact/viewcontact.hxx
index 0d07c8f..c34f5e9 100644
--- a/include/svx/sdr/contact/viewcontact.hxx
+++ b/include/svx/sdr/contact/viewcontact.hxx
@@ -113,13 +113,12 @@ public:
// from this object
void ActionChildInserted(ViewContact& rChild);
- // React on changes of the object of this ViewContact
- virtual void ActionChanged();
-
- // access to SdrObject and/or SdrPage. May return 0L like the default
+ // access to SdrObject. May return 0L like the default
// implementations do. Override as needed.
virtual SdrObject* TryToGetSdrObject() const;
- virtual SdrPage* TryToGetSdrPage() const;
+
+ // React on changes of the object of this ViewContact
+ virtual void ActionChanged();
// access to the local primitive. This will ensure that the primitive is
// current in comparing the local one with a fresh created incarnation
diff --git a/include/svx/sdr/contact/viewobjectcontact.hxx b/include/svx/sdr/contact/viewobjectcontact.hxx
index dca5c60..fec1dfe 100644
--- a/include/svx/sdr/contact/viewobjectcontact.hxx
+++ b/include/svx/sdr/contact/viewobjectcontact.hxx
@@ -94,9 +94,6 @@ public:
// get the oebject's size range
const basegfx::B2DRange& getObjectRange() const;
- // A ViewObjectContact was deleted and shall be forgotten.
- void RemoveViewObjectContact(ViewObjectContact& rVOContact);
-
// React on changes of the object of this ViewContact
virtual void ActionChanged();
diff --git a/include/svx/sdr/overlay/overlaymanager.hxx b/include/svx/sdr/overlay/overlaymanager.hxx
index 6710f61..b7be54c 100644
--- a/include/svx/sdr/overlay/overlaymanager.hxx
+++ b/include/svx/sdr/overlay/overlaymanager.hxx
@@ -104,9 +104,6 @@ namespace sdr
// flush. Do buffered updates.
virtual void flush();
- // #i68597# part of content gets copied, react on it
- virtual void copyArea(const Point& rDestPt, const Point& rSrcPt, const Size& rSrcSize);
-
// restore part of background. Implemented form buffered versions only.
virtual void restoreBackground(const vcl::Region& rRegion) const;
diff --git a/include/svx/sdr/overlay/overlaypolypolygon.hxx b/include/svx/sdr/overlay/overlaypolypolygon.hxx
index b51477b..29a06dc 100644
--- a/include/svx/sdr/overlay/overlaypolypolygon.hxx
+++ b/include/svx/sdr/overlay/overlaypolypolygon.hxx
@@ -46,7 +46,6 @@ namespace sdr
// change geometry
basegfx::B2DPolyPolygon getLinePolyPolygon() const { return maLinePolyPolygon; }
- void setLinePolyPolygon(const basegfx::B2DPolyPolygon& rNew);
// react on stripe definition change
virtual void stripeDefinitionHasChanged() SAL_OVERRIDE;
diff --git a/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx b/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx
index e500bf8..4cdda1c 100644
--- a/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx
+++ b/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx
@@ -39,11 +39,6 @@ namespace sdr
// geometry creation for OverlayObject
virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() SAL_OVERRIDE;
- private:
- // internal helper to create a drawinglayer::geometry::ViewInformation2D
- // using a OutputDevice and local knowledge
- drawinglayer::geometry::ViewInformation2D impCreateViewInformation2D(OutputDevice& rOutputDevice) const;
-
public:
explicit OverlayPrimitive2DSequenceObject(const drawinglayer::primitive2d::Primitive2DSequence& rSequence);
diff --git a/include/svx/sdrpaintwindow.hxx b/include/svx/sdrpaintwindow.hxx
index 36176e5..060c5ac 100644
--- a/include/svx/sdrpaintwindow.hxx
+++ b/include/svx/sdrpaintwindow.hxx
@@ -58,7 +58,6 @@ public:
void PreparePreRenderDevice();
void OutputPreRenderDevice(const vcl::Region& rExpandedRegion);
- OutputDevice& GetOriginalOutputDevice() const { return mrOutputDevice; }
OutputDevice& GetPreRenderDevice() { return *mpPreRenderDevice.get(); }
};
diff --git a/include/svx/svdcrtv.hxx b/include/svx/svdcrtv.hxx
index 5a5730c..a1d8f6c 100644
--- a/include/svx/svdcrtv.hxx
+++ b/include/svx/svdcrtv.hxx
@@ -85,7 +85,6 @@ public:
virtual bool MouseMove(const MouseEvent& rMEvt, vcl::Window* pWin) SAL_OVERRIDE;
void SetMeasureLayer(const OUString& rName) { aMeasureLayer=rName; }
- const OUString& GetMeasureLayer() const { return aMeasureLayer; }
// If the MeasureLayer is not set (empty string), then use the active layer for measuring.
void SetEditMode(SdrViewEditMode eMode) { SdrDragView::SetEditMode(eMode); CheckEdgeMode(); }
@@ -127,7 +126,6 @@ public:
// OBJ_TEXTEXT, OBJ_OUTLINERTEXT, OBJ_TITLETEXT, OBJ_CAPTION)
// automatically start a TextEdit (SdrObjEditView: SdrBeginTextEdit)
bool IsTextEditAfterCreate() const { return bAutoTextEdit; }
- void SetTextEditAfterCreate(bool bOn) { bAutoTextEdit = bOn; }
// Create a circle/rectangle/text frame with the first Point being
// the center of the object instead of the upper-left corner.
@@ -142,17 +140,14 @@ public:
// Object <= nAutoCloseDistPix pixels.
// Default = TRUE.
bool IsAutoClosePolys() const { return bAutoClosePolys; }
- void SetAutoClosePolys(bool bOn) { bAutoClosePolys=bOn; }
// Default = 5 Pixel
sal_uInt16 GetAutoCloseDistPix() const { return sal_uInt16(nAutoCloseDistPix); }
- void SetAutoCloseDistPix(sal_uInt16 nVal) { nAutoCloseDistPix=nVal; }
// Setting for the minimum distantce in pixels between 2 bezier points when
// creating a freehand line.
// Default = 10 Pixel
sal_uInt16 GetFreeHandMinDistPix() const { return sal_uInt16(nFreeHandMinDistPix); }
- void SetFreeHandMinDistPix(sal_uInt16 nVal) { nFreeHandMinDistPix=nVal; }
// FIXME: Whoever wants to keep the Create Interface for the PathObj which is
// incompatible with the rest of the Create functionality of SvDraw, needs
diff --git a/include/svx/svddrag.hxx b/include/svx/svddrag.hxx
index 3be0872..91ea052 100644
--- a/include/svx/svddrag.hxx
+++ b/include/svx/svddrag.hxx
@@ -90,7 +90,6 @@ public:
const Point& GetPrev() const { return GetPoint(GetPointAnz()-(GetPointAnz()>=2 ? 2:1)); }
Point& Prev() { return Pnt(GetPointAnz()-(GetPointAnz()>=2 ? 2:1)); }
const Point& GetPos0() const { return aPos0; }
- Point& Pos0() { return aPos0; }
const Point& GetNow() const { return GetPoint(GetPointAnz()-1); }
Point& Now() { return Pnt(GetPointAnz()-1); }
const Point& GetRealNow() const { return aRealNow; }
@@ -109,8 +108,7 @@ public:
bool IsMinMoved() const { return bMinMoved; }
void SetMinMoved() { bMinMoved=true; }
void ResetMinMoved() { bMinMoved=false; }
- void SetMinMove(sal_uInt16 nDist) { nMinMov=nDist; if (nMinMov<1) nMinMov=1; }
- sal_uInt16 GetMinMove() const { return nMinMov; }
+ void SetMinMove(sal_uInt16 nDist) { nMinMov=nDist; if (nMinMov<1) nMinMov=1; }
bool IsHorFixed() const { return bHorFixed; }
void SetHorFixed(bool bOn) { bHorFixed=bOn; }
diff --git a/include/svx/svddrgmt.hxx b/include/svx/svddrgmt.hxx
index e8e09b6..54527db 100644
--- a/include/svx/svddrgmt.hxx
+++ b/include/svx/svddrgmt.hxx
@@ -173,7 +173,6 @@ protected:
inline const Rectangle& GetMarkedRect() const;
SdrPageView* GetDragPV() const;
SdrObject* GetDragObj() const;
- OutputDevice* GetDragWin() const { return getSdrDragView().pDragWin; }
bool IsDraggingPoints() const { return getSdrDragView().IsDraggingPoints(); }
bool IsDraggingGluePoints() const { return getSdrDragView().IsDraggingGluePoints(); }
diff --git a/include/svx/svddrgv.hxx b/include/svx/svddrgv.hxx
index 4bd3037..802404d 100644
--- a/include/svx/svddrgv.hxx
+++ b/include/svx/svddrgv.hxx
@@ -125,7 +125,6 @@ public:
bool BegInsObjPoint(const Point& rPnt, bool bNewObj) { return ImpBegInsObjPoint(false, 0L, rPnt, bNewObj, 0L); }
void MovInsObjPoint(const Point& rPnt) { MovDragObj(rPnt); }
bool EndInsObjPoint(SdrCreateCmd eCmd);
- void BrkInsObjPoint() { BrkDragObj(); }
bool IsInsObjPoint() const { return mpCurrentSdrDragMethod && mbInsPolyPoint; }
// For the app to manage the status. GetPreferredPointer() is
@@ -135,9 +134,6 @@ public:
bool IsInsGluePointPossible() const;
bool BegInsGluePoint(const Point& rPnt);
- void MovInsGluePoint(const Point& rPnt) { MovDragObj(rPnt); }
- bool EndInsGluePoint() { return EndDragObj(); }
- void BrkInsGluePoint() { BrkDragObj(); }
bool IsInsGluePoint() const { return mpCurrentSdrDragMethod && mbInsGluePoint; }
// For the app to manage the status. GetPreferredPointer() is
@@ -156,7 +152,6 @@ public:
// Hide the mouse when dragging polygon points or glue points.
// Default=false
- void SetMouseHideWhileDraggingPoints(bool bOn) { mbMouseHideWhileDraggingPoints = bOn; }
bool IsMouseHideWhileDraggingPoints() const { return mbMouseHideWhileDraggingPoints; }
// As a general rule, the contours of the selected objects
@@ -173,14 +168,12 @@ public:
// NoDragPolys is (temporarily) activated implicitely.
// PolyPolygons etc. are regarded as multiple objects respectively.
// Default=100
- void SetDragXorPolyLimit(sal_uIntPtr nLimit) { mnDragXorPolyLimit=nLimit; }
sal_uIntPtr GetDragXorPolyLimit() const { return mnDragXorPolyLimit; }
// Like DragXorPolyLimit, but in respect to the total number of
// all polygons. Default=500.
// NoDragPolys is (temporarily) activated, if one of the limits
// is exceeded.
- void SetDragXorPointLimit(sal_uIntPtr nPointCount) { mnDragXorPointLimit=nPointCount; }
sal_uIntPtr GetDragXorPointLimit() const { return mnDragXorPointLimit; }
void SetSolidDragging(bool bOn);
@@ -190,12 +183,10 @@ public:
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// Stick Connectors to vertices
// Default=true=Yes
- void SetAutoVertexConnectors(bool bOn) { mbAutoVertexCon = bOn; }
bool IsAutoVertexConnectors() const { return mbAutoVertexCon; }
// Stick Connectors to Corners
// Default=false=No
- void SetAutoCornerConnectors(bool bOn) { mbAutoCornerCon = bOn; }
bool IsAutoCornerConnectors() const { return mbAutoCornerCon; }
// Dragging of connected objects (Nodes):
@@ -207,8 +198,6 @@ public:
// Default value: 10
bool IsDetailedEdgeDragging() const { return mbDetailedEdgeDragging; }
- sal_uInt16 GetDetailedEdgeDraggingLimit() const { return mnDetailedEdgeDraggingLimit; }
-
// EdgeDraggingLimit: If more than nEdgeObjCount edges are affected,
// they are not shown in the interactive dragging.
// This here talks about the "rubber bands", which take less computing time
@@ -233,11 +222,6 @@ public:
void SetMarkedHitMovesAlways(bool bOn) { mbMarkedHitMovesAlways = bOn; }
bool IsMarkedHitMovesAlways() const { return mbMarkedHitMovesAlways; }
- // Show the mirror image of the selected objects as Xor while dragging
- // the mirror axis? Persistent. Not yet implemented. Default: true
- void SetMirrRefDragObj(bool bOn) { mbMirrRefDragObj = bOn; }
- bool IsMirrRefDragObj() const { return mbMirrRefDragObj; }
-
bool IsOrthoDesired() const;
// center as reference on Resize
diff --git a/include/svx/svdedtv.hxx b/include/svx/svdedtv.hxx
index b109e0c..b97f8eb 100644
--- a/include/svx/svdedtv.hxx
+++ b/include/svx/svdedtv.hxx
@@ -197,8 +197,6 @@ public:
SdrLayer* InsertNewLayer(const OUString& rName, sal_uInt16 nPos=0xFFFF);
// Delete a layer including all objects contained
void DeleteLayer(const OUString& rName);
- // Move a layer (change sequence of layers)
- void MoveLayer(const OUString& rName, sal_uInt16 nNewPos);
// Marked objects which are outside a page
// are assigned to an other page; at the moment without undo!!!
@@ -209,7 +207,6 @@ public:
// delete all marked objects
void DeleteMarkedObj();
- bool IsDeleteMarkedObjPossible() const { ForcePossibilities(); return bDeletePossible; }
// Set a logical enclosing rectangle for all marked objects.
// It is not guaranteed if this succeeds, as a horizontal
@@ -233,14 +230,9 @@ public:
void SetAllMarkedRect(const Rectangle& rRect, bool bCopy=false) { SetMarkedObjRect(rRect,bCopy); }
void MoveAllMarked(const Size& rSiz, bool bCopy=false) { MoveMarkedObj (rSiz,bCopy); }
void ResizeAllMarked(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bCopy=false) { ResizeMarkedObj (rRef,xFact,yFact,bCopy); }
- long GetAllMarkedRotate() const { return GetMarkedObjRotate(); }
void RotateAllMarked(const Point& rRef, long nAngle, bool bCopy=false) { RotateMarkedObj(rRef,nAngle,bCopy); }
- void MirrorAllMarked(const Point& rRef1, const Point& rRef2, bool bCopy=false) { MirrorMarkedObj(rRef1,rRef2,bCopy); }
void MirrorAllMarkedHorizontal(bool bCopy=false) { MirrorMarkedObjHorizontal(bCopy); }
void MirrorAllMarkedVertical(bool bCopy=false) { MirrorMarkedObjVertical(bCopy); }
- long GetAllMarkedShear() const { return GetMarkedObjShear(); }
- void ShearAllMarked(const Point& rRef, long nAngle, bool bVShear=false, bool bCopy=false) { ShearMarkedObj(rRef,nAngle,bVShear,bCopy); }
- void CrookAllMarked(const Point& rRef, const Point& rRad, SdrCrookMode eMode, bool bVertical=false, bool bNoContortion=false, bool bCopy=false) { CrookMarkedObj(rRef,rRad,eMode,bVertical,bNoContortion,bCopy); }
void CopyMarked() { CopyMarkedObj(); }
bool IsMoveAllowed() const { ForcePossibilities(); return bMoveAllowed && !bMoveProtect; }
bool IsResizeAllowed(bool bProp=false) const;
@@ -418,7 +410,6 @@ public:
// in their Z-order (Writer).
// Default setting is sal_False=swithed off.
void SetVirtualObjectBundling(bool bOn) { bBundleVirtObj=bOn; }
- bool IsVirtualObjectBundling() const { return bBundleVirtObj; }
// override SdrMarkView, for internal use
virtual void MarkListHasChanged() SAL_OVERRIDE;
diff --git a/include/svx/svdedxv.hxx b/include/svx/svdedxv.hxx
index 5c994cc..2aa9f89 100644
--- a/include/svx/svdedxv.hxx
+++ b/include/svx/svdedxv.hxx
@@ -198,7 +198,6 @@ public:
virtual SdrPageView* GetTextEditPageView() const SAL_OVERRIDE;
// Current window of the outliners.
- vcl::Window* GetTextEditWin() const { return pTextEditWin; }
void SetTextEditWin(vcl::Window* pWin);
// Now at this outliner, events can be send, attributes can be set,
@@ -236,7 +235,6 @@ public:
// Persistent. Default TRUE. SvDraw evaluates the flag e.g. at SdrView::GetPreferredPointer().
// Has only effect, if the document has draw-objects with macrofunctionality (SdrObject::HasMacro()==sal_True).
- void SetMacroMode(bool bOn) { bMacroMode=bOn; }
bool IsMacroMode() const { return bMacroMode; }
bool BegMacroObj(const Point& rPnt, short nTol, SdrObject* pObj, SdrPageView* pPV, vcl::Window* pWin);
bool BegMacroObj(const Point& rPnt, SdrObject* pObj, SdrPageView* pPV, vcl::Window* pWin) { return BegMacroObj(rPnt,-2,pObj,pPV,pWin); }
@@ -244,7 +242,6 @@ public:
void BrkMacroObj();
bool EndMacroObj();
bool IsMacroObj() const { return pMacroObj!=NULL; }
- bool IsMacroObjDown() const { return bMacroDown; }
/** fills the given any with a XTextCursor for the current text selection.
Leaves the any untouched if there currently is no text selected */
diff --git a/include/svx/svdetc.hxx b/include/svx/svdetc.hxx
index 1b8a97a..0f82c5b 100644
--- a/include/svx/svdetc.hxx
+++ b/include/svx/svdetc.hxx
@@ -153,7 +153,6 @@ public:
bool ReportActions( sal_uIntPtr nActionCount );
bool ReportInserts( sal_uIntPtr nInsertCount );
- sal_uIntPtr GetSumActionCount() const { return nSumActionCount; };
sal_uIntPtr GetSumCurAction() const { return nSumCurAction; };
sal_uIntPtr GetObjCount() const { return nObjCount; };
sal_uIntPtr GetCurObj() const { return nCurObj; };
@@ -183,7 +182,6 @@ public:
const Link<>& GetLink(unsigned nNum) const { return *aList[nNum]; }
void InsertLink(const Link<>& rLink, unsigned nPos=0xFFFF);
void RemoveLink(const Link<>& rLink);
- bool HasLink(const Link<>& rLink) const { return FindEntry(rLink)!=0xFFFF; }
};
SdrLinkList& ImpGetUserMakeObjHdl();
diff --git a/include/svx/svdglev.hxx b/include/svx/svdglev.hxx
index 92f77fe..19e2d07 100644
--- a/include/svx/svdglev.hxx
+++ b/include/svx/svdglev.hxx
@@ -50,13 +50,11 @@ public:
// SdrEscapeDirection::LEFT, SdrEscapeDirection::RIGHT, SdrEscapeDirection::TOP and SdrEscapeDirection::BOTTOM
SDR_TRISTATE IsMarkedGluePointsEscDir(SdrEscapeDirection nThisEsc) const;
void SetMarkedGluePointsEscDir(SdrEscapeDirection nThisEsc, bool bOn);
- bool IsSetMarkedGluePointsEscDirPossible() const { return !IsReadOnly() && HasMarkedGluePoints(); }
// check/set, if the GluePoints are relativ to the
// object size (Percent=sal_True) or not (Percent=sal_False)
SDR_TRISTATE IsMarkedGluePointsPercent() const;
void SetMarkedGluePointsPercent(bool bOn);
- bool IsSetMarkedGluePointsPercentPossible() const { return !IsReadOnly() && HasMarkedGluePoints(); }
// bVert=FALSE: check/set hotizontal alignment
// SdrAlign::HORZ_CENTER
@@ -70,7 +68,6 @@ public:
// SdrAlign::VERT_DONTCARE (only at Get())
SdrAlign GetMarkedGluePointsAlign(bool bVert) const;
void SetMarkedGluePointsAlign(bool bVert, SdrAlign nAlign);
- bool IsSetMarkedGluePointsAlignPossible() const { return !IsReadOnly() && HasMarkedGluePoints(); }
// delete all marked GluePoints
void DeleteMarkedGluePoints();
@@ -78,14 +75,6 @@ public:
void MoveMarkedGluePoints (const Size& rSiz, bool bCopy=false);
void ResizeMarkedGluePoints(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bCopy=false);
void RotateMarkedGluePoints(const Point& rRef, long nAngle, bool bCopy=false);
- void MirrorMarkedGluePoints(const Point& rRef1, const Point& rRef2, bool bCopy=false);
- void MirrorMarkedGluePointsHorizontal(bool bCopy=false);
- void MirrorMarkedGluePointsVertical(bool bCopy=false);
- void ShearMarkedGluePoints(const Point& rRef, long nAngle, bool bVShear=false, bool bCopy=false);
- void CrookMarkedGluePoints(const Point& rRef, const Point& rRad, SdrCrookMode eMode, bool bVertical=false, bool bNoContortion=false, bool bCopy=false);
- void DistortMarkedGluePoints(const Rectangle& rRef, const XPolygon& rDistortedRect, bool bNoContortion=false, bool bCopy=false);
-
- void AlignMarkedGluePoints(SdrHorAlign eHor, SdrVertAlign eVert);
};
#endif // INCLUDED_SVX_SVDGLEV_HXX
diff --git a/include/svx/svdglue.hxx b/include/svx/svdglue.hxx
index 2d0b6c9..c880eab 100644
--- a/include/svx/svdglue.hxx
+++ b/include/svx/svdglue.hxx
@@ -89,7 +89,6 @@ public:
bool IsPercent() const { return !bNoPercent; }
void SetPercent(bool bOn) { bNoPercent = !bOn; }
// temp for transformations on the reference object
- bool IsReallyAbsolute() const { return bReallyAbsolute; }
void SetReallyAbsolute(bool bOn, const SdrObject& rObj);
// #i38892#
diff --git a/include/svx/svdhdl.hxx b/include/svx/svdhdl.hxx
index 486baaf..ec3ef8d 100644
--- a/include/svx/svdhdl.hxx
+++ b/include/svx/svdhdl.hxx
@@ -280,11 +280,9 @@ public:
Color GetColor() const { return aMarkerColor; }
void SetColor(Color aNew, bool bCallLink = false);
- const Size& GetSize() const { return aMarkerSize; }
void SetSize(const Size& rNew);
void SetColorChangeHdl(const Link<>& rLink) { aColorChangeHdl = rLink; }
- const Link<>& GetColorChangeHdl() const { return aColorChangeHdl; }
};
diff --git a/include/svx/svdhlpln.hxx b/include/svx/svdhlpln.hxx
index f5b31fa..03b59ae 100644
--- a/include/svx/svdhlpln.hxx
+++ b/include/svx/svdhlpln.hxx
@@ -38,11 +38,6 @@ class SdrHelpLine {
Point aPos; // je nach Wert von eKind ist X oder Y evtl. belanglos
SdrHelpLineKind eKind;
- // #i27493#
- // Helper method to draw a hor or ver two-colored dashed line
- void ImpDrawDashedTwoColorLine(OutputDevice& rOut, sal_Int32 nStart, sal_Int32 nEnd, sal_Int32 nFixPos,
- sal_Int32 nStepWidth, Color aColA, Color aColB, bool bHorizontal) const;
-
public:
explicit SdrHelpLine(SdrHelpLineKind eNewKind=SDRHELPLINE_POINT): eKind(eNewKind) {}
SdrHelpLine(SdrHelpLineKind eNewKind, const Point& rNewPos): aPos(rNewPos), eKind(eNewKind) {}
diff --git a/include/svx/svdlayer.hxx b/include/svx/svdlayer.hxx
index 0a79bd9..70c3009 100644
--- a/include/svx/svdlayer.hxx
+++ b/include/svx/svdlayer.hxx
@@ -56,12 +56,10 @@ public:
SdrLayerID GetID() const { return nID; }
void SetModel(SdrModel* pNewModel) { pModel=pNewModel; }
- SdrModel* GetModel() const { return pModel; }
// A SdrLayer should be considered the standard Layer. It shall then set the
// appropriate country-specific name. SetName() sets the "StandardLayer" flag
// and if necessary returns "Userdefined".
void SetStandardLayer(bool bStd = true);
- bool IsStandardLayer() const { return nType==1; }
};
// When Changing the layer data you currently have to set the Modify-Flag
@@ -82,26 +80,18 @@ protected:
// verbraucht, so gibt's 'ne 0. Wer sicher gehen will, muss vorher
// GetLayerCount()<SDRLAYER_MAXCOUNT abfragen, denn sonst sind alle
// vergeben.
- SdrLayerID GetUniqueLayerID() const;
- void Broadcast() const;
+ SdrLayerID GetUniqueLayerID() const;
+ void Broadcast() const;
public:
explicit SdrLayerAdmin(SdrLayerAdmin* pNewParent=NULL);
SdrLayerAdmin(const SdrLayerAdmin& rSrcLayerAdmin);
~SdrLayerAdmin();
const SdrLayerAdmin& operator=(const SdrLayerAdmin& rSrcLayerAdmin);
- bool operator==(const SdrLayerAdmin& rCmpLayerAdmin) const;
- bool operator!=(const SdrLayerAdmin& rCmpLayerAdmin) const { return !operator==(rCmpLayerAdmin); }
- SdrLayerAdmin* GetParent() const { return pParent; }
- void SetParent(SdrLayerAdmin* pNewParent) { pParent=pNewParent; }
- void SetModel(SdrModel* pNewModel);
- SdrModel* GetModel() const { return pModel; }
- void InsertLayer(SdrLayer* pLayer)
- {
- aLayer.push_back(pLayer);
- pLayer->SetModel(pModel);
- Broadcast();
- }
- void InsertLayer(SdrLayer* pLayer, sal_uInt16 nPos)
+ bool operator==(const SdrLayerAdmin& rCmpLayerAdmin) const;
+ bool operator!=(const SdrLayerAdmin& rCmpLayerAdmin) const { return !operator==(rCmpLayerAdmin); }
+ void SetParent(SdrLayerAdmin* pNewParent) { pParent=pNewParent; }
+ void SetModel(SdrModel* pNewModel);
+ void InsertLayer(SdrLayer* pLayer, sal_uInt16 nPos)
{
if(nPos==0xFFFF)
aLayer.push_back(pLayer);
@@ -110,38 +100,29 @@ public:
pLayer->SetModel(pModel);
Broadcast();
}
- SdrLayer* RemoveLayer(sal_uInt16 nPos);
+ SdrLayer* RemoveLayer(sal_uInt16 nPos);
// Delete the entire layer
void ClearLayer();
// New layer is created and inserted
SdrLayer* NewLayer(const OUString& rName, sal_uInt16 nPos=0xFFFF);
- void DeleteLayer(SdrLayer* pLayer)
- {
- std::vector<SdrLayer*>::iterator it = std::find(aLayer.begin(), aLayer.end(), pLayer);
- if( it == aLayer.end() )
- return;
- aLayer.erase(it);
- delete pLayer;
- Broadcast();
- }
// New layer, name is retrieved from the resource
SdrLayer* NewStandardLayer(sal_uInt16 nPos=0xFFFF);
// Iterate over all layers
- sal_uInt16 GetLayerCount() const { return sal_uInt16(aLayer.size()); }
- SdrLayer* GetLayer(sal_uInt16 i) { return aLayer[i]; }
- const SdrLayer* GetLayer(sal_uInt16 i) const { return aLayer[i]; }
+ sal_uInt16 GetLayerCount() const { return sal_uInt16(aLayer.size()); }
+ SdrLayer* GetLayer(sal_uInt16 i) { return aLayer[i]; }
+ const SdrLayer* GetLayer(sal_uInt16 i) const { return aLayer[i]; }
- sal_uInt16 GetLayerPos(SdrLayer* pLayer) const;
+ sal_uInt16 GetLayerPos(SdrLayer* pLayer) const;
- SdrLayer* GetLayer(const OUString& rName, bool bInherited);
- const SdrLayer* GetLayer(const OUString& rName, bool bInherited) const;
- SdrLayerID GetLayerID(const OUString& rName, bool bInherited) const;
- SdrLayer* GetLayerPerID(sal_uInt16 nID) { return const_cast<SdrLayer*>(const_cast<const SdrLayerAdmin*>(this)->GetLayerPerID(nID)); }
+ SdrLayer* GetLayer(const OUString& rName, bool bInherited);
+ const SdrLayer* GetLayer(const OUString& rName, bool bInherited) const;
+ SdrLayerID GetLayerID(const OUString& rName, bool bInherited) const;
+ SdrLayer* GetLayerPerID(sal_uInt16 nID) { return const_cast<SdrLayer*>(const_cast<const SdrLayerAdmin*>(this)->GetLayerPerID(nID)); }
const SdrLayer* GetLayerPerID(sal_uInt16 nID) const;
- void SetControlLayerName(const OUString& rNewName);
- const OUString& GetControlLayerName() const { return maControlLayerName; }
+ void SetControlLayerName(const OUString& rNewName);
+ const OUString& GetControlLayerName() const { return maControlLayerName; }
};
/*
diff --git a/include/svx/svdmark.hxx b/include/svx/svdmark.hxx
index 7c5181f..391dbbd 100644
--- a/include/svx/svdmark.hxx
+++ b/include/svx/svdmark.hxx
@@ -113,11 +113,6 @@ public:
return mpPoints;
}
- const SdrUShortCont* GetMarkedLines() const
- {
- return mpLines;
- }
-
const SdrUShortCont* GetMarkedGluePoints() const
{
return mpGluePoints;
@@ -128,11 +123,6 @@ public:
return mpPoints;
}
- SdrUShortCont* GetMarkedLines()
- {
- return mpLines;
- }
-
SdrUShortCont* GetMarkedGluePoints()
{
return mpGluePoints;
@@ -146,14 +136,6 @@ public:
return mpPoints;
}
- SdrUShortCont* ForceMarkedLines()
- {
- if(!mpLines)
- mpLines = new SdrUShortCont;
-
- return mpLines;
- }
-
SdrUShortCont* ForceMarkedGluePoints()
{
if(!mpGluePoints)
diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx
index 97394d2..2c9eb47 100644
--- a/include/svx/svdmodel.hxx
+++ b/include/svx/svdmodel.hxx
@@ -225,15 +225,6 @@ private:
sal_uInt32 mnUniqueCommentID;
public:
- // create a new, unique comment ID
- sal_uInt32 GetNextUniqueCommentID();
-
- // for export
- sal_uInt32 GetUniqueCommentID() const { return mnUniqueCommentID; }
-
- // for import
- void SetUniqueCommentID(sal_uInt32 nNewID) { if(nNewID != mnUniqueCommentID) { mnUniqueCommentID = nNewID; } }
-
sal_uInt16 nStarDrawPreviewMasterPageNum;
SvxForbiddenCharactersTable* mpForbiddenCharactersTable;
SdrSwapGraphicsMode nSwapGraphicsMode;
@@ -374,7 +365,6 @@ public:
void SetLinkManager( sfx2::LinkManager* pLinkMgr ) { pLinkManager = pLinkMgr; }
::comphelper::IEmbeddedHelper* GetPersist() const { return m_pEmbeddedHelper; }
- void ClearPersist() { m_pEmbeddedHelper = 0; }
void SetPersist( ::comphelper::IEmbeddedHelper *p ) { m_pEmbeddedHelper = p; }
// Unit for the symbol coordination
@@ -410,11 +400,6 @@ public:
// Setting both simultaneously performs a little better
void SetUIUnit(FieldUnit eUnit, const Fraction& rScale);
- const Fraction& GetUIUnitFact() const { return aUIUnitFact; }
- const OUString& GetUIUnitStr() const { return aUIUnitStr; }
- int GetUIUnitKomma() const { return nUIUnitKomma; }
- bool IsUIOnlyKomma() const { return bUIOnlyKomma; }
-
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);
@@ -453,30 +438,6 @@ public:
bool IsChanged() const { return mbChanged; }
virtual void SetChanged(bool bFlg = true);
- // PageNotValid means that the model carries objects which are
- // anchored on a Page but the Page is invalid. This mark is needed for
- // Clipboard/Drag&Drop.
- bool IsPageNotValid() const { return bPageNotValid; }
- void SetPageNotValid(bool bJa = true) { bPageNotValid=bJa; }
-
- // Setting this flag to sal_True, graphic objects are saved
- // portably. Meta files will eventually implicitly changed, i.e. during save.
- // Default=FALSE. Flag is not persistent.
- bool IsSavePortable() const { return bSavePortable; }
- void SetSavePortable(bool bJa = true) { bSavePortable=bJa; }
-
- // If you set this flag to sal_True, the
- // pixel objects will be saved (heavily) compressed.
- // Default=FALSE. Flag is not persistent.
- bool IsSaveCompressed() const { return bSaveCompressed; }
- void SetSaveCompressed(bool bJa = true) { bSaveCompressed=bJa; }
-
- // If true, graphic objects with set Native-Link
- // native will be saved.
- // Default=FALSE. Flag is not persistent.
- bool IsSaveNative() const { return bSaveNative; }
- void SetSaveNative(bool bJa = true) { bSaveNative=bJa; }
-
// If set to sal_True, graphics from graphics objects will:
// - not be loaded immediately when loading a document,
// but only once they are needed (e.g. displayed).
@@ -489,16 +450,6 @@ public:
SdrSwapGraphicsMode GetSwapGraphicsMode() const { return nSwapGraphicsMode; }
bool IsSaveOLEPreview() const { return bSaveOLEPreview; }
- void SetSaveOLEPreview( bool bSet) { bSaveOLEPreview = bSet; }
-
- // To accelerate the screen output of Bitmaps (especially rotated ones)
- // they will be cached. The existence of that cache can be toggled with this
- // flag. During the next Paint an image will be remembered or freed.
- // If a Bitmap object is placed in Undo its Cache for this object is turned off
- // immediately to save memory.
- // Default=Cache activated. Flag is not persistent.
- bool IsBitmapCaching() const { return !bNoBitmapCaching; }
- void SetBitmapCaching(bool bJa = true) { bNoBitmapCaching=!bJa; }
// Text frames without filling can be select with a mouse click by default (sal_False).
// With this flag set to true you can hit them only in the area in which text is to be
@@ -554,7 +505,6 @@ public:
void EndUndo(); // close Undo group
void AddUndo(SdrUndoAction* pUndo);
sal_uInt16 GetUndoBracketLevel() const { return nUndoLevel; }
- const SdrUndoGroup* GetAktUndoGroup() const { return pAktUndoGroup; }
// only after the first BegUndo or before the last EndUndo:
void SetUndoComment(const OUString& rComment);
void SetUndoComment(const OUString& rComment, const OUString& rObjDescr);
@@ -562,7 +512,6 @@ public:
// The Undo management is only done if not NotifyUndoAction-Handler is set.
// Default is 16. Minimal MaxUndoActionCount is 1!
void SetMaxUndoActionCount(sal_uIntPtr nCount);
- sal_uIntPtr GetMaxUndoActionCount() const { return nMaxUndoCount; }
void ClearUndoBuffer();
bool HasUndoActions() const;
@@ -577,7 +526,6 @@ public:
// When calling the handler ownership is transferred;
// The UndoAction belongs to the Handler, not the SdrModel.
void SetNotifyUndoActionHdl(const Link<>& rLink) { aUndoLink=rLink; }
- const Link<>& GetNotifyUndoActionHdl() const { return aUndoLink; }
/** application can set its own undo manager, BegUndo, EndUndo and AddUndoAction
calls are routed to this interface if given */
@@ -593,19 +541,6 @@ public:
undo actions for this model. */
SdrUndoFactory& GetSdrUndoFactory() const;
- // You can set a handler which will be called multiple times while
- // streaming and which estimates the progress of the function.
- // The handler needs to have this signature:
- // void class::IOProgressHdl(const USHORT& nPercent);
- // The first call of the handler will be with 0. The last call with 100.
- // In between there will at most be 99 calls with 1..99.
- // You can thus initialise the progres bar with 0 and close it on 100.
- // Mind that the handler will also be called if the App serves Draw data in the
- // office wide Draw-Exchange-Format because that happens through streaming into
- // a MemoryStream.
- void SetIOProgressHdl(const Link<>& rLink) { aIOProgressLink=rLink; }
- const Link<>& GetIOProgressHdl() const { return aIOProgressLink; }
-
// Accessor methods for Palettes, Lists and Tabeles
// FIXME: this badly needs re-factoring ...
XPropertyListRef GetPropertyList( XPropertyListType t ) const { return maProperties[ t ]; }
@@ -669,7 +604,6 @@ public:
static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelImplementationId();
virtual ImageMap* GetImageMapForObject(SdrObject*){return NULL;};
- virtual sal_Int32 GetHyperlinkCount(SdrObject*){return 0;}
/** enables (true) or disables (false) recording of undo actions
If undo actions are added while undo is disabled, they are deleted.
diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx
index 186a33b..5e0b0b1 100644
--- a/include/svx/svdmrkv.hxx
+++ b/include/svx/svdmrkv.hxx
@@ -207,16 +207,11 @@ public:
// The interface might maybe be changed in the future because of Ortho-Drag
void SetDragMode(SdrDragMode eMode);
SdrDragMode GetDragMode() const { return meDragMode; }
- bool ChkDragMode(SdrDragMode eMode) const;
void SetFrameHandles(bool bOn);
bool IsFrameHandles() const { return mbForceFrameHandles; }
sal_uIntPtr GetMarkableObjCount() const;
- // Limit. Exceeding the limit causes an implicite switch to FrameHandles. default=50.
- void SetFrameHandlesLimit(sal_uInt16 nCount) { mnFrameHandlesLimit=nCount; }
- sal_uInt16 GetFrameHandlesLimit() const { return mnFrameHandlesLimit; }
-
void SetEditMode(SdrViewEditMode eMode);
SdrViewEditMode GetEditMode() const { return meEditMode; }
@@ -340,11 +335,9 @@ public:
// Mark all points within this rectangular alle Punkte (View coordinates)
bool MarkPoints(const Rectangle& rRect, bool bUnmark=false) { return MarkPoints(&rRect,bUnmark); }
bool UnmarkPoint(SdrHdl& rHdl) { return MarkPoint(rHdl,true); }
- bool UnMarkPoint(SdrHdl& rHdl) { return MarkPoint(rHdl,true); }
bool IsPointMarked(const SdrHdl& rHdl) const { ForceUndirtyMrkPnt(); return rHdl.IsSelected(); }
bool MarkAllPoints() { return MarkPoints(NULL,false); }
bool UnmarkAllPoints() { return MarkPoints(NULL,true); }
- bool UnMarkAllPoints() { return MarkPoints(NULL,true); }
// Selects the first marked point (P1) which is hit by rPnt
// and from there it searches the first non-marked point(P2).
@@ -374,7 +367,6 @@ public:
// Are Handles visible during TextEdit (in double size)?
// Persistent, default=FALSE
void SetMarkHdlWhenTextEdit(bool bOn) { mbMarkHdlWhenTextEdit=bOn; }
- bool IsMarkHdlWhenTextEdit() const { return mbMarkHdlWhenTextEdit; }
bool HasMarkableGluePoints() const;
bool HasMarkedGluePoints() const;
@@ -401,8 +393,6 @@ public:
static bool IsGluePoint(const SdrHdl& rHdl) { return rHdl.GetKind()==HDL_GLUE; }
// Mark all points within this rectangular (View coordinates)
- bool MarkGluePoints(const Rectangle& rRect) { return MarkGluePoints(&rRect,false); }
- bool UnmarkGluePoints(const Rectangle& rRect) { return MarkGluePoints(&rRect,true); }
bool MarkAllGluePoints() { return MarkGluePoints(NULL,false); }
bool UnmarkAllGluePoints() { return MarkGluePoints(NULL,true); }
@@ -435,7 +425,6 @@ public:
const Rectangle& GetMarkedGluePointsRect() const; // Enclosing rectangle of all marked glue points
const Rectangle& GetAllMarkedRect() const { return GetMarkedObjRect(); }
Rectangle GetAllMarkedBoundRect() const { return GetMarkedObjBoundRect(); }
- const Rectangle& GetAllMarkedPointsRect() const { return GetMarkedPointsRect(); }
Point GetGridOffset() const;
// Will be always called, if the list of marked objects might be changed.
@@ -451,10 +440,6 @@ public:
// separately. The method returns sal_True, if at least one group was entered.
bool EnterMarkedGroup();
- // Get the center point of the last Crook-Dragging. Den kann man
- // bei einem anschliessenden Rotate sinnvoll als Drehmittelpunkt setzen.
- const Point& GetLastCrookCenter() const { return maLastCrookCenter; }
-
// Is set by DragView automatically when finishing a Crook-Drag.
void SetLastCrookCenter(const Point& rPt) { maLastCrookCenter=rPt; }
@@ -465,7 +450,6 @@ public:
// End point of the axis of reflextion
const Point& GetRef2() const { return maRef1; }
void SetRef2(const Point& rPt);
- void UnmarkObj(SdrObject* pObj);
};
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index 3bc77df..652cd9f 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -368,7 +368,6 @@ public:
Point GetGridOffset() const { return aGridOffset; }
void SetGridOffset( const Point& rGridOffset ){ aGridOffset = rGridOffset; }
protected:
- void ImpDeleteUserData();
Rectangle ImpDragCalcRect(const SdrDragStat& rDrag) const;
// for GetDragComment
@@ -445,13 +444,6 @@ public:
SdrObjUserCall* GetUserCall() const { return pUserCall;}
void SendUserCall(SdrUserCallType eUserCall, const Rectangle& rBoundRect) const;
- // Such a reference point is for instance:
- // - a symbol's point that should snap to the raster when inserting the symbol
- // - or an image's fix point within an animation object
- virtual bool HasRefPoint() const;
- virtual Point GetRefPoint() const;
- virtual void SetRefPoint(const Point& rPnt);
-
// #i68101#
// An object may have a user-set Name (Get/SetName()), e.g SdrGrafObj, SdrObjGroup
// or SdrOle2Obj.
@@ -790,9 +782,6 @@ public:
void NbcMirrorGluePoints(const Point& rRef1, const Point& rRef2);
void NbcShearGluePoints (const Point& rRef, long nAngle, double tn, bool bVShear);
- // is object an edge?
- virtual bool IsEdge() const;
-
// if bTail1 is true, line start, otherwise line end
// if pObj is null disconnect
virtual void ConnectToNode(bool bTail1, SdrObject* pObj);
diff --git a/include/svx/svdoedge.hxx b/include/svx/svdoedge.hxx
index 8e44eab..de78e8c 100644
--- a/include/svx/svdoedge.hxx
+++ b/include/svx/svdoedge.hxx
@@ -73,7 +73,6 @@ public:
inline void SetConnectorId( sal_uInt16 nId ) { nConId = nId; };
inline bool IsBestConnection() const { return bBestConn; };
- inline bool IsBestVertex() const { return bBestVertex; };
inline bool IsAutoVertex() const { return bAutoVertex; };
inline sal_uInt16 GetConnectorId() const { return nConId; };
inline SdrObject* GetObject() const { return pObj; }
@@ -228,7 +227,6 @@ public:
virtual SdrGluePoint GetCornerGluePoint(sal_uInt16 nNum) const SAL_OVERRIDE;
virtual const SdrGluePointList* GetGluePointList() const SAL_OVERRIDE;
virtual SdrGluePointList* ForceGluePointList() SAL_OVERRIDE;
- virtual bool IsEdge() const SAL_OVERRIDE;
// bTail1=TRUE: Linienanfang, sonst LinienEnde
// pObj=NULL: Disconnect
diff --git a/include/svx/svdogrp.hxx b/include/svx/svdogrp.hxx
index 6e9f48e..54c52c9 100644
--- a/include/svx/svdogrp.hxx
+++ b/include/svx/svdogrp.hxx
@@ -59,9 +59,6 @@ public:
virtual void SetObjList(SdrObjList* pNewObjList) SAL_OVERRIDE;
virtual void SetPage(SdrPage* pNewPage) SAL_OVERRIDE;
virtual void SetModel(SdrModel* pNewModel) SAL_OVERRIDE;
- virtual bool HasRefPoint() const SAL_OVERRIDE;
- virtual Point GetRefPoint() const SAL_OVERRIDE;
- virtual void SetRefPoint(const Point& rPnt) SAL_OVERRIDE;
virtual SdrObjList* GetSubList() const SAL_OVERRIDE;
virtual const Rectangle& GetCurrentBoundRect() const SAL_OVERRIDE;
diff --git a/include/svx/svdopath.hxx b/include/svx/svdopath.hxx
index ea1bd16..f625668 100644
--- a/include/svx/svdopath.hxx
+++ b/include/svx/svdopath.hxx
@@ -150,7 +150,6 @@ public:
// special functions for Bezier-polygon handling
bool IsClosed() const { return meKind==OBJ_POLY || meKind==OBJ_PATHPOLY || meKind==OBJ_PATHFILL || meKind==OBJ_FREEFILL || meKind==OBJ_SPLNFILL; }
bool IsLine() const { return meKind==OBJ_PLIN || meKind==OBJ_PATHPLIN || meKind==OBJ_PATHLINE || meKind==OBJ_FREELINE || meKind==OBJ_SPLNLINE || meKind==OBJ_LINE; }
- bool IsFreeHand() const { return meKind==OBJ_FREELINE || meKind==OBJ_FREEFILL; }
bool IsBezier() const { return meKind==OBJ_PATHLINE || meKind==OBJ_PATHFILL; }
bool IsSpline() const { return meKind==OBJ_SPLNLINE || meKind==OBJ_SPLNFILL; }
diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx
index b092425..0b62bab 100644
--- a/include/svx/svdotext.hxx
+++ b/include/svx/svdotext.hxx
@@ -370,7 +370,6 @@ public:
virtual sal_Int32 CheckTextHit(const Point& rPnt) const;
void SetDisableAutoWidthOnDragging(bool bOn) { bDisableAutoWidthOnDragging=bOn; }
- bool IsDisableAutoWidthOnDragging() { return bDisableAutoWidthOnDragging; }
void NbcSetText(const OUString& rStr);
void SetText(const OUString& rStr);
void NbcSetText(SvStream& rInput, const OUString& rBaseURL, sal_uInt16 eFormat);
diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx
index 2c83427..8a7977c 100644
--- a/include/svx/svdpage.hxx
+++ b/include/svx/svdpage.hxx
@@ -63,14 +63,11 @@ enum SdrInsertReasonKind {
};
class SdrInsertReason {
- const SdrObject* pRefObj;
SdrInsertReasonKind eReason;
public:
- SdrInsertReason(): pRefObj(NULL),eReason(SDRREASON_UNKNOWN) {}
- SdrInsertReason(SdrInsertReasonKind eR,const SdrObject* pO=NULL): pRefObj(pO),eReason(eR) {}
- void SetReferenceObject(const SdrObject* pO) { pRefObj=pO; }
- const SdrObject* GetReferenceObject() const { return pRefObj; }
- void SetReason(SdrInsertReasonKind eR) { eReason=eR; }
+ SdrInsertReason(): eReason(SDRREASON_UNKNOWN) {}
+ SdrInsertReason(SdrInsertReasonKind eR): eReason(eR) {}
+
SdrInsertReasonKind GetReason() const { return eReason; }
};
@@ -113,10 +110,6 @@ public:
virtual SdrObjList* Clone() const;
- // !!! This method is only for people who know exactly what they do !!!
-
- // #110094# This should not be needed (!)
- void SetObjOrdNumsDirty() { bObjOrdNumsDirty=true; }
void CopyObjects(const SdrObjList& rSrcList);
/// clean up everything (without Undo)
void Clear();
@@ -313,8 +306,6 @@ class SdrPageGridFrame
public:
SdrPageGridFrame(const Rectangle& rPaper): aPaper(rPaper), aUserArea(rPaper) {}
SdrPageGridFrame(const Rectangle& rPaper, const Rectangle& rUser): aPaper(rPaper), aUserArea(rUser) {}
- void SetPaperRect(const Rectangle& rPaper) { aPaper=rPaper; }
- void SetUserArea(const Rectangle& rUser) { aUserArea=rUser; }
const Rectangle& GetPaperRect() const { return aPaper; }
const Rectangle& GetUserArea() const { return aUserArea; }
};
@@ -332,25 +323,6 @@ public:
void Clear();
sal_uInt16 GetCount() const { return sal_uInt16(aList.size()); }
void Insert(const SdrPageGridFrame& rGF) { aList.push_back(new SdrPageGridFrame(rGF)); }
- void Insert(const SdrPageGridFrame& rGF, sal_uInt16 nPos)
- {
- if(nPos==0xFFFF)
- aList.push_back(new SdrPageGridFrame(rGF));
- else
- aList.insert(aList.begin()+nPos,new SdrPageGridFrame(rGF));
- }
- void Delete(sal_uInt16 nPos)
- {
- SdrPageGridFrame* p = aList[nPos];
- aList.erase(aList.begin()+nPos);
- delete p;
- }
- void Move(sal_uInt16 nPos, sal_uInt16 nNewPos)
- {
- SdrPageGridFrame* p = aList[nPos];
- aList.erase(aList.begin()+nPos);
- aList.insert(aList.begin()+nNewPos,p);
- }
SdrPageGridFrame& operator[](sal_uInt16 nPos) { return *GetObject(nPos); }
const SdrPageGridFrame& operator[](sal_uInt16 nPos) const { return *GetObject(nPos); }
};
@@ -545,8 +517,6 @@ public:
/// if pRect != null, then the pages that are intersected by this Rect,
/// otherwise the visible pages
virtual const SdrPageGridFrameList* GetGridFrameList(const SdrPageView* pPV, const Rectangle* pRect) const;
- bool IsObjectsNotPersistent() const { return mbObjectsNotPersistent; }
- void SetObjectsNotPersistent(bool b) { mbObjectsNotPersistent = b; }
css::uno::Reference< css::uno::XInterface > getUnoPage();
diff --git a/include/svx/svdpagv.hxx b/include/svx/svdpagv.hxx
index 8bf305f..1cc20e1 100644
--- a/include/svx/svdpagv.hxx
+++ b/include/svx/svdpagv.hxx
@@ -214,7 +214,6 @@ public:
void LogicToPagePos(Point& rPnt) const { rPnt-=aPgOrg; }
void LogicToPagePos(Rectangle& rRect) const { rRect.Move(-aPgOrg.X(),-aPgOrg.Y()); }
void PagePosToLogic(Point& rPnt) const { rPnt+=aPgOrg; }
- void PagePosToLogic(Rectangle& rRect) const { rRect.Move(aPgOrg.X(),aPgOrg.Y()); }
void SetVisibleLayers(const SetOfByte& rSet) { aLayerVisi=rSet; InvalidateAllWin(); }
const SetOfByte& GetVisibleLayers() const { return aLayerVisi; }
@@ -229,7 +228,6 @@ public:
void SetHelpLine(sal_uInt16 nNum, const SdrHelpLine& rNewHelpLine);
void DeleteHelpLine(sal_uInt16 nNum);
void InsertHelpLine(const SdrHelpLine& rHL, sal_uInt16 nNum=0xFFFF);
- void MoveHelpLine(sal_uInt16 nNum, sal_uInt16 nNewNum) { aHelpLines.Move(nNum,nNewNum); }
// Liefert sal_True, wenn Layer des Obj sichtbar und nicht gesperrt.
// Beim Gruppenobjekt muss wenigstens ein Member sichtbar sein,
diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx
index 592e1b8a7..b7c9d50 100644
--- a/include/svx/svdpntv.hxx
+++ b/include/svx/svdpntv.hxx
@@ -258,9 +258,6 @@ protected:
void ImpSetGlueVisible2(bool bOn) { if (bGlueVisible2!=bOn) { bGlueVisible2=bOn; if (!bGlueVisible && !bGlueVisible3 && !bGlueVisible4) GlueInvalidate(); } }
void ImpSetGlueVisible3(bool bOn) { if (bGlueVisible3!=bOn) { bGlueVisible3=bOn; if (!bGlueVisible && !bGlueVisible2 && !bGlueVisible4) GlueInvalidate(); } }
void ImpSetGlueVisible4(bool bOn) { if (bGlueVisible4!=bOn) { bGlueVisible4=bOn; if (!bGlueVisible && !bGlueVisible2 && !bGlueVisible3) GlueInvalidate(); } }
- bool ImpIsGlueVisible2() const { return bGlueVisible2; }
- bool ImpIsGlueVisible3() const { return bGlueVisible3; }
- bool ImpIsGlueVisible4() const { return bGlueVisible4; }
public:
bool ImpIsGlueVisible() { return bGlueVisible || bGlueVisible2 || bGlueVisible3 || bGlueVisible4; }
@@ -269,10 +266,6 @@ protected:
virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) SAL_OVERRIDE;
void GlueInvalidate() const;
- void ShowEncirclement(OutputDevice* pOut);
- void HideEncirclement(OutputDevice* pOut);
- void DrawEncirclement(OutputDevice* pOut) const;
-
// ModelHasChanged wird gerufen, sobald nach beliebig vielen HINT_OBJCHG
// das System wieder idle ist (StarView-Timer). Wer diese Methode ueberlaed,
// muss unbedingt ModelHasChanged() der Basisklasse rufen.
@@ -308,17 +301,14 @@ public:
// Pixelwerten logische Werte berechnen kann.
void SetActualWin(const OutputDevice* pWin);
void SetMinMoveDistancePixel(sal_uInt16 nVal) { nMinMovPix=nVal; TheresNewMapMode(); }
- sal_uInt16 GetMinMoveDistancePixel() const { return (sal_uInt16)nMinMovPix; }
void SetHitTolerancePixel(sal_uInt16 nVal) { nHitTolPix=nVal; TheresNewMapMode(); }
sal_uInt16 GetHitTolerancePixel() const { return (sal_uInt16)nHitTolPix; }
// data read access on logic HitTolerance and MinMoveTolerance
sal_uInt16 getHitTolLog() const { return nHitTolLog; }
- sal_uInt16 getMinMovLog() const { return nMinMovLog; }
// Flag zur Visualisierung von Gruppen abfragen/testen
bool DoVisualizeEnteredGroup() const { return bVisualizeEnteredGroup; }
- void SetVisualizeEnteredGroup(bool bNew) { bVisualizeEnteredGroup = bNew; }
// Am DragStatus laesst sich beispielsweise erfragen, welche
// entfernung bereits gedraggd wurde, etc.
@@ -392,7 +382,6 @@ public:
bool IsGridFront() const { return bGridFront ; } // Rastergitter ueber die Objekte druebermalen oder dahinter
bool IsHlplVisible() const { return bHlplVisible; } // Hilfslinien der Seiten malen oder nicht
bool IsHlplFront() const { return bHlplFront ; } // Hilfslinie ueber die Objekte druebermalen oder dahinter
- bool IsGlueVisible() const { return bGlueVisible; } // Konnektoren der objekte sichtbar oder nicht
Color GetGridColor() const { return maGridColor;}
void SetPageVisible(bool bOn = true) { bPageVisible=bOn; InvalidateAllWin(); }
void SetPageBorderVisible(bool bOn = true) { bPageBorderVisible=bOn; InvalidateAllWin(); }
@@ -454,10 +443,6 @@ public:
void SetNotPersistDefaultAttr(const SfxItemSet& rAttr, bool bReplaceAll);
void MergeNotPersistDefaultAttr(SfxItemSet& rAttr, bool bOnlyHardAttr) const;
- // use this mode as mode to draw all internal GraphicManager objects with
- GraphicManagerDrawFlags GetGraphicManagerDrawMode() const { return nGraphicManagerDrawMode; }
- void SetGraphicManagerDrawMode( GraphicManagerDrawFlags nMode ) { nGraphicManagerDrawMode = nMode; }
-
// SwapIn (z.B. von Grafiken) asynchron durchfuehren. Also nicht
// beim Paint sofort nachladen, sondern dort das Nachladen anstossen.
// Nach Abschluss des Nachladens wird das Objekt dann angezeigt.
@@ -491,7 +476,6 @@ public:
void SetAnimationEnabled( bool bEnable=true );
// set/unset pause state for animations
- bool IsAnimationPause() const { return bAnimationPause; }
void SetAnimationPause( bool bSet );
// Verhalten beim Starten von Animation im Paint-Handler:
@@ -499,7 +483,6 @@ public:
// 2. Nur die Ersatzdarstellung der Animation zeichnen ( SDR_ANIMATION_DONT_ANIMATE )
// 3. Nicht starten und nichts ersatzweise ausgeben ( SDR_ANIMATION_DISABLE )
void SetAnimationMode( const SdrAnimationMode eMode );
- SdrAnimationMode GetAnimationMode() const { return eAnimationMode; }
// bei bShow=sal_False wird der Browser destruiert
#ifdef DBG_UTIL
diff --git a/include/svx/svdpoev.hxx b/include/svx/svdpoev.hxx
index e7a47c6..871c3f9 100644
--- a/include/svx/svdpoev.hxx
+++ b/include/svx/svdpoev.hxx
@@ -73,7 +73,6 @@ public:
// Alle markierten Polylines werden zu Polygonen, alle offenen
// Bezierkurven zu geschlossenen.
- void CloseMarkedObjects(bool bToggle=false, bool bOpen=false) SAL_OVERRIDE; // , long nOpenDistance=0);
bool IsOpenCloseMarkedObjectsPossible() const SAL_OVERRIDE;
SdrObjClosedKind GetMarkedObjectsClosedState() const SAL_OVERRIDE;
diff --git a/include/svx/svdsnpv.hxx b/include/svx/svdsnpv.hxx
index 1554fb0..2384758 100644
--- a/include/svx/svdsnpv.hxx
+++ b/include/svx/svdsnpv.hxx
@@ -109,7 +109,6 @@ public:
const Fraction& GetSnapGridWidthY() const { return aSnapWdtY; }
void SetSnapMagnetic(const Size& rSiz) { if (rSiz!=aMagnSiz) { aMagnSiz=rSiz; } }
- const Size& GetSnapMagnetic() const { return aMagnSiz; }
void SetSnapMagneticPixel(sal_uInt16 nPix) { nMagnSizPix=nPix; }
sal_uInt16 GetSnapMagneticPixel() const { return nMagnSizPix; }
@@ -146,21 +145,6 @@ public:
void SetMoveSnapOnlyTopLeft(bool bOn) { bMoveSnapOnlyTopLeft=bOn; }
bool IsMoveSnapOnlyTopLeft() const { return bMoveSnapOnlyTopLeft; }
- // auxiliary lines fixed (not moveable)
- // persistent, Default=FALSE.
- bool IsHlplFixed() const { return bHlplFixed; }
- void SetHlplFixed(bool bOn) { bHlplFixed=bOn; }
-
- bool IsMoveMFrmSnap() const { return bMoveMFrmSnap; } // Fang des LogFram aller markierten Objekte
- bool IsMoveOFrmSnap() const { return bMoveOFrmSnap; } // Fang aller LogFram der markierten Objekte
- bool IsMoveOPntSnap() const { return bMoveOPntSnap; } // Fang ausgepraegter Punkte der markierten Objekte
- bool IsMoveOConSnap() const { return bMoveOConSnap; } // Fang der Konnektoren der markierten Objekte
-
- void SetMoveMFrmSnap(bool bOn) { bMoveMFrmSnap=bOn; }
- void SetMoveOFrmSnap(bool bOn) { bMoveOFrmSnap=bOn; }
- void SetMoveOPntSnap(bool bOn) { bMoveOPntSnap=bOn; }
- void SetMoveOConSnap(bool bOn) { bMoveOConSnap=bOn; }
-
// #114409#-1 Migrate PageOrigin
bool BegSetPageOrg(const Point& rPnt);
void MovSetPageOrg(const Point& rPnt);
diff --git a/include/svx/svdtrans.hxx b/include/svx/svdtrans.hxx
index 7ce7b8d..221b7ad 100644
--- a/include/svx/svdtrans.hxx
+++ b/include/svx/svdtrans.hxx
@@ -302,10 +302,6 @@ public:
SdrFormatter(MapUnit eSrc, FieldUnit eDst) { eSrcMU=eSrc; bSrcFU=false; eDstFU=eDst; bDstFU=true; bDirty=true; }
SdrFormatter(FieldUnit eSrc, MapUnit eDst) { eSrcFU=eSrc; bSrcFU=true; eDstMU=eDst; bDstFU=false; bDirty=true; }
SdrFormatter(FieldUnit eSrc, FieldUnit eDst) { eSrcFU=eSrc; bSrcFU=true; eDstFU=eDst; bDstFU=true; bDirty=true; }
- void SetSourceUnit(MapUnit eSrc) { eSrcMU=eSrc; bSrcFU=false; bDirty=true; }
- void SetSourceUnit(FieldUnit eSrc) { eSrcFU=eSrc; bSrcFU=true; bDirty=true; }
- void SetDestinationUnit(MapUnit eDst) { eDstMU=eDst; bDstFU=false; bDirty=true; }
- void SetDestinationUnit(FieldUnit eDst) { eDstFU=eDst; bDstFU=true; bDirty=true; }
void TakeStr(long nVal, OUString& rStr) const;
static void TakeUnitStr(MapUnit eUnit, OUString& rStr);
static void TakeUnitStr(FieldUnit eUnit, OUString& rStr);
diff --git a/include/svx/svdundo.hxx b/include/svx/svdundo.hxx
index 9f29a31..6b4773f 100644
--- a/include/svx/svdundo.hxx
+++ b/include/svx/svdundo.hxx
@@ -107,7 +107,6 @@ public:
virtual bool CanSdrRepeat(SdrView& rView) const SAL_OVERRIDE;
virtual void SdrRepeat(SdrView& rView) SAL_OVERRIDE;
void SetRepeatFunction(SdrRepeatFunc eFunc) { eFunction=eFunc; }
- SdrRepeatFunc GetRepeatFunction() const { return eFunction; }
};
/**
@@ -189,9 +188,6 @@ public:
SdrUndoMoveObj(SdrObject& rNewObj, const Size& rDist): SdrUndoObj(rNewObj),aDistance(rDist) {}
virtual ~SdrUndoMoveObj();
- void SetDistance(const Size& rDist) { aDistance=rDist; }
- const Size& GetDistance() const { return aDistance; }
-
virtual void Undo() SAL_OVERRIDE;
virtual void Redo() SAL_OVERRIDE;
@@ -247,13 +243,8 @@ protected:
SdrUndoObjList(SdrObject& rNewObj, bool bOrdNumDirect = false);
virtual ~SdrUndoObjList();
- void SetView(SdrView* pView1, SdrPageView* pPageView1) { pView=pView1; pPageView=pPageView1; }
bool IsOwner() { return bOwner; }
void SetOwner(bool bNew);
-
-private:
- sal_uInt32 GetOrdNum() const { return nOrdNum;}
- void SetOrdNum(sal_uInt32 nOrdNum_);
};
/**
diff --git a/include/svx/svdview.hxx b/include/svx/svdview.hxx
index ab97b79..29673ef 100644
--- a/include/svx/svdview.hxx
+++ b/include/svx/svdview.hxx
@@ -129,9 +129,6 @@ struct SVX_DLLPUBLIC SdrViewEvent
public:
SdrViewEvent();
~SdrViewEvent();
-
- // nEventKind is SdrMouseEventKind::BUTTONDOWN, SdrMouseEventKind::MOVE or SdrMouseEventKind::BUTTONUP
- void SetMouseEvent(const MouseEvent& rMEvt, SdrMouseEventKind nEventKind);
};
// helper class for all D&D overlays
@@ -190,10 +187,8 @@ public:
bool IsExtendedKeyInputDispatcherEnabled() const { return bNoExtendedKeyDispatcher; }
void EnableExtendedCommandEventDispatcher(bool bOn) { bNoExtendedCommandDispatcher=!bOn; }
- bool IsExtendedCommandEventDispatcherEnabled() const { return bNoExtendedCommandDispatcher; }
void EnableTextEditOnObjectsWithoutTextIfTextTool(bool bOn) { bTextEditOnObjectsWithoutTextIfTextTool=bOn; }
- bool IsEnableTextEditOnObjectsWithoutTextIfTextToolEnabled() const { return bTextEditOnObjectsWithoutTextIfTextTool; }
void SetMasterPagePaintCaching(bool bOn);
bool IsMasterPagePaintCaching() const { return mbMasterPagePaintCaching; }
diff --git a/include/svx/svdxcgv.hxx b/include/svx/svdxcgv.hxx
index ec5d3be..114adfc 100644
--- a/include/svx/svdxcgv.hxx
+++ b/include/svx/svdxcgv.hxx
@@ -115,7 +115,6 @@ public:
static bool Yank( sal_uIntPtr nFormat = SDR_ANYFORMAT );
static bool Paste( vcl::Window* pWin = NULL, sal_uIntPtr nFormat = SDR_ANYFORMAT );
- bool PasteClipboard( OutputDevice* pOut = NULL, sal_uIntPtr nFormat = SDR_ANYFORMAT, sal_uInt32 nOptions = 0 );
};
#endif // INCLUDED_SVX_SVDXCGV_HXX
diff --git a/include/svx/svxdlg.hxx b/include/svx/svxdlg.hxx
index 696666b..369a581 100644
--- a/include/svx/svxdlg.hxx
+++ b/include/svx/svxdlg.hxx
@@ -69,13 +69,13 @@ public:
class AbstractFmShowColsDialog : public VclAbstractDialog
{
- public:
+public:
virtual void SetColumns(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer>& xCols)= 0;
};
class AbstractSvxZoomDialog : public VclAbstractDialog
{
- public:
+public:
virtual void SetLimits( sal_uInt16 nMin, sal_uInt16 nMax ) = 0;
virtual void HideButton( ZoomButtonId nBtnId )= 0;
virtual const SfxItemSet* GetOutputItemSet() const = 0 ;
@@ -83,9 +83,7 @@ class AbstractSvxZoomDialog : public VclAbstractDialog
class AbstractSpellDialog : public VclAbstractDialog
{
- public:
- virtual void SetLanguage( sal_uInt16 nLang ) = 0;
- virtual bool Close() = 0;
+public:
virtual void Invalidate() = 0;
virtual vcl::Window* GetWindow() = 0;
virtual SfxBindings& GetBindings() = 0;
@@ -95,17 +93,10 @@ typedef sal_IntPtr (*PLinkStub)( void*, void* );
class AbstractSearchProgress :public VclAbstractRefreshableDialog
{
-public:
- virtual void SetFileType( const OUString& rType ) = 0;
- virtual void SetDirectory( const INetURLObject& rURL ) = 0;
- virtual PLinkStub GetLinkStubCleanUpHdl() = 0;
};
class AbstractTakeProgress :public VclAbstractRefreshableDialog
{
-public:
- virtual void SetFile( const INetURLObject& rURL ) = 0;
- virtual PLinkStub GetLinkStubCleanUpHdl() = 0;
};
class AbstractTitleDialog :public VclAbstractDialog
@@ -132,18 +123,6 @@ public:
class AbstractSvxHlinkDlgMarkWnd :public VclAbstractDialog
{
-public:
- virtual bool MoveTo ( Point aNewPos ) const = 0;
- virtual bool ConnectToDialog( bool bDoit = true ) const = 0;
- virtual void RefreshTree ( const OUString& aStrURL ) = 0;
- virtual void SelectEntry ( const OUString& aStrMark ) = 0;
- virtual sal_uInt16 SetError( sal_uInt16 nError) = 0;
- // in class Window
- virtual void SetSizePixel( const Size& rNewSize ) = 0;
- virtual Size GetSizePixel() const = 0;
- virtual void Hide() = 0;
- virtual bool IsVisible() const = 0;
- virtual void Invalidate( InvalidateFlags nFlags = InvalidateFlags::NONE ) = 0;
};
class AbstractSvxSearchSimilarityDialog :public VclAbstractDialog
@@ -201,8 +180,6 @@ public:
class AbstractSvxMessDialog :public VclAbstractDialog
{
-public:
- virtual void SetButtonText( sal_uInt16 nBtnId, const OUString& rNewTxt ) = 0;
};
class AbstractSvxMultiPathDialog : public VclAbstractDialog
@@ -263,8 +240,6 @@ public:
virtual void ShowLastAuthor(const OUString& rAuthor, const OUString& rDate) = 0;
virtual void DontChangeAuthor() = 0;
virtual void HideAuthor() = 0;
- virtual void SetReadonlyPostIt(bool bDisable) = 0;
- virtual bool IsOkEnabled() const = 0;
virtual vcl::Window * GetWindow() = 0;
};
@@ -323,9 +298,6 @@ public:
virtual VclAbstractRefreshableDialog * CreateActualizeProgressDialog( vcl::Window* pParent,
GalleryTheme* pThm ) = 0;
- virtual AbstractSearchProgress * CreateSearchProgressDialog( vcl::Window* pParent,
- const INetURLObject& rStartURL ) = 0;
- virtual AbstractTakeProgress * CreateTakeProgressDialog( vcl::Window* pParent ) = 0;
virtual AbstractTitleDialog * CreateTitleDialog( vcl::Window* pParent,
const OUString& rOldText ) = 0;
virtual AbstractGalleryIdDialog * CreateGalleryIdDialog( vcl::Window* pParent,
@@ -337,7 +309,6 @@ public:
const OUString& rURL, const OUString& rAltText, const OUString& rDescription,
const OUString& rTarget, const OUString& rName,
TargetList& rTargetList ) = 0;
- virtual AbstractSvxHlinkDlgMarkWnd* CreateSvxHlinkDlgMarkWndDialog( SvxHyperlinkTabPageBase* pParent, sal_uInt32 nResId ) =0;
virtual SfxAbstractTabDialog* CreateTabItemDialog(vcl::Window* pParent,
const SfxItemSet& rSet) = 0;
@@ -383,10 +354,6 @@ public:
virtual AbstractSvxObjectNameDialog* CreateSvxObjectNameDialog(vcl::Window* pParent, const OUString& rName ) = 0;
virtual AbstractSvxObjectTitleDescDialog* CreateSvxObjectTitleDescDialog(vcl::Window* pParent, const OUString& rTitle, const OUString& rDescription) = 0;
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list