summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2011-08-03 01:51:28 +0200
committerThomas Arnhold <thomas@arnhold.org>2011-08-03 01:51:28 +0200
commit5fd54f2f3de2fec39b372e2f8ece0ee73f080c8f (patch)
tree580aaed1b4aab01dd2598c6f46c6d629f2de454e /svx
parent228d801ab1d5e1dd86b814703b2e25baf69ad07c (diff)
callcatcher: remove unused methods
Diffstat (limited to 'svx')
-rw-r--r--svx/inc/svx/svdetc.hxx28
-rw-r--r--svx/source/svdraw/svdetc.cxx133
2 files changed, 0 insertions, 161 deletions
diff --git a/svx/inc/svx/svdetc.hxx b/svx/inc/svx/svdetc.hxx
index f7142e29e24f..da0d1407f121 100644
--- a/svx/inc/svx/svdetc.hxx
+++ b/svx/inc/svx/svdetc.hxx
@@ -163,32 +163,6 @@ virtual
////////////////////////////////////////////////////////////////////////////////////////////////////
-#define SDRHDC_SAVEPEN 1 /* Save Linecolor */
-#define SDRHDC_SAVEBRUSH 2 /* Save Fillcolorn */
-#define SDRHDC_SAVEFONT 4 /* Save Font */
-#define SDRHDC_SAVEPENANDBRUSH 3 /* Save Line- and FillColor */
-#define SDRHDC_SAVEPENANDBRUSHANDFONT 7 /* Save Font, Line- and fillcolor */
-#define SDRHDC_SAVECLIPPING 8 /* Save Clipping */
-#define SDRHDC_SAVEALL 15 /* Save Clipping, Font, fill- and linecolor */
-
-class ImpClipMerk;
-class ImpColorMerk;
-class ImpSdrHdcMerk
-{
- ImpColorMerk* pFarbMerk;
- ImpClipMerk* pClipMerk;
- Color* pLineColorMerk;
- sal_uInt16 nMode;
-public:
- ImpSdrHdcMerk(const OutputDevice& rOut, sal_uInt16 nNewMode=SDRHDC_SAVEALL, bool bAutoMerk = true);
- ~ImpSdrHdcMerk();
- void Save(const OutputDevice& rOut);
- bool IsSaved() const { return pFarbMerk!=NULL || pClipMerk!=NULL || pLineColorMerk!=NULL; }
- void Restore(OutputDevice& rOut, sal_uInt16 nMask=SDRHDC_SAVEALL) const;
-};
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
// Ein ItemSet auf Outliner- bzw. EditEngine-Items durchsuchen
// Liefert sal_True, wenn der Set solchen Items enthaelt.
sal_Bool SearchOutlinerItems(const SfxItemSet& rSet, sal_Bool bInklDefaults, sal_Bool* pbOnlyEE=NULL);
@@ -199,8 +173,6 @@ sal_uInt16* RemoveWhichRange(const sal_uInt16* pOldWhichTable, sal_uInt16 nRange
////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
class Link;
// Hilfsklasse zur kommunikation zwischen dem Dialog
diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx
index d34a5df97c42..453800ffac0d 100644
--- a/svx/source/svdraw/svdetc.cxx
+++ b/svx/source/svdraw/svdetc.cxx
@@ -320,139 +320,6 @@ void UShortCont::Sort()
////////////////////////////////////////////////////////////////////////////////////////////////////
-class ImpClipMerk {
- Region aClip;
- bool bClip;
-public:
- ImpClipMerk(const OutputDevice& rOut): aClip(rOut.GetClipRegion()),bClip(rOut.IsClipRegion()) {}
- void Restore(OutputDevice& rOut)
- {
- // Kein Clipping in die Metafileaufzeichnung
- GDIMetaFile* pMtf=rOut.GetConnectMetaFile();
- if (pMtf!=NULL && (!pMtf->IsRecord() || pMtf->IsPause())) pMtf=NULL;
- if (pMtf!=NULL) pMtf->Pause(sal_True);
- if (bClip) rOut.SetClipRegion(aClip);
- else rOut.SetClipRegion();
- if (pMtf!=NULL) pMtf->Pause(sal_False);
- }
-};
-
-class ImpColorMerk {
- Color aLineColor;
- Color aFillColor;
- Color aBckgrdColor;
- Font aFont;
-public:
- ImpColorMerk(const OutputDevice& rOut):
- aLineColor( rOut.GetLineColor() ),
- aFillColor( rOut.GetFillColor() ),
- aBckgrdColor( rOut.GetBackground().GetColor() ),
- aFont (rOut.GetFont()) {}
-
- ImpColorMerk(const OutputDevice& rOut, sal_uInt16 nMode)
- {
- if ( (nMode & SDRHDC_SAVEPEN) == SDRHDC_SAVEPEN )
- aLineColor = rOut.GetLineColor();
-
- if ( (nMode & SDRHDC_SAVEBRUSH) == SDRHDC_SAVEBRUSH)
- {
- aFillColor = rOut.GetFillColor();
- aBckgrdColor = rOut.GetBackground().GetColor();
- }
-
- if ( (nMode & SDRHDC_SAVEFONT) == SDRHDC_SAVEFONT)
- aFont=rOut.GetFont();
- }
-
- void Restore(OutputDevice& rOut, sal_uInt16 nMode=SDRHDC_SAVEPENANDBRUSHANDFONT)
- {
- if ( (nMode & SDRHDC_SAVEPEN) == SDRHDC_SAVEPEN)
- rOut.SetLineColor( aLineColor );
-
- if ( (nMode & SDRHDC_SAVEBRUSH) == SDRHDC_SAVEBRUSH)
- {
- rOut.SetFillColor( aFillColor );
- rOut.SetBackground( Wallpaper( aBckgrdColor ) );
- }
- if ((nMode & SDRHDC_SAVEFONT) ==SDRHDC_SAVEFONT)
- {
- if (!rOut.GetFont().IsSameInstance(aFont))
- {
- rOut.SetFont(aFont);
- }
- }
- }
-
- const Color& GetLineColor() const { return aLineColor; }
-};
-
-ImpSdrHdcMerk::ImpSdrHdcMerk(const OutputDevice& rOut, sal_uInt16 nNewMode, bool bAutoMerk):
- pFarbMerk(NULL),
- pClipMerk(NULL),
- pLineColorMerk(NULL),
- nMode(nNewMode)
-{
- if (bAutoMerk) Save(rOut);
-}
-
-ImpSdrHdcMerk::~ImpSdrHdcMerk()
-{
- if (pFarbMerk!=NULL) delete pFarbMerk;
- if (pClipMerk!=NULL) delete pClipMerk;
- if (pLineColorMerk !=NULL) delete pLineColorMerk;
-}
-
-void ImpSdrHdcMerk::Save(const OutputDevice& rOut)
-{
- if (pFarbMerk!=NULL)
- {
- delete pFarbMerk;
- pFarbMerk=NULL;
- }
- if (pClipMerk!=NULL)
- {
- delete pClipMerk;
- pClipMerk=NULL;
- }
- if (pLineColorMerk !=NULL)
- {
- delete pLineColorMerk ;
- pLineColorMerk =NULL;
- }
- if ((nMode & SDRHDC_SAVECLIPPING) ==SDRHDC_SAVECLIPPING)
- pClipMerk=new ImpClipMerk(rOut);
-
- sal_uInt16 nCol=nMode & SDRHDC_SAVEPENANDBRUSHANDFONT;
-
- if (nCol==SDRHDC_SAVEPEN)
- pLineColorMerk=new Color( rOut.GetLineColor() );
- else if (nCol==SDRHDC_SAVEPENANDBRUSHANDFONT)
- pFarbMerk=new ImpColorMerk(rOut);
- else if (nCol!=0)
- pFarbMerk=new ImpColorMerk(rOut,nCol);
-}
-
-void ImpSdrHdcMerk::Restore(OutputDevice& rOut, sal_uInt16 nMask) const
-{
- nMask&=nMode; // nur restaurieren, was auch gesichert wurde
-
- if ((nMask & SDRHDC_SAVECLIPPING) ==SDRHDC_SAVECLIPPING && pClipMerk!=NULL)
- pClipMerk->Restore(rOut);
-
- sal_uInt16 nCol=nMask & SDRHDC_SAVEPENANDBRUSHANDFONT;
-
- if (nCol==SDRHDC_SAVEPEN)
- {
- if (pLineColorMerk!=NULL)
- rOut.SetLineColor(*pLineColorMerk);
- else if (pFarbMerk!=NULL)
- rOut.SetLineColor( pFarbMerk->GetLineColor() );
- } else if (nCol!=0 && pFarbMerk!=NULL)
- pFarbMerk->Restore(rOut,nCol);
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
void SdrLinkList::Clear()
{
unsigned nAnz=GetLinkCount();