summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--editeng/inc/editeng/unofield.hxx3
-rw-r--r--editeng/source/uno/unofield.cxx20
-rw-r--r--sc/source/filter/inc/drawingmanager.hxx20
-rw-r--r--sc/source/filter/oox/drawingmanager.cxx60
-rwxr-xr-xunusedcode.easy19
-rw-r--r--vcl/inc/vcl/gradient.hxx1
-rw-r--r--vcl/source/gdi/gradient.cxx10
7 files changed, 28 insertions, 105 deletions
diff --git a/editeng/inc/editeng/unofield.hxx b/editeng/inc/editeng/unofield.hxx
index 39cf2e6fae10..bbd2a1e02eb1 100644
--- a/editeng/inc/editeng/unofield.hxx
+++ b/editeng/inc/editeng/unofield.hxx
@@ -74,7 +74,8 @@ public:
SvxFieldData* CreateFieldData() const throw();
void SetAnchor( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > xAnchor ) { mxAnchor = xAnchor; }
- UNO3_GETIMPLEMENTATION_DECL( SvxUnoTextField )
+ static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw();
+ virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException);
// ::com::sun::star::uno::XInterface
virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
diff --git a/editeng/source/uno/unofield.cxx b/editeng/source/uno/unofield.cxx
index 4f4bb6978231..b0a51eb63c98 100644
--- a/editeng/source/uno/unofield.cxx
+++ b/editeng/source/uno/unofield.cxx
@@ -253,7 +253,25 @@ inline Time setTime( util::DateTime& rDate )
// ====================================================================
// class SvxUnoTextField
// ====================================================================
-UNO3_GETIMPLEMENTATION_IMPL( SvxUnoTextField );
+namespace
+{
+ class theSvxUnoTextFieldUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSvxUnoTextFieldUnoTunnelId> {};
+}
+
+const ::com::sun::star::uno::Sequence< sal_Int8 > & SvxUnoTextField::getUnoTunnelId() throw()
+{
+ return theSvxUnoTextFieldUnoTunnelId::get().getSeq();
+}
+
+sal_Int64 SAL_CALL SvxUnoTextField::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw(::com::sun::star::uno::RuntimeException)
+{
+ if( rId.getLength() == 16 && 0 == rtl_compareMemory( getUnoTunnelId().getConstArray(),
+ rId.getConstArray(), 16 ) )
+ {
+ return sal::static_int_cast<sal_Int64>(reinterpret_cast<sal_IntPtr>(this));
+ }
+ return 0;
+}
SvxUnoTextField::SvxUnoTextField( sal_Int32 nServiceId ) throw()
: OComponentHelper( getMutex() )
diff --git a/sc/source/filter/inc/drawingmanager.hxx b/sc/source/filter/inc/drawingmanager.hxx
index 6a1953c84a42..f79a7b3b23c5 100644
--- a/sc/source/filter/inc/drawingmanager.hxx
+++ b/sc/source/filter/inc/drawingmanager.hxx
@@ -92,9 +92,6 @@ public:
/** Returns true, if the object list is empty. */
inline bool empty() const { return maObjects.empty(); }
- /** Tries to insert the passed object into the last group or appends it. */
- void insertGrouped( const BiffDrawingObjectRef& rxDrawingObj );
-
/** Creates and inserts all UNO shapes into the passed shape container. */
void convertAndInsert( BiffDrawingBase& rDrawing,
const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes,
@@ -145,15 +142,6 @@ public:
const ::com::sun::star::awt::Rectangle* pParentRect = 0 ) const;
protected:
- /** Reads the object name in a BIFF5 OBJ record. */
- void readNameBiff5( BiffInputStream& rStrm, sal_uInt16 nNameLen );
- /** Reads the macro link in a BIFF3 OBJ record. */
- void readMacroBiff3( BiffInputStream& rStrm, sal_uInt16 nMacroSize );
- /** Reads the macro link in a BIFF4 OBJ record. */
- void readMacroBiff4( BiffInputStream& rStrm, sal_uInt16 nMacroSize );
- /** Reads the macro link in a BIFF5 OBJ record. */
- void readMacroBiff5( BiffInputStream& rStrm, sal_uInt16 nMacroSize );
-
/** Converts the passed line formatting to the passed property map. */
void convertLineProperties( ::oox::drawingml::ShapePropertyMap& rPropMap, const BiffObjLineModel& rLineModel, sal_uInt16 nArrows = 0 ) const;
/** Converts the passed fill formatting to the passed property map. */
@@ -225,14 +213,6 @@ public:
/** Final processing after import of the all drawing objects. */
void finalizeImport();
- /** Creates a new UNO shape object, inserts it into the passed UNO shape
- container, and sets the shape position and size. */
- ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
- createAndInsertXShape(
- const ::rtl::OUString& rService,
- const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes,
- const ::com::sun::star::awt::Rectangle& rShapeRect ) const;
-
/** Derived classes may want to know that a shape has been inserted. Will
be called from the convertAndInsert() implementation. */
virtual void notifyShapeInserted(
diff --git a/sc/source/filter/oox/drawingmanager.cxx b/sc/source/filter/oox/drawingmanager.cxx
index 9f6f31de78a7..25d166be241d 100644
--- a/sc/source/filter/oox/drawingmanager.cxx
+++ b/sc/source/filter/oox/drawingmanager.cxx
@@ -219,11 +219,6 @@ BiffDrawingObjectContainer::BiffDrawingObjectContainer()
{
}
-void BiffDrawingObjectContainer::insertGrouped( const BiffDrawingObjectRef& rxDrawingObj )
-{
- maObjects.push_back( rxDrawingObj );
-}
-
void BiffDrawingObjectContainer::convertAndInsert( BiffDrawingBase& rDrawing, const Reference< XShapes >& rxShapes, const Rectangle* pParentRect ) const
{
maObjects.forEachMem( &BiffDrawingObjectBase::convertAndInsert, ::boost::ref( rDrawing ), ::boost::cref( rxShapes ), pParentRect );
@@ -281,40 +276,6 @@ Reference< XShape > BiffDrawingObjectBase::convertAndInsert( BiffDrawingBase& rD
return xShape;
}
-// protected ------------------------------------------------------------------
-
-void BiffDrawingObjectBase::readNameBiff5( BiffInputStream& rStrm, sal_uInt16 nNameLen )
-{
- maObjName = OUString();
- if( nNameLen > 0 )
- {
- // name length field is repeated before the name
- maObjName = rStrm.readByteStringUC( false, getTextEncoding() );
- // skip padding byte for word boundaries
- rStrm.alignToBlock( 2 );
- }
-}
-
-void BiffDrawingObjectBase::readMacroBiff3( BiffInputStream& rStrm, sal_uInt16 nMacroSize )
-{
- maMacroName = OUString();
- rStrm.skip( nMacroSize );
- // skip padding byte for word boundaries, not contained in nMacroSize
- rStrm.alignToBlock( 2 );
-}
-
-void BiffDrawingObjectBase::readMacroBiff4( BiffInputStream& rStrm, sal_uInt16 nMacroSize )
-{
- maMacroName = OUString();
- rStrm.skip( nMacroSize );
-}
-
-void BiffDrawingObjectBase::readMacroBiff5( BiffInputStream& rStrm, sal_uInt16 nMacroSize )
-{
- maMacroName = OUString();
- rStrm.skip( nMacroSize );
-}
-
void BiffDrawingObjectBase::convertLineProperties( ShapePropertyMap& rPropMap, const BiffObjLineModel& rLineModel, sal_uInt16 nArrows ) const
{
if( rLineModel.mbAuto )
@@ -557,27 +518,6 @@ void BiffDrawingBase::finalizeImport()
maRawObjs.convertAndInsert( *this, xShapes );
}
-Reference< XShape > BiffDrawingBase::createAndInsertXShape( const OUString& rService,
- const Reference< XShapes >& rxShapes, const Rectangle& rShapeRect ) const
-{
- OSL_ENSURE( !rService.isEmpty(), "BiffDrawingBase::createAndInsertXShape - missing UNO shape service name" );
- OSL_ENSURE( rxShapes.is(), "BiffDrawingBase::createAndInsertXShape - missing XShapes container" );
- Reference< XShape > xShape;
- if( !rService.isEmpty() && rxShapes.is() ) try
- {
- xShape.set( getBaseFilter().getModelFactory()->createInstance( rService ), UNO_QUERY_THROW );
- // insert shape into passed shape collection (maybe drawpage or group shape)
- rxShapes->add( xShape );
- xShape->setPosition( Point( rShapeRect.X, rShapeRect.Y ) );
- xShape->setSize( Size( rShapeRect.Width, rShapeRect.Height ) );
- }
- catch( Exception& )
- {
- }
- OSL_ENSURE( xShape.is(), "BiffDrawingBase::createAndInsertXShape - cannot instanciate shape object" );
- return xShape;
-}
-
// ============================================================================
BiffSheetDrawing::BiffSheetDrawing( const WorksheetHelper& rHelper ) :
diff --git a/unusedcode.easy b/unusedcode.easy
index 26847130126f..0f841e97281f 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -30,6 +30,10 @@ ScAddInDocs::Insert(ScDocument* const&, unsigned short&)
ScAddInDocs::Insert(ScDocument* const*, unsigned short)
ScAddInDocs::Remove(ScDocument* const&, unsigned short)
ScChartListener::SetName(rtl::OUString const&)
+ScColorScaleFormatList::begin()
+ScColorScaleFormatList::begin() const
+ScColorScaleFormatList::end()
+ScColorScaleFormatList::end() const
ScCompressedArray<int, unsigned char>::GetEntryCount() const
ScCompressedArray<int, unsigned short>::CopyFrom(ScCompressedArray<int, unsigned short> const&, int, int, long)
ScCompressedArray<int, unsigned short>::GetEntryCount() const
@@ -39,11 +43,6 @@ ScCompressedArray<int, unsigned short>::Remove(int, unsigned long)
ScCompressedArray<int, unsigned short>::ScCompressedArray(int, unsigned short const&, unsigned long)
ScCompressedArray<int, unsigned short>::ScCompressedArray(int, unsigned short const*, unsigned long)
ScCompressedArray<int, unsigned short>::SetValue(int, unsigned short const&)
-ScConditionalFormats_Impl::Insert(ScConditionalFormat* const&, unsigned short&)
-ScConditionalFormats_Impl::Insert(ScConditionalFormat* const*, unsigned short)
-ScConditionalFormats_Impl::Insert(ScConditionalFormats_Impl const*, unsigned short, unsigned short)
-ScConditionalFormats_Impl::Remove(ScConditionalFormat* const&, unsigned short)
-ScConditionalFormats_Impl::Remove(unsigned short, unsigned short)
ScCsvControl::ScCsvControl(Window*, ScCsvLayoutData const&, long)
ScDBCollection::AnonDBs::erase(boost::void_ptr_iterator<__gnu_debug::_Safe_iterator<__gnu_cxx::__normal_iterator<void**, std::__cxx1998::vector<void*, std::allocator<void*> > >, std::__debug::vector<void*, std::allocator<void*> > >, ScDBData>)
ScDBCollection::AnonDBs::findByTable(short) const
@@ -149,7 +148,6 @@ SwCurrShells::Insert(CurrShell* const&, unsigned short&)
SwCurrShells::Insert(CurrShell* const*, unsigned short)
SwCurrShells::Insert(SwCurrShells const*, unsigned short, unsigned short)
SwCurrShells::Remove(unsigned short, unsigned short)
-SwDependentFields::DeleteAndDestroy(unsigned short, unsigned short)
SwDestroyList::DeleteAndDestroy(unsigned short, unsigned short)
SwDestroyList::Insert(SwDestroyList const*, unsigned short, unsigned short)
SwDestroyList::Insert(SwSectionFrm* const&, unsigned short&)
@@ -160,11 +158,6 @@ SwGlblDocContents::Insert(SwGlblDocContent* const&, unsigned short&)
SwGlblDocContents::Insert(SwGlblDocContent* const*, unsigned short)
SwGlblDocContents::Insert(SwGlblDocContents const*, unsigned short, unsigned short)
SwGlblDocContents::Remove(SwGlblDocContent* const&, unsigned short)
-SwHTMLFmtInfos::Insert(SwHTMLFmtInfo const*&, unsigned short&)
-SwHTMLFmtInfos::Insert(SwHTMLFmtInfo const**, unsigned short)
-SwHTMLFmtInfos::Insert(SwHTMLFmtInfos const*, unsigned short, unsigned short)
-SwHTMLFmtInfos::Remove(SwHTMLFmtInfo const*&, unsigned short)
-SwHTMLFmtInfos::Remove(unsigned short, unsigned short)
SwHTMLPosFlyFrms::Insert(SwHTMLPosFlyFrm* const&, unsigned short&)
SwHTMLPosFlyFrms::Insert(SwHTMLPosFlyFrm* const*, unsigned short)
SwHTMLPosFlyFrms::Insert(SwHTMLPosFlyFrms const*, unsigned short, unsigned short)
@@ -192,6 +185,8 @@ SwRedlineDataParentSortArr::Insert(SwRedlineDataParent* const&)
SwRedlineDataParentSortArr::Insert(SwRedlineDataParent* const*, unsigned short)
SwRedlineDataParentSortArr::Insert(SwRedlineDataParentSortArr const*, unsigned short, unsigned short)
SwSections::DeleteAndDestroy(unsigned short, unsigned short)
+SwSelBoxes::Insert(SwTableBox* const&, unsigned short&)
+SwSelBoxes::Remove(SwTableBox* const&, unsigned short)
SwSortElements::Insert(SwSortElement* const&, unsigned short&)
SwSortElements::Insert(SwSortElement* const*, unsigned short)
SwSortElements::Insert(SwSortElements const*, unsigned short, unsigned short)
@@ -292,7 +287,6 @@ _SfxObjectList::Insert(_FileListEntry const**, unsigned short)
_SfxObjectList::Insert(_SfxObjectList const*, unsigned short, unsigned short)
_SfxObjectList::Remove(_FileListEntry const*&, unsigned short)
_SfxObjectList::Remove(unsigned short, unsigned short)
-_SfxPoolItems::DeleteAndDestroy(unsigned short, unsigned short)
_SwFtnIdxs::Insert(SwTxtFtn* const&, unsigned short&)
_SwFtnIdxs::Insert(SwTxtFtn* const*, unsigned short)
_SwFtnIdxs::Remove(SwTxtFtn* const&, unsigned short)
@@ -686,6 +680,7 @@ nullcanvas::SpriteCanvasHelper::genericUpdate(basegfx::B2DConnectedRanges<canvas
nullcanvas::SpriteCanvasHelper::opaqueUpdate(basegfx::B2DConnectedRanges<canvas::SpriteRedrawManager::SpriteInfo>::ConnectedComponents const&)
nullcanvas::SpriteCanvasHelper::scrollUpdate(basegfx::B2DRange const&, basegfx::B2DRange const&, basegfx::B2DConnectedRanges<canvas::SpriteRedrawManager::SpriteInfo>::ConnectedComponents const&)
oox::PropertyMap::dump(com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>)
+oox::xls::BiffDrawingObjectBase::BiffDrawingObjectBase(oox::xls::WorksheetHelper const&)
oox::xls::CellBlock::CellBlock(oox::xls::WorksheetHelper const&, oox::ValueRange const&, int)
sd::LeftDrawPaneShell::RegisterInterface(SfxModule*)
sd::LeftImpressPaneShell::RegisterInterface(SfxModule*)
diff --git a/vcl/inc/vcl/gradient.hxx b/vcl/inc/vcl/gradient.hxx
index 1ed0c12ce98f..382b245e984a 100644
--- a/vcl/inc/vcl/gradient.hxx
+++ b/vcl/inc/vcl/gradient.hxx
@@ -88,7 +88,6 @@ private:
public:
Gradient();
Gradient( const Gradient& rGradient );
- Gradient( GradientStyle eStyle );
Gradient( GradientStyle eStyle,
const Color& rStartColor,
const Color& rEndColor );
diff --git a/vcl/source/gdi/gradient.cxx b/vcl/source/gdi/gradient.cxx
index ce9a75f24f38..af648a19d53f 100644
--- a/vcl/source/gdi/gradient.cxx
+++ b/vcl/source/gdi/gradient.cxx
@@ -106,16 +106,6 @@ Gradient::Gradient( const Gradient& rGradient )
// -----------------------------------------------------------------------
-Gradient::Gradient( GradientStyle eStyle )
-{
- DBG_CTOR( Gradient, NULL );
-
- mpImplGradient = new Impl_Gradient;
- mpImplGradient->meStyle = eStyle;
-}
-
-// -----------------------------------------------------------------------
-
Gradient::Gradient( GradientStyle eStyle,
const Color& rStartColor, const Color& rEndColor )
{
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-16 20:00:27 +0000