summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-11-10 09:28:22 +0000
committerCaolán McNamara <caolanm@redhat.com>2011-11-10 09:28:40 +0000
commit58692c30e390d24c20108a7c3140d96638898696 (patch)
treeecd84d5343b09488c91e8f8008b10fd216c2de65
parent8c69b4db58ce820e27c96dc0f33890b6946a5f4c (diff)
callcatcher: remove unused methods
-rw-r--r--cui/source/dialogs/hltpbase.cxx29
-rw-r--r--cui/source/inc/hltpbase.hxx1
-rw-r--r--svx/inc/svx/contdlg.hxx4
-rw-r--r--svx/inc/svx/strarray.hxx2
-rw-r--r--svx/inc/svx/svdhdl.hxx3
-rw-r--r--svx/inc/svx/svdhlpln.hxx5
-rw-r--r--svx/source/dialog/_contdlg.cxx8
-rw-r--r--svx/source/dialog/strarray.cxx29
-rw-r--r--svx/source/svdraw/svdhdl.cxx17
-rw-r--r--svx/source/svdraw/svdhlpln.cxx18
-rwxr-xr-xsw/source/core/inc/viewimp.hxx7
-rw-r--r--sw/source/core/view/viewimp.cxx7
-rw-r--r--sw/source/ui/inc/swuicnttab.hxx1
-rw-r--r--sw/source/ui/index/cnttab.cxx11
-rw-r--r--unotools/source/config/inetoptions.cxx43
-rw-r--r--unusedcode.easy10
-rw-r--r--vcl/inc/vcl/graphictools.hxx2
-rw-r--r--vcl/source/gdi/graphictools.cxx151
-rw-r--r--xmloff/inc/xmloff/nmspmap.hxx3
-rw-r--r--xmloff/source/core/nmspmap.cxx14
20 files changed, 0 insertions, 365 deletions
diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx
index c577095dd216..4b6fd2cb03e5 100644
--- a/cui/source/dialogs/hltpbase.cxx
+++ b/cui/source/dialogs/hltpbase.cxx
@@ -513,35 +513,6 @@ SvxMacroTableDtor* SvxHyperlinkTabPageBase::GetMacroTable()
/*************************************************************************
|*
-|* Does the given file exists ?
-|*
-|************************************************************************/
-
-sal_Bool SvxHyperlinkTabPageBase::FileExists( const INetURLObject& rURL )
-{
- sal_Bool bRet = sal_False;
-
- if( rURL.GetFull().getLength() > 0 )
- {
- try
- {
- Content aCnt( rURL.GetMainURL( INetURLObject::NO_DECODE ), ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >() );
- ::rtl::OUString aTitle;
-
- aCnt.getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Title" ) ) ) >>= aTitle;
- bRet = ( aTitle.getLength() > 0 );
- }
- catch( ... )
- {
- OSL_FAIL( "FileExists: ucb error" );
- }
- }
-
- return bRet;
-}
-
-/*************************************************************************
-|*
|* try to detect the current protocol that is used in aStrURL
|*
|************************************************************************/
diff --git a/cui/source/inc/hltpbase.hxx b/cui/source/inc/hltpbase.hxx
index b13fe077e15b..686d5611d6f9 100644
--- a/cui/source/inc/hltpbase.hxx
+++ b/cui/source/inc/hltpbase.hxx
@@ -147,7 +147,6 @@ protected:
String aEmptyStr;
- sal_Bool FileExists( const INetURLObject& rURL );
static String GetSchemeFromURL( String aStrURL );
inline void DisableClose( sal_Bool _bDisable ) { mbIsCloseDisabled = _bDisable; }
diff --git a/svx/inc/svx/contdlg.hxx b/svx/inc/svx/contdlg.hxx
index 26e30a83ed4a..cb88430ca90f 100644
--- a/svx/inc/svx/contdlg.hxx
+++ b/svx/inc/svx/contdlg.hxx
@@ -49,10 +49,6 @@ class SVX_DLLPUBLIC SvxContourDlgChildWindow : public SfxChildWindow
SvxContourDlgChildWindow( Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* );
SFX_DECL_CHILDWINDOW( SvxContourDlgChildWindow );
-
- static void UpdateContourDlg( const Graphic& rGraphic, sal_Bool bGraphicLinked,
- const PolyPolygon* pPolyPoly = NULL,
- void* pEditingObj = NULL );
};
#ifndef _REDUCED_ContourDlg_HXX_
diff --git a/svx/inc/svx/strarray.hxx b/svx/inc/svx/strarray.hxx
index ba2d62e53bd2..258361278041 100644
--- a/svx/inc/svx/strarray.hxx
+++ b/svx/inc/svx/strarray.hxx
@@ -43,8 +43,6 @@ public:
~SvxStringArray();
const String& GetStringByPos( sal_uInt32 nPos ) const;
- const String& GetStringByType( long nType ) const;
- long GetValueByStr( const String& rStr ) const;
};
diff --git a/svx/inc/svx/svdhdl.hxx b/svx/inc/svx/svdhdl.hxx
index cadd4a4f593e..91a067a7a471 100644
--- a/svx/inc/svx/svdhdl.hxx
+++ b/svx/inc/svx/svdhdl.hxx
@@ -460,7 +460,6 @@ protected:
unsigned bRotateShear : 1;
unsigned bDistortShear : 1;
unsigned bMoveOutside : 1; // Handles nach aussen ruecken (fuer TextEdit)
- unsigned bFineHandles : 1;
private:
SVX_DLLPRIVATE SdrHdlList(const SdrHdlList&): aList(1024,64,64) {}
@@ -497,8 +496,6 @@ public:
sal_Bool IsRotateShear() const { return bRotateShear; }
void SetDistortShear(sal_Bool bOn);
sal_Bool IsDistortShear() const { return bDistortShear; }
- void SetFineHdl(sal_Bool bOn);
- sal_Bool IsFineHdl() const { return bFineHandles; }
// AddHdl uebernimmt das Handle in sein Eigentum. Es muss
// also auf dem Heap stehen, da Clear() ein delete macht.
diff --git a/svx/inc/svx/svdhlpln.hxx b/svx/inc/svx/svdhlpln.hxx
index a6a11d4df2cf..0106c2da06a2 100644
--- a/svx/inc/svx/svdhlpln.hxx
+++ b/svx/inc/svx/svdhlpln.hxx
@@ -70,11 +70,6 @@ public:
bool IsHit(const Point& rPnt, sal_uInt16 nTolLog, const OutputDevice& rOut) const;
// OutputDevice wird benoetigt, da Fangpunkte eine feste Pixelgroesse haben
Rectangle GetBoundRect(const OutputDevice& rOut) const;
-
- /* returns true if this and the given help line would be rendered at the same pixel position
- of the given OutputDevice. This can be used to avoid drawing multiple help lines with xor
- on same position which could render them invisible */
- bool IsVisibleEqual( const SdrHelpLine& rHelpLine, const OutputDevice& rOut ) const;
};
#define SDRHELPLINE_NOTFOUND 0xFFFF
diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index a1001284f2c9..24e9e3b4f0e0 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -105,14 +105,6 @@ SvxContourDlgChildWindow::SvxContourDlgChildWindow( Window* _pParent, sal_uInt16
pDlg->Initialize( pInfo );
}
-void SvxContourDlgChildWindow::UpdateContourDlg( const Graphic& rGraphic, sal_Bool bGraphicLinked,
- const PolyPolygon* pPolyPoly, void* pEditingObj )
-{
- if ( SfxViewFrame::Current() &&
- SfxViewFrame::Current()->HasChildWindow( SvxContourDlgChildWindow::GetChildWindowId() ) )
- SVXCONTOURDLG()->Update( rGraphic, bGraphicLinked, pPolyPoly, pEditingObj );
-}
-
SvxContourDlg::SvxContourDlg( SfxBindings* _pBindings, SfxChildWindow* pCW,
Window* _pParent, const ResId& rResId ) :
diff --git a/svx/source/dialog/strarray.cxx b/svx/source/dialog/strarray.cxx
index 10b4f0750210..ae0c446131d6 100644
--- a/svx/source/dialog/strarray.cxx
+++ b/svx/source/dialog/strarray.cxx
@@ -69,33 +69,4 @@ const String& SvxStringArray::GetStringByPos( sal_uInt32 nPos ) const
return String::EmptyString();
}
-//------------------------------------------------------------------------
-
-const String& SvxStringArray::GetStringByType( long nType ) const
-{
- sal_uInt32 nPos = FindIndex( nType );
-
- if ( RESARRAY_INDEX_NOTFOUND != nPos && nPos < Count() )
- return ResStringArray::GetString( nPos );
- else
- return String::EmptyString();
-}
-
-//------------------------------------------------------------------------
-
-long SvxStringArray::GetValueByStr( const String& rStr ) const
-{
- long nType = 0;
- sal_uInt32 nCount = Count();
-
- for ( sal_uInt32 i = 0; i < nCount; ++i )
- if ( rStr == ResStringArray::GetString( i ) )
- {
- nType = GetValue( i );
- break;
- }
- return nType;
-}
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index 98cd7a85e458..75146b80696f 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -2029,7 +2029,6 @@ SdrHdlList::SdrHdlList(SdrMarkView* pV)
bRotateShear = sal_False;
bMoveOutside = sal_False;
bDistortShear = sal_False;
- bFineHandles = sal_False;
}
SdrHdlList::~SdrHdlList()
@@ -2079,22 +2078,6 @@ void SdrHdlList::SetDistortShear(sal_Bool bOn)
bDistortShear = bOn;
}
-void SdrHdlList::SetFineHdl(sal_Bool bOn)
-{
- if(bFineHandles != bOn)
- {
- // remember new state
- bFineHandles = bOn;
-
- // propagate change to IAOs
- for(sal_uInt32 i=0; i<GetHdlCount(); i++)
- {
- SdrHdl* pHdl = GetHdl(i);
- pHdl->Touch();
- }
- }
-}
-
SdrHdl* SdrHdlList::RemoveHdl(sal_uIntPtr nNum)
{
SdrHdl* pRetval = (SdrHdl*)aList.Remove(nNum);
diff --git a/svx/source/svdraw/svdhlpln.cxx b/svx/source/svdraw/svdhlpln.cxx
index 30d4dd31824b..21ef6a2c9376 100644
--- a/svx/source/svdraw/svdhlpln.cxx
+++ b/svx/source/svdraw/svdhlpln.cxx
@@ -86,24 +86,6 @@ Rectangle SdrHelpLine::GetBoundRect(const OutputDevice& rOut) const
return aRet;
}
-bool SdrHelpLine::IsVisibleEqual( const SdrHelpLine& rHelpLine, const OutputDevice& rOut ) const
-{
- if( eKind == rHelpLine.eKind)
- {
- Point aPt1(rOut.LogicToPixel(aPos)), aPt2(rOut.LogicToPixel(rHelpLine.aPos));
- switch( eKind )
- {
- case SDRHELPLINE_POINT:
- return aPt1 == aPt2;
- case SDRHELPLINE_VERTICAL:
- return aPt1.X() == aPt2.X();
- case SDRHELPLINE_HORIZONTAL:
- return aPt1.Y() == aPt2.Y();
- }
- }
- return false;
-}
-
void SdrHelpLineList::Clear()
{
sal_uInt16 nAnz=GetCount();
diff --git a/sw/source/core/inc/viewimp.hxx b/sw/source/core/inc/viewimp.hxx
index cc94622da58e..aefc22d8c0d0 100755
--- a/sw/source/core/inc/viewimp.hxx
+++ b/sw/source/core/inc/viewimp.hxx
@@ -109,13 +109,6 @@ class SwViewImp
SwPagePreviewLayout* mpPgPrevwLayout;
/**
- Signal whether to stop printing.
-
- @param _useless just to fit macro
- */
- DECL_LINK(SetStopPrt, void * _useless = NULL);
-
- /**
Returns if printer shall be stopped.
@retval sal_True The printer shall be stopped.
diff --git a/sw/source/core/view/viewimp.cxx b/sw/source/core/view/viewimp.cxx
index a1ea19b19bf4..7c053e0bd0e7 100644
--- a/sw/source/core/view/viewimp.cxx
+++ b/sw/source/core/view/viewimp.cxx
@@ -465,11 +465,4 @@ void SwViewImp::FireAccessibleEvents()
GetAccessibleMap().FireEvents();
}
-IMPL_LINK(SwViewImp, SetStopPrt, void *, EMPTYARG)
-{
- bStopPrt = sal_True;
-
- return 0;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/inc/swuicnttab.hxx b/sw/source/ui/inc/swuicnttab.hxx
index a2ff8e8c0294..727cdae58657 100644
--- a/sw/source/ui/inc/swuicnttab.hxx
+++ b/sw/source/ui/inc/swuicnttab.hxx
@@ -222,7 +222,6 @@ class SwTOXSelectTabPage : public SfxTabPage
sal_Bool bFirstCall;
DECL_LINK(TOXTypeHdl, ListBox* );
- DECL_LINK(TOXAreaHdl, ListBox* );
DECL_LINK(AddStylesHdl, PushButton* );
DECL_LINK(MenuEnableHdl, Menu*);
DECL_LINK(MenuExecuteHdl, Menu*);
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index fa75af65eedc..3fc515d6aa4d 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -1553,17 +1553,6 @@ IMPL_LINK(SwTOXSelectTabPage, LanguageHdl, ListBox*, pBox)
return 0;
};
-IMPL_LINK(SwTOXSelectTabPage, TOXAreaHdl, ListBox*, pBox)
-{
- OSL_FAIL("not implemented");
- switch((long)pBox->GetEntryData( pBox->GetSelectEntryPos() ))
- {
- case AREA_DOCUMENT : break;
- case AREA_CHAPTER : break;
- }
- return 0;
-}
-
IMPL_LINK(SwTOXSelectTabPage, AddStylesHdl, PushButton*, pButton)
{
SwAddStylesDlg_Impl* pDlg = new SwAddStylesDlg_Impl(pButton,
diff --git a/unotools/source/config/inetoptions.cxx b/unotools/source/config/inetoptions.cxx
index 5d74102e9730..1995a1a032c4 100644
--- a/unotools/source/config/inetoptions.cxx
+++ b/unotools/source/config/inetoptions.cxx
@@ -105,18 +105,6 @@ public:
inline void flush() { Commit(); }
- void
- addPropertiesChangeListener(
- star::uno::Sequence< rtl::OUString > const & rPropertyNames,
- star::uno::Reference< star::beans::XPropertiesChangeListener > const &
- rListener);
-
- void
- removePropertiesChangeListener(
- star::uno::Sequence< rtl::OUString > const & rPropertyNames,
- star::uno::Reference< star::beans::XPropertiesChangeListener > const &
- rListener);
-
private:
enum { ENTRY_COUNT = INDEX_HTTP_PROXY_PORT + 1 };
@@ -361,37 +349,6 @@ void SvtInetOptions::Impl::setProperty(Index nIndex,
}
//============================================================================
-void
-SvtInetOptions::Impl::addPropertiesChangeListener(
- star::uno::Sequence< rtl::OUString > const & rPropertyNames,
- star::uno::Reference< star::beans::XPropertiesChangeListener > const &
- rListener)
-{
- osl::MutexGuard aGuard(m_aMutex);
- Map::mapped_type & rEntry = m_aListeners[rListener];
- for (sal_Int32 i = 0; i < rPropertyNames.getLength(); ++i)
- rEntry.insert(rPropertyNames[i]);
-}
-
-//============================================================================
-void
-SvtInetOptions::Impl::removePropertiesChangeListener(
- star::uno::Sequence< rtl::OUString > const & rPropertyNames,
- star::uno::Reference< star::beans::XPropertiesChangeListener > const &
- rListener)
-{
- osl::MutexGuard aGuard(m_aMutex);
- Map::iterator aIt(m_aListeners.find(rListener));
- if (aIt != m_aListeners.end())
- {
- for (sal_Int32 i = 0; i < rPropertyNames.getLength(); ++i)
- aIt->second.erase(rPropertyNames[i]);
- if (aIt->second.empty())
- m_aListeners.erase(aIt);
- }
-}
-
-//============================================================================
//
// SvtInetOptions
//
diff --git a/unusedcode.easy b/unusedcode.easy
index 7280eb2c39bd..d2be88e13ac4 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -520,7 +520,6 @@ SdrGrafObj::SetFileName(String const&)
SdrGrafObj::SetFilterName(String const&)
SdrGrafObj::StopAnimation(OutputDevice*, long)
SdrHdl::isMouseOver() const
-SdrHelpLine::IsVisibleEqual(SdrHelpLine const&, OutputDevice const&) const
SdrHint::GetObjList() const
SdrHint::GetRect() const
SdrHint::SdrHint()
@@ -750,8 +749,6 @@ SvXMLImport::SetError(int, rtl::OUString const&, rtl::OUString const&, rtl::OUSt
SvXMLImport::SetError(int, rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, rtl::OUString const&)
SvXMLImportContexts_Impl::DeleteAndDestroy(unsigned short, unsigned short)
SvXMLImportPropertyMapper::importXML(std::__debug::vector<XMLPropertyState, std::allocator<XMLPropertyState> >&, com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>, SvXMLUnitConverter const&, SvXMLNamespaceMap const&, unsigned int) const
-SvXMLNamespaceMap::AddAtIndex(unsigned short, char const*, char const*, unsigned short)
-SvXMLNamespaceMap::GetKeyByIndex(unsigned short) const
SvXMLNumFormatContext::AddCondition(int, rtl::OUString const&, LocaleDataWrapper const&)
SvXMLStyleIndices_Impl::GetPos(SvXMLStyleIndex_Impl const*) const
SvXMLStyleIndices_Impl::Remove(SvXMLStyleIndex_Impl*)
@@ -791,7 +788,6 @@ SvtGraphicFill::setHatchType(SvtGraphicFill::HatchType)
SvtGraphicFill::setTiling(bool)
SvtGraphicFill::setTransform(SvtGraphicFill::Transform const&)
SvtGraphicFill::setTransparency(double)
-SvtGraphicFill::toString() const
SvtGraphicStroke::setCapType(SvtGraphicStroke::CapType)
SvtGraphicStroke::setDashArray(std::__debug::vector<double, std::allocator<double> > const&)
SvtGraphicStroke::setEndArrow(PolyPolygon const&)
@@ -905,7 +901,6 @@ SvxContourDlg::SetExecState(unsigned char)
SvxContourDlg::SetGraphic(Graphic const&)
SvxContourDlg::SetGraphicLinked(unsigned char)
SvxContourDlg::SetPolyPolygon(PolyPolygon const&)
-SvxContourDlgChildWindow::UpdateContourDlg(Graphic const&, unsigned char, PolyPolygon const*, void*)
SvxDoCapitals::Do(String const&, unsigned short, unsigned short, unsigned char)
SvxDrawOutlinerViewForwarder::SetShapePos(Point const&)
SvxDrawPage::GetPageForSdrPage(SdrPage*)
@@ -922,7 +917,6 @@ SvxGraphCtrlAccessibleContext::setDescription(rtl::OUString const&)
SvxGraphCtrlAccessibleContext::setName(rtl::OUString const&)
SvxHtmlOptions::AddListenerLink(Link const&)
SvxHtmlOptions::RemoveListenerLink(Link const&)
-SvxHyperlinkTabPageBase::FileExists(INetURLObject const&)
SvxIMapDlg::GetTargetList() const
SvxIconChoiceCtrlEntry::LockPos(unsigned char)
SvxInsertStatusBarControl::GetDefItemWidth(StatusBar const&)
@@ -980,8 +974,6 @@ SvxShapePolyPolygonBezier::GetPolygonKind() const
SvxShapeText::SvxShapeText()
SvxSimpleTable::ClearAll()
SvxSimpleTable::TableToTop()
-SvxStringArray::GetStringByType(long) const
-SvxStringArray::GetValueByStr(String const&) const
SvxSuperContourDlg::DoAutoCreate()
SvxSuperContourDlg::ReducePoints(long)
SvxTPFilter::DisableRange(unsigned char)
@@ -1088,7 +1080,6 @@ SwSortTableLines::Remove(SwTableLine* const&, unsigned short)
SwSortTableLines::Remove(unsigned short, unsigned short)
SwSyncChildWin::GetChildWindowId()
SwTOXMarks::DeleteAndDestroy(unsigned short, unsigned short)
-SwTOXSelectTabPage::LinkStubTOXAreaHdl(void*, void*)
SwTOXSources::Insert(SwTOXSources const*, unsigned short, unsigned short, unsigned short)
SwTOXSources::Remove(unsigned short, unsigned short)
SwTOXSources::Replace(SwTOXSource const&, unsigned short)
@@ -1105,7 +1096,6 @@ SwVbaStyle::getOOoStyleTypeFromMSWord(int)
SwVbaTableHelper::setTableWidth(int)
SwView::LinkStubHtmlOptionsHdl(void*, void*)
SwView::LinkStubSpellError(void*, void*)
-SwViewImp::LinkStubSetStopPrt(void*, void*)
SwWriteTableCols::Insert(SwWriteTableCol* const&, unsigned short&)
SwWriteTableCols::Insert(SwWriteTableCol* const*, unsigned short)
SwWriteTableCols::Insert(SwWriteTableCols const*, unsigned short, unsigned short)
diff --git a/vcl/inc/vcl/graphictools.hxx b/vcl/inc/vcl/graphictools.hxx
index 333c9163d57a..3e0afda00b34 100644
--- a/vcl/inc/vcl/graphictools.hxx
+++ b/vcl/inc/vcl/graphictools.hxx
@@ -389,8 +389,6 @@ public:
it to the appropriate size.
*/
void getGraphic ( Graphic& ) const;
- /// Query a textual representation of the object's content
- ::rtl::OString toString () const;
// mutators
/// Set path to fill
diff --git a/vcl/source/gdi/graphictools.cxx b/vcl/source/gdi/graphictools.cxx
index 251261d0943e..14a0fa27dfc5 100644
--- a/vcl/source/gdi/graphictools.cxx
+++ b/vcl/source/gdi/graphictools.cxx
@@ -98,21 +98,6 @@ static ::rtl::OString dashToString( const SvtGraphicStroke::DashArray& rDashArra
return aStr;
}
-static ::rtl::OString colorToString( Color aColor )
-{
- ::rtl::OString aStr;
-
- aStr += "color: [ ";
- aStr += ::rtl::OString::valueOf( aColor.GetRed() );
- aStr += " ";
- aStr += ::rtl::OString::valueOf( aColor.GetGreen() );
- aStr += " ";
- aStr += ::rtl::OString::valueOf( aColor.GetBlue() );
- aStr += " ] ";
-
- return aStr;
-}
-
////////////////////////////////////////////////////////////////////////////
SvtGraphicFill::Transform::Transform()
@@ -494,142 +479,6 @@ void SvtGraphicFill::getGraphic( Graphic& rGraphic ) const
rGraphic = maFillGraphic;
}
-::rtl::OString SvtGraphicFill::toString() const
-{
- ::rtl::OString aStr;
-
- aStr += polyPolyToString( maPath );
- aStr += "fill";
- aStr += colorToString( getFillColor() );
- aStr += " trans: ";
- aStr += ::rtl::OString::valueOf( static_cast< double >(getTransparency()) );
- aStr += " rule: ";
- switch( getFillRule() )
- {
- case fillNonZero:
- aStr += "nonzero";
- break;
-
- case fillEvenOdd:
- aStr += "evenodd";
- break;
-
- default:
- OSL_FAIL( "SvtGraphicFill::toString missing fill rule");
- break;
- }
- aStr += " type: ";
- switch( getFillType() )
- {
- case fillSolid:
- aStr += "solid";
- break;
-
- case fillGradient:
- aStr += "gradient";
- break;
-
- case fillHatch:
- aStr += "hatch";
- break;
-
- case fillTexture:
- aStr += "bitmap";
- break;
-
- default:
- OSL_FAIL( "SvtGraphicStroke::toString missing fill type");
- break;
- }
-
- aStr += " transform: [ ";
- int i;
- for(i=0; i<Transform::MatrixSize; ++i)
- aStr += ::rtl::OString::valueOf( maFillTransform.matrix[i] );
- aStr += " ] ";
-
- aStr += " hatch: ";
- switch( getHatchType() )
- {
- case hatchSingle:
- aStr += "single";
- break;
-
- case hatchDouble:
- aStr += "double";
- break;
-
- case hatchTriple:
- aStr += "triple";
- break;
-
- default:
- OSL_FAIL( "SvtGraphicStroke::toString missing hatch type");
- break;
- }
-
- aStr += " hatch";
- aStr += colorToString( getHatchColor() );
-
- aStr += " gradient: ";
- switch( getGradientType() )
- {
- case gradientLinear:
- aStr += "linear";
- break;
-
- case gradientRadial:
- aStr += "radial";
- break;
-
- case gradientRectangular:
- aStr += "rectangular";
- break;
-
- default:
- OSL_FAIL( "SvtGraphicStroke::toString missing gradient type");
- break;
- }
-
- aStr += " grad1st";
- aStr += colorToString( getGradient1stColor() );
-
- aStr += " grad2nd";
- aStr += colorToString( getGradient2ndColor() );
-
- aStr += " gradstep";
- aStr += ::rtl::OString::valueOf( (sal_Int32)getGradientStepCount() );
-
- if( maFillGraphic.GetType() != GRAPHIC_NONE )
- {
- aStr += " fillgraphic: ";
- switch( maFillGraphic.GetType() )
- {
- case GRAPHIC_BITMAP:
- aStr += "bitmap";
- break;
-
- case GRAPHIC_GDIMETAFILE:
- aStr += "metafile";
- break;
-
- case GRAPHIC_DEFAULT:
- aStr += "default";
- break;
-
- default:
- OSL_FAIL( "SvtGraphicStroke::toString missing graphic type");
- break;
- }
-
- aStr += " of ";
- aStr += ::rtl::OString::valueOf( static_cast< sal_Int32 >(maFillGraphic.GetSizeBytes()) );
- aStr += " bytes";
- }
-
- return aStr;
-}
-
void SvtGraphicFill::setPath( const PolyPolygon& rPath )
{
maPath = rPath;
diff --git a/xmloff/inc/xmloff/nmspmap.hxx b/xmloff/inc/xmloff/nmspmap.hxx
index e56983a58df8..79139ef1223f 100644
--- a/xmloff/inc/xmloff/nmspmap.hxx
+++ b/xmloff/inc/xmloff/nmspmap.hxx
@@ -159,10 +159,7 @@ public:
/* deprecated */ sal_Bool AddAtIndex( sal_uInt16 nIdx, const ::rtl::OUString& rPrefix,
const ::rtl::OUString& rName, sal_uInt16 nKey = XML_NAMESPACE_UNKNOWN );
-/* deprecated */ sal_Bool AddAtIndex( sal_uInt16 nIdx, const sal_Char *pPrefix,
- const sal_Char *pName, sal_uInt16 nKey = XML_NAMESPACE_UNKNOWN );
/* deprecated */ sal_uInt16 GetIndexByKey( sal_uInt16 nKey ) const;
-/* deprecated */ sal_uInt16 GetKeyByIndex( sal_uInt16 nIdx ) const;
/* deprecated */ sal_uInt16 GetIndexByPrefix( const ::rtl::OUString& rPrefix ) const;
/* deprecated */ sal_uInt16 GetFirstIndex() const;
/* deprecated */ sal_uInt16 GetNextIndex( sal_uInt16 nOldIdx ) const;
diff --git a/xmloff/source/core/nmspmap.cxx b/xmloff/source/core/nmspmap.cxx
index 977bf46b175b..373c747dc915 100644
--- a/xmloff/source/core/nmspmap.cxx
+++ b/xmloff/source/core/nmspmap.cxx
@@ -382,11 +382,6 @@ sal_uInt16 SvXMLNamespaceMap::GetNextKey( sal_uInt16 nLastKey ) const
// All methods after this are deprecated...
-sal_uInt16 SvXMLNamespaceMap::GetKeyByIndex( sal_uInt16 nIdx ) const
-{
- return nIdx;
-}
-
sal_uInt16 SvXMLNamespaceMap::GetIndexByKey( sal_uInt16 nKey ) const
{
return nKey;
@@ -420,15 +415,6 @@ sal_Bool SvXMLNamespaceMap::AddAtIndex( sal_uInt16 /*nIdx*/, const OUString& rPr
return bRet;
}
-sal_Bool SvXMLNamespaceMap::AddAtIndex( sal_uInt16 nIdx, const sal_Char *pPrefix,
- const sal_Char *pName, sal_uInt16 nKey )
-{
- OUString sPrefix( OUString::createFromAscii(pPrefix) );
- OUString sName( OUString::createFromAscii(pName) );
-
- return AddAtIndex( nIdx, sPrefix, sName, nKey );
-}
-
OUString SvXMLNamespaceMap::GetAttrNameByIndex( sal_uInt16 nIdx ) const
{
return GetAttrNameByKey( nIdx );