diff options
Diffstat (limited to 'reportdesign/source/ui/dlg/Condition.cxx')
-rw-r--r-- | reportdesign/source/ui/dlg/Condition.cxx | 33 |
1 files changed, 15 insertions, 18 deletions
diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx index db7326fccd41..e3591ae03534 100644 --- a/reportdesign/source/ui/dlg/Condition.cxx +++ b/reportdesign/source/ui/dlg/Condition.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: Condition.cxx,v $ - * $Revision: 1.6 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -75,7 +72,7 @@ ConditionField::ConditionField( Condition* _pParent, const ResId& _rResId ) : Ed m_pSubEdit = new Edit(this,0); SetSubEdit(m_pSubEdit); m_pSubEdit->EnableRTL( FALSE ); - m_pSubEdit->SetPosPixel( Point() );
+ m_pSubEdit->SetPosPixel( Point() ); m_aFormula.SetText(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("..."))); m_aFormula.SetClickHdl( LINK( this, ConditionField, OnFormula ) ); @@ -102,19 +99,19 @@ void ConditionField::Resize() // ----------------------------------------------------------------------------- IMPL_LINK( ConditionField, OnFormula, Button*, /*_pClickedButton*/ ) { - ::rtl::OUString sFormula(m_pSubEdit->GetText());
- const sal_Int32 nLen = sFormula.getLength();
- if ( nLen )
- {
- ReportFormula aFormula( sFormula );
- sFormula = aFormula.getCompleteFormula();
- } // if ( nLen )
- uno::Reference< awt::XWindow> xInspectorWindow = VCLUnoHelper::GetInterface(this);
- uno::Reference< beans::XPropertySet> xProp(m_pParent->getController().getRowSet(),uno::UNO_QUERY);
- if ( rptui::openDialogFormula_nothrow( sFormula, m_pParent->getController().getContext(),xInspectorWindow,xProp ) )
- {
- ReportFormula aFormula( sFormula );
- m_pSubEdit->SetText(aFormula.getUndecoratedContent());
+ ::rtl::OUString sFormula(m_pSubEdit->GetText()); + const sal_Int32 nLen = sFormula.getLength(); + if ( nLen ) + { + ReportFormula aFormula( sFormula ); + sFormula = aFormula.getCompleteFormula(); + } // if ( nLen ) + uno::Reference< awt::XWindow> xInspectorWindow = VCLUnoHelper::GetInterface(this); + uno::Reference< beans::XPropertySet> xProp(m_pParent->getController().getRowSet(),uno::UNO_QUERY); + if ( rptui::openDialogFormula_nothrow( sFormula, m_pParent->getController().getContext(),xInspectorWindow,xProp ) ) + { + ReportFormula aFormula( sFormula ); + m_pSubEdit->SetText(aFormula.getUndecoratedContent()); } return 0L; } |