diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:03:39 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:03:39 +0200 |
commit | 53aa87381a4df49d2d2c34328dc61716b4261ec7 (patch) | |
tree | 960b32cda2755f988d0d34e568f1019ad2bce0d2 /reportdesign/source/ui/dlg/CondFormat.cxx | |
parent | 2cfb9101ab66d1521faa19f4f7e7174aea66a972 (diff) |
recreated tag libreoffice-3.3.3.1 which had these commits:
commit 38f9e030925fc02a8e00bdd5985d4375439e199c (tag: refs/tags/libreoffice-3.3.3.1)
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue May 31 17:39:02 2011 +0200
Version 3.3.3.1, tag libreoffice-3.3.3.1 (3.3.3-rc1)
Notes
split repo tag: base_libreoffice-3.3.3.1
split repo tag: base_libreoffice-3.3.4.1
Diffstat (limited to 'reportdesign/source/ui/dlg/CondFormat.cxx')
-rw-r--r-- | reportdesign/source/ui/dlg/CondFormat.cxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/reportdesign/source/ui/dlg/CondFormat.cxx b/reportdesign/source/ui/dlg/CondFormat.cxx index 898779094953..a505e111bf39 100644 --- a/reportdesign/source/ui/dlg/CondFormat.cxx +++ b/reportdesign/source/ui/dlg/CondFormat.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 @@ -99,7 +99,7 @@ namespace rptui //======================================================================== // class ConditionalFormattingDialog //======================================================================== - DBG_NAME(rpt_ConditionalFormattingDialog) + DBG_NAME(rpt_ConditionalFormattingDialog) ConditionalFormattingDialog::ConditionalFormattingDialog( Window* _pParent, const Reference< XReportControlModel >& _rxFormatConditions, ::rptui::OReportController& _rController ) :ModalDialog( _pParent, ModuleRes(RID_CONDFORMAT) ) @@ -110,10 +110,10 @@ namespace rptui ,m_aPB_Help(this, ModuleRes(PB_HELP)) ,m_aCondScroll( this, ModuleRes( SB_ALL_CONDITIONS ) ) ,m_rController( _rController ) - ,m_xFormatConditions( _rxFormatConditions ) + ,m_xFormatConditions( _rxFormatConditions ) ,m_bDeletingCondition( false ) { - DBG_CTOR(rpt_ConditionalFormattingDialog,NULL); + DBG_CTOR(rpt_ConditionalFormattingDialog,NULL); OSL_ENSURE( m_xFormatConditions.is(), "ConditionalFormattingDialog::ConditionalFormattingDialog: ReportControlModel is NULL -> Prepare for GPF!" ); m_xCopy.set( m_xFormatConditions->createClone(), UNO_QUERY_THROW ); @@ -129,7 +129,7 @@ namespace rptui ConditionalFormattingDialog::~ConditionalFormattingDialog() { m_aConditions.clear(); - DBG_DTOR(rpt_ConditionalFormattingDialog,NULL); + DBG_DTOR(rpt_ConditionalFormattingDialog,NULL); } // ----------------------------------------------------------------------------- @@ -188,7 +188,7 @@ namespace rptui m_aConditions.insert( m_aConditions.begin() + _nNewCondIndex, pCon ); pCon->SetPosSizePixel( 0, 0, impl_getConditionWidth(), 0, WINDOW_POSSIZE_WIDTH ); - } + } catch( const Exception& ) { DBG_UNHANDLED_EXCEPTION(); @@ -246,7 +246,7 @@ namespace rptui if ( nNewFocusIndex >= impl_getConditionCount() ) nNewFocusIndex = impl_getConditionCount() - 1; } - } + } catch( const Exception& ) { DBG_UNHANDLED_EXCEPTION(); @@ -391,7 +391,7 @@ namespace rptui pCon->updateToolbar( xCond.get() ); m_aConditions.push_back( pCon ); } - } + } catch(Exception&) { OSL_ENSURE(0,"Can not access format condition!"); @@ -418,11 +418,11 @@ namespace rptui aArgs[2].Name = PROPERTY_FONTCOLOR; aArgs[2].Value <<= (sal_uInt32)_aColor.GetColor(); - + // we use this way to create undo actions m_rController.executeUnChecked(_nCommandId,aArgs); m_aConditions[ _nCondIndex ]->updateToolbar(xReportControlFormat); - } + } catch( Exception& ) { DBG_UNHANDLED_EXCEPTION(); @@ -500,7 +500,7 @@ namespace rptui m_xFormatConditions->removeByIndex(k); ::comphelper::copyProperties( m_xCopy.get(), m_xFormatConditions.get() ); - } + } catch ( const Exception& ) { DBG_UNHANDLED_EXCEPTION(); |