From 105546f7f11ccee50f8066bfb7c753fabb177fc8 Mon Sep 17 00:00:00 2001 From: Thomas Arnhold Date: Wed, 18 Jan 2012 19:48:19 +0100 Subject: remove unused code --- sw/inc/pam.hxx | 4 --- sw/source/core/crsr/pam.cxx | 10 -------- sw/source/core/text/inftxt.cxx | 6 ----- sw/source/ui/vba/vbacolumn.cxx | 55 ------------------------------------------ sw/source/ui/vba/vbacolumn.hxx | 4 --- sw/source/ui/vba/vbastyle.cxx | 27 --------------------- sw/source/ui/vba/vbastyle.hxx | 1 - 7 files changed, 107 deletions(-) (limited to 'sw') 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 @@ -104,12 +104,6 @@ namespace numfunc extern bool IsDefBulletFontUserDefined(); } -#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); -- cgit