strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoid reserved identifier (_CreateShape -> CreateShape)

Browse source 
Change-Id: Idcdd35302e60392fae9f63de1828e1a41ab89610
This commit is contained in:
Stephan Bergmann 2016-04-15 15:27:20 +02:00
parent ea83bf5295
commit 277193b122
13 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/svx/fmdpage.hxx
View file

@ -39,7 +39,7 @@ protected:
// The following method is called when a SvxShape object should be created.
// Derived classes can create a derivation or an object aggregating SvxShape.
virtual css::uno::Reference< css::drawing::XShape > _CreateShape( SdrObject *pObj ) const
virtual css::uno::Reference< css::drawing::XShape > CreateShape( SdrObject *pObj ) const
throw (css::uno::RuntimeException, std::exception) override;
public:

2
include/svx/unopage.hxx
View file

@ -100,7 +100,7 @@ class SVX_DLLPUBLIC SvxDrawPage : public ::cppu::WeakAggImplHelper6< css::drawin
// The following method is called if a SvxShape object is to be created.
// Derived classes can create a derivation or an SvxShape aggregating object.
virtual css::uno::Reference< css::drawing::XShape > _CreateShape( SdrObject *pObj ) const
virtual css::uno::Reference< css::drawing::XShape > CreateShape( SdrObject *pObj ) const
throw (css::uno::RuntimeException, std::exception);
UNO3_GETIMPLEMENTATION_DECL( SvxDrawPage )

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

@ -33,7 +33,7 @@ namespace reportdesign
protected:
virtual SdrObject *CreateSdrObject_( const css::uno::Reference< css::drawing::XShape > & xShape )
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:
OReportDrawPage(SdrPage* pPage,const css::uno::Reference< css::report::XSection >& _xSection);
virtual ~OReportDrawPage() throw(){}

6
reportdesign/source/core/sdr/ReportDrawPage.cxx
View file

@ -55,12 +55,12 @@ SdrObject* OReportDrawPage::CreateSdrObject_(const uno::Reference< drawing::XSha
return SvxDrawPage::CreateSdrObject_( xDescr );
}
uno::Reference< drawing::XShape > OReportDrawPage::_CreateShape( SdrObject *pObj ) const
uno::Reference< drawing::XShape > OReportDrawPage::CreateShape( SdrObject *pObj ) const
throw (uno::RuntimeException, std::exception)
{
OObjectBase* pBaseObj = dynamic_cast<OObjectBase*>(pObj);
if ( !pBaseObj )
return SvxDrawPage::_CreateShape( pObj );
return SvxDrawPage::CreateShape( pObj );
uno::Reference< report::XSection> xSection = m_xSection;
uno::Reference< lang::XMultiServiceFactory> xFactory;
@ -130,7 +130,7 @@ uno::Reference< drawing::XShape > OReportDrawPage::_CreateShape( SdrObject *pOb
}
if ( !xShape.is() )
xShape.set( SvxDrawPage::_CreateShape( pObj ) );
xShape.set( SvxDrawPage::CreateShape( pObj ) );
try
{

2
sc/inc/pageuno.hxx
View file

@ -30,7 +30,7 @@ public:
ScPageObj(SdrPage* pPage);
virtual ~ScPageObj() throw();
virtual css::uno::Reference<css::drawing::XShape> _CreateShape(SdrObject *pObj) const
virtual css::uno::Reference<css::drawing::XShape> CreateShape(SdrObject *pObj) const
throw (css::uno::RuntimeException, std::exception) override;
// XServiceInfo

4
sc/source/ui/unoobj/pageuno.cxx
View file

@ -33,10 +33,10 @@ ScPageObj::~ScPageObj() throw()
{
}
uno::Reference<drawing::XShape > ScPageObj::_CreateShape( SdrObject *pObj ) const
uno::Reference<drawing::XShape > ScPageObj::CreateShape( SdrObject *pObj ) const
throw (css::uno::RuntimeException, std::exception)
{
uno::Reference<drawing::XShape> xShape(SvxFmDrawPage::_CreateShape( pObj ));
uno::Reference<drawing::XShape> xShape(SvxFmDrawPage::CreateShape( pObj ));
new ScShapeObj( xShape ); // aggregates object and modifies xShape

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

@ -108,7 +108,7 @@ public:
throw (css::uno::RuntimeException, std::exception) override;
// SvxFmDrawPage
virtual css::uno::Reference<css::drawing::XShape> _CreateShape(SdrObject *pObj) const
virtual css::uno::Reference<css::drawing::XShape> CreateShape(SdrObject *pObj) const
throw (css::uno::RuntimeException, std::exception) override;
// XInterface

10
sd/source/ui/unoidl/unopage.cxx
View file

@ -1408,11 +1408,11 @@ void SAL_CALL SdGenericDrawPage::firePropertiesChangeEvent( const Sequence< OUSt
{
}
Reference< drawing::XShape > SdGenericDrawPage::_CreateShape(SdrObject *pObj) const
Reference< drawing::XShape > SdGenericDrawPage::CreateShape(SdrObject *pObj) const
throw (RuntimeException, std::exception)
{
DBG_ASSERT( GetPage(), "SdGenericDrawPage::_CreateShape(), can't create shape for disposed page!" );
DBG_ASSERT( pObj, "SdGenericDrawPage::_CreateShape(), invalid call with pObj == 0!" );
DBG_ASSERT( GetPage(), "SdGenericDrawPage::CreateShape(), can't create shape for disposed page!" );
DBG_ASSERT( pObj, "SdGenericDrawPage::CreateShape(), invalid call with pObj == 0!" );
if (!pObj)
return Reference< drawing::XShape >();
@ -1452,7 +1452,7 @@ Reference< drawing::XShape > SdGenericDrawPage::_CreateShape(SdrObject *pObj) c
Reference< drawing::XShape > xShape( pShape );
if(!xShape.is())
xShape = SvxFmDrawPage::_CreateShape( pObj );
xShape = SvxFmDrawPage::CreateShape( pObj );
if( eKind != PRESOBJ_NONE )
{
@ -1535,7 +1535,7 @@ Reference< drawing::XShape > SdGenericDrawPage::_CreateShape(SdrObject *pObj) c
}
else
{
return SvxFmDrawPage::_CreateShape( pObj );
return SvxFmDrawPage::CreateShape( pObj );
}
}

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

@ -79,7 +79,7 @@ SdrObject *SvxFmDrawPage::CreateSdrObject_( const css::uno::Reference< css::draw
}
css::uno::Reference< css::drawing::XShape > SvxFmDrawPage::_CreateShape( SdrObject *pObj ) const
css::uno::Reference< css::drawing::XShape > SvxFmDrawPage::CreateShape( SdrObject *pObj ) const
throw (css::uno::RuntimeException, std::exception)
{
if( FmFormInventor == pObj->GetObjInventor() )
@ -88,7 +88,7 @@ css::uno::Reference< css::drawing::XShape > SvxFmDrawPage::_CreateShape( SdrObj
return xShape;
}
else
return SvxDrawPage::_CreateShape( pObj );
return SvxDrawPage::CreateShape( pObj );
}
// XFormsSupplier

2
svx/source/svdraw/svdobj.cxx
View file

@ -2895,7 +2895,7 @@ css::uno::Reference< css::uno::XInterface > SdrObject::getUnoShape()
if( pDrawPage )
{
// create one
xShape = pDrawPage->_CreateShape( this );
xShape = pDrawPage->CreateShape( this );
impl_setUnoShape( xShape );
}
}

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

@ -785,7 +785,7 @@ SvxShape* SvxDrawPage::CreateShapeByTypeAndInventor( sal_uInt16 nType, sal_uInt3
}
default: // unknown inventor
{
OSL_FAIL("AW: Unknown Inventor in SvxDrawPage::_CreateShape()");
OSL_FAIL("AW: Unknown Inventor in SvxDrawPage::CreateShape()");
break;
}
}
@ -821,7 +821,7 @@ SvxShape* SvxDrawPage::CreateShapeByTypeAndInventor( sal_uInt16 nType, sal_uInt3
return pRet;
}
Reference< drawing::XShape > SvxDrawPage::_CreateShape( SdrObject *pObj ) const
Reference< drawing::XShape > SvxDrawPage::CreateShape( SdrObject *pObj ) const
throw (css::uno::RuntimeException, std::exception)
{
Reference< drawing::XShape > xShape( CreateShapeByTypeAndInventor(pObj->GetObjIdentifier(),

2
sw/inc/unodraw.hxx
View file

@ -64,7 +64,7 @@ public:
// The following method is called when a SvxShape-object is to be created.
// Derived classes may obtain at this point a derivation or an object
// that is aggregating a SvxShape.
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;
};
typedef cppu::WeakAggImplHelper4

6
sw/source/core/unocore/unodraw.cxx
View file

@ -300,7 +300,7 @@ SdrObject* SwFmDrawPage::CreateSdrObject_( const uno::Reference< drawing::XShape
return SvxFmDrawPage::CreateSdrObject_( xShape );
}
uno::Reference< drawing::XShape > SwFmDrawPage::_CreateShape( SdrObject *pObj ) const
uno::Reference< drawing::XShape > SwFmDrawPage::CreateShape( SdrObject *pObj ) const
throw (uno::RuntimeException, std::exception)
{
uno::Reference< drawing::XShape > xRet;
@ -336,7 +336,7 @@ uno::Reference< drawing::XShape > SwFmDrawPage::_CreateShape( SdrObject *pObj )
}
else
{
OSL_FAIL( "<SwFmDrawPage::_CreateShape(..)> - could not retrieve type. Thus, no shape created." );
OSL_FAIL( "<SwFmDrawPage::CreateShape(..)> - could not retrieve type. Thus, no shape created." );
return xRet;
}
}
@ -346,7 +346,7 @@ uno::Reference< drawing::XShape > SwFmDrawPage::_CreateShape( SdrObject *pObj )
// own block - temporary object has to be destroyed before
// the delegator is set #81670#
{
xRet = SvxFmDrawPage::_CreateShape( pObj );
xRet = SvxFmDrawPage::CreateShape( pObj );
}
uno::Reference< XUnoTunnel > xShapeTunnel(xRet, uno::UNO_QUERY);
//don't create an SwXShape if it already exists