diff options
author | Caolán McNamara <caolanm@redhat.com> | 2011-11-21 09:00:05 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-11-21 09:17:11 +0000 |
commit | 4d1c57a00ed20f49685504ac5289bc2c325060fc (patch) | |
tree | 86c2e3f32327030bcda206555960779c20551570 /svx | |
parent | e4d90aef949abf172c45e15241159371504d6090 (diff) |
callcatcher: update list
Diffstat (limited to 'svx')
-rw-r--r-- | svx/inc/svx/svdlayer.hxx | 1 | ||||
-rw-r--r-- | svx/inc/svx/svdmrkv.hxx | 14 | ||||
-rw-r--r-- | svx/inc/svx/svdobj.hxx | 1 | ||||
-rw-r--r-- | svx/inc/svx/svdpage.hxx | 2 | ||||
-rw-r--r-- | svx/inc/svx/svdpagv.hxx | 7 | ||||
-rw-r--r-- | svx/source/svdraw/svdlayer.cxx | 11 | ||||
-rw-r--r-- | svx/source/svdraw/svdmrkv1.cxx | 24 | ||||
-rw-r--r-- | svx/source/svdraw/svdobj.cxx | 11 | ||||
-rw-r--r-- | svx/source/svdraw/svdpage.cxx | 11 | ||||
-rw-r--r-- | svx/source/svdraw/svdpagv.cxx | 28 | ||||
-rw-r--r-- | svx/source/svdraw/svdview.cxx | 2 |
11 files changed, 1 insertions, 111 deletions
diff --git a/svx/inc/svx/svdlayer.hxx b/svx/inc/svx/svdlayer.hxx index 0fb10c690ddf..a98154fbb8e8 100644 --- a/svx/inc/svx/svdlayer.hxx +++ b/svx/inc/svx/svdlayer.hxx @@ -113,7 +113,6 @@ public: // Neuer Layer wird angelegt und eingefuegt SdrLayer* NewLayer(const String& rName, sal_uInt16 nPos=0xFFFF); void DeleteLayer(SdrLayer* pLayer) { aLayer.Remove(pLayer); delete pLayer; Broadcast(); } - SdrLayer* MoveLayer(sal_uInt16 nPos, sal_uInt16 nNewPos); // Neuer Layer, Name wird aus der Resource geholt SdrLayer* NewStandardLayer(sal_uInt16 nPos=0xFFFF); diff --git a/svx/inc/svx/svdmrkv.hxx b/svx/inc/svx/svdmrkv.hxx index d292e3caa9ef..b5442a3eb4bb 100644 --- a/svx/inc/svx/svdmrkv.hxx +++ b/svx/inc/svx/svdmrkv.hxx @@ -359,13 +359,6 @@ public: sal_Bool UnmarkAllPoints() { return MarkPoints(NULL,sal_True); } sal_Bool UnMarkAllPoints() { return MarkPoints(NULL,sal_True); } - // Sucht sich den ersten markierten Punkt (P1) und sucht von dort - // aus in den ersten nichtmarkierte Punkt (P2). - // Bei Erfolg wird die Markierung von P1 entfernt, an P2 gesetzt und TRUE - // returniert. Mit dem Parameter bPrev=sal_True geht die Suche genau in die - // andere Richtung. - sal_Bool MarkNextPoint(sal_Bool bPrev=sal_False); - // Sucht sich den ersten markierten Punkt (P1) das von rPnt // getroffen wird und sucht von dort aus den // ersten nichtmarkierten Punkt (P2). Bei Erfolg wird die Markierung von @@ -428,13 +421,6 @@ public: sal_Bool MarkAllGluePoints() { return MarkGluePoints(NULL,sal_False); } sal_Bool UnmarkAllGluePoints() { return MarkGluePoints(NULL,sal_True); } - // Sucht sich den ersten markierten Klebepunkt (P1) und sucht von dort - // aus in den ersten nichtmarkierte Klebepunkt (P2). - // Bei Erfolg wird die Markierung von P1 entfernt, an P2 gesetzt und TRUE - // returniert. Mit dem Parameter bPrev=sal_True geht die Suche genau in die - // andere Richtung. - sal_Bool MarkNextGluePoint(sal_Bool bPrev=sal_False); - // Sucht sich den ersten markierten Klebepunkt (P1) das von rPnt // getroffen wird und sucht von dort aus den // ersten nichtmarkierten Klebepunkt (P2). Bei Erfolg wird die Markierung diff --git a/svx/inc/svx/svdobj.hxx b/svx/inc/svx/svdobj.hxx index 57c85699c753..eeef220c33ee 100644 --- a/svx/inc/svx/svdobj.hxx +++ b/svx/inc/svx/svdobj.hxx @@ -1167,7 +1167,6 @@ public: private: SVX_DLLPRIVATE SdrObjFactory(sal_uInt32 nInvent, sal_uInt16 nIdent, SdrPage* pNewPage, SdrModel* pNewModel); - SVX_DLLPRIVATE SdrObjFactory(sal_uInt32 nInvent, sal_uInt16 nIdent, SdrObject* pObj1); public: static SdrObject* MakeNewObject(sal_uInt32 nInvent, sal_uInt16 nIdent, SdrPage* pPage, SdrModel* pModel=NULL); diff --git a/svx/inc/svx/svdpage.hxx b/svx/inc/svx/svdpage.hxx index d7af3bcf4432..3833a6787908 100644 --- a/svx/inc/svx/svdpage.hxx +++ b/svx/inc/svx/svdpage.hxx @@ -549,8 +549,6 @@ public: virtual SfxStyleSheet* GetTextStyleSheetForObject( SdrObject* pObj ) const; - bool HasTransparentObjects( bool bCheckForAlphaChannel = false ) const; - /** *deprecated* returns an averaged background color of this page */ // #i75566# GetBackgroundColor -> GetPageBackgroundColor Color GetPageBackgroundColor() const; diff --git a/svx/inc/svx/svdpagv.hxx b/svx/inc/svx/svdpagv.hxx index 2e8145264532..8a825a0702b9 100644 --- a/svx/inc/svx/svdpagv.hxx +++ b/svx/inc/svx/svdpagv.hxx @@ -133,7 +133,6 @@ protected: protected: void SetLayer(const String& rName, SetOfByte& rBS, sal_Bool bJa); sal_Bool IsLayer(const String& rName, const SetOfByte& rBS) const; - void SetAllLayers(SetOfByte& rB, sal_Bool bJa); virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint); @@ -181,9 +180,6 @@ public: // PrePaint call forwarded from app windows void PrePaint(); - // PostPaint call forwarded from app windows - void PostPaint(); - // rReg bezieht sich auf's OutDev, nicht auf die Page void CompleteRedraw(SdrPaintWindow& rPaintWindow, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0L) const; @@ -215,15 +211,12 @@ public: void SetLayerVisible(const String& rName, sal_Bool bShow = sal_True) { SetLayer(rName, aLayerVisi, bShow); if(!bShow) AdjHdl(); InvalidateAllWin(); } sal_Bool IsLayerVisible(const String& rName) const { return IsLayer(rName, aLayerVisi); } - void SetAllLayersVisible(sal_Bool bShow = sal_True) { SetAllLayers(aLayerVisi, bShow); if(!bShow) AdjHdl(); InvalidateAllWin(); } void SetLayerLocked(const String& rName, sal_Bool bLock = sal_True) { SetLayer(rName, aLayerLock, bLock); if(bLock) AdjHdl(); } sal_Bool IsLayerLocked(const String& rName) const { return IsLayer(rName,aLayerLock); } - void SetAllLayersLocked(sal_Bool bLock = sal_True) { SetAllLayers(aLayerLock, bLock); if(bLock) AdjHdl(); } void SetLayerPrintable(const String& rName, sal_Bool bPrn = sal_True) { SetLayer(rName, aLayerPrn, bPrn); } sal_Bool IsLayerPrintable(const String& rName) const { return IsLayer(rName, aLayerPrn); } - void SetAllLayersPrintable(sal_Bool bPrn = sal_True) { SetAllLayers(aLayerPrn, bPrn); } // PV stellt eine RefPage oder eine SubList eines RefObj dar oder Model ist ReadOnly sal_Bool IsReadOnly() const; diff --git a/svx/source/svdraw/svdlayer.cxx b/svx/source/svdraw/svdlayer.cxx index e8cc9bff9223..f538280d329e 100644 --- a/svx/source/svdraw/svdlayer.cxx +++ b/svx/source/svdraw/svdlayer.cxx @@ -349,17 +349,6 @@ SdrLayer* SdrLayerAdmin::NewStandardLayer(sal_uInt16 nPos) return pLay; } -SdrLayer* SdrLayerAdmin::MoveLayer(sal_uInt16 nPos, sal_uInt16 nNewPos) -{ - SdrLayer* pLayer=(SdrLayer*)(aLayer.Remove(nPos)); - if (pLayer!=NULL) { - aLayer.Insert(pLayer,nNewPos); - } - - Broadcast(); - return pLayer; -} - sal_uInt16 SdrLayerAdmin::GetLayerPos(SdrLayer* pLayer) const { sal_uIntPtr nRet=SDRLAYER_NOTFOUND; diff --git a/svx/source/svdraw/svdmrkv1.cxx b/svx/source/svdraw/svdmrkv1.cxx index f650754fcd51..3522ef196342 100644 --- a/svx/source/svdraw/svdmrkv1.cxx +++ b/svx/source/svdraw/svdmrkv1.cxx @@ -291,18 +291,6 @@ sal_Bool SdrMarkView::MarkPoints(const Rectangle* pRect, sal_Bool bUnmark) return bChgd; } -sal_Bool SdrMarkView::MarkNextPoint(sal_Bool /*bPrev*/) -{ - ForceUndirtyMrkPnt(); - sal_Bool bChgd=sal_False; - SortMarkedObjects(); - // ... - if (bChgd) { - MarkListHasChanged(); - } - return bChgd; -} - sal_Bool SdrMarkView::MarkNextPoint(const Point& /*rPnt*/, sal_Bool /*bPrev*/) { ForceUndirtyMrkPnt(); @@ -644,18 +632,6 @@ SdrHdl* SdrMarkView::GetGluePointHdl(const SdrObject* pObj, sal_uInt16 nId) cons return NULL; } -sal_Bool SdrMarkView::MarkNextGluePoint(sal_Bool /*bPrev*/) -{ - ForceUndirtyMrkPnt(); - sal_Bool bChgd=sal_False; - SortMarkedObjects(); - // ... - if (bChgd) { - MarkListHasChanged(); - } - return bChgd; -} - sal_Bool SdrMarkView::MarkNextGluePoint(const Point& /*rPnt*/, sal_Bool /*bPrev*/) { ForceUndirtyMrkPnt(); diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index 132690dc6972..be6700955f09 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -3034,17 +3034,6 @@ SdrObjFactory::SdrObjFactory(sal_uInt32 nInvent, sal_uInt16 nIdent, SdrPage* pNe pNewData=NULL; } -SdrObjFactory::SdrObjFactory(sal_uInt32 nInvent, sal_uInt16 nIdent, SdrObject* pObj1) -{ - nInventor=nInvent; - nIdentifier=nIdent; - pNewObj=NULL; - pPage=NULL; - pModel=NULL; - pObj=pObj1; - pNewData=NULL; -} - SdrObject* SdrObjFactory::MakeNewObject(sal_uInt32 nInvent, sal_uInt16 nIdent, SdrPage* pPage, SdrModel* pModel) { if(pModel == NULL && pPage != NULL) diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx index de1086050a41..58d110ec3170 100644 --- a/svx/source/svdraw/svdpage.cxx +++ b/svx/source/svdraw/svdpage.cxx @@ -1815,17 +1815,6 @@ SfxStyleSheet* SdrPage::GetTextStyleSheetForObject( SdrObject* pObj ) const return pObj->GetStyleSheet(); } -bool SdrPage::HasTransparentObjects( bool bCheckForAlphaChannel ) const -{ - bool bRet = false; - - for( sal_uIntPtr n = 0, nCount = GetObjCount(); ( n < nCount ) && !bRet; n++ ) - if( GetObj( n )->IsTransparent( bCheckForAlphaChannel ) ) - bRet = true; - - return bRet; -} - /** returns an averaged background color of this page */ // #i75566# GetBackgroundColor -> GetPageBackgroundColor and bScreenDisplay hint value Color SdrPage::GetPageBackgroundColor( SdrPageView* pView, bool bScreenDisplay ) const diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx index f689bc0a27ab..474c77e6e219 100644 --- a/svx/source/svdraw/svdpagv.cxx +++ b/svx/source/svdraw/svdpagv.cxx @@ -327,21 +327,6 @@ void SdrPageView::PrePaint() } } -void SdrPageView::PostPaint() -{ - const sal_uInt32 nCount(PageWindowCount()); - - for(sal_uInt32 a(0); a < nCount; a++) - { - SdrPageWindow* pCandidate = GetPageWindow(a); - - if(pCandidate) - { - pCandidate->PostPaint(); - } - } -} - void SdrPageView::CompleteRedraw(SdrPaintWindow& rPaintWindow, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector) const { if(GetPage()) @@ -697,19 +682,6 @@ sal_Bool SdrPageView::IsLayer(const XubString& rName, const SetOfByte& rBS) cons return bRet; } -void SdrPageView::SetAllLayers(SetOfByte& rB, sal_Bool bJa) -{ - if(bJa) - { - rB.SetAll(); - rB.Clear(SDRLAYER_NOTFOUND); - } - else - { - rB.ClearAll(); - } -} - sal_Bool SdrPageView::IsObjMarkable(SdrObject* pObj) const { if(pObj) diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx index a915777a2195..541590420cda 100644 --- a/svx/source/svdraw/svdview.cxx +++ b/svx/source/svdraw/svdview.cxx @@ -965,7 +965,7 @@ Pointer SdrView::GetPreferedPointer(const Point& rMousePos, const OutputDevice* return mpCurrentSdrDragMethod->GetSdrDragPointer(); } - if (IsMarkObj() || IsMarkPoints() || IsMarkGluePoints() || IsEncirclement() || IsSetPageOrg()) return Pointer(POINTER_ARROW); + if (IsMarkObj() || IsMarkPoints() || IsMarkGluePoints() || IsSetPageOrg()) return Pointer(POINTER_ARROW); if (IsDragHelpLine()) return GetDraggedHelpLinePointer(); if (IsMacroObj()) { SdrObjMacroHitRec aHitRec; |