diff options
| -rw-r--r-- | include/vcl/mapmod.hxx | 1 | ||||
| -rw-r--r-- | sc/inc/compiler.hxx | 1 | ||||
| -rw-r--r-- | sc/source/core/tool/token.cxx | 9 | ||||
| -rw-r--r-- | sc/source/filter/inc/drawingmanager.hxx | 25 | ||||
| -rw-r--r-- | sc/source/filter/oox/drawingmanager.cxx | 18 | ||||
| -rw-r--r-- | unusedcode.easy | 2 | ||||
| -rw-r--r-- | vcl/source/gdi/mapmod.cxx | 5 |
7 files changed, 0 insertions, 61 deletions
diff --git a/include/vcl/mapmod.hxx b/include/vcl/mapmod.hxx index 266e38f1ad0f..2edd16f09923 100644 --- a/include/vcl/mapmod.hxx +++ b/include/vcl/mapmod.hxx @@ -69,7 +69,6 @@ public: bool operator!=( const MapMode& rMapMode ) const { return !(MapMode::operator==( rMapMode )); } bool IsDefault() const; - bool IsSameInstance( const MapMode& rMapMode ) const; friend VCL_DLLPUBLIC SvStream& ReadMapMode( SvStream& rIStm, MapMode& rMapMode ); friend VCL_DLLPUBLIC SvStream& WriteMapMode( SvStream& rOStm, const MapMode& rMapMode ); diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx index 93246cd3e41b..8ae1a8e56db8 100644 --- a/sc/inc/compiler.hxx +++ b/sc/inc/compiler.hxx @@ -115,7 +115,6 @@ struct ScRawToken: private ScRawTokenBase // Friends that use a temporary ScRawToken on the stack (and therefore need // the private dtor) and know what they're doing.. friend class ScTokenArray; - static sal_uInt16 sbyteOffset(); public: union { double nValue; diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx index 28bb7a10d5e6..f0030f69826c 100644 --- a/sc/source/core/tool/token.cxx +++ b/sc/source/core/tool/token.cxx @@ -291,15 +291,6 @@ bool ScRawToken::IsValidReference() const return false; } -sal_uInt16 ScRawToken::sbyteOffset() -{ - // offset of sbyte in ScRawToken - // offsetof(ScRawToken, sbyte) gives a warning with gcc, because ScRawToken is no POD - - ScRawToken aToken; - return static_cast<sal_uInt16>( reinterpret_cast<char*>(&aToken.sbyte) - reinterpret_cast<char*>(&aToken) ); -} - FormulaToken* ScRawToken::CreateToken() const { #if OSL_DEBUG_LEVEL > 1 diff --git a/sc/source/filter/inc/drawingmanager.hxx b/sc/source/filter/inc/drawingmanager.hxx index c9a50fa3a8b9..021127a96534 100644 --- a/sc/source/filter/inc/drawingmanager.hxx +++ b/sc/source/filter/inc/drawingmanager.hxx @@ -35,32 +35,7 @@ namespace xls { const sal_uInt16 BIFF_OBJ_INVALID_ID = 0; -// Model structures for BIFF OBJ record data - -/** This structure contains line formatting attributes from an OBJ record. */ -struct BiffObjLineModel -{ - sal_uInt8 mnColorIdx; /// Index into color palette. - sal_uInt8 mnStyle; /// Line dash style. - sal_uInt8 mnWidth; /// Line width. - bool mbAuto; /// True = automatic line format. - - explicit BiffObjLineModel(); -}; - -/** This structure contains fill formatting attributes from an OBJ record. */ -struct BiffObjFillModel -{ - sal_uInt8 mnBackColorIdx; /// Index to color palette for background color. - sal_uInt8 mnPattColorIdx; /// Index to color palette for pattern foreground color. - sal_uInt8 mnPattern; /// Fill pattern. - bool mbAuto; /// True = automatic fill format. - - explicit BiffObjFillModel(); -}; - // BIFF drawing objects - class BiffDrawingBase; // BIFF drawing page diff --git a/sc/source/filter/oox/drawingmanager.cxx b/sc/source/filter/oox/drawingmanager.cxx index bf9c9a8f3e60..17f1b55eeb94 100644 --- a/sc/source/filter/oox/drawingmanager.cxx +++ b/sc/source/filter/oox/drawingmanager.cxx @@ -64,24 +64,6 @@ const sal_uInt8 BIFF_OBJ_PATT_SOLID = 1; } // namespace -// Model structures for BIFF OBJ record data - -BiffObjLineModel::BiffObjLineModel() : - mnColorIdx( BIFF_OBJ_LINE_AUTOCOLOR ), - mnStyle( BIFF_OBJ_LINE_SOLID ), - mnWidth( BIFF_OBJ_LINE_HAIR ), - mbAuto( true ) -{ -} - -BiffObjFillModel::BiffObjFillModel() : - mnBackColorIdx( BIFF_OBJ_LINE_AUTOCOLOR ), - mnPattColorIdx( BIFF_OBJ_FILL_AUTOCOLOR ), - mnPattern( BIFF_OBJ_PATT_SOLID ), - mbAuto( true ) -{ -} - // BIFF drawing page BiffDrawingBase::BiffDrawingBase( const WorksheetHelper& rHelper, const Reference< XDrawPage >& rxDrawPage ) : WorksheetHelper( rHelper ), diff --git a/unusedcode.easy b/unusedcode.easy index 7bd225a23cc9..6c9ec973e06a 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -10,8 +10,6 @@ OpenGLContext::renderToFile() OpenGLContext::requestSingleBufferedRendering() OpenGLContext::requestVirtualDevice() OpenGLRender::CreateTextTexture(rtl::OUString const&, vcl::Font, long, com::sun::star::awt::Point, com::sun::star::awt::Size, long) -OpenGLSalBitmap::Draw(OpenGLContext&, SalTwoRect const&) -OpenGLTexture::OpenGLTexture() OutputDevice::GetCanvas() const OutputDevice::HasAlpha() OutputDevice::LogicHeightToDeviceCoordinate(long) const diff --git a/vcl/source/gdi/mapmod.cxx b/vcl/source/gdi/mapmod.cxx index d12b09497fc5..a64f43b6aed6 100644 --- a/vcl/source/gdi/mapmod.cxx +++ b/vcl/source/gdi/mapmod.cxx @@ -277,11 +277,6 @@ const Fraction& MapMode::GetScaleX() const { return mpImplMapMode->maScaleX; } const Fraction& MapMode::GetScaleY() const { return mpImplMapMode->maScaleY; } -bool MapMode::IsSameInstance( const MapMode& rMapMode ) const -{ - return (mpImplMapMode == rMapMode.mpImplMapMode); -} - bool MapMode::IsSimple() const { return mpImplMapMode->mbSimple; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |