[Libreoffice-commits] .: 2 commits - editeng/inc editeng/source svx/inc svx/source tools/inc unusedcode.easy vcl/inc vcl/source
Caolán McNamara
caolan at kemper.freedesktop.org
Mon Nov 21 01:17:38 PST 2011
editeng/inc/editeng/outliner.hxx | 1 -
editeng/source/editeng/editobj.cxx | 1 -
editeng/source/outliner/outlin2.cxx | 7 -------
svx/inc/svx/svdlayer.hxx | 1 -
svx/inc/svx/svdmrkv.hxx | 14 --------------
svx/inc/svx/svdobj.hxx | 1 -
svx/inc/svx/svdpage.hxx | 2 --
svx/inc/svx/svdpagv.hxx | 7 -------
svx/source/svdraw/svdlayer.cxx | 11 -----------
svx/source/svdraw/svdmrkv1.cxx | 24 ------------------------
svx/source/svdraw/svdobj.cxx | 11 -----------
svx/source/svdraw/svdpage.cxx | 11 -----------
svx/source/svdraw/svdpagv.cxx | 28 ----------------------------
svx/source/svdraw/svdview.cxx | 2 +-
tools/inc/tools/stream.hxx | 6 ------
unusedcode.easy | 5 ++++-
vcl/inc/impgraph.hxx | 4 ----
vcl/source/gdi/impgraph.cxx | 11 -----------
18 files changed, 5 insertions(+), 142 deletions(-)
New commits:
commit 4d1c57a00ed20f49685504ac5289bc2c325060fc
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Nov 21 09:00:05 2011 +0000
callcatcher: update list
diff --git a/editeng/inc/editeng/outliner.hxx b/editeng/inc/editeng/outliner.hxx
index 89ee624..d2759a4 100644
--- a/editeng/inc/editeng/outliner.hxx
+++ b/editeng/inc/editeng/outliner.hxx
@@ -967,7 +967,6 @@ public:
void SetGlobalCharStretching( sal_uInt16 nX = 100, sal_uInt16 nY = 100 );
void GetGlobalCharStretching( sal_uInt16& rX, sal_uInt16& rY );
- void DoStretchChars( sal_uInt16 nX, sal_uInt16 nY );
void EraseVirtualDevice();
sal_Bool ShouldCreateBigTextObject() const;
diff --git a/editeng/source/outliner/outlin2.cxx b/editeng/source/outliner/outlin2.cxx
index 2898eec..f91a035 100644
--- a/editeng/source/outliner/outlin2.cxx
+++ b/editeng/source/outliner/outlin2.cxx
@@ -608,13 +608,6 @@ void Outliner::GetGlobalCharStretching( sal_uInt16& rX, sal_uInt16& rY )
pEditEngine->GetGlobalCharStretching( rX, rY );
}
-
-void Outliner::DoStretchChars( sal_uInt16 nX, sal_uInt16 nY )
-{
- DBG_CHKTHIS(Outliner,0);
- pEditEngine->DoStretchChars( nX, nY );
-}
-
void Outliner::EraseVirtualDevice()
{
DBG_CHKTHIS(Outliner,0);
diff --git a/svx/inc/svx/svdlayer.hxx b/svx/inc/svx/svdlayer.hxx
index 0fb10c6..a98154f 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 d292e3c..b5442a3 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 57c8569..eeef220 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 d7af3bc..3833a67 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 2e81452..8a825a0 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 e8cc9bf..f538280 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 f650754..3522ef1 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 132690d..be67009 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 de10860..58d110e 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 f689bc0..474c77e 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 a915777..5415904 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;
diff --git a/unusedcode.easy b/unusedcode.easy
index 40bb39a..04bb153 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -169,6 +169,7 @@ ImpSvtData::~ImpSvtData()
ImplBorderWindow::ImplBorderWindow(Window*, long, unsigned short, com::sun::star::uno::Any const&)
ImplBorderWindow::SetHelpButton(unsigned char)
ImplDevFontList::ImplFindByLocale(com::sun::star::lang::Locale&) const
+ImplEncirclementOverlay::ImplEncirclementOverlay(SdrPaintView const&, basegfx::B2DPoint const&)
ImplEntryList::IsEntrySelected(String const&) const
ImplImageList::GetImageCount() const
ImplListBox::GetEntryFlags(unsigned short) const
@@ -305,7 +306,6 @@ SVGExport::pushClip(basegfx::B2DPolyPolygon const&)
SalColormap::SalColormap(BitmapPalette const&)
SalColormap::SetPalette(BitmapPalette const&)
SalDisplay::IsLocal()
-SalGraphics::AddDevFontSubstitute(OutputDevice*, String const&, String const&, unsigned short)
SalGraphics::DrawBitmap(SalTwoRect const*, SalBitmap const&, unsigned int, OutputDevice const*)
SalGraphics::drawAlphaBitmap(SalTwoRect const&, SalBitmap const&, SalBitmap const&)
SalGraphics::drawPolyLine(basegfx::B2DPolygon const&, double, basegfx::B2DVector const&, basegfx::B2DLineJoin)
@@ -460,6 +460,8 @@ ScVbaShapes::AddShape(rtl::OUString const&, rtl::OUString const&, int, int, int,
ScVbaWindows::ScVbaWindows(com::sun::star::uno::Reference<ooo::vba::XHelperInterface> const&, com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&, com::sun::star::uno::Reference<com::sun::star::container::XIndexAccess> const&)
ScVbaWorksheet::ScVbaWorksheet(com::sun::star::uno::Reference<ooo::vba::XHelperInterface> const&, com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&)
ScXMLExportDDELinks::CellsEqual(bool, bool, String const&, double const&, bool, bool, String const&, double const&) const
+ScXMLFilterContext::SetCaseSensitive(bool)
+ScXMLFilterContext::SetUseRegularExpressions(bool)
ScaList::Insert(void*, unsigned int)
SchXMLExport::SetProgress(int)
SchXMLExportHelper_Impl::getCellAddress(int, int)
@@ -2179,6 +2181,7 @@ sdr::Comment::SetText(rtl::OUString const&)
sdr::Comment::SetUserName(rtl::OUString const&)
sdr::animation::Scheduler::Reset(unsigned int)
sdr::contact::ViewContactOfPageObj::GetReferencedPage() const
+sdr::contact::ViewContactOfSdrMediaObj::hasPreferredSize() const
sdr::contact::ViewObjectContactOfUnoControl::isControlVisible() const
sdr::overlay::OverlayBitmapEx::setBitmapEx(BitmapEx const&)
sdr::overlay::OverlayBitmapEx::setCenterXY(unsigned short, unsigned short)
diff --git a/vcl/inc/impgraph.hxx b/vcl/inc/impgraph.hxx
index e7eb642..9b029f5 100644
--- a/vcl/inc/impgraph.hxx
+++ b/vcl/inc/impgraph.hxx
@@ -128,10 +128,6 @@ private:
void ImplStartAnimation( OutputDevice* pOutDev,
const Point& rDestPt,
- long nExtraData = 0,
- OutputDevice* pFirstFrameOutDev = NULL );
- void ImplStartAnimation( OutputDevice* pOutDev,
- const Point& rDestPt,
const Size& rDestSize,
long nExtraData = 0,
OutputDevice* pFirstFrameOutDev = NULL );
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index 71563d2..f5bf32c 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -851,17 +851,6 @@ void ImpGraphic::ImplDraw( OutputDevice* pOutDev,
// ------------------------------------------------------------------------
-void ImpGraphic::ImplStartAnimation( OutputDevice* pOutDev,
- const Point& rDestPt,
- long nExtraData,
- OutputDevice* pFirstFrameOutDev )
-{
- if( ImplIsSupportedGraphic() && !ImplIsSwapOut() && mpAnimation )
- mpAnimation->Start( pOutDev, rDestPt, nExtraData, pFirstFrameOutDev );
-}
-
-// ------------------------------------------------------------------------
-
void ImpGraphic::ImplStartAnimation( OutputDevice* pOutDev, const Point& rDestPt,
const Size& rDestSize, long nExtraData,
OutputDevice* pFirstFrameOutDev )
commit e4d90aef949abf172c45e15241159371504d6090
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Nov 20 23:05:48 2011 +0000
ditch last ENABLE_STRING_STREAM_OPERATORS
diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx
index bc2a02e..6b4c4c5 100644
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -34,7 +34,6 @@
#include <vcl/msgbox.hxx>
#include <vcl/svapp.hxx>
-#define ENABLE_STRING_STREAM_OPERATORS
#include <tools/stream.hxx>
#include <editobj2.hxx>
diff --git a/tools/inc/tools/stream.hxx b/tools/inc/tools/stream.hxx
index c320bc2..0ad9585 100644
--- a/tools/inc/tools/stream.hxx
+++ b/tools/inc/tools/stream.hxx
@@ -346,9 +346,6 @@ public:
SvStream& operator>>( unsigned char& rChar );
SvStream& operator>>( float& rFloat );
SvStream& operator>>( double& rDouble );
-#ifdef ENABLE_STRING_STREAM_OPERATORS
- SvStream& operator>>( UniString& rString ) { return ReadByteString(rString); }
-#endif
SvStream& operator>>( SvStream& rStream );
SvStream& operator<<( sal_uInt16 nUInt16 );
@@ -364,9 +361,6 @@ public:
SvStream& operator<<( const double& rDouble );
SvStream& operator<<( const char* pBuf );
SvStream& operator<<( const unsigned char* pBuf );
-#ifdef ENABLE_STRING_STREAM_OPERATORS
- SvStream& operator<<( const UniString& rString ) { return WriteByteString(rString); }
-#endif
SvStream& operator<<( SvStream& rStream );
SvStream& ReadByteString( UniString& rStr, rtl_TextEncoding eSrcCharSet );
More information about the Libreoffice-commits
mailing list