summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--svx/inc/svx/svdcrtv.hxx1
-rw-r--r--svx/inc/svx/svdedxv.hxx12
-rw-r--r--svx/inc/svx/svdetc.hxx6
-rw-r--r--svx/inc/svx/svdxcgv.hxx9
-rw-r--r--svx/source/svdraw/svdcrtv.cxx4
-rw-r--r--svx/source/svdraw/svdedxv.cxx69
-rw-r--r--svx/source/svdraw/svdetc.cxx11
-rw-r--r--svx/source/svdraw/svdxcgv.cxx47
-rw-r--r--unusedcode.easy10
9 files changed, 0 insertions, 169 deletions
diff --git a/svx/inc/svx/svdcrtv.hxx b/svx/inc/svx/svdcrtv.hxx
index 3e2993bdfe76..b72b0bea259a 100644
--- a/svx/inc/svx/svdcrtv.hxx
+++ b/svx/inc/svx/svdcrtv.hxx
@@ -87,7 +87,6 @@ protected:
private:
SVX_DLLPRIVATE void ImpClearVars();
SVX_DLLPRIVATE void ImpMakeCreateAttr();
- SVX_DLLPRIVATE void ImpDelCreateAttr();
protected:
sal_Bool ImpBegCreateObj(sal_uInt32 nInvent, sal_uInt16 nIdent, const Point& rPnt, OutputDevice* pOut,
diff --git a/svx/inc/svx/svdedxv.hxx b/svx/inc/svx/svdedxv.hxx
index 742473fc1d8b..a383a3723b87 100644
--- a/svx/inc/svx/svdedxv.hxx
+++ b/svx/inc/svx/svdedxv.hxx
@@ -195,11 +195,6 @@ public:
virtual SdrEndTextEditKind SdrEndTextEdit(sal_Bool bDontDeleteReally = sal_False);
virtual bool IsTextEdit() const;
- // sal_True=Es wird ein Textrahmen (OBJ_TEXT,OBJ_OUTLINETEXT,...) editiert
- // ansonsten handelt es sich um ein beschriftetes Zeichenobjekt, an dem
- // der Text ja bekanntlich hor. und vert. zentriert wird.
- sal_Bool IsTextEditFrame() const;
-
// Diese Methode liefert sal_True, wenn der Punkt rHit innerhalb der
// des Objektbereichs oder der OutlinerView liegt.
sal_Bool IsTextEditHit(const Point& rHit, short nTol) const;
@@ -213,10 +208,6 @@ public:
// MouseButtonUp liefert diese Methode immer TRUE.
sal_Bool IsTextEditInSelectionMode() const;
- // Folgende Methode addiert einen passenden Offset zum MouseEvent
- // um diesen an den Outliner weiterzureichen.
- void AddTextEditOfs(MouseEvent& rMEvt) const;
-
// Wer das z.Zt. im TextEdit befindliche Objekt braucht:
SdrObject* GetTextEditObject() const { return mxTextEditObj.get(); }
@@ -240,9 +231,6 @@ public:
virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt, Window* pWin);
virtual sal_Bool MouseMove(const MouseEvent& rMEvt, Window* pWin);
virtual sal_Bool Command(const CommandEvent& rCEvt, Window* pWin);
- sal_Bool Cut(sal_uIntPtr nFormat=SDR_ANYFORMAT);
- sal_Bool Yank(sal_uIntPtr nFormat=SDR_ANYFORMAT);
- sal_Bool Paste(Window* pWin=NULL, sal_uIntPtr nFormat=SDR_ANYFORMAT);
// #97766# make virtual to change implementation e.g. for SdOutlineView
virtual sal_uInt16 GetScriptType() const;
diff --git a/svx/inc/svx/svdetc.hxx b/svx/inc/svx/svdetc.hxx
index da0d1407f121..9100b5bf9911 100644
--- a/svx/inc/svx/svdetc.hxx
+++ b/svx/inc/svx/svdetc.hxx
@@ -106,12 +106,6 @@ public:
// Default MapFraction ist 1/1.
static void SetMapFraction(const Fraction& rMap) { GetDefaults().aMapFraction=rMap; }
static Fraction GetMapFraction() { return GetDefaults().aMapFraction; }
- // Der Aufruf der folgenden Methode veranlasst die Engine
- // ihre sprachabhaengigen Resourcen neu zu initiallisieren.
- // Bereits bestehende Undotexte, etc. bleiben jedoch in der
- // sprache erhalten, in der sie erzeugt wurden.
- static void LanguageHasChanged();
-
// Einen Outliner mit den engineglobalen
// Defaulteinstellungen auf dem Heap erzeugen.
diff --git a/svx/inc/svx/svdxcgv.hxx b/svx/inc/svx/svdxcgv.hxx
index f76d5c9ef7c0..90074daf29b5 100644
--- a/svx/inc/svx/svdxcgv.hxx
+++ b/svx/inc/svx/svdxcgv.hxx
@@ -57,7 +57,6 @@ protected:
void ImpGetPasteObjList(Point& rPos, SdrObjList*& rpLst);
void ImpPasteObject(SdrObject* pObj, SdrObjList& rLst, const Point& rCenter, const Size& rSiz, const MapMode& rMap, sal_uInt32 nOptions);
sal_Bool ImpGetPasteLayer(const SdrObjList* pObjList, SdrLayerID& rLayer) const;
- Point GetPastePos(SdrObjList* pLst, OutputDevice* pOut=NULL);
// liefert True, wenn rPt geaendert wurde
sal_Bool ImpLimitToWorkArea(Point& rPt) const;
@@ -132,16 +131,8 @@ public:
// View angezeigt wird.
// Gueltige Werte fuer nOptions sind SDRINSERT_DONTMARK und
// SDRINSERT_ADDMARK (siehe svdedtv.hxx).
- sal_Bool Paste(const GDIMetaFile& rMtf, SdrObjList* pLst=NULL, OutputDevice* pOut=NULL, sal_uInt32 nOptions=0) { return Paste(rMtf,GetPastePos(pLst,pOut),pLst,nOptions); }
- sal_Bool Paste(const GDIMetaFile& rMtf, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0);
- sal_Bool Paste(const Bitmap& rBmp, SdrObjList* pLst=NULL, OutputDevice* pOut=NULL, sal_uInt32 nOptions=0) { return Paste(rBmp,GetPastePos(pLst,pOut),pLst,nOptions); }
- sal_Bool Paste(const Bitmap& rBmp, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0);
- sal_Bool Paste(const SdrModel& rMod, SdrObjList* pLst=NULL, OutputDevice* pOut=NULL, sal_uInt32 nOptions=0) { return Paste(rMod,GetPastePos(pLst,pOut),pLst,nOptions); }
virtual sal_Bool Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0);
- sal_Bool Paste(const String& rStr, SdrObjList* pLst=NULL, OutputDevice* pOut=NULL, sal_uInt32 nOptions=0) { return Paste(rStr,GetPastePos(pLst,pOut),pLst,nOptions); }
sal_Bool Paste(const String& rStr, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0);
- // der sal_uInt16 eFormat nimmt Werte des enum EETextFormat entgegen
- sal_Bool Paste(SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat, SdrObjList* pLst=NULL, OutputDevice* pOut=NULL, sal_uInt32 nOptions=0) { return Paste(rInput,rBaseURL,eFormat,GetPastePos(pLst,pOut),pLst,nOptions); }
sal_Bool Paste(SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0);
sal_Bool Cut( sal_uIntPtr nFormat = SDR_ANYFORMAT );
diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx
index 8849ca59958b..54e80fbfe262 100644
--- a/svx/source/svdraw/svdcrtv.cxx
+++ b/svx/source/svdraw/svdcrtv.cxx
@@ -246,10 +246,6 @@ SdrCreateView::~SdrCreateView()
SdrObject::Free( pAktCreate );
}
-void SdrCreateView::ImpDelCreateAttr()
-{
-}
-
sal_Bool SdrCreateView::IsAction() const
{
return SdrDragView::IsAction() || pAktCreate!=NULL;
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 18876c50a14d..d4464b6ccdbb 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -461,12 +461,6 @@ OutlinerView* SdrObjEditView::ImpMakeOutlinerView(Window* pWin, sal_Bool /*bNoPa
return pOutlView;
}
-sal_Bool SdrObjEditView::IsTextEditFrame() const
-{
- SdrTextObj* pText = dynamic_cast< SdrTextObj* >( mxTextEditObj.get() );
- return pText!=NULL && pText->IsTextFrame();
-}
-
IMPL_LINK(SdrObjEditView,ImpOutlinerStatusEventHdl,EditStatus*,pEditStat)
{
if(pTextEditOutliner )
@@ -1124,24 +1118,6 @@ sal_Bool SdrObjEditView::IsTextEditFrameHit(const Point& rHit) const
return bOk;
}
-void SdrObjEditView::AddTextEditOfs(MouseEvent& rMEvt) const
-{
- if(mxTextEditObj.is())
- {
- Point aPvOfs;
- SdrTextObj* pTextObj = dynamic_cast< SdrTextObj* >( mxTextEditObj.get() );
-
- if( pTextObj )
- {
- // #108784#
- aPvOfs += pTextObj->GetTextEditOffset();
- }
-
- Point aObjOfs(mxTextEditObj->GetLogicRect().TopLeft());
- (Point&)(rMEvt.GetPosPixel())+=aPvOfs+aObjOfs;
- }
-}
-
////////////////////////////////////////////////////////////////////////////////////////////////////
sal_Bool SdrObjEditView::KeyInput(const KeyEvent& rKEvt, Window* pWin)
@@ -1317,51 +1293,6 @@ sal_Bool SdrObjEditView::Command(const CommandEvent& rCEvt, Window* pWin)
return SdrGlueEditView::Command(rCEvt,pWin);
}
-sal_Bool SdrObjEditView::Cut(sal_uIntPtr nFormat)
-{
- if (pTextEditOutliner!=NULL) {
- pTextEditOutlinerView->Cut();
-#ifdef DBG_UTIL
- if (pItemBrowser!=NULL) pItemBrowser->SetDirty();
-#endif
- ImpMakeTextCursorAreaVisible();
- return sal_True;
- } else {
- return SdrGlueEditView::Cut(nFormat);
- }
-}
-
-sal_Bool SdrObjEditView::Yank(sal_uIntPtr nFormat)
-{
- if (pTextEditOutliner!=NULL) {
- pTextEditOutlinerView->Copy();
- return sal_True;
- } else {
- return SdrGlueEditView::Yank(nFormat);
- }
-}
-
-sal_Bool SdrObjEditView::Paste(Window* pWin, sal_uIntPtr nFormat)
-{
- if (pTextEditOutliner!=NULL) {
- if (pWin!=NULL) {
- OutlinerView* pNewView=ImpFindOutlinerView(pWin);
- if (pNewView!=NULL) {
- pNewView->Paste();
- }
- } else {
- pTextEditOutlinerView->Paste();
- }
-#ifdef DBG_UTIL
- if (pItemBrowser!=NULL) pItemBrowser->SetDirty();
-#endif
- ImpMakeTextCursorAreaVisible();
- return sal_True;
- } else {
- return SdrGlueEditView::Paste(pWin,nFormat);
- }
-}
-
////////////////////////////////////////////////////////////////////////////////////////////////////
sal_Bool SdrObjEditView::ImpIsTextEditAllSelected() const
diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx
index 453800ffac0d..d1fc85affb5a 100644
--- a/svx/source/svdraw/svdetc.cxx
+++ b/svx/source/svdraw/svdetc.cxx
@@ -487,17 +487,6 @@ SdrEngineDefaults& SdrEngineDefaults::GetDefaults()
////////////////////////////////////////////////////////////////////////////////////////////////////
-void SdrEngineDefaults::LanguageHasChanged()
-{
- SdrGlobalData& rGlobalData=GetSdrGlobalData();
- if (rGlobalData.pResMgr!=NULL) {
- delete rGlobalData.pResMgr;
- rGlobalData.pResMgr=NULL;
- }
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
SdrOutliner* SdrMakeOutliner( sal_uInt16 nOutlinerMode, SdrModel* pModel )
{
//SdrEngineDefaults& rDefaults = SdrEngineDefaults::GetDefaults();
diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx
index 13ea61e2217d..89b48c61ede0 100644
--- a/svx/source/svdraw/svdxcgv.cxx
+++ b/svx/source/svdraw/svdxcgv.cxx
@@ -92,19 +92,6 @@ Point SdrExchangeView::GetViewCenter(const OutputDevice* pOut) const
return aCenter;
}
-Point SdrExchangeView::GetPastePos(SdrObjList* pLst, OutputDevice* pOut)
-{
- Point aP(GetViewCenter(pOut));
- SdrPage* pPg=NULL;
- if (pLst!=NULL) pPg=pLst->GetPage();
- if (pPg!=NULL) {
- Size aSiz(pPg->GetSize());
- aP.X()=aSiz.Width()/2;
- aP.Y()=aSiz.Height()/2;
- }
- return aP;
-}
-
sal_Bool SdrExchangeView::ImpLimitToWorkArea(Point& rPt) const
{
sal_Bool bRet(sal_False);
@@ -168,40 +155,6 @@ sal_Bool SdrExchangeView::ImpGetPasteLayer(const SdrObjList* pObjList, SdrLayerI
return bRet;
}
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-sal_Bool SdrExchangeView::Paste(const GDIMetaFile& rMtf, const Point& rPos, SdrObjList* pLst, sal_uInt32 nOptions)
-{
- Point aPos(rPos);
- ImpGetPasteObjList(aPos,pLst);
- ImpLimitToWorkArea( aPos );
- if (pLst==NULL) return sal_False;
- SdrLayerID nLayer;
- if (!ImpGetPasteLayer(pLst,nLayer)) return sal_False;
- sal_Bool bUnmark=(nOptions&(SDRINSERT_DONTMARK|SDRINSERT_ADDMARK))==0 && !IsTextEdit();
- if (bUnmark) UnmarkAllObj();
- SdrGrafObj* pObj=new SdrGrafObj(Graphic(rMtf));
- pObj->SetLayer(nLayer);
- ImpPasteObject(pObj,*pLst,aPos,rMtf.GetPrefSize(),rMtf.GetPrefMapMode(),nOptions);
- return sal_True;
-}
-
-sal_Bool SdrExchangeView::Paste(const Bitmap& rBmp, const Point& rPos, SdrObjList* pLst, sal_uInt32 nOptions)
-{
- Point aPos(rPos);
- ImpGetPasteObjList(aPos,pLst);
- ImpLimitToWorkArea( aPos );
- if (pLst==NULL) return sal_False;
- SdrLayerID nLayer;
- if (!ImpGetPasteLayer(pLst,nLayer)) return sal_False;
- sal_Bool bUnmark=(nOptions&(SDRINSERT_DONTMARK|SDRINSERT_ADDMARK))==0 && !IsTextEdit();
- if (bUnmark) UnmarkAllObj();
- SdrGrafObj* pObj=new SdrGrafObj(Graphic(rBmp));
- pObj->SetLayer(nLayer);
- ImpPasteObject(pObj,*pLst,aPos,rBmp.GetSizePixel(),MapMode(MAP_PIXEL),nOptions);
- return sal_True;
-}
-
sal_Bool SdrExchangeView::Paste(const XubString& rStr, const Point& rPos, SdrObjList* pLst, sal_uInt32 nOptions)
{
if(!rStr.Len())
diff --git a/unusedcode.easy b/unusedcode.easy
index 319cb240807f..13cbb9d13217 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -571,16 +571,11 @@ ScrollableWindow::ScrollableWindow(Window*, ResId const&, unsigned short)
ScrollableWindow::SetLineSize(unsigned long, unsigned long)
ScrollableWindow::SetVisibleSize(Size const&)
SdFilterDetect::impl_createFactory(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&)
-SdrCreateView::ImpDelCreateAttr()
SdrCustomShapeDataItem::SdrCustomShapeDataItem(String const&)
SdrCustomShapeEngineItem::SdrCustomShapeEngineItem(String const&)
SdrCustomShapeGeometryItem::ClearPropertyValue(rtl::OUString const&, rtl::OUString const&)
SdrCustomShapeReplacementURLItem::SdrCustomShapeReplacementURLItem(String const&)
SdrEditView::MoveLayer(String const&, unsigned short)
-SdrEngineDefaults::LanguageHasChanged()
-SdrExchangeView::GetPastePos(SdrObjList*, OutputDevice*)
-SdrExchangeView::Paste(Bitmap const&, Point const&, SdrObjList*, unsigned int)
-SdrExchangeView::Paste(GDIMetaFile const&, Point const&, SdrObjList*, unsigned int)
SdrGlobalData::GetCharClass()
SdrGlobalData::~SdrGlobalData()
SdrGluePoint::Draw(OutputDevice&, SdrObject const*) const
@@ -608,11 +603,6 @@ SdrModel::CheckConsistence() const
SdrModel::GetNumberFormatter() const
SdrModel::HasTransparentObjects(bool) const
SdrModel::IsAllowShapePropertyChangeListener() const
-SdrObjEditView::AddTextEditOfs(MouseEvent&) const
-SdrObjEditView::Cut(unsigned long)
-SdrObjEditView::IsTextEditFrame() const
-SdrObjEditView::Paste(Window*, unsigned long)
-SdrObjEditView::Yank(unsigned long)
SdrObjFactory::MakeNewObjUserData(unsigned int, unsigned short, SdrObject*)
SdrObject::ClearObjectItem(unsigned short)
SdrObject::FreeGlobalDrawObjectItemPool()
generated by cgit (git 2.34.1) at 2025-03-09 21:39:35 +0000