summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2012-01-18 19:48:19 +0100
committerThomas Arnhold <thomas@arnhold.org>2012-01-18 20:45:14 +0100
commit105546f7f11ccee50f8066bfb7c753fabb177fc8 (patch)
tree4515108e07c8498bbfb01edf4309b9b6dddf526c
parent051e60ff36da9b1b7d0ee5268f74fcd34c4ef059 (diff)
remove unused code
-rw-r--r--svl/inc/svl/srchitem.hxx3
-rw-r--r--svl/source/items/srchitem.cxx64
-rw-r--r--svx/inc/svx/ctredlin.hxx6
-rw-r--r--svx/inc/svx/simptabl.hxx3
-rw-r--r--svx/inc/svx/unoshape.hxx3
-rw-r--r--svx/source/dialog/_contdlg.cxx44
-rw-r--r--svx/source/dialog/contimp.hxx3
-rw-r--r--svx/source/dialog/ctredlin.cxx95
-rw-r--r--svx/source/dialog/simptabl.cxx10
-rw-r--r--svx/source/unodraw/unoshape.cxx16
-rw-r--r--sw/inc/pam.hxx4
-rw-r--r--sw/source/core/crsr/pam.cxx10
-rw-r--r--sw/source/core/text/inftxt.cxx6
-rw-r--r--sw/source/ui/vba/vbacolumn.cxx55
-rw-r--r--sw/source/ui/vba/vbacolumn.hxx4
-rw-r--r--sw/source/ui/vba/vbastyle.cxx27
-rw-r--r--sw/source/ui/vba/vbastyle.hxx1
-rw-r--r--toolkit/inc/toolkit/helper/vclunohelper.hxx1
-rw-r--r--toolkit/source/helper/vclunohelper.cxx70
-rw-r--r--unusedcode.easy23
-rw-r--r--vcl/inc/vcl/window.hxx3
-rw-r--r--vcl/source/window/window.cxx7
22 files changed, 0 insertions, 458 deletions
diff --git a/svl/inc/svl/srchitem.hxx b/svl/inc/svl/srchitem.hxx
index 7a0be711147b..c832bac51aee 100644
--- a/svl/inc/svl/srchitem.hxx
+++ b/svl/inc/svl/srchitem.hxx
@@ -171,9 +171,6 @@ public:
inline sal_uInt16 GetLEVLonger() const;
inline void SetLEVLonger(sal_uInt16 nSet);
- void GetFromDescriptor( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor > & rDescr );
- void SetToDescriptor( ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor > & rDescr );
-
inline const com::sun::star::util::SearchOptions &
GetSearchOptions() const;
inline void SetSearchOptions( const com::sun::star::util::SearchOptions &rOpt );
diff --git a/svl/source/items/srchitem.cxx b/svl/source/items/srchitem.cxx
index 0e0117246cf0..57f1f1d21ce8 100644
--- a/svl/source/items/srchitem.cxx
+++ b/svl/source/items/srchitem.cxx
@@ -280,70 +280,6 @@ SfxItemPresentation SvxSearchItem::GetPresentation
return SFX_ITEM_PRESENTATION_NONE;
}
-void SvxSearchItem::GetFromDescriptor( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor >& rDescr )
-{
- SetSearchString( rDescr->getSearchString() );
- ::com::sun::star::uno::Any aAny = rDescr->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchWords") ) );
- sal_Bool bTemp = false;
- aAny >>= bTemp ;
- SetWordOnly( bTemp );
- aAny = rDescr->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchCaseSensitive") ) );
- aAny >>= bTemp ;
- SetExact( bTemp );
- aAny = rDescr->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchBackwards") ) );
- aAny >>= bTemp ;
- SetBackward( bTemp );
- aAny = rDescr->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchInSelection") ) );
- aAny >>= bTemp ;
- SetSelection( bTemp );
- aAny = rDescr->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchRegularExpression") ) );
- aAny >>= bTemp ;
- SetRegExp( bTemp );
- aAny = rDescr->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchSimilarity") ) );
- aAny >>= bTemp ;
- SetLevenshtein( bTemp );
- aAny = rDescr->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchSimilarityRelax") ) );
- aAny >>= bTemp ;
- SetLEVRelaxed( bTemp );
- aAny = rDescr->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchSimilarityExchange") ) );
- sal_Int16 nTemp = 0;
- aAny >>= nTemp ;
- SetLEVOther( nTemp );
- aAny = rDescr->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchSimilarityRemove") ) );
- aAny >>= nTemp ;
- SetLEVShorter( nTemp );
- aAny = rDescr->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchSimilarityAdd") ) );
- aAny >>= nTemp ;
- SetLEVLonger( nTemp );
-}
-
-void SvxSearchItem::SetToDescriptor( ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor > & rDescr )
-{
- rDescr->setSearchString( GetSearchString() );
- ::com::sun::star::uno::Any aAny;
- aAny <<= GetWordOnly() ;
- rDescr->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchWords") ), aAny );
- aAny <<= GetExact() ;
- rDescr->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchCaseSensitive") ), aAny );
- aAny <<= GetBackward() ;
- rDescr->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchBackwards") ), aAny );
- aAny <<= GetSelection() ;
- rDescr->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchInSelection") ), aAny );
- aAny <<= GetRegExp() ;
- rDescr->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchRegularExpression") ), aAny );
- aAny <<= IsLevenshtein() ;
- rDescr->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchSimilarity") ), aAny );
- aAny <<= IsLEVRelaxed() ;
- rDescr->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchSimilarityRelax") ), aAny );
- aAny <<= GetLEVOther() ;
- rDescr->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchSimilarityExchange") ), aAny );
- aAny <<= GetLEVShorter() ;
- rDescr->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchSimilarityRemove") ), aAny );
- aAny <<= GetLEVLonger() ;
- rDescr->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchSimilarityAdd") ), aAny );
-}
-
-
void SvxSearchItem::Notify( const Sequence< ::rtl::OUString > & )
{
// applies transliteration changes in the configuration database
diff --git a/svx/inc/svx/ctredlin.hxx b/svx/inc/svx/ctredlin.hxx
index 18089c791687..74e92bcce50b 100644
--- a/svx/inc/svx/ctredlin.hxx
+++ b/svx/inc/svx/ctredlin.hxx
@@ -122,7 +122,6 @@ protected:
public:
SvxRedlinTable(SvxSimpleTableContainer& rParent, WinBits nBits = WB_BORDER);
- SvxRedlinTable(SvxSimpleTableContainer& rParent, const ResId& rResId);
~SvxRedlinTable();
// For FilterPage only {
@@ -141,8 +140,6 @@ public:
// } For FilterPage only
void SetCalcView(sal_Bool bFlag=sal_True);
- sal_Bool IsValidCalcEntry(const String& ,RedlinData *pUserData);
- sal_Bool IsValidWriterEntry(const String& ,RedlinData *pUserData);
// no NULL-pointer checking {
sal_Bool IsValidEntry(const String* pAuthor,const DateTime *pDateTime,const String* pComment);
@@ -239,7 +236,6 @@ public:
void ClearAuthors();
void InsertAuthor( const String& rString, sal_uInt16 nPos = LISTBOX_APPEND );
- sal_uInt16 GetSelectedAuthorPos();
String GetSelectedAuthor()const;
void SelectedAuthorPos(sal_uInt16 nPos);
sal_uInt16 SelectAuthor(const String& aString);
@@ -251,11 +247,9 @@ public:
void SetRange(const String& rString);
String GetRange() const;
void HideRange(sal_Bool bHide=sal_True);
- void DisableRange(sal_Bool bFlag=sal_True);
void SetFocusToRange();
// } Methods for Calc
- void HideClocks(sal_Bool bHide=sal_True);
void DisableRef(sal_Bool bFlag);
sal_Bool IsDate();
diff --git a/svx/inc/svx/simptabl.hxx b/svx/inc/svx/simptabl.hxx
index c192458be2c8..b15a485f473f 100644
--- a/svx/inc/svx/simptabl.hxx
+++ b/svx/inc/svx/simptabl.hxx
@@ -112,7 +112,6 @@ public:
void SetTabs( long* pTabs, MapUnit = MAP_APPFONT );
- void ClearAll();
void ClearHeader();
// to be removed all calls of the related methods are redirected to *Table() methods
@@ -138,8 +137,6 @@ public:
void DisableTable();
sal_Bool IsEnabled() const;
- void TableToTop();
-
sal_uInt16 GetSelectedCol();
void SortByCol(sal_uInt16,sal_Bool bDir=sal_True);
sal_Bool GetSortDirection(){ return bSortDirection;}
diff --git a/svx/inc/svx/unoshape.hxx b/svx/inc/svx/unoshape.hxx
index beb51026bf95..f22468f0f8c9 100644
--- a/svx/inc/svx/unoshape.hxx
+++ b/svx/inc/svx/unoshape.hxx
@@ -191,7 +191,6 @@ public:
SdrObject* GetSdrObject() const {return mpObj.get();}
void SetShapeType( const ::rtl::OUString& ShapeType ) { maShapeType = ShapeType; }
::com::sun::star::uno::Any GetBitmap( sal_Bool bMetaFile = sal_False ) const throw ();
- static SvxShape* GetShapeForSdrObj( SdrObject* pObj ) throw ();
::svx::PropertyChangeNotifier& getShapePropertyChangeNotifier();
@@ -223,8 +222,6 @@ public:
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL _getTypes( ) throw(::com::sun::star::uno::RuntimeException);
void setMaster( SvxShapeMaster* pMaster );
- const SvxShapeMaster* getMaster() const;
- SvxShapeMaster* getMaster();
// SfxListener
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) throw ();
diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index a49fa0dfa179..576d06e925d7 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -501,50 +501,6 @@ sal_Bool SvxSuperContourDlg::IsRedoPossible() const
return aRedoGraphic.GetType() != GRAPHIC_NONE;
}
-void SvxSuperContourDlg::DoAutoCreate()
-{
- aCreateTimer.Start();
-}
-
-void SvxSuperContourDlg::ReducePoints( const long nTol )
-{
- PolyPolygon aPolyPoly( GetPolyPolygon( sal_False ) );
-
- if ( aPolyPoly.Count() )
- {
- const MapMode aMapMode( MAP_100TH_MM );
- const long nTol2 = nTol * nTol;
- Polygon& rPoly = aPolyPoly[ 0 ];
- OutputDevice* pOutDev = Application::GetDefaultDevice();
- Point aPtPix;
- const sal_uInt16 nSize = rPoly.GetSize();
- sal_uInt16 nCounter = 0;
-
- if ( nSize )
- aPtPix = pOutDev->LogicToPixel( rPoly[ 0 ], aMapMode );
-
- for( sal_uInt16 i = 1; i < nSize; i++ )
- {
- const Point& rNewPt = rPoly[ i ];
- const Point aNewPtPix( pOutDev->LogicToPixel( rNewPt, aMapMode ) );
-
- const long nDistX = aNewPtPix.X() - aPtPix.X();
- const long nDistY = aNewPtPix.Y() - aPtPix.Y();
-
- if( ( nDistX * nDistX + nDistY * nDistY ) >= nTol2 )
- {
- rPoly[ ++nCounter ] = rNewPt;
- aPtPix = aNewPtPix;
- }
- }
-
- rPoly.SetSize( nCounter );
- aContourWnd.SetPolyPolygon( aPolyPoly );
- aContourWnd.GetSdrModel()->SetChanged( sal_True );
- }
-}
-
-
// Click handler for ToolBox
IMPL_LINK( SvxSuperContourDlg, Tbx1ClickHdl, ToolBox*, pTbx )
diff --git a/svx/source/dialog/contimp.hxx b/svx/source/dialog/contimp.hxx
index bf40b9812228..9a7c8de4b02b 100644
--- a/svx/source/dialog/contimp.hxx
+++ b/svx/source/dialog/contimp.hxx
@@ -65,9 +65,6 @@ class SvxSuperContourDlg : public SvxContourDlg
virtual void Resize();
virtual sal_Bool Close();
- void DoAutoCreate();
- void ReducePoints( const long nTol = 8 );
-
DECL_LINK( Tbx1ClickHdl, ToolBox* );
DECL_LINK( MousePosHdl, ContourWindow* );
DECL_LINK( GraphSizeHdl, ContourWindow* );
diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx
index a7ba9562d8f8..ba858714113c 100644
--- a/svx/source/dialog/ctredlin.cxx
+++ b/svx/source/dialog/ctredlin.cxx
@@ -163,22 +163,6 @@ SvxRedlinTable::SvxRedlinTable(SvxSimpleTableContainer& rParent,WinBits nBits)
SetNodeDefaultImages();
}
-SvxRedlinTable::SvxRedlinTable(SvxSimpleTableContainer& rParent,const ResId& rResId)
- : SvxSimpleTable(rParent,rResId),
- aDaTiFirst( DateTime::EMPTY ),
- aDaTiLast( DateTime::EMPTY ),
- aDaTiFilterFirst( DateTime::EMPTY ),
- aDaTiFilterLast( DateTime::EMPTY )
-{
- bAuthor=sal_False;
- bDate=sal_False;
- bIsCalc=sal_False;
- bComment=sal_False;
- nDatePos=WRITER_DATE;
- pCommentSearcher=NULL;
- SetNodeDefaultImages();
-}
-
SvxRedlinTable::~SvxRedlinTable()
{
if(pCommentSearcher!=NULL)
@@ -339,50 +323,6 @@ void SvxRedlinTable::SetCommentParams( const utl::SearchParam* pSearchPara )
}
}
-sal_Bool SvxRedlinTable::IsValidWriterEntry(const String& rString,RedlinData *pUserData)
-{
- sal_Bool nTheFlag=sal_True;
- String aString=rString.GetToken(WRITER_AUTHOR,'\t');
- if(pUserData==NULL)
- {
- if(bAuthor)
- {
- if(aAuthor.CompareTo(aString)==COMPARE_EQUAL)
- nTheFlag=sal_True;
- else
- nTheFlag=sal_False;
- }
- }
- else
- {
- DateTime aDateTime=pUserData->aDateTime;
- nTheFlag=IsValidEntry(&aString,&aDateTime);
- }
- return nTheFlag;
-}
-
-sal_Bool SvxRedlinTable::IsValidCalcEntry(const String& rString,RedlinData *pUserData)
-{
- sal_Bool nTheFlag=sal_True;
- String aString=rString.GetToken(CALC_AUTHOR,'\t');
- if(pUserData==NULL)
- {
- if(bAuthor)
- {
- if(aAuthor.CompareTo(aString)==COMPARE_EQUAL)
- nTheFlag=sal_True;
- else
- nTheFlag=sal_False;
- }
- }
- else
- {
- DateTime aDateTime=pUserData->aDateTime;
- nTheFlag=IsValidEntry(&aString,&aDateTime);
- }
- return nTheFlag;
-}
-
sal_Bool SvxRedlinTable::IsValidEntry(const String* pAuthorStr,
const DateTime *pDateTime,const String* pCommentStr)
{
@@ -837,22 +777,6 @@ String SvxTPFilter::GetMyName() const
return aStrMyName;
}
-void SvxTPFilter::DisableRange(sal_Bool bFlag)
-{
- if(bFlag)
- {
- aCbRange.Disable();
- aEdRange.Disable();
- aBtnRange.Disable();
- }
- else
- {
- aCbRange.Enable();
- aEdRange.Enable();
- aBtnRange.Enable();
- }
-}
-
void SvxTPFilter::ShowDateFields(sal_uInt16 nKind)
{
String aEmpty;
@@ -991,11 +915,6 @@ String SvxTPFilter::GetSelectedAuthor() const
return aLbAuthor.GetSelectEntry();
}
-sal_uInt16 SvxTPFilter::GetSelectedAuthorPos()
-{
- return (sal_uInt16) aLbAuthor.GetSelectEntryPos();
-}
-
void SvxTPFilter::SelectedAuthorPos(sal_uInt16 nPos)
{
aLbAuthor.SelectEntryPos(nPos);
@@ -1040,20 +959,6 @@ void SvxTPFilter::HideRange(sal_Bool bHide)
}
}
-void SvxTPFilter::HideClocks(sal_Bool bHide)
-{
- if(bHide)
- {
- aIbClock. Hide();
- aIbClock2.Hide();
- }
- else
- {
- aIbClock. Show();
- aIbClock2.Show();
- }
-}
-
void SvxTPFilter::SetComment(const String &rComment)
{
aEdComment.SetText(rComment);
diff --git a/svx/source/dialog/simptabl.cxx b/svx/source/dialog/simptabl.cxx
index c9fae16aca3a..e3b0aa597486 100644
--- a/svx/source/dialog/simptabl.cxx
+++ b/svx/source/dialog/simptabl.cxx
@@ -250,11 +250,6 @@ void SvxSimpleTable::InsertHeaderEntry(const rtl::OUString& rText,
SetTabs();
}
-void SvxSimpleTable::ClearAll()
-{
- aHeaderBar.Clear();
- Clear();
-}
void SvxSimpleTable::ClearHeader()
{
aHeaderBar.Clear();
@@ -290,11 +285,6 @@ sal_Bool SvxSimpleTable::IsEnabled() const
return m_rParentTableContainer.IsEnabled();
}
-void SvxSimpleTable::TableToTop()
-{
- m_rParentTableContainer.ToTop();
-}
-
sal_uInt16 SvxSimpleTable::GetSelectedCol()
{
return (aHeaderBar.GetCurItemId()-1);
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 2b575105cc06..6a15396a68c6 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -310,16 +310,6 @@ void SvxShape::setMaster( SvxShapeMaster* pMaster )
mpImpl->mpMaster = pMaster;
}
-SvxShapeMaster* SvxShape::getMaster()
-{
- return mpImpl->mpMaster;
-}
-
-const SvxShapeMaster* SvxShape::getMaster() const
-{
- return mpImpl->mpMaster;
-}
-
//----------------------------------------------------------------------
uno::Any SAL_CALL SvxShape::queryAggregation( const uno::Type& rType ) throw (uno::RuntimeException)
@@ -368,12 +358,6 @@ sal_Int64 SAL_CALL SvxShape::getSomething( const ::com::sun::star::uno::Sequence
}
//----------------------------------------------------------------------
-SvxShape* SvxShape::GetShapeForSdrObj( SdrObject* pObj ) throw()
-{
- return getImplementation( pObj->getUnoShape() );
-}
-
-//----------------------------------------------------------------------
::svx::PropertyChangeNotifier& SvxShape::getShapePropertyChangeNotifier()
{
return mpImpl->maPropertyNotifier;
diff --git a/sw/inc/pam.hxx b/sw/inc/pam.hxx
index 456d8ff108d1..53d1486632ac 100644
--- a/sw/inc/pam.hxx
+++ b/sw/inc/pam.hxx
@@ -299,10 +299,6 @@ public:
sal_Bool ContainsPosition(const SwPosition & rPos)
{ return *Start() <= rPos && rPos <= *End(); }
- static sal_Bool Overlap(const SwPaM & a, const SwPaM & b);
-
- static sal_Bool LessThan(const SwPaM & a, const SwPaM & b);
-
DECL_FIXEDMEMPOOL_NEWDEL(SwPaM);
String GetTxt() const;
diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx
index 4ef51b4161d4..0d9211bdcd0e 100644
--- a/sw/source/core/crsr/pam.cxx
+++ b/sw/source/core/crsr/pam.cxx
@@ -1141,11 +1141,6 @@ String SwPaM::GetTxt() const
return aResult;
}
-sal_Bool SwPaM::Overlap(const SwPaM & a, const SwPaM & b)
-{
- return !(*b.End() <= *a.Start() || *a.End() <= *b.End());
-}
-
void SwPaM::InvalidatePaM()
{
const SwNode *_pNd=this->GetNode();
@@ -1160,9 +1155,4 @@ void SwPaM::InvalidatePaM()
}
}
-sal_Bool SwPaM::LessThan(const SwPaM & a, const SwPaM & b)
-{
- return (*a.Start() < *b.Start()) || (*a.Start() == *b.Start() && *a.End() < *b.End());
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index 46088d743a11..96d596c310b9 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -105,12 +105,6 @@ namespace numfunc
}
#ifdef DBG_UTIL
-// Test2: WYSIWYG++
-// Test4: WYSIWYG debug
-static bool g_bDbgLow = false;
-#endif
-
-#ifdef DBG_UTIL
sal_Bool SwTxtSizeInfo::IsOptDbg() const { return GetOpt().IsTest4(); }
#endif
diff --git a/sw/source/ui/vba/vbacolumn.cxx b/sw/source/ui/vba/vbacolumn.cxx
index 0e1718c3fd3d..e5abefd4e599 100644
--- a/sw/source/ui/vba/vbacolumn.cxx
+++ b/sw/source/ui/vba/vbacolumn.cxx
@@ -50,61 +50,6 @@ SwVbaColumn::~SwVbaColumn()
{
}
-void SwVbaColumn::calculateAbsoluteColumnWidth( sal_Int32 nTableWidth, const css::uno::Sequence< css::text::TableColumnSeparator >& aSeparators, double* pAbsWidth )
-{
- const text::TableColumnSeparator* pArray = aSeparators.getConstArray();
- sal_Int32 nSepCount = aSeparators.getLength();
- for( sal_Int32 i = 0; i <= nSepCount; i++ )
- {
- sal_Int32 nRelColWidth = 0;
- if( i == 0 )
- {
- if( nSepCount != 0 )
- {
- nRelColWidth = pArray[0].Position;
- }
- else
- {
- nRelColWidth = RELATIVE_TABLE_WIDTH;
- }
- }
- else
- {
- if( i == nSepCount )
- {
- nRelColWidth = RELATIVE_TABLE_WIDTH - pArray[i-1].Position;
- }
- else
- {
- nRelColWidth = pArray[i].Position - pArray[i-1].Position;
- }
- }
- pAbsWidth[i] = ( (double)nRelColWidth / RELATIVE_TABLE_WIDTH ) * (double) nTableWidth;
- }
-}
-
-void SwVbaColumn::calculateRelativeColumnWidth( const double* pAbsWidth, double* pRelWidth, sal_Int32 nCount )
-{
- double tableWidth = 0.0;
- for( sal_Int32 i = 0; i < nCount; i++ )
- {
- tableWidth += pAbsWidth[i];
- }
-
- pRelWidth[ nCount - 1 ] = tableWidth;
- for( sal_Int32 i = 0; i < nCount - 1; i++ )
- {
- if( i == 0 )
- {
- pRelWidth[i] = ( pAbsWidth[i] * RELATIVE_TABLE_WIDTH ) / tableWidth;
- }
- else
- {
- pRelWidth[i] = pRelWidth[i-1] + ( pAbsWidth[i] * RELATIVE_TABLE_WIDTH ) / tableWidth;
- }
- }
-}
-
sal_Int32 SAL_CALL
SwVbaColumn::getWidth( ) throw ( css::uno::RuntimeException )
{
diff --git a/sw/source/ui/vba/vbacolumn.hxx b/sw/source/ui/vba/vbacolumn.hxx
index 3ab42d6491d8..fe7926fee2de 100644
--- a/sw/source/ui/vba/vbacolumn.hxx
+++ b/sw/source/ui/vba/vbacolumn.hxx
@@ -44,10 +44,6 @@ private:
css::uno::Reference< css::table::XTableColumns > mxTableColumns;
sal_Int32 mnIndex;
-private:
- void calculateAbsoluteColumnWidth( sal_Int32 nTableWidth, const css::uno::Sequence< css::text::TableColumnSeparator >& aSeparators, double* pAbsWidth );
- void calculateRelativeColumnWidth( const double* pAbsWidth, double* pRelWidth, sal_Int32 nCount );
-
public:
SwVbaColumn( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextTable >& xTextTable, sal_Int32 nIndex ) throw ( css::uno::RuntimeException );
virtual ~SwVbaColumn();
diff --git a/sw/source/ui/vba/vbastyle.cxx b/sw/source/ui/vba/vbastyle.cxx
index 4c966e3637ce..9b037b02c2ef 100644
--- a/sw/source/ui/vba/vbastyle.cxx
+++ b/sw/source/ui/vba/vbastyle.cxx
@@ -127,33 +127,6 @@ void SwVbaStyle::setStyle( const uno::Reference< beans::XPropertySet >& xParaPro
throw uno::RuntimeException();
}
-rtl::OUString SwVbaStyle::getOOoStyleTypeFromMSWord( sal_Int32 _wdStyleType )
-{
- rtl::OUString aStyleType;
- switch( _wdStyleType )
- {
- case word::WdStyleType::wdStyleTypeParagraph:
- case word::WdStyleType::wdStyleTypeTable:
- {
- aStyleType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParaStyleName") );
- break;
- }
- case word::WdStyleType::wdStyleTypeCharacter:
- {
- aStyleType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CharStyleName") );
- break;
- }
- case word::WdStyleType::wdStyleTypeList:
- {
- aStyleType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("NumberingStyleName") );
- break;
- }
- default:
- DebugHelper::exception( SbERR_INTERNAL_ERROR, rtl::OUString() );
- }
- return aStyleType;
-}
-
::rtl::OUString SAL_CALL SwVbaStyle::getNameLocal() throw (uno::RuntimeException)
{
rtl::OUString sNameLocal;
diff --git a/sw/source/ui/vba/vbastyle.hxx b/sw/source/ui/vba/vbastyle.hxx
index 4052a6bd8162..b6a2867f3dfb 100644
--- a/sw/source/ui/vba/vbastyle.hxx
+++ b/sw/source/ui/vba/vbastyle.hxx
@@ -50,7 +50,6 @@ public:
virtual ~SwVbaStyle(){}
static void setStyle( const css::uno::Reference< css::beans::XPropertySet >& xParaProps, const css::uno::Any& xStyle ) throw (css::uno::RuntimeException);
- static rtl::OUString getOOoStyleTypeFromMSWord( sal_Int32 _wdStyleType );
static sal_Int32 getLanguageID( const css::uno::Reference< css::beans::XPropertySet >& xTCProps ) throw (css::uno::RuntimeException);
static void setLanguageID( const css::uno::Reference< css::beans::XPropertySet >& xTCProps, sal_Int32 _languageid ) throw (css::uno::RuntimeException);
diff --git a/toolkit/inc/toolkit/helper/vclunohelper.hxx b/toolkit/inc/toolkit/helper/vclunohelper.hxx
index ba8844eb277c..bb6e1ebcceb9 100644
--- a/toolkit/inc/toolkit/helper/vclunohelper.hxx
+++ b/toolkit/inc/toolkit/helper/vclunohelper.hxx
@@ -136,7 +136,6 @@ public:
static FieldUnit ConvertToFieldUnit( sal_Int16 _nMeasurementUnit, sal_Int16& _rFieldToUNOValueFactor );
static MapUnit /* MapModeUnit */ ConvertToMapModeUnit(sal_Int16 /* com.sun.star.util.MeasureUnit.* */ _nMeasureUnit) throw (::com::sun::star::lang::IllegalArgumentException);
- static sal_Int16 /* com.sun.star.util.MeasureUnit.* */ ConvertToMeasurementUnit(MapUnit /* MapModeUnit */ _nMapModeUnit) throw (::com::sun::star::lang::IllegalArgumentException);
static ::Size /* VCLSize */ ConvertToVCLSize(::com::sun::star::awt::Size const& _aSize);
static ::com::sun::star::awt::Size ConvertToAWTSize(::Size /* VCLSize */ const& _aSize);
diff --git a/toolkit/source/helper/vclunohelper.cxx b/toolkit/source/helper/vclunohelper.cxx
index 4a38bf82a325..7fce9f1f95af 100644
--- a/toolkit/source/helper/vclunohelper.cxx
+++ b/toolkit/source/helper/vclunohelper.cxx
@@ -642,76 +642,6 @@ MapUnit /* MapModeUnit */ VCLUnoHelper::ConvertToMapModeUnit(sal_Int16 /* com.su
return eMode;
}
-sal_Int16 /* com.sun.star.util.MeasureUnit.* */ VCLUnoHelper::ConvertToMeasurementUnit(MapUnit /* MapModeUnit */ _eMapModeUnit) throw (::com::sun::star::lang::IllegalArgumentException)
-{
- sal_Int16 nMeasureUnit = 0;
- switch (_eMapModeUnit)
- {
- case MAP_100TH_MM:
- nMeasureUnit = com::sun::star::util::MeasureUnit::MM_100TH;
- break;
-
- case MAP_10TH_MM:
- nMeasureUnit = com::sun::star::util::MeasureUnit::MM_10TH;
- break;
-
- case MAP_MM:
- nMeasureUnit = com::sun::star::util::MeasureUnit::MM;
- break;
-
- case MAP_CM:
- nMeasureUnit = com::sun::star::util::MeasureUnit::CM;
- break;
-
- case MAP_1000TH_INCH:
- nMeasureUnit = com::sun::star::util::MeasureUnit::INCH_1000TH;
- break;
-
- case MAP_100TH_INCH:
- nMeasureUnit = com::sun::star::util::MeasureUnit::INCH_100TH;
- break;
-
- case MAP_10TH_INCH:
- nMeasureUnit = com::sun::star::util::MeasureUnit::INCH_10TH;
- break;
-
- case MAP_INCH:
- nMeasureUnit = com::sun::star::util::MeasureUnit::INCH;
- break;
-
- case MAP_POINT:
- nMeasureUnit = com::sun::star::util::MeasureUnit::POINT;
- break;
-
- case MAP_TWIP:
- nMeasureUnit = com::sun::star::util::MeasureUnit::TWIP;
- break;
-
- case MAP_PIXEL:
- nMeasureUnit = com::sun::star::util::MeasureUnit::PIXEL;
- break;
-
- case MAP_APPFONT:
- nMeasureUnit = com::sun::star::util::MeasureUnit::APPFONT;
- break;
-
- case MAP_SYSFONT:
- nMeasureUnit = com::sun::star::util::MeasureUnit::SYSFONT;
- break;
-
-/*
- case MAP_RELATIVE:
- break;
-
- case MAP_REALAPPFONT:
- break;
-*/
- default:
- throw ::com::sun::star::lang::IllegalArgumentException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Unsupported MapMode unit.")), NULL, 1 );
- }
- return nMeasureUnit;
-}
-
::Size VCLUnoHelper::ConvertToVCLSize(com::sun::star::awt::Size const& _aSize)
{
::Size aVCLSize(_aSize.Width, _aSize.Height);
diff --git a/unusedcode.easy b/unusedcode.easy
index 564d2d75fcec..2a6c2fce8792 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -562,9 +562,6 @@ SvxPositionSizeTabPage::LinkStubChangePosXHdl(void*, void*)
SvxPositionSizeTabPage::LinkStubChangePosYHdl(void*, void*)
SvxRectCtlAccessibleContext::setDescription(rtl::OUString const&)
SvxRectCtlAccessibleContext::setName(rtl::OUString const&)
-SvxRedlinTable::IsValidCalcEntry(String const&, RedlinData*)
-SvxRedlinTable::IsValidWriterEntry(String const&, RedlinData*)
-SvxRedlinTable::SvxRedlinTable(SvxSimpleTableContainer&, ResId const&)
SvxRelativeField::SvxRelativeField(Window*, long)
SvxReloadControllerItem::RegisterControl(unsigned short, SfxModule*)
SvxRubyChildWindow::GetChildWindowId()
@@ -572,22 +569,9 @@ SvxRuler::GetDefTabDist() const
SvxSearchDialog::GetReplaceItems(SfxItemSet&)
SvxSearchDialog::GetSearchItems(SfxItemSet&)
SvxSearchDialog::SvxSearchDialog(Window*, SfxBindings&)
-SvxSearchItem::GetFromDescriptor(com::sun::star::uno::Reference<com::sun::star::util::XSearchDescriptor> const&)
-SvxSearchItem::SetToDescriptor(com::sun::star::uno::Reference<com::sun::star::util::XSearchDescriptor>&)
SvxSelectionModeControl::GetDefItemWidth(StatusBar const&)
-SvxShape::GetShapeForSdrObj(SdrObject*)
-SvxShape::getMaster()
-SvxShape::getMaster() const
SvxShapePolyPolygonBezier::GetPolygonKind() const
SvxShapeText::SvxShapeText()
-SvxSimpleTable::ClearAll()
-SvxSimpleTable::TableToTop()
-SvxSuperContourDlg::DoAutoCreate()
-SvxSuperContourDlg::ReducePoints(long)
-SvxTPFilter::DisableRange(unsigned char)
-SvxTPFilter::GetSelectedAuthorPos()
-SvxTPFilter::HideClocks(unsigned char)
-SvxTabStopArr::Insert(SvxTabStop const&, unsigned short&)
SvxTabStopArr::Insert(SvxTabStop const*, unsigned short)
SvxTabStopArr::Remove(SvxTabStop const&, unsigned short)
SvxTabStopArr_SAR::Replace(SvxTabStop const&, unsigned short)
@@ -661,8 +645,6 @@ SwModule::SetUseRsid(unsigned char)
SwOutlineNodes::Insert(SwNode* const&, unsigned short&)
SwOutlineNodes::Insert(SwNode* const*, unsigned short)
SwOutlineNodes::Insert(SwOutlineNodes const*, unsigned short, unsigned short)
-SwPaM::LessThan(SwPaM const&, SwPaM const&)
-SwPaM::Overlap(SwPaM const&, SwPaM const&)
SwPosFlyFrms::DeleteAndDestroy(unsigned short, unsigned short)
SwPosFlyFrms::Insert(SwPosFlyFrm* const&, unsigned short&)
SwPosFlyFrms::Insert(SwPosFlyFrm* const*, unsigned short)
@@ -703,9 +685,6 @@ SwTableSortBoxes::DeleteAndDestroy(unsigned short, unsigned short)
SwTableSortBoxes::Insert(SwTableBox* const&, unsigned short&)
SwTableSortBoxes::Insert(SwTableBox* const*, unsigned short)
SwTxtFly::ShowContour(OutputDevice*)
-SwVbaColumn::calculateAbsoluteColumnWidth(int, com::sun::star::uno::Sequence<com::sun::star::text::TableColumnSeparator> const&, double*)
-SwVbaColumn::calculateRelativeColumnWidth(double const*, double*, int)
-SwVbaStyle::getOOoStyleTypeFromMSWord(int)
SwVbaTableHelper::setTableWidth(int)
SwWriteTableCols::Insert(SwWriteTableCol* const&, unsigned short&)
SwWriteTableCols::Insert(SwWriteTableCol* const*, unsigned short)
@@ -774,7 +753,6 @@ UnoDialog::getMapsFromPixels(int) const
UnoListBoxControl::getActionListeners()
UnoListBoxControl::getItemListeners()
UnoMemoryStream::UnoMemoryStream(unsigned int, unsigned int)
-VCLUnoHelper::ConvertToMeasurementUnit(MapUnit)
VCLUnoHelper::CreatePointer()
VCLXDevice::IsCreatedWithToolkit() const
VCLXPrinterServer::getImplementationId()
@@ -812,7 +790,6 @@ WW8OleMaps::Remove(unsigned short, unsigned short)
WinMtfOutput::DrawLine(Point const&, Point const&)
WinMtfOutput::GetTextLayoutMode() const
WinMtfOutput::SetFont(Font const&)
-Window::GetFullscreenSpriteCanvas(Size const&) const
Window::PostUserEvent(unsigned long&, unsigned long, void*)
X11SalGraphics::SetMask(int&, int&, unsigned int&, unsigned int&, int&, int&, unsigned long)
X509Certificate_NssImpl::getImplementation(com::sun::star::uno::Reference<com::sun::star::uno::XInterface>)
diff --git a/vcl/inc/vcl/window.hxx b/vcl/inc/vcl/window.hxx
index 33544997f55f..ad445b7a0064 100644
--- a/vcl/inc/vcl/window.hxx
+++ b/vcl/inc/vcl/window.hxx
@@ -1029,9 +1029,6 @@ public:
/// request XSpriteCanvas render interface for this window
::com::sun::star::uno::Reference<
::com::sun::star::rendering::XSpriteCanvas > GetSpriteCanvas() const;
- /// request fullscreen XSpriteCanvas render interface for this window
- ::com::sun::star::uno::Reference<
- ::com::sun::star::rendering::XSpriteCanvas > GetFullscreenSpriteCanvas( const Size& rFullscreenSize ) const;
/* records all DrawText operations within the passed rectangle;
* a synchronous paint is sent to achieve this
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 54ac8b2ad68d..06f1efc586c6 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -9441,13 +9441,6 @@ uno::Reference< rendering::XSpriteCanvas > Window::GetSpriteCanvas() const
return xSpriteCanvas;
}
-uno::Reference< ::com::sun::star::rendering::XSpriteCanvas > Window::GetFullscreenSpriteCanvas( const Size& rFullscreenSize ) const
-{
- uno::Reference< rendering::XSpriteCanvas > xSpriteCanvas(
- ImplGetCanvas( rFullscreenSize, true, true ), uno::UNO_QUERY );
- return xSpriteCanvas;
-}
-
void Window::ImplPaintToDevice( OutputDevice* i_pTargetOutDev, const Point& i_rPos )
{
sal_Bool bRVisible = mpWindowImpl->mbReallyVisible;