mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid reserved identifier (_CreateSdrObject -> CreateSdrObject_)

Browse Source 
Change-Id: Iee63999e4953a083783cb5c9811640150616472d
This commit is contained in:
Stephan Bergmann 2016-04-15 15:23:08 +02:00
parent d9adda92cc
commit ea83bf5295
12 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/svx/fmdpage.hxx
View File

@ -34,7 +34,7 @@ protected:
// Creating a SdrObject based on a Description. Cann be used by derived classes to // Creating a SdrObject based on a Description. Cann be used by derived classes to
// support own css::drawing::Shapes (for example Controls) // support own css::drawing::Shapes (for example Controls)
virtual SdrObject *_CreateSdrObject( const css::uno::Reference< css::drawing::XShape > & xShape ) virtual SdrObject *CreateSdrObject_( const css::uno::Reference< css::drawing::XShape > & xShape )
throw (css::uno::RuntimeException, std::exception) override; throw (css::uno::RuntimeException, std::exception) override;
// The following method is called when a SvxShape object should be created. // The following method is called when a SvxShape object should be created.

2
include/svx/unopage.hxx
View File

@ -93,7 +93,7 @@ class SVX_DLLPUBLIC SvxDrawPage : public ::cppu::WeakAggImplHelper6< css::drawin
// Creating a SdrObject using it's Description. // Creating a SdrObject using it's Description.
// Can be used by derived classes to support their owen Shapes (e.g. Controls). // Can be used by derived classes to support their owen Shapes (e.g. Controls).
virtual SdrObject *_CreateSdrObject( const css::uno::Reference< css::drawing::XShape >& xShape ) virtual SdrObject *CreateSdrObject_( const css::uno::Reference< css::drawing::XShape >& xShape )
throw (css::uno::RuntimeException, std::exception); throw (css::uno::RuntimeException, std::exception);
static SvxShape* CreateShapeByTypeAndInventor( sal_uInt16 nType, sal_uInt32 nInventor, SdrObject *pObj = nullptr, SvxDrawPage *pPage = nullptr, OUString const & referer = OUString() ) throw (css::uno::RuntimeException); static SvxShape* CreateShapeByTypeAndInventor( sal_uInt16 nType, sal_uInt32 nInventor, SdrObject *pObj = nullptr, SvxDrawPage *pPage = nullptr, OUString const & referer = OUString() ) throw (css::uno::RuntimeException);

2
reportdesign/source/core/inc/ReportDrawPage.hxx
View File

@ -31,7 +31,7 @@ namespace reportdesign
OReportDrawPage(const OReportDrawPage&) = delete; OReportDrawPage(const OReportDrawPage&) = delete;
void operator =(const OReportDrawPage&) = delete; void operator =(const OReportDrawPage&) = delete;
protected: protected:
virtual SdrObject *_CreateSdrObject( const css::uno::Reference< css::drawing::XShape > & xShape ) virtual SdrObject *CreateSdrObject_( const css::uno::Reference< css::drawing::XShape > & xShape )
throw (css::uno::RuntimeException, std::exception) override; throw (css::uno::RuntimeException, std::exception) override;
virtual css::uno::Reference< css::drawing::XShape > _CreateShape( SdrObject *pObj ) const throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference< css::drawing::XShape > _CreateShape( SdrObject *pObj ) const throw (css::uno::RuntimeException, std::exception) override;
public: public:

4
reportdesign/source/core/sdr/ReportDrawPage.cxx
View File

@ -46,13 +46,13 @@ OReportDrawPage::OReportDrawPage(SdrPage* _pPage
{ {
} }
SdrObject* OReportDrawPage::_CreateSdrObject(const uno::Reference< drawing::XShape > & xDescr) SdrObject* OReportDrawPage::CreateSdrObject_(const uno::Reference< drawing::XShape > & xDescr)
throw (uno::RuntimeException, std::exception) throw (uno::RuntimeException, std::exception)
{ {
uno::Reference< report::XReportComponent> xReportComponent(xDescr,uno::UNO_QUERY); uno::Reference< report::XReportComponent> xReportComponent(xDescr,uno::UNO_QUERY);
if ( xReportComponent.is() ) if ( xReportComponent.is() )
return OObjectBase::createObject(xReportComponent); return OObjectBase::createObject(xReportComponent);
return SvxDrawPage::_CreateSdrObject( xDescr ); return SvxDrawPage::CreateSdrObject_( xDescr );
} }
uno::Reference< drawing::XShape > OReportDrawPage::_CreateShape( SdrObject *pObj ) const uno::Reference< drawing::XShape > OReportDrawPage::_CreateShape( SdrObject *pObj ) const

2
sd/source/ui/inc/unopage.hxx
View File

@ -104,7 +104,7 @@ public:
virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override; virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
// this is called whenever a SdrObject must be created for a empty api shape wrapper // this is called whenever a SdrObject must be created for a empty api shape wrapper
virtual SdrObject *_CreateSdrObject( const css::uno::Reference< css::drawing::XShape >& xShape ) virtual SdrObject *CreateSdrObject_( const css::uno::Reference< css::drawing::XShape >& xShape )
throw (css::uno::RuntimeException, std::exception) override; throw (css::uno::RuntimeException, std::exception) override;
// SvxFmDrawPage // SvxFmDrawPage

6
sd/source/ui/unoidl/unopage.cxx
View File

@ -388,7 +388,7 @@ SdXImpressDocument* SdGenericDrawPage::GetModel() const
} }
// this is called whenever a SdrObject must be created for a empty api shape wrapper // this is called whenever a SdrObject must be created for a empty api shape wrapper
SdrObject * SdGenericDrawPage::_CreateSdrObject( const Reference< drawing::XShape >& xShape ) SdrObject * SdGenericDrawPage::CreateSdrObject_( const Reference< drawing::XShape >& xShape )
throw (css::uno::RuntimeException, std::exception) throw (css::uno::RuntimeException, std::exception)
{ {
if( nullptr == SvxFmDrawPage::mpPage || !xShape.is() ) if( nullptr == SvxFmDrawPage::mpPage || !xShape.is() )
@ -398,7 +398,7 @@ SdrObject * SdGenericDrawPage::_CreateSdrObject( const Reference< drawing::XShap
const OUString aPrefix( "com.sun.star.presentation." ); const OUString aPrefix( "com.sun.star.presentation." );
if( !aType.startsWith( aPrefix ) ) if( !aType.startsWith( aPrefix ) )
{ {
SdrObject* pObj = SvxFmDrawPage::_CreateSdrObject( xShape ); SdrObject* pObj = SvxFmDrawPage::CreateSdrObject_( xShape );
if( pObj && ( (pObj->GetObjInventor() != SdrInventor) || (pObj->GetObjIdentifier() != OBJ_PAGE) ) ) if( pObj && ( (pObj->GetObjInventor() != SdrInventor) || (pObj->GetObjIdentifier() != OBJ_PAGE) ) )
{ {
SdDrawDocument* pDoc = static_cast<SdDrawDocument*>(GetPage()->GetModel()); SdDrawDocument* pDoc = static_cast<SdDrawDocument*>(GetPage()->GetModel());
@ -510,7 +510,7 @@ SdrObject * SdGenericDrawPage::_CreateSdrObject( const Reference< drawing::XShap
SdrObject *pPresObj = nullptr; SdrObject *pPresObj = nullptr;
if( (eObjKind == PRESOBJ_TABLE) || (eObjKind == PRESOBJ_MEDIA) ) if( (eObjKind == PRESOBJ_TABLE) || (eObjKind == PRESOBJ_MEDIA) )
{ {
pPresObj = SvxFmDrawPage::_CreateSdrObject( xShape ); pPresObj = SvxFmDrawPage::CreateSdrObject_( xShape );
if( pPresObj ) if( pPresObj )
{ {
SdDrawDocument* pDoc = static_cast<SdDrawDocument*>(GetPage()->GetModel()); SdDrawDocument* pDoc = static_cast<SdDrawDocument*>(GetPage()->GetModel());

4
svx/source/form/fmdpage.cxx
View File

@ -65,7 +65,7 @@ css::uno::Sequence< css::uno::Type > SAL_CALL SvxFmDrawPage::getTypes( ) throw(
return aTypes; return aTypes;
} }
SdrObject *SvxFmDrawPage::_CreateSdrObject( const css::uno::Reference< css::drawing::XShape > & xDescr ) SdrObject *SvxFmDrawPage::CreateSdrObject_( const css::uno::Reference< css::drawing::XShape > & xDescr )
throw (css::uno::RuntimeException, std::exception) throw (css::uno::RuntimeException, std::exception)
{ {
OUString aShapeType( xDescr->getShapeType() ); OUString aShapeType( xDescr->getShapeType() );
@ -75,7 +75,7 @@ SdrObject *SvxFmDrawPage::_CreateSdrObject( const css::uno::Reference< css::draw
) )
return new FmFormObj(); return new FmFormObj();
else else
return SvxDrawPage::_CreateSdrObject( xDescr ); return SvxDrawPage::CreateSdrObject_( xDescr );
} }

4
svx/source/unodraw/unopage.cxx
View File

@ -487,7 +487,7 @@ void SAL_CALL SvxDrawPage::ungroup( const Reference< drawing::XShapeGroup >& aGr
mpModel->SetChanged(); mpModel->SetChanged();
} }
SdrObject *SvxDrawPage::_CreateSdrObject(const Reference< drawing::XShape > & xShape) SdrObject *SvxDrawPage::CreateSdrObject_(const Reference< drawing::XShape > & xShape)
throw (css::uno::RuntimeException, std::exception) throw (css::uno::RuntimeException, std::exception)
{ {
sal_uInt16 nType = 0; sal_uInt16 nType = 0;
@ -833,7 +833,7 @@ Reference< drawing::XShape > SvxDrawPage::_CreateShape( SdrObject *pObj ) const
SdrObject *SvxDrawPage::CreateSdrObject( const Reference< drawing::XShape > & xShape, bool bBeginning ) throw() SdrObject *SvxDrawPage::CreateSdrObject( const Reference< drawing::XShape > & xShape, bool bBeginning ) throw()
{ {
SdrObject* pObj = _CreateSdrObject( xShape ); SdrObject* pObj = CreateSdrObject_( xShape );
if( pObj) if( pObj)
{ {
pObj->SetModel(mpModel); pObj->SetModel(mpModel);

2
svx/source/unodraw/unoshap2.cxx
View File

@ -198,7 +198,7 @@ void SvxShapeGroup::addUnoShape( const uno::Reference< drawing::XShape >& xShape
SdrObject* pSdrShape = pShape->GetSdrObject(); SdrObject* pSdrShape = pShape->GetSdrObject();
if( pSdrShape == nullptr ) if( pSdrShape == nullptr )
pSdrShape = mxPage->_CreateSdrObject( xShape ); pSdrShape = mxPage->CreateSdrObject_( xShape );
if( pSdrShape->IsInserted() ) if( pSdrShape->IsInserted() )
pSdrShape->GetObjList()->RemoveObject( pSdrShape->GetOrdNum() ); pSdrShape->GetObjList()->RemoveObject( pSdrShape->GetOrdNum() );

2
svx/source/unodraw/unoshap3.cxx
View File

@ -129,7 +129,7 @@ void SAL_CALL Svx3DSceneObject::add( const Reference< drawing::XShape >& xShape
if(!mpObj.is() || !mxPage.is() || pShape == nullptr || nullptr != pShape->GetSdrObject() ) if(!mpObj.is() || !mxPage.is() || pShape == nullptr || nullptr != pShape->GetSdrObject() )
throw uno::RuntimeException(); throw uno::RuntimeException();
SdrObject* pSdrShape = mxPage->_CreateSdrObject( xShape ); SdrObject* pSdrShape = mxPage->CreateSdrObject_( xShape );
if( dynamic_cast<const E3dObject* >(pSdrShape) != nullptr ) if( dynamic_cast<const E3dObject* >(pSdrShape) != nullptr )
{ {
mpObj->GetSubList()->NbcInsertObject( pSdrShape ); mpObj->GetSubList()->NbcInsertObject( pSdrShape );

2
sw/inc/unodraw.hxx
View File

@ -46,7 +46,7 @@ protected:
// Create a SdrObject according to a description. Can be used by derived classes to // Create a SdrObject according to a description. Can be used by derived classes to
// support own css::drawing::Shapes (e.g. controls). // support own css::drawing::Shapes (e.g. controls).
virtual SdrObject *_CreateSdrObject( const css::uno::Reference< css::drawing::XShape > & xShape ) virtual SdrObject *CreateSdrObject_( const css::uno::Reference< css::drawing::XShape > & xShape )
throw (css::uno::RuntimeException, std::exception) override; throw (css::uno::RuntimeException, std::exception) override;
public: public:

4
sw/source/core/unocore/unodraw.cxx
View File

@ -293,11 +293,11 @@ uno::Reference< uno::XInterface > SwFmDrawPage::GetInterface( SdrObject* pObj
return xShape; return xShape;
} }
SdrObject* SwFmDrawPage::_CreateSdrObject( const uno::Reference< drawing::XShape > & xShape ) SdrObject* SwFmDrawPage::CreateSdrObject_( const uno::Reference< drawing::XShape > & xShape )
throw (uno::RuntimeException, std::exception) throw (uno::RuntimeException, std::exception)
{ {
//FIXME: just a redirect call - can this method be deleted? //FIXME: just a redirect call - can this method be deleted?
return SvxFmDrawPage::_CreateSdrObject( xShape ); return SvxFmDrawPage::CreateSdrObject_( xShape );
} }
uno::Reference< drawing::XShape > SwFmDrawPage::_CreateShape( SdrObject *pObj ) const uno::Reference< drawing::XShape > SwFmDrawPage::_CreateShape( SdrObject *pObj ) const