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