diff options
author | Marc-André Laverdière-Papineau <marc-andre@atc.tcs.com> | 2012-01-15 18:24:58 -0500 |
---|---|---|
committer | Kohei Yoshida <kohei.yoshida@suse.com> | 2012-01-18 20:02:19 -0500 |
commit | 05a8ecca55d96b823348fa390482be6cfee64f69 (patch) | |
tree | c7deb8edaac63f4edca00c281ecacfa78ee96ae9 | |
parent | fdo#44896 accomodate localized text expansion (diff) | |
download | core-05a8ecca55d96b823348fa390482be6cfee64f69.tar.gz core-05a8ecca55d96b823348fa390482be6cfee64f69.zip |
removed some dead code
-rw-r--r-- | filter/source/svg/svgexport.cxx | 50 | ||||
-rw-r--r-- | filter/source/svg/svgfilter.hxx | 6 | ||||
-rw-r--r-- | filter/source/svg/svgwriter.cxx | 8 | ||||
-rw-r--r-- | tools/inc/tools/color.hxx | 1 | ||||
-rw-r--r-- | tools/source/generic/color.cxx | 15 | ||||
-rw-r--r-- | unusedcode.easy | 7 | ||||
-rw-r--r-- | writerperfect/source/filter/PageSpan.cxx | 16 | ||||
-rw-r--r-- | writerperfect/source/filter/PageSpan.hxx | 2 |
8 files changed, 1 insertions, 104 deletions
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx index 6149ddf2960d..ea63fa164066 100644 --- a/filter/source/svg/svgexport.cxx +++ b/filter/source/svg/svgexport.cxx @@ -382,20 +382,6 @@ sal_Bool SVGExport::IsUseNativeTextDecoration() const // ----------------------------------------------------------------------------- -::rtl::OUString SVGExport::GetGlyphPlacement() const -{ - ::rtl::OUString aRet; - - if( mrFilterData.getLength() > 3 ) - mrFilterData[ 3 ].Value >>= aRet; - else - aRet = B2UCONST( "abs" ); - - return aRet; -} - -// ----------------------------------------------------------------------------- - sal_Bool SVGExport::IsUseOpacity() const { sal_Bool bRet = !IsUseTinyProfile(); @@ -408,43 +394,9 @@ sal_Bool SVGExport::IsUseOpacity() const // ----------------------------------------------------------------------------- -sal_Bool SVGExport::IsUseGradient() const -{ - sal_Bool bRet = !IsUseTinyProfile(); - - if( !bRet && ( mrFilterData.getLength() > 5 ) ) - mrFilterData[ 5 ].Value >>= bRet; - - return bRet; -} - -// ----------------------------------------------------------------------------- - -void SVGExport::pushClip( const ::basegfx::B2DPolyPolygon& rPolyPoly ) -{ - maClipList.push_front( ::basegfx::tools::correctOrientations( rPolyPoly ) ); -} - -// ----------------------------------------------------------------------------- - -void SVGExport::popClip() -{ - if( !maClipList.empty() ) - maClipList.pop_front(); -} - -// ----------------------------------------------------------------------------- - -sal_Bool SVGExport::hasClip() const -{ - return( !maClipList.empty() ); -} - -// ----------------------------------------------------------------------------- - const ::basegfx::B2DPolyPolygon* SVGExport::getCurClip() const { - return( maClipList.empty() ? NULL : &( *maClipList.begin() ) ); + return NULL; } // ------------------------ diff --git a/filter/source/svg/svgfilter.hxx b/filter/source/svg/svgfilter.hxx index 21c123853503..d218e065467e 100644 --- a/filter/source/svg/svgfilter.hxx +++ b/filter/source/svg/svgfilter.hxx @@ -141,13 +141,8 @@ public: sal_Bool IsUseTinyProfile() const; sal_Bool IsEmbedFonts() const; sal_Bool IsUseNativeTextDecoration() const; - ::rtl::OUString GetGlyphPlacement() const; sal_Bool IsUseOpacity() const; - sal_Bool IsUseGradient() const; - void pushClip( const ::basegfx::B2DPolyPolygon& rPolyPoly ); - void popClip(); - sal_Bool hasClip() const; const ::basegfx::B2DPolyPolygon* getCurClip() const; protected: @@ -161,7 +156,6 @@ protected: private: const Sequence< PropertyValue >& mrFilterData; - B2DPolyPolygonList maClipList; SVGExport(); }; diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx index 9f70046dfe7f..0639e5d681e0 100644 --- a/filter/source/svg/svgwriter.cxx +++ b/filter/source/svg/svgwriter.cxx @@ -640,14 +640,6 @@ void SVGActionWriter::ImplWritePolyPolygon( const PolyPolygon& rPolyPoly, sal_Bo else aPolyPoly = rPolyPoly; - if( mrExport.hasClip() ) - { - const ::basegfx::B2DPolyPolygon aB2DPolyPoly( ::basegfx::tools::correctOrientations( aPolyPoly.getB2DPolyPolygon() ) ); - - aPolyPoly = PolyPolygon( ::basegfx::tools::clipPolyPolygonOnPolyPolygon( - *mrExport.getCurClip(), aB2DPolyPoly, sal_False, sal_False ) ); - } - // add path data attribute mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrD, GetPathString( aPolyPoly, bLineOnly ) ); diff --git a/tools/inc/tools/color.hxx b/tools/inc/tools/color.hxx index ba9d7df5806d..a9fe58975e17 100644 --- a/tools/inc/tools/color.hxx +++ b/tools/inc/tools/color.hxx @@ -156,7 +156,6 @@ public: void IncreaseLuminance( sal_uInt8 cLumInc ); void DecreaseLuminance( sal_uInt8 cLumDec ); - void IncreaseContrast( sal_uInt8 cContInc ); void DecreaseContrast( sal_uInt8 cContDec ); void Invert(); diff --git a/tools/source/generic/color.cxx b/tools/source/generic/color.cxx index f06d3d1a5ac0..aa848f72bbbe 100644 --- a/tools/source/generic/color.cxx +++ b/tools/source/generic/color.cxx @@ -102,21 +102,6 @@ void Color::DecreaseLuminance( sal_uInt8 cLumDec ) // ----------------------------------------------------------------------- -void Color::IncreaseContrast( sal_uInt8 cContInc ) -{ - if( cContInc) - { - const double fM = 128.0 / ( 128.0 - 0.4985 * cContInc ); - const double fOff = 128.0 - fM * 128.0; - - SetRed( (sal_uInt8) SAL_BOUND( _FRound( COLORDATA_RED( mnColor ) * fM + fOff ), 0L, 255L ) ); - SetGreen( (sal_uInt8) SAL_BOUND( _FRound( COLORDATA_GREEN( mnColor ) * fM + fOff ), 0L, 255L ) ); - SetBlue( (sal_uInt8) SAL_BOUND( _FRound( COLORDATA_BLUE( mnColor ) * fM + fOff ), 0L, 255L ) ); - } -} - -// ----------------------------------------------------------------------- - void Color::DecreaseContrast( sal_uInt8 cContDec ) { if( cContDec ) diff --git a/unusedcode.easy b/unusedcode.easy index 2a6c2fce8792..c472c729611a 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -55,7 +55,6 @@ CharPosArray::Insert(CharPosArray const*, unsigned short, unsigned short, unsign CharPosArray::Replace(int const&, unsigned short) CharPosArray::Replace(int const*, unsigned short, unsigned short) CharPosArray::_ForEach(unsigned short, unsigned short, unsigned char (*)(int const&, void*), void*) -Color::IncreaseContrast(unsigned char) CurrencyField::ImplLoadRes(ResId const&) CustomToolBarImportHelper::showToolbar(rtl::OUString const&) DdeGetPutItem::DdeGetPutItem(DdeItem const&) @@ -166,8 +165,6 @@ Octree::AddColor(BitmapColor const&) Octree::Octree(unsigned long) OutputDevice::LogicToPixel(PolyPolygon const&, MapMode const&) const OutputDevice::PixelToLogic(PolyPolygon const&, MapMode const&) const -PageSpan::getMarginLeft() const -PageSpan::getMarginRight() const ParagraphObj::ParagraphObj(ParagraphObj&) ParagraphStyleManager::get(WPXString const&) const PathDialog::SetPath(Edit const&) @@ -179,10 +176,6 @@ PropBrwMgr::GetChildWindowId() ProposalList::Remove(rtl::OUString const&) PushButton::GetSymbolAlign() const ResData::Dump() -SVGExport::GetGlyphPlacement() const -SVGExport::IsUseGradient() const -SVGExport::popClip() -SVGExport::pushClip(basegfx::B2DPolyPolygon const&) SalGraphics::DrawBitmap(SalTwoRect const*, SalBitmap const&, unsigned int, OutputDevice const*) SalGraphics::DrawNativeControlText(unsigned int, unsigned int, Rectangle const&, unsigned int, ImplControlValue const&, rtl::OUString const&, OutputDevice const*) SalGraphics::drawAlphaBitmap(SalTwoRect const&, SalBitmap const&, SalBitmap const&) diff --git a/writerperfect/source/filter/PageSpan.cxx b/writerperfect/source/filter/PageSpan.cxx index cb7da9729194..944764e5a25b 100644 --- a/writerperfect/source/filter/PageSpan.cxx +++ b/writerperfect/source/filter/PageSpan.cxx @@ -91,22 +91,6 @@ int PageSpan::getSpan() const return 0; // should never happen } -double PageSpan::getMarginLeft() const -{ - if (mxPropList["fo:margin-left"]) - return mxPropList["fo:margin-left"]->getDouble(); - - return 0.0; -} - -double PageSpan::getMarginRight() const -{ - if (mxPropList["fo:margin-right"]) - return mxPropList["fo:margin-right"]->getDouble(); - - return 0.0; -} - void PageSpan::setHeaderContent(std::vector<DocumentElement *> * pHeaderContent) { if (mpHeaderContent) diff --git a/writerperfect/source/filter/PageSpan.hxx b/writerperfect/source/filter/PageSpan.hxx index c3d5cc16dd28..9172937f0fd3 100644 --- a/writerperfect/source/filter/PageSpan.hxx +++ b/writerperfect/source/filter/PageSpan.hxx @@ -41,8 +41,6 @@ public: void writePageLayout(const int iNum, OdfDocumentHandler *pHandler) const; void writeMasterPages(const int iStartingNum, const int iPageLayoutNum, const bool bLastPageSpan, OdfDocumentHandler *pHandler) const; int getSpan() const; - double getMarginLeft() const; - double getMarginRight() const; void setHeaderContent(std::vector<DocumentElement *> * pHeaderContent); void setFooterContent(std::vector<DocumentElement *> * pFooterContent); |