[Libreoffice] Another code finesse I may have missed

2012-01-03 Thread Olivier Hallot 
636  
http://opengrok.libreoffice.org/xref/core/reportdesign/source/core/sdr/RptObject.cxx#636OUnoObject
http://opengrok.libreoffice.org/s?refs=OUnoObjectproject=core::OUnoObject
http://opengrok.libreoffice.org/s?refs=OUnoObjectproject=core(*const*
uno http://opengrok.libreoffice.org/s?defs=unoproject=core::Reference
http://opengrok.libreoffice.org/s?defs=Referenceproject=core
report 
http://opengrok.libreoffice.org/s?defs=reportproject=core::XReportComponent
http://opengrok.libreoffice.org/s?defs=XReportComponentproject=core
_xComponent http://opengrok.libreoffice.org/s?defs=_xComponentproject=core
   637  
http://opengrok.libreoffice.org/xref/core/reportdesign/source/core/sdr/RptObject.cxx#637
  ,*const* ::rtl
http://opengrok.libreoffice.org/s?defs=rtlproject=core::OUString
http://opengrok.libreoffice.org/s?defs=OUStringproject=core
rModelName http://opengrok.libreoffice.org/s?defs=rModelNameproject=core
   638  
http://opengrok.libreoffice.org/xref/core/reportdesign/source/core/sdr/RptObject.cxx#638
  ,sal_uInt16
http://opengrok.libreoffice.org/s?defs=sal_uInt16project=core
_nObjectType http://opengrok.libreoffice.org/s?defs=_nObjectTypeproject=core)
   639  
http://opengrok.libreoffice.org/xref/core/reportdesign/source/core/sdr/RptObject.cxx#639
 :SdrUnoObj
http://opengrok.libreoffice.org/s?defs=SdrUnoObjproject=core(rModelName
http://opengrok.libreoffice.org/s?defs=rModelNameproject=core,
sal_True http://opengrok.libreoffice.org/s?defs=sal_Trueproject=core)
   640  
http://opengrok.libreoffice.org/xref/core/reportdesign/source/core/sdr/RptObject.cxx#640
 ,OObjectBase
http://opengrok.libreoffice.org/s?defs=OObjectBaseproject=core(_xComponent
http://opengrok.libreoffice.org/s?defs=_xComponentproject=core)
641  
http://opengrok.libreoffice.org/xref/core/reportdesign/source/core/sdr/RptObject.cxx#641
 ,m_nObjectType
http://opengrok.libreoffice.org/s?defs=m_nObjectTypeproject=core(_nObjectType
http://opengrok.libreoffice.org/s?defs=_nObjectTypeproject=core)
642  
http://opengrok.libreoffice.org/xref/core/reportdesign/source/core/sdr/RptObject.cxx#642{
   643  
http://opengrok.libreoffice.org/xref/core/reportdesign/source/core/sdr/RptObject.cxx#643
   DBG_CTOR http://opengrok.libreoffice.org/s?defs=DBG_CTORproject=core(
rpt_OUnoObject 
http://opengrok.libreoffice.org/xref/core/reportdesign/source/core/sdr/RptObject.cxx#rpt_OUnoObject,
NULL http://opengrok.libreoffice.org/s?defs=NULLproject=core);
644  
http://opengrok.libreoffice.org/xref/core/reportdesign/source/core/sdr/RptObject.cxx#644
   impl_setUnoShape
http://opengrok.libreoffice.org/s?defs=impl_setUnoShapeproject=core(
uno http://opengrok.libreoffice.org/s?defs=unoproject=core::Reference
http://opengrok.libreoffice.org/s?defs=Referenceproject=core uno
http://opengrok.libreoffice.org/s?defs=unoproject=core::XInterface
http://opengrok.libreoffice.org/s?defs=XInterfaceproject=core (
_xComponent http://opengrok.libreoffice.org/s?defs=_xComponentproject=core,
uno http://opengrok.libreoffice.org/s?defs=unoproject=core::UNO_QUERY
http://opengrok.libreoffice.org/s?defs=UNO_QUERYproject=core ) );
 645  
http://opengrok.libreoffice.org/xref/core/reportdesign/source/core/sdr/RptObject.cxx#645
   646  
http://opengrok.libreoffice.org/xref/core/reportdesign/source/core/sdr/RptObject.cxx#646
   *if* ( rModelName
http://opengrok.libreoffice.org/s?defs=rModelNameproject=core.getLength
http://opengrok.libreoffice.org/s?defs=getLengthproject=core() )
647  
http://opengrok.libreoffice.org/xref/core/reportdesign/source/core/sdr/RptObject.cxx#647
   impl_initializeModel_nothrow
http://opengrok.libreoffice.org/xref/core/reportdesign/source/core/sdr/RptObject.cxx#impl_initializeModel_nothrow();
   648  
http://opengrok.libreoffice.org/xref/core/reportdesign/source/core/sdr/RptObject.cxx#648
   649  
http://opengrok.libreoffice.org/xref/core/reportdesign/source/core/sdr/RptObject.cxx#649
   *if* ( rModelName
http://opengrok.libreoffice.org/s?defs=rModelNameproject=core.getLength
http://opengrok.libreoffice.org/s?defs=getLengthproject=core() )
650  
http://opengrok.libreoffice.org/xref/core/reportdesign/source/core/sdr/RptObject.cxx#650
   impl_initializeModel_nothrow
http://opengrok.libreoffice.org/xref/core/reportdesign/source/core/sdr/RptObject.cxx#impl_initializeModel_nothrow();
   651  
http://opengrok.libreoffice.org/xref/core/reportdesign/source/core/sdr/RptObject.cxx#651}



Hi

Can someone tell me the 2nd last IF's is not a repetition of the 1st? If it
is, can I drop the second IF?

Thanks

-- 
Olivier Hallot
Founder and Steering Commitee Member
The Document Foundation
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] Another code finesse I may have missed

2012-01-03 Thread Norbert Thiebaud 
On Tue, Jan 3, 2012 at 10:59 AM, Olivier Hallot
olivier.hal...@documentfoundation.org wrote:
 636 OUnoObject::OUnoObject(const uno::Reference
 report::XReportComponent _xComponent
 637    ,const ::rtl::OUString rModelName
 638    ,sal_uInt16   _nObjectType)
 639   :SdrUnoObj(rModelName, sal_True)
 640   ,OObjectBase(_xComponent)
 641   ,m_nObjectType(_nObjectType)
 642 {
 643 DBG_CTOR( rpt_OUnoObject, NULL);
 644 impl_setUnoShape( uno::Reference uno::XInterface (
 _xComponent, uno::UNO_QUERY ) );
 645
 646 if ( rModelName.getLength() )
 647 impl_initializeModel_nothrow();
 648
 649 if ( rModelName.getLength() )
 650 impl_initializeModel_nothrow();
 651 }




That looks like a merge snafu. and git blame seems to concurs

so yep the 2nd copy can go :-)

Norbert
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] Another code finesse I may have missed

2012-01-03 Thread Olivier Hallot 
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

Hello Norbert

So it went.

Kind regards

Olivier

Em 03-01-2012 15:31, Norbert Thiebaud escreveu:
 On Tue, Jan 3, 2012 at 10:59 AM, Olivier Hallot
 olivier.hal...@documentfoundation.org wrote:
 636 OUnoObject::OUnoObject(const uno::Reference
 report::XReportComponent _xComponent
 637,const ::rtl::OUString rModelName
 638,sal_uInt16   _nObjectType)
 639   :SdrUnoObj(rModelName, sal_True)
 640   ,OObjectBase(_xComponent)
 641   ,m_nObjectType(_nObjectType)
 642 {
 643 DBG_CTOR( rpt_OUnoObject, NULL);
 644 impl_setUnoShape( uno::Reference uno::XInterface (
 _xComponent, uno::UNO_QUERY ) );
 645
 646 if ( rModelName.getLength() )
 647 impl_initializeModel_nothrow();
 648
 649 if ( rModelName.getLength() )
 650 impl_initializeModel_nothrow();
 651 }



 
 That looks like a merge snafu. and git blame seems to concurs
 
 so yep the 2nd copy can go :-)
 
 Norbert

- -- 
Olivier Hallot
Founder, Board of Directors Member - The Document Foundation
LibreOffice translation leader for Brazilian Portuguese
+55-21-8822-8812
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQEcBAEBAgAGBQJPA0xaAAoJEJp3R7nH3vLx6W4H/RXgqRxpPepA5WMlxBCc9JFC
wPUL4lmQ8n9fbvW3bBPfHOGiDVjTf146saUwZV7DG1xQeFhQtPvVdwceGD9Oplu+
CleSDoprnd6qkToqXBmv+wYH4id7lhhxDGcDJhlari2K/OLlAd5dOGQGggtUPncR
ABBhtpS5kW6f4I2gHIUYJmurinWaodF+0u1Fd4C7NQTC2cPVo2pbC07r1bKJ2L9l
ROnYef8WlkoWs5xtkuMxTHX78SCK5dGMdVFbB4aQBPekvxDn/r7vXg2j+RSj0+W0
rFBLm/HjObJ7WtorHphjSZEpRZxvSGuaD+hSCV8ffDONWTl6RdPqie5cB23nfPs=
=dcGh
-END PGP SIGNATURE-
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice