summaryrefslogtreecommitdiff
path: root/svtools/source
diff options
context:
space:
mode:
Diffstat (limited to 'svtools/source')
-rw-r--r--svtools/source/config/accessibilityoptions.cxx4
-rw-r--r--svtools/source/dialogs/mcvmath.cxx68
-rw-r--r--svtools/source/dialogs/mcvmath.hxx3
-rw-r--r--svtools/source/graphic/grfmgr.cxx42
-rw-r--r--svtools/source/misc/transfer.cxx15
5 files changed, 2 insertions, 130 deletions
diff --git a/svtools/source/config/accessibilityoptions.cxx b/svtools/source/config/accessibilityoptions.cxx
index 5d3f9718cac3..c083ffce71a0 100644
--- a/svtools/source/config/accessibilityoptions.cxx
+++ b/svtools/source/config/accessibilityoptions.cxx
@@ -617,10 +617,6 @@ bool SvtAccessibilityOptions::GetIsForPagePreviews() const
{
return sm_pSingleImplConfig->GetIsForPagePreviews();
}
-bool SvtAccessibilityOptions::GetIsHelpTipsDisappear() const
-{
- return sm_pSingleImplConfig->GetIsHelpTipsDisappear();
-}
bool SvtAccessibilityOptions::GetIsAllowAnimatedGraphics() const
{
return sm_pSingleImplConfig->GetIsAllowAnimatedGraphics();
diff --git a/svtools/source/dialogs/mcvmath.cxx b/svtools/source/dialogs/mcvmath.cxx
index 3dbd6d83d2ec..b4a72eb4004d 100644
--- a/svtools/source/dialogs/mcvmath.cxx
+++ b/svtools/source/dialogs/mcvmath.cxx
@@ -20,44 +20,6 @@
#include "mcvmath.hxx"
-
-// die folgenden Tabellen enthalten sin(phi) * 2**14
-// fuer phi= 360Grad*2**-32 bis 360 Grad
-// def. fuer x: phi=360Grad * 2**(x-16)
-// d.h. x = 16 -> 360 Grad
-// x = -16 -> (2**-16) * 360 Grad
-// x: -16 ... 0 ... 15
-//x= 0, 1, 2, 3, 4, 5, 6, 7,
-// 8, 9, 10, 11, 12, 13, 14, 15
-
-static const short CosTab[16] =
-{
- 16384, 16384, 16384, 16384, 16384, 16384, 16384, 16383,
- 16379, 16364, 16305, 16069, 15137, 11585, 0, -16383
-};
-static const short SinTab[16]=
-{
- 2, 3, 6, 13, 25, 50, 101, 201,
- 402, 804, 1606, 3196, 6270, 11585, 16384, 0
-};
-
-/**************************************************************************
-|*
-|* ImpMultBig2()
-|*
-|* Description Multiplier for FixPoint-calculations
-|*
-**************************************************************************/
-
-// first parameter should be the larger one
-
-Fix ImpMultBig2( const Fix& a, const Fix& b )
-{
- Fix f;
- f.x = (((b.x+FIX_A2)>>FIX_P2)*a.x+FIX_A3)>>FIX_P3;
- return f;
-}
-
/**************************************************************************
|*
|* ImpSqrt()
@@ -88,34 +50,4 @@ sal_uInt16 ImpSqrt( sal_uLong nRadi )
return sal::static_int_cast< sal_uInt16 >(sqr);
}
-/**************************************************************************
-|*
-|* ImpExPI()
-|*
-|* Description EXPI funktion or FixPoint-calculations
-|*
-**************************************************************************/
-
-// e**(i*nPhi), unit nPhi: 2**16 == 360 degrees
-
-FixCpx ImpExPI( sal_uInt16 nPhi )
-{
- short i;
- FixCpx aIter(Fix(1L)); // e**(0*i)
- FixCpx Mul;
- const char Sft=14-FIX_POST;
-
- for ( i = 15; i >= 0; i-- )
- {
- if ( (1L<<i) & nPhi )
- {
- Mul.r.x = CosTab[i]>>Sft; // e**(i(phi1+phi2)) =
- Mul.i.x = SinTab[i]>>Sft; // e**(i*phi1)) * e**(i*phi2))
- aIter *= Mul;
- }
- }
-
- return aIter;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/dialogs/mcvmath.hxx b/svtools/source/dialogs/mcvmath.hxx
index 480980462e32..2e84f5165558 100644
--- a/svtools/source/dialogs/mcvmath.hxx
+++ b/svtools/source/dialogs/mcvmath.hxx
@@ -189,10 +189,7 @@ inline FixCpx operator/ ( const FixCpx& a, const FixCpx& b )
-Fix ImpMultBig2( const Fix& a, const Fix& b );
-
sal_uInt16 ImpSqrt( sal_uLong nRadi );
-FixCpx ImpExPI( sal_uInt16 nPhi );
#endif // INCLUDED_SVTOOLS_SOURCE_DIALOGS_MCVMATH_HXX
diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx
index e6fbd3f3024d..a1f1015b644b 100644
--- a/svtools/source/graphic/grfmgr.cxx
+++ b/svtools/source/graphic/grfmgr.cxx
@@ -1083,48 +1083,6 @@ IMPL_LINK_NOARG_TYPED(GraphicObject, ImplAutoSwapOutHdl, Timer *, void)
mpSwapOutTimer->Start();
}
-SvStream& ReadGraphicObject( SvStream& rIStm, GraphicObject& rGraphicObj )
-{
- VersionCompat aCompat( rIStm, StreamMode::READ );
- Graphic aGraphic;
- GraphicAttr aAttr;
- bool bLink;
-
- ReadGraphic( rIStm, aGraphic );
- ReadGraphicAttr( rIStm, aAttr );
- rIStm.ReadCharAsBool( bLink );
-
- rGraphicObj.SetGraphic( aGraphic );
- rGraphicObj.SetAttr( aAttr );
-
- if( bLink )
- {
- OUString aLink = read_uInt16_lenPrefixed_uInt8s_ToOUString(rIStm, RTL_TEXTENCODING_UTF8);
- rGraphicObj.SetLink(aLink);
- }
- else
- rGraphicObj.SetLink();
-
- rGraphicObj.SetSwapStreamHdl();
-
- return rIStm;
-}
-
-SvStream& WriteGraphicObject( SvStream& rOStm, const GraphicObject& rGraphicObj )
-{
- VersionCompat aCompat( rOStm, StreamMode::WRITE, 1 );
- const bool bLink = rGraphicObj.HasLink();
-
- WriteGraphic( rOStm, rGraphicObj.GetGraphic() );
- WriteGraphicAttr( rOStm, rGraphicObj.GetAttr() );
- rOStm.WriteBool( bLink );
-
- if( bLink )
- write_uInt16_lenPrefixed_uInt8s_FromOUString(rOStm, rGraphicObj.GetLink(), RTL_TEXTENCODING_UTF8);
-
- return rOStm;
-}
-
#define UNO_NAME_GRAPHOBJ_URLPREFIX "vnd.sun.star.GraphicObject:"
GraphicObject GraphicObject::CreateGraphicObjectFromURL( const OUString &rURL )
diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx
index 8145532dba84..538dbfcab34d 100644
--- a/svtools/source/misc/transfer.cxx
+++ b/svtools/source/misc/transfer.cxx
@@ -737,19 +737,8 @@ bool TransferableHelper::SetBitmapEx( const BitmapEx& rBitmapEx, const DataFlavo
{
const Bitmap aBitmap(rBitmapEx.GetBitmap());
- // #i124085# take out DIBV5 for writing to the clipboard
- //if(rBitmapEx.IsTransparent())
- //{
- // const Bitmap aMask(rBitmapEx.GetAlpha().GetBitmap());
-
- // // explicitely use Bitmap::Write with bCompressed = sal_False and bFileHeader = sal_True
- // WriteDIBV5(aBitmap, aMask, aMemStm);
- //}
- //else
- //{
- // explicitely use Bitmap::Write with bCompressed = sal_False and bFileHeader = sal_True
- WriteDIB(aBitmap, aMemStm, false, true);
- //}
+ // explicitely use Bitmap::Write with bCompressed = sal_False and bFileHeader = sal_True
+ WriteDIB(aBitmap, aMemStm, false, true);
}
maAny <<= Sequence< sal_Int8 >( static_cast< const sal_Int8* >( aMemStm.GetData() ), aMemStm.Seek( STREAM_SEEK_TO_END ) );
generated by cgit (git 2.34.1) at 2024-07-15 06:54:10 +0000