sw/source/core/unocore/unocoll.cxx | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-)
New commits: commit 5017ccda02e755eb1986bf6f16b7e847199946ed Author: Tor Lillqvist <[email protected]> Date: Wed Oct 2 20:51:27 2013 +0300 Fix indentation Change-Id: If50bc5be982eec1d2db4e7d1320da0f0d8d17c50 diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx index ae83cfc..2807f5b 100644 --- a/sw/source/core/unocore/unocoll.cxx +++ b/sw/source/core/unocore/unocoll.cxx @@ -145,25 +145,27 @@ public: uno::Reference< container::XIndexAccess > xIndex( xSupplier->getDrawPage(), uno::UNO_QUERY_THROW ); bool bMatched = false; - try + try + { + uno::Reference< form::XFormsSupplier > xFormSupplier( xIndex, uno::UNO_QUERY_THROW ); + uno::Reference< container::XIndexAccess > xFormIndex( xFormSupplier->getForms(), uno::UNO_QUERY_THROW ); + // get the www-standard container + uno::Reference< container::XIndexAccess > xFormControls( xFormIndex->getByIndex(0), uno::UNO_QUERY_THROW ); + sal_Int32 nCntrls = xFormControls->getCount(); + for( sal_Int32 cIndex = 0; cIndex < nCntrls; ++cIndex ) { - uno::Reference< form::XFormsSupplier > xFormSupplier( xIndex, uno::UNO_QUERY_THROW ); - uno::Reference< container::XIndexAccess > xFormIndex( xFormSupplier->getForms(), uno::UNO_QUERY_THROW ); - // get the www-standard container - uno::Reference< container::XIndexAccess > xFormControls( xFormIndex->getByIndex(0), uno::UNO_QUERY_THROW ); - sal_Int32 nCntrls = xFormControls->getCount(); - for( sal_Int32 cIndex = 0; cIndex < nCntrls; ++cIndex ) + uno::Reference< uno::XInterface > xControl( xFormControls->getByIndex( cIndex ), uno::UNO_QUERY_THROW ); + bMatched = ( xControl == xIf ); + if ( bMatched ) { - uno::Reference< uno::XInterface > xControl( xFormControls->getByIndex( cIndex ), uno::UNO_QUERY_THROW ); - bMatched = ( xControl == xIf ); - if ( bMatched ) - { - sCodeName = msThisDocumentCodeName; - break; - } + sCodeName = msThisDocumentCodeName; + break; } } - catch( uno::Exception& ) {} + } + catch( uno::Exception& ) + { + } } // Probably should throw here ( if !bMatched ) return sCodeName; commit e5ae44bbd3f0041e980269bb6041642e5935ce1b Author: Tor Lillqvist <[email protected]> Date: Wed Oct 2 20:49:56 2013 +0300 WaE: unused variable Change-Id: Ic44062cca5c0b552ca38e2ea57191f288aa550d0 diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx index 3230129..ae83cfc 100644 --- a/sw/source/core/unocore/unocoll.cxx +++ b/sw/source/core/unocore/unocoll.cxx @@ -145,7 +145,6 @@ public: uno::Reference< container::XIndexAccess > xIndex( xSupplier->getDrawPage(), uno::UNO_QUERY_THROW ); bool bMatched = false; - uno::Sequence< script::ScriptEventDescriptor > aFakeEvents; try { uno::Reference< form::XFormsSupplier > xFormSupplier( xIndex, uno::UNO_QUERY_THROW ); _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
