diff options
Diffstat (limited to 'reportdesign/source/core/sdr')
| -rw-r--r-- | reportdesign/source/core/sdr/ModuleHelper.cxx | 22 | ||||
| -rw-r--r-- | reportdesign/source/core/sdr/PropertyForward.cxx | 14 | ||||
| -rw-r--r-- | reportdesign/source/core/sdr/ReportDrawPage.cxx | 4 | ||||
| -rw-r--r-- | reportdesign/source/core/sdr/ReportUndoFactory.cxx | 10 | ||||
| -rw-r--r-- | reportdesign/source/core/sdr/RptModel.cxx | 8 | ||||
| -rw-r--r-- | reportdesign/source/core/sdr/RptObject.cxx | 74 | ||||
| -rw-r--r-- | reportdesign/source/core/sdr/RptObjectListener.cxx | 6 | ||||
| -rw-r--r-- | reportdesign/source/core/sdr/RptPage.cxx | 28 | ||||
| -rw-r--r-- | reportdesign/source/core/sdr/UndoActions.cxx | 20 | ||||
| -rw-r--r-- | reportdesign/source/core/sdr/UndoEnv.cxx | 34 | ||||
| -rw-r--r-- | reportdesign/source/core/sdr/formatnormalizer.cxx | 8 | ||||
| -rw-r--r-- | reportdesign/source/core/sdr/formatnormalizer.hxx | 2 |
12 files changed, 115 insertions, 115 deletions
diff --git a/reportdesign/source/core/sdr/ModuleHelper.cxx b/reportdesign/source/core/sdr/ModuleHelper.cxx index d132304be477..c823aed327dc 100644 --- a/reportdesign/source/core/sdr/ModuleHelper.cxx +++ b/reportdesign/source/core/sdr/ModuleHelper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,8 +37,8 @@ #include <svl/solar.hrc> #define EXPAND_PROTOCOL "vnd.sun.star.expand:" -#define ENTER_MOD_METHOD() \ - ::osl::MutexGuard aGuard(s_aMutex); \ +#define ENTER_MOD_METHOD() \ + ::osl::MutexGuard aGuard(s_aMutex); \ ensureImpl() //......................................................................... @@ -53,7 +53,7 @@ namespace rptui */ class OModuleImpl { - ResMgr* m_pRessources; + ResMgr* m_pRessources; public: /// ctor @@ -61,7 +61,7 @@ public: ~OModuleImpl(); /// get the manager for the ressources of the module - ResMgr* getResManager(); + ResMgr* getResManager(); }; DBG_NAME( rpt_OModuleImpl ) @@ -83,7 +83,7 @@ OModuleImpl::~OModuleImpl() } //------------------------------------------------------------------------- -ResMgr* OModuleImpl::getResManager() +ResMgr* OModuleImpl::getResManager() { // note that this method is not threadsafe, which counts for the whole class ! @@ -99,11 +99,11 @@ ResMgr* OModuleImpl::getResManager() //========================================================================= //= OModule //========================================================================= -::osl::Mutex OModule::s_aMutex; -sal_Int32 OModule::s_nClients = 0; -OModuleImpl* OModule::s_pImpl = NULL; +::osl::Mutex OModule::s_aMutex; +sal_Int32 OModule::s_nClients = 0; +OModuleImpl* OModule::s_pImpl = NULL; //------------------------------------------------------------------------- -ResMgr* OModule::getResManager() +ResMgr* OModule::getResManager() { ENTER_MOD_METHOD(); return s_pImpl->getResManager(); @@ -136,7 +136,7 @@ void OModule::ensureImpl() } //......................................................................... -} // namespace dbaui +} // namespace dbaui //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/sdr/PropertyForward.cxx b/reportdesign/source/core/sdr/PropertyForward.cxx index 307b6f26c390..7cef3bf1fcb4 100644 --- a/reportdesign/source/core/sdr/PropertyForward.cxx +++ b/reportdesign/source/core/sdr/PropertyForward.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,8 +42,8 @@ namespace rptui using namespace ::com::sun::star::beans; using namespace reportdesign; -DBG_NAME( rpt_OPropertyMediator ) -OPropertyMediator::OPropertyMediator(const Reference< XPropertySet>& _xSource +DBG_NAME( rpt_OPropertyMediator ) +OPropertyMediator::OPropertyMediator(const Reference< XPropertySet>& _xSource ,const Reference< XPropertySet>& _xDest ,const TPropertyNamePair& _aNameMap ,sal_Bool _bReverse) @@ -53,7 +53,7 @@ OPropertyMediator::OPropertyMediator(const Reference< XPropertySet>& _xSource ,m_xDest(_xDest) ,m_bInChange(sal_False) { - DBG_CTOR( rpt_OPropertyMediator,NULL); + DBG_CTOR( rpt_OPropertyMediator,NULL); osl_incrementInterlockedCount(&m_refCount); OSL_ENSURE(m_xDest.is(),"Dest is NULL!"); OSL_ENSURE(m_xSource.is(),"Source is NULL!"); @@ -100,7 +100,7 @@ OPropertyMediator::OPropertyMediator(const Reference< XPropertySet>& _xSource // ----------------------------------------------------------------------------- OPropertyMediator::~OPropertyMediator() { - DBG_DTOR( rpt_OPropertyMediator,NULL); + DBG_DTOR( rpt_OPropertyMediator,NULL); } // ----------------------------------------------------------------------------- void SAL_CALL OPropertyMediator::propertyChange( const PropertyChangeEvent& evt ) throw(RuntimeException) @@ -141,7 +141,7 @@ void SAL_CALL OPropertyMediator::propertyChange( const PropertyChangeEvent& evt } if ( sPropName.getLength() && xPropInfo->hasPropertyByName(sPropName) ) xProp->setPropertyValue(sPropName,aFind->second.second->operator()(sPropName,evt.NewValue)); - else if ( evt.PropertyName == PROPERTY_CHARFONTNAME + else if ( evt.PropertyName == PROPERTY_CHARFONTNAME || evt.PropertyName == PROPERTY_CHARFONTSTYLENAME || evt.PropertyName == PROPERTY_CHARSTRIKEOUT || evt.PropertyName == PROPERTY_CHARWORDMODE @@ -201,7 +201,7 @@ void OPropertyMediator::startListening() } // ----------------------------------------------------------------------------- //........................................................................ -} // namespace dbaccess +} // namespace dbaccess //........................................................................ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/sdr/ReportDrawPage.cxx b/reportdesign/source/core/sdr/ReportDrawPage.cxx index 2aa9cca9d187..31c977b05bed 100644 --- a/reportdesign/source/core/sdr/ReportDrawPage.cxx +++ b/reportdesign/source/core/sdr/ReportDrawPage.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -111,7 +111,7 @@ uno::Reference< drawing::XShape > OReportDrawPage::_CreateShape( SdrObject *pOb sal_Int64 nAspect = embed::Aspects::MSOLE_CONTENT; uno::Reference < embed::XEmbeddedObject > xObj; ::rtl::OUString sName; - xObj = pObj->GetModel()->GetPersist()->getEmbeddedObjectContainer().CreateEmbeddedObject( + xObj = pObj->GetModel()->GetPersist()->getEmbeddedObjectContainer().CreateEmbeddedObject( ::comphelper::MimeConfigurationHelper::GetSequenceClassIDRepresentation( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("80243D39-6741-46C5-926E-069164FF87BB"))), sName ); OSL_ENSURE(xObj.is(),"Embedded Object could not be created!"); diff --git a/reportdesign/source/core/sdr/ReportUndoFactory.cxx b/reportdesign/source/core/sdr/ReportUndoFactory.cxx index a16963c95573..0f2fbcebef48 100644 --- a/reportdesign/source/core/sdr/ReportUndoFactory.cxx +++ b/reportdesign/source/core/sdr/ReportUndoFactory.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,12 +54,12 @@ DBG_NAME( rpt_OReportUndoFactory ) // ----------------------------------------------------------------------------- OReportUndoFactory::OReportUndoFactory() : m_pUndoFactory(new SdrUndoFactory) { - DBG_CTOR( rpt_OReportUndoFactory,NULL); + DBG_CTOR( rpt_OReportUndoFactory,NULL); } // ----------------------------------------------------------------------------- OReportUndoFactory::~OReportUndoFactory() { - DBG_DTOR( rpt_OReportUndoFactory,NULL); + DBG_DTOR( rpt_OReportUndoFactory,NULL); } /////////////////////////////////////////////////////////////////////// // shapes @@ -146,7 +146,7 @@ SdrUndoAction* OReportUndoFactory::CreateUndoMoveLayer(sal_uInt16 nLayerNum, Sdr } // page -SdrUndoAction* OReportUndoFactory::CreateUndoDeletePage(SdrPage& rPage) +SdrUndoAction* OReportUndoFactory::CreateUndoDeletePage(SdrPage& rPage) { return m_pUndoFactory->CreateUndoDeletePage( rPage ); } @@ -177,7 +177,7 @@ SdrUndoAction* OReportUndoFactory::CreateUndoPageChangeMasterPage(SdrPage& rChan } //================================================================== -} //rptui +} //rptui //================================================================== /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/sdr/RptModel.cxx b/reportdesign/source/core/sdr/RptModel.cxx index 7b98042f9aeb..689ecd9149a8 100644 --- a/reportdesign/source/core/sdr/RptModel.cxx +++ b/reportdesign/source/core/sdr/RptModel.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,7 +37,7 @@ #include "UndoEnv.hxx" #include "ReportUndoFactory.hxx" #include "ReportDefinition.hxx" -#define ITEMID_COLOR 1 +#define ITEMID_COLOR 1 #define ITEMID_BRUSH 2 #define ITEMID_FONT 3 #define ITEMID_FONTHEIGHT 4 @@ -120,7 +120,7 @@ Window* OReportModel::GetCurDocViewWin() } //---------------------------------------------------------------------------- -OXUndoEnvironment& OReportModel::GetUndoEnv() +OXUndoEnvironment& OReportModel::GetUndoEnv() { return *m_pUndoEnv; } @@ -230,7 +230,7 @@ uno::Reference< uno::XInterface > OReportModel::createShape(const ::rtl::OUStrin return xRet; } //================================================================== -} //rptui +} //rptui //================================================================== /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/sdr/RptObject.cxx b/reportdesign/source/core/sdr/RptObject.cxx index 9e7a83a5b557..3f622a48f636 100644 --- a/reportdesign/source/core/sdr/RptObject.cxx +++ b/reportdesign/source/core/sdr/RptObject.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -107,11 +107,11 @@ sal_uInt16 OObjectBase::getObjectType(const uno::Reference< report::XReportCompo } if ( xServiceInfo->supportsService( SERVICE_IMAGECONTROL)) return OBJ_DLG_IMAGECONTROL; - if ( xServiceInfo->supportsService( SERVICE_FORMATTEDFIELD )) + if ( xServiceInfo->supportsService( SERVICE_FORMATTEDFIELD )) return OBJ_DLG_FORMATTEDFIELD; if ( xServiceInfo->supportsService( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.OLE2Shape")) ) ) return OBJ_OLE2; - if ( xServiceInfo->supportsService( SERVICE_SHAPE )) + if ( xServiceInfo->supportsService( SERVICE_SHAPE )) return OBJ_CUSTOMSHAPE; if ( xServiceInfo->supportsService( SERVICE_REPORTDEFINITION ) ) return OBJ_DLG_SUBREPORT; @@ -128,11 +128,11 @@ SdrObject* OObjectBase::createObject(const uno::Reference< report::XReportCompon { case OBJ_DLG_FIXEDTEXT: { - OUnoObject* pUnoObj = new OUnoObject( _xComponent - ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FixedText")) + OUnoObject* pUnoObj = new OUnoObject( _xComponent + ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FixedText")) ,OBJ_DLG_FIXEDTEXT); pNewObj = pUnoObj; - + uno::Reference<beans::XPropertySet> xControlModel(pUnoObj->GetUnoControlModel(),uno::UNO_QUERY); if ( xControlModel.is() ) xControlModel->setPropertyValue( PROPERTY_MULTILINE,uno::makeAny(sal_True)); @@ -140,18 +140,18 @@ SdrObject* OObjectBase::createObject(const uno::Reference< report::XReportCompon break; case OBJ_DLG_IMAGECONTROL: pNewObj = new OUnoObject(_xComponent - ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.DatabaseImageControl")) + ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.DatabaseImageControl")) ,OBJ_DLG_IMAGECONTROL); break; case OBJ_DLG_FORMATTEDFIELD: pNewObj = new OUnoObject( _xComponent - ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FormattedField")) + ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FormattedField")) ,OBJ_DLG_FORMATTEDFIELD); break; case OBJ_DLG_HFIXEDLINE: case OBJ_DLG_VFIXEDLINE: pNewObj = new OUnoObject( _xComponent - ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlFixedLineModel")) + ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlFixedLineModel")) ,nType); break; case OBJ_CUSTOMSHAPE: @@ -323,7 +323,7 @@ DBG_NAME( rpt_OObjectBase ) OObjectBase::OObjectBase(const uno::Reference< report::XReportComponent>& _xComponent) :m_bIsListening(sal_False) { - DBG_CTOR( rpt_OObjectBase,NULL); + DBG_CTOR( rpt_OObjectBase,NULL); m_xReportComponent = _xComponent; } //---------------------------------------------------------------------------- @@ -336,7 +336,7 @@ OObjectBase::OObjectBase(const ::rtl::OUString& _sComponentName) //---------------------------------------------------------------------------- OObjectBase::~OObjectBase() { - DBG_DTOR( rpt_OObjectBase,NULL); + DBG_DTOR( rpt_OObjectBase,NULL); m_xMediator.reset(); if ( isListening() ) EndListening(); @@ -370,7 +370,7 @@ void OObjectBase::StartListening() if ( !isListening() && m_xReportComponent.is() ) { m_bIsListening = sal_True; - + if ( !m_xPropertyChangeListener.is() ) { m_xPropertyChangeListener = new OObjectListener( this ); @@ -551,8 +551,8 @@ void OCustomShape::NbcMove( const Size& rSize ) m_xReportComponent->setPositionX(m_xReportComponent->getPositionX() + rSize.A()); m_xReportComponent->setPositionY(m_xReportComponent->getPositionY() + rSize.B()); } - - // set geometry properties + + // set geometry properties SetPropsFromRect(GetSnapRect()); m_bIsListening = sal_True; @@ -728,7 +728,7 @@ sal_Int32 OUnoObject::GetStep() const void OUnoObject::NbcMove( const Size& rSize ) { DBG_CHKTHIS( rpt_OUnoObject,NULL); - + if ( m_bIsListening ) { // stop listening @@ -775,7 +775,7 @@ void OUnoObject::NbcMove( const Size& rSize ) // } // } } - // set geometry properties + // set geometry properties SetPropsFromRect(GetLogicRect()); // start listening @@ -794,8 +794,8 @@ void OUnoObject::NbcResize(const Point& rRef, const Fraction& xFract, const Frac // stop listening OObjectBase::EndListening(sal_False); - - // set geometry properties + + // set geometry properties SetPropsFromRect(GetLogicRect()); // start listening @@ -807,8 +807,8 @@ void OUnoObject::NbcSetLogicRect(const Rectangle& rRect) SdrUnoObj::NbcSetLogicRect(rRect); // stop listening OObjectBase::EndListening(sal_False); - - // set geometry properties + + // set geometry properties SetPropsFromRect(rRect); // start listening @@ -823,7 +823,7 @@ bool OUnoObject::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) if ( bResult ) { impl_setReportComponent_nothrow(); - // set labels + // set labels if ( m_xReportComponent.is() ) { try @@ -840,7 +840,7 @@ bool OUnoObject::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) impl_initializeModel_nothrow(); } - // set geometry properties + // set geometry properties SetPropsFromRect(GetLogicRect()); } @@ -848,7 +848,7 @@ bool OUnoObject::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) } //---------------------------------------------------------------------------- ::rtl::OUString OUnoObject::GetDefaultName(const OUnoObject* _pObj) -{ +{ sal_uInt16 nResId = 0; ::rtl::OUString aDefaultName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HERE WE HAVE TO INSERT OUR NAME!")); if ( _pObj->supportsService( SERVICE_FIXEDTEXT ) ) @@ -869,7 +869,7 @@ bool OUnoObject::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) } if (nResId) - aDefaultName = ::rtl::OUString( String(ModuleRes(nResId)) ); + aDefaultName = ::rtl::OUString( String(ModuleRes(nResId)) ); return aDefaultName; } @@ -928,7 +928,7 @@ void OUnoObject::_propertyChange( const beans::PropertyChangeEvent& evt ) throw OObjectBase::StartListening(); } } - } + } } } // ----------------------------------------------------------------------------- @@ -1035,7 +1035,7 @@ sal_Int32 OOle2Obj::GetStep() const void OOle2Obj::NbcMove( const Size& rSize ) { DBG_CHKTHIS( rpt_OOle2Obj,NULL); - + if ( m_bIsListening ) { // stop listening @@ -1048,8 +1048,8 @@ void OOle2Obj::NbcMove( const Size& rSize ) m_xReportComponent->setPositionX(m_xReportComponent->getPositionX() + rSize.A()); m_xReportComponent->setPositionY(m_xReportComponent->getPositionY() + rSize.B()); } - - // set geometry properties + + // set geometry properties SetPropsFromRect(GetLogicRect()); // start listening @@ -1068,8 +1068,8 @@ void OOle2Obj::NbcResize(const Point& rRef, const Fraction& xFract, const Fracti // stop listening OObjectBase::EndListening(sal_False); - - // set geometry properties + + // set geometry properties SetPropsFromRect(GetLogicRect()); // start listening @@ -1081,8 +1081,8 @@ void OOle2Obj::NbcSetLogicRect(const Rectangle& rRect) SdrOle2Obj::NbcSetLogicRect(rRect); // stop listening OObjectBase::EndListening(sal_False); - - // set geometry properties + + // set geometry properties SetPropsFromRect(rRect); // start listening @@ -1103,7 +1103,7 @@ bool OOle2Obj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) if ( !m_xReportComponent.is() ) m_xReportComponent.set(getUnoShape(),uno::UNO_QUERY); } - // set geometry properties + // set geometry properties SetPropsFromRect(GetLogicRect()); } @@ -1150,7 +1150,7 @@ SdrObject* OOle2Obj::Clone() const OReportModel* pRptModel = static_cast<OReportModel*>(GetModel()); svt::EmbeddedObjectRef::TryRunningState( pObj->GetObjRef() ); pObj->impl_createDataProvider_nothrow(pRptModel->getReportDefinition().get()); - + uno::Reference< chart2::data::XDatabaseDataProvider > xSource( lcl_getDataProvider(GetObjRef()) ); uno::Reference< chart2::data::XDatabaseDataProvider > xDest( lcl_getDataProvider(pObj->GetObjRef()) ); if ( xSource.is() && xDest.is() ) @@ -1190,7 +1190,7 @@ void OOle2Obj::initializeOle() uno::Reference < embed::XEmbeddedObject > xObj = GetObjRef(); OReportModel* pRptModel = static_cast<OReportModel*>(GetModel()); pRptModel->GetUndoEnv().AddElement(lcl_getDataProvider(xObj)); - + uno::Reference< embed::XComponentSupplier > xCompSupp( xObj, uno::UNO_QUERY ); if( xCompSupp.is() ) { @@ -1238,11 +1238,11 @@ uno::Reference< style::XStyle> getUsedStyle(const uno::Reference< report::XRepor { uno::Reference<container::XNameAccess> xStyles = _xReport->getStyleFamilies(); uno::Reference<container::XNameAccess> xPageStyles(xStyles->getByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PageStyles"))),uno::UNO_QUERY); - + uno::Reference< style::XStyle> xReturn; uno::Sequence< ::rtl::OUString> aSeq = xPageStyles->getElementNames(); const ::rtl::OUString* pIter = aSeq.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); + const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); for(;pIter != pEnd && !xReturn.is() ;++pIter) { uno::Reference< style::XStyle> xStyle(xPageStyles->getByName(*pIter),uno::UNO_QUERY); diff --git a/reportdesign/source/core/sdr/RptObjectListener.cxx b/reportdesign/source/core/sdr/RptObjectListener.cxx index 01ba228ffb96..16ba83604b90 100644 --- a/reportdesign/source/core/sdr/RptObjectListener.cxx +++ b/reportdesign/source/core/sdr/RptObjectListener.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,14 +41,14 @@ DBG_NAME(rpt_OObjectListener) OObjectListener::OObjectListener(OObjectBase* _pObject) :m_pObject(_pObject) { - DBG_CTOR(rpt_OObjectListener,NULL); + DBG_CTOR(rpt_OObjectListener,NULL); } //---------------------------------------------------------------------------- OObjectListener::~OObjectListener() { - DBG_DTOR(rpt_OObjectListener,NULL); + DBG_DTOR(rpt_OObjectListener,NULL); } // XEventListener diff --git a/reportdesign/source/core/sdr/RptPage.cxx b/reportdesign/source/core/sdr/RptPage.cxx index fe9ae18cdb52..b466a60bd839 100644 --- a/reportdesign/source/core/sdr/RptPage.cxx +++ b/reportdesign/source/core/sdr/RptPage.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -134,17 +134,17 @@ SdrObject* OReportPage::RemoveObject(ULONG nObjNum) //---------------------------------------------------------------------------- //namespace //{ -// ::rtl::OUString lcl_getControlName(const uno::Reference< lang::XServiceInfo >& _xServiceInfo) -// { -// if ( _xServiceInfo->supportsService( SERVICE_FIXEDTEXT )) -// return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FixedText")); +// ::rtl::OUString lcl_getControlName(const uno::Reference< lang::XServiceInfo >& _xServiceInfo) +// { +// if ( _xServiceInfo->supportsService( SERVICE_FIXEDTEXT )) +// return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FixedText")); // if ( _xServiceInfo->supportsService( SERVICE_FORMATTEDFIELD )) -// return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FormattedField")); -// if ( _xServiceInfo->supportsService( SERVICE_IMAGECONTROL)) -// return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.DatabaseImageControl")); -// -// return ::rtl::OUString(); -// } +// return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FormattedField")); +// if ( _xServiceInfo->supportsService( SERVICE_IMAGECONTROL)) +// return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.DatabaseImageControl")); +// +// return ::rtl::OUString(); +// } //} //---------------------------------------------------------------------------- void OReportPage::insertObject(const uno::Reference< report::XReportComponent >& _xObject) @@ -197,14 +197,14 @@ void OReportPage::resetSpecialMode() const sal_Bool bChanged = rModel.IsChanged(); ::std::vector<SdrObject*>::iterator aIter = m_aTemporaryObjectList.begin(); ::std::vector<SdrObject*>::iterator aEnd = m_aTemporaryObjectList.end(); - + for (; aIter != aEnd; ++aIter) { removeTempObject(*aIter); } m_aTemporaryObjectList.clear(); rModel.SetChanged(bChanged); - + m_bSpecialInsertMode = false; } // ----------------------------------------------------------------------------- @@ -218,7 +218,7 @@ void OReportPage::NbcInsertObject(SdrObject* pObj, ULONG nPos, const SdrInsertRe m_aTemporaryObjectList.push_back(pObj); return; } - + if ( pUnoObj ) { pUnoObj->CreateMediator(); diff --git a/reportdesign/source/core/sdr/UndoActions.cxx b/reportdesign/source/core/sdr/UndoActions.cxx index 737e43af74be..5e043b49bde5 100644 --- a/reportdesign/source/core/sdr/UndoActions.cxx +++ b/reportdesign/source/core/sdr/UndoActions.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -97,17 +97,17 @@ namespace rptui TYPEINIT1( OCommentUndoAction, SdrUndoAction ); DBG_NAME(rpt_OCommentUndoAction) //---------------------------------------------------------------------------- -OCommentUndoAction::OCommentUndoAction(SdrModel& _rMod,USHORT nCommentID) +OCommentUndoAction::OCommentUndoAction(SdrModel& _rMod,USHORT nCommentID) :SdrUndoAction(_rMod) -{ - DBG_CTOR(rpt_OCommentUndoAction,NULL); +{ + DBG_CTOR(rpt_OCommentUndoAction,NULL); m_pController = static_cast< OReportModel& >( _rMod ).getController(); if ( nCommentID ) - m_strComment = String(ModuleRes(nCommentID)); + m_strComment = String(ModuleRes(nCommentID)); } OCommentUndoAction::~OCommentUndoAction() { - DBG_DTOR(rpt_OCommentUndoAction,NULL); + DBG_DTOR(rpt_OCommentUndoAction,NULL); } //---------------------------------------------------------------------------- void OCommentUndoAction::Undo() @@ -170,7 +170,7 @@ OUndoContainerAction::~OUndoContainerAction() } //------------------------------------------------------------------------------ void OUndoContainerAction::implReInsert( ) SAL_THROW( ( Exception ) ) -{ +{ if ( m_xContainer.is() ) { // insert the element @@ -277,7 +277,7 @@ OUndoGroupSectionAction::OUndoGroupSectionAction(SdrModel& _rMod } //------------------------------------------------------------------------------ void OUndoGroupSectionAction::implReInsert( ) SAL_THROW( ( Exception ) ) -{ +{ OXUndoEnvironment& rEnv = static_cast< OReportModel& >( rMod ).GetUndoEnv(); try { @@ -323,7 +323,7 @@ OUndoReportSectionAction::OUndoReportSectionAction(SdrModel& _rMod } //------------------------------------------------------------------------------ void OUndoReportSectionAction::implReInsert( ) SAL_THROW( ( Exception ) ) -{ +{ OXUndoEnvironment& rEnv = static_cast< OReportModel& >( rMod ).GetUndoEnv(); try { @@ -406,7 +406,7 @@ void ORptUndoPropertyAction::setProperty(sal_Bool _bOld) String ORptUndoPropertyAction::GetComment() const { String aStr(ModuleRes(RID_STR_UNDO_PROPERTY)); - + aStr.SearchAndReplace( '#', m_aPropertyName ); return aStr; } diff --git a/reportdesign/source/core/sdr/UndoEnv.cxx b/reportdesign/source/core/sdr/UndoEnv.cxx index 780113958495..70f132d63cdf 100644 --- a/reportdesign/source/core/sdr/UndoEnv.cxx +++ b/reportdesign/source/core/sdr/UndoEnv.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -87,7 +87,7 @@ public: ::osl::Mutex m_aMutex; ::std::vector< uno::Reference< container::XChild> > m_aSections; oslInterlockedCount m_nLocks; - sal_Bool m_bReadOnly; + sal_Bool m_bReadOnly; sal_Bool m_bIsUndo; OXUndoEnvironmentImpl(OReportModel& _rModel); @@ -118,16 +118,16 @@ OXUndoEnvironment::~OXUndoEnvironment() DBG_DTOR( rpt_OXUndoEnvironment,NULL); } // ----------------------------------------------------------------------------- -void OXUndoEnvironment::Lock() -{ +void OXUndoEnvironment::Lock() +{ OSL_ENSURE(m_refCount,"Illegal call to dead object!"); - osl_incrementInterlockedCount( &m_pImpl->m_nLocks ); + osl_incrementInterlockedCount( &m_pImpl->m_nLocks ); } -void OXUndoEnvironment::UnLock() -{ +void OXUndoEnvironment::UnLock() +{ OSL_ENSURE(m_refCount,"Illegal call to dead object!"); - osl_decrementInterlockedCount( &m_pImpl->m_nLocks ); + osl_decrementInterlockedCount( &m_pImpl->m_nLocks ); } sal_Bool OXUndoEnvironment::IsLocked() const { return m_pImpl->m_nLocks != 0; } // ----------------------------------------------------------------------------- @@ -174,7 +174,7 @@ void OXUndoEnvironment::Clear(const Accessor& /*_r*/) { OReportPage* pPage = PTR_CAST( OReportPage, m_pImpl->m_rModel.GetMasterPage(i) ); RemoveSection(pPage); - } + } m_pImpl->m_aSections.clear(); @@ -200,7 +200,7 @@ void OXUndoEnvironment::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) ModeChanged(); } // ----------------------------------------------------------------------------- -// XEventListener +// XEventListener //------------------------------------------------------------------------------ void SAL_CALL OXUndoEnvironment::disposing(const EventObject& e) throw( RuntimeException ) { @@ -236,7 +236,7 @@ void SAL_CALL OXUndoEnvironment::propertyChange( const PropertyChangeEvent& _rEv if ( !pController ) return; - // no Undo for transient and readonly props. + // no Undo for transient and readonly props. // let's see if we know something about the set #if OSL_DEBUG_LEVEL > 0 int nlen = m_pImpl->m_aPropertySetCache.size(); @@ -257,7 +257,7 @@ void SAL_CALL OXUndoEnvironment::propertyChange( const PropertyChangeEvent& _rEv AllProperties& rPropInfos = aSetPos->second; AllPropertiesIterator aPropertyPos = rPropInfos.find( _rEvent.PropertyName ); if (aPropertyPos == rPropInfos.end()) - { // nothing 'til now ... have to change this .... + { // nothing 'til now ... have to change this .... // the attributes INT32 nAttributes = xSet->getPropertySetInfo()->getPropertyByName( _rEvent.PropertyName ).Attributes; bool bTransReadOnly = ((nAttributes & PropertyAttribute::READONLY) != 0) || ((nAttributes & PropertyAttribute::TRANSIENT) != 0); @@ -316,7 +316,7 @@ void SAL_CALL OXUndoEnvironment::propertyChange( const PropertyChangeEvent& _rEv if ( _xContainer.is() ) { aFind = ::std::find(m_pImpl->m_aSections.begin(),m_pImpl->m_aSections.end(),_xContainer); - + if ( aFind == m_pImpl->m_aSections.end() ) { Reference<container::XChild> xParent(_xContainer->getParent(),uno::UNO_QUERY); @@ -342,7 +342,7 @@ void SAL_CALL OXUndoEnvironment::elementInserted(const ContainerEvent& evt) thro Reference< report::XSection > xContainer(evt.Source,uno::UNO_QUERY); ::std::vector< uno::Reference< container::XChild> >::const_iterator aFind = getSection(xContainer.get()); - + if ( aFind != m_pImpl->m_aSections.end() ) { OUndoEnvLock aLock(*this); @@ -357,7 +357,7 @@ void SAL_CALL OXUndoEnvironment::elementInserted(const ContainerEvent& evt) thro { DBG_UNHANDLED_EXCEPTION(); } - + } } else @@ -414,7 +414,7 @@ void SAL_CALL OXUndoEnvironment::elementRemoved(const ContainerEvent& evt) throw { Reference< report::XSection > xContainer(evt.Source,uno::UNO_QUERY); ::std::vector< uno::Reference< container::XChild> >::const_iterator aFind = getSection(xContainer.get()); - + Reference< report::XReportComponent > xReportComponent( xIface, UNO_QUERY ); if ( aFind != m_pImpl->m_aSections.end() && xReportComponent.is() ) { @@ -445,7 +445,7 @@ void SAL_CALL OXUndoEnvironment::elementRemoved(const ContainerEvent& evt) throw } } } - + if ( xIface.is() ) RemoveElement(xIface); diff --git a/reportdesign/source/core/sdr/formatnormalizer.cxx b/reportdesign/source/core/sdr/formatnormalizer.cxx index 3620f29bf554..af475726bfa0 100644 --- a/reportdesign/source/core/sdr/formatnormalizer.cxx +++ b/reportdesign/source/core/sdr/formatnormalizer.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -68,20 +68,20 @@ namespace rptui //==================================================================== //= FormatNormalizer //==================================================================== - DBG_NAME(rpt_FormatNormalizer) + DBG_NAME(rpt_FormatNormalizer) //-------------------------------------------------------------------- FormatNormalizer::FormatNormalizer( const OReportModel& _rModel ) :m_rModel( _rModel ) ,m_xReportDefinition( ) ,m_bFieldListDirty( true ) { - DBG_CTOR(rpt_FormatNormalizer,NULL); + DBG_CTOR(rpt_FormatNormalizer,NULL); } //-------------------------------------------------------------------- FormatNormalizer::~FormatNormalizer() { - DBG_DTOR(rpt_FormatNormalizer,NULL); + DBG_DTOR(rpt_FormatNormalizer,NULL); } //-------------------------------------------------------------------- diff --git a/reportdesign/source/core/sdr/formatnormalizer.hxx b/reportdesign/source/core/sdr/formatnormalizer.hxx index a3974f8e9103..f1b6979cc17b 100644 --- a/reportdesign/source/core/sdr/formatnormalizer.hxx +++ b/reportdesign/source/core/sdr/formatnormalizer.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite |