diff options
Diffstat (limited to 'forms')
252 files changed, 1597 insertions, 1597 deletions
diff --git a/forms/inc/pch/precompiled_forms.cxx b/forms/inc/pch/precompiled_forms.cxx index b925dcfc6605..990b15d0e6ba 100644 --- a/forms/inc/pch/precompiled_forms.cxx +++ b/forms/inc/pch/precompiled_forms.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 diff --git a/forms/inc/pch/precompiled_forms.hxx b/forms/inc/pch/precompiled_forms.hxx index 371183f1a99c..77e339408760 100644 --- a/forms/inc/pch/precompiled_forms.hxx +++ b/forms/inc/pch/precompiled_forms.hxx @@ -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 diff --git a/forms/qa/complex/forms/CheckOGroupBoxModel.java b/forms/qa/complex/forms/CheckOGroupBoxModel.java index 8a2ae5c7f0e4..b1d42ba60c13 100755 --- a/forms/qa/complex/forms/CheckOGroupBoxModel.java +++ b/forms/qa/complex/forms/CheckOGroupBoxModel.java @@ -1,7 +1,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 diff --git a/forms/qa/integration/forms/BooleanValidator.java b/forms/qa/integration/forms/BooleanValidator.java index 3cba1273d63f..4353703a4a92 100644 --- a/forms/qa/integration/forms/BooleanValidator.java +++ b/forms/qa/integration/forms/BooleanValidator.java @@ -21,7 +21,7 @@ public class BooleanValidator extends integration.forms.ControlValidator m_preventChecked = preventChecked; m_converter = new com.sun.star.uno.AnyConverter(); } - + public String explainInvalid( Object Value ) { try @@ -38,7 +38,7 @@ public class BooleanValidator extends integration.forms.ControlValidator } return ""; } - + public boolean isValid( Object Value ) { try diff --git a/forms/qa/integration/forms/CellBinding.java b/forms/qa/integration/forms/CellBinding.java index 3bf171d82465..07a8fddd6279 100644 --- a/forms/qa/integration/forms/CellBinding.java +++ b/forms/qa/integration/forms/CellBinding.java @@ -398,7 +398,7 @@ public class CellBinding extends complexlib.ComplexTestCase } return true; } - + /* ------------------------------------------------------------------ */ /** verifies that the content of a given cell equals a given string */ @@ -425,7 +425,7 @@ public class CellBinding extends complexlib.ComplexTestCase ); cell.setString( text ); } - + /* ------------------------------------------------------------------ */ /** sets a numeric value in a given cell */ @@ -436,7 +436,7 @@ public class CellBinding extends complexlib.ComplexTestCase ); cell.setValue( value ); } - + /* ------------------------------------------------------------------ */ /** sets a numeric value in a given cell */ @@ -450,7 +450,7 @@ public class CellBinding extends complexlib.ComplexTestCase String[][] args = new String[][] { new String[] { "=INVALID_FUNCTION()" } }; cell.setFormulaArray( args ); } - + /* ------------------------------------------------------------------ */ /** binds the given control model to the given cell in the first sheet, * using the given service name for the binding @@ -469,7 +469,7 @@ public class CellBinding extends complexlib.ComplexTestCase NamedValue[] parameters = new NamedValue[] { new NamedValue() }; parameters[0].Name = "BoundCell"; parameters[0].Value = address; - + XValueBinding cellBinding = (XValueBinding)UnoRuntime.queryInterface( XValueBinding.class, m_document.createInstanceWithArguments( _bindingServiceName, parameters ) ); @@ -492,7 +492,7 @@ public class CellBinding extends complexlib.ComplexTestCase { CellRangeAddress listSourceAddress = new CellRangeAddress( (short)0, (int)_sourceCol, (int)_rowStart, (int)_sourceCol, (int)_rowEnd ); NamedValue addressParameter = new NamedValue( "CellRange", listSourceAddress ); - + XListEntrySource listSource = (XListEntrySource)UnoRuntime.queryInterface( XListEntrySource.class, m_document.createInstanceWithArguments( "com.sun.star.table.CellRangeListSource", new NamedValue[]{ addressParameter } ) ); diff --git a/forms/qa/integration/forms/ControlValidation.java b/forms/qa/integration/forms/ControlValidation.java index c480ded16a4b..059101801f37 100644 --- a/forms/qa/integration/forms/ControlValidation.java +++ b/forms/qa/integration/forms/ControlValidation.java @@ -1,7 +1,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 diff --git a/forms/qa/integration/forms/ControlValidator.java b/forms/qa/integration/forms/ControlValidator.java index 969a9d2f46aa..746115998d8f 100644 --- a/forms/qa/integration/forms/ControlValidator.java +++ b/forms/qa/integration/forms/ControlValidator.java @@ -1,7 +1,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 @@ -32,20 +32,20 @@ package integration.forms; */ public abstract class ControlValidator implements com.sun.star.form.validation.XValidator { - + /** Creates a new instance of ControlValidator */ public ControlValidator() { } - + public void addValidityConstraintListener(com.sun.star.form.validation.XValidityConstraintListener xValidityConstraintListener) { } - + public void removeValidityConstraintListener(com.sun.star.form.validation.XValidityConstraintListener xValidityConstraintListener) { } - + protected boolean isVoid( Object Value ) { try diff --git a/forms/qa/integration/forms/DateValidator.java b/forms/qa/integration/forms/DateValidator.java index 1ae2bbe48058..526ba1031c4b 100644 --- a/forms/qa/integration/forms/DateValidator.java +++ b/forms/qa/integration/forms/DateValidator.java @@ -1,7 +1,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 @@ -34,12 +34,12 @@ import com.sun.star.form.binding.*; */ public class DateValidator extends integration.forms.ControlValidator { - + /** Creates a new instance of NumericValidator */ public DateValidator( ) { } - + public String explainInvalid( Object Value ) { try @@ -60,7 +60,7 @@ public class DateValidator extends integration.forms.ControlValidator } return ""; } - + public boolean isValid( Object Value ) { try diff --git a/forms/qa/integration/forms/DocumentHelper.java b/forms/qa/integration/forms/DocumentHelper.java index 524f6b939afb..f4dbac80b26c 100644 --- a/forms/qa/integration/forms/DocumentHelper.java +++ b/forms/qa/integration/forms/DocumentHelper.java @@ -1,7 +1,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 @@ -185,7 +185,7 @@ public class DocumentHelper * of the document, they will become invalid. * The Model instance itself, at which you called reload, will still be valid, it will * automatically update its internal state after the reload. - * + * * Another consequence is that if the document does not have a view at all, it cannot * be reloaded. */ diff --git a/forms/qa/integration/forms/DocumentType.java b/forms/qa/integration/forms/DocumentType.java index cc52e6a1aabc..88455824a33b 100644 --- a/forms/qa/integration/forms/DocumentType.java +++ b/forms/qa/integration/forms/DocumentType.java @@ -1,7 +1,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 diff --git a/forms/qa/integration/forms/DocumentViewHelper.java b/forms/qa/integration/forms/DocumentViewHelper.java index afd89841a8d2..9260d680f58c 100644 --- a/forms/qa/integration/forms/DocumentViewHelper.java +++ b/forms/qa/integration/forms/DocumentViewHelper.java @@ -1,7 +1,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 @@ -53,7 +53,7 @@ import org.openoffice.xforms.XMLDocument; */ public class DocumentViewHelper { - private XMultiServiceFactory m_orb; + private XMultiServiceFactory m_orb; private XController m_controller; private DocumentHelper m_document; diff --git a/forms/qa/integration/forms/FormComponent.java b/forms/qa/integration/forms/FormComponent.java index 6e6676fff94f..75bb5958d711 100644 --- a/forms/qa/integration/forms/FormComponent.java +++ b/forms/qa/integration/forms/FormComponent.java @@ -1,7 +1,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 diff --git a/forms/qa/integration/forms/FormControlTest.java b/forms/qa/integration/forms/FormControlTest.java index 7fdf68dea796..58af651942d7 100644 --- a/forms/qa/integration/forms/FormControlTest.java +++ b/forms/qa/integration/forms/FormControlTest.java @@ -1,7 +1,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 @@ -496,7 +496,7 @@ public class FormControlTest extends complexlib.ComplexTestCase implements XSQLE XPropertySet dataSourceSettings = (XPropertySet)UnoRuntime.queryInterface( XPropertySet.class, m_dataSourceProps.getPropertyValue( "Settings" ) ); dataSourceSettings.setPropertyValue( "FormsCheckRequiredFields", new Boolean( false ) ); - + return m_dataSource != null; } @@ -514,12 +514,12 @@ public class FormControlTest extends complexlib.ComplexTestCase implements XSQLE /* ------------------------------------------------------------------ */ private void createSampleDocument() throws com.sun.star.uno.Exception, java.lang.Exception { - + m_document = DocumentHelper.blankTextDocument( m_orb ); m_formLayer = new FormLayer( m_document ); // insert some controls - XPropertySet xIDField = m_formLayer.insertControlLine( "DatabaseNumericField", "ID", "", 3 ); + XPropertySet xIDField = m_formLayer.insertControlLine( "DatabaseNumericField", "ID", "", 3 ); m_formLayer.insertControlLine( "DatabaseFormattedField","f_integer", "", 11 ); m_formLayer.insertControlLine( "DatabaseTextField", "f_text", "", 19 ); XPropertySet xReqField = m_formLayer.insertControlLine( "DatabaseTextField", "f_required_text", "", 27 ); diff --git a/forms/qa/integration/forms/FormLayer.java b/forms/qa/integration/forms/FormLayer.java index d1b50f0d246c..087424ee43d4 100644 --- a/forms/qa/integration/forms/FormLayer.java +++ b/forms/qa/integration/forms/FormLayer.java @@ -1,7 +1,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 @@ -168,7 +168,7 @@ public class FormLayer } /** creates a pair of controls, namely a label control, and another control labeled by it - * + * * @param _formComponentServiceName * the service name for the control which is not the label control * @param _label @@ -203,7 +203,7 @@ public class FormLayer return field; } - + /* ------------------------------------------------------------------ */ /** creates a line of controls, consisting of a label and a field for data input. diff --git a/forms/qa/integration/forms/FormPropertyBags.java b/forms/qa/integration/forms/FormPropertyBags.java index c2cd36289a42..d6fab4bda945 100644 --- a/forms/qa/integration/forms/FormPropertyBags.java +++ b/forms/qa/integration/forms/FormPropertyBags.java @@ -1,7 +1,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 diff --git a/forms/qa/integration/forms/ImageComparison.java b/forms/qa/integration/forms/ImageComparison.java index 87f2c82f928d..859d1b1bbce8 100644 --- a/forms/qa/integration/forms/ImageComparison.java +++ b/forms/qa/integration/forms/ImageComparison.java @@ -12,7 +12,7 @@ package integration.forms; */ public final class ImageComparison implements com.sun.star.awt.XImageConsumer { - + private byte[] m_referenceBytes; private int m_referencePosition; private java.io.FileOutputStream m_stream; @@ -38,15 +38,15 @@ public final class ImageComparison implements com.sun.star.awt.XImageConsumer m_notifyDone.notify(); } } - + public void init(int param, int param1) { } - + public void setColorModel(short param, int[] values, int param2, int param3, int param4, int param5) { } - + public void setPixelsByBytes(int param, int param1, int param2, int param3, byte[] values, int param5, int param6) { if ( m_referencePosition == -1 ) @@ -65,9 +65,9 @@ public final class ImageComparison implements com.sun.star.awt.XImageConsumer ++m_referencePosition; } } - + public void setPixelsByLongs(int param, int param1, int param2, int param3, int[] values, int param5, int param6) { } - + } diff --git a/forms/qa/integration/forms/ListBox.java b/forms/qa/integration/forms/ListBox.java index 6e50291d6525..11af2682023e 100644 --- a/forms/qa/integration/forms/ListBox.java +++ b/forms/qa/integration/forms/ListBox.java @@ -1,7 +1,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 diff --git a/forms/qa/integration/forms/ListSelection.java b/forms/qa/integration/forms/ListSelection.java index 24a5290dc1d4..e26acd69c349 100644 --- a/forms/qa/integration/forms/ListSelection.java +++ b/forms/qa/integration/forms/ListSelection.java @@ -1,7 +1,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 diff --git a/forms/qa/integration/forms/ListSelectionValidator.java b/forms/qa/integration/forms/ListSelectionValidator.java index 4f25b162712d..489772047401 100644 --- a/forms/qa/integration/forms/ListSelectionValidator.java +++ b/forms/qa/integration/forms/ListSelectionValidator.java @@ -1,7 +1,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 @@ -37,7 +37,7 @@ public class ListSelectionValidator extends integration.forms.ControlValidator public ListSelectionValidator() { } - + public String explainInvalid( Object Value ) { try @@ -52,7 +52,7 @@ public class ListSelectionValidator extends integration.forms.ControlValidator } return ""; } - + public boolean isValid( Object Value ) { try @@ -67,5 +67,5 @@ public class ListSelectionValidator extends integration.forms.ControlValidator } return false; } - + } diff --git a/forms/qa/integration/forms/MasterDetailForms.java b/forms/qa/integration/forms/MasterDetailForms.java index cd51abc3e446..90f9f511cf55 100644 --- a/forms/qa/integration/forms/MasterDetailForms.java +++ b/forms/qa/integration/forms/MasterDetailForms.java @@ -1,7 +1,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 @@ -72,7 +72,7 @@ public class MasterDetailForms extends complexlib.ComplexTestCase implements com public MasterDetailForms() { } - + /* ------------------------------------------------------------------ */ public String[] getTestMethodNames() { @@ -96,7 +96,7 @@ public class MasterDetailForms extends complexlib.ComplexTestCase implements com /* ------------------------------------------------------------------ */ /** creates the table structure needed for the test - */ + */ private void impl_createTableStructure( final HsqlDatabase _databaseDocument ) throws SQLException { HsqlColumnDescriptor[] masterColumns = { @@ -383,7 +383,7 @@ public class MasterDetailForms extends complexlib.ComplexTestCase implements com m_loaded = false; } } - + /** assures that the (integer) values in the given columns of our master and detail forms are identical */ private void verifyColumnValueIdentity( final String masterColName, final String detailColName ) throws SQLException @@ -394,7 +394,7 @@ public class MasterDetailForms extends complexlib.ComplexTestCase implements com int masterValue = m_masterResult.getInt( locateMasterCols.findColumn( masterColName ) ); int detailValue = m_detailResult.getInt( locateDetailCols.findColumn( detailColName ) ); - assure( "values in linked column pair " + detailColName + "->" + masterColName + " (" + + assure( "values in linked column pair " + detailColName + "->" + masterColName + " (" + detailValue + "->" + masterValue + ") do not match (master position: " + m_masterResult.getRow() + ")!", masterValue == detailValue ); } diff --git a/forms/qa/integration/forms/NumericValidator.java b/forms/qa/integration/forms/NumericValidator.java index 4fed12c4fd2b..cc8662c24a8c 100644 --- a/forms/qa/integration/forms/NumericValidator.java +++ b/forms/qa/integration/forms/NumericValidator.java @@ -1,7 +1,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 @@ -34,12 +34,12 @@ import com.sun.star.form.binding.*; */ public class NumericValidator extends integration.forms.ControlValidator { - + /** Creates a new instance of NumericValidator */ public NumericValidator( ) { } - + public String explainInvalid( Object Value ) { try @@ -58,7 +58,7 @@ public class NumericValidator extends integration.forms.ControlValidator } return ""; } - + public boolean isValid( Object Value ) { try @@ -77,7 +77,7 @@ public class NumericValidator extends integration.forms.ControlValidator } return false; } - + private boolean isProperRange( double value) { return ( value >= 0 ) && ( value <= 100 ); diff --git a/forms/qa/integration/forms/RadioButtons.java b/forms/qa/integration/forms/RadioButtons.java index 3ce02787b330..4a731a6d2e1f 100644 --- a/forms/qa/integration/forms/RadioButtons.java +++ b/forms/qa/integration/forms/RadioButtons.java @@ -1,7 +1,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 diff --git a/forms/qa/integration/forms/SingleControlValidation.java b/forms/qa/integration/forms/SingleControlValidation.java index 637e9c9e4e26..50490a44db73 100644 --- a/forms/qa/integration/forms/SingleControlValidation.java +++ b/forms/qa/integration/forms/SingleControlValidation.java @@ -1,7 +1,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 @@ -71,7 +71,7 @@ public class SingleControlValidation implements XFormComponentValidityListener m_formLayer = new FormLayer( m_document ); createControls( columnPos, rowPos, formComponentService, controlCount, controlHeight ); } - + /* ------------------------------------------------------------------ */ public XPropertySet getInputField() { @@ -155,7 +155,7 @@ public class SingleControlValidation implements XFormComponentValidityListener { // not interested in } - + /* ------------------------------------------------------------------ */ /* XFormComponentValidityListener overridables */ /* ------------------------------------------------------------------ */ @@ -187,5 +187,5 @@ public class SingleControlValidation implements XFormComponentValidityListener e.printStackTrace( System.out ); } } - + } diff --git a/forms/qa/integration/forms/SpreadsheetDocument.java b/forms/qa/integration/forms/SpreadsheetDocument.java index 8f156fe8e3b6..91d348998302 100644 --- a/forms/qa/integration/forms/SpreadsheetDocument.java +++ b/forms/qa/integration/forms/SpreadsheetDocument.java @@ -1,7 +1,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 diff --git a/forms/qa/integration/forms/SpreadsheetView.java b/forms/qa/integration/forms/SpreadsheetView.java index 19f7bd429290..819cca3f4d17 100644 --- a/forms/qa/integration/forms/SpreadsheetView.java +++ b/forms/qa/integration/forms/SpreadsheetView.java @@ -1,7 +1,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 @@ -47,7 +47,7 @@ import integration.forms.DocumentHelper; */ public class SpreadsheetView extends integration.forms.DocumentViewHelper { - + /** Creates a new instance of SpreadsheetView */ public SpreadsheetView( XMultiServiceFactory orb, DocumentHelper document, XController controller ) { diff --git a/forms/qa/integration/forms/TableCellTextBinding.java b/forms/qa/integration/forms/TableCellTextBinding.java index 6517ed5c90f0..f6b38013ef46 100644 --- a/forms/qa/integration/forms/TableCellTextBinding.java +++ b/forms/qa/integration/forms/TableCellTextBinding.java @@ -1,7 +1,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 diff --git a/forms/qa/integration/forms/TestCase.java b/forms/qa/integration/forms/TestCase.java index aeaa8048f92c..6498515b6cc4 100644 --- a/forms/qa/integration/forms/TestCase.java +++ b/forms/qa/integration/forms/TestCase.java @@ -1,7 +1,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 diff --git a/forms/qa/integration/forms/TestSkeleton.java b/forms/qa/integration/forms/TestSkeleton.java index 2736395ff400..c5471d097be8 100644 --- a/forms/qa/integration/forms/TestSkeleton.java +++ b/forms/qa/integration/forms/TestSkeleton.java @@ -1,7 +1,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 diff --git a/forms/qa/integration/forms/TextValidator.java b/forms/qa/integration/forms/TextValidator.java index db340f93abcc..e59d77013490 100644 --- a/forms/qa/integration/forms/TextValidator.java +++ b/forms/qa/integration/forms/TextValidator.java @@ -1,7 +1,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 @@ -34,7 +34,7 @@ import com.sun.star.form.binding.*; */ public class TextValidator extends integration.forms.ControlValidator { - + /** Creates a new instance of NumericValidator */ public TextValidator( ) { @@ -56,7 +56,7 @@ public class TextValidator extends integration.forms.ControlValidator } return ""; } - + public boolean isValid( Object Value ) { try @@ -73,7 +73,7 @@ public class TextValidator extends integration.forms.ControlValidator } return false; } - + private boolean isProperChunks( String value ) { return ( value.length() % 3 ) == 0; diff --git a/forms/qa/integration/forms/TimeValidator.java b/forms/qa/integration/forms/TimeValidator.java index 116f98455d94..3ed3b6756209 100644 --- a/forms/qa/integration/forms/TimeValidator.java +++ b/forms/qa/integration/forms/TimeValidator.java @@ -1,7 +1,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 @@ -34,12 +34,12 @@ import com.sun.star.form.binding.*; */ public class TimeValidator extends integration.forms.ControlValidator { - + /** Creates a new instance of NumericValidator */ public TimeValidator( ) { } - + public String explainInvalid( Object Value ) { try @@ -59,7 +59,7 @@ public class TimeValidator extends integration.forms.ControlValidator } return ""; } - + public boolean isValid( Object Value ) { try diff --git a/forms/qa/integration/forms/ValueBinding.java b/forms/qa/integration/forms/ValueBinding.java index cec1b6d200c2..e53c1d2b1936 100644 --- a/forms/qa/integration/forms/ValueBinding.java +++ b/forms/qa/integration/forms/ValueBinding.java @@ -1,7 +1,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 diff --git a/forms/qa/integration/forms/WaitForInput.java b/forms/qa/integration/forms/WaitForInput.java index f0109aa485d4..8a71c8f0662c 100644 --- a/forms/qa/integration/forms/WaitForInput.java +++ b/forms/qa/integration/forms/WaitForInput.java @@ -1,7 +1,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 @@ -28,8 +28,8 @@ package integration.forms; class WaitForInput extends java.lang.Thread { - private Object m_aToNotify; - private boolean m_bDone; + private Object m_aToNotify; + private boolean m_bDone; public WaitForInput( Object aToNotify ) { diff --git a/forms/qa/integration/forms/XMLFormSettings.java b/forms/qa/integration/forms/XMLFormSettings.java index e3881bfa861d..c8b28d3f44be 100644 --- a/forms/qa/integration/forms/XMLFormSettings.java +++ b/forms/qa/integration/forms/XMLFormSettings.java @@ -1,7 +1,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 @@ -59,7 +59,7 @@ public class XMLFormSettings extends complexlib.ComplexTestCase public XMLFormSettings() { } - + /* ------------------------------------------------------------------ */ public String[] getTestMethodNames() { @@ -67,7 +67,7 @@ public class XMLFormSettings extends complexlib.ComplexTestCase "checkExternalData" }; } - + /* ------------------------------------------------------------------ */ public String getTestObjectName() { diff --git a/forms/qa/org/openoffice/xforms/Instance.java b/forms/qa/org/openoffice/xforms/Instance.java index 5e4e04741995..8986be44b897 100644 --- a/forms/qa/org/openoffice/xforms/Instance.java +++ b/forms/qa/org/openoffice/xforms/Instance.java @@ -27,9 +27,9 @@ public class Instance } /** creates a new element in the instance - * + * * The element will be inserted immediately below the root node of the instance. - * + * * @param _elementName * the name of the to-be-created element * @return @@ -42,9 +42,9 @@ public class Instance } /** creates a new element in the instance - * + * * The element will be inserted immediately below the root node of the instance. - * + * * @param _elementName * the name of the to-be-created element * @param _initialNodeValue @@ -59,9 +59,9 @@ public class Instance } /** creates a new element in the instance - * + * * The element will be inserted immediately below a given XNode. - * + * * @param _parentElement * the node whose child shall be created * @param _elementName @@ -76,9 +76,9 @@ public class Instance } /** creates a new element in the instance - * + * * The element will be inserted immediately below a given XNode. - * + * * @param _parentElement * the node whose child shall be created * @param _elementName @@ -132,7 +132,7 @@ public class Instance } /** creates an attribute for the root node of the instance - * + * * @param _attribName * the name of the to-be-created attribute * @return @@ -145,7 +145,7 @@ public class Instance } /** creates an attribute for the root node of the instance - * + * * @param _attribName * the name of the to-be-created attribute * @param _initialNodeValue @@ -160,7 +160,7 @@ public class Instance } /** creates an attribute for the given node - * + * * @param _parentElement * the element at which the attribute should be created * @param _attribName @@ -175,7 +175,7 @@ public class Instance } /** creates an attribute for the given node - * + * * @param _parentElement * the element at which the attribute should be created * @param _attribName diff --git a/forms/qa/org/openoffice/xforms/Model.java b/forms/qa/org/openoffice/xforms/Model.java index ee4ed6caa7e8..a4a76f2130bd 100644 --- a/forms/qa/org/openoffice/xforms/Model.java +++ b/forms/qa/org/openoffice/xforms/Model.java @@ -49,7 +49,7 @@ public class Model } /** creates a binding for the given DOM node - * + * * @param _node * the DOM node to create a binding for * @param _dataType diff --git a/forms/source/component/BaseListBox.hxx b/forms/source/component/BaseListBox.hxx index 01d63db5659f..184acbad2bdb 100644 --- a/forms/source/component/BaseListBox.hxx +++ b/forms/source/component/BaseListBox.hxx @@ -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 @@ -33,8 +33,8 @@ namespace frm { -const sal_uInt16 ENTRY_NOT_FOUND = 0xFFFF; -const sal_uInt16 BOUNDCOLUMN = 0x0001; +const sal_uInt16 ENTRY_NOT_FOUND = 0xFFFF; +const sal_uInt16 BOUNDCOLUMN = 0x0001; //......................................................................... } diff --git a/forms/source/component/Button.cxx b/forms/source/component/Button.cxx index da060f997052..8d9b8c8a088f 100644 --- a/forms/source/component/Button.cxx +++ b/forms/source/component/Button.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 @@ -120,12 +120,12 @@ OButtonModel::~OButtonModel() void OButtonModel::describeFixedProperties( Sequence< Property >& _rProps ) const { BEGIN_DESCRIBE_PROPERTIES( 6, OClickableImageBaseModel ) - DECL_PROP1( BUTTONTYPE, FormButtonType, BOUND ); + DECL_PROP1( BUTTONTYPE, FormButtonType, BOUND ); DECL_PROP1( DEFAULT_STATE, sal_Int16, BOUND ); - DECL_PROP1( DISPATCHURLINTERNAL, sal_Bool, BOUND ); - DECL_PROP1( TARGET_URL, ::rtl::OUString, BOUND ); - DECL_PROP1( TARGET_FRAME, ::rtl::OUString, BOUND ); - DECL_PROP1( TABINDEX, sal_Int16, BOUND ); + DECL_PROP1( DISPATCHURLINTERNAL, sal_Bool, BOUND ); + DECL_PROP1( TARGET_URL, ::rtl::OUString, BOUND ); + DECL_PROP1( TARGET_FRAME, ::rtl::OUString, BOUND ); + DECL_PROP1( TABINDEX, sal_Int16, BOUND ); END_DESCRIBE_PROPERTIES(); } @@ -134,7 +134,7 @@ IMPLEMENT_DEFAULT_CLONING( OButtonModel ) // XServiceInfo //------------------------------------------------------------------------------ -StringSequence OButtonModel::getSupportedServiceNames() throw() +StringSequence OButtonModel::getSupportedServiceNames() throw() { StringSequence aSupported = OClickableImageBaseModel::getSupportedServiceNames(); aSupported.realloc( aSupported.getLength() + 1 ); @@ -148,7 +148,7 @@ StringSequence OButtonModel::getSupportedServiceNames() throw() //------------------------------------------------------------------------------ ::rtl::OUString OButtonModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException) { - return FRM_COMPONENT_COMMANDBUTTON; // old (non-sun) name for compatibility ! + return FRM_COMPONENT_COMMANDBUTTON; // old (non-sun) name for compatibility ! } //------------------------------------------------------------------------------ @@ -156,7 +156,7 @@ void OButtonModel::write(const Reference<XObjectOutputStream>& _rxOutStream) thr { OClickableImageBaseModel::write(_rxOutStream); - _rxOutStream->writeShort(0x0003); // Version + _rxOutStream->writeShort(0x0003); // Version { OStreamSection aSection( _rxOutStream.get() ); @@ -177,7 +177,7 @@ void OButtonModel::read(const Reference<XObjectInputStream>& _rxInStream) throw { OClickableImageBaseModel::read(_rxInStream); - sal_uInt16 nVersion = _rxInStream->readShort(); // Version + sal_uInt16 nVersion = _rxInStream->readShort(); // Version switch (nVersion) { case 0x0001: @@ -364,7 +364,7 @@ Sequence<Type> OButtonControl::_getTypes() } //------------------------------------------------------------------------------ -StringSequence OButtonControl::getSupportedServiceNames() throw() +StringSequence OButtonControl::getSupportedServiceNames() throw() { StringSequence aSupported = OClickableImageBaseControl::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 1); @@ -776,7 +776,7 @@ void SAL_CALL OButtonControl::releaseDispatchProviderInterceptor( const Referenc } //......................................................................... -} // namespace frm +} // namespace frm //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/component/Button.hxx b/forms/source/component/Button.hxx index b866c55b3b1c..511077d4032f 100644 --- a/forms/source/component/Button.hxx +++ b/forms/source/component/Button.hxx @@ -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 @@ -123,7 +123,7 @@ typedef ::cppu::ImplHelper3 < ::com::sun::star::awt::XButton , ::com::sun::star::beans::XPropertyChangeListener > OButtonControl_BASE; -class OButtonControl :public OButtonControl_BASE +class OButtonControl :public OButtonControl_BASE ,public OClickableImageBaseControl ,public OFormNavigationHelper { @@ -204,7 +204,7 @@ private: }; //......................................................................... -} // namespace frm +} // namespace frm //......................................................................... #endif // _FRM_BUTTON_HXX_ diff --git a/forms/source/component/CheckBox.cxx b/forms/source/component/CheckBox.cxx index 11ccbe16690a..bc69702ede28 100644 --- a/forms/source/component/CheckBox.cxx +++ b/forms/source/component/CheckBox.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 @@ -68,7 +68,7 @@ InterfaceRef SAL_CALL OCheckBoxControl_CreateInstance(const Reference<XMultiServ } //------------------------------------------------------------------------------ -StringSequence SAL_CALL OCheckBoxControl::getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException) +StringSequence SAL_CALL OCheckBoxControl::getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException) { StringSequence aSupported = OBoundControl::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 1); @@ -119,7 +119,7 @@ IMPLEMENT_DEFAULT_CLONING( OCheckBoxModel ) // XServiceInfo //------------------------------------------------------------------------------ -StringSequence SAL_CALL OCheckBoxModel::getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException) +StringSequence SAL_CALL OCheckBoxModel::getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException) { StringSequence aSupported = OReferenceValueComponent::getSupportedServiceNames(); @@ -145,14 +145,14 @@ StringSequence SAL_CALL OCheckBoxModel::getSupportedServiceNames() throw(::com:: void OCheckBoxModel::describeFixedProperties( Sequence< Property >& _rProps ) const { BEGIN_DESCRIBE_PROPERTIES( 1, OReferenceValueComponent ) - DECL_PROP1(TABINDEX, sal_Int16, BOUND); + DECL_PROP1(TABINDEX, sal_Int16, BOUND); END_DESCRIBE_PROPERTIES(); } //------------------------------------------------------------------------------ ::rtl::OUString SAL_CALL OCheckBoxModel::getServiceName() throw(RuntimeException) { - return FRM_COMPONENT_CHECKBOX; // old (non-sun) name for compatibility ! + return FRM_COMPONENT_CHECKBOX; // old (non-sun) name for compatibility ! } //------------------------------------------------------------------------------ diff --git a/forms/source/component/CheckBox.hxx b/forms/source/component/CheckBox.hxx index f5620b310947..6ae342c4045b 100644 --- a/forms/source/component/CheckBox.hxx +++ b/forms/source/component/CheckBox.hxx @@ -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 @@ -38,20 +38,20 @@ namespace frm //================================================================== //= OCheckBoxModel //================================================================== -class OCheckBoxModel :public OReferenceValueComponent +class OCheckBoxModel :public OReferenceValueComponent { protected: - sal_Int16 getState(const ::com::sun::star::uno::Any& rValue); + sal_Int16 getState(const ::com::sun::star::uno::Any& rValue); public: DECLARE_DEFAULT_LEAF_XTOR( OCheckBoxModel ); // XServiceInfo IMPLEMENTATION_NAME(OCheckBoxModel); - virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XPersistObject - virtual ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); + virtual ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL @@ -81,7 +81,7 @@ public: // XServiceInfo IMPLEMENTATION_NAME(OCheckBoxControl); - virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; //......................................................................... diff --git a/forms/source/component/Columns.cxx b/forms/source/component/Columns.cxx index d64ebab3ed8c..af41076175d0 100644 --- a/forms/source/component/Columns.cxx +++ b/forms/source/component/Columns.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 @@ -259,7 +259,7 @@ OGridColumn::OGridColumn( const OGridColumn* _pOriginal ) } if ( m_xAggregate.is() ) - { // don't omit this brackets - they ensure that the following temporary is properly deleted + { // don't omit this brackets - they ensure that the following temporary is properly deleted m_xAggregate->setDelegator( static_cast< ::cppu::OWeakObject* >( this ) ); } } diff --git a/forms/source/component/Columns.hxx b/forms/source/component/Columns.hxx index 4068a7b88590..76c526cdc302 100644 --- a/forms/source/component/Columns.hxx +++ b/forms/source/component/Columns.hxx @@ -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 @@ -59,23 +59,23 @@ namespace frm //================================================================== typedef ::cppu::WeakAggComponentImplHelper2 < ::com::sun::star::lang::XUnoTunnel , ::com::sun::star::util::XCloneable > OGridColumn_BASE; -class OGridColumn :public ::comphelper::OBaseMutex +class OGridColumn :public ::comphelper::OBaseMutex ,public OGridColumn_BASE ,public OPropertySetAggregationHelper ,public OCloneableAggregation { protected: // [properties] - ::com::sun::star::uno::Any m_aWidth; // column width - ::com::sun::star::uno::Any m_aAlign; // column alignment - ::com::sun::star::uno::Any m_aHidden; // column hidden? + ::com::sun::star::uno::Any m_aWidth; // column width + ::com::sun::star::uno::Any m_aAlign; // column alignment + ::com::sun::star::uno::Any m_aHidden; // column hidden? // [properties] ::comphelper::ComponentContext m_aContext; - ::rtl::OUString m_aModelName; + ::rtl::OUString m_aModelName; // [properties] - ::rtl::OUString m_aLabel; // Name der Spalte + ::rtl::OUString m_aLabel; // Name der Spalte // [properties] public: @@ -92,8 +92,8 @@ public: virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence<sal_Int8>& _rIdentifier) throw(::com::sun::star::uno::RuntimeException); // XTypeProvider - virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); // OComponentHelper virtual void SAL_CALL disposing(); @@ -130,28 +130,28 @@ protected: virtual OGridColumn* createCloneColumn() const = 0; }; -#define DECL_COLUMN(ClassName) \ -class ClassName \ - :public OGridColumn \ - ,public OAggregationArrayUsageHelper< ClassName > \ -{ \ -public: \ +#define DECL_COLUMN(ClassName) \ +class ClassName \ + :public OGridColumn \ + ,public OAggregationArrayUsageHelper< ClassName > \ +{ \ +public: \ ClassName(const ::comphelper::ComponentContext& _rContext ); \ ClassName(const ClassName* _pCloneFrom); \ \ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); \ - virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); \ + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); \ + virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); \ \ - virtual void fillProperties( \ - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rProps, \ - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rAggregateProps \ - ) const; \ + virtual void fillProperties( \ + ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rProps, \ + ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rAggregateProps \ + ) const; \ \ virtual OGridColumn* createCloneColumn() const; \ }; -#define IMPL_COLUMN(ClassName, Model, bAllowDropDown) \ +#define IMPL_COLUMN(ClassName, Model, bAllowDropDown) \ ClassName::ClassName( const ::comphelper::ComponentContext& _rContext ) \ :OGridColumn(_rContext, Model) \ { \ @@ -187,16 +187,16 @@ OGridColumn* ClassName::createCloneColumn() const \ } \ \ // column type ids -#define TYPE_CHECKBOX 0 -#define TYPE_COMBOBOX 1 +#define TYPE_CHECKBOX 0 +#define TYPE_COMBOBOX 1 #define TYPE_CURRENCYFIELD 2 -#define TYPE_DATEFIELD 3 -#define TYPE_FORMATTEDFIELD 4 -#define TYPE_LISTBOX 5 -#define TYPE_NUMERICFIELD 6 -#define TYPE_PATTERNFIELD 7 -#define TYPE_TEXTFIELD 8 -#define TYPE_TIMEFIELD 9 +#define TYPE_DATEFIELD 3 +#define TYPE_FORMATTEDFIELD 4 +#define TYPE_LISTBOX 5 +#define TYPE_NUMERICFIELD 6 +#define TYPE_PATTERNFIELD 7 +#define TYPE_TEXTFIELD 8 +#define TYPE_TIMEFIELD 9 // liste aller bekannten columns const StringSequence& getColumnTypes(); @@ -217,7 +217,7 @@ DECL_COLUMN(FormattedFieldColumn) #endif // _FRM_COLUMNS_HXX //......................................................................... -} // namespace frm +} // namespace frm //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/component/ComboBox.cxx b/forms/source/component/ComboBox.cxx index 899289025e7b..02d15508abe5 100644 --- a/forms/source/component/ComboBox.cxx +++ b/forms/source/component/ComboBox.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 @@ -316,11 +316,11 @@ sal_Bool OComboBoxModel::convertFastPropertyValue( void OComboBoxModel::describeFixedProperties( Sequence< Property >& _rProps ) const { BEGIN_DESCRIBE_PROPERTIES( 6, OBoundControlModel ) - DECL_PROP1(TABINDEX, sal_Int16, BOUND); - DECL_PROP1(LISTSOURCETYPE, ListSourceType, BOUND); - DECL_PROP1(LISTSOURCE, ::rtl::OUString, BOUND); - DECL_BOOL_PROP1(EMPTY_IS_NULL, BOUND); - DECL_PROP1(DEFAULT_TEXT, ::rtl::OUString, BOUND); + DECL_PROP1(TABINDEX, sal_Int16, BOUND); + DECL_PROP1(LISTSOURCETYPE, ListSourceType, BOUND); + DECL_PROP1(LISTSOURCE, ::rtl::OUString, BOUND); + DECL_BOOL_PROP1(EMPTY_IS_NULL, BOUND); + DECL_PROP1(DEFAULT_TEXT, ::rtl::OUString, BOUND); DECL_PROP1(STRINGITEMLIST, Sequence< ::rtl::OUString >,BOUND); END_DESCRIBE_PROPERTIES(); } @@ -337,7 +337,7 @@ void OComboBoxModel::describeAggregateProperties( Sequence< Property >& _rAggreg //------------------------------------------------------------------------------ ::rtl::OUString SAL_CALL OComboBoxModel::getServiceName() throw(RuntimeException) { - return FRM_COMPONENT_COMBOBOX; // old (non-sun) name for compatibility ! + return FRM_COMPONENT_COMBOBOX; // old (non-sun) name for compatibility ! } //------------------------------------------------------------------------------ @@ -347,10 +347,10 @@ void SAL_CALL OComboBoxModel::write(const Reference<stario::XObjectOutputStream> OBoundControlModel::write(_rxOutStream); // Version - // Version 0x0002: EmptyIsNull - // Version 0x0003: ListSource->Seq - // Version 0x0004: DefaultText - // Version 0x0005: HelpText + // Version 0x0002: EmptyIsNull + // Version 0x0003: ListSource->Seq + // Version 0x0004: DefaultText + // Version 0x0005: HelpText _rxOutStream->writeShort(0x0006); // Maskierung fuer any @@ -452,7 +452,7 @@ void SAL_CALL OComboBoxModel::read(const Reference<stario::XObjectInputStream>& m_bEmptyIsNull = bNull; } - if (nVersion > 0x0003) // nVersion == 4 + if (nVersion > 0x0003) // nVersion == 4 _rxInStream >> m_aDefaultText; // Stringliste muss geleert werden, wenn eine Listenquelle gesetzt ist @@ -572,7 +572,7 @@ void OComboBoxModel::loadData( bool _bForce ) m_aListRowSet.setCommand( aStatement.makeStringAndClear() ); bExecuteRowSet = true; } - } break; + } break; case ListSourceType_QUERY: { m_aListRowSet.setCommandFromQuery( m_aListSource ); @@ -611,7 +611,7 @@ void OComboBoxModel::loadData( bool _bForce ) return; } - ::std::vector< ::rtl::OUString > aStringList; + ::std::vector< ::rtl::OUString > aStringList; aStringList.reserve(16); try { diff --git a/forms/source/component/ComboBox.hxx b/forms/source/component/ComboBox.hxx index 0a45a2fa78d9..3f88658ce9b3 100644 --- a/forms/source/component/ComboBox.hxx +++ b/forms/source/component/ComboBox.hxx @@ -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 @@ -63,20 +63,20 @@ class OComboBoxModel ,public OErrorBroadcaster { CachedRowSet m_aListRowSet; // the row set to fill the list - ::com::sun::star::uno::Any m_aBoundColumn; // obsolet - ::rtl::OUString m_aListSource; // - ::rtl::OUString m_aDefaultText; // DefaultText + ::com::sun::star::uno::Any m_aBoundColumn; // obsolet + ::rtl::OUString m_aListSource; // + ::rtl::OUString m_aDefaultText; // DefaultText ::com::sun::star::uno::Any m_aLastKnownValue; - StringSequence m_aDesignModeStringItems; + StringSequence m_aDesignModeStringItems; // upon loading, in some cases we reset fill our string item list ourself. We don't want // to lose the user's items then, so we remember them here. ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter> m_xFormatter; - ::com::sun::star::form::ListSourceType m_eListSourceType; // type der list source - sal_Bool m_bEmptyIsNull; // LeerString wird als NULL interpretiert + ::com::sun::star::form::ListSourceType m_eListSourceType; // type der list source + sal_Bool m_bEmptyIsNull; // LeerString wird als NULL interpretiert ::std::auto_ptr< ::dbtools::FormattedColumnValue > m_pValueFormatter; @@ -84,7 +84,7 @@ class OComboBoxModel protected: - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes(); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes(); public: DECLARE_DEFAULT_LEAF_XTOR( OComboBoxModel ); @@ -111,7 +111,7 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw (::com::sun::star::uno::RuntimeException); // XPersistObject - virtual ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); + virtual ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL @@ -137,8 +137,8 @@ protected: translateDbColumnToControlValue( ); virtual sal_Bool commitControlValueToDbColumn( bool _bPostReset ); - virtual void onConnectedDbColumn( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxForm ); - virtual void onDisconnectedDbColumn(); + virtual void onConnectedDbColumn( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxForm ); + virtual void onDisconnectedDbColumn(); virtual ::com::sun::star::uno::Any getDefaultForReset() const; diff --git a/forms/source/component/Currency.cxx b/forms/source/component/Currency.cxx index efcbaeae18e1..808863d2fbf4 100644 --- a/forms/source/component/Currency.cxx +++ b/forms/source/component/Currency.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 @@ -112,15 +112,15 @@ void OCurrencyModel::implConstruct() sal_Bool bPrependCurrencySymbol; switch ( aLocaleInfo.getCurrPositiveFormat() ) { - case 0: // $1 + case 0: // $1 sCurrencySymbol = String(aLocaleInfo.getCurrSymbol()); bPrependCurrencySymbol = sal_True; break; - case 1: // 1$ + case 1: // 1$ sCurrencySymbol = String(aLocaleInfo.getCurrSymbol()); bPrependCurrencySymbol = sal_False; break; - case 2: // $ 1 + case 2: // $ 1 sCurrencySymbol = ::rtl::OUString(String(aLocaleInfo.getCurrSymbol())) + ::rtl::OUString::createFromAscii(" "); bPrependCurrencySymbol = sal_True; break; @@ -199,17 +199,17 @@ void OCurrencyModel::describeFixedProperties( Sequence< Property >& _rProps ) co { BEGIN_DESCRIBE_PROPERTIES( 2, OEditBaseModel ) // Value auf transient setzen -// ModifyPropertyAttributes(_rAggregateProps, PROPERTY_VALUE, PropertyAttribute::TRANSIENT, 0); +// ModifyPropertyAttributes(_rAggregateProps, PROPERTY_VALUE, PropertyAttribute::TRANSIENT, 0); - DECL_PROP3(DEFAULT_VALUE, double, BOUND, MAYBEDEFAULT, MAYBEVOID); - DECL_PROP1(TABINDEX, sal_Int16, BOUND); + DECL_PROP3(DEFAULT_VALUE, double, BOUND, MAYBEDEFAULT, MAYBEVOID); + DECL_PROP1(TABINDEX, sal_Int16, BOUND); END_DESCRIBE_PROPERTIES(); } //------------------------------------------------------------------------------ ::rtl::OUString SAL_CALL OCurrencyModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException) { - return FRM_COMPONENT_CURRENCYFIELD; // old (non-sun) name for compatibility ! + return FRM_COMPONENT_CURRENCYFIELD; // old (non-sun) name for compatibility ! } //------------------------------------------------------------------------------ @@ -264,7 +264,7 @@ void OCurrencyModel::resetNoBroadcast() } //......................................................................... -} // namespace frm +} // namespace frm //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/component/Currency.hxx b/forms/source/component/Currency.hxx index b36585e52e39..49f19d98deee 100644 --- a/forms/source/component/Currency.hxx +++ b/forms/source/component/Currency.hxx @@ -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 @@ -42,7 +42,7 @@ namespace frm class OCurrencyModel :public OEditBaseModel { - ::com::sun::star::uno::Any m_aSaveValue; + ::com::sun::star::uno::Any m_aSaveValue; protected: virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes(); @@ -95,7 +95,7 @@ public: }; //......................................................................... -} // namespace frm +} // namespace frm //......................................................................... #endif // _FORMS_CURRENCY_HXX_ diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx index 248fbb44c0b9..cb4273631a9d 100644 --- a/forms/source/component/DatabaseForm.cxx +++ b/forms/source/component/DatabaseForm.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 @@ -506,7 +506,7 @@ ODatabaseForm::~ODatabaseForm() ::rtl::OUString aName; ::rtl::OUString aValue; - for ( HtmlSuccessfulObjListIterator pSuccObj = aSuccObjList.begin(); + for ( HtmlSuccessfulObjListIterator pSuccObj = aSuccObjList.begin(); pSuccObj < aSuccObjList.end(); ++pSuccObj ) @@ -529,7 +529,7 @@ ODatabaseForm::~ODatabaseForm() aResult.append(aName); aResult.append(sal_Unicode('=')); aResult.append(aValue); - + if (pSuccObj < aSuccObjList.end() - 1) { if ( _bURLEncoded ) @@ -569,7 +569,7 @@ Sequence<sal_Int8> ODatabaseForm::GetDataMultiPartEncoded(const Reference<XContr // Liste zu ::rtl::OUString zusammensetzen ::rtl::OUString aResult; - for ( HtmlSuccessfulObjListIterator pSuccObj = aSuccObjList.begin(); + for ( HtmlSuccessfulObjListIterator pSuccObj = aSuccObjList.begin(); pSuccObj < aSuccObjList.end(); ++pSuccObj ) @@ -640,7 +640,7 @@ void ODatabaseForm::AppendComponent(HtmlSuccessfulObjList& rList, const Referenc xComponentSet->getPropertyValue( PROPERTY_NAME ) >>= aName; if( !aName.getLength() && nClassId != FormComponentType::IMAGEBUTTON) return; - else // Name um den Prefix erweitern + else // Name um den Prefix erweitern aName = rNamePrefix + aName; switch( nClassId ) @@ -719,11 +719,11 @@ void ODatabaseForm::AppendComponent(HtmlSuccessfulObjList& rList, const Referenc // MIB: Spezial-Behandlung fuer Multiline-Edit nur dann, wenn // es auch ein Control dazu gibt. Any aTmp = xComponentSet->getPropertyValue( PROPERTY_MULTILINE ); - sal_Bool bMulti = rxSubmitButton.is() + sal_Bool bMulti = rxSubmitButton.is() && (aTmp.getValueType().getTypeClass() == TypeClass_BOOLEAN) && getBOOL(aTmp); ::rtl::OUString sText; - if ( bMulti ) // Bei MultiLineEdit Text am Control abholen + if ( bMulti ) // Bei MultiLineEdit Text am Control abholen { Reference<XControlContainer> xControlContainer(rxSubmitButton->getContext(), UNO_QUERY); @@ -788,7 +788,7 @@ void ODatabaseForm::AppendComponent(HtmlSuccessfulObjList& rList, const Referenc } rList.push_back( HtmlSuccessfulObj(aName, aText) ); } - } break; + } break; case FormComponentType::DATEFIELD: { // <name>=<wert> // Wert wird als Datum im Format (MM-DD-YYYY) @@ -811,7 +811,7 @@ void ODatabaseForm::AppendComponent(HtmlSuccessfulObjList& rList, const Referenc } rList.push_back( HtmlSuccessfulObj(aName, aText) ); } - } break; + } break; case FormComponentType::TIMEFIELD: { // <name>=<wert> // Wert wird als Zeit im Format (HH:MM:SS) angegeben @@ -834,7 +834,7 @@ void ODatabaseForm::AppendComponent(HtmlSuccessfulObjList& rList, const Referenc } rList.push_back( HtmlSuccessfulObj(aName, aText) ); } - } break; + } break; // starform case FormComponentType::HIDDENCONTROL: @@ -953,7 +953,7 @@ void ODatabaseForm::FillSuccessfulList( HtmlSuccessfulObjList& rList, // Liste loeschen rList.clear(); // Ueber Components iterieren - Reference<XPropertySet> xComponentSet; + Reference<XPropertySet> xComponentSet; ::rtl::OUString aPrefix; // we know already how many objects should be appended, @@ -972,7 +972,7 @@ void ODatabaseForm::Encode( ::rtl::OUString& rString ) const ::rtl::OUString aResult; // Immer ANSI #58641 -// rString.Convert(CHARSET_SYSTEM, CHARSET_ANSI); +// rString.Convert(CHARSET_SYSTEM, CHARSET_ANSI); // Zeilenendezeichen werden als CR dargestellt @@ -994,17 +994,17 @@ void ODatabaseForm::Encode( ::rtl::OUString& rString ) const { switch( nCharCode ) { - case 13: // CR - aResult += ::rtl::OUString::createFromAscii("%0D%0A"); // Hex-Darstellung CR LF + case 13: // CR + aResult += ::rtl::OUString::createFromAscii("%0D%0A"); // Hex-Darstellung CR LF break; // Netscape Sonderbehandlung - case 42: // '*' - case 45: // '-' - case 46: // '.' - case 64: // '@' - case 95: // '_' + case 42: // '*' + case 45: // '-' + case 46: // '.' + case 64: // '@' + case 95: // '_' aResult += UniString(nCharCode); break; @@ -1026,7 +1026,7 @@ void ODatabaseForm::Encode( ::rtl::OUString& rString ) const } - // Spaces durch '+' ersetzen + // Spaces durch '+' ersetzen aResult = aResult.replace(' ', '+'); rString = aResult; @@ -1165,10 +1165,10 @@ bool ODatabaseForm::hasValidParent() const { Reference< XPropertySet > xSet( m_xParent, UNO_QUERY ); Reference< XLoadable > xLoad( m_xParent, UNO_QUERY ); - if ( xLoad->isLoaded() - && ( xResultSet->isBeforeFirst() - || xResultSet->isAfterLast() - || getBOOL( xSet->getPropertyValue( PROPERTY_ISNEW ) ) + if ( xLoad->isLoaded() + && ( xResultSet->isBeforeFirst() + || xResultSet->isAfterLast() + || getBOOL( xSet->getPropertyValue( PROPERTY_ISNEW ) ) ) ) // the parent form is loaded and on a "virtual" row -> not valid @@ -1281,7 +1281,7 @@ sal_Bool ODatabaseForm::executeRowSet(::osl::ResettableMutexGuard& _rClearForNot if (bSuccess) { // adjust the privilege property - // m_nPrivileges; + // m_nPrivileges; m_xAggregateSet->getPropertyValue(PROPERTY_PRIVILEGES) >>= m_nPrivileges; if (!m_bAllowInsert) m_nPrivileges &= ~Privilege::INSERT; @@ -1409,7 +1409,7 @@ void ODatabaseForm::describeFixedAndAggregateProperties( RemoveProperty( _rAggregateProps, PROPERTY_FILTER ); RemoveProperty( _rAggregateProps, PROPERTY_APPLYFILTER ); - DECL_IFACE_PROP4(ACTIVE_CONNECTION, XConnection, BOUND, TRANSIENT, MAYBEVOID, CONSTRAINED); + DECL_IFACE_PROP4(ACTIVE_CONNECTION, XConnection, BOUND, TRANSIENT, MAYBEVOID, CONSTRAINED); DECL_BOOL_PROP2 ( APPLYFILTER, BOUND, MAYBEDEFAULT ); DECL_PROP1 ( NAME, ::rtl::OUString, BOUND ); DECL_PROP1 ( MASTERFIELDS, Sequence< ::rtl::OUString >, BOUND ); @@ -1512,9 +1512,9 @@ void ODatabaseForm::fire( sal_Int32* pnHandles, const Any* pNewValues, const Any break; if ((nPos < nCount) && (pNewValues[nPos].getValueType().getTypeClass() == TypeClass_BOOLEAN) && getBOOL(pNewValues[nPos])) - { // yeah, we found it, and it changed to TRUE + { // yeah, we found it, and it changed to TRUE if (nPos == 0) - { // just cut the first element + { // just cut the first element ++pnHandles; ++pNewValues; ++pOldValues; @@ -1524,7 +1524,7 @@ void ODatabaseForm::fire( sal_Int32* pnHandles, const Any* pNewValues, const Any // just cut the last element --nCount; else - { // split into two base class calls + { // split into two base class calls OPropertySetAggregationHelper::fire(pnHandles, pNewValues, pOldValues, nPos, bVetoable); ++nPos; OPropertySetAggregationHelper::fire(pnHandles + nPos, pNewValues + nPos, pOldValues + nPos, nCount - nPos, bVetoable); @@ -2392,7 +2392,7 @@ void ODatabaseForm::_propertyChanged(const PropertyChangeEvent& evt) throw( Runt sal_Int32 nHandle = PROPERTY_ID_ACTIVE_CONNECTION; fire(&nHandle, &evt.NewValue, &evt.OldValue, 1, sal_False); } - else // it was one of the statement relevant props + else // it was one of the statement relevant props { // if the statement has changed we have to delete the parameter info invlidateParameters(); @@ -2607,7 +2607,7 @@ void SAL_CALL ODatabaseForm::disposing(const EventObject& Source) throw( Runtime // does the disposing come from the aggregate ? if (m_xAggregate.is()) - { // no -> forward it + { // no -> forward it com::sun::star::uno::Reference<com::sun::star::lang::XEventListener> xListener; if (query_aggregation(m_xAggregate, xListener)) xListener->disposing(Source); @@ -2726,7 +2726,7 @@ sal_Bool ODatabaseForm::canShareConnection( const Reference< XPropertySet >& _rx // and it's really a data source name (not empty) bCanShareConnection = sal_True; else - { // the data source name is empty + { // the data source name is empty // -> ook for the URL ::rtl::OUString sParentURL; ::rtl::OUString sMyURL; @@ -2752,7 +2752,7 @@ sal_Bool ODatabaseForm::canShareConnection( const Reference< XPropertySet >& _rx bCanShareConnection = ( sParentUser == sMyUser ) - && ( sParentPwd == sMyPwd ); + && ( sParentPwd == sMyPwd ); } return bCanShareConnection; @@ -2898,7 +2898,7 @@ void ODatabaseForm::load_impl(sal_Bool bCausedByParentForm, sal_Bool bMoveToFirs // if we don't have a connection, we are not intended to be a database form or the aggregate was not able // to establish a connection - sal_Bool bConnected = implEnsureConnection(); + sal_Bool bConnected = implEnsureConnection(); // we don't have to execute if we do not have a command to execute sal_Bool bExecute = bConnected && m_xAggregateSet.is() && getString(m_xAggregateSet->getPropertyValue(PROPERTY_COMMAND)).getLength(); @@ -3230,7 +3230,7 @@ sal_Bool SAL_CALL ODatabaseForm::approveRowChange(const RowChangeEvent& event) t //------------------------------------------------------------------------------ sal_Bool SAL_CALL ODatabaseForm::approveRowSetChange(const EventObject& event) throw( RuntimeException ) { - if (event.Source == InterfaceRef(static_cast<XWeak*>(this))) // ignore our aggregate as we handle this approve ourself + if (event.Source == InterfaceRef(static_cast<XWeak*>(this))) // ignore our aggregate as we handle this approve ourself { ::osl::ClearableMutexGuard aGuard( m_aMutex ); bool bWasLoaded = isLoaded(); @@ -3803,7 +3803,7 @@ void SAL_CALL ODatabaseForm::propertyChange( const PropertyChangeEvent& evt ) th // com::sun::star::lang::XServiceInfo //------------------------------------------------------------------------------ -::rtl::OUString SAL_CALL ODatabaseForm::getImplementationName_Static() +::rtl::OUString SAL_CALL ODatabaseForm::getImplementationName_Static() { return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.forms.ODatabaseForm" ) ); } @@ -3844,7 +3844,7 @@ Sequence< ::rtl::OUString > SAL_CALL ODatabaseForm::getSupportedServiceNames_Sta } //------------------------------------------------------------------------------ -::rtl::OUString SAL_CALL ODatabaseForm::getImplementationName() throw( RuntimeException ) +::rtl::OUString SAL_CALL ODatabaseForm::getImplementationName() throw( RuntimeException ) { return getImplementationName_Static(); } @@ -3885,13 +3885,13 @@ sal_Bool SAL_CALL ODatabaseForm::supportsService(const ::rtl::OUString& ServiceN // com::sun::star::io::XPersistObject //------------------------------------------------------------------------------ -const sal_uInt16 CYCLE = 0x0001; -const sal_uInt16 DONTAPPLYFILTER = 0x0002; +const sal_uInt16 CYCLE = 0x0001; +const sal_uInt16 DONTAPPLYFILTER = 0x0002; //------------------------------------------------------------------------------ ::rtl::OUString ODatabaseForm::getServiceName() throw( RuntimeException ) { - return FRM_COMPONENT_FORM; // old (non-sun) name for compatibility ! + return FRM_COMPONENT_FORM; // old (non-sun) name for compatibility ! } //------------------------------------------------------------------------------ @@ -3943,7 +3943,7 @@ void SAL_CALL ODatabaseForm::write(const Reference<XObjectOutputStream>& _rxOutS default : DBG_ERROR("ODatabaseForm::write : wrong CommandType !"); } } - _rxOutStream->writeShort((sal_Int16)eTranslated); // former DataSelectionType + _rxOutStream->writeShort((sal_Int16)eTranslated); // former DataSelectionType // very old versions expect a CursorType here _rxOutStream->writeShort(DatabaseCursorType_KEYSET); @@ -4064,16 +4064,16 @@ void SAL_CALL ODatabaseForm::read(const Reference<XObjectInputStream>& _rxInStre if (m_xAggregateSet.is()) m_xAggregateSet->setPropertyValue(PROPERTY_INSERTONLY, makeAny(bInsertOnly)); - m_bAllowInsert = _rxInStream->readBoolean(); - m_bAllowUpdate = _rxInStream->readBoolean(); - m_bAllowDelete = _rxInStream->readBoolean(); + m_bAllowInsert = _rxInStream->readBoolean(); + m_bAllowUpdate = _rxInStream->readBoolean(); + m_bAllowDelete = _rxInStream->readBoolean(); // html stuff ::rtl::OUString sTmp; _rxInStream >> sTmp; m_aTargetURL = INetURLObject::decode( sTmp, '%', INetURLObject::DECODE_UNAMBIGUOUS); - m_eSubmitMethod = (FormSubmitMethod)_rxInStream->readShort(); - m_eSubmitEncoding = (FormSubmitEncoding)_rxInStream->readShort(); + m_eSubmitMethod = (FormSubmitMethod)_rxInStream->readShort(); + m_eSubmitEncoding = (FormSubmitEncoding)_rxInStream->readShort(); _rxInStream >> m_aTargetFrame; if (nVersion > 1) @@ -4090,7 +4090,7 @@ void SAL_CALL ODatabaseForm::read(const Reference<XObjectInputStream>& _rxInStre m_xAggregateSet->setPropertyValue(PROPERTY_SORT, makeAny(sAggregateProp)); } - sal_uInt16 nAnyMask = 0; + sal_uInt16 nAnyMask = 0; if (nVersion > 2) { nAnyMask = _rxInStream->readShort(); @@ -4111,11 +4111,11 @@ void ODatabaseForm::implInserted( const ElementDescription* _pElement ) { OFormComponents::implInserted( _pElement ); - Reference< XSQLErrorBroadcaster > xBroadcaster( _pElement->xInterface, UNO_QUERY ); - Reference< XForm > xForm ( _pElement->xInterface, UNO_QUERY ); + Reference< XSQLErrorBroadcaster > xBroadcaster( _pElement->xInterface, UNO_QUERY ); + Reference< XForm > xForm ( _pElement->xInterface, UNO_QUERY ); if ( xBroadcaster.is() && !xForm.is() ) - { // the object is an error broadcaster, but no form itself -> add ourself as listener + { // the object is an error broadcaster, but no form itself -> add ourself as listener xBroadcaster->addSQLErrorListener( this ); } } @@ -4128,7 +4128,7 @@ void ODatabaseForm::implRemoved(const InterfaceRef& _rxObject) Reference<XSQLErrorBroadcaster> xBroadcaster(_rxObject, UNO_QUERY); Reference<XForm> xForm(_rxObject, UNO_QUERY); if (xBroadcaster.is() && !xForm.is()) - { // the object is an error broadcaster, but no form itself -> remove ourself as listener + { // the object is an error broadcaster, but no form itself -> remove ourself as listener xBroadcaster->removeSQLErrorListener(this); } } @@ -4158,7 +4158,7 @@ void SAL_CALL ODatabaseForm::setName(const ::rtl::OUString& aName) throw( Runtim } //......................................................................... -} // namespace frm +} // namespace frm //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/component/DatabaseForm.hxx b/forms/source/component/DatabaseForm.hxx index 75249a2b8adf..06790e48aca1 100644 --- a/forms/source/component/DatabaseForm.hxx +++ b/forms/source/component/DatabaseForm.hxx @@ -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 @@ -96,16 +96,16 @@ namespace frm //= html tools //======================================================================== -const sal_uInt16 SUCCESSFUL_REPRESENT_TEXT = 0x0001; -const sal_uInt16 SUCCESSFUL_REPRESENT_FILE = 0x0002; +const sal_uInt16 SUCCESSFUL_REPRESENT_TEXT = 0x0001; +const sal_uInt16 SUCCESSFUL_REPRESENT_FILE = 0x0002; //------------------------------------------------------------------------------ class HtmlSuccessfulObj { public: - ::rtl::OUString aName; - ::rtl::OUString aValue; - sal_uInt16 nRepresentation; + ::rtl::OUString aName; + ::rtl::OUString aValue; + sal_uInt16 nRepresentation; HtmlSuccessfulObj( const ::rtl::OUString& _rName, const ::rtl::OUString& _rValue, sal_uInt16 _nRepresent = SUCCESSFUL_REPRESENT_TEXT ) @@ -147,7 +147,7 @@ typedef ::cppu::ImplHelper4 < ::com::sun::star::lang::XServiceInfo , ::com::sun::star::sdbc::XWarningsSupplier > ODatabaseForm_BASE2; -typedef ::cppu::ImplHelper7< ::com::sun::star::sdbc::XCloseable, +typedef ::cppu::ImplHelper7< ::com::sun::star::sdbc::XCloseable, ::com::sun::star::sdbc::XRowSet, ::com::sun::star::sdb::XCompletedExecution, ::com::sun::star::sdb::XRowSetApproveBroadcaster, @@ -156,7 +156,7 @@ typedef ::cppu::ImplHelper7< ::com::sun::star::sdbc::XCloseable, ::com::sun::star::sdbc::XParameters > ODatabaseForm_BASE3; -class ODatabaseForm :public OFormComponents +class ODatabaseForm :public OFormComponents ,public OPropertySetAggregationHelper ,public OPropertyChangeListener ,public ODatabaseForm_BASE1 @@ -166,65 +166,65 @@ class ODatabaseForm :public OFormComponents { friend class OFormSubmitResetThread; - OImplementationIdsRef m_aHoldIdHelper; + OImplementationIdsRef m_aHoldIdHelper; // listener administration - ::cppu::OInterfaceContainerHelper m_aLoadListeners; - ::cppu::OInterfaceContainerHelper m_aRowSetApproveListeners; - ::cppu::OInterfaceContainerHelper m_aRowSetListeners; - ::cppu::OInterfaceContainerHelper m_aSubmitListeners; - ::cppu::OInterfaceContainerHelper m_aErrorListeners; + ::cppu::OInterfaceContainerHelper m_aLoadListeners; + ::cppu::OInterfaceContainerHelper m_aRowSetApproveListeners; + ::cppu::OInterfaceContainerHelper m_aRowSetListeners; + ::cppu::OInterfaceContainerHelper m_aSubmitListeners; + ::cppu::OInterfaceContainerHelper m_aErrorListeners; ResetListeners m_aResetListeners; - ::osl::Mutex m_aResetSafety; - ::com::sun::star::uno::Any m_aCycle; - ::com::sun::star::uno::Any m_aIgnoreResult; // set when we are a subform and our master form positioned on a new row - ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aMasterFields; - ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aDetailFields; + ::osl::Mutex m_aResetSafety; + ::com::sun::star::uno::Any m_aCycle; + ::com::sun::star::uno::Any m_aIgnoreResult; // set when we are a subform and our master form positioned on a new row + ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aMasterFields; + ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aDetailFields; // the object doin' most of the work - an SDB-rowset - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation> m_xAggregate; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation> m_xAggregate; // same object, interface as member because of performance reasons - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet> m_xAggregateAsRowSet; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet> m_xAggregateAsRowSet; PropertyBagHelper m_aPropertyBagHelper; ::dbtools::WarningsContainer m_aWarnings; - OPropertyChangeMultiplexer* m_pAggregatePropertyMultiplexer; + OPropertyChangeMultiplexer* m_pAggregatePropertyMultiplexer; // Verwaltung der ControlGruppen - OGroupManager* m_pGroupManager; + OGroupManager* m_pGroupManager; ::dbtools::ParameterManager m_aParameterManager; ::dbtools::FilterManager m_aFilterManager; - Timer* m_pLoadTimer; + Timer* m_pLoadTimer; - OFormSubmitResetThread* m_pThread; - ::rtl::OUString m_sCurrentErrorContext; + OFormSubmitResetThread* m_pThread; + ::rtl::OUString m_sCurrentErrorContext; // will be used as additional context information // when an exception is catched and forwarded to the listeners - INT32 m_nResetsPending; -// <overwritten_properties> - sal_Int32 m_nPrivileges; + INT32 m_nResetsPending; +// <overwritten_properties> + sal_Int32 m_nPrivileges; sal_Bool m_bInsertOnly; -// </overwritten_properties> +// </overwritten_properties> -// <properties> +// <properties> ::com::sun::star::uno::Any m_aControlBorderColorFocus; ::com::sun::star::uno::Any m_aControlBorderColorMouse; ::com::sun::star::uno::Any m_aControlBorderColorInvalid; ::com::sun::star::uno::Any m_aDynamicControlBorder; - ::rtl::OUString m_sName; - ::rtl::OUString m_aTargetURL; - ::rtl::OUString m_aTargetFrame; - ::com::sun::star::form::FormSubmitMethod m_eSubmitMethod; - ::com::sun::star::form::FormSubmitEncoding m_eSubmitEncoding; - ::com::sun::star::form::NavigationBarMode m_eNavigation; - sal_Bool m_bAllowInsert : 1; - sal_Bool m_bAllowUpdate : 1; - sal_Bool m_bAllowDelete : 1; -// </properties> - sal_Bool m_bLoaded : 1; - sal_Bool m_bSubForm : 1; - sal_Bool m_bForwardingConnection : 1; // sal_True if we're setting the ActiveConnection on the aggregate - sal_Bool m_bSharingConnection : 1; // sal_True if the connection we're using is shared with out parent + ::rtl::OUString m_sName; + ::rtl::OUString m_aTargetURL; + ::rtl::OUString m_aTargetFrame; + ::com::sun::star::form::FormSubmitMethod m_eSubmitMethod; + ::com::sun::star::form::FormSubmitEncoding m_eSubmitEncoding; + ::com::sun::star::form::NavigationBarMode m_eNavigation; + sal_Bool m_bAllowInsert : 1; + sal_Bool m_bAllowUpdate : 1; + sal_Bool m_bAllowDelete : 1; +// </properties> + sal_Bool m_bLoaded : 1; + sal_Bool m_bSubForm : 1; + sal_Bool m_bForwardingConnection : 1; // sal_True if we're setting the ActiveConnection on the aggregate + sal_Bool m_bSharingConnection : 1; // sal_True if the connection we're using is shared with out parent public: ODatabaseForm(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory); @@ -249,7 +249,7 @@ public: virtual sal_Bool SAL_CALL convertFastPropertyValue(::com::sun::star::uno::Any& rConvertedValue, ::com::sun::star::uno::Any& rOldValue, sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::lang::IllegalArgumentException); virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue) throw ( ::com::sun::star::uno::Exception ); - ::com::sun::star::uno::Any SAL_CALL getFastPropertyValue( sal_Int32 nHandle ) + ::com::sun::star::uno::Any SAL_CALL getFastPropertyValue( sal_Int32 nHandle ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); void fire( sal_Int32 * pnHandles, const ::com::sun::star::uno::Any * pNewValues, const ::com::sun::star::uno::Any * pOldValues, sal_Int32 nCount, sal_Bool bVetoable ); @@ -263,8 +263,8 @@ public: getPropertiesInterface(); // com::sun::star::beans::XPropertyState - virtual ::com::sun::star::beans::PropertyState getPropertyStateByHandle(sal_Int32 nHandle); - virtual void setPropertyToDefaultByHandle(sal_Int32 nHandle); + virtual ::com::sun::star::beans::PropertyState getPropertyStateByHandle(sal_Int32 nHandle); + virtual void setPropertyToDefaultByHandle(sal_Int32 nHandle); virtual ::com::sun::star::uno::Any getPropertyDefaultByHandle(sal_Int32 nHandle) const; // com::sun::star::sdbc::XSQLErrorBroadcaster @@ -386,15 +386,15 @@ public: // com::sun::star::lang::XServiceInfo virtual sal_Bool SAL_CALL supportsService(const ::rtl::OUString& ServiceName) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); + virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // com::sun::star::lang::XServiceInfo - static version - static ::rtl::OUString SAL_CALL getImplementationName_Static(); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_Static(); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getCurrentServiceNames_Static(); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getCompatibleServiceNames_Static(); - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory ); + static ::rtl::OUString SAL_CALL getImplementationName_Static(); + static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_Static(); + static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getCurrentServiceNames_Static(); + static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getCompatibleServiceNames_Static(); + static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory ); // com::sun::star::io::XPersistObject virtual ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); @@ -465,39 +465,39 @@ protected: private: sal_Bool executeRowSet(::osl::ResettableMutexGuard& _rClearForNotifies, sal_Bool bMoveToFirst = sal_True, const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& _rxCompletionHandler = ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >()); - bool fillParameters(::osl::ResettableMutexGuard& _rClearForNotifies, + bool fillParameters(::osl::ResettableMutexGuard& _rClearForNotifies, const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& _rxCompletionHandler = ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >()); - void updateParameterInfo(); - bool hasValidParent() const; + void updateParameterInfo(); + bool hasValidParent() const; // impl methods - void load_impl(sal_Bool bCausedByParentForm, sal_Bool bMoveToFirst = sal_True, + void load_impl(sal_Bool bCausedByParentForm, sal_Bool bMoveToFirst = sal_True, const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& _rxCompletionHandler = ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >()) throw(::com::sun::star::uno::RuntimeException); - void reload_impl(sal_Bool bMoveToFirst, + void reload_impl(sal_Bool bMoveToFirst, const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& _rxCompletionHandler = ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >()) throw(::com::sun::star::uno::RuntimeException); - void submit_impl(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& Control, const ::com::sun::star::awt::MouseEvent& MouseEvt, bool _bAproveByListeners); - void reset_impl(bool _bAproveByListeners); + void submit_impl(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& Control, const ::com::sun::star::awt::MouseEvent& MouseEvt, bool _bAproveByListeners); + void reset_impl(bool _bAproveByListeners); - sal_Bool implEnsureConnection(); + sal_Bool implEnsureConnection(); // connection sharing /// checks if we can re-use (aka share) the connection of the given parent - sal_Bool canShareConnection( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxParentProps ); + sal_Bool canShareConnection( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxParentProps ); /// starts sharing the connection with the parent - void doShareConnection( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxParentProps ); + void doShareConnection( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxParentProps ); /// stops sharing the connection with the parent - void stopSharingConnection( ); + void stopSharingConnection( ); /// called when the connection which we share with our parent is beeing disposed - void disposingSharedConnection( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConn ); + void disposingSharedConnection( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConn ); /// checks if we currently share our connection with our parent - sal_Bool isSharingConnection( ) const { return m_bSharingConnection; } + sal_Bool isSharingConnection( ) const { return m_bSharingConnection; } /** calls our row set approval listeners @@ -518,20 +518,20 @@ private: ); /// invalidate all our parameter-related stuff - void invlidateParameters(); + void invlidateParameters(); - void saveInsertOnlyState( ); - void restoreInsertOnlyState( ); + void saveInsertOnlyState( ); + void restoreInsertOnlyState( ); // error handling - void onError(const ::com::sun::star::sdb::SQLErrorEvent& _rEvent); - void onError(const ::com::sun::star::sdbc::SQLException&, const ::rtl::OUString& _rContextDescription); + void onError(const ::com::sun::star::sdb::SQLErrorEvent& _rEvent); + void onError(const ::com::sun::star::sdbc::SQLException&, const ::rtl::OUString& _rContextDescription); // html tools ::rtl::OUString GetDataEncoded(bool _bURLEncoded,const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& SubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt); - ::rtl::OUString GetDataURLEncoded(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& SubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt); - ::rtl::OUString GetDataTextEncoded(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& SubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt); - ::com::sun::star::uno::Sequence<sal_Int8> GetDataMultiPartEncoded(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& SubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt, + ::rtl::OUString GetDataURLEncoded(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& SubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt); + ::rtl::OUString GetDataTextEncoded(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& SubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt); + ::com::sun::star::uno::Sequence<sal_Int8> GetDataMultiPartEncoded(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& SubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt, ::rtl::OUString& rContentType); void AppendComponent(HtmlSuccessfulObjList& rList, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& xComponentSet, const ::rtl::OUString& rNamePrefix, @@ -560,7 +560,7 @@ inline void ODatabaseForm::submitNBC(const ::com::sun::star::uno::Reference< ::c } //......................................................................... -} // namespace frm +} // namespace frm //......................................................................... #endif // _FRM_DATABASEFORM_HXX_ diff --git a/forms/source/component/Date.cxx b/forms/source/component/Date.cxx index 74e0444093a1..7a935862c716 100644 --- a/forms/source/component/Date.cxx +++ b/forms/source/component/Date.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 @@ -172,7 +172,7 @@ StringSequence SAL_CALL ODateModel::getSupportedServiceNames() throw() //------------------------------------------------------------------------------ ::rtl::OUString SAL_CALL ODateModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException) { - return FRM_COMPONENT_DATEFIELD; // old (non-sun) name for compatibility ! + return FRM_COMPONENT_DATEFIELD; // old (non-sun) name for compatibility ! } // XPropertySet @@ -180,10 +180,10 @@ StringSequence SAL_CALL ODateModel::getSupportedServiceNames() throw() void ODateModel::describeFixedProperties( Sequence< Property >& _rProps ) const { BEGIN_DESCRIBE_PROPERTIES( 4, OEditBaseModel ) - DECL_PROP3(DEFAULT_DATE, sal_Int32, BOUND, MAYBEDEFAULT, MAYBEVOID); - DECL_PROP1(TABINDEX, sal_Int16, BOUND); - DECL_PROP1(FORMATKEY, sal_Int32, TRANSIENT); - DECL_IFACE_PROP2(FORMATSSUPPLIER, XNumberFormatsSupplier, READONLY, TRANSIENT); + DECL_PROP3(DEFAULT_DATE, sal_Int32, BOUND, MAYBEDEFAULT, MAYBEVOID); + DECL_PROP1(TABINDEX, sal_Int16, BOUND); + DECL_PROP1(FORMATKEY, sal_Int32, TRANSIENT); + DECL_IFACE_PROP2(FORMATSSUPPLIER, XNumberFormatsSupplier, READONLY, TRANSIENT); END_DESCRIBE_PROPERTIES(); } @@ -359,7 +359,7 @@ Sequence< Type > ODateModel::getSupportedBindingTypes() } //......................................................................... -} // namespace frm +} // namespace frm //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/component/Date.hxx b/forms/source/component/Date.hxx index 790c8f027bfb..3b7c56cf2d18 100644 --- a/forms/source/component/Date.hxx +++ b/forms/source/component/Date.hxx @@ -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 @@ -44,8 +44,8 @@ class ODateModel :public OEditBaseModel ,public OLimitedFormats { - ::com::sun::star::uno::Any m_aSaveValue; - sal_Bool m_bDateTimeField; + ::com::sun::star::uno::Any m_aSaveValue; + sal_Bool m_bDateTimeField; protected: virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes(); @@ -96,7 +96,7 @@ protected: virtual void resetNoBroadcast(); - virtual void onConnectedDbColumn( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxForm ); + virtual void onConnectedDbColumn( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxForm ); protected: DECLARE_XCLONEABLE(); @@ -127,7 +127,7 @@ public: }; //......................................................................... -} // namespace frm +} // namespace frm //......................................................................... #endif // _FORMS_DATE_HXX_ diff --git a/forms/source/component/Edit.cxx b/forms/source/component/Edit.cxx index 229ae6e0a954..799816cdce11 100644 --- a/forms/source/component/Edit.cxx +++ b/forms/source/component/Edit.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 @@ -159,7 +159,7 @@ void OEditControl::disposing() // XServiceInfo //------------------------------------------------------------------------------ -StringSequence OEditControl::getSupportedServiceNames() throw() +StringSequence OEditControl::getSupportedServiceNames() throw() { StringSequence aSupported = OBoundControl::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 1); @@ -239,7 +239,7 @@ void OEditControl::keyPressed(const ::com::sun::star::awt::KeyEvent& e) throw ( Reference<XPropertySet> xFCSet; for( sal_Int32 nIndex=0; nIndex < nCount; nIndex++ ) { - // Any aElement(xElements->getByIndex(nIndex)); + // Any aElement(xElements->getByIndex(nIndex)); xElements->getByIndex(nIndex) >>= xFCSet; OSL_ENSURE(xFCSet.is(),"OEditControl::keyPressed: No XPropertySet!"); @@ -351,7 +351,7 @@ void OEditModel::disposing() //------------------------------------------------------------------------------ ::rtl::OUString SAL_CALL OEditModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException) { - return FRM_COMPONENT_EDIT; // old (non-sun) name for compatibility ! + return FRM_COMPONENT_EDIT; // old (non-sun) name for compatibility ! } // XServiceInfo @@ -398,11 +398,11 @@ void SAL_CALL OEditModel::getFastPropertyValue(Any& rValue, sal_Int32 nHandle ) void OEditModel::describeFixedProperties( Sequence< Property >& _rProps ) const { BEGIN_DESCRIBE_PROPERTIES( 5, OEditBaseModel ) - DECL_PROP2(PERSISTENCE_MAXTEXTLENGTH,sal_Int16, READONLY, TRANSIENT); - DECL_PROP2(DEFAULT_TEXT, ::rtl::OUString, BOUND, MAYBEDEFAULT); - DECL_BOOL_PROP1(EMPTY_IS_NULL, BOUND); - DECL_PROP1(TABINDEX, sal_Int16, BOUND); - DECL_BOOL_PROP2(FILTERPROPOSAL, BOUND, MAYBEDEFAULT); + DECL_PROP2(PERSISTENCE_MAXTEXTLENGTH,sal_Int16, READONLY, TRANSIENT); + DECL_PROP2(DEFAULT_TEXT, ::rtl::OUString, BOUND, MAYBEDEFAULT); + DECL_BOOL_PROP1(EMPTY_IS_NULL, BOUND); + DECL_PROP1(TABINDEX, sal_Int16, BOUND); + DECL_BOOL_PROP2(FILTERPROPOSAL, BOUND, MAYBEDEFAULT); END_DESCRIBE_PROPERTIES(); } @@ -558,7 +558,7 @@ void OEditModel::write(const Reference<XObjectOutputStream>& _rxOutStream) throw sal_Int16 nOldTextLen = 0; // bin ich gerade loaded und habe dazu zeitweilig die MaxTextLen umgesetzt ? if ( m_bMaxTextLenModified ) - { // -> fuer die Dauer des Speicherns meinem aggregierten Model die alte TextLen einreden + { // -> fuer die Dauer des Speicherns meinem aggregierten Model die alte TextLen einreden // before doing this we have to save the current text value of the aggregate, as this may be affected by resetting the text len // FS - 08.12.99 - 70606 @@ -571,7 +571,7 @@ void OEditModel::write(const Reference<XObjectOutputStream>& _rxOutStream) throw OEditBaseModel::write(_rxOutStream); if ( m_bMaxTextLenModified ) - { // wieder zuruecksetzen + { // wieder zuruecksetzen m_xAggregateSet->setPropertyValue(PROPERTY_MAXTEXTLEN, makeAny(nOldTextLen)); // and reset the text // First we set it to an empty string : Without this the second setPropertyValue would not do anything as it thinks @@ -593,8 +593,8 @@ void OEditModel::read(const Reference<XObjectInputStream>& _rxInStream) throw ( if (m_xAggregateSet.is()) { Any aDefaultControl = m_xAggregateSet->getPropertyValue(PROPERTY_DEFAULTCONTROL); - if ( (aDefaultControl.getValueType().getTypeClass() == TypeClass_STRING) - && (getString(aDefaultControl).compareTo(STARDIV_ONE_FORM_CONTROL_TEXTFIELD) == COMPARE_EQUAL) + if ( (aDefaultControl.getValueType().getTypeClass() == TypeClass_STRING) + && (getString(aDefaultControl).compareTo(STARDIV_ONE_FORM_CONTROL_TEXTFIELD) == COMPARE_EQUAL) ) { m_xAggregateSet->setPropertyValue( PROPERTY_DEFAULTCONTROL, makeAny( (::rtl::OUString)STARDIV_ONE_FORM_CONTROL_EDIT ) ); @@ -625,7 +625,7 @@ void OEditModel::onConnectedDbColumn( const Reference< XInterface >& _rxForm ) if ( m_pValueFormatter->getKeyType() != NumberFormat::SCIENTIFIC ) { - m_bMaxTextLenModified = getINT16(m_xAggregateSet->getPropertyValue(PROPERTY_MAXTEXTLEN)) != 0; + m_bMaxTextLenModified = getINT16(m_xAggregateSet->getPropertyValue(PROPERTY_MAXTEXTLEN)) != 0; if ( !m_bMaxTextLenModified ) { sal_Int32 nFieldLen = 0; @@ -656,7 +656,7 @@ void OEditModel::onDisconnectedDbColumn() if ( hasField() && m_bMaxTextLenModified ) { Any aVal; - aVal <<= (sal_Int16)0; // nur wenn es 0 war, habe ich es in onConnectedDbColumn umgesetzt + aVal <<= (sal_Int16)0; // nur wenn es 0 war, habe ich es in onConnectedDbColumn umgesetzt m_xAggregateSet->setPropertyValue(PROPERTY_MAXTEXTLEN, aVal); m_bMaxTextLenModified = sal_False; } diff --git a/forms/source/component/Edit.hxx b/forms/source/component/Edit.hxx index e3c84612443f..055b5dd4fd57 100644 --- a/forms/source/component/Edit.hxx +++ b/forms/source/component/Edit.hxx @@ -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 @@ -48,9 +48,9 @@ class OEditModel ::com::sun::star::uno::Any m_aLastKnownValue; ::std::auto_ptr< ::dbtools::FormattedColumnValue > m_pValueFormatter; - sal_Bool m_bMaxTextLenModified : 1; // set to <TRUE/> when we change the MaxTextLen of the aggregate + sal_Bool m_bMaxTextLenModified : 1; // set to <TRUE/> when we change the MaxTextLen of the aggregate - sal_Bool m_bWritingFormattedFake : 1; + sal_Bool m_bWritingFormattedFake : 1; // are we writing something which should be interpreted as formatted upon reading? protected: @@ -64,7 +64,7 @@ protected: friend InterfaceRef SAL_CALL OEditModel_CreateInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory); friend class OFormattedFieldWrapper; - friend class OFormattedModel; // temporary + friend class OFormattedModel; // temporary public: virtual void SAL_CALL disposing(); @@ -114,7 +114,7 @@ protected: virtual void onConnectedDbColumn( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxForm ); virtual void onDisconnectedDbColumn(); - virtual sal_Bool approveDbColumnType( sal_Int32 _nColumnType ); + virtual sal_Bool approveDbColumnType( sal_Int32 _nColumnType ); virtual void resetNoBroadcast(); @@ -130,7 +130,7 @@ private: //================================================================== //= OEditControl //================================================================== -typedef ::cppu::ImplHelper3< ::com::sun::star::awt::XFocusListener, +typedef ::cppu::ImplHelper3< ::com::sun::star::awt::XFocusListener, ::com::sun::star::awt::XKeyListener, ::com::sun::star::form::XChangeBroadcaster > OEditControl_BASE; @@ -140,8 +140,8 @@ class OEditControl : public OBoundControl ::cppu::OInterfaceContainerHelper m_aChangeListeners; - ::rtl::OUString m_aHtmlChangeValue; - sal_uInt32 m_nKeyEvent; + ::rtl::OUString m_aHtmlChangeValue; + sal_uInt32 m_nKeyEvent; public: OEditControl(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory); diff --git a/forms/source/component/EditBase.cxx b/forms/source/component/EditBase.cxx index 10903bdfee55..6afff3637ce7 100644 --- a/forms/source/component/EditBase.cxx +++ b/forms/source/component/EditBase.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 @@ -53,9 +53,9 @@ using namespace ::com::sun::star::io; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::util; -const sal_uInt16 DEFAULT_LONG = 0x0001; -const sal_uInt16 DEFAULT_DOUBLE = 0x0002; -const sal_uInt16 FILTERPROPOSAL = 0x0004; +const sal_uInt16 DEFAULT_LONG = 0x0001; +const sal_uInt16 DEFAULT_DOUBLE = 0x0002; +const sal_uInt16 FILTERPROPOSAL = 0x0004; DBG_NAME( OEditBaseModel ) //------------------------------------------------------------------ @@ -104,7 +104,7 @@ void OEditBaseModel::write(const Reference<XObjectOutputStream>& _rxOutStream) t _rxOutStream->writeShort(nVersionId); // Name - _rxOutStream->writeShort(0); // obsolete + _rxOutStream->writeShort(0); // obsolete _rxOutStream << m_aDefaultText; // Maskierung fuer any @@ -114,7 +114,7 @@ void OEditBaseModel::write(const Reference<XObjectOutputStream>& _rxOutStream) t else if (m_aDefault.getValueType().getTypeClass() == TypeClass_DOUBLE) nAnyMask |= DEFAULT_DOUBLE; - if (m_bFilterProposal) // da boolean, kein Wert speichern + if (m_bFilterProposal) // da boolean, kein Wert speichern nAnyMask |= FILTERPROPOSAL; _rxOutStream->writeBoolean(m_bEmptyIsNull); @@ -209,7 +209,7 @@ void OEditBaseModel::readCommonEditProperties(const Reference<XObjectInputStream { sal_Int32 nLen = _rxInStream->readLong(); - Reference<XMarkableStream> xMark(_rxInStream, UNO_QUERY); + Reference<XMarkableStream> xMark(_rxInStream, UNO_QUERY); DBG_ASSERT(xMark.is(), "OBoundControlModel::readCommonProperties : can only work with markable streams !"); sal_Int32 nMark = xMark->createMark(); @@ -227,7 +227,7 @@ void OEditBaseModel::readCommonEditProperties(const Reference<XObjectInputStream //------------------------------------------------------------------------------ void OEditBaseModel::writeCommonEditProperties(const Reference<XObjectOutputStream>& _rxOutStream) { - Reference<XMarkableStream> xMark(_rxOutStream, UNO_QUERY); + Reference<XMarkableStream> xMark(_rxOutStream, UNO_QUERY); DBG_ASSERT(xMark.is(), "OEditBaseModel::writeCommonProperties : can only work with markable streams !"); sal_Int32 nMark = xMark->createMark(); diff --git a/forms/source/component/EditBase.hxx b/forms/source/component/EditBase.hxx index 497fd570d522..0a070c06e5ef 100644 --- a/forms/source/component/EditBase.hxx +++ b/forms/source/component/EditBase.hxx @@ -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 @@ -41,20 +41,20 @@ #include <com/sun/star/lang/XComponent.hpp> // persistence flags for use with the version id -#define PF_HANDLE_COMMON_PROPS 0x8000 +#define PF_HANDLE_COMMON_PROPS 0x8000 // Derived classes which use their own persistence methods (read/write) and have an own // version handling therein may want to clear this flag in getPersistenceFlags. // If done so, this class will write an version without a call to writeCommonEditProperties. -#define PF_FAKE_FORMATTED_FIELD 0x4000 +#define PF_FAKE_FORMATTED_FIELD 0x4000 // .... hmmm .... a fake, as the name suggests. see OFormattedFieldWrapper -#define PF_RESERVED_2 0x2000 -#define PF_RESERVED_3 0x1000 -#define PF_RESERVED_4 0x0800 -#define PF_RESERVED_5 0x0400 -#define PF_RESERVED_6 0x0200 -#define PF_RESERVED_7 0x0100 +#define PF_RESERVED_2 0x2000 +#define PF_RESERVED_3 0x1000 +#define PF_RESERVED_4 0x0800 +#define PF_RESERVED_5 0x0400 +#define PF_RESERVED_6 0x0200 +#define PF_RESERVED_7 0x0100 -#define PF_SPECIAL_FLAGS 0xFF00 +#define PF_SPECIAL_FLAGS 0xFF00 //......................................................................... namespace frm @@ -63,19 +63,19 @@ namespace frm //================================================================== //= OEditBaseModel //================================================================== -class OEditBaseModel : public OBoundControlModel +class OEditBaseModel : public OBoundControlModel { - sal_Int16 m_nLastReadVersion; + sal_Int16 m_nLastReadVersion; protected: -// [properties] fuer all Editierfelder - ::com::sun::star::uno::Any m_aDefault; - ::rtl::OUString m_aDefaultText; // default value - sal_Bool m_bEmptyIsNull : 1; // empty string will be interepreted as NULL when committing - sal_Bool m_bFilterProposal : 1; // use a list of possible value in filtermode +// [properties] fuer all Editierfelder + ::com::sun::star::uno::Any m_aDefault; + ::rtl::OUString m_aDefaultText; // default value + sal_Bool m_bEmptyIsNull : 1; // empty string will be interepreted as NULL when committing + sal_Bool m_bFilterProposal : 1; // use a list of possible value in filtermode // [properties] - sal_Int16 getLastReadVersion() const { return m_nLastReadVersion; } + sal_Int16 getLastReadVersion() const { return m_nLastReadVersion; } public: DECLARE_DEFAULT_BOUND_XTOR( OEditBaseModel ); diff --git a/forms/source/component/EventThread.cxx b/forms/source/component/EventThread.cxx index 7e16c62715e0..1f383024c0a4 100644 --- a/forms/source/component/EventThread.cxx +++ b/forms/source/component/EventThread.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 @@ -137,8 +137,8 @@ void OComponentEventThread::addEvent( const EventObject* _pEvt, // Daten in die Queue stellen m_aEvents.push_back( cloneEvent( _pEvt ) ); - Reference<XWeak> xWeakControl(rControl, UNO_QUERY); - Reference<XAdapter> xControlAdapter = xWeakControl.is() ? xWeakControl->queryAdapter() : Reference<XAdapter>(); + Reference<XWeak> xWeakControl(rControl, UNO_QUERY); + Reference<XAdapter> xControlAdapter = xWeakControl.is() ? xWeakControl->queryAdapter() : Reference<XAdapter>(); m_aControls.push_back( xControlAdapter ); m_aFlags.push_back( bFlag ); @@ -248,7 +248,7 @@ void OComponentEventThread::run() } //......................................................................... -} // namespace frm +} // namespace frm //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/component/EventThread.hxx b/forms/source/component/EventThread.hxx index 195a354fbd7a..f0568ef4fd24 100644 --- a/forms/source/component/EventThread.hxx +++ b/forms/source/component/EventThread.hxx @@ -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 @@ -50,7 +50,7 @@ namespace frm // *************************************************************************************************** // *************************************************************************************************** -typedef ::osl::Thread OComponentEventThread_TBASE; +typedef ::osl::Thread OComponentEventThread_TBASE; class OComponentEventThread :public OComponentEventThread_TBASE ,public ::com::sun::star::lang::XEventListener @@ -58,16 +58,16 @@ class OComponentEventThread { DECLARE_STL_VECTOR(::com::sun::star::lang::EventObject*, ThreadEvents); DECLARE_STL_VECTOR(::com::sun::star::uno::Reference< ::com::sun::star::uno::XAdapter> , ThreadObjects); - DECLARE_STL_VECTOR(sal_Bool, ThreadBools); + DECLARE_STL_VECTOR(sal_Bool, ThreadBools); ::osl::Mutex m_aMutex; - ::osl::Condition m_aCond; // Queue gefuellt? - ThreadEvents m_aEvents; // Event-Queue - ThreadObjects m_aControls; // Control fuer Submit - ThreadBools m_aFlags; // Flags fuer Submit/Reset + ::osl::Condition m_aCond; // Queue gefuellt? + ThreadEvents m_aEvents; // Event-Queue + ThreadObjects m_aControls; // Control fuer Submit + ThreadBools m_aFlags; // Flags fuer Submit/Reset - ::cppu::OComponentHelper* m_pCompImpl; // Implementierung des Controls - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent> m_xComp; // ::com::sun::star::lang::XComponent des Controls + ::cppu::OComponentHelper* m_pCompImpl; // Implementierung des Controls + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent> m_xComp; // ::com::sun::star::lang::XComponent des Controls protected: @@ -113,14 +113,14 @@ public: void SAL_CALL operator delete( void * p ) throw() { osl::Thread::operator delete(p); } private: - void implStarted( ); - void implTerminated( ); + void implStarted( ); + void implTerminated( ); void impl_clearEventQueue(); }; //......................................................................... -} // namespace frm +} // namespace frm //......................................................................... #endif // _FRM_EVENT_THREAD_HXX_ diff --git a/forms/source/component/File.cxx b/forms/source/component/File.cxx index 4e4b62dc6131..b6003a391f02 100644 --- a/forms/source/component/File.cxx +++ b/forms/source/component/File.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 @@ -84,7 +84,7 @@ Sequence<Type> OFileControlModel::_getTypes() // XServiceInfo //------------------------------------------------------------------------------ -StringSequence OFileControlModel::getSupportedServiceNames() throw(RuntimeException) +StringSequence OFileControlModel::getSupportedServiceNames() throw(RuntimeException) { StringSequence aSupported = OControlModel::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 1); @@ -205,15 +205,15 @@ sal_Bool OFileControlModel::convertFastPropertyValue(Any& rConvertedValue, Any& void OFileControlModel::describeFixedProperties( Sequence< Property >& _rProps ) const { BEGIN_DESCRIBE_PROPERTIES( 2, OControlModel ) - DECL_PROP1(DEFAULT_TEXT, ::rtl::OUString, BOUND); - DECL_PROP1(TABINDEX, sal_Int16, BOUND); + DECL_PROP1(DEFAULT_TEXT, ::rtl::OUString, BOUND); + DECL_PROP1(TABINDEX, sal_Int16, BOUND); END_DESCRIBE_PROPERTIES(); } //------------------------------------------------------------------------------ ::rtl::OUString SAL_CALL OFileControlModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException) { - return FRM_COMPONENT_FILECONTROL; // old (non-sun) name for compatibility ! + return FRM_COMPONENT_FILECONTROL; // old (non-sun) name for compatibility ! } //------------------------------------------------------------------------------ @@ -253,7 +253,7 @@ void OFileControlModel::read(const Reference<stario::XObjectInputStream>& _rxInS } // Nach dem Lesen die Defaultwerte anzeigen -// _reset(); +// _reset(); } //----------------------------------------------------------------------------- @@ -291,7 +291,7 @@ void OFileControlModel::removeResetListener(const Reference<XResetListener>& _rx //------------------------------------------------------------------------------ void OFileControlModel::_reset() { - { // release our mutex once (it's acquired in the calling method !), as setting aggregate properties + { // release our mutex once (it's acquired in the calling method !), as setting aggregate properties // may cause any uno controls belonging to us to lock the solar mutex, which is potentially dangerous with // our own mutex locked // FS - 72451 - 31.01.00 @@ -301,7 +301,7 @@ void OFileControlModel::_reset() } //......................................................................... -} // namespace frm +} // namespace frm //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/component/File.hxx b/forms/source/component/File.hxx index 02a09eedc198..4f0c56f13a3b 100644 --- a/forms/source/component/File.hxx +++ b/forms/source/component/File.hxx @@ -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 @@ -43,8 +43,8 @@ class OFileControlModel :public OControlModel ,public ::com::sun::star::form::XReset { - ::cppu::OInterfaceContainerHelper m_aResetListeners; - ::rtl::OUString m_sDefaultValue; + ::cppu::OInterfaceContainerHelper m_aResetListeners; + ::rtl::OUString m_sDefaultValue; protected: virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes(); @@ -97,7 +97,7 @@ protected: }; //......................................................................... -} // namespace frm +} // namespace frm //......................................................................... #endif // _FORMS_FILE_HXX_ diff --git a/forms/source/component/Filter.cxx b/forms/source/component/Filter.cxx index 362c0fc77097..1add42bb0d3f 100644 --- a/forms/source/component/Filter.cxx +++ b/forms/source/component/Filter.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 @@ -152,7 +152,7 @@ namespace frm } //--------------------------------------------------------------------- - Any SAL_CALL OFilterControl::queryAggregation( const Type & rType ) throw(RuntimeException) + Any SAL_CALL OFilterControl::queryAggregation( const Type & rType ) throw(RuntimeException) { Any aRet = UnoControl::queryAggregation( rType); if(!aRet.hasValue()) @@ -511,7 +511,7 @@ namespace frm Reference< XTextComponent > xText( getPeer(), UNO_QUERY ); if (xText.is()) aText = xText->getText(); - } break; + } break; default: return sal_True; } @@ -592,7 +592,7 @@ namespace frm m_aText = aText; xVclWindow->setProperty( PROPERTY_STATE, aValue ); } - } break; + } break; case FormComponentType::RADIOBUTTON: { Reference< XVclWindowPeer > xVclWindow( getPeer(), UNO_QUERY ); @@ -607,7 +607,7 @@ namespace frm m_aText = aText; xVclWindow->setProperty(PROPERTY_STATE, aValue); } - } break; + } break; case FormComponentType::LISTBOX: { Reference< XListBox > xListBox( getPeer(), UNO_QUERY ); @@ -713,7 +713,7 @@ namespace frm Sequence< Any > aArgs(2); aArgs[0] <<= PropertyValue(::rtl::OUString::createFromAscii("SQLException"), 0, makeAny( _rExcept ), PropertyState_DIRECT_VALUE); aArgs[1] <<= PropertyValue(::rtl::OUString::createFromAscii("ParentWindow"), 0, makeAny( m_xMessageParent ), PropertyState_DIRECT_VALUE); - + static ::rtl::OUString s_sDialogServiceName = ::rtl::OUString::createFromAscii( "com.sun.star.sdb.ErrorMessageDialog" ); Reference< XExecutableDialog > xErrorDialog( m_aContext.createComponentWithArguments( s_sDialogServiceName, aArgs ), UNO_QUERY ); @@ -849,7 +849,7 @@ namespace frm } //--------------------------------------------------------------------- - ::rtl::OUString SAL_CALL OFilterControl::getImplementationName_Static() + ::rtl::OUString SAL_CALL OFilterControl::getImplementationName_Static() { return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.forms.OFilterControl" ) ); } @@ -870,7 +870,7 @@ namespace frm } //......................................................................... -} // namespace frm +} // namespace frm //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/component/Filter.hxx b/forms/source/component/Filter.hxx index 8bac596b016d..fcb75fc00ea4 100644 --- a/forms/source/component/Filter.hxx +++ b/forms/source/component/Filter.hxx @@ -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 @@ -56,78 +56,78 @@ namespace frm //===================================================================== // OFilterControl //===================================================================== - typedef ::cppu::ImplHelper5 < ::com::sun::star::awt::XTextComponent - , ::com::sun::star::awt::XFocusListener - , ::com::sun::star::awt::XItemListener - , ::com::sun::star::form::XBoundComponent - , ::com::sun::star::lang::XInitialization - > OFilterControl_BASE; - - class OFilterControl :public UnoControl + typedef ::cppu::ImplHelper5 < ::com::sun::star::awt::XTextComponent + , ::com::sun::star::awt::XFocusListener + , ::com::sun::star::awt::XItemListener + , ::com::sun::star::form::XBoundComponent + , ::com::sun::star::lang::XInitialization + > OFilterControl_BASE; + + class OFilterControl :public UnoControl ,public OFilterControl_BASE ,public ::svxform::OParseContextClient { - TextListenerMultiplexer m_aTextListeners; + TextListenerMultiplexer m_aTextListeners; ::comphelper::ComponentContext m_aContext; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xField; - ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > m_xFormatter; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xConnection; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > m_xMessageParent; - - ::rtl::OUString m_aText; - ::connectivity::OSQLParser m_aParser; - sal_Int16 m_nControlClass; // which kind of control do we use? - sal_Bool m_bFilterList : 1; - sal_Bool m_bMultiLine : 1; - sal_Bool m_bFilterListFilled : 1; + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xField; + ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > m_xFormatter; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xConnection; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > m_xMessageParent; + + ::rtl::OUString m_aText; + ::connectivity::OSQLParser m_aParser; + sal_Int16 m_nControlClass; // which kind of control do we use? + sal_Bool m_bFilterList : 1; + sal_Bool m_bMultiLine : 1; + sal_Bool m_bFilterListFilled : 1; private: -// OFilterControl(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB); +// OFilterControl(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB); void implInitFilterList(); public: - OFilterControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB ); + OFilterControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB ); DECLARE_UNO3_AGG_DEFAULTS(OFilterControl,OWeakAggObject); - ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString GetComponentServiceName(); - virtual void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit > & rxToolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > & rParentPeer ) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::rtl::OUString GetComponentServiceName(); + virtual void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit > & rxToolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > & rParentPeer ) throw( ::com::sun::star::uno::RuntimeException ); // ::com::sun::star::lang::XComponent - virtual void SAL_CALL dispose(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL dispose(void) throw( ::com::sun::star::uno::RuntimeException ); // ::com::sun::star::awt::XTextComponent - virtual void SAL_CALL addTextListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextListener > & l ) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL removeTextListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextListener > & l ) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setText( const ::rtl::OUString& aText ) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL insertText( const ::com::sun::star::awt::Selection& rSel, const ::rtl::OUString& aText ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getText() throw( ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getSelectedText() throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setSelection( const ::com::sun::star::awt::Selection& aSelection ) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL addTextListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextListener > & l ) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL removeTextListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextListener > & l ) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL setText( const ::rtl::OUString& aText ) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL insertText( const ::com::sun::star::awt::Selection& rSel, const ::rtl::OUString& aText ) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::rtl::OUString SAL_CALL getText() throw( ::com::sun::star::uno::RuntimeException ); + virtual ::rtl::OUString SAL_CALL getSelectedText() throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL setSelection( const ::com::sun::star::awt::Selection& aSelection ) throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::awt::Selection SAL_CALL getSelection() throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL isEditable() throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setEditable( sal_Bool bEditable ) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setMaxTextLen( sal_Int16 nLength ) throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Int16 SAL_CALL getMaxTextLen() throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL isEditable() throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL setEditable( sal_Bool bEditable ) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL setMaxTextLen( sal_Int16 nLength ) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Int16 SAL_CALL getMaxTextLen() throw( ::com::sun::star::uno::RuntimeException ); // ::com::sun::star::form::XBoundComponent - virtual void SAL_CALL addUpdateListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XUpdateListener > & /*l*/) throw( ::com::sun::star::uno::RuntimeException ) {} - virtual void SAL_CALL removeUpdateListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XUpdateListener > & /*l*/) throw( ::com::sun::star::uno::RuntimeException ) {} - virtual sal_Bool SAL_CALL commit() throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL addUpdateListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XUpdateListener > & /*l*/) throw( ::com::sun::star::uno::RuntimeException ) {} + virtual void SAL_CALL removeUpdateListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XUpdateListener > & /*l*/) throw( ::com::sun::star::uno::RuntimeException ) {} + virtual sal_Bool SAL_CALL commit() throw( ::com::sun::star::uno::RuntimeException ); // ::com::sun::star::lang::XEventListener - virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw( ::com::sun::star::uno::RuntimeException ); // ::com::sun::star::awt::XFocusListener - virtual void SAL_CALL focusGained(const ::com::sun::star::awt::FocusEvent& e) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL focusLost(const ::com::sun::star::awt::FocusEvent& e) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL focusGained(const ::com::sun::star::awt::FocusEvent& e) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL focusLost(const ::com::sun::star::awt::FocusEvent& e) throw( ::com::sun::star::uno::RuntimeException ); // ::com::sun::star::awt::XItemListener - virtual void SAL_CALL itemStateChanged(const ::com::sun::star::awt::ItemEvent& rEvent) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL itemStateChanged(const ::com::sun::star::awt::ItemEvent& rEvent) throw( ::com::sun::star::uno::RuntimeException ); // ::com::sun::star::util::XInitialization virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); @@ -138,9 +138,9 @@ namespace frm virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); // com::sun::star::lang::XServiceInfo - static version - static ::rtl::OUString SAL_CALL getImplementationName_Static(); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_Static(); - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory ); + static ::rtl::OUString SAL_CALL getImplementationName_Static(); + static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_Static(); + static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory ); protected: virtual void PrepareWindowDescriptor( ::com::sun::star::awt::WindowDescriptor& rDesc ); @@ -151,7 +151,7 @@ namespace frm void displayException( const ::com::sun::star::sdb::SQLContext& _rExcept ); }; //......................................................................... -} // namespace frm +} // namespace frm //......................................................................... #endif // FORMS_COMPONENT_FILTER_HXX diff --git a/forms/source/component/FixedText.cxx b/forms/source/component/FixedText.cxx index 2a27fbc2d4c5..31ac6221616f 100644 --- a/forms/source/component/FixedText.cxx +++ b/forms/source/component/FixedText.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 @@ -106,7 +106,7 @@ void OFixedTextModel::describeAggregateProperties( Sequence< Property >& _rAggre //------------------------------------------------------------------------------ ::rtl::OUString SAL_CALL OFixedTextModel::getServiceName() throw(RuntimeException) { - return FRM_COMPONENT_FIXEDTEXT; // old (non-sun) name for compatibility ! + return FRM_COMPONENT_FIXEDTEXT; // old (non-sun) name for compatibility ! } //------------------------------------------------------------------------------ diff --git a/forms/source/component/FixedText.hxx b/forms/source/component/FixedText.hxx index a6b92a1e510f..d9db90885065 100644 --- a/forms/source/component/FixedText.hxx +++ b/forms/source/component/FixedText.hxx @@ -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 @@ -46,10 +46,10 @@ public: // XServiceInfo IMPLEMENTATION_NAME(OFixedTextModel); - virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XPersistObject - virtual ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); + virtual ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx index 768eaca5f489..c8b108ed53df 100644 --- a/forms/source/component/FormComponent.cxx +++ b/forms/source/component/FormComponent.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 @@ -302,7 +302,7 @@ void SAL_CALL OControl::disposing(const com::sun::star::lang::EventObject& _rEve // does the disposing come from the aggregate ? if (xAggAsIface != InterfaceRef(_rEvent.Source, UNO_QUERY)) - { // no -> forward it + { // no -> forward it Reference<com::sun::star::lang::XEventListener> xListener; if (query_aggregation(m_xAggregate, xListener)) xListener->disposing(_rEvent); @@ -422,7 +422,7 @@ OBoundControl::~OBoundControl() DBG_DTOR(frm_OBoundControl, NULL); } // ----------------------------------------------------------------------------- -Sequence< Type> OBoundControl::_getTypes() +Sequence< Type> OBoundControl::_getTypes() { return TypeBag( OControl::_getTypes(), OBoundControl_BASE::getTypes() ).getTypes(); } @@ -605,7 +605,7 @@ OControlModel::OControlModel( // #i37342# / 2004-11-19 / frank.schoenheit@sun.com { DBG_CTOR(OControlModel, NULL); - if (_rUnoControlModelTypeName.getLength()) // the is a model we have to aggregate + if (_rUnoControlModelTypeName.getLength()) // the is a model we have to aggregate { increment(m_refCount); @@ -1812,7 +1812,7 @@ sal_Bool OBoundControlModel::convertFastPropertyValue( throw com::sun::star::lang::IllegalArgumentException(); case PROPERTY_ID_CONTROLLABEL: if (!_rValue.hasValue()) - { // property set to void + { // property set to void _rConvertedValue = Any(); getFastPropertyValue(_rOldValue, _nHandle); bModified = m_xLabelControl.is(); @@ -1871,7 +1871,7 @@ void OBoundControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, co DBG_ASSERT(!rValue.hasValue() || (rValue.getValueType().getTypeClass() == TypeClass_INTERFACE), "OBoundControlModel::setFastPropertyValue_NoBroadcast : invalid argument !"); if (!rValue.hasValue()) - { // set property to "void" + { // set property to "void" Reference<com::sun::star::lang::XComponent> xComp(m_xLabelControl, UNO_QUERY); if (xComp.is()) xComp->removeEventListener(static_cast<com::sun::star::lang::XEventListener*>(static_cast<XPropertyChangeListener*>(this))); @@ -1953,7 +1953,7 @@ void SAL_CALL OBoundControlModel::propertyChange( const PropertyChangeEvent& evt { OSL_ENSURE( evt.Source == m_xExternalBinding, "OBoundControlModel::propertyChange: where did this come from?" ); - // our binding has properties which can control properties of ourself + // our binding has properties which can control properties of ourself ::rtl::OUString sBindingControlledProperty; bool bForwardToLabelControl = false; if ( evt.PropertyName.equals( PROPERTY_READONLY ) ) @@ -2486,9 +2486,9 @@ void OBoundControlModel::reset() throw (RuntimeException) // @author fs@openoffice.org sal_Bool bSimpleReset = - ( !m_xColumn.is() // no connection to a database column - || ( m_xCursor.is() // OR we have an improperly positioned cursor - && bInvalidCursorPosition + ( !m_xColumn.is() // no connection to a database column + || ( m_xCursor.is() // OR we have an improperly positioned cursor + && bInvalidCursorPosition ) || hasExternalValueBinding() // OR we have an external value binding ); diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx index 8bafb3f893b4..5958726516e4 100644 --- a/forms/source/component/FormattedField.cxx +++ b/forms/source/component/FormattedField.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 @@ -227,7 +227,7 @@ OFormattedControl::OFormattedControl(const Reference<XMultiServiceFactory>& _rxF increment(m_refCount); { - Reference<XWindow> xComp; + Reference<XWindow> xComp; if (query_aggregation(m_xAggregate, xComp)) { xComp->addKeyListener(this); @@ -265,7 +265,7 @@ void OFormattedControl::keyPressed(const ::com::sun::star::awt::KeyEvent& e) thr return; // Steht das Control in einem Formular mit einer Submit-URL? - Reference<com::sun::star::beans::XPropertySet> xSet(getModel(), UNO_QUERY); + Reference<com::sun::star::beans::XPropertySet> xSet(getModel(), UNO_QUERY); if( !xSet.is() ) return; @@ -274,7 +274,7 @@ void OFormattedControl::keyPressed(const ::com::sun::star::awt::KeyEvent& e) thr if( !xParent.is() ) return; - Reference<com::sun::star::beans::XPropertySet> xFormSet(xParent, UNO_QUERY); + Reference<com::sun::star::beans::XPropertySet> xFormSet(xParent, UNO_QUERY); if( !xFormSet.is() ) return; @@ -288,10 +288,10 @@ void OFormattedControl::keyPressed(const ::com::sun::star::awt::KeyEvent& e) thr if( nCount > 1 ) { - Reference<com::sun::star::beans::XPropertySet> xFCSet; + Reference<com::sun::star::beans::XPropertySet> xFCSet; for( sal_Int32 nIndex=0; nIndex < nCount; nIndex++ ) { - // Any aElement(xElements->getByIndex(nIndex)); + // Any aElement(xElements->getByIndex(nIndex)); xElements->getByIndex(nIndex) >>= xFCSet; if (hasProperty(PROPERTY_CLASSID, xFCSet) && @@ -323,14 +323,14 @@ IMPL_LINK(OFormattedControl, OnKeyPressed, void*, /*EMPTYARG*/) Reference<XFormComponent> xFComp(getModel(), UNO_QUERY); InterfaceRef xParent = xFComp->getParent(); - Reference<XSubmit> xSubmit(xParent, UNO_QUERY); + Reference<XSubmit> xSubmit(xParent, UNO_QUERY); if (xSubmit.is()) xSubmit->submit( Reference<XControl> (), ::com::sun::star::awt::MouseEvent() ); return 0L; } //------------------------------------------------------------------------------ -StringSequence OFormattedControl::getSupportedServiceNames() throw() +StringSequence OFormattedControl::getSupportedServiceNames() throw() { StringSequence aSupported = OBoundControl::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 1); @@ -463,9 +463,9 @@ Sequence< Type > OFormattedModel::_getTypes() void OFormattedModel::describeFixedProperties( Sequence< Property >& _rProps ) const { BEGIN_DESCRIBE_PROPERTIES( 3, OEditBaseModel ) - DECL_BOOL_PROP1(EMPTY_IS_NULL, BOUND); - DECL_PROP1(TABINDEX, sal_Int16, BOUND); - DECL_BOOL_PROP2(FILTERPROPOSAL, BOUND, MAYBEDEFAULT); + DECL_BOOL_PROP1(EMPTY_IS_NULL, BOUND); + DECL_PROP1(TABINDEX, sal_Int16, BOUND); + DECL_BOOL_PROP2(FILTERPROPOSAL, BOUND, MAYBEDEFAULT); END_DESCRIBE_PROPERTIES(); } @@ -577,7 +577,7 @@ void OFormattedModel::_propertyChanged( const com::sun::star::beans::PropertyCha ::osl::MutexGuard aGuard( m_aMutex ); Reference<XNumberFormatsSupplier> xSupplier( calcFormatsSupplier() ); - m_nKeyType = getNumberFormatType(xSupplier->getNumberFormats(), getINT32( evt.NewValue ) ); + m_nKeyType = getNumberFormatType(xSupplier->getNumberFormats(), getINT32( evt.NewValue ) ); // as m_aSaveValue (which is used by commitControlValueToDbColumn) is format dependent we have // to recalc it, which is done by translateDbColumnToControlValue @@ -655,7 +655,7 @@ Reference<XNumberFormatsSupplier> OFormattedModel::calcFormFormatsSupplier() co Reference<XForm> xNextParentForm(xParent, UNO_QUERY); while (!xNextParentForm.is() && xParent.is()) { - xParent = xParent.query( xParent->getParent() ); + xParent = xParent.query( xParent->getParent() ); xNextParentForm = xNextParentForm.query( xParent ); } @@ -712,14 +712,14 @@ void OFormattedModel::onConnectedDbColumn( const Reference< XInterface >& _rxFor DBG_ASSERT(m_xAggregateSet.is(), "OFormattedModel::onConnectedDbColumn : have no aggregate !"); if (m_xAggregateSet.is()) - { // all the following doesn't make any sense if we have no aggregate ... + { // all the following doesn't make any sense if we have no aggregate ... Any aSupplier = m_xAggregateSet->getPropertyValue(PROPERTY_FORMATSSUPPLIER); DBG_ASSERT( aSupplier.hasValue(), "OFormattedModel::onConnectedDbColumn : invalid property value !" ); // das sollte im Constructor oder im read auf was richtiges gesetzt worden sein Any aFmtKey = m_xAggregateSet->getPropertyValue(PROPERTY_FORMATKEY); if ( !(aFmtKey >>= nFormatKey ) ) - { // nobody gave us a format to use. So we examine the field we're bound to for a + { // nobody gave us a format to use. So we examine the field we're bound to for a // format key, and use it ourself, too sal_Int32 nType = DataType::VARCHAR; if (xField.is()) @@ -735,7 +735,7 @@ void OFormattedModel::onConnectedDbColumn( const Reference< XInterface >& _rxFor m_bOriginalNumeric = getBOOL(getPropertyValue(PROPERTY_TREATASNUMERIC)); if (!aFmtKey.hasValue()) - { // we aren't bound to a field (or this field's format is invalid) + { // we aren't bound to a field (or this field's format is invalid) // -> determine the standard text (or numeric) format of the supplier Reference<XNumberFormatTypes> xTypes(xSupplier->getNumberFormats(), UNO_QUERY); if (xTypes.is()) @@ -789,7 +789,7 @@ void OFormattedModel::onConnectedDbColumn( const Reference< XInterface >& _rxFor Reference<XNumberFormatsSupplier> xSupplier = calcFormatsSupplier(); m_bNumeric = getBOOL( getPropertyValue( PROPERTY_TREATASNUMERIC ) ); - m_nKeyType = getNumberFormatType( xSupplier->getNumberFormats(), nFormatKey ); + m_nKeyType = getNumberFormatType( xSupplier->getNumberFormats(), nFormatKey ); xSupplier->getNumberFormatSettings()->getPropertyValue( ::rtl::OUString::createFromAscii("NullDate") ) >>= m_aNullDate; OEditBaseModel::onConnectedDbColumn( _rxForm ); @@ -800,7 +800,7 @@ void OFormattedModel::onDisconnectedDbColumn() { OEditBaseModel::onDisconnectedDbColumn(); if (m_xOriginalFormatter.is()) - { // unser aggregiertes Model hatte keinerlei Format-Informationen + { // unser aggregiertes Model hatte keinerlei Format-Informationen m_xAggregateSet->setPropertyValue(PROPERTY_FORMATSSUPPLIER, makeAny(m_xOriginalFormatter)); m_xAggregateSet->setPropertyValue(PROPERTY_FORMATKEY, Any()); setPropertyValue(PROPERTY_TREATASNUMERIC, makeAny((sal_Bool)m_bOriginalNumeric)); @@ -808,7 +808,7 @@ void OFormattedModel::onDisconnectedDbColumn() } m_nFieldType = DataType::OTHER; - m_nKeyType = NumberFormat::UNDEFINED; + m_nKeyType = NumberFormat::UNDEFINED; m_aNullDate = DBTypeConversion::getStandardDate(); } @@ -849,11 +849,11 @@ void OFormattedModel::write(const Reference<XObjectOutputStream>& _rxOutStream) Reference<XNumberFormats> xFormats = xSupplier->getNumberFormats(); - ::rtl::OUString sFormatDescription; - LanguageType eFormatLanguage = LANGUAGE_DONTKNOW; + ::rtl::OUString sFormatDescription; + LanguageType eFormatLanguage = LANGUAGE_DONTKNOW; static const ::rtl::OUString s_aLocaleProp = ::rtl::OUString::createFromAscii("Locale"); - Reference<com::sun::star::beans::XPropertySet> xFormat = xFormats->getByKey(nKey); + Reference<com::sun::star::beans::XPropertySet> xFormat = xFormats->getByKey(nKey); if (hasProperty(s_aLocaleProp, xFormat)) { Any aLocale = xFormat->getPropertyValue(s_aLocaleProp); @@ -908,7 +908,7 @@ void OFormattedModel::write(const Reference<XObjectOutputStream>& _rxOutStream) _rxOutStream->writeShort(0x0001); _rxOutStream->writeDouble(::comphelper::getDouble(aEffectiveValue)); break; - default: // void and all unknown states + default: // void and all unknown states DBG_ASSERT(!aEffectiveValue.hasValue(), "FmXFormattedModel::write : unknown property value type !"); _rxOutStream->writeShort(0x0002); break; @@ -949,7 +949,7 @@ void OFormattedModel::read(const Reference<XObjectInputStream>& _rxInStream) thr nKey = xFormats->queryKey(sFormatDescription, aDescriptionLanguage, sal_False); if (nKey == (sal_Int32)-1) - { // noch nicht vorhanden in meinem Formatter ... + { // noch nicht vorhanden in meinem Formatter ... nKey = xFormats->addNew(sFormatDescription, aDescriptionLanguage); } } @@ -958,7 +958,7 @@ void OFormattedModel::read(const Reference<XObjectInputStream>& _rxInStream) thr readCommonEditProperties(_rxInStream); if (nVersion == 0x0003) - { // since version 3 there is a "skippable" block at this position + { // since version 3 there is a "skippable" block at this position Reference< XDataInputStream > xIn(_rxInStream, UNO_QUERY); OStreamSection aDownCompat(xIn); @@ -1032,10 +1032,10 @@ sal_Bool OFormattedModel::commitControlValueToDbColumn( bool /*_bPostReset*/ ) if ( aControlValue != m_aSaveValue ) { // Leerstring + EmptyIsNull = void - if ( !aControlValue.hasValue() - || ( ( aControlValue.getValueType().getTypeClass() == TypeClass_STRING ) - && ( getString( aControlValue ).getLength() == 0 ) - && m_bEmptyIsNull + if ( !aControlValue.hasValue() + || ( ( aControlValue.getValueType().getTypeClass() == TypeClass_STRING ) + && ( getString( aControlValue ).getLength() == 0 ) + && m_bEmptyIsNull ) ) m_xColumnUpdate->updateNull(); diff --git a/forms/source/component/FormattedField.hxx b/forms/source/component/FormattedField.hxx index 9891a71bf654..a2cdf4285a27 100644 --- a/forms/source/component/FormattedField.hxx +++ b/forms/source/component/FormattedField.hxx @@ -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 @@ -48,15 +48,15 @@ namespace frm { // das Original, falls ich die Format-Properties meines aggregierten Models gefaket, d.h. von dem Feld, an das // ich gebunden bin, weitergereicht habe (nur gueltig wenn loaded) - ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier> m_xOriginalFormatter; - ::com::sun::star::util::Date m_aNullDate; - ::com::sun::star::uno::Any m_aSaveValue; - - sal_Int32 m_nFieldType; - sal_Int16 m_nKeyType; - sal_Bool m_bOriginalNumeric : 1, - m_bNumeric : 1; // analog fuer TreatAsNumeric-Property - + ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier> m_xOriginalFormatter; + ::com::sun::star::util::Date m_aNullDate; + ::com::sun::star::uno::Any m_aSaveValue; + + sal_Int32 m_nFieldType; + sal_Int16 m_nKeyType; + sal_Bool m_bOriginalNumeric : 1, + m_bNumeric : 1; // analog fuer TreatAsNumeric-Property + protected: ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier> calcDefaultFormatsSupplier() const; ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier> calcFormFormatsSupplier() const; @@ -156,10 +156,10 @@ namespace frm //= OFormattedControl //================================================================== typedef ::cppu::ImplHelper1< ::com::sun::star::awt::XKeyListener> OFormattedControl_BASE; - class OFormattedControl : public OBoundControl + class OFormattedControl : public OBoundControl ,public OFormattedControl_BASE { - sal_uInt32 m_nKeyEvent; + sal_uInt32 m_nKeyEvent; public: OFormattedControl(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory); diff --git a/forms/source/component/FormattedFieldWrapper.cxx b/forms/source/component/FormattedFieldWrapper.cxx index 53f340fd9d70..161046d0ce1e 100644 --- a/forms/source/component/FormattedFieldWrapper.cxx +++ b/forms/source/component/FormattedFieldWrapper.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 @@ -94,7 +94,7 @@ OFormattedFieldWrapper::OFormattedFieldWrapper(const Reference<XMultiServiceFact m_pEditPart->acquire(); } if (m_xAggregate.is()) - { // has to be in it's own block because of the temporary variable created by *this + { // has to be in it's own block because of the temporary variable created by *this m_xAggregate->setDelegator(static_cast<XWeak*>(this)); } decrement(m_refCount); @@ -127,13 +127,13 @@ OFormattedFieldWrapper::OFormattedFieldWrapper( const OFormattedFieldWrapper* _p } } if ( m_xAggregate.is() ) - { // has to be in it's own block because of the temporary variable created by *this + { // has to be in it's own block because of the temporary variable created by *this m_xAggregate->setDelegator( static_cast< XWeak* >( this ) ); } decrement( m_refCount ); } else - { // the clone source does not yet have an aggregate -> we don't yet need one, too + { // the clone source does not yet have an aggregate -> we don't yet need one, too } } @@ -156,7 +156,7 @@ Any SAL_CALL OFormattedFieldWrapper::queryAggregation(const Type& _rType) throw Any aReturn; if (_rType.equals( ::getCppuType( static_cast< Reference< XTypeProvider >* >(NULL) ) ) ) - { // a XTypeProvider interface needs a working aggregate - we don't want to give the type provider + { // a XTypeProvider interface needs a working aggregate - we don't want to give the type provider // of our base class (OFormattedFieldWrapper_Base) to the caller as it supplies nearly nothing ensureAggregate(); if (m_xAggregate.is()) @@ -168,7 +168,7 @@ Any SAL_CALL OFormattedFieldWrapper::queryAggregation(const Type& _rType) throw aReturn = OFormattedFieldWrapper_Base::queryAggregation(_rType); if ((_rType.equals( ::getCppuType( static_cast< Reference< XServiceInfo >* >(NULL) ) ) ) && aReturn.hasValue()) - { // somebody requested an XServiceInfo interface and our base class provided it + { // somebody requested an XServiceInfo interface and our base class provided it // check our aggregate if it has one, too ensureAggregate(); } @@ -270,14 +270,14 @@ void SAL_CALL OFormattedFieldWrapper::write(const Reference<XObjectOutputStream> void SAL_CALL OFormattedFieldWrapper::read(const Reference<XObjectInputStream>& _rxInStream) throw( IOException, RuntimeException ) { if (m_xAggregate.is()) - { // we alread did a decision if we're an EditModel or a FormattedModel + { // we alread did a decision if we're an EditModel or a FormattedModel // if we act as formatted, we have to read the edit part first if (m_xFormattedPart.is()) { // two possible cases: // a) the stuff was written by a version which didn't work with an Edit header (all intermediate - // versions >5.1 && <=568) + // versions >5.1 && <=568) // b) it was written by a version using edit headers // as we can distinguish a) from b) only after we have read the edit part, we need to remember the // position @@ -289,7 +289,7 @@ void SAL_CALL OFormattedFieldWrapper::read(const Reference<XObjectInputStream>& // this only works because an edit model can read the stuff written by a formatted model (maybe with // some assertions) , but not vice versa if (!m_pEditPart->lastReadWasFormattedFake()) - { // case a), written with a version without the edit part fake, so seek to the start position, again + { // case a), written with a version without the edit part fake, so seek to the start position, again xInMarkable->jumpToMark(nBeforeEditPart); } xInMarkable->deleteMark(nBeforeEditPart); @@ -318,7 +318,7 @@ void SAL_CALL OFormattedFieldWrapper::read(const Reference<XObjectInputStream>& // yes -> all fine pNewAggregate = pBasicReader; else - { // no -> substitute it with a formatted model + { // no -> substitute it with a formatted model // let the formmatted model do the reading OFormattedModel* pFormattedReader = new OFormattedModel(m_xServiceFactory); @@ -341,7 +341,7 @@ void SAL_CALL OFormattedFieldWrapper::read(const Reference<XObjectInputStream>& DBG_ASSERT(m_xAggregate.is(), "OFormattedFieldWrapper::read : the OEditModel didn't have an XAggregation interface !"); } if (m_xAggregate.is()) - { // has to be in it's own block because of the temporary variable created by *this + { // has to be in it's own block because of the temporary variable created by *this m_xAggregate->setDelegator(static_cast<XWeak*>(this)); } decrement(m_refCount); @@ -386,7 +386,7 @@ void OFormattedFieldWrapper::ensureAggregate() } } if (m_xAggregate.is()) - { // has to be in it's own block because of the temporary variable created by *this + { // has to be in it's own block because of the temporary variable created by *this m_xAggregate->setDelegator(static_cast<XWeak*>(this)); } decrement(m_refCount); diff --git a/forms/source/component/FormattedFieldWrapper.hxx b/forms/source/component/FormattedFieldWrapper.hxx index d7726ee428fa..42f861d30666 100644 --- a/forms/source/component/FormattedFieldWrapper.hxx +++ b/forms/source/component/FormattedFieldWrapper.hxx @@ -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 @@ -42,21 +42,21 @@ class OEditModel; //================================================================== //= OFormattedFieldWrapper //================================================================== -typedef ::cppu::WeakAggImplHelper3 < ::com::sun::star::io::XPersistObject - , ::com::sun::star::lang::XServiceInfo - , ::com::sun::star::util::XCloneable - > OFormattedFieldWrapper_Base; +typedef ::cppu::WeakAggImplHelper3 < ::com::sun::star::io::XPersistObject + , ::com::sun::star::lang::XServiceInfo + , ::com::sun::star::util::XCloneable + > OFormattedFieldWrapper_Base; class OFormattedFieldWrapper : public OFormattedFieldWrapper_Base { - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory> m_xServiceFactory; + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory> m_xServiceFactory; protected: - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation> m_xAggregate; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation> m_xAggregate; - OEditModel* m_pEditPart; + OEditModel* m_pEditPart; // if we act as formatted this is used to write the EditModel part - ::com::sun::star::uno::Reference< ::com::sun::star::io::XPersistObject> m_xFormattedPart; + ::com::sun::star::uno::Reference< ::com::sun::star::io::XPersistObject> m_xFormattedPart; // if we act as formatted, this is the PersistObject interface of our aggregate, used // to read and write the FormattedModel part diff --git a/forms/source/component/FormsCollection.cxx b/forms/source/component/FormsCollection.cxx index b6629e91cb94..cf69c0015910 100644 --- a/forms/source/component/FormsCollection.cxx +++ b/forms/source/component/FormsCollection.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 @@ -182,7 +182,7 @@ InterfaceRef OFormsCollection::getParent() throw( RuntimeException ) } //......................................................................... -} // namespace frm +} // namespace frm //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/component/FormsCollection.hxx b/forms/source/component/FormsCollection.hxx index df547f1f6238..8a9ef988a40c 100644 --- a/forms/source/component/FormsCollection.hxx +++ b/forms/source/component/FormsCollection.hxx @@ -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 @@ -46,7 +46,7 @@ namespace frm // oder aussen einen Context uebergeben bekommen //================================================================== typedef ::cppu::OComponentHelper FormsCollectionComponentBase; -typedef ::cppu::ImplHelper2< ::com::sun::star::container::XChild +typedef ::cppu::ImplHelper2< ::com::sun::star::container::XChild ,::com::sun::star::lang::XServiceInfo > OFormsCollection_BASE; // else MSVC kills itself on some statements @@ -55,9 +55,9 @@ class OFormsCollection ,public OInterfaceContainer ,public OFormsCollection_BASE { - ::osl::Mutex m_aMutex; - OImplementationIdsRef m_aHoldIdHelper; - ::comphelper::InterfaceRef m_xParent; // Parent + ::osl::Mutex m_aMutex; + OImplementationIdsRef m_aHoldIdHelper; + ::comphelper::InterfaceRef m_xParent; // Parent public: OFormsCollection(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory); @@ -96,7 +96,7 @@ public: }; //......................................................................... -} // namespace frm +} // namespace frm //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/component/Grid.cxx b/forms/source/component/Grid.cxx index 701f143c1c0a..7626cc6e14ae 100644 --- a/forms/source/component/Grid.cxx +++ b/forms/source/component/Grid.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 @@ -72,15 +72,15 @@ using namespace ::com::sun::star::view; namespace WritingMode2 = ::com::sun::star::text::WritingMode2; -const sal_uInt16 ROWHEIGHT = 0x0001; -const sal_uInt16 FONTTYPE = 0x0002; -const sal_uInt16 FONTSIZE = 0x0004; -const sal_uInt16 FONTATTRIBS = 0x0008; -const sal_uInt16 TABSTOP = 0x0010; -const sal_uInt16 TEXTCOLOR = 0x0020; -const sal_uInt16 FONTDESCRIPTOR = 0x0040; -const sal_uInt16 RECORDMARKER = 0x0080; -const sal_uInt16 BACKGROUNDCOLOR = 0x0100; +const sal_uInt16 ROWHEIGHT = 0x0001; +const sal_uInt16 FONTTYPE = 0x0002; +const sal_uInt16 FONTSIZE = 0x0004; +const sal_uInt16 FONTATTRIBS = 0x0008; +const sal_uInt16 TABSTOP = 0x0010; +const sal_uInt16 TEXTCOLOR = 0x0020; +const sal_uInt16 FONTDESCRIPTOR = 0x0040; +const sal_uInt16 RECORDMARKER = 0x0080; +const sal_uInt16 BACKGROUNDCOLOR = 0x0100; //------------------------------------------------------------------ InterfaceRef SAL_CALL OGridControlModel_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory) @@ -288,7 +288,7 @@ void SAL_CALL OGridControlModel::setParent( const InterfaceRef& i_Parent ) throw } //------------------------------------------------------------------------------ -Sequence< Type > SAL_CALL OGridControlModel::getTypes( ) throw(RuntimeException) +Sequence< Type > SAL_CALL OGridControlModel::getTypes( ) throw(RuntimeException) { return concatSequences( concatSequences( @@ -388,16 +388,16 @@ Reference<XPropertySet> OGridControlModel::createColumn(sal_Int32 nTypeId) cons Reference<XPropertySet> xReturn; switch (nTypeId) { - case TYPE_CHECKBOX: xReturn = new CheckBoxColumn( getContext() ); break; - case TYPE_COMBOBOX: xReturn = new ComboBoxColumn( getContext() ); break; - case TYPE_CURRENCYFIELD: xReturn = new CurrencyFieldColumn( getContext() ); break; - case TYPE_DATEFIELD: xReturn = new DateFieldColumn( getContext() ); break; - case TYPE_LISTBOX: xReturn = new ListBoxColumn( getContext() ); break; - case TYPE_NUMERICFIELD: xReturn = new NumericFieldColumn( getContext() ); break; - case TYPE_PATTERNFIELD: xReturn = new PatternFieldColumn( getContext() ); break; - case TYPE_TEXTFIELD: xReturn = new TextFieldColumn( getContext() ); break; - case TYPE_TIMEFIELD: xReturn = new TimeFieldColumn( getContext() ); break; - case TYPE_FORMATTEDFIELD: xReturn = new FormattedFieldColumn( getContext() ); break; + case TYPE_CHECKBOX: xReturn = new CheckBoxColumn( getContext() ); break; + case TYPE_COMBOBOX: xReturn = new ComboBoxColumn( getContext() ); break; + case TYPE_CURRENCYFIELD: xReturn = new CurrencyFieldColumn( getContext() ); break; + case TYPE_DATEFIELD: xReturn = new DateFieldColumn( getContext() ); break; + case TYPE_LISTBOX: xReturn = new ListBoxColumn( getContext() ); break; + case TYPE_NUMERICFIELD: xReturn = new NumericFieldColumn( getContext() ); break; + case TYPE_PATTERNFIELD: xReturn = new PatternFieldColumn( getContext() ); break; + case TYPE_TEXTFIELD: xReturn = new TextFieldColumn( getContext() ); break; + case TYPE_TIMEFIELD: xReturn = new TimeFieldColumn( getContext() ); break; + case TYPE_FORMATTEDFIELD: xReturn = new FormattedFieldColumn( getContext() ); break; default: DBG_ERROR("OGridControlModel::createColumn: Unknown Column"); break; @@ -458,41 +458,41 @@ void OGridControlModel::_reset() void OGridControlModel::describeFixedProperties( Sequence< Property >& _rProps ) const { BEGIN_DESCRIBE_BASE_PROPERTIES( 37 ) - DECL_PROP1(NAME, ::rtl::OUString, BOUND); - DECL_PROP2(CLASSID, sal_Int16, READONLY, TRANSIENT); - DECL_PROP1(TAG, ::rtl::OUString, BOUND); - DECL_PROP1(TABINDEX, sal_Int16, BOUND); - DECL_PROP3(TABSTOP, sal_Bool, BOUND, MAYBEDEFAULT, MAYBEVOID); - DECL_PROP2(HASNAVIGATION, sal_Bool, BOUND, MAYBEDEFAULT); - DECL_PROP1(ENABLED, sal_Bool, BOUND); - DECL_PROP2(ENABLEVISIBLE, sal_Bool, BOUND, MAYBEDEFAULT); - DECL_PROP1(BORDER, sal_Int16, BOUND); - DECL_PROP2(BORDERCOLOR, sal_Int16, BOUND, MAYBEVOID); - DECL_PROP1(DEFAULTCONTROL, ::rtl::OUString, BOUND); - DECL_PROP3(TEXTCOLOR, sal_Int32, BOUND, MAYBEDEFAULT, MAYBEVOID); - DECL_PROP3(BACKGROUNDCOLOR, sal_Int32, BOUND, MAYBEDEFAULT, MAYBEVOID); - DECL_PROP2(FONT, FontDescriptor, BOUND, MAYBEDEFAULT); - DECL_PROP3(ROWHEIGHT, sal_Int32, BOUND, MAYBEDEFAULT, MAYBEVOID); - DECL_PROP1(HELPTEXT, ::rtl::OUString, BOUND); - DECL_PROP1(FONT_NAME, ::rtl::OUString, MAYBEDEFAULT); - DECL_PROP1(FONT_STYLENAME, ::rtl::OUString, MAYBEDEFAULT); - DECL_PROP1(FONT_FAMILY, sal_Int16, MAYBEDEFAULT); - DECL_PROP1(FONT_CHARSET, sal_Int16, MAYBEDEFAULT); - DECL_PROP1(FONT_HEIGHT, float, MAYBEDEFAULT); - DECL_PROP1(FONT_WEIGHT, float, MAYBEDEFAULT); - DECL_PROP1(FONT_SLANT, sal_Int16, MAYBEDEFAULT); - DECL_PROP1(FONT_UNDERLINE, sal_Int16, MAYBEDEFAULT); - DECL_BOOL_PROP1(FONT_WORDLINEMODE, MAYBEDEFAULT); - DECL_PROP3(TEXTLINECOLOR, sal_Int32, BOUND, MAYBEDEFAULT, MAYBEVOID); - DECL_PROP2(FONTEMPHASISMARK, sal_Int16, BOUND, MAYBEDEFAULT); - DECL_PROP2(FONTRELIEF, sal_Int16, BOUND, MAYBEDEFAULT); - DECL_PROP1(FONT_STRIKEOUT, sal_Int16, MAYBEDEFAULT); - DECL_PROP2(RECORDMARKER, sal_Bool, BOUND, MAYBEDEFAULT ); - DECL_PROP2(PRINTABLE, sal_Bool, BOUND, MAYBEDEFAULT ); - DECL_PROP4(CURSORCOLOR, sal_Int32, BOUND, MAYBEDEFAULT, MAYBEVOID , TRANSIENT); - DECL_PROP3(ALWAYSSHOWCURSOR, sal_Bool, BOUND, MAYBEDEFAULT, TRANSIENT); - DECL_PROP3(DISPLAYSYNCHRON, sal_Bool, BOUND, MAYBEDEFAULT, TRANSIENT); - DECL_PROP2(HELPURL, ::rtl::OUString, BOUND, MAYBEDEFAULT); + DECL_PROP1(NAME, ::rtl::OUString, BOUND); + DECL_PROP2(CLASSID, sal_Int16, READONLY, TRANSIENT); + DECL_PROP1(TAG, ::rtl::OUString, BOUND); + DECL_PROP1(TABINDEX, sal_Int16, BOUND); + DECL_PROP3(TABSTOP, sal_Bool, BOUND, MAYBEDEFAULT, MAYBEVOID); + DECL_PROP2(HASNAVIGATION, sal_Bool, BOUND, MAYBEDEFAULT); + DECL_PROP1(ENABLED, sal_Bool, BOUND); + DECL_PROP2(ENABLEVISIBLE, sal_Bool, BOUND, MAYBEDEFAULT); + DECL_PROP1(BORDER, sal_Int16, BOUND); + DECL_PROP2(BORDERCOLOR, sal_Int16, BOUND, MAYBEVOID); + DECL_PROP1(DEFAULTCONTROL, ::rtl::OUString, BOUND); + DECL_PROP3(TEXTCOLOR, sal_Int32, BOUND, MAYBEDEFAULT, MAYBEVOID); + DECL_PROP3(BACKGROUNDCOLOR, sal_Int32, BOUND, MAYBEDEFAULT, MAYBEVOID); + DECL_PROP2(FONT, FontDescriptor, BOUND, MAYBEDEFAULT); + DECL_PROP3(ROWHEIGHT, sal_Int32, BOUND, MAYBEDEFAULT, MAYBEVOID); + DECL_PROP1(HELPTEXT, ::rtl::OUString, BOUND); + DECL_PROP1(FONT_NAME, ::rtl::OUString, MAYBEDEFAULT); + DECL_PROP1(FONT_STYLENAME, ::rtl::OUString, MAYBEDEFAULT); + DECL_PROP1(FONT_FAMILY, sal_Int16, MAYBEDEFAULT); + DECL_PROP1(FONT_CHARSET, sal_Int16, MAYBEDEFAULT); + DECL_PROP1(FONT_HEIGHT, float, MAYBEDEFAULT); + DECL_PROP1(FONT_WEIGHT, float, MAYBEDEFAULT); + DECL_PROP1(FONT_SLANT, sal_Int16, MAYBEDEFAULT); + DECL_PROP1(FONT_UNDERLINE, sal_Int16, MAYBEDEFAULT); + DECL_BOOL_PROP1(FONT_WORDLINEMODE, MAYBEDEFAULT); + DECL_PROP3(TEXTLINECOLOR, sal_Int32, BOUND, MAYBEDEFAULT, MAYBEVOID); + DECL_PROP2(FONTEMPHASISMARK, sal_Int16, BOUND, MAYBEDEFAULT); + DECL_PROP2(FONTRELIEF, sal_Int16, BOUND, MAYBEDEFAULT); + DECL_PROP1(FONT_STRIKEOUT, sal_Int16, MAYBEDEFAULT); + DECL_PROP2(RECORDMARKER, sal_Bool, BOUND, MAYBEDEFAULT ); + DECL_PROP2(PRINTABLE, sal_Bool, BOUND, MAYBEDEFAULT ); + DECL_PROP4(CURSORCOLOR, sal_Int32, BOUND, MAYBEDEFAULT, MAYBEVOID , TRANSIENT); + DECL_PROP3(ALWAYSSHOWCURSOR, sal_Bool, BOUND, MAYBEDEFAULT, TRANSIENT); + DECL_PROP3(DISPLAYSYNCHRON, sal_Bool, BOUND, MAYBEDEFAULT, TRANSIENT); + DECL_PROP2(HELPURL, ::rtl::OUString, BOUND, MAYBEDEFAULT); DECL_PROP2(WRITING_MODE, sal_Int16, BOUND, MAYBEDEFAULT); DECL_PROP3(CONTEXT_WRITING_MODE,sal_Int16, BOUND, MAYBEDEFAULT, TRANSIENT); END_DESCRIBE_PROPERTIES(); @@ -811,7 +811,7 @@ void OGridControlModel::gotColumn( const Reference< XInterface >& _rxColumn ) void OGridControlModel::lostColumn(const Reference< XInterface >& _rxColumn) { if ( m_xSelection == _rxColumn ) - { // the currently selected element was replaced + { // the currently selected element was replaced m_xSelection.clear(); EventObject aEvt( static_cast< XWeak* >( this ) ); m_aSelectListeners.notifyEach( &XSelectionChangeListener::selectionChanged, aEvt ); @@ -883,7 +883,7 @@ void OGridControlModel::approveNewElement( const Reference< XPropertySet >& _rxO //------------------------------------------------------------------------------ ::rtl::OUString SAL_CALL OGridControlModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException) { - return FRM_COMPONENT_GRID; // old (non-sun) name for compatibility ! + return FRM_COMPONENT_GRID; // old (non-sun) name for compatibility ! } //------------------------------------------------------------------------------ @@ -891,7 +891,7 @@ void OGridControlModel::write(const Reference<XObjectOutputStream>& _rxOutStream { OControlModel::write(_rxOutStream); - Reference<XMarkableStream> xMark(_rxOutStream, UNO_QUERY); + Reference<XMarkableStream> xMark(_rxOutStream, UNO_QUERY); // 1. Version _rxOutStream->writeShort(0x0008); @@ -1009,7 +1009,7 @@ void OGridControlModel::read(const Reference<XObjectInputStream>& _rxInStream) t { OControlModel::read(_rxInStream); - Reference<XMarkableStream> xMark(_rxInStream, UNO_QUERY); + Reference<XMarkableStream> xMark(_rxInStream, UNO_QUERY); // 1. Version sal_Int16 nVersion = _rxInStream->readShort(); @@ -1159,7 +1159,7 @@ void OGridControlModel::read(const Reference<XObjectInputStream>& _rxInStream) t } //......................................................................... -} // namespace frm +} // namespace frm //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/component/Grid.hxx b/forms/source/component/Grid.hxx index 5b4b645d77f0..7077ffc59e9e 100644 --- a/forms/source/component/Grid.hxx +++ b/forms/source/component/Grid.hxx @@ -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 @@ -57,55 +57,55 @@ class OGridColumn; struct ColumnDescription : public ElementDescription { public: - OGridColumn* pColumn; // not owned by this instance! only to prevent duplicate XUnoTunnel usage + OGridColumn* pColumn; // not owned by this instance! only to prevent duplicate XUnoTunnel usage }; //================================================================== // OGridControlModel //================================================================== -typedef ::cppu::ImplHelper7 < ::com::sun::star::awt::XControlModel - , ::com::sun::star::form::XGridColumnFactory - , ::com::sun::star::form::XReset - , ::com::sun::star::view::XSelectionSupplier - , ::com::sun::star::sdb::XSQLErrorListener +typedef ::cppu::ImplHelper7 < ::com::sun::star::awt::XControlModel + , ::com::sun::star::form::XGridColumnFactory + , ::com::sun::star::form::XReset + , ::com::sun::star::view::XSelectionSupplier + , ::com::sun::star::sdb::XSQLErrorListener , ::com::sun::star::sdb::XRowSetSupplier , ::com::sun::star::sdb::XRowSetChangeBroadcaster - > OGridControlModel_BASE; - + > OGridControlModel_BASE; + class OGridControlModel :public OControlModel ,public OInterfaceContainer ,public OErrorBroadcaster ,public FontControlModel ,public OGridControlModel_BASE { - ::cppu::OInterfaceContainerHelper m_aSelectListeners, + ::cppu::OInterfaceContainerHelper m_aSelectListeners, m_aResetListeners, m_aRowSetChangeListeners; // [properties] - ::com::sun::star::uno::Any m_aRowHeight; // Zeilenhoehe - ::com::sun::star::uno::Any m_aTabStop; - ::com::sun::star::uno::Any m_aBackgroundColor; - ::com::sun::star::uno::Any m_aCursorColor; // transient + ::com::sun::star::uno::Any m_aRowHeight; // Zeilenhoehe + ::com::sun::star::uno::Any m_aTabStop; + ::com::sun::star::uno::Any m_aBackgroundColor; + ::com::sun::star::uno::Any m_aCursorColor; // transient ::com::sun::star::uno::Any m_aBorderColor; - ::rtl::OUString m_aDefaultControl; - ::rtl::OUString m_sHelpText; + ::rtl::OUString m_aDefaultControl; + ::rtl::OUString m_sHelpText; // [properties] - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xSelection; + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xSelection; // [properties] - ::rtl::OUString m_sHelpURL; // URL - sal_Int16 m_nBorder; + ::rtl::OUString m_sHelpURL; // URL + sal_Int16 m_nBorder; sal_Int16 m_nWritingMode; sal_Int16 m_nContextWritingMode; - sal_Bool m_bEnableVisible : 1; - sal_Bool m_bEnable : 1; - sal_Bool m_bNavigation : 1; - sal_Bool m_bRecordMarker : 1; - sal_Bool m_bPrintable : 1; - sal_Bool m_bAlwaysShowCursor : 1; // transient - sal_Bool m_bDisplaySynchron : 1; // transient + sal_Bool m_bEnableVisible : 1; + sal_Bool m_bEnable : 1; + sal_Bool m_bNavigation : 1; + sal_Bool m_bRecordMarker : 1; + sal_Bool m_bPrintable : 1; + sal_Bool m_bAlwaysShowCursor : 1; // transient + sal_Bool m_bDisplaySynchron : 1; // transient // [properties] protected: @@ -214,7 +214,7 @@ protected: }; //......................................................................... -} // namespace frm +} // namespace frm //......................................................................... diff --git a/forms/source/component/GroupBox.cxx b/forms/source/component/GroupBox.cxx index 702a3aba1905..a6a781fe6455 100644 --- a/forms/source/component/GroupBox.cxx +++ b/forms/source/component/GroupBox.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 @@ -78,7 +78,7 @@ OGroupBoxModel::OGroupBoxModel( const OGroupBoxModel* _pOriginal, const Referenc // XServiceInfo //------------------------------------------------------------------------------ -StringSequence SAL_CALL OGroupBoxModel::getSupportedServiceNames() throw(RuntimeException) +StringSequence SAL_CALL OGroupBoxModel::getSupportedServiceNames() throw(RuntimeException) { StringSequence aSupported = OControlModel::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 1); @@ -108,7 +108,7 @@ void OGroupBoxModel::describeAggregateProperties( Sequence< Property >& _rAggreg //------------------------------------------------------------------------------ ::rtl::OUString SAL_CALL OGroupBoxModel::getServiceName() throw(RuntimeException) { - return FRM_COMPONENT_GROUPBOX; // old (non-sun) name for compatibility ! + return FRM_COMPONENT_GROUPBOX; // old (non-sun) name for compatibility ! } //------------------------------------------------------------------------------ @@ -158,7 +158,7 @@ OGroupBoxControl::OGroupBoxControl(const Reference<starlang::XMultiServiceFactor } //------------------------------------------------------------------------------ -StringSequence SAL_CALL OGroupBoxControl::getSupportedServiceNames() throw(RuntimeException) +StringSequence SAL_CALL OGroupBoxControl::getSupportedServiceNames() throw(RuntimeException) { StringSequence aSupported = OControl::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 1); diff --git a/forms/source/component/GroupBox.hxx b/forms/source/component/GroupBox.hxx index a7b0411af451..1c0af9dc13ce 100644 --- a/forms/source/component/GroupBox.hxx +++ b/forms/source/component/GroupBox.hxx @@ -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 @@ -46,10 +46,10 @@ public: // XServiceInfo IMPLEMENTATION_NAME(OGroupBoxModel); - virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XPersistObject - virtual ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); + virtual ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL @@ -74,7 +74,7 @@ public: // XServiceInfo IMPLEMENTATION_NAME(OGroupBoxControl); - virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; //......................................................................... diff --git a/forms/source/component/GroupManager.cxx b/forms/source/component/GroupManager.cxx index c9b8e4616e73..8e31c5c317aa 100644 --- a/forms/source/component/GroupManager.cxx +++ b/forms/source/component/GroupManager.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 @@ -94,7 +94,7 @@ public: { return reinterpret_cast<sal_Int64>(lhs.m_xComponent.get()) - < reinterpret_cast<sal_Int64>(rhs.m_xComponent.get()); + < reinterpret_cast<sal_Int64>(rhs.m_xComponent.get()); } }; @@ -350,7 +350,7 @@ void SAL_CALL OGroupManager::propertyChange(const PropertyChangeEvent& evt) thro Reference<XPropertySet> xSet(evt.Source, UNO_QUERY); // Component aus Gruppe entfernen - ::rtl::OUString sGroupName; + ::rtl::OUString sGroupName; if (hasProperty( PROPERTY_GROUP_NAME, xSet )) xSet->getPropertyValue( PROPERTY_GROUP_NAME ) >>= sGroupName; if (evt.PropertyName == PROPERTY_NAME) { @@ -425,9 +425,9 @@ sal_Int32 OGroupManager::getGroupCount() void OGroupManager::getGroup(sal_Int32 nGroup, Sequence< Reference<XControlModel> >& _rGroup, ::rtl::OUString& _rName) { OSL_ENSURE(nGroup >= 0 && (size_t)nGroup < m_aActiveGroupMap.size(),"OGroupManager::getGroup: Invalid group index!"); - OGroupArr::iterator aGroupPos = m_aActiveGroupMap[nGroup]; - _rName = aGroupPos->second.GetGroupName(); - _rGroup = aGroupPos->second.GetControlModels(); + OGroupArr::iterator aGroupPos = m_aActiveGroupMap[nGroup]; + _rName = aGroupPos->second.GetGroupName(); + _rGroup = aGroupPos->second.GetControlModels(); } //------------------------------------------------------------------ @@ -506,7 +506,7 @@ void OGroupManager::RemoveElement( const Reference<XPropertySet>& xSet ) return; // Component aus Gruppe entfernen - ::rtl::OUString sGroupName( GetGroupName( xSet ) ); + ::rtl::OUString sGroupName( GetGroupName( xSet ) ); removeFromGroupMap(sGroupName,xSet); } @@ -527,7 +527,7 @@ void OGroupManager::RemoveElement( const Reference<XPropertySet>& xSet ) } //......................................................................... -} // namespace frm +} // namespace frm //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/component/GroupManager.hxx b/forms/source/component/GroupManager.hxx index aa2218856282..119144c1c5bd 100644 --- a/forms/source/component/GroupManager.hxx +++ b/forms/source/component/GroupManager.hxx @@ -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 @@ -95,7 +95,7 @@ namespace frm _rCompareOp ); if ((aExistentPos != _rArray.end()) && (*aExistentPos == _rNewElement)) - { // we have a valid "lower or equal" element and it's really "equal" + { // we have a valid "lower or equal" element and it's really "equal" nPos = aExistentPos - _rArray.begin(); return sal_True; } @@ -106,11 +106,11 @@ namespace frm //======================================================================== class OGroupComp { - ::rtl::OUString m_aName; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> m_xComponent; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel> m_xControlModel; - sal_Int32 m_nPos; - sal_Int16 m_nTabIndex; + ::rtl::OUString m_aName; + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> m_xComponent; + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel> m_xControlModel; + sal_Int32 m_nPos; + sal_Int16 m_nTabIndex; friend class OGroupCompLess; @@ -122,10 +122,10 @@ public: sal_Bool operator==( const OGroupComp& rComp ) const; inline const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& GetComponent() const { return m_xComponent; } - inline const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel>& GetControlModel() const { return m_xControlModel; } + inline const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel>& GetControlModel() const { return m_xControlModel; } - sal_Int32 GetPos() const { return m_nPos; } - sal_Int16 GetTabIndex() const { return m_nTabIndex; } + sal_Int32 GetPos() const { return m_nPos; } + sal_Int16 GetTabIndex() const { return m_nTabIndex; } ::rtl::OUString GetName() const { return m_aName; } }; @@ -135,9 +135,9 @@ DECLARE_STL_VECTOR(OGroupComp, OGroupCompArr); class OGroupComp; class OGroupCompAcc { - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> m_xComponent; - - OGroupComp m_aGroupComp; + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> m_xComponent; + + OGroupComp m_aGroupComp; friend class OGroupCompAccLess; @@ -146,8 +146,8 @@ public: sal_Bool operator==( const OGroupCompAcc& rCompAcc ) const; - inline const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& GetComponent() const { return m_xComponent; } - const OGroupComp& GetGroupComponent() const { return m_aGroupComp; } + inline const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& GetComponent() const { return m_xComponent; } + const OGroupComp& GetGroupComponent() const { return m_aGroupComp; } }; DECLARE_STL_VECTOR(OGroupCompAcc, OGroupCompAccArr); @@ -155,18 +155,18 @@ DECLARE_STL_VECTOR(OGroupCompAcc, OGroupCompAccArr); //======================================================================== class OGroup { - OGroupCompArr m_aCompArray; - OGroupCompAccArr m_aCompAccArray; + OGroupCompArr m_aCompArray; + OGroupCompAccArr m_aCompAccArray; ::rtl::OUString m_aGroupName; - sal_uInt16 m_nInsertPos; // Die Einfugeposition der GroupComps wird von der Gruppe bestimmt. + sal_uInt16 m_nInsertPos; // Die Einfugeposition der GroupComps wird von der Gruppe bestimmt. friend class OGroupLess; public: OGroup( const ::rtl::OUString& rGroupName ); #ifdef DBG_UTIL - OGroup( const OGroup& _rSource ); // just to ensure the DBG_CTOR call + OGroup( const OGroup& _rSource ); // just to ensure the DBG_CTOR call #endif virtual ~OGroup(); @@ -186,11 +186,11 @@ DECLARE_STL_USTRINGACCESS_MAP(OGroup, OGroupArr); DECLARE_STL_VECTOR(OGroupArr::iterator, OActiveGroups); //======================================================================== -class OGroupManager : public ::cppu::WeakImplHelper2< ::com::sun::star::beans::XPropertyChangeListener, ::com::sun::star::container::XContainerListener> +class OGroupManager : public ::cppu::WeakImplHelper2< ::com::sun::star::beans::XPropertyChangeListener, ::com::sun::star::container::XContainerListener> { - OGroup* m_pCompGroup; // Alle Components nach TabIndizes sortiert - OGroupArr m_aGroupArr; // Alle Components nach Gruppen sortiert - OActiveGroups m_aActiveGroupMap; // In dieser Map werden die Indizes aller Gruppen gehalten, + OGroup* m_pCompGroup; // Alle Components nach TabIndizes sortiert + OGroupArr m_aGroupArr; // Alle Components nach Gruppen sortiert + OActiveGroups m_aActiveGroupMap; // In dieser Map werden die Indizes aller Gruppen gehalten, // die mehr als 1 Element haben ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainer > @@ -227,7 +227,7 @@ public: //......................................................................... -} // namespace frm +} // namespace frm //......................................................................... #endif // _FRM_GROUPMANAGER_HXX_ diff --git a/forms/source/component/Hidden.cxx b/forms/source/component/Hidden.cxx index 6f1e595d7e79..d291a9818a72 100644 --- a/forms/source/component/Hidden.cxx +++ b/forms/source/component/Hidden.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 @@ -130,16 +130,16 @@ sal_Bool OHiddenModel::convertFastPropertyValue( void OHiddenModel::describeFixedProperties( Sequence< Property >& _rProps ) const { BEGIN_DESCRIBE_BASE_PROPERTIES(4) - DECL_PROP2(CLASSID, sal_Int16, READONLY, TRANSIENT); - DECL_PROP1(HIDDEN_VALUE, ::rtl::OUString, BOUND); - DECL_PROP1(NAME, ::rtl::OUString, BOUND); - DECL_PROP1(TAG, ::rtl::OUString, BOUND); + DECL_PROP2(CLASSID, sal_Int16, READONLY, TRANSIENT); + DECL_PROP1(HIDDEN_VALUE, ::rtl::OUString, BOUND); + DECL_PROP1(NAME, ::rtl::OUString, BOUND); + DECL_PROP1(TAG, ::rtl::OUString, BOUND); END_DESCRIBE_PROPERTIES(); } // XServiceInfo //------------------------------------------------------------------------------ -StringSequence SAL_CALL OHiddenModel::getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException) +StringSequence SAL_CALL OHiddenModel::getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException) { StringSequence aSupported( 2 ); aSupported[ 0 ] = FRM_SUN_COMPONENT_HIDDENCONTROL; @@ -150,7 +150,7 @@ StringSequence SAL_CALL OHiddenModel::getSupportedServiceNames() throw(::com::su //------------------------------------------------------------------------------ ::rtl::OUString SAL_CALL OHiddenModel::getServiceName() throw(RuntimeException) { - return FRM_COMPONENT_HIDDEN; // old (non-sun) name for compatibility ! + return FRM_COMPONENT_HIDDEN; // old (non-sun) name for compatibility ! } //------------------------------------------------------------------------------ diff --git a/forms/source/component/Hidden.hxx b/forms/source/component/Hidden.hxx index 640b91dbd3c1..98bbcdd6c086 100644 --- a/forms/source/component/Hidden.hxx +++ b/forms/source/component/Hidden.hxx @@ -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 @@ -41,7 +41,7 @@ namespace frm class OHiddenModel :public OControlModel { - ::rtl::OUString m_sHiddenValue; + ::rtl::OUString m_sHiddenValue; public: DECLARE_DEFAULT_LEAF_XTOR( OHiddenModel ); @@ -56,10 +56,10 @@ public: // XServiceInfo IMPLEMENTATION_NAME(OHiddenModel); - virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XPersistObject - virtual ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); + virtual ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL diff --git a/forms/source/component/ImageButton.cxx b/forms/source/component/ImageButton.cxx index 926ed5c57e55..2b6165f5fac8 100644 --- a/forms/source/component/ImageButton.cxx +++ b/forms/source/component/ImageButton.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 @@ -90,7 +90,7 @@ OImageButtonModel::~OImageButtonModel() // XServiceInfo //------------------------------------------------------------------------------ -StringSequence OImageButtonModel::getSupportedServiceNames() throw() +StringSequence OImageButtonModel::getSupportedServiceNames() throw() { StringSequence aSupported = OClickableImageBaseModel::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 1); @@ -115,7 +115,7 @@ void OImageButtonModel::describeFixedProperties( Sequence< Property >& _rProps ) //------------------------------------------------------------------------------ ::rtl::OUString OImageButtonModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException) { - return FRM_COMPONENT_IMAGEBUTTON; // old (non-sun) name for compatibility ! + return FRM_COMPONENT_IMAGEBUTTON; // old (non-sun) name for compatibility ! } //------------------------------------------------------------------------------ @@ -192,7 +192,7 @@ Sequence<Type> OImageButtonControl::_getTypes() } //------------------------------------------------------------------------------ -StringSequence OImageButtonControl::getSupportedServiceNames() throw() +StringSequence OImageButtonControl::getSupportedServiceNames() throw() { StringSequence aSupported = OClickableImageBaseControl::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 1); @@ -269,7 +269,7 @@ void SAL_CALL OImageButtonControl::mouseExited(const awt::MouseEvent& /*e*/) thr //......................................................................... -} // namespace frm +} // namespace frm //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/component/ImageButton.hxx b/forms/source/component/ImageButton.hxx index cd5e4f7758a1..2507e3666b5c 100644 --- a/forms/source/component/ImageButton.hxx +++ b/forms/source/component/ImageButton.hxx @@ -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 @@ -101,7 +101,7 @@ public: }; //......................................................................... -} // namespace frm +} // namespace frm //......................................................................... #endif // _FRM_IMAGE_BUTTON_HXX_ diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx index 6caf6f4b530a..e888fcaa0169 100644 --- a/forms/source/component/ImageControl.cxx +++ b/forms/source/component/ImageControl.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 @@ -67,8 +67,8 @@ #include <memory> -#define ID_OPEN_GRAPHICS 1 -#define ID_CLEAR_GRAPHICS 2 +#define ID_OPEN_GRAPHICS 1 +#define ID_CLEAR_GRAPHICS 2 //......................................................................... namespace frm @@ -213,7 +213,7 @@ IMPLEMENT_DEFAULT_CLONING( OImageControlModel ) // XServiceInfo //------------------------------------------------------------------------------ -StringSequence OImageControlModel::getSupportedServiceNames() throw() +StringSequence OImageControlModel::getSupportedServiceNames() throw() { StringSequence aSupported = OBoundControlModel::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 1); @@ -370,7 +370,7 @@ void OImageControlModel::describeAggregateProperties( Sequence< Property >& /* [ //------------------------------------------------------------------------------ ::rtl::OUString OImageControlModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException) { - return FRM_COMPONENT_IMAGECONTROL; // old (non-sun) name for compatibility ! + return FRM_COMPONENT_IMAGECONTROL; // old (non-sun) name for compatibility ! } //------------------------------------------------------------------------------ @@ -416,8 +416,8 @@ void OImageControlModel::read(const Reference<XObjectInputStream>& _rxInStream) } // Nach dem Lesen die Defaultwerte anzeigen if ( getControlSource().getLength() ) - { // (not if we don't have a control source - the "State" property acts like it is persistent, then - ::osl::MutexGuard aGuard(m_aMutex); // resetNoBroadcast expects this mutex guarding + { // (not if we don't have a control source - the "State" property acts like it is persistent, then + ::osl::MutexGuard aGuard(m_aMutex); // resetNoBroadcast expects this mutex guarding resetNoBroadcast(); } } @@ -574,7 +574,7 @@ Any OImageControlModel::translateDbColumnToControlValue() { switch ( lcl_getImageStoreType( getFieldType() ) ) { - case ImageStoreBinary: + case ImageStoreBinary: { Reference< XInputStream > xImageStream( m_xColumn->getBinaryStream() ); if ( m_xColumn->wasNull() ) @@ -619,7 +619,7 @@ void OImageControlModel::doSetControlValue( const Any& _rValue ) GetImageProducer()->setImage( xInStream ); bStartProduction = true; } - break; + break; case ImageStoreLink: { @@ -756,7 +756,7 @@ Any SAL_CALL OImageControlControl::queryAggregation(const Type& _rType) throw (R } //------------------------------------------------------------------------------ -StringSequence OImageControlControl::getSupportedServiceNames() throw() +StringSequence OImageControlControl::getSupportedServiceNames() throw() { StringSequence aSupported = OBoundControl::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 1); @@ -932,7 +932,7 @@ void OImageControlControl::mousePressed(const ::com::sun::star::awt::MouseEvent& awt::Rectangle aRect( e.X, e.Y, 0, 0 ); if ( ( e.X < 0 ) || ( e.Y < 0 ) ) - { // context menu triggered by keyboard + { // context menu triggered by keyboard // position it in the center of the control // 102205 - 16.08.2002 - fs@openoffice.org Reference< XWindow > xWindow( static_cast< ::cppu::OWeakObject* >( this ), UNO_QUERY ); @@ -1019,7 +1019,7 @@ void SAL_CALL OImageControlControl::mouseExited(const awt::MouseEvent& /*e*/) th } //......................................................................... -} // namespace frm +} // namespace frm //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/component/ImageControl.hxx b/forms/source/component/ImageControl.hxx index 65c3f0dc872e..65f1a6a6a2c2 100644 --- a/forms/source/component/ImageControl.hxx +++ b/forms/source/component/ImageControl.hxx @@ -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 @@ -57,12 +57,12 @@ class OImageControlModel :public OImageControlModel_Base ,public OBoundControlModel { - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XImageProducer> m_xImageProducer; - ImageProducer* m_pImageProducer; + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XImageProducer> m_xImageProducer; + ImageProducer* m_pImageProducer; bool m_bExternalGraphic; - sal_Bool m_bReadOnly; + sal_Bool m_bReadOnly; ::rtl::OUString m_sImageURL; - ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphicObject > + ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphicObject > m_xGraphicObject; ::rtl::OUString m_sDocumentURL; @@ -129,7 +129,7 @@ protected: getControlValue( ) const; virtual void doSetControlValue( const ::com::sun::star::uno::Any& _rValue ); - virtual sal_Bool approveDbColumnType(sal_Int32 _nColumnType); + virtual sal_Bool approveDbColumnType(sal_Int32 _nColumnType); virtual void resetNoBroadcast(); @@ -195,7 +195,7 @@ public: virtual void SAL_CALL disposing(); private: - void implClearGraphics( sal_Bool _bForce ); + void implClearGraphics( sal_Bool _bForce ); bool implInsertGraphics(); /** determines whether the control does currently have an empty grahic set @@ -204,7 +204,7 @@ private: }; //......................................................................... -} // namespace frm +} // namespace frm //......................................................................... #endif // _FRM_IMAGE_CONTROL_HXX_ diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx index 3be8f97f112b..c8d0c722ccc6 100644 --- a/forms/source/component/ListBox.cxx +++ b/forms/source/component/ListBox.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 diff --git a/forms/source/component/ListBox.hxx b/forms/source/component/ListBox.hxx index cd1302c35fcc..a46442ec54b6 100644 --- a/forms/source/component/ListBox.hxx +++ b/forms/source/component/ListBox.hxx @@ -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 @@ -76,20 +76,20 @@ class OListBoxModel :public OBoundControlModel ::connectivity::ORowSetValue m_aSaveValue; // <properties> - ::com::sun::star::form::ListSourceType m_eListSourceType; // type der list source - ::com::sun::star::uno::Any m_aBoundColumn; + ::com::sun::star::form::ListSourceType m_eListSourceType; // type der list source + ::com::sun::star::uno::Any m_aBoundColumn; ValueList m_aListSourceValues; ValueList m_aBoundValues; - ::com::sun::star::uno::Sequence<sal_Int16> m_aDefaultSelectSeq; // DefaultSelected + ::com::sun::star::uno::Sequence<sal_Int16> m_aDefaultSelectSeq; // DefaultSelected // </properties> - sal_Int16 m_nNULLPos; // position of the NULL value in our list + sal_Int16 m_nNULLPos; // position of the NULL value in our list sal_Int32 m_nBoundColumnType; private: ::connectivity::ORowSetValue getFirstSelectedValue() const; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes(); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes(); public: DECLARE_DEFAULT_LEAF_XTOR( OListBoxModel ); @@ -118,7 +118,7 @@ protected: virtual void SAL_CALL setPropertyValues(const ::com::sun::star::uno::Sequence< ::rtl::OUString >& PropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Values) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XPersistObject - virtual ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); + virtual ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL @@ -154,8 +154,8 @@ protected: translateControlValueToExternalValue( ) const; virtual sal_Bool commitControlValueToDbColumn( bool _bPostReset ); - virtual void onConnectedDbColumn( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxForm ); - virtual void onDisconnectedDbColumn(); + virtual void onConnectedDbColumn( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxForm ); + virtual void onDisconnectedDbColumn(); virtual ::com::sun::star::uno::Any getDefaultForReset() const; @@ -197,7 +197,7 @@ typedef ::cppu::ImplHelper4 < ::com::sun::star::awt::XFocusListener class ChangeListeners; -class OListBoxControl :public OBoundControl +class OListBoxControl :public OBoundControl ,public OListBoxControl_BASE ,public IEventProcessor { @@ -205,8 +205,8 @@ private: ::cppu::OInterfaceContainerHelper m_aChangeListeners; ::cppu::OInterfaceContainerHelper m_aItemListeners; - ::com::sun::star::uno::Any m_aCurrentSelection; - Timer m_aChangeTimer; + ::com::sun::star::uno::Any m_aCurrentSelection; + Timer m_aChangeTimer; ::com::sun::star::uno::Reference< ::com::sun::star::awt::XListBox > m_xAggregateListBox; @@ -216,7 +216,7 @@ private: protected: // UNO Anbindung - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes(); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes(); public: OListBoxControl(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory); diff --git a/forms/source/component/Numeric.cxx b/forms/source/component/Numeric.cxx index b722c8058f4d..5dc45da96f9d 100644 --- a/forms/source/component/Numeric.cxx +++ b/forms/source/component/Numeric.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 @@ -155,15 +155,15 @@ StringSequence ONumericModel::getSupportedServiceNames() throw() void ONumericModel::describeFixedProperties( Sequence< Property >& _rProps ) const { BEGIN_DESCRIBE_PROPERTIES( 2, OEditBaseModel ) - DECL_PROP3(DEFAULT_VALUE, double, BOUND, MAYBEDEFAULT, MAYBEVOID); - DECL_PROP1(TABINDEX, sal_Int16, BOUND); + DECL_PROP3(DEFAULT_VALUE, double, BOUND, MAYBEDEFAULT, MAYBEVOID); + DECL_PROP1(TABINDEX, sal_Int16, BOUND); END_DESCRIBE_PROPERTIES(); } //------------------------------------------------------------------------------ ::rtl::OUString SAL_CALL ONumericModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException) { - return FRM_COMPONENT_NUMERICFIELD; // old (non-sun) name for compatibility ! + return FRM_COMPONENT_NUMERICFIELD; // old (non-sun) name for compatibility ! } //------------------------------------------------------------------------------ @@ -218,7 +218,7 @@ void ONumericModel::resetNoBroadcast() } //......................................................................... -} // namespace frm +} // namespace frm //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/component/Numeric.hxx b/forms/source/component/Numeric.hxx index 7cef3c7ef5bb..f87cf90081b7 100644 --- a/forms/source/component/Numeric.hxx +++ b/forms/source/component/Numeric.hxx @@ -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 @@ -43,7 +43,7 @@ class ONumericModel :public OEditBaseModel { private: - ::com::sun::star::uno::Any m_aSaveValue; + ::com::sun::star::uno::Any m_aSaveValue; protected: virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes(); @@ -93,7 +93,7 @@ public: }; //......................................................................... -} // namespace frm +} // namespace frm //......................................................................... #endif // _FORMS_NUMERIC_HXX_ diff --git a/forms/source/component/Pattern.cxx b/forms/source/component/Pattern.cxx index 1600af87649d..b600553db60f 100644 --- a/forms/source/component/Pattern.cxx +++ b/forms/source/component/Pattern.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 diff --git a/forms/source/component/Pattern.hxx b/forms/source/component/Pattern.hxx index 9460bb42fa4e..d4d09a3387aa 100644 --- a/forms/source/component/Pattern.hxx +++ b/forms/source/component/Pattern.hxx @@ -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 diff --git a/forms/source/component/RadioButton.cxx b/forms/source/component/RadioButton.cxx index abf2e33ae11b..4afd4741cea1 100644 --- a/forms/source/component/RadioButton.cxx +++ b/forms/source/component/RadioButton.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 @@ -63,7 +63,7 @@ InterfaceRef SAL_CALL ORadioButtonControl_CreateInstance(const Reference<XMultiS } //------------------------------------------------------------------------------ -StringSequence SAL_CALL ORadioButtonControl::getSupportedServiceNames() throw(RuntimeException) +StringSequence SAL_CALL ORadioButtonControl::getSupportedServiceNames() throw(RuntimeException) { StringSequence aSupported = OBoundControl::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 1); @@ -87,9 +87,9 @@ void SAL_CALL ORadioButtonControl::createPeer(const Reference<starawt::XToolkit> // switch off the auto-toggle, we do this ourself .... // (formerly this switch-off was done in the toolkit - but the correct place is here ...) -// Reference< XVclWindowPeer > xVclWindowPeer( getPeer(), UNO_QUERY ); -// if (xVclWindowPeer.is()) -// xVclWindowPeer->setProperty(::rtl::OUString::createFromAscii("AutoToggle"), ::cppu::bool2any(sal_False)); +// Reference< XVclWindowPeer > xVclWindowPeer( getPeer(), UNO_QUERY ); +// if (xVclWindowPeer.is()) +// xVclWindowPeer->setProperty(::rtl::OUString::createFromAscii("AutoToggle"), ::cppu::bool2any(sal_False)); // new order: do _not_ switch off the auto toggle because: // * today, it is not necessary anymore to handle the toggling ourself (everything works fine without it) // * without auto toggle, the AccessibleEvents as fired by the radio buttons are @@ -141,7 +141,7 @@ IMPLEMENT_DEFAULT_CLONING( ORadioButtonModel ) // XServiceInfo //------------------------------------------------------------------------------ -StringSequence SAL_CALL ORadioButtonModel::getSupportedServiceNames() throw(RuntimeException) +StringSequence SAL_CALL ORadioButtonModel::getSupportedServiceNames() throw(RuntimeException) { StringSequence aSupported = OReferenceValueComponent::getSupportedServiceNames(); @@ -179,15 +179,15 @@ void ORadioButtonModel::SetSiblingPropsTo(const ::rtl::OUString& rPropName, cons { Reference<XPropertySet> xMyProps; query_interface(static_cast<XWeak*>(this), xMyProps); - ::rtl::OUString sCurrentGroup; + ::rtl::OUString sCurrentGroup; sal_Int32 nNumSiblings = xIndexAccess->getCount(); for (sal_Int32 i=0; i<nNumSiblings; ++i) { - Reference<XPropertySet> xSiblingProperties(*(InterfaceRef*)xIndexAccess->getByIndex(i).getValue(), UNO_QUERY); + Reference<XPropertySet> xSiblingProperties(*(InterfaceRef*)xIndexAccess->getByIndex(i).getValue(), UNO_QUERY); if (!xSiblingProperties.is()) continue; if (xMyProps == xSiblingProperties) - continue; // mich selber nicht umsetzen + continue; // mich selber nicht umsetzen // nur wenn es ein Radio-Button ist if (!hasProperty(PROPERTY_CLASSID, xSiblingProperties)) @@ -212,13 +212,13 @@ void ORadioButtonModel::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, cons // if the label control changed ... if (nHandle == PROPERTY_ID_CONTROLLABEL) - { // ... forward this to our siblings + { // ... forward this to our siblings SetSiblingPropsTo(PROPERTY_CONTROLLABEL, rValue); } // wenn sich die ControlSource-Eigenschaft geaendert hat ... if (nHandle == PROPERTY_ID_CONTROLSOURCE) - { // ... muss ich allen meinen Siblings, die in der selben RadioButton-Gruppe sind wie ich, auch die + { // ... muss ich allen meinen Siblings, die in der selben RadioButton-Gruppe sind wie ich, auch die // neue ControlSource mitgeben SetSiblingPropsTo(PROPERTY_CONTROLSOURCE, rValue); } @@ -234,7 +234,7 @@ void ORadioButtonModel::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, cons sal_Int16 nValue; rValue >>= nValue; if (1 == nValue) - { // bei allen Radios der selben Gruppe das 'default checked' ruecksetzen, denn wie schon der highlander wusste : + { // bei allen Radios der selben Gruppe das 'default checked' ruecksetzen, denn wie schon der highlander wusste : // es kann nur einen geben. Any aZero; nValue = 0; @@ -259,7 +259,7 @@ void ORadioButtonModel::setControlSource() query_interface(static_cast<XWeak*>(this), xMyProps); for (sal_Int32 i=0; i<xIndexAccess->getCount(); ++i) { - Reference<XPropertySet> xSiblingProperties(*(InterfaceRef*)xIndexAccess->getByIndex(i).getValue(), UNO_QUERY); + Reference<XPropertySet> xSiblingProperties(*(InterfaceRef*)xIndexAccess->getByIndex(i).getValue(), UNO_QUERY); if (!xSiblingProperties.is()) continue; @@ -294,14 +294,14 @@ void ORadioButtonModel::setControlSource() void ORadioButtonModel::describeFixedProperties( Sequence< Property >& _rProps ) const { BEGIN_DESCRIBE_PROPERTIES( 1, OReferenceValueComponent ) - DECL_PROP1(TABINDEX, sal_Int16, BOUND); + DECL_PROP1(TABINDEX, sal_Int16, BOUND); END_DESCRIBE_PROPERTIES(); } //------------------------------------------------------------------------------ ::rtl::OUString SAL_CALL ORadioButtonModel::getServiceName() throw(RuntimeException) { - return FRM_COMPONENT_RADIOBUTTON; // old (non-sun) name for compatibility ! + return FRM_COMPONENT_RADIOBUTTON; // old (non-sun) name for compatibility ! } //------------------------------------------------------------------------------ diff --git a/forms/source/component/RadioButton.hxx b/forms/source/component/RadioButton.hxx index 0ffd8a2ba9b5..d562152ed067 100644 --- a/forms/source/component/RadioButton.hxx +++ b/forms/source/component/RadioButton.hxx @@ -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 @@ -38,21 +38,21 @@ namespace frm //================================================================== // ORadioButtonModel //================================================================== -class ORadioButtonModel :public OReferenceValueComponent +class ORadioButtonModel :public OReferenceValueComponent { public: DECLARE_DEFAULT_LEAF_XTOR( ORadioButtonModel ); // XServiceInfo IMPLEMENTATION_NAME(ORadioButtonModel); - virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // OPropertySetHelper virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception); // XPersistObject - virtual ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); + virtual ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL @@ -99,7 +99,7 @@ public: // XServiceInfo IMPLEMENTATION_NAME(ORadioButtonControl); - virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); protected: // XControl diff --git a/forms/source/component/Time.cxx b/forms/source/component/Time.cxx index 0f0bb6336b33..5918dd201dcc 100644 --- a/forms/source/component/Time.cxx +++ b/forms/source/component/Time.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 @@ -55,7 +55,7 @@ using namespace ::com::sun::star::io; using namespace ::com::sun::star::lang; //================================================================== -//= +//= //================================================================== //================================================================== @@ -169,7 +169,7 @@ IMPLEMENT_DEFAULT_CLONING( OTimeModel ) //------------------------------------------------------------------------------ ::rtl::OUString SAL_CALL OTimeModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException) { - return FRM_COMPONENT_TIMEFIELD; // old (non-sun) name for compatibility ! + return FRM_COMPONENT_TIMEFIELD; // old (non-sun) name for compatibility ! } // XPropertySet @@ -177,10 +177,10 @@ IMPLEMENT_DEFAULT_CLONING( OTimeModel ) void OTimeModel::describeFixedProperties( Sequence< Property >& _rProps ) const { BEGIN_DESCRIBE_PROPERTIES( 4, OEditBaseModel ) - DECL_PROP3(DEFAULT_TIME, sal_Int32, BOUND, MAYBEDEFAULT, MAYBEVOID); - DECL_PROP1(TABINDEX, sal_Int16, BOUND); - DECL_PROP1(FORMATKEY, sal_Int32, TRANSIENT); - DECL_IFACE_PROP2(FORMATSSUPPLIER, XNumberFormatsSupplier, READONLY, TRANSIENT); + DECL_PROP3(DEFAULT_TIME, sal_Int32, BOUND, MAYBEDEFAULT, MAYBEVOID); + DECL_PROP1(TABINDEX, sal_Int16, BOUND); + DECL_PROP1(FORMATKEY, sal_Int32, TRANSIENT); + DECL_IFACE_PROP2(FORMATSSUPPLIER, XNumberFormatsSupplier, READONLY, TRANSIENT); END_DESCRIBE_PROPERTIES(); } @@ -361,7 +361,7 @@ Sequence< Type > OTimeModel::getSupportedBindingTypes() } //......................................................................... -} // namespace frm +} // namespace frm //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/component/Time.hxx b/forms/source/component/Time.hxx index 60aadc6e5e26..5d6a8a66e59e 100644 --- a/forms/source/component/Time.hxx +++ b/forms/source/component/Time.hxx @@ -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 @@ -45,8 +45,8 @@ class OTimeModel ,public OLimitedFormats { private: - ::com::sun::star::uno::Any m_aSaveValue; - sal_Bool m_bDateTimeField; + ::com::sun::star::uno::Any m_aSaveValue; + sal_Bool m_bDateTimeField; protected: virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes(); @@ -96,7 +96,7 @@ protected: getDefaultForReset() const; virtual void resetNoBroadcast(); - virtual void onConnectedDbColumn( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxForm ); + virtual void onConnectedDbColumn( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxForm ); protected: DECLARE_XCLONEABLE(); @@ -127,7 +127,7 @@ public: }; //......................................................................... -} // namespace frm +} // namespace frm //......................................................................... #endif // _FORMS_TIME_HXX_ diff --git a/forms/source/component/cachedrowset.cxx b/forms/source/component/cachedrowset.cxx index ac277e8310ec..8d4bc6b9ef0a 100644 --- a/forms/source/component/cachedrowset.cxx +++ b/forms/source/component/cachedrowset.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 diff --git a/forms/source/component/cachedrowset.hxx b/forms/source/component/cachedrowset.hxx index 6c0ebc645367..09f3250910d9 100644 --- a/forms/source/component/cachedrowset.hxx +++ b/forms/source/component/cachedrowset.hxx @@ -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 diff --git a/forms/source/component/clickableimage.cxx b/forms/source/component/clickableimage.cxx index 2c62e7960f69..b08d9190fa9a 100644 --- a/forms/source/component/clickableimage.cxx +++ b/forms/source/component/clickableimage.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 @@ -52,7 +52,7 @@ #include <comphelper/container.hxx> #include <comphelper/listenernotification.hxx> #include <svtools/imageresourceaccess.hxx> -#define LOCAL_URL_PREFIX '#' +#define LOCAL_URL_PREFIX '#' //......................................................................... namespace frm @@ -138,7 +138,7 @@ namespace frm { m_pFeatureInterception->registerDispatchProviderInterceptor( _rxInterceptor ); } - + //-------------------------------------------------------------------- void SAL_CALL OClickableImageBaseControl::releaseDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor ) throw (RuntimeException) { @@ -282,7 +282,7 @@ namespace frm getString(xSet->getPropertyValue(PROPERTY_TARGET_URL)); if (aURL.Complete.getLength() && (LOCAL_URL_PREFIX == aURL.Complete.getStr()[0])) - { // the URL contains a local URL only. Since the URLTransformer does not handle this case correctly + { // the URL contains a local URL only. Since the URLTransformer does not handle this case correctly // (it can't: it does not know the document URL), we have to take care for this ourself. // The real solution would be to not allow such relative URLs (there is a rule that at runtime, all // URLs have to be absolute), but for compatibility reasons this is no option. @@ -489,10 +489,10 @@ namespace frm implConstruct(); // copy properties - m_eButtonType = _pOriginal->m_eButtonType; - m_sTargetURL = _pOriginal->m_sTargetURL; - m_sTargetFrame = _pOriginal->m_sTargetFrame; - m_bDispatchUrlInternal = _pOriginal->m_bDispatchUrlInternal; + m_eButtonType = _pOriginal->m_eButtonType; + m_sTargetURL = _pOriginal->m_sTargetURL; + m_sTargetFrame = _pOriginal->m_sTargetFrame; + m_bDispatchUrlInternal = _pOriginal->m_bDispatchUrlInternal; } //------------------------------------------------------------------------------ @@ -624,10 +624,10 @@ namespace frm { switch (nHandle) { - case PROPERTY_ID_BUTTONTYPE : rValue <<= m_eButtonType; break; - case PROPERTY_ID_TARGET_URL : rValue <<= m_sTargetURL; break; - case PROPERTY_ID_TARGET_FRAME : rValue <<= m_sTargetFrame; break; - case PROPERTY_ID_DISPATCHURLINTERNAL : rValue <<= m_bDispatchUrlInternal; break; + case PROPERTY_ID_BUTTONTYPE : rValue <<= m_eButtonType; break; + case PROPERTY_ID_TARGET_URL : rValue <<= m_sTargetURL; break; + case PROPERTY_ID_TARGET_FRAME : rValue <<= m_sTargetFrame; break; + case PROPERTY_ID_DISPATCHURLINTERNAL : rValue <<= m_bDispatchUrlInternal; break; default: OControlModel::getFastPropertyValue(rValue, nHandle); } @@ -692,12 +692,12 @@ namespace frm ImageProducer *pImgProd = GetImageProducer(); // grab the ImageURL rtl::OUString sURL; - getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ImageURL") ) ) >>= sURL; + getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ImageURL") ) ) >>= sURL; if (!m_pMedium) { if ( ::svt::GraphicAccess::isSupportedURL( sURL ) ) pImgProd->SetImage( sURL ); - else + else // caution: the medium may be NULL if somebody gave us a invalid URL to work with // 11/24/2000 - 79667 - FS pImgProd->SetImage(String()); @@ -739,7 +739,7 @@ namespace frm // we treat an invalid URL like we would treat no URL return; - if (rURL.getLength() && !::svt::GraphicAccess::isSupportedURL( rURL ) ) + if (rURL.getLength() && !::svt::GraphicAccess::isSupportedURL( rURL ) ) { if (m_pMedium) delete m_pMedium; @@ -897,10 +897,10 @@ namespace frm { switch (nHandle) { - case PROPERTY_ID_BUTTONTYPE : return makeAny( FormButtonType_PUSH ); - case PROPERTY_ID_TARGET_URL : - case PROPERTY_ID_TARGET_FRAME : return makeAny( ::rtl::OUString() ); - case PROPERTY_ID_DISPATCHURLINTERNAL : return makeAny( sal_False ); + case PROPERTY_ID_BUTTONTYPE : return makeAny( FormButtonType_PUSH ); + case PROPERTY_ID_TARGET_URL : + case PROPERTY_ID_TARGET_FRAME : return makeAny( ::rtl::OUString() ); + case PROPERTY_ID_DISPATCHURLINTERNAL : return makeAny( sal_False ); default: return OControlModel::getPropertyDefaultByHandle(nHandle); } diff --git a/forms/source/component/clickableimage.hxx b/forms/source/component/clickableimage.hxx index 816a2aeb827d..9091d8b23765 100644 --- a/forms/source/component/clickableimage.hxx +++ b/forms/source/component/clickableimage.hxx @@ -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 @@ -67,17 +67,17 @@ namespace frm ,public OPropertyChangeListener { protected: - ::com::sun::star::form::FormButtonType m_eButtonType; // Art des Buttons (push,submit,reset) - ::rtl::OUString m_sTargetURL; // URL fuer den URL-Button - ::rtl::OUString m_sTargetFrame; // TargetFrame zum Oeffnen + ::com::sun::star::form::FormButtonType m_eButtonType; // Art des Buttons (push,submit,reset) + ::rtl::OUString m_sTargetURL; // URL fuer den URL-Button + ::rtl::OUString m_sTargetFrame; // TargetFrame zum Oeffnen // ImageProducer stuff - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XImageProducer> m_xProducer; - SfxMedium* m_pMedium; // Download-Medium - ImageProducer* m_pProducer; - sal_Bool m_bDispatchUrlInternal; // property: is not allowed to set : 1 - sal_Bool m_bDownloading : 1; // laeuft ein Download? - sal_Bool m_bProdStarted : 1; + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XImageProducer> m_xProducer; + SfxMedium* m_pMedium; // Download-Medium + ImageProducer* m_pProducer; + sal_Bool m_bDispatchUrlInternal; // property: is not allowed to set : 1 + sal_Bool m_bDownloading : 1; // laeuft ein Download? + sal_Bool m_bProdStarted : 1; // XSubmission stuff ::com::sun::star::uno::Reference< ::com::sun::star::form::submission::XSubmission > @@ -96,7 +96,7 @@ namespace frm ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes(); inline sal_Bool isDispatchUrlInternal() const { return m_bDispatchUrlInternal; } - inline void setDispatchUrlInternal(sal_Bool _bDispatch) { m_bDispatchUrlInternal = _bDispatch; } + inline void setDispatchUrlInternal(sal_Bool _bDispatch) { m_bDispatchUrlInternal = _bDispatch; } public: DECLARE_DEFAULT_XTOR( OClickableImageBaseModel ); @@ -289,7 +289,7 @@ namespace frm }; //......................................................................... -} // namespace frm +} // namespace frm //......................................................................... #endif // FORMS_SOURCE_CLICKABLEIMAGE_HXX diff --git a/forms/source/component/cloneable.cxx b/forms/source/component/cloneable.cxx index 368c3b701d02..8b876f6319ab 100644 --- a/forms/source/component/cloneable.cxx +++ b/forms/source/component/cloneable.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 @@ -48,8 +48,8 @@ namespace frm //------------------------------------------------------------------ Reference< XAggregation > OCloneableAggregation::createAggregateClone( const OCloneableAggregation* _pOriginal ) { - Reference< XCloneable > xAggregateCloneable; // will be the aggregate's XCloneable - Reference< XAggregation > xAggregateClone; // will be the aggregate's clone + Reference< XCloneable > xAggregateCloneable; // will be the aggregate's XCloneable + Reference< XAggregation > xAggregateClone; // will be the aggregate's clone if ( query_aggregation( _pOriginal->m_xAggregate, xAggregateCloneable ) ) { @@ -64,7 +64,7 @@ namespace frm } //......................................................................... -} // namespace frm +} // namespace frm //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/component/entrylisthelper.cxx b/forms/source/component/entrylisthelper.cxx index c894f3fce150..1d24c68674a2 100644 --- a/forms/source/component/entrylisthelper.cxx +++ b/forms/source/component/entrylisthelper.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 diff --git a/forms/source/component/entrylisthelper.hxx b/forms/source/component/entrylisthelper.hxx index 64f99feb740f..1713ffe24660 100644 --- a/forms/source/component/entrylisthelper.hxx +++ b/forms/source/component/entrylisthelper.hxx @@ -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 @@ -53,7 +53,7 @@ namespace frm typedef ::cppu::ImplHelper3 < ::com::sun::star::form::binding::XListEntrySink , ::com::sun::star::form::binding::XListEntryListener , ::com::sun::star::util::XRefreshable - > OEntryListHelper_BASE; + > OEntryListHelper_BASE; class OEntryListHelper : public OEntryListHelper_BASE { diff --git a/forms/source/component/errorbroadcaster.cxx b/forms/source/component/errorbroadcaster.cxx index 40d1afd06c22..575a65d461eb 100644 --- a/forms/source/component/errorbroadcaster.cxx +++ b/forms/source/component/errorbroadcaster.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 @@ -109,7 +109,7 @@ namespace frm } //......................................................................... -} // namespace frm +} // namespace frm //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/component/errorbroadcaster.hxx b/forms/source/component/errorbroadcaster.hxx index 86e96c1fce7e..38a808322ae0 100644 --- a/forms/source/component/errorbroadcaster.hxx +++ b/forms/source/component/errorbroadcaster.hxx @@ -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 @@ -43,14 +43,14 @@ namespace frm //===================================================================== //= OErrorBroadcaster //===================================================================== - typedef ::cppu::ImplHelper1 < ::com::sun::star::sdb::XSQLErrorBroadcaster - > OErrorBroadcaster_BASE; + typedef ::cppu::ImplHelper1 < ::com::sun::star::sdb::XSQLErrorBroadcaster + > OErrorBroadcaster_BASE; class OErrorBroadcaster : public OErrorBroadcaster_BASE { private: - ::cppu::OBroadcastHelper& m_rBHelper; - ::cppu::OInterfaceContainerHelper m_aErrorListeners; + ::cppu::OBroadcastHelper& m_rBHelper; + ::cppu::OInterfaceContainerHelper m_aErrorListeners; protected: OErrorBroadcaster( ::cppu::OBroadcastHelper& _rBHelper ); @@ -68,7 +68,7 @@ namespace frm }; //......................................................................... -} // namespace frm +} // namespace frm //......................................................................... #endif // FORMS_ERRORBROADCASTER_HXX diff --git a/forms/source/component/findpos.cxx b/forms/source/component/findpos.cxx index 86c07c080113..40732f806e97 100644 --- a/forms/source/component/findpos.cxx +++ b/forms/source/component/findpos.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 diff --git a/forms/source/component/findpos.hxx b/forms/source/component/findpos.hxx index 28d33311ae9b..1a583a909026 100644 --- a/forms/source/component/findpos.hxx +++ b/forms/source/component/findpos.hxx @@ -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 diff --git a/forms/source/component/formcontrolfont.cxx b/forms/source/component/formcontrolfont.cxx index f1488c85846a..518b48e76f4a 100644 --- a/forms/source/component/formcontrolfont.cxx +++ b/forms/source/component/formcontrolfont.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 diff --git a/forms/source/component/imgprod.cxx b/forms/source/component/imgprod.cxx index ceeeccaffa79..d168678dadd6 100644 --- a/forms/source/component/imgprod.cxx +++ b/forms/source/component/imgprod.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 @@ -47,8 +47,8 @@ class ImgProdLockBytes : public SvLockBytes { - ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > xStmRef; - ::com::sun::star::uno::Sequence<sal_Int8> maSeq; + ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > xStmRef; + ::com::sun::star::uno::Sequence<sal_Int8> maSeq; ImgProdLockBytes() {}; @@ -56,13 +56,13 @@ public: ImgProdLockBytes( SvStream* pStm, sal_Bool bOwner ); ImgProdLockBytes( ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > & rStreamRef ); - virtual ~ImgProdLockBytes(); + virtual ~ImgProdLockBytes(); - virtual ErrCode ReadAt( sal_Size nPos, void* pBuffer, sal_Size nCount, sal_Size* pRead ) const; - virtual ErrCode WriteAt( sal_Size nPos, const void* pBuffer, sal_Size nCount, sal_Size* pWritten ); - virtual ErrCode Flush() const; - virtual ErrCode SetSize( sal_Size nSize ); - virtual ErrCode Stat( SvLockBytesStat*, SvLockBytesStatFlag ) const; + virtual ErrCode ReadAt( sal_Size nPos, void* pBuffer, sal_Size nCount, sal_Size* pRead ) const; + virtual ErrCode WriteAt( sal_Size nPos, const void* pBuffer, sal_Size nCount, sal_Size* pWritten ); + virtual ErrCode Flush() const; + virtual ErrCode SetSize( sal_Size nSize ); + virtual ErrCode Stat( SvLockBytesStat*, SvLockBytesStatFlag ) const; }; // ------------------------------------------------------------------------ @@ -79,13 +79,13 @@ ImgProdLockBytes::ImgProdLockBytes( ::com::sun::star::uno::Reference< ::com::sun { if( xStmRef.is() ) { - const sal_uInt32 nBytesToRead = 65535; - sal_uInt32 nRead; + const sal_uInt32 nBytesToRead = 65535; + sal_uInt32 nRead; do { ::com::sun::star::uno::Sequence< sal_Int8 > aReadSeq; - + nRead = xStmRef->readSomeBytes( aReadSeq, nBytesToRead ); if( nRead ) @@ -188,8 +188,8 @@ ErrCode ImgProdLockBytes::Stat( SvLockBytesStat* pStat, SvLockBytesStatFlag eFla // ----------------- ImageProducer::ImageProducer() : - mpStm ( NULL ), - mbConsInit ( sal_False ) + mpStm ( NULL ), + mbConsInit ( sal_False ) { mpGraphic = new Graphic; DBG_ASSERT( Application::GetFilterHdl().IsSet(), "ImageProducer::ImageProducer(): No filter handler set" ); @@ -333,8 +333,8 @@ void ImageProducer::startProduction() throw(::com::sun::star::uno::RuntimeExcept if ( bNotifyEmptyGraphics ) { // reset image - List aTmp; - void* pCons; + List aTmp; + void* pCons; // create temporary list to hold interfaces for( pCons = maConsList.First(); pCons; pCons = maConsList.Next() ) @@ -382,8 +382,8 @@ void ImageProducer::ImplUpdateData( const Graphic& rGraphic ) if( mbConsInit && maConsList.Count() ) { - List aTmp; - void* pCons; + List aTmp; + void* pCons; ImplUpdateConsumer( rGraphic ); mbConsInit = sal_False; @@ -406,10 +406,10 @@ void ImageProducer::ImplUpdateData( const Graphic& rGraphic ) void ImageProducer::ImplInitConsumer( const Graphic& rGraphic ) { - Bitmap aBmp( rGraphic.GetBitmapEx().GetBitmap() ); - BitmapReadAccess* pBmpAcc = aBmp.AcquireReadAccess(); + Bitmap aBmp( rGraphic.GetBitmapEx().GetBitmap() ); + BitmapReadAccess* pBmpAcc = aBmp.AcquireReadAccess(); - if( pBmpAcc ) + if( pBmpAcc ) { List aTmp; void * pCons; @@ -418,7 +418,7 @@ void ImageProducer::ImplInitConsumer( const Graphic& rGraphic ) sal_uInt32 nGMask = 0; sal_uInt32 nBMask = 0; sal_uInt32 nAMask = 0; - ::com::sun::star::uno::Sequence< sal_Int32 > aRGBPal; + ::com::sun::star::uno::Sequence< sal_Int32 > aRGBPal; if( pBmpAcc->HasPalette() ) { @@ -427,7 +427,7 @@ void ImageProducer::ImplInitConsumer( const Graphic& rGraphic ) if( nPalCount ) { aRGBPal = ::com::sun::star::uno::Sequence< sal_Int32 >( nPalCount + 1 ); - + sal_Int32* pTmp = aRGBPal.getArray(); for( sal_uInt32 i = 0; i < nPalCount; i++, pTmp++ ) @@ -485,24 +485,24 @@ void ImageProducer::ImplInitConsumer( const Graphic& rGraphic ) void ImageProducer::ImplUpdateConsumer( const Graphic& rGraphic ) { - BitmapEx aBmpEx( rGraphic.GetBitmapEx() ); - Bitmap aBmp( aBmpEx.GetBitmap() ); - BitmapReadAccess* pBmpAcc = aBmp.AcquireReadAccess(); + BitmapEx aBmpEx( rGraphic.GetBitmapEx() ); + Bitmap aBmp( aBmpEx.GetBitmap() ); + BitmapReadAccess* pBmpAcc = aBmp.AcquireReadAccess(); if( pBmpAcc ) { - List aTmp; - void* pCons; - Bitmap aMask( aBmpEx.GetMask() ); - BitmapReadAccess* pMskAcc = !!aMask ? aMask.AcquireReadAccess() : NULL; - const long nWidth = pBmpAcc->Width(); - const long nHeight = pBmpAcc->Height(); - const long nStartX = 0L; - const long nEndX = nWidth - 1L; - const long nStartY = 0L; - const long nEndY = nHeight - 1L; - const long nPartWidth = nEndX - nStartX + 1; - const long nPartHeight = nEndY - nStartY + 1; + List aTmp; + void* pCons; + Bitmap aMask( aBmpEx.GetMask() ); + BitmapReadAccess* pMskAcc = !!aMask ? aMask.AcquireReadAccess() : NULL; + const long nWidth = pBmpAcc->Width(); + const long nHeight = pBmpAcc->Height(); + const long nStartX = 0L; + const long nEndX = nWidth - 1L; + const long nStartY = 0L; + const long nEndY = nHeight - 1L; + const long nPartWidth = nEndX - nStartX + 1; + const long nPartHeight = nEndY - nStartY + 1; if( !pMskAcc ) { @@ -521,8 +521,8 @@ void ImageProducer::ImplUpdateConsumer( const Graphic& rGraphic ) if( mnTransIndex < 256 ) { - ::com::sun::star::uno::Sequence<sal_Int8> aData( nPartWidth * nPartHeight ); - sal_Int8* pTmp = aData.getArray(); + ::com::sun::star::uno::Sequence<sal_Int8> aData( nPartWidth * nPartHeight ); + sal_Int8* pTmp = aData.getArray(); for( long nY = nStartY; nY <= nEndY; nY++ ) { @@ -543,8 +543,8 @@ void ImageProducer::ImplUpdateConsumer( const Graphic& rGraphic ) } else { - ::com::sun::star::uno::Sequence<sal_Int32> aData( nPartWidth * nPartHeight ); - sal_Int32* pTmp = aData.getArray(); + ::com::sun::star::uno::Sequence<sal_Int32> aData( nPartWidth * nPartHeight ); + sal_Int32* pTmp = aData.getArray(); for( long nY = nStartY; nY <= nEndY; nY++ ) { @@ -565,9 +565,9 @@ void ImageProducer::ImplUpdateConsumer( const Graphic& rGraphic ) } else { - ::com::sun::star::uno::Sequence<sal_Int32> aData( nPartWidth * nPartHeight ); - const BitmapColor aWhite( pMskAcc->GetBestMatchingColor( Color( COL_WHITE ) ) ); - sal_Int32* pTmp = aData.getArray(); + ::com::sun::star::uno::Sequence<sal_Int32> aData( nPartWidth * nPartHeight ); + const BitmapColor aWhite( pMskAcc->GetBestMatchingColor( Color( COL_WHITE ) ) ); + sal_Int32* pTmp = aData.getArray(); for( long nY = nStartY; nY <= nEndY; nY++ ) { diff --git a/forms/source/component/imgprod.hxx b/forms/source/component/imgprod.hxx index ee949ce56575..d6ec50c58f58 100644 --- a/forms/source/component/imgprod.hxx +++ b/forms/source/component/imgprod.hxx @@ -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 @@ -55,45 +55,45 @@ namespace com { namespace sun { namespace star { namespace io { }}}} -class ImageProducer : public ::com::sun::star::awt::XImageProducer, - public ::com::sun::star::lang::XInitialization, +class ImageProducer : public ::com::sun::star::awt::XImageProducer, + public ::com::sun::star::lang::XInitialization, public ::cppu::OWeakObject { private: - ::rtl::OUString maURL; - List maConsList; - Graphic* mpGraphic; - SvStream* mpStm; - sal_uInt32 mnTransIndex; - sal_Bool mbConsInit; + ::rtl::OUString maURL; + List maConsList; + Graphic* mpGraphic; + SvStream* mpStm; + sal_uInt32 mnTransIndex; + sal_Bool mbConsInit; Link maDoneHdl; - sal_Bool ImplImportGraphic( Graphic& rGraphic ); - void ImplUpdateData( const Graphic& rGraphic ); - void ImplInitConsumer( const Graphic& rGraphic ); - void ImplUpdateConsumer( const Graphic& rGraphic ); + sal_Bool ImplImportGraphic( Graphic& rGraphic ); + void ImplUpdateData( const Graphic& rGraphic ); + void ImplInitConsumer( const Graphic& rGraphic ); + void ImplUpdateConsumer( const Graphic& rGraphic ); public: ImageProducer(); ~ImageProducer(); - void SetImage( const ::rtl::OUString& rPath ); - void SetImage( SvStream& rStm ); + void SetImage( const ::rtl::OUString& rPath ); + void SetImage( SvStream& rStm ); - void NewDataAvailable(); + void NewDataAvailable(); void SetDoneHdl( const Link& i_rHdl ) { maDoneHdl = i_rHdl; } const Link& GetDoneHdl() const { return maDoneHdl; } // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL acquire() throw() { OWeakObject::acquire(); } - void SAL_CALL release() throw() { OWeakObject::release(); } - + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL acquire() throw() { OWeakObject::acquire(); } + void SAL_CALL release() throw() { OWeakObject::release(); } + // MT: ??? - void setImage( ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > & rStmRef ); + void setImage( ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > & rStmRef ); // ::com::sun::star::awt::XImageProducer void SAL_CALL addConsumer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XImageConsumer >& rxConsumer ) throw(::com::sun::star::uno::RuntimeException); diff --git a/forms/source/component/navigationbar.cxx b/forms/source/component/navigationbar.cxx index 7799779d4b3f..c0c38b083d0a 100644 --- a/forms/source/component/navigationbar.cxx +++ b/forms/source/component/navigationbar.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 @@ -170,7 +170,7 @@ namespace frm IMPLEMENT_DEFAULT_CLONING( ONavigationBarModel ) //------------------------------------------------------------------ - ::rtl::OUString SAL_CALL ONavigationBarModel::getImplementationName() throw(RuntimeException) + ::rtl::OUString SAL_CALL ONavigationBarModel::getImplementationName() throw(RuntimeException) { return getImplementationName_Static(); } @@ -182,7 +182,7 @@ namespace frm } //------------------------------------------------------------------ - ::rtl::OUString SAL_CALL ONavigationBarModel::getImplementationName_Static() + ::rtl::OUString SAL_CALL ONavigationBarModel::getImplementationName_Static() { return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.form.ONavigationBarModel" ) ); } diff --git a/forms/source/component/navigationbar.hxx b/forms/source/component/navigationbar.hxx index e410a13c64f6..4af073777748 100644 --- a/forms/source/component/navigationbar.hxx +++ b/forms/source/component/navigationbar.hxx @@ -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 @@ -51,7 +51,7 @@ namespace frm //================================================================== typedef ::cppu::ImplHelper1 < ::com::sun::star::awt::XControlModel > ONavigationBarModel_BASE; - + class ONavigationBarModel :public OControlModel ,public FontControlModel @@ -81,9 +81,9 @@ namespace frm DECLARE_DEFAULT_LEAF_XTOR( ONavigationBarModel ); // XServiceInfo - static version - static ::rtl::OUString SAL_CALL getImplementationName_Static(); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_Static(); - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory ); + static ::rtl::OUString SAL_CALL getImplementationName_Static(); + static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_Static(); + static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory ); protected: // UNO @@ -91,7 +91,7 @@ namespace frm virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); + virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XTypeProvider diff --git a/forms/source/component/propertybaghelper.cxx b/forms/source/component/propertybaghelper.cxx index 508c05ac5ca1..0d439bad7b11 100644 --- a/forms/source/component/propertybaghelper.cxx +++ b/forms/source/component/propertybaghelper.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 diff --git a/forms/source/component/refvaluecomponent.cxx b/forms/source/component/refvaluecomponent.cxx index ab32ff5bcce3..e23b0fc00685 100644 --- a/forms/source/component/refvaluecomponent.cxx +++ b/forms/source/component/refvaluecomponent.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 @@ -48,7 +48,7 @@ namespace frm using namespace ::com::sun::star::form::binding; //==================================================================== - //= + //= //==================================================================== //-------------------------------------------------------------------- OReferenceValueComponent::OReferenceValueComponent( const Reference< XMultiServiceFactory>& _rxFactory, const ::rtl::OUString& _rUnoControlModelTypeName, const ::rtl::OUString& _rDefault, sal_Bool _bSupportNoCheckRefValue ) @@ -59,7 +59,7 @@ namespace frm } //-------------------------------------------------------------------- - OReferenceValueComponent::OReferenceValueComponent( const OReferenceValueComponent* _pOriginal, const Reference< XMultiServiceFactory>& _rxFactory ) + OReferenceValueComponent::OReferenceValueComponent( const OReferenceValueComponent* _pOriginal, const Reference< XMultiServiceFactory>& _rxFactory ) :OBoundControlModel( _pOriginal, _rxFactory ) { m_sReferenceValue = _pOriginal->m_sReferenceValue; @@ -99,7 +99,7 @@ namespace frm OBoundControlModel::getFastPropertyValue( _rValue, _nHandle ); } } - + //-------------------------------------------------------------------- void SAL_CALL OReferenceValueComponent::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) throw (Exception) { @@ -128,7 +128,7 @@ namespace frm OBoundControlModel::setFastPropertyValue_NoBroadcast( _nHandle, _rValue ); } } - + //-------------------------------------------------------------------- sal_Bool SAL_CALL OReferenceValueComponent::convertFastPropertyValue( Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue ) throw (IllegalArgumentException) { @@ -154,7 +154,7 @@ namespace frm } return bModified; } - + //------------------------------------------------------------------------------ Any OReferenceValueComponent::getDefaultForReset() const { diff --git a/forms/source/component/refvaluecomponent.hxx b/forms/source/component/refvaluecomponent.hxx index f88fb5e93f41..bb56ba8b4a69 100644 --- a/forms/source/component/refvaluecomponent.hxx +++ b/forms/source/component/refvaluecomponent.hxx @@ -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 @@ -51,7 +51,7 @@ namespace frm // <properties> ::rtl::OUString m_sReferenceValue; // the reference value to use for data exchange ::rtl::OUString m_sNoCheckReferenceValue; // the reference value to be exchanged when the control is not checked - ToggleState m_eDefaultChecked; // the default check state + ToggleState m_eDefaultChecked; // the default check state // </properties> sal_Bool m_bSupportSecondRefValue; // do we support the SecondaryRefValue property? diff --git a/forms/source/component/scrollbar.cxx b/forms/source/component/scrollbar.cxx index 98c47b258d51..13c509859407 100644 --- a/forms/source/component/scrollbar.cxx +++ b/forms/source/component/scrollbar.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 @@ -57,7 +57,7 @@ namespace frm //= helper //==================================================================== //-------------------------------------------------------------------- - Any translateExternalDoubleToControlIntValue( + Any translateExternalDoubleToControlIntValue( const Any& _rExternalValue, const Reference< XPropertySet >& _rxProperties, const ::rtl::OUString& _rMinValueName, const ::rtl::OUString& _rMaxValueName ) { @@ -297,7 +297,7 @@ namespace frm //-------------------------------------------------------------------- Any OScrollBarModel::translateExternalValueToControlValue( const Any& _rExternalValue ) const { - return translateExternalDoubleToControlIntValue( _rExternalValue, m_xAggregateSet, + return translateExternalDoubleToControlIntValue( _rExternalValue, m_xAggregateSet, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ScrollValueMin" ) ), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ScrollValueMax" ) ) ); } diff --git a/forms/source/component/scrollbar.hxx b/forms/source/component/scrollbar.hxx index 93a946268a14..a7b4e323fa50 100644 --- a/forms/source/component/scrollbar.hxx +++ b/forms/source/component/scrollbar.hxx @@ -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 diff --git a/forms/source/component/spinbutton.cxx b/forms/source/component/spinbutton.cxx index 06c6d4f63618..9d3232022dc8 100644 --- a/forms/source/component/spinbutton.cxx +++ b/forms/source/component/spinbutton.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 @@ -56,7 +56,7 @@ namespace frm //= OSpinButtonModel //==================================================================== // implemented elsewhere - Any translateExternalDoubleToControlIntValue( + Any translateExternalDoubleToControlIntValue( const Any& _rExternalValue, const Reference< XPropertySet >& _rxProperties, const ::rtl::OUString& _rMinValueName, const ::rtl::OUString& _rMaxValueName ); Any translateControlIntToExternalDoubleValue( const Any& _rControlIntValue ); @@ -253,7 +253,7 @@ namespace frm //-------------------------------------------------------------------- Any OSpinButtonModel::translateExternalValueToControlValue( const Any& _rExternalValue ) const { - return translateExternalDoubleToControlIntValue( _rExternalValue, m_xAggregateSet, + return translateExternalDoubleToControlIntValue( _rExternalValue, m_xAggregateSet, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SpinValueMin" ) ), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SpinValueMax" ) ) ); } diff --git a/forms/source/component/spinbutton.hxx b/forms/source/component/spinbutton.hxx index 2b811ab97459..54348e580d44 100644 --- a/forms/source/component/spinbutton.hxx +++ b/forms/source/component/spinbutton.hxx @@ -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 diff --git a/forms/source/helper/commanddescriptionprovider.cxx b/forms/source/helper/commanddescriptionprovider.cxx index 292528db1d53..e61810f607ce 100644 --- a/forms/source/helper/commanddescriptionprovider.cxx +++ b/forms/source/helper/commanddescriptionprovider.cxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * 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 diff --git a/forms/source/helper/commandimageprovider.cxx b/forms/source/helper/commandimageprovider.cxx index c8025bb66f1a..504ead723f40 100644 --- a/forms/source/helper/commandimageprovider.cxx +++ b/forms/source/helper/commandimageprovider.cxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * 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 diff --git a/forms/source/helper/controlfeatureinterception.cxx b/forms/source/helper/controlfeatureinterception.cxx index 78746c7f4918..0a292e969878 100644 --- a/forms/source/helper/controlfeatureinterception.cxx +++ b/forms/source/helper/controlfeatureinterception.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 @@ -76,7 +76,7 @@ namespace frm m_xFirstDispatchInterceptor->setMasterDispatchProvider( NULL ); // it's the first of the interceptor chain } - + //-------------------------------------------------------------------- void SAL_CALL ControlFeatureInterception::releaseDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor ) throw (RuntimeException ) { @@ -89,7 +89,7 @@ namespace frm Reference< XDispatchProviderInterceptor > xChainWalk( m_xFirstDispatchInterceptor ); if ( m_xFirstDispatchInterceptor == _rxInterceptor ) - { // our chain will have a new first element + { // our chain will have a new first element Reference< XDispatchProviderInterceptor > xSlave( m_xFirstDispatchInterceptor->getSlaveDispatchProvider(), UNO_QUERY ); m_xFirstDispatchInterceptor = xSlave; } diff --git a/forms/source/helper/formnavigation.cxx b/forms/source/helper/formnavigation.cxx index 5ac563e63373..7394fcaadec8 100644 --- a/forms/source/helper/formnavigation.cxx +++ b/forms/source/helper/formnavigation.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 @@ -166,7 +166,7 @@ namespace frm void OFormNavigationHelper::updateDispatches() { if ( !m_nConnectedFeatures ) - { // we don't have any dispatchers yet -> do the initial connect + { // we don't have any dispatchers yet -> do the initial connect connectDispatchers(); return; } @@ -211,7 +211,7 @@ namespace frm void OFormNavigationHelper::connectDispatchers() { if ( m_nConnectedFeatures ) - { // already connected -> just do an update + { // already connected -> just do an update updateDispatches(); return; } @@ -251,7 +251,7 @@ namespace frm { if ( aFeature->second.xDispatcher.is() ) aFeature->second.xDispatcher->removeStatusListener( static_cast< XStatusListener* >( this ), aFeature->second.aURL ); - + aFeature->second.xDispatcher = NULL; aFeature->second.bCachedState = sal_False; aFeature->second.aCachedAdditionalState.clear(); diff --git a/forms/source/helper/resettable.cxx b/forms/source/helper/resettable.cxx index 4748d74f68df..94380fe7c5a5 100644 --- a/forms/source/helper/resettable.cxx +++ b/forms/source/helper/resettable.cxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * 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 diff --git a/forms/source/helper/urltransformer.cxx b/forms/source/helper/urltransformer.cxx index 852fd5483ddd..8788fa6bde1f 100644 --- a/forms/source/helper/urltransformer.cxx +++ b/forms/source/helper/urltransformer.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 diff --git a/forms/source/helper/windowstateguard.cxx b/forms/source/helper/windowstateguard.cxx index a35ebd68ff44..f20e9c5caf2b 100644 --- a/forms/source/helper/windowstateguard.cxx +++ b/forms/source/helper/windowstateguard.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 @@ -153,32 +153,32 @@ namespace frm ::osl::MutexGuard aGuard( m_aMutex ); impl_ensureEnabledState_nothrow(); } - + //-------------------------------------------------------------------- void SAL_CALL WindowStateGuard_Impl::windowDisabled( const EventObject& /*e*/ ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); impl_ensureEnabledState_nothrow(); } - + //-------------------------------------------------------------------- void SAL_CALL WindowStateGuard_Impl::windowResized( const WindowEvent& /*e*/ ) throw (RuntimeException) { // not interested in } - + //-------------------------------------------------------------------- void SAL_CALL WindowStateGuard_Impl::windowMoved( const WindowEvent& /*e*/ ) throw (RuntimeException) { // not interested in } - + //-------------------------------------------------------------------- void SAL_CALL WindowStateGuard_Impl::windowShown( const EventObject& /*e*/ ) throw (RuntimeException) { // not interested in } - + //-------------------------------------------------------------------- void SAL_CALL WindowStateGuard_Impl::windowHidden( const EventObject& /*e*/ ) throw (RuntimeException) { diff --git a/forms/source/inc/FormComponent.hxx b/forms/source/inc/FormComponent.hxx index d9f009ce21ae..a51426d441f6 100644 --- a/forms/source/inc/FormComponent.hxx +++ b/forms/source/inc/FormComponent.hxx @@ -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 @@ -102,7 +102,7 @@ namespace frm virtual void SAL_CALL read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); \ // old macro for quickly implementing XServiceInfo::getImplementationName - #define IMPLEMENTATION_NAME(ImplName) \ + #define IMPLEMENTATION_NAME(ImplName) \ virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException) \ { return ::rtl::OUString::createFromAscii("com.sun.star.comp.forms.") + ::rtl::OUString::createFromAscii(#ImplName); } @@ -168,17 +168,17 @@ namespace frm //= OControl //= base class for form layer controls //========================================================================= -typedef ::cppu::ImplHelper3 < ::com::sun::star::awt::XControl - , ::com::sun::star::lang::XEventListener - , ::com::sun::star::lang::XServiceInfo +typedef ::cppu::ImplHelper3 < ::com::sun::star::awt::XControl + , ::com::sun::star::lang::XEventListener + , ::com::sun::star::lang::XServiceInfo > OControl_BASE; -class OControl :public ::cppu::OComponentHelper +class OControl :public ::cppu::OComponentHelper ,public OControl_BASE { protected: ::osl::Mutex m_aMutex; - OImplementationIdsRef m_aHoldIdHelper; + OImplementationIdsRef m_aHoldIdHelper; ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > m_xControl; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation> @@ -232,16 +232,16 @@ protected: if you passed <FALSE/> to the <arg>_bSetDelegator</arg> parameter of the <type>OControl</type> constructor. */ - void doSetDelegator(); - void doResetDelegator(); + void doSetDelegator(); + void doResetDelegator(); // UNO DECLARE_UNO3_AGG_DEFAULTS(OControl, OComponentHelper); virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw(::com::sun::star::uno::RuntimeException); // XTypeProvider - virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); // OComponentHelper virtual void SAL_CALL disposing(); @@ -258,27 +258,27 @@ protected: virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual sal_Bool SAL_CALL supportsService(const ::rtl::OUString& ServiceName) throw (::com::sun::star::uno::RuntimeException); - virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException) = 0; + virtual sal_Bool SAL_CALL supportsService(const ::rtl::OUString& ServiceName) throw (::com::sun::star::uno::RuntimeException); + virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException) = 0; // XServiceInfo - static version - static StringSequence SAL_CALL getSupportedServiceNames_Static() throw(::com::sun::star::uno::RuntimeException); + static StringSequence SAL_CALL getSupportedServiceNames_Static() throw(::com::sun::star::uno::RuntimeException); // XControl - virtual void SAL_CALL setContext(const InterfaceRef& Context) throw (::com::sun::star::uno::RuntimeException); - virtual InterfaceRef SAL_CALL getContext() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL createPeer(const ::com::sun::star::uno::Reference<starawt::XToolkit>& Toolkit, const ::com::sun::star::uno::Reference<starawt::XWindowPeer>& Parent) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference<starawt::XWindowPeer> SAL_CALL getPeer() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL setModel(const ::com::sun::star::uno::Reference<starawt::XControlModel>& Model) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference<starawt::XControlModel> SAL_CALL getModel() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference<starawt::XView> SAL_CALL getView() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setDesignMode(sal_Bool bOn) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isDesignMode() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isTransparent() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setContext(const InterfaceRef& Context) throw (::com::sun::star::uno::RuntimeException); + virtual InterfaceRef SAL_CALL getContext() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL createPeer(const ::com::sun::star::uno::Reference<starawt::XToolkit>& Toolkit, const ::com::sun::star::uno::Reference<starawt::XWindowPeer>& Parent) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference<starawt::XWindowPeer> SAL_CALL getPeer() throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL setModel(const ::com::sun::star::uno::Reference<starawt::XControlModel>& Model) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference<starawt::XControlModel> SAL_CALL getModel() throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference<starawt::XView> SAL_CALL getView() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setDesignMode(sal_Bool bOn) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL isDesignMode() throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL isTransparent() throw (::com::sun::star::uno::RuntimeException); protected: - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes(); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes(); // overwrite this and call the base class if you have additional types ::com::sun::star::uno::Sequence< ::rtl::OUString > getAggregateServiceNames(); @@ -293,11 +293,11 @@ private: //================================================================== typedef ::cppu::ImplHelper1 < ::com::sun::star::form::XBoundControl > OBoundControl_BASE; -class OBoundControl :public OControl +class OBoundControl :public OControl ,public OBoundControl_BASE { protected: - sal_Bool m_bLocked : 1; + sal_Bool m_bLocked : 1; ::rtl::OUString m_sOriginalHelpText; // as long as the text/value is invalid, we change the help text of our peer ::com::sun::star::awt::FontDescriptor @@ -317,8 +317,8 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw(::com::sun::star::uno::RuntimeException); // XBoundControl - virtual sal_Bool SAL_CALL getLock() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setLock(sal_Bool _bLock) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL getLock() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setLock(sal_Bool _bLock) throw(::com::sun::star::uno::RuntimeException); // default implementation just disables the controls, overwrite _setLock to change this behaviour // XControl @@ -331,9 +331,9 @@ public: virtual void SAL_CALL disposing(); protected: - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes(); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes(); // implement the lock setting - virtual void _setLock(sal_Bool _bLock); + virtual void _setLock(sal_Bool _bLock); }; //================================================================== @@ -341,16 +341,16 @@ protected: //= model of a form layer control //================================================================== -typedef ::cppu::ImplHelper7 < ::com::sun::star::form::XFormComponent - , ::com::sun::star::io::XPersistObject - , ::com::sun::star::container::XNamed - , ::com::sun::star::lang::XServiceInfo - , ::com::sun::star::util::XCloneable - , ::com::sun::star::beans::XPropertyContainer - , ::com::sun::star::beans::XPropertyAccess - > OControlModel_BASE; +typedef ::cppu::ImplHelper7 < ::com::sun::star::form::XFormComponent + , ::com::sun::star::io::XPersistObject + , ::com::sun::star::container::XNamed + , ::com::sun::star::lang::XServiceInfo + , ::com::sun::star::util::XCloneable + , ::com::sun::star::beans::XPropertyContainer + , ::com::sun::star::beans::XPropertyAccess + > OControlModel_BASE; -class OControlModel :public ::cppu::OComponentHelper +class OControlModel :public ::cppu::OComponentHelper ,public OPropertySetAggregationHelper ,public OControlModel_BASE ,public OCloneableAggregation @@ -363,39 +363,39 @@ protected: ::osl::Mutex m_aMutex; oslInterlockedCount m_lockCount; - InterfaceRef m_xParent; // ParentComponent - OImplementationIdsRef m_aHoldIdHelper; + InterfaceRef m_xParent; // ParentComponent + OImplementationIdsRef m_aHoldIdHelper; PropertyBagHelper m_aPropertyBagHelper; const ::comphelper::ComponentContext& getContext() const { return m_aContext; } // <properties> - ::rtl::OUString m_aName; // name of the control - ::rtl::OUString m_aTag; // tag for additional data - sal_Int16 m_nTabIndex; // index within the taborder - sal_Int16 m_nClassId; // type of the control + ::rtl::OUString m_aName; // name of the control + ::rtl::OUString m_aTag; // tag for additional data + sal_Int16 m_nTabIndex; // index within the taborder + sal_Int16 m_nClassId; // type of the control sal_Bool m_bNativeLook; // should the control use the native platform look? // </properties> protected: OControlModel( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rFactory, // factory to create the aggregate with - const ::rtl::OUString& _rUnoControlModelTypeName, // service name of te model to aggregate - const ::rtl::OUString& rDefault = ::rtl::OUString(), // service name of the default control - const sal_Bool _bSetDelegator = sal_True // set to FALSE if you want to call setDelegator later (after returning from this ctor) + const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rFactory, // factory to create the aggregate with + const ::rtl::OUString& _rUnoControlModelTypeName, // service name of te model to aggregate + const ::rtl::OUString& rDefault = ::rtl::OUString(), // service name of the default control + const sal_Bool _bSetDelegator = sal_True // set to FALSE if you want to call setDelegator later (after returning from this ctor) ); OControlModel( - const OControlModel* _pOriginal, // the original object to clone - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rFactory, // factory to create the aggregate with + const OControlModel* _pOriginal, // the original object to clone + const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rFactory, // factory to create the aggregate with const sal_Bool _bCloneAggregate = sal_True, // should the aggregate of the original be cloned, too? - const sal_Bool _bSetDelegator = sal_True // set to FALSE if you want to call setDelegator later (after returning from this ctor) + const sal_Bool _bSetDelegator = sal_True // set to FALSE if you want to call setDelegator later (after returning from this ctor) ); virtual ~OControlModel(); /** to be called after a OBoundControlModel (a derivee, respectively) has been cloned - + <p>This method contains late initializations which cannot be done in the constructor of this base class, since the virtual method of derived classes do not yet work there.</p> @@ -404,13 +404,13 @@ protected: using OComponentHelper::rBHelper; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes(); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes(); - void readHelpTextCompatibly(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream >& _rxInStream); - void writeHelpTextCompatibly(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream >& _rxOutStream); + void readHelpTextCompatibly(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream >& _rxInStream); + void writeHelpTextCompatibly(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream >& _rxOutStream); - void doSetDelegator(); - void doResetDelegator(); + void doSetDelegator(); + void doResetDelegator(); ::com::sun::star::uno::Sequence< ::rtl::OUString > getAggregateServiceNames(); @@ -419,34 +419,34 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw (::com::sun::star::uno::RuntimeException); // XTypeProvider - virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); // OComponentHelper virtual void SAL_CALL disposing(); // XNamed - virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName(const ::rtl::OUString& aName) throw(::com::sun::star::uno::RuntimeException); + virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setName(const ::rtl::OUString& aName) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual sal_Bool SAL_CALL supportsService(const ::rtl::OUString& ServiceName) throw (::com::sun::star::uno::RuntimeException); - virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException) = 0; + virtual sal_Bool SAL_CALL supportsService(const ::rtl::OUString& ServiceName) throw (::com::sun::star::uno::RuntimeException); + virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException) = 0; // XSericeInfo - static version(s) - static StringSequence SAL_CALL getSupportedServiceNames_Static() throw(::com::sun::star::uno::RuntimeException); + static StringSequence SAL_CALL getSupportedServiceNames_Static() throw(::com::sun::star::uno::RuntimeException); // XPersistObject - virtual ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException) = 0; + virtual ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException) = 0; virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); // XChild (base of XFormComponent) - virtual InterfaceRef SAL_CALL getParent() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setParent(const InterfaceRef& Parent) throw(::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); + virtual InterfaceRef SAL_CALL getParent() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setParent(const InterfaceRef& Parent) throw(::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); // XEventListener virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw (::com::sun::star::uno::RuntimeException); @@ -461,8 +461,8 @@ public: using ::cppu::OPropertySetHelper::getFastPropertyValue; // ::com::sun::star::beans::XPropertyState - virtual ::com::sun::star::beans::PropertyState getPropertyStateByHandle(sal_Int32 nHandle); - virtual void setPropertyToDefaultByHandle(sal_Int32 nHandle); + virtual ::com::sun::star::beans::PropertyState getPropertyStateByHandle(sal_Int32 nHandle); + virtual void setPropertyToDefaultByHandle(sal_Int32 nHandle); virtual ::com::sun::star::uno::Any getPropertyDefaultByHandle( sal_Int32 nHandle ) const; // XCloneable @@ -538,18 +538,18 @@ public: //================================================================== // simple destructor -#define DECLARE_DEFAULT_DTOR( classname ) \ +#define DECLARE_DEFAULT_DTOR( classname ) \ ~classname() \ // constructor for cloning a class #define DECLARE_DEFAULT_CLONE_CTOR( classname ) \ classname( \ const classname* _pOriginal, \ - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory \ + const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory \ ); \ // all xtors for an inner class of the object hierarchy -#define DECLARE_DEFAULT_XTOR( classname ) \ +#define DECLARE_DEFAULT_XTOR( classname ) \ classname( \ const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory, \ const ::rtl::OUString& _rUnoControlModelTypeName, \ @@ -559,7 +559,7 @@ public: DECLARE_DEFAULT_DTOR( classname ) \ // all xtors for an inner class of the object hierarchy which is *bound* -#define DECLARE_DEFAULT_BOUND_XTOR( classname ) \ +#define DECLARE_DEFAULT_BOUND_XTOR( classname ) \ classname( \ const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory, \ const ::rtl::OUString& _rUnoControlModelTypeName, \ @@ -571,7 +571,7 @@ public: DECLARE_DEFAULT_DTOR( classname ) \ // all xtors for a leas class of the object hierarchy -#define DECLARE_DEFAULT_LEAF_XTOR( classname ) \ +#define DECLARE_DEFAULT_LEAF_XTOR( classname ) \ classname( \ const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory \ ); \ @@ -598,11 +598,11 @@ public: //= OBoundControlModel //= model of a form layer control which is bound to a data source field //================================================================== -typedef ::cppu::ImplHelper4 < ::com::sun::star::form::XLoadListener +typedef ::cppu::ImplHelper4 < ::com::sun::star::form::XLoadListener , ::com::sun::star::form::XReset - , ::com::sun::star::beans::XPropertyChangeListener - , ::com::sun::star::sdb::XRowSetChangeListener - > OBoundControlModel_BASE1; + , ::com::sun::star::beans::XPropertyChangeListener + , ::com::sun::star::sdb::XRowSetChangeListener + > OBoundControlModel_BASE1; // separated into an own base class since derivees can disable the support for this // interface, thus we want to easily exclude it in the queryInterface and getTypes @@ -619,7 +619,7 @@ typedef ::cppu::ImplHelper2 < ::com::sun::star::form::validation::XValidityCon , ::com::sun::star::form::validation::XValidatableFormComponent > OBoundControlModel_VALIDATION; -class OBoundControlModel :public OControlModel +class OBoundControlModel :public OControlModel ,public OBoundControlModel_BASE1 ,public OBoundControlModel_COMMITTING ,public OBoundControlModel_BINDING @@ -641,7 +641,7 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::form::XLoadable > m_xAmbientForm; - ::rtl::OUString m_sValuePropertyName; + ::rtl::OUString m_sValuePropertyName; sal_Int32 m_nValuePropertyAggregateHandle; sal_Int32 m_nFieldType; ::com::sun::star::uno::Type m_aValuePropertyType; @@ -658,9 +658,9 @@ private: ::com::sun::star::uno::Type m_aExternalValueType; // <properties> - ::rtl::OUString m_aControlSource; // Datenquelle, Name des Feldes + ::rtl::OUString m_aControlSource; // Datenquelle, Name des Feldes ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > - m_xLabelControl; // reference to a sibling control (model) which is our label + m_xLabelControl; // reference to a sibling control (model) which is our label sal_Bool m_bInputRequired; // </properties> @@ -668,13 +668,13 @@ private: m_pAggPropMultiplexer; bool m_bFormListening : 1; // are we currently a XLoadListener at our ambient form? - sal_Bool m_bLoaded : 1; - sal_Bool m_bRequired : 1; - const sal_Bool m_bCommitable : 1; // do we support XBoundComponent? + sal_Bool m_bLoaded : 1; + sal_Bool m_bRequired : 1; + const sal_Bool m_bCommitable : 1; // do we support XBoundComponent? const sal_Bool m_bSupportsExternalBinding : 1; // do we support XBindableValue? - const sal_Bool m_bSupportsValidation : 1; // do we support XValidatable? - sal_Bool m_bForwardValueChanges : 1; // do we currently handle changes in the bound database field? - sal_Bool m_bTransferingValue : 1; // true if we're currently transfering our value to an external binding + const sal_Bool m_bSupportsValidation : 1; // do we support XValidatable? + sal_Bool m_bForwardValueChanges : 1; // do we currently handle changes in the bound database field? + sal_Bool m_bTransferingValue : 1; // true if we're currently transfering our value to an external binding sal_Bool m_bIsCurrentValueValid : 1; // flag specifying whether our current value is valid, relative to our external validator sal_Bool m_bBindingControlsRO : 1; // is our ReadOnly property currently controlled by our external binding? sal_Bool m_bBindingControlsEnable : 1; // is our Enabled property currently controlled by our external binding? @@ -682,7 +682,7 @@ private: ValueChangeInstigator m_eControlValueChangeInstigator; protected: - ::rtl::OUString m_aLabelServiceName; + ::rtl::OUString m_aLabelServiceName; // when setting the label for our control (property FM_PROP_CONTROLLABEL, member m_xLabelControl), // we accept only objects supporting an XControlModel interface, an XServiceInfo interface and // support for a service (XServiceInfo::supportsService) determined by this string. @@ -708,14 +708,14 @@ protected: OBoundControlModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rFactory, // factory to create the aggregate with - const ::rtl::OUString& _rUnoControlModelTypeName, // service name of te model to aggregate - const ::rtl::OUString& _rDefault, // service name of the default control - const sal_Bool _bCommitable, // is the control (model) commitable ? + const ::rtl::OUString& _rUnoControlModelTypeName, // service name of te model to aggregate + const ::rtl::OUString& _rDefault, // service name of the default control + const sal_Bool _bCommitable, // is the control (model) commitable ? const sal_Bool _bSupportExternalBinding, // set to TRUE if you want to support XBindableValue const sal_Bool _bSupportsValidation // set to TRUE if you want to support XValidatable ); OBoundControlModel( - const OBoundControlModel* _pOriginal, // the original object to clone + const OBoundControlModel* _pOriginal, // the original object to clone const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rFactory // factory to create the aggregate with ); @@ -953,12 +953,12 @@ protected: */ virtual void onDisconnectedValidator( ); - /** nFieldType ist der Typ des Feldes, an das das Model gebunden werden soll. + /** nFieldType ist der Typ des Feldes, an das das Model gebunden werden soll. Das Binden erfolgt genau dann, wenn Rueckgabewert sal_True. Die Standard-Implementation erlaubt alles ausser den drei binary-Typen und FieldType_OTHER. */ - virtual sal_Bool approveDbColumnType(sal_Int32 _nColumnType); + virtual sal_Bool approveDbColumnType(sal_Int32 _nColumnType); /** retrieves the current value of the control, in a shape which can be used with our external validator. @@ -986,10 +986,10 @@ protected: (unfortunally). So derived classes may use the following to methods. They secure the written data with marks, so any new common properties in newer versions will be skipped by older ones. */ - void writeCommonProperties(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream); - void readCommonProperties(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream); + void writeCommonProperties(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream); + void readCommonProperties(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream); // the next method may be used in derived classes's read when an unknown version is encountered - void defaultCommonProperties(); + void defaultCommonProperties(); /** called to reset the control to some kind of default. @@ -1004,7 +1004,7 @@ protected: */ virtual void resetNoBroadcast(); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes(); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes(); /// sets m_xField to the given new value, without notifying our listeners void impl_setField_noNotify( @@ -1047,7 +1047,7 @@ public: virtual StringSequence SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - static version - static StringSequence SAL_CALL getSupportedServiceNames_Static() throw(::com::sun::star::uno::RuntimeException); + static StringSequence SAL_CALL getSupportedServiceNames_Static() throw(::com::sun::star::uno::RuntimeException); // XChild virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw(::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); @@ -1264,7 +1264,7 @@ private: @precond our mutex is currently locked exactly once */ - void connectValidator( + void connectValidator( const ::com::sun::star::uno::Reference< ::com::sun::star::form::validation::XValidator >& _rxValidator ); diff --git a/forms/source/inc/InterfaceContainer.hxx b/forms/source/inc/InterfaceContainer.hxx index 57f530765a37..ebe3a67039d8 100644 --- a/forms/source/inc/InterfaceContainer.hxx +++ b/forms/source/inc/InterfaceContainer.hxx @@ -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 @@ -69,18 +69,18 @@ namespace frm struct ElementDescription { public: - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xInterface; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xPropertySet; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XChild > xChild; - ::com::sun::star::uno::Any aElementTypeInterface; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xInterface; + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xPropertySet; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XChild > xChild; + ::com::sun::star::uno::Any aElementTypeInterface; public: ElementDescription( ); virtual ~ElementDescription(); private: - ElementDescription( const ElementDescription& ); // never implemented - ElementDescription& operator=( const ElementDescription& ); // never implemented + ElementDescription( const ElementDescription& ); // never implemented + ElementDescription& operator=( const ElementDescription& ); // never implemented }; typedef ::std::vector<InterfaceRef> OInterfaceArray; @@ -100,22 +100,22 @@ typedef ::cppu::ImplHelper8 < ::com::sun::star::container::XNameContainer , ::com::sun::star::util::XCloneable > OInterfaceContainer_BASE; -class OInterfaceContainer : public OInterfaceContainer_BASE +class OInterfaceContainer : public OInterfaceContainer_BASE { protected: - ::osl::Mutex& m_rMutex; + ::osl::Mutex& m_rMutex; - OInterfaceArray m_aItems; - OInterfaceMap m_aMap; - ::cppu::OInterfaceContainerHelper m_aContainerListeners; + OInterfaceArray m_aItems; + OInterfaceMap m_aMap; + ::cppu::OInterfaceContainerHelper m_aContainerListeners; const ::com::sun::star::uno::Type m_aElementType; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory> m_xServiceFactory; + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory> m_xServiceFactory; // EventManager - ::com::sun::star::uno::Reference< ::com::sun::star::script::XEventAttacherManager> m_xEventAttacher; + ::com::sun::star::uno::Reference< ::com::sun::star::script::XEventAttacherManager> m_xEventAttacher; public: OInterfaceContainer( @@ -247,7 +247,7 @@ protected: @precond <arg>_nIndex</arg> is a valid index @precond our mutex is locked exactly once, by the guard specified with <arg>_rClearBeforeNotify</arg> - + */ void implReplaceByIndex( const sal_Int32 _nIndex, @@ -259,7 +259,7 @@ protected: @precond <arg>_nIndex</arg> is a valid index @precond our mutex is locked exactly once, by the guard specified with <arg>_rClearBeforeNotify</arg> - + */ void implRemoveByIndex( const sal_Int32 _nIndex, @@ -282,7 +282,7 @@ private: efVersionSO5x, efVersionSO6x }; - void transformEvents( const EventFormat _eTargetFormat ); + void transformEvents( const EventFormat _eTargetFormat ); void impl_createEventAttacher_nothrow(); }; @@ -298,8 +298,8 @@ class OFormComponents :public FormComponentsBase ,public OFormComponents_BASE { protected: - ::osl::Mutex m_aMutex; - ::comphelper::InterfaceRef m_xParent; + ::osl::Mutex m_aMutex; + ::comphelper::InterfaceRef m_xParent; public: OFormComponents(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory); @@ -322,7 +322,7 @@ public: using OInterfaceContainer::disposing; }; //......................................................................... -} // namespace frm +} // namespace frm //......................................................................... #endif // _FRM_INTERFACE_CONTAINER_HXX_ diff --git a/forms/source/inc/cloneable.hxx b/forms/source/inc/cloneable.hxx index 5500d6dac708..d08caa881137 100644 --- a/forms/source/inc/cloneable.hxx +++ b/forms/source/inc/cloneable.hxx @@ -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 @@ -42,14 +42,14 @@ namespace frm class OCloneableAggregation { protected: - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation> m_xAggregate; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation> m_xAggregate; protected: static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation > createAggregateClone( const OCloneableAggregation* _pOriginal ); }; //......................................................................... -} // namespace frm +} // namespace frm //......................................................................... #endif // FORMS_COMPONENT_CLONEABLE_HXX diff --git a/forms/source/inc/commanddescriptionprovider.hxx b/forms/source/inc/commanddescriptionprovider.hxx index 702040b1b284..986f24a79a3d 100644 --- a/forms/source/inc/commanddescriptionprovider.hxx +++ b/forms/source/inc/commanddescriptionprovider.hxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * 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 diff --git a/forms/source/inc/commandimageprovider.hxx b/forms/source/inc/commandimageprovider.hxx index 8fece35e50e9..f17b72283350 100644 --- a/forms/source/inc/commandimageprovider.hxx +++ b/forms/source/inc/commandimageprovider.hxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * 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 diff --git a/forms/source/inc/componenttools.hxx b/forms/source/inc/componenttools.hxx index 6632e59858dc..8b20881e585f 100644 --- a/forms/source/inc/componenttools.hxx +++ b/forms/source/inc/componenttools.hxx @@ -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 diff --git a/forms/source/inc/controlfeatureinterception.hxx b/forms/source/inc/controlfeatureinterception.hxx index d3c9aa3c91e3..9bb80965688c 100644 --- a/forms/source/inc/controlfeatureinterception.hxx +++ b/forms/source/inc/controlfeatureinterception.hxx @@ -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 diff --git a/forms/source/inc/featuredispatcher.hxx b/forms/source/inc/featuredispatcher.hxx index 760a8c4b6455..bca3431d6bcf 100644 --- a/forms/source/inc/featuredispatcher.hxx +++ b/forms/source/inc/featuredispatcher.hxx @@ -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 diff --git a/forms/source/inc/formcontrolfont.hxx b/forms/source/inc/formcontrolfont.hxx index 1a6df9d30ce3..1460aa0cff1a 100644 --- a/forms/source/inc/formcontrolfont.hxx +++ b/forms/source/inc/formcontrolfont.hxx @@ -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 @@ -47,9 +47,9 @@ namespace frm private: // <properties> ::com::sun::star::awt::FontDescriptor m_aFont; - sal_Int16 m_nFontRelief; - sal_Int16 m_nFontEmphasis; - ::com::sun::star::uno::Any m_aTextLineColor; + sal_Int16 m_nFontRelief; + sal_Int16 m_nFontEmphasis; + ::com::sun::star::uno::Any m_aTextLineColor; ::com::sun::star::uno::Any m_aTextColor; // </properties> diff --git a/forms/source/inc/formnavigation.hxx b/forms/source/inc/formnavigation.hxx index 6e56e4f54519..095ecba2c9ac 100644 --- a/forms/source/inc/formnavigation.hxx +++ b/forms/source/inc/formnavigation.hxx @@ -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 diff --git a/forms/source/inc/forms_module.hxx b/forms/source/inc/forms_module.hxx index 866de89fab6c..6eed7b8fe477 100644 --- a/forms/source/inc/forms_module.hxx +++ b/forms/source/inc/forms_module.hxx @@ -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 @@ -68,24 +68,24 @@ namespace FORMS_MODULE_NAMESPACE protected: // auto registration administration - static ::com::sun::star::uno::Sequence< ::rtl::OUString >* + static ::com::sun::star::uno::Sequence< ::rtl::OUString >* s_pImplementationNames; - static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > >* + static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > >* s_pSupportedServices; - static ::com::sun::star::uno::Sequence< sal_Int64 >* + static ::com::sun::star::uno::Sequence< sal_Int64 >* s_pCreationFunctionPointers; - static ::com::sun::star::uno::Sequence< sal_Int64 >* + static ::com::sun::star::uno::Sequence< sal_Int64 >* s_pFactoryFunctionPointers; public: /** register a component implementing a service with the given data. - @param _rImplementationName + @param _rImplementationName the implementation name of the component - @param _rServiceNames + @param _rServiceNames the services the component supports - @param _pCreateFunction + @param _pCreateFunction a function for creating an instance of the component - @param _pFactoryFunction + @param _pFactoryFunction a function for creating a factory for that component @see revokeComponent */ @@ -96,7 +96,7 @@ namespace FORMS_MODULE_NAMESPACE FactoryInstantiation _pFactoryFunction); /** revoke the registration for the specified component - @param _rImplementationName + @param _rImplementationName the implementation name of the component */ static void revokeComponent( @@ -106,9 +106,9 @@ namespace FORMS_MODULE_NAMESPACE <p>writes the registration information of all components which are currently registered into the specified registry.<p/> <p>Usually used from within component_writeInfo.<p/> - @param _rxServiceManager + @param _rxServiceManager the service manager - @param _rRootKey + @param _rRootKey the registry key under which the information will be stored @return sal_True if the registration of all implementations was successfull, sal_False otherwise @@ -119,9 +119,9 @@ namespace FORMS_MODULE_NAMESPACE /** creates a Factory for the component with the given implementation name. <p>Usually used from within component_getFactory.<p/> - @param _rxServiceManager + @param _rxServiceManager a pointer to an XMultiServiceFactory interface as got in component_getFactory - @param _pImplementationName + @param _pImplementationName the implementation name of the component @return the XInterface access to a factory for the component @@ -329,7 +329,7 @@ namespace FORMS_MODULE_NAMESPACE } \ //......................................................................... -} // namespace FORMS_MODULE_NAMESPACE +} // namespace FORMS_MODULE_NAMESPACE //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/inc/forms_module_impl.hxx b/forms/source/inc/forms_module_impl.hxx index 3269eec68df0..cef7914ca96f 100644 --- a/forms/source/inc/forms_module_impl.hxx +++ b/forms/source/inc/forms_module_impl.hxx @@ -28,10 +28,10 @@ namespace FORMS_MODULE_NAMESPACE //- registration helper //-------------------------------------------------------------------------- - Sequence< ::rtl::OUString >* OFormsModule::s_pImplementationNames = NULL; - Sequence< Sequence< ::rtl::OUString > >* OFormsModule::s_pSupportedServices = NULL; - Sequence< sal_Int64 >* OFormsModule::s_pCreationFunctionPointers = NULL; - Sequence< sal_Int64 >* OFormsModule::s_pFactoryFunctionPointers = NULL; + Sequence< ::rtl::OUString >* OFormsModule::s_pImplementationNames = NULL; + Sequence< Sequence< ::rtl::OUString > >* OFormsModule::s_pSupportedServices = NULL; + Sequence< sal_Int64 >* OFormsModule::s_pCreationFunctionPointers = NULL; + Sequence< sal_Int64 >* OFormsModule::s_pFactoryFunctionPointers = NULL; //-------------------------------------------------------------------------- void OFormsModule::registerComponent( @@ -52,9 +52,9 @@ namespace FORMS_MODULE_NAMESPACE OSL_ENSURE(s_pImplementationNames && s_pSupportedServices && s_pCreationFunctionPointers && s_pFactoryFunctionPointers, "OFormsModule::registerComponent : inconsistent state (the pointers (2)) !"); - OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength()) - && (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength()) - && (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()), + OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength()) + && (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength()) + && (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()), "OFormsModule::registerComponent : inconsistent state !"); sal_Int32 nOldLen = s_pImplementationNames->getLength(); @@ -79,9 +79,9 @@ namespace FORMS_MODULE_NAMESPACE } OSL_ENSURE(s_pImplementationNames && s_pSupportedServices && s_pCreationFunctionPointers && s_pFactoryFunctionPointers, "OFormsModule::revokeComponent : inconsistent state (the pointers) !"); - OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength()) - && (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength()) - && (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()), + OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength()) + && (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength()) + && (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()), "OFormsModule::revokeComponent : inconsistent state !"); sal_Int32 nLen = s_pImplementationNames->getLength(); @@ -121,9 +121,9 @@ namespace FORMS_MODULE_NAMESPACE } OSL_ENSURE(s_pImplementationNames && s_pSupportedServices && s_pCreationFunctionPointers && s_pFactoryFunctionPointers, "OFormsModule::writeComponentInfos : inconsistent state (the pointers) !"); - OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength()) - && (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength()) - && (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()), + OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength()) + && (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength()) + && (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()), "OFormsModule::writeComponentInfos : inconsistent state !"); sal_Int32 nLen = s_pImplementationNames->getLength(); @@ -170,9 +170,9 @@ namespace FORMS_MODULE_NAMESPACE } OSL_ENSURE(s_pImplementationNames && s_pSupportedServices && s_pCreationFunctionPointers && s_pFactoryFunctionPointers, "OFormsModule::getComponentFactory : inconsistent state (the pointers) !"); - OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength()) - && (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength()) - && (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()), + OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength()) + && (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength()) + && (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()), "OFormsModule::getComponentFactory : inconsistent state !"); diff --git a/forms/source/inc/frm_module.hxx b/forms/source/inc/frm_module.hxx index 0a5342f2bcff..9ed02c2345bc 100644 --- a/forms/source/inc/frm_module.hxx +++ b/forms/source/inc/frm_module.hxx @@ -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 diff --git a/forms/source/inc/frm_resource.hrc b/forms/source/inc/frm_resource.hrc index a35707cb1708..3e7ef035bed6 100644 --- a/forms/source/inc/frm_resource.hrc +++ b/forms/source/inc/frm_resource.hrc @@ -1,7 +1,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 @@ -33,29 +33,29 @@ #endif //------------------------------------------------------------------------------ -#define RID_FRM_STRINGS_START RID_FORMLAYER_START +#define RID_FRM_STRINGS_START RID_FORMLAYER_START //------------------------------------------------------------------------------ //- String-IDs -#define RID_BASELISTBOX_ERROR_FILLLIST ( RID_FRM_STRINGS_START + 0 ) -#define RID_STR_IMPORT_GRAPHIC ( RID_FRM_STRINGS_START + 1 ) -#define RID_STR_CONTROL_SUBSTITUTED_NAME ( RID_FRM_STRINGS_START + 2 ) -#define RID_STR_CONTROL_SUBSTITUTED_EPXPLAIN ( RID_FRM_STRINGS_START + 3 ) -#define RID_STR_READERROR ( RID_FRM_STRINGS_START + 4 ) -#define RID_STR_CONNECTERROR ( RID_FRM_STRINGS_START + 5 ) -#define RID_ERR_LOADING_FORM ( RID_FRM_STRINGS_START + 6 ) -#define RID_ERR_REFRESHING_FORM ( RID_FRM_STRINGS_START + 7 ) -#define RID_STR_ERR_INSERTRECORD ( RID_FRM_STRINGS_START + 8 ) -#define RID_STR_ERR_UPDATERECORD ( RID_FRM_STRINGS_START + 9 ) -#define RID_STR_ERR_DELETERECORD ( RID_FRM_STRINGS_START + 10 ) -#define RID_STR_ERR_DELETERECORDS ( RID_FRM_STRINGS_START + 11 ) -#define RID_STR_NEED_NON_NULL_OBJECT ( RID_FRM_STRINGS_START + 12 ) -#define RID_STR_OPEN_GRAPHICS ( RID_FRM_STRINGS_START + 13 ) -#define RID_STR_CLEAR_GRAPHICS ( RID_FRM_STRINGS_START + 14 ) -#define RID_STR_INVALIDSTREAM ( RID_FRM_STRINGS_START + 15 ) -#define RID_STR_SYNTAXERROR ( RID_FRM_STRINGS_START + 16 ) +#define RID_BASELISTBOX_ERROR_FILLLIST ( RID_FRM_STRINGS_START + 0 ) +#define RID_STR_IMPORT_GRAPHIC ( RID_FRM_STRINGS_START + 1 ) +#define RID_STR_CONTROL_SUBSTITUTED_NAME ( RID_FRM_STRINGS_START + 2 ) +#define RID_STR_CONTROL_SUBSTITUTED_EPXPLAIN ( RID_FRM_STRINGS_START + 3 ) +#define RID_STR_READERROR ( RID_FRM_STRINGS_START + 4 ) +#define RID_STR_CONNECTERROR ( RID_FRM_STRINGS_START + 5 ) +#define RID_ERR_LOADING_FORM ( RID_FRM_STRINGS_START + 6 ) +#define RID_ERR_REFRESHING_FORM ( RID_FRM_STRINGS_START + 7 ) +#define RID_STR_ERR_INSERTRECORD ( RID_FRM_STRINGS_START + 8 ) +#define RID_STR_ERR_UPDATERECORD ( RID_FRM_STRINGS_START + 9 ) +#define RID_STR_ERR_DELETERECORD ( RID_FRM_STRINGS_START + 10 ) +#define RID_STR_ERR_DELETERECORDS ( RID_FRM_STRINGS_START + 11 ) +#define RID_STR_NEED_NON_NULL_OBJECT ( RID_FRM_STRINGS_START + 12 ) +#define RID_STR_OPEN_GRAPHICS ( RID_FRM_STRINGS_START + 13 ) +#define RID_STR_CLEAR_GRAPHICS ( RID_FRM_STRINGS_START + 14 ) +#define RID_STR_INVALIDSTREAM ( RID_FRM_STRINGS_START + 15 ) +#define RID_STR_SYNTAXERROR ( RID_FRM_STRINGS_START + 16 ) #define RID_STR_INCOMPATIBLE_TYPES ( RID_FRM_STRINGS_START + 17 ) #define RID_STR_INVALID_VALIDATOR ( RID_FRM_STRINGS_START + 18 ) #define RID_STR_LABEL_RECORD ( RID_FRM_STRINGS_START + 19 ) diff --git a/forms/source/inc/frm_resource.hxx b/forms/source/inc/frm_resource.hxx index 503a0050e4e6..bb217960d46c 100644 --- a/forms/source/inc/frm_resource.hxx +++ b/forms/source/inc/frm_resource.hxx @@ -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 @@ -44,7 +44,7 @@ namespace frm //================================================================== class ResourceManager { - static SimpleResMgr* m_pImpl; + static SimpleResMgr* m_pImpl; private: // no instantiation allowed diff --git a/forms/source/inc/frm_strings.hxx b/forms/source/inc/frm_strings.hxx index 57d4ff9bccd5..98c4fa634487 100644 --- a/forms/source/inc/frm_strings.hxx +++ b/forms/source/inc/frm_strings.hxx @@ -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 @@ -39,17 +39,17 @@ namespace frm struct ConstAsciiString { - const sal_Char* ascii; - sal_Int32 length; + const sal_Char* ascii; + sal_Int32 length; - inline operator ::rtl::OUString () const; - inline operator const sal_Char* () const { return ascii; } + inline operator ::rtl::OUString () const; + inline operator const sal_Char* () const { return ascii; } inline ConstAsciiString(const sal_Char* _pAsciiZeroTerminated, const sal_Int32 _nLength); inline ~ConstAsciiString(); private: - mutable ::rtl::OUString* ustring; + mutable ::rtl::OUString* ustring; }; //------------------------------------------------------------ diff --git a/forms/source/inc/ids.hxx b/forms/source/inc/ids.hxx index db009f959b44..204713ea9263 100644 --- a/forms/source/inc/ids.hxx +++ b/forms/source/inc/ids.hxx @@ -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 diff --git a/forms/source/inc/limitedformats.hxx b/forms/source/inc/limitedformats.hxx index 92e4d49e0034..6c75a5bed4e7 100644 --- a/forms/source/inc/limitedformats.hxx +++ b/forms/source/inc/limitedformats.hxx @@ -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 @@ -49,14 +49,14 @@ namespace frm class OLimitedFormats { private: - static sal_Int32 s_nInstanceCount; - static ::osl::Mutex s_aMutex; + static sal_Int32 s_nInstanceCount; + static ::osl::Mutex s_aMutex; static ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > s_xStandardFormats; protected: - sal_Int32 m_nFormatEnumPropertyHandle; - const sal_Int16 m_nTableId; + sal_Int32 m_nFormatEnumPropertyHandle; + const sal_Int16 m_nTableId; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XFastPropertySet > m_xAggregate; @@ -78,19 +78,19 @@ namespace frm ); protected: - void getFormatKeyPropertyValue( ::com::sun::star::uno::Any& _rValue ) const; - sal_Bool convertFormatKeyPropertyValue( + void getFormatKeyPropertyValue( ::com::sun::star::uno::Any& _rValue ) const; + sal_Bool convertFormatKeyPropertyValue( ::com::sun::star::uno::Any& _rConvertedValue, ::com::sun::star::uno::Any& _rOldValue, - const ::com::sun::star::uno::Any& _rNewValue + const ::com::sun::star::uno::Any& _rNewValue ); - void setFormatKeyPropertyValue( const ::com::sun::star::uno::Any& _rNewValue ); + void setFormatKeyPropertyValue( const ::com::sun::star::uno::Any& _rNewValue ); // setFormatKeyPropertyValue should only be called with a value got from convertFormatKeyPropertyValue! ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > getFormatsSupplier() const { return s_xStandardFormats; } - private: + private: void acquireSupplier(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB); void releaseSupplier(); @@ -99,7 +99,7 @@ namespace frm }; //......................................................................... -} // namespace frm +} // namespace frm //......................................................................... #endif // _FORMS_LIMITED_FORMATS_HXX_ diff --git a/forms/source/inc/listenercontainers.hxx b/forms/source/inc/listenercontainers.hxx index 59f8c3a604ef..4c12b69c8cb5 100644 --- a/forms/source/inc/listenercontainers.hxx +++ b/forms/source/inc/listenercontainers.hxx @@ -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 diff --git a/forms/source/inc/property.hrc b/forms/source/inc/property.hrc index b0216f4f63b6..8ba6e87a48f2 100644 --- a/forms/source/inc/property.hrc +++ b/forms/source/inc/property.hrc @@ -1,7 +1,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 diff --git a/forms/source/inc/property.hxx b/forms/source/inc/property.hxx index d12a0d030e61..35e8162bb505 100644 --- a/forms/source/inc/property.hxx +++ b/forms/source/inc/property.hxx @@ -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 @@ -59,8 +59,8 @@ class PropertyInfoService //.................................................................. struct PropertyAssignment { - ::rtl::OUString sName; - sal_Int32 nHandle; + ::rtl::OUString sName; + sal_Int32 nHandle; PropertyAssignment() { nHandle = -1; } PropertyAssignment(const PropertyAssignment& _rSource) @@ -71,7 +71,7 @@ class PropertyInfoService }; DECLARE_STL_VECTOR(PropertyAssignment, PropertyMap); - static PropertyMap s_AllKnownProperties; + static PropertyMap s_AllKnownProperties; //.................................................................. // comparing two PropertyAssignment's @@ -94,8 +94,8 @@ public: PropertyInfoService() { } public: - static sal_Int32 getPropertyId(const ::rtl::OUString& _rName); - static ::rtl::OUString getPropertyName(sal_Int32 _nHandle); + static sal_Int32 getPropertyId(const ::rtl::OUString& _rName); + static ::rtl::OUString getPropertyName(sal_Int32 _nHandle); private: static void initialize(); @@ -106,7 +106,7 @@ private: class ConcreteInfoService : public ::comphelper::IPropertyInfoService { public: - virtual sal_Int32 getPreferedPropertyId(const ::rtl::OUString& _rName); + virtual sal_Int32 getPreferedPropertyId(const ::rtl::OUString& _rName); }; //------------------------------------------------------------------------------ @@ -122,79 +122,79 @@ public: *pProperties++ = com::sun::star::beans::Property(PROPERTY_##varname, PROPERTY_ID_##varname, ::getCppuType(reinterpret_cast< com::sun::star::uno::Reference< type >* >(NULL)), //------------------------------------------------------------------------------ -#define BEGIN_DESCRIBE_PROPERTIES( count, baseclass ) \ +#define BEGIN_DESCRIBE_PROPERTIES( count, baseclass ) \ baseclass::describeFixedProperties( _rProps ); \ sal_Int32 nOldCount = _rProps.getLength(); \ - _rProps.realloc( nOldCount + ( count ) ); \ + _rProps.realloc( nOldCount + ( count ) ); \ ::com::sun::star::beans::Property* pProperties = _rProps.getArray() + nOldCount; \ //------------------------------------------------------------------------------ -#define BEGIN_DESCRIBE_BASE_PROPERTIES( count ) \ - _rProps.realloc( count ); \ +#define BEGIN_DESCRIBE_BASE_PROPERTIES( count ) \ + _rProps.realloc( count ); \ ::com::sun::star::beans::Property* pProperties = _rProps.getArray(); \ //------------------------------------------------------------------------------ -#define BEGIN_DESCRIBE_AGGREGATION_PROPERTIES( count, aggregate ) \ - _rProps.realloc( count ); \ +#define BEGIN_DESCRIBE_AGGREGATION_PROPERTIES( count, aggregate ) \ + _rProps.realloc( count ); \ ::com::sun::star::beans::Property* pProperties = _rProps.getArray(); \ \ - if (aggregate.is()) \ - _rAggregateProps = aggregate->getPropertySetInfo()->getProperties(); \ + if (aggregate.is()) \ + _rAggregateProps = aggregate->getPropertySetInfo()->getProperties(); \ // === //------------------------------------------------------------------------------ -#define DECL_PROP0(varname, type) \ +#define DECL_PROP0(varname, type) \ DECL_PROP_IMPL(varname, type) 0) //------------------------------------------------------------------------------ -#define DECL_PROP1(varname, type, attrib1) \ +#define DECL_PROP1(varname, type, attrib1) \ DECL_PROP_IMPL(varname, type) com::sun::star::beans::PropertyAttribute::attrib1) //------------------------------------------------------------------------------ -#define DECL_PROP2(varname, type, attrib1, attrib2) \ +#define DECL_PROP2(varname, type, attrib1, attrib2) \ DECL_PROP_IMPL(varname, type) com::sun::star::beans::PropertyAttribute::attrib1 | com::sun::star::beans::PropertyAttribute::attrib2) //------------------------------------------------------------------------------ -#define DECL_PROP3(varname, type, attrib1, attrib2, attrib3) \ +#define DECL_PROP3(varname, type, attrib1, attrib2, attrib3) \ DECL_PROP_IMPL(varname, type) com::sun::star::beans::PropertyAttribute::attrib1 | com::sun::star::beans::PropertyAttribute::attrib2 | com::sun::star::beans::PropertyAttribute::attrib3) //------------------------------------------------------------------------------ -#define DECL_PROP4(varname, type, attrib1, attrib2, attrib3, attrib4) \ +#define DECL_PROP4(varname, type, attrib1, attrib2, attrib3, attrib4) \ DECL_PROP_IMPL(varname, type) com::sun::star::beans::PropertyAttribute::attrib1 | com::sun::star::beans::PropertyAttribute::attrib2 | com::sun::star::beans::PropertyAttribute::attrib3 | com::sun::star::beans::PropertyAttribute::attrib4) // === some property types require special handling // === such as interfaces //------------------------------------------------------------------------------ -#define DECL_IFACE_PROP0(varname, type) \ +#define DECL_IFACE_PROP0(varname, type) \ DECL_IFACE_PROP_IMPL(varname, type) 0) //------------------------------------------------------------------------------ -#define DECL_IFACE_PROP1(varname, type, attrib1) \ +#define DECL_IFACE_PROP1(varname, type, attrib1) \ DECL_IFACE_PROP_IMPL(varname, type) starbeans::PropertyAttribute::attrib1) //------------------------------------------------------------------------------ -#define DECL_IFACE_PROP2(varname, type, attrib1, attrib2) \ +#define DECL_IFACE_PROP2(varname, type, attrib1, attrib2) \ DECL_IFACE_PROP_IMPL(varname, type) com::sun::star::beans::PropertyAttribute::attrib1 | com::sun::star::beans::PropertyAttribute::attrib2) //------------------------------------------------------------------------------ -#define DECL_IFACE_PROP3(varname, type, attrib1, attrib2, attrib3) \ +#define DECL_IFACE_PROP3(varname, type, attrib1, attrib2, attrib3) \ DECL_IFACE_PROP_IMPL(varname, type) starbeans::PropertyAttribute::attrib1 | starbeans::PropertyAttribute::attrib2 | starbeans::PropertyAttribute::attrib3) //------------------------------------------------------------------------------ -#define DECL_IFACE_PROP4(varname, type, attrib1, attrib2, attrib3, attrib4) \ +#define DECL_IFACE_PROP4(varname, type, attrib1, attrib2, attrib3, attrib4) \ DECL_IFACE_PROP_IMPL(varname, type) starbeans::PropertyAttribute::attrib1 | starbeans::PropertyAttribute::attrib2 | starbeans::PropertyAttribute::attrib3 | PropertyAttribute::attrib4) // === or Boolean properties //------------------------------------------------------------------------------ -#define DECL_BOOL_PROP0(varname) \ +#define DECL_BOOL_PROP0(varname) \ DECL_BOOL_PROP_IMPL(varname) 0) //------------------------------------------------------------------------------ -#define DECL_BOOL_PROP1(varname, attrib1) \ +#define DECL_BOOL_PROP1(varname, attrib1) \ DECL_BOOL_PROP_IMPL(varname) com::sun::star::beans::PropertyAttribute::attrib1) //------------------------------------------------------------------------------ -#define DECL_BOOL_PROP2(varname, attrib1, attrib2) \ +#define DECL_BOOL_PROP2(varname, attrib1, attrib2) \ DECL_BOOL_PROP_IMPL(varname) com::sun::star::beans::PropertyAttribute::attrib1 | com::sun::star::beans::PropertyAttribute::attrib2) //------------------------------------------------------------------------------ @@ -203,8 +203,8 @@ public: // === //------------------------------------------------------------------------------ -#define END_DESCRIBE_PROPERTIES() \ - DBG_ASSERT( pProperties == _rProps.getArray() + _rProps.getLength(), "<...>::describeFixedProperties/getInfoHelper: forgot to adjust the count ?"); \ +#define END_DESCRIBE_PROPERTIES() \ + DBG_ASSERT( pProperties == _rProps.getArray() + _rProps.getLength(), "<...>::describeFixedProperties/getInfoHelper: forgot to adjust the count ?"); \ //============================================================================== //------------------------------------------------------------------------------ diff --git a/forms/source/inc/propertybaghelper.hxx b/forms/source/inc/propertybaghelper.hxx index 5bb10583ea37..b8c0fbe16c75 100644 --- a/forms/source/inc/propertybaghelper.hxx +++ b/forms/source/inc/propertybaghelper.hxx @@ -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 diff --git a/forms/source/inc/resettable.hxx b/forms/source/inc/resettable.hxx index d1af14b7718b..f40383e484d5 100644 --- a/forms/source/inc/resettable.hxx +++ b/forms/source/inc/resettable.hxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * 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 diff --git a/forms/source/inc/services.hxx b/forms/source/inc/services.hxx index 450b8adcd346..f71436ffba76 100644 --- a/forms/source/inc/services.hxx +++ b/forms/source/inc/services.hxx @@ -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 @@ -84,16 +84,16 @@ namespace frm // service names for compatibility // ----------------------- FORMS_CONSTASCII_STRING( FRM_COMPONENT_FORM, "stardiv.one.form.component.Form" ); - FORMS_CONSTASCII_STRING( FRM_COMPONENT_EDIT, "stardiv.one.form.component.Edit" ); // compatibility + FORMS_CONSTASCII_STRING( FRM_COMPONENT_EDIT, "stardiv.one.form.component.Edit" ); // compatibility FORMS_CONSTASCII_STRING( FRM_COMPONENT_TEXTFIELD, "stardiv.one.form.component.TextField" ); FORMS_CONSTASCII_STRING( FRM_COMPONENT_LISTBOX, "stardiv.one.form.component.ListBox" ); FORMS_CONSTASCII_STRING( FRM_COMPONENT_COMBOBOX, "stardiv.one.form.component.ComboBox" ); FORMS_CONSTASCII_STRING( FRM_COMPONENT_RADIOBUTTON, "stardiv.one.form.component.RadioButton" ); - FORMS_CONSTASCII_STRING( FRM_COMPONENT_GROUPBOX, "stardiv.one.form.component.GroupBox" ); // compatibility - FORMS_CONSTASCII_STRING( FRM_COMPONENT_FIXEDTEXT, "stardiv.one.form.component.FixedText" ); // compatibility + FORMS_CONSTASCII_STRING( FRM_COMPONENT_GROUPBOX, "stardiv.one.form.component.GroupBox" ); // compatibility + FORMS_CONSTASCII_STRING( FRM_COMPONENT_FIXEDTEXT, "stardiv.one.form.component.FixedText" ); // compatibility FORMS_CONSTASCII_STRING( FRM_COMPONENT_COMMANDBUTTON, "stardiv.one.form.component.CommandButton" ); FORMS_CONSTASCII_STRING( FRM_COMPONENT_CHECKBOX, "stardiv.one.form.component.CheckBox" ); - FORMS_CONSTASCII_STRING( FRM_COMPONENT_GRID, "stardiv.one.form.component.Grid" ); // compatibility + FORMS_CONSTASCII_STRING( FRM_COMPONENT_GRID, "stardiv.one.form.component.Grid" ); // compatibility FORMS_CONSTASCII_STRING( FRM_COMPONENT_GRIDCONTROL, "stardiv.one.form.component.GridControl" ); FORMS_CONSTASCII_STRING( FRM_COMPONENT_IMAGEBUTTON, "stardiv.one.form.component.ImageButton" ); FORMS_CONSTASCII_STRING( FRM_COMPONENT_FILECONTROL, "stardiv.one.form.component.FileControl" ); diff --git a/forms/source/inc/togglestate.hxx b/forms/source/inc/togglestate.hxx index 4d2d418798d1..77076916b887 100644 --- a/forms/source/inc/togglestate.hxx +++ b/forms/source/inc/togglestate.hxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * 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 diff --git a/forms/source/inc/urltransformer.hxx b/forms/source/inc/urltransformer.hxx index ead8a5963f22..aecc29541280 100644 --- a/forms/source/inc/urltransformer.hxx +++ b/forms/source/inc/urltransformer.hxx @@ -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 diff --git a/forms/source/inc/windowstateguard.hxx b/forms/source/inc/windowstateguard.hxx index 2123d41ffdf0..b93959f268c7 100644 --- a/forms/source/inc/windowstateguard.hxx +++ b/forms/source/inc/windowstateguard.hxx @@ -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 diff --git a/forms/source/misc/InterfaceContainer.cxx b/forms/source/misc/InterfaceContainer.cxx index 9235b085d14a..fd54c4c61395 100644 --- a/forms/source/misc/InterfaceContainer.cxx +++ b/forms/source/misc/InterfaceContainer.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 @@ -106,7 +106,7 @@ Sequence< ScriptEventDescriptor > lcl_stripVbaEvents( const Sequence< ScriptEventDescriptor >& sEvents ) { Sequence< ScriptEventDescriptor > sStripped( sEvents.getLength() ); - + const ScriptEventDescriptor* pDesc = sEvents.getConstArray(); const ScriptEventDescriptor* pEnd = ( pDesc + sEvents.getLength() ); sal_Int32 nCopied = 0; @@ -139,7 +139,7 @@ void OInterfaceContainer::impl_addVbEvents_nolck_nothrow( const sal_Int32 i_nIn break; ::osl::MutexGuard aGuard( m_rMutex ); - bool hasVBABindings = lcl_hasVbaEvents( m_xEventAttacher->getScriptEvents( i_nIndex ) ); + bool hasVBABindings = lcl_hasVbaEvents( m_xEventAttacher->getScriptEvents( i_nIndex ) ); if ( hasVBABindings ) break; @@ -306,7 +306,7 @@ namespace _rSave.reserve( _nItemCount ); // copy the events - for (sal_Int32 i=0; i<_nItemCount; ++i) + for (sal_Int32 i=0; i<_nItemCount; ++i) _rSave.push_back(_rxManager->getScriptEvents( i )); } @@ -378,14 +378,14 @@ struct TransformEventTo52Format : public ::std::unary_function< ScriptEventDescr void operator()( ScriptEventDescriptor& _rDescriptor ) { if ( 0 == _rDescriptor.ScriptType.compareToAscii( "StarBasic" ) ) - { // it's a starbasic macro + { // it's a starbasic macro sal_Int32 nPrefixLength = _rDescriptor.ScriptCode.indexOf( ':' ); if ( 0 <= nPrefixLength ) - { // the macro name does not already contain a : + { // the macro name does not already contain a : #ifdef DBG_UTIL const ::rtl::OUString sPrefix = _rDescriptor.ScriptCode.copy( 0, nPrefixLength ); - DBG_ASSERT( 0 == sPrefix.compareToAscii( "document" ) - || 0 == sPrefix.compareToAscii( "application" ), + DBG_ASSERT( 0 == sPrefix.compareToAscii( "document" ) + || 0 == sPrefix.compareToAscii( "application" ), "TransformEventTo52Format: invalid (unknown) prefix!" ); #endif // cut the prefix @@ -401,9 +401,9 @@ struct TransformEventTo60Format : public ::std::unary_function< ScriptEventDescr void operator()( ScriptEventDescriptor& _rDescriptor ) { if ( 0 == _rDescriptor.ScriptType.compareToAscii( "StarBasic" ) ) - { // it's a starbasic macro + { // it's a starbasic macro if ( _rDescriptor.ScriptCode.indexOf( ':' ) < 0 ) - { // the macro name does not already contain a : + { // the macro name does not already contain a : // -> default the type to "document" ::rtl::OUString sNewScriptCode( RTL_CONSTASCII_USTRINGPARAM( "document:" ) ); sNewScriptCode += _rDescriptor.ScriptCode; @@ -434,8 +434,8 @@ void OInterfaceContainer::transformEvents( const EventFormat _eTargetFormat ) if ( aChildEvents.getLength() ) { // the "iterators" for the events for this child - ScriptEventDescriptor* pChildEvents = aChildEvents.getArray(); - ScriptEventDescriptor* pChildEventsEnd = pChildEvents + aChildEvents.getLength(); + ScriptEventDescriptor* pChildEvents = aChildEvents.getArray(); + ScriptEventDescriptor* pChildEventsEnd = pChildEvents + aChildEvents.getLength(); // do the transformation if ( efVersionSO6x == _eTargetFormat ) @@ -482,7 +482,7 @@ void SAL_CALL OInterfaceContainer::readEvents(const Reference<XObjectInputStream OInterfaceArray::const_iterator aAttachEnd = m_aItems.end(); for ( sal_Int32 i=0; aAttach != aAttachEnd; ++aAttach, ++i ) { - Reference< XInterface > xAsIFace( *aAttach, UNO_QUERY ); // important to normalize this .... + Reference< XInterface > xAsIFace( *aAttach, UNO_QUERY ); // important to normalize this .... Reference< XPropertySet > xAsSet( xAsIFace, UNO_QUERY ); m_xEventAttacher->attach( i, xAsIFace, makeAny( xAsSet ) ); } @@ -601,11 +601,11 @@ void SAL_CALL OInterfaceContainer::read( const Reference< XObjectInputStream >& try { implInsert( - m_aItems.size(), // position - xElement, // element to insert - sal_False, // no event attacher manager handling - NULL, // not yet approved - let implInsert do it - sal_True // fire the event + m_aItems.size(), // position + xElement, // element to insert + sal_False, // no event attacher manager handling + NULL, // not yet approved - let implInsert do it + sal_True // fire the event ); } catch( const Exception& ) @@ -827,7 +827,7 @@ void OInterfaceContainer::approveNewElement( const Reference< XPropertySet >& _r _pElement->xPropertySet = _rxObject; _pElement->xChild = xChild; _pElement->aElementTypeInterface = aCorrectType; - _pElement->xInterface = Reference< XInterface >( _rxObject, UNO_QUERY ); // normalized XInterface + _pElement->xInterface = Reference< XInterface >( _rxObject, UNO_QUERY ); // normalized XInterface } } @@ -843,7 +843,7 @@ void OInterfaceContainer::implInsert(sal_Int32 _nIndex, const Reference< XProper ::std::auto_ptr< ElementDescription > aAutoDeleteMetaData; ElementDescription* pElementMetaData = _pApprovalResult; if ( !pElementMetaData ) - { // not yet approved by the caller -> do ourself + { // not yet approved by the caller -> do ourself pElementMetaData = createElementMetaData(); DBG_ASSERT( pElementMetaData, "OInterfaceContainer::implInsert: createElementMetaData returned nonsense!" ); @@ -895,19 +895,19 @@ void OInterfaceContainer::implInsert(sal_Int32 _nIndex, const Reference< XProper { Reference< XEventAttacherManager > xMgr ( pElementMetaData->xInterface, UNO_QUERY ); if ( xMgr.is() ) - { + { OInterfaceContainer* pIfcMgr = dynamic_cast< OInterfaceContainer* >( xMgr.get() ); sal_Int32 nLen = pIfcMgr->getCount(); for ( sal_Int32 i = 0; (i < nLen) && pIfcMgr ; ++i ) - { + { // add fake events to the control at index i pIfcMgr->impl_addVbEvents_nolck_nothrow( i ); - } + } } else { // add fake events to the control at index i - impl_addVbEvents_nolck_nothrow( _nIndex ); + impl_addVbEvents_nolck_nothrow( _nIndex ); } } @@ -1141,11 +1141,11 @@ void SAL_CALL OInterfaceContainer::insertByName(const ::rtl::OUString& _rName, c } catch( const IllegalArgumentException& ) { - throw; // allowed to leave + throw; // allowed to leave } catch( const ElementExistException& ) { - throw; // allowed to leave + throw; // allowed to leave } catch( const Exception& ) { @@ -1366,7 +1366,7 @@ InterfaceRef OFormComponents::getParent() throw( RuntimeException ) } //......................................................................... -} // namespace frm +} // namespace frm //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/misc/componenttools.cxx b/forms/source/misc/componenttools.cxx index abd4c96f5482..f1e3fb0586dc 100644 --- a/forms/source/misc/componenttools.cxx +++ b/forms/source/misc/componenttools.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 diff --git a/forms/source/misc/frm_module.cxx b/forms/source/misc/frm_module.cxx index e1f4fcaf8bc9..684112b50629 100644 --- a/forms/source/misc/frm_module.cxx +++ b/forms/source/misc/frm_module.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 diff --git a/forms/source/misc/frm_strings.cxx b/forms/source/misc/frm_strings.cxx index 62c4a1ee5b8d..f5650e832576 100644 --- a/forms/source/misc/frm_strings.cxx +++ b/forms/source/misc/frm_strings.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 diff --git a/forms/source/misc/ids.cxx b/forms/source/misc/ids.cxx index c9b0265bd533..ee0605790d4d 100644 --- a/forms/source/misc/ids.cxx +++ b/forms/source/misc/ids.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 diff --git a/forms/source/misc/limitedformats.cxx b/forms/source/misc/limitedformats.cxx index 8d2e13e0ea69..d63cb79cd96c 100644 --- a/forms/source/misc/limitedformats.cxx +++ b/forms/source/misc/limitedformats.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 @@ -46,9 +46,9 @@ namespace frm using namespace ::com::sun::star::form; using namespace ::com::sun::star::beans; - sal_Int32 OLimitedFormats::s_nInstanceCount(0); - ::osl::Mutex OLimitedFormats::s_aMutex; - Reference< XNumberFormatsSupplier > OLimitedFormats::s_xStandardFormats; + sal_Int32 OLimitedFormats::s_nInstanceCount(0); + ::osl::Mutex OLimitedFormats::s_aMutex; + Reference< XNumberFormatsSupplier > OLimitedFormats::s_xStandardFormats; //===================================================================== //= @@ -89,8 +89,8 @@ namespace frm struct FormatEntry { const sal_Char* pDescription; - sal_Int32 nKey; - LocaleType eLocale; + sal_Int32 nKey; + LocaleType eLocale; }; //--------------------------------------------------------------------- @@ -267,7 +267,7 @@ namespace frm // seek to the nValue'th entry sal_Int32 nLookup = 0; - for ( ; + for ( ; (NULL != pFormats->pDescription) && (nLookup < nValue); ++pFormats, ++nLookup ) @@ -305,7 +305,7 @@ namespace frm // look for the entry with the given format key sal_Int32 nTablePosition = 0; - for ( ; + for ( ; (NULL != pFormats->pDescription) && (nNewFormat != pFormats->nKey); ++pFormats, ++nTablePosition ) @@ -323,7 +323,7 @@ namespace frm } if (!_rOldValue.hasValue()) - { // did not reach the end of the table (means we found nNewFormat) + { // did not reach the end of the table (means we found nNewFormat) // -> go to the end to ensure that _rOldValue is set while (pFormats->pDescription) { @@ -341,7 +341,7 @@ namespace frm OSL_ENSURE(_rOldValue.hasValue(), "OLimitedFormats::convertFormatKeyPropertyValue: did not find the old enum value in the table!"); if (!bFoundIt) - { // somebody gave us an format which we can't translate + { // somebody gave us an format which we can't translate ::rtl::OUString sMessage = ::rtl::OUString::createFromAscii("This control supports only a very limited number of formats."); throw IllegalArgumentException(sMessage, NULL, 2); } @@ -358,7 +358,7 @@ namespace frm OSL_ENSURE(m_xAggregate.is() && (-1 != m_nFormatEnumPropertyHandle), "OLimitedFormats::setFormatKeyPropertyValue: not initialized!"); if (m_xAggregate.is()) - { // this is to be called after convertFormatKeyPropertyValue, where + { // this is to be called after convertFormatKeyPropertyValue, where // we translated the format key into a enum value. // So now we can simply forward this enum value to our aggreate m_xAggregate->setFastPropertyValue(m_nFormatEnumPropertyHandle, _rNewValue); @@ -370,7 +370,7 @@ namespace frm { ::osl::MutexGuard aGuard(s_aMutex); if ((1 == ++s_nInstanceCount) && _rxORB.is()) - { // create the standard formatter + { // create the standard formatter Sequence< Any > aInit(1); aInit[0] <<= getLocale(ltEnglishUS); @@ -398,7 +398,7 @@ namespace frm } //......................................................................... -} // namespace frm +} // namespace frm //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/misc/listenercontainers.cxx b/forms/source/misc/listenercontainers.cxx index 56297368ff74..641be686b161 100644 --- a/forms/source/misc/listenercontainers.cxx +++ b/forms/source/misc/listenercontainers.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 diff --git a/forms/source/misc/property.cxx b/forms/source/misc/property.cxx index 0d97609f0eb7..4e95fa85ca17 100644 --- a/forms/source/misc/property.cxx +++ b/forms/source/misc/property.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 @@ -62,7 +62,7 @@ sal_Int32 PropertyInfoService::getPropertyId(const ::rtl::OUString& _rName) sal_Int32 nHandle = -1; if (aPair.first != aPair.second) - { // we found something _and_ we have an identity + { // we found something _and_ we have an identity nHandle = aPair.first->nHandle; } diff --git a/forms/source/misc/services.cxx b/forms/source/misc/services.cxx index 2732b86bfc8f..a06f4bee89c9 100644 --- a/forms/source/misc/services.cxx +++ b/forms/source/misc/services.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 @@ -103,17 +103,17 @@ DECLARE_SERVICE_INFO(ImageProducer) //--------------------------------------------------------------------------------------- -static Sequence< ::rtl::OUString > s_aClassImplementationNames; -static Sequence<Sequence< ::rtl::OUString > > s_aClassServiceNames; -static Sequence<sal_Int64> s_aFactories; +static Sequence< ::rtl::OUString > s_aClassImplementationNames; +static Sequence<Sequence< ::rtl::OUString > > s_aClassServiceNames; +static Sequence<sal_Int64> s_aFactories; // need to use sal_Int64 instead of ComponentInstantiation, as ComponentInstantiation has no cppuType, so // it can't be used with sequences //--------------------------------------------------------------------------------------- void registerClassInfo( - ::rtl::OUString _rClassImplName, // the ImplName of the class - const Sequence< ::rtl::OUString >& _rServiceNames, // the services supported by this class - ::cppu::ComponentInstantiation _pCreateFunction // the method for instantiating such a class + ::rtl::OUString _rClassImplName, // the ImplName of the class + const Sequence< ::rtl::OUString >& _rServiceNames, // the services supported by this class + ::cppu::ComponentInstantiation _pCreateFunction // the method for instantiating such a class ) { sal_Int32 nCurrentLength = s_aClassImplementationNames.getLength(); diff --git a/forms/source/resource/frm_resource.cxx b/forms/source/resource/frm_resource.cxx index 93746147f3cd..c8d65eb914fd 100644 --- a/forms/source/resource/frm_resource.cxx +++ b/forms/source/resource/frm_resource.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 @@ -66,7 +66,7 @@ namespace frm if (m_pImpl) { // no that we have a impl class make sure it's deleted on unloading the library - static ResourceManager::EnsureDelete s_aDeleteTheImplClas; + static ResourceManager::EnsureDelete s_aDeleteTheImplClas; } } diff --git a/forms/source/resource/strings.src b/forms/source/resource/strings.src index 96f2c1d95dfb..54cf3d56a617 100644 --- a/forms/source/resource/strings.src +++ b/forms/source/resource/strings.src @@ -1,7 +1,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 diff --git a/forms/source/resource/xforms.src b/forms/source/resource/xforms.src index 4efa63320a6f..b01f5c8cb3a5 100644 --- a/forms/source/resource/xforms.src +++ b/forms/source/resource/xforms.src @@ -1,7 +1,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 diff --git a/forms/source/richtext/attributedispatcher.cxx b/forms/source/richtext/attributedispatcher.cxx index 0599aef47105..b93370868900 100644 --- a/forms/source/richtext/attributedispatcher.cxx +++ b/forms/source/richtext/attributedispatcher.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 @@ -121,7 +121,7 @@ namespace frm if ( m_pMasterDispatcher ) m_pMasterDispatcher->executeAttribute( m_nAttributeId, NULL ); } - + //-------------------------------------------------------------------- void OAttributeDispatcher::onAttributeStateChanged( AttributeId _nAttributeId, const AttributeState& /*_rState*/ ) { diff --git a/forms/source/richtext/attributedispatcher.hxx b/forms/source/richtext/attributedispatcher.hxx index 3dafb5c3f53f..df52d3bff6cf 100644 --- a/forms/source/richtext/attributedispatcher.hxx +++ b/forms/source/richtext/attributedispatcher.hxx @@ -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 diff --git a/forms/source/richtext/clipboarddispatcher.cxx b/forms/source/richtext/clipboarddispatcher.cxx index 02a44fef4c42..fa387f56aead 100644 --- a/forms/source/richtext/clipboarddispatcher.cxx +++ b/forms/source/richtext/clipboarddispatcher.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 diff --git a/forms/source/richtext/clipboarddispatcher.hxx b/forms/source/richtext/clipboarddispatcher.hxx index b41527036ef9..8019dda3cc3c 100644 --- a/forms/source/richtext/clipboarddispatcher.hxx +++ b/forms/source/richtext/clipboarddispatcher.hxx @@ -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 diff --git a/forms/source/richtext/featuredispatcher.cxx b/forms/source/richtext/featuredispatcher.cxx index 7514d4a2a35f..174b97585f46 100644 --- a/forms/source/richtext/featuredispatcher.cxx +++ b/forms/source/richtext/featuredispatcher.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 @@ -97,7 +97,7 @@ namespace frm newStatusListener( _rxControl ); } } - + //-------------------------------------------------------------------- void SAL_CALL ORichTextFeatureDispatcher::removeStatusListener( const Reference< XStatusListener >& _rxControl, const URL& /*_rURL*/ ) throw (RuntimeException) { diff --git a/forms/source/richtext/featuredispatcher.hxx b/forms/source/richtext/featuredispatcher.hxx index 2eb80a914c40..5fff974d722b 100644 --- a/forms/source/richtext/featuredispatcher.hxx +++ b/forms/source/richtext/featuredispatcher.hxx @@ -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 diff --git a/forms/source/richtext/parametrizedattributedispatcher.cxx b/forms/source/richtext/parametrizedattributedispatcher.cxx index a13f165af945..45ff2e5abed8 100644 --- a/forms/source/richtext/parametrizedattributedispatcher.cxx +++ b/forms/source/richtext/parametrizedattributedispatcher.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 diff --git a/forms/source/richtext/parametrizedattributedispatcher.hxx b/forms/source/richtext/parametrizedattributedispatcher.hxx index 0f911dbf4df8..f5f91bd81a88 100644 --- a/forms/source/richtext/parametrizedattributedispatcher.hxx +++ b/forms/source/richtext/parametrizedattributedispatcher.hxx @@ -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 diff --git a/forms/source/richtext/richtextcontrol.cxx b/forms/source/richtext/richtextcontrol.cxx index dd71a80f9172..f277eac23127 100644 --- a/forms/source/richtext/richtextcontrol.cxx +++ b/forms/source/richtext/richtextcontrol.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 @@ -279,7 +279,7 @@ namespace frm } //------------------------------------------------------------------ - ::rtl::OUString SAL_CALL ORichTextControl::getImplementationName() throw( RuntimeException ) + ::rtl::OUString SAL_CALL ORichTextControl::getImplementationName() throw( RuntimeException ) { return getImplementationName_Static(); } @@ -291,7 +291,7 @@ namespace frm } //------------------------------------------------------------------ - ::rtl::OUString SAL_CALL ORichTextControl::getImplementationName_Static() + ::rtl::OUString SAL_CALL ORichTextControl::getImplementationName_Static() { return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.form.ORichTextControl" ) ); } diff --git a/forms/source/richtext/richtextcontrol.hxx b/forms/source/richtext/richtextcontrol.hxx index ad16b0fc9c42..05ee2935513e 100644 --- a/forms/source/richtext/richtextcontrol.hxx +++ b/forms/source/richtext/richtextcontrol.hxx @@ -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 @@ -74,9 +74,9 @@ namespace frm public: // XServiceInfo - static version - static ::rtl::OUString SAL_CALL getImplementationName_Static(); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_Static(); - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory ); + static ::rtl::OUString SAL_CALL getImplementationName_Static(); + static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_Static(); + static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory ); protected: // UNO @@ -87,7 +87,7 @@ namespace frm virtual void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& _rToolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& _rParent ) throw( ::com::sun::star::uno::RuntimeException ); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); + virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XTypeProvider diff --git a/forms/source/richtext/richtextengine.cxx b/forms/source/richtext/richtextengine.cxx index a627c6d0e4e3..13a371b0d19c 100644 --- a/forms/source/richtext/richtextengine.cxx +++ b/forms/source/richtext/richtextengine.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 diff --git a/forms/source/richtext/richtextengine.hxx b/forms/source/richtext/richtextengine.hxx index c571f51e9aaf..0c24d28c1539 100644 --- a/forms/source/richtext/richtextengine.hxx +++ b/forms/source/richtext/richtextengine.hxx @@ -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 diff --git a/forms/source/richtext/richtextimplcontrol.cxx b/forms/source/richtext/richtextimplcontrol.cxx index 244291bc81f9..b2c9541086a2 100644 --- a/forms/source/richtext/richtextimplcontrol.cxx +++ b/forms/source/richtext/richtextimplcontrol.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 diff --git a/forms/source/richtext/richtextimplcontrol.hxx b/forms/source/richtext/richtextimplcontrol.hxx index a79efcf1b89d..c16e749758a0 100644 --- a/forms/source/richtext/richtextimplcontrol.hxx +++ b/forms/source/richtext/richtextimplcontrol.hxx @@ -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 diff --git a/forms/source/richtext/richtextmodel.cxx b/forms/source/richtext/richtextmodel.cxx index 42accca83e79..7deb75f7426e 100644 --- a/forms/source/richtext/richtextmodel.cxx +++ b/forms/source/richtext/richtextmodel.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 diff --git a/forms/source/richtext/richtextmodel.hxx b/forms/source/richtext/richtextmodel.hxx index 18c083d02c80..6be38c0408fd 100644 --- a/forms/source/richtext/richtextmodel.hxx +++ b/forms/source/richtext/richtextmodel.hxx @@ -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 @@ -100,7 +100,7 @@ namespace frm sal_Bool m_bMultiLine; // </properties_for_awt_edit_compatibility> - ::std::auto_ptr<RichTextEngine> + ::std::auto_ptr<RichTextEngine> m_pEngine; bool m_bSettingEngineText; diff --git a/forms/source/richtext/richtextunowrapper.cxx b/forms/source/richtext/richtextunowrapper.cxx index fd1e5cc74e5a..1f4f833ad52f 100644 --- a/forms/source/richtext/richtextunowrapper.cxx +++ b/forms/source/richtext/richtextunowrapper.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 diff --git a/forms/source/richtext/richtextunowrapper.hxx b/forms/source/richtext/richtextunowrapper.hxx index ef9ecbe57338..9605156b274a 100644 --- a/forms/source/richtext/richtextunowrapper.hxx +++ b/forms/source/richtext/richtextunowrapper.hxx @@ -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 diff --git a/forms/source/richtext/richtextvclcontrol.cxx b/forms/source/richtext/richtextvclcontrol.cxx index 53e7d9091f80..d41480a98f98 100644 --- a/forms/source/richtext/richtextvclcontrol.cxx +++ b/forms/source/richtext/richtextvclcontrol.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 diff --git a/forms/source/richtext/richtextvclcontrol.hxx b/forms/source/richtext/richtextvclcontrol.hxx index 4ea84a925519..b113e41ef0ef 100644 --- a/forms/source/richtext/richtextvclcontrol.hxx +++ b/forms/source/richtext/richtextvclcontrol.hxx @@ -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 diff --git a/forms/source/richtext/richtextviewport.cxx b/forms/source/richtext/richtextviewport.cxx index 5d6bff8e85bb..22688981ddfb 100644 --- a/forms/source/richtext/richtextviewport.cxx +++ b/forms/source/richtext/richtextviewport.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 diff --git a/forms/source/richtext/richtextviewport.hxx b/forms/source/richtext/richtextviewport.hxx index 2e89fe9a5a74..b99320c06285 100644 --- a/forms/source/richtext/richtextviewport.hxx +++ b/forms/source/richtext/richtextviewport.hxx @@ -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 diff --git a/forms/source/richtext/rtattributehandler.cxx b/forms/source/richtext/rtattributehandler.cxx index 3b43f137ab6a..392425ecce56 100644 --- a/forms/source/richtext/rtattributehandler.cxx +++ b/forms/source/richtext/rtattributehandler.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 diff --git a/forms/source/richtext/rtattributehandler.hxx b/forms/source/richtext/rtattributehandler.hxx index 87e192032c38..da4a82cabb0f 100644 --- a/forms/source/richtext/rtattributehandler.hxx +++ b/forms/source/richtext/rtattributehandler.hxx @@ -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 diff --git a/forms/source/richtext/rtattributes.hxx b/forms/source/richtext/rtattributes.hxx index c15eca82f587..2dae7a3e56f4 100644 --- a/forms/source/richtext/rtattributes.hxx +++ b/forms/source/richtext/rtattributes.hxx @@ -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 diff --git a/forms/source/richtext/specialdispatchers.cxx b/forms/source/richtext/specialdispatchers.cxx index 1cbd2520ee3b..c36742bd7de5 100644 --- a/forms/source/richtext/specialdispatchers.cxx +++ b/forms/source/richtext/specialdispatchers.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 @@ -87,7 +87,7 @@ namespace frm getEditView()->SetSelection( ESelection( 0, 0, nLastParaNumber, nParaLen ) ); } } - + //-------------------------------------------------------------------- FeatureStateEvent OSelectAllDispatcher::buildStatusEvent() const { @@ -144,7 +144,7 @@ namespace frm pEngine->SetVertical( !pEngine->IsVertical() ); } - + //-------------------------------------------------------------------- FeatureStateEvent OTextDirectionDispatcher::buildStatusEvent() const { diff --git a/forms/source/richtext/specialdispatchers.hxx b/forms/source/richtext/specialdispatchers.hxx index 4f8c48a6bd84..e050f024aceb 100644 --- a/forms/source/richtext/specialdispatchers.hxx +++ b/forms/source/richtext/specialdispatchers.hxx @@ -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 diff --git a/forms/source/richtext/textattributelistener.hxx b/forms/source/richtext/textattributelistener.hxx index 51ea48f42af1..2febc3a458f0 100644 --- a/forms/source/richtext/textattributelistener.hxx +++ b/forms/source/richtext/textattributelistener.hxx @@ -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 diff --git a/forms/source/runtime/formoperations.cxx b/forms/source/runtime/formoperations.cxx index 601af810779b..e857787f6012 100644 --- a/forms/source/runtime/formoperations.cxx +++ b/forms/source/runtime/formoperations.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 @@ -158,7 +158,7 @@ namespace frm { return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.forms.FormOperations" ) ); } - + //-------------------------------------------------------------------- Sequence< ::rtl::OUString > FormOperations::getSupportedServiceNames_Static( ) throw(RuntimeException) { @@ -166,13 +166,13 @@ namespace frm aNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.runtime.FormOperations" ) ); return aNames; } - + //-------------------------------------------------------------------- Reference< XInterface > SAL_CALL FormOperations::Create(const Reference< XMultiServiceFactory >& _rxFactory ) { return *new FormOperations( _rxFactory ); } - + //-------------------------------------------------------------------- void SAL_CALL FormOperations::initialize( const Sequence< Any >& _arguments ) throw (Exception, RuntimeException) { @@ -194,13 +194,13 @@ namespace frm throw IllegalArgumentException( ::rtl::OUString(), *this, 0 ); } - + //-------------------------------------------------------------------- ::rtl::OUString SAL_CALL FormOperations::getImplementationName( ) throw (RuntimeException) { return getImplementationName_Static(); } - + //-------------------------------------------------------------------- ::sal_Bool SAL_CALL FormOperations::supportsService( const ::rtl::OUString& _ServiceName ) throw (RuntimeException) { @@ -209,7 +209,7 @@ namespace frm const ::rtl::OUString* pEnd = aSupportedServiceNames.getConstArray() + aSupportedServiceNames.getLength(); return ::std::find( pBegin, pEnd, _ServiceName ) != pEnd; } - + //-------------------------------------------------------------------- Sequence< ::rtl::OUString > SAL_CALL FormOperations::getSupportedServiceNames( ) throw (RuntimeException) { @@ -222,35 +222,35 @@ namespace frm MethodGuard aGuard( *this ); return m_xCursor; } - + //-------------------------------------------------------------------- Reference< XResultSetUpdate > SAL_CALL FormOperations::getUpdateCursor() throw (RuntimeException) { MethodGuard aGuard( *this ); return m_xUpdateCursor; } - + //-------------------------------------------------------------------- Reference< XFormController > SAL_CALL FormOperations::getController() throw (RuntimeException) { MethodGuard aGuard( *this ); return m_xController; } - + //-------------------------------------------------------------------- Reference< XFeatureInvalidation > SAL_CALL FormOperations::getFeatureInvalidation() throw (RuntimeException) { MethodGuard aGuard( *this ); return m_xFeatureInvalidation; } - + //-------------------------------------------------------------------- void SAL_CALL FormOperations::setFeatureInvalidation( const Reference< XFeatureInvalidation > & _rxFeatureInvalidation ) throw (RuntimeException) { MethodGuard aGuard( *this ); m_xFeatureInvalidation = _rxFeatureInvalidation; } - + //-------------------------------------------------------------------- FeatureState SAL_CALL FormOperations::getState( ::sal_Int16 _nFeature ) throw (RuntimeException) { @@ -262,9 +262,9 @@ namespace frm try { // some checks for basic pre-requisites - if ( !m_xLoadableForm.is() + if ( !m_xLoadableForm.is() || !m_xLoadableForm->isLoaded() - || !m_xCursorProperties.is() + || !m_xCursorProperties.is() ) { return aState; @@ -433,7 +433,7 @@ namespace frm return aState; } - + //-------------------------------------------------------------------- ::sal_Bool SAL_CALL FormOperations::isEnabled( ::sal_Int16 _nFeature ) throw (RuntimeException) { @@ -442,7 +442,7 @@ namespace frm FeatureState aState( getState( _nFeature ) ); return aState.Enabled; } - + //-------------------------------------------------------------------- namespace { @@ -734,7 +734,7 @@ namespace frm impl_invalidateAllSupportedFeatures_nothrow( aGuard ); } - + //-------------------------------------------------------------------- void SAL_CALL FormOperations::executeWithArguments( ::sal_Int16 _nFeature, const Sequence< NamedValue >& _rArguments ) throw (RuntimeException, IllegalArgumentException, SQLException, WrappedTargetException) { @@ -826,7 +826,7 @@ namespace frm } return bResult; } - + //-------------------------------------------------------------------- ::sal_Bool SAL_CALL FormOperations::commitCurrentControl() throw (RuntimeException, SQLException) { @@ -891,7 +891,7 @@ namespace frm } return bIs; } - + //-------------------------------------------------------------------- ::sal_Bool SAL_CALL FormOperations::isModifiedRow() throw (RuntimeException, WrappedTargetException) { @@ -916,19 +916,19 @@ namespace frm impl_invalidateAllSupportedFeatures_nothrow( aGuard ); } - + //-------------------------------------------------------------------- void SAL_CALL FormOperations::rowChanged( const EventObject& /*_Event*/ ) throw (RuntimeException) { // not interested in } - + //-------------------------------------------------------------------- void SAL_CALL FormOperations::rowSetChanged( const EventObject& /*_Event*/ ) throw (RuntimeException) { // not interested in } - + //-------------------------------------------------------------------- void SAL_CALL FormOperations::modified( const EventObject& /*_Source*/ ) throw( RuntimeException ) { @@ -941,7 +941,7 @@ namespace frm impl_invalidateModifyDependentFeatures_nothrow( aGuard ); } } - + //-------------------------------------------------------------------- void SAL_CALL FormOperations::propertyChange( const PropertyChangeEvent& _rEvent ) throw (RuntimeException) { @@ -989,13 +989,13 @@ namespace frm impl_invalidateAllSupportedFeatures_nothrow( aGuard ); } } - + //-------------------------------------------------------------------- void SAL_CALL FormOperations::disposing( const EventObject& /*_Source*/ ) throw (RuntimeException) { // TODO: should we react on this? Or is this the responsibility of our owner to dispose us? } - + //-------------------------------------------------------------------- void SAL_CALL FormOperations::disposing() { @@ -1524,7 +1524,7 @@ namespace frm if ( !m_xLoadableForm->isLoaded() ) - { // something went wrong -> restore the original state + { // something went wrong -> restore the original state try { m_xParser->setOrder( sOriginalSort ); @@ -1597,7 +1597,7 @@ namespace frm if ( !m_xLoadableForm->isLoaded() ) - { // something went wrong -> restore the original state + { // something went wrong -> restore the original state try { m_xParser->setOrder( sOriginalFilter ); diff --git a/forms/source/runtime/formoperations.hxx b/forms/source/runtime/formoperations.hxx index 3699a2474f72..1d6d028fd7ad 100644 --- a/forms/source/runtime/formoperations.hxx +++ b/forms/source/runtime/formoperations.hxx @@ -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 diff --git a/forms/source/solar/component/navbarcontrol.cxx b/forms/source/solar/component/navbarcontrol.cxx index 673501803f29..5e73342d680d 100644 --- a/forms/source/solar/component/navbarcontrol.cxx +++ b/forms/source/solar/component/navbarcontrol.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 @@ -217,7 +217,7 @@ namespace frm } //------------------------------------------------------------------ - ::rtl::OUString SAL_CALL ONavigationBarControl::getImplementationName() throw( RuntimeException ) + ::rtl::OUString SAL_CALL ONavigationBarControl::getImplementationName() throw( RuntimeException ) { return getImplementationName_Static(); } @@ -229,7 +229,7 @@ namespace frm } //------------------------------------------------------------------ - ::rtl::OUString SAL_CALL ONavigationBarControl::getImplementationName_Static() + ::rtl::OUString SAL_CALL ONavigationBarControl::getImplementationName_Static() { return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.form.ONavigationBarControl" ) ); } @@ -297,7 +297,7 @@ namespace frm // we want a faster repeating rate for the slots in this // toolbox - AllSettings aSettings = pNavBar->GetSettings(); + AllSettings aSettings = pNavBar->GetSettings(); MouseSettings aMouseSettings = aSettings.GetMouseSettings(); aMouseSettings.SetButtonRepeat( 10 ); aSettings.SetMouseSettings( aMouseSettings ); diff --git a/forms/source/solar/component/navbarcontrol.hxx b/forms/source/solar/component/navbarcontrol.hxx index 864ff225e8de..8c5bd8b45524 100644 --- a/forms/source/solar/component/navbarcontrol.hxx +++ b/forms/source/solar/component/navbarcontrol.hxx @@ -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 @@ -71,9 +71,9 @@ namespace frm public: // XServiceInfo - static version - static ::rtl::OUString SAL_CALL getImplementationName_Static(); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_Static(); - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory ); + static ::rtl::OUString SAL_CALL getImplementationName_Static(); + static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_Static(); + static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory ); protected: // UNO @@ -84,7 +84,7 @@ namespace frm virtual void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& _rToolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& _rParent ) throw( ::com::sun::star::uno::RuntimeException ); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); + virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XTypeProvider diff --git a/forms/source/solar/control/navtoolbar.cxx b/forms/source/solar/control/navtoolbar.cxx index 7e5974971283..bdc4e981d1a2 100644 --- a/forms/source/solar/control/navtoolbar.cxx +++ b/forms/source/solar/control/navtoolbar.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 diff --git a/forms/source/solar/inc/navtoolbar.hxx b/forms/source/solar/inc/navtoolbar.hxx index 03343e5d2d8b..2caba050b81a 100644 --- a/forms/source/solar/inc/navtoolbar.hxx +++ b/forms/source/solar/inc/navtoolbar.hxx @@ -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 diff --git a/forms/source/xforms/NameContainer.hxx b/forms/source/xforms/NameContainer.hxx index b4481a5434d8..fe8a6a480986 100644 --- a/forms/source/xforms/NameContainer.hxx +++ b/forms/source/xforms/NameContainer.hxx @@ -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 @@ -68,7 +68,7 @@ protected: return findItem( rName ) != maItems.end(); } - T getItem( const rtl::OUString& rName ) + T getItem( const rtl::OUString& rName ) { OSL_ENSURE( hasItem( rName ), "can't get non-existant item" ); return maItems[ rName ]; @@ -123,7 +123,7 @@ public: // virtual com::sun::star::uno::Any SAL_CALL getByName( - const rtl::OUString& rName ) + const rtl::OUString& rName ) throw( com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException ) diff --git a/forms/source/xforms/binding.cxx b/forms/source/xforms/binding.cxx index 0ec73fc116b0..853e42964430 100644 --- a/forms/source/xforms/binding.cxx +++ b/forms/source/xforms/binding.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 @@ -248,7 +248,7 @@ bool Binding::isValid() isValid_DataType() && maMIP.isConstraint() && ( ! maMIP.isRequired() || - ( maBindingExpression.hasValue() && + ( maBindingExpression.hasValue() && maBindingExpression.getString().getLength() > 0 ) ); } @@ -292,7 +292,7 @@ OUString Binding::explainInvalid() if( sReason.getLength() == 0 ) { // no explanation given by data type? Then give generic message - sReason = getResource( RID_STR_XFORMS_INVALID_VALUE, + sReason = getResource( RID_STR_XFORMS_INVALID_VALUE, maMIP.getTypeName() ); } } @@ -300,7 +300,7 @@ OUString Binding::explainInvalid() { sReason = maMIP.getConstraintExplanation(); } - else if( maMIP.isRequired() && maBindingExpression.hasValue() && + else if( maMIP.isRequired() && maBindingExpression.hasValue() && ( maBindingExpression.getString().getLength() == 0 ) ) { sReason = getResource( RID_STR_XFORMS_REQUIRED ); @@ -342,7 +342,7 @@ Binding::IntSequence_t Binding::getUnoTunnelID() Binding* SAL_CALL Binding::getBinding( const Reference<XPropertySet>& xPropertySet ) { Reference<XUnoTunnel> xTunnel( xPropertySet, UNO_QUERY ); - return xTunnel.is() + return xTunnel.is() ? reinterpret_cast<Binding*>( xTunnel->getSomething(getUnoTunnelID())) : NULL; } @@ -522,7 +522,7 @@ Model* Binding::getModelImpl() const Model* Binding::getModelImpl( const Model_t& xModel ) const { Reference<XUnoTunnel> xTunnel( xModel, UNO_QUERY ); - Model* pModel = xTunnel.is() + Model* pModel = xTunnel.is() ? reinterpret_cast<Model*>( xTunnel->getSomething( Model::getUnoTunnelID() ) ) : NULL; @@ -539,13 +539,13 @@ void lcl_addListenerToNode( Reference<XNode> xNode, xListener, false ); xTarget->addEventListener( OUSTRING("DOMCharacterDataModified"), xListener, true ); - xTarget->addEventListener( OUSTRING("DOMAttrModified"), + xTarget->addEventListener( OUSTRING("DOMAttrModified"), xListener, false ); - xTarget->addEventListener( OUSTRING("DOMAttrModified"), + xTarget->addEventListener( OUSTRING("DOMAttrModified"), xListener, true ); - xTarget->addEventListener( OUSTRING("DOMAttrModified"), + xTarget->addEventListener( OUSTRING("DOMAttrModified"), xListener, true ); - xTarget->addEventListener( OUSTRING("xforms-generic"), + xTarget->addEventListener( OUSTRING("xforms-generic"), xListener, true ); } } @@ -560,11 +560,11 @@ void lcl_removeListenerFromNode( Reference<XNode> xNode, xListener, false ); xTarget->removeEventListener( OUSTRING("DOMCharacterDataModified"), xListener, true ); - xTarget->removeEventListener( OUSTRING("DOMAttrModified"), + xTarget->removeEventListener( OUSTRING("DOMAttrModified"), xListener, false ); - xTarget->removeEventListener( OUSTRING("DOMAttrModified"), + xTarget->removeEventListener( OUSTRING("DOMAttrModified"), xListener, true ); - xTarget->removeEventListener( OUSTRING("xforms-generic"), + xTarget->removeEventListener( OUSTRING("xforms-generic"), xListener, true ); } } @@ -585,7 +585,7 @@ void lcl_removeListenerFromNode( Reference<XNode> xNode, OSL_ENSURE( aIter->is(), "no node?" ); // create proper evaluation context for this MIP - aVector.push_back( EvaluationContext( *aIter, getModel(), + aVector.push_back( EvaluationContext( *aIter, getModel(), getBindingNamespaces(), nCount, aNodes.size() ) ); } @@ -614,16 +614,16 @@ void Binding::bind( bool bForceRebind ) if( ! maBindingExpression.getNode().is() ) { // 1b) create node (if valid element name) - if( isValidQName( maBindingExpression.getExpression(), + if( isValidQName( maBindingExpression.getExpression(), aContext.mxNamespaces ) ) { - aContext.mxContextNode->appendChild( - Reference<XNode>( - aContext.mxContextNode->getOwnerDocument()->createElement( + aContext.mxContextNode->appendChild( + Reference<XNode>( + aContext.mxContextNode->getOwnerDocument()->createElement( maBindingExpression.getExpression() ), UNO_QUERY ) ); maBindingExpression.evaluate( aContext ); - OSL_ENSURE( maBindingExpression.getNode().is(), + OSL_ENSURE( maBindingExpression.getNode().is(), "we should bind to the newly inserted node!" ); } } @@ -643,8 +643,8 @@ void Binding::bind( bool bForceRebind ) aIter++ ) maEventNodes.push_back( *aIter ); else - maEventNodes.push_back( - Reference<XNode>( aContext.mxContextNode->getOwnerDocument(), + maEventNodes.push_back( + Reference<XNode>( aContext.mxContextNode->getOwnerDocument(), UNO_QUERY_THROW ) ); for( PathExpression::NodeVector_t::iterator aIter2 = maEventNodes.begin(); aIter2 != maEventNodes.end(); @@ -744,13 +744,13 @@ void Binding::valueModified() // control will query once the value has changed) Reference<XInterface> xSource = static_cast<XPropertySet*>( this ); ::std::for_each( maModifyListeners.begin(), - maModifyListeners.end(), + maModifyListeners.end(), ::std::bind2nd( ::std::ptr_fun( lcl_modified ), xSource ) ); ::std::for_each( maListEntryListeners.begin(), - maListEntryListeners.end(), + maListEntryListeners.end(), ::std::bind2nd( ::std::ptr_fun( lcl_listentry ), xSource ) ); ::std::for_each( maValidityListeners.begin(), - maValidityListeners.end(), + maValidityListeners.end(), ::std::bind2nd( ::std::ptr_fun( lcl_validate ), xSource ) ); // now distribute MIPs to childs @@ -837,7 +837,7 @@ Binding::XDataType_t Binding::getDataType() OSL_ENSURE( getModel().is(), "need model" ); OSL_ENSURE( getModel()->getDataTypeRepository().is(), "need types" ); - Reference<XDataTypeRepository> xRepository( + Reference<XDataTypeRepository> xRepository( getModel()->getDataTypeRepository(), UNO_QUERY ); OUString sTypeName = maMIP.getTypeName(); @@ -971,7 +971,7 @@ void Binding::_setNamespaces( const XNameContainer_t& rNamespaces, bool bBinding ) { Model* pModel = getModelImpl(); - XNameContainer_t xModelNamespaces = ( pModel != NULL ) + XNameContainer_t xModelNamespaces = ( pModel != NULL ) ? pModel->getNamespaces() : NULL; OSL_ENSURE( ( pModel != NULL ) == xModelNamespaces.is(), "no model nmsp?"); @@ -992,10 +992,10 @@ void Binding::_setNamespaces( const XNameContainer_t& rNamespaces, // determine whether the namespace should go into model's or // into binding's namespaces - bool bLocal = + bool bLocal = ! xModelNamespaces.is() || mxNamespaces->hasByName( rName ) - || ( bBinding + || ( bBinding && xModelNamespaces.is() && xModelNamespaces->hasByName( rName ) ); @@ -1051,20 +1051,20 @@ void Binding::_checkBindingID() // XValueBinding // -Binding::Sequence_Type_t Binding::getSupportedValueTypes() +Binding::Sequence_Type_t Binding::getSupportedValueTypes() throw( RuntimeException ) { return Convert::get().getTypes(); } -sal_Bool Binding::supportsType( const Type_t& rType ) +sal_Bool Binding::supportsType( const Type_t& rType ) throw( RuntimeException ) { return Convert::get().hasType( rType ); } Binding::Any_t Binding::getValue( const Type_t& rType ) - throw( IncompatibleTypesException, + throw( IncompatibleTypesException, RuntimeException ) { // first, check for model @@ -1081,18 +1081,18 @@ Binding::Any_t Binding::getValue( const Type_t& rType ) Convert &rConvert = Convert::get(); result = rConvert.toAny(pathExpr,rType); } - -// return maBindingExpression.hasValue() + +// return maBindingExpression.hasValue() // ? Convert::get().toAny( maBindingExpression.getString(), rType ) // : Any(); return result; } -void Binding::setValue( const Any_t& aValue ) - throw( IncompatibleTypesException, - InvalidBindingStateException, - NoSupportException, +void Binding::setValue( const Any_t& aValue ) + throw( IncompatibleTypesException, + InvalidBindingStateException, + NoSupportException, RuntimeException ) { // first, check for model @@ -1196,8 +1196,8 @@ void Binding::addListEntryListener( const XListEntryListener_t& xListener ) RuntimeException ) { OSL_ENSURE( xListener.is(), "need listener!" ); - if( ::std::find( maListEntryListeners.begin(), - maListEntryListeners.end(), + if( ::std::find( maListEntryListeners.begin(), + maListEntryListeners.end(), xListener) == maListEntryListeners.end() ) maListEntryListeners.push_back( xListener ); @@ -1207,15 +1207,15 @@ void Binding::removeListEntryListener( const XListEntryListener_t& xListener ) throw( NullPointerException, RuntimeException ) { - XListEntryListeners_t::iterator aIter = - ::std::find( maListEntryListeners.begin(), maListEntryListeners.end(), + XListEntryListeners_t::iterator aIter = + ::std::find( maListEntryListeners.begin(), maListEntryListeners.end(), xListener ); if( aIter != maListEntryListeners.end() ) maListEntryListeners.erase( aIter ); } -// +// // XValidator // @@ -1256,8 +1256,8 @@ void Binding::removeValidityConstraintListener( throw( NullPointerException, RuntimeException ) { - XValidityConstraintListeners_t::iterator aIter = - ::std::find( maValidityListeners.begin(), maValidityListeners.end(), + XValidityConstraintListeners_t::iterator aIter = + ::std::find( maValidityListeners.begin(), maValidityListeners.end(), xListener ); if( aIter != maValidityListeners.end() ) maValidityListeners.erase( aIter ); @@ -1265,7 +1265,7 @@ void Binding::removeValidityConstraintListener( -// +// // xml::dom::event::XEventListener // @@ -1367,7 +1367,7 @@ void Binding::initializePropertySet() initializePropertyValueCache( HANDLE_ExternalData ); } -void Binding::addModifyListener( +void Binding::addModifyListener( const XModifyListener_t& xListener ) throw( RuntimeException ) { @@ -1386,7 +1386,7 @@ void Binding::removeModifyListener( const XModifyListener_t& xListener ) throw( RuntimeException ) { - ModifyListeners_t::iterator aIter = + ModifyListeners_t::iterator aIter = ::std::find( maModifyListeners.begin(), maModifyListeners.end(), xListener ); if( aIter != maModifyListeners.end() ) maModifyListeners.erase( aIter ); diff --git a/forms/source/xforms/binding.hxx b/forms/source/xforms/binding.hxx index ba538441df91..b61a5597d831 100644 --- a/forms/source/xforms/binding.hxx +++ b/forms/source/xforms/binding.hxx @@ -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 @@ -34,18 +34,18 @@ // forward declaractions namespace xforms { - class Model; + class Model; class EvaluationContext; } namespace com { namespace sun { namespace star { namespace xml { namespace xpath { class XXPathAPI; } - namespace dom - { - class XNode; + namespace dom + { + class XNode; class XNodeList; } - } + } namespace container { class XNameContainer; } namespace xforms { class XModel; } namespace xsd { class XDataType; } @@ -130,7 +130,7 @@ private: /// an XPath-expression to be instantiated on the data instance PathExpression maBindingExpression; - /// an XPath-expression to determine read-only status + /// an XPath-expression to determine read-only status BoolExpression maReadonly; /// an XPath-expression to determine relevance @@ -154,7 +154,7 @@ private: /// a type name rtl::OUString msTypeName; - /// modify listeners + /// modify listeners ModifyListeners_t maModifyListeners; /// list entry listener @@ -192,7 +192,7 @@ public: Model_t getModel() const; /// get XForms model void _setModel( const Model_t& ); /// set XForms model (only called by Model) - + rtl::OUString getModelID() const; /// get ID of XForms model @@ -223,7 +223,7 @@ public: void setType( const rtl::OUString& ); /// set type name MIP (static) // a binding expression can only be interpreted with respect to - // suitable namespace declarations. We collect those in the model and in a binding. + // suitable namespace declarations. We collect those in the model and in a binding. // access to a binding's namespace // (set-method only changes local namespaces (but may add to model)) @@ -246,7 +246,7 @@ public: // - type (static; default: xsd:string) // - minOccurs/maxOccurs (computed XPath; default: 0/inf) // - p3ptype (static; no default) - + @@ -260,7 +260,7 @@ public: XNodeList_t getXNodeList(); /// heuristically determine whether this binding is simple binding - /// (here: simple binding == does not depend on other parts of the + /// (here: simple binding == does not depend on other parts of the /// instance, it's not a 'dynamic' binding) bool isSimpleBinding() const; @@ -344,7 +344,7 @@ private: /// bind this binding, and pre-compute the affected nodes void bind( bool bForceRebind = false ); - /// the binding value has been changed: + /// the binding value has been changed: /// trigger a modified event on all modified listeners void valueModified(); @@ -397,20 +397,20 @@ public: public: - virtual Sequence_Type_t SAL_CALL getSupportedValueTypes() + virtual Sequence_Type_t SAL_CALL getSupportedValueTypes() throw( RuntimeException_t ); - virtual sal_Bool SAL_CALL supportsType( const Type_t& aType ) + virtual sal_Bool SAL_CALL supportsType( const Type_t& aType ) throw( RuntimeException_t ); virtual Any_t SAL_CALL getValue( const Type_t& aType ) - throw( IncompatibleTypesException_t, + throw( IncompatibleTypesException_t, RuntimeException_t ); - virtual void SAL_CALL setValue( const Any_t& aValue ) - throw( IncompatibleTypesException_t, + virtual void SAL_CALL setValue( const Any_t& aValue ) + throw( IncompatibleTypesException_t, InvalidBindingStateException_t, - NoSupportException_t, + NoSupportException_t, RuntimeException_t ); @@ -443,7 +443,7 @@ public: // XValidator: // - virtual sal_Bool SAL_CALL isValid( + virtual sal_Bool SAL_CALL isValid( const Any_t& ) throw( RuntimeException_t ); @@ -469,7 +469,7 @@ public: public: - virtual void SAL_CALL addModifyListener( + virtual void SAL_CALL addModifyListener( const XModifyListener_t& xListener ) throw( RuntimeException_t ); @@ -495,12 +495,12 @@ public: - // + // // xml::dom::event::XEventListener // receive an event if our node changed // - virtual void SAL_CALL handleEvent( + virtual void SAL_CALL handleEvent( const XEvent_t& xEvent ) throw( RuntimeException_t ); diff --git a/forms/source/xforms/boolexpression.cxx b/forms/source/xforms/boolexpression.cxx index 9abf5590f70d..6a8750121021 100644 --- a/forms/source/xforms/boolexpression.cxx +++ b/forms/source/xforms/boolexpression.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 diff --git a/forms/source/xforms/boolexpression.hxx b/forms/source/xforms/boolexpression.hxx index 8da5d58ad3c0..1419ad431c19 100644 --- a/forms/source/xforms/boolexpression.hxx +++ b/forms/source/xforms/boolexpression.hxx @@ -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 diff --git a/forms/source/xforms/collection.hxx b/forms/source/xforms/collection.hxx index 0ba804c8e608..cebe52417ec2 100644 --- a/forms/source/xforms/collection.hxx +++ b/forms/source/xforms/collection.hxx @@ -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 @@ -166,28 +166,28 @@ public: // XElementAccess - virtual Type_t SAL_CALL getElementType() + virtual Type_t SAL_CALL getElementType() throw( RuntimeException_t ) { return getCppuType( static_cast<T*>( NULL ) ); } - virtual sal_Bool SAL_CALL hasElements() + virtual sal_Bool SAL_CALL hasElements() throw( RuntimeException_t ) { return hasItems(); } // XIndexAccess : XElementAccess - virtual sal_Int32 SAL_CALL getCount() + virtual sal_Int32 SAL_CALL getCount() throw( RuntimeException_t ) { return countItems(); } - virtual Any_t SAL_CALL getByIndex( sal_Int32 nIndex ) - throw( IndexOutOfBoundsException_t, - WrappedTargetException_t, + virtual Any_t SAL_CALL getByIndex( sal_Int32 nIndex ) + throw( IndexOutOfBoundsException_t, + WrappedTargetException_t, RuntimeException_t) { if( isValidIndex( nIndex ) ) @@ -197,11 +197,11 @@ public: } // XIndexReplace : XIndexAccess - virtual void SAL_CALL replaceByIndex( sal_Int32 nIndex, - const Any_t& aElement ) - throw( IllegalArgumentException_t, - IndexOutOfBoundsException_t, - WrappedTargetException_t, + virtual void SAL_CALL replaceByIndex( sal_Int32 nIndex, + const Any_t& aElement ) + throw( IllegalArgumentException_t, + IndexOutOfBoundsException_t, + WrappedTargetException_t, RuntimeException_t) { T t; @@ -221,18 +221,18 @@ public: return new Enumeration( this ); } - + // XSet : XEnumerationAccess - virtual sal_Bool SAL_CALL has( const Any_t& aElement ) + virtual sal_Bool SAL_CALL has( const Any_t& aElement ) throw( RuntimeException_t ) { T t; return ( aElement >>= t ) ? hasItem( t ) : sal_False; } - + virtual void SAL_CALL insert( const Any_t& aElement ) throw( IllegalArgumentException_t, - ElementExistException_t, + ElementExistException_t, RuntimeException_t ) { T t; @@ -262,7 +262,7 @@ public: // XContainer - virtual void SAL_CALL addContainerListener( + virtual void SAL_CALL addContainerListener( const XContainerListener_t& xListener ) throw( RuntimeException_t ) { @@ -277,7 +277,7 @@ public: throw( RuntimeException_t ) { OSL_ENSURE( xListener.is(), "need listener!" ); - Listeners_t::iterator aIter = + Listeners_t::iterator aIter = std::find( maListeners.begin(), maListeners.end(), xListener ); if( aIter != maListeners.end() ) maListeners.erase( aIter ); @@ -289,7 +289,7 @@ protected: void _elementInserted( sal_Int32 nPos ) { OSL_ENSURE( isValidIndex(nPos), "invalid index" ); - com::sun::star::container::ContainerEvent aEvent( + com::sun::star::container::ContainerEvent aEvent( static_cast<com::sun::star::container::XIndexReplace*>( this ), com::sun::star::uno::makeAny( nPos ), com::sun::star::uno::makeAny( getItem( nPos ) ), @@ -304,7 +304,7 @@ protected: void _elementRemoved( const T& aOld ) { - com::sun::star::container::ContainerEvent aEvent( + com::sun::star::container::ContainerEvent aEvent( static_cast<com::sun::star::container::XIndexReplace*>( this ), com::sun::star::uno::Any(), com::sun::star::uno::makeAny( aOld ), @@ -320,7 +320,7 @@ protected: void _elementReplaced( const sal_Int32 nPos, const T& aNew ) { OSL_ENSURE( isValidIndex(nPos), "invalid index" ); - com::sun::star::container::ContainerEvent aEvent( + com::sun::star::container::ContainerEvent aEvent( static_cast<com::sun::star::container::XIndexReplace*>( this ), com::sun::star::uno::makeAny( nPos ), com::sun::star::uno::makeAny( getItem( nPos ) ), diff --git a/forms/source/xforms/computedexpression.cxx b/forms/source/xforms/computedexpression.cxx index cb8cb9e99ab7..ad9421ab4f7f 100644 --- a/forms/source/xforms/computedexpression.cxx +++ b/forms/source/xforms/computedexpression.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 @@ -72,7 +72,7 @@ using com::sun::star::util::SearchAlgorithms_REGEXP; namespace xforms { -ComputedExpression::ComputedExpression() +ComputedExpression::ComputedExpression() : msExpression(), mbIsEmpty( true ), mbIsSimple( true ), @@ -109,8 +109,8 @@ bool ComputedExpression::_checkExpression( const sal_Char* pExpression ) const aSearchOptions.algorithmType = SearchAlgorithms_REGEXP; aSearchOptions.searchString = String( pExpression, RTL_TEXTENCODING_ASCII_US ); utl::TextSearch aTextSearch( aSearchOptions ); - - xub_StrLen nLength = + + xub_StrLen nLength = static_cast<xub_StrLen>( msExpression.getLength() ); xub_StrLen nStart = 0; xub_StrLen nEnd = nLength; @@ -118,7 +118,7 @@ bool ComputedExpression::_checkExpression( const sal_Char* pExpression ) const // our expression is static only if 1) we found our regexp, and 2) // the regexp goes from beginning to end. - return ( nLength == 0 || nSearch != 0 ) + return ( nLength == 0 || nSearch != 0 ) && ( nStart == 0 && nEnd == nLength ); } @@ -141,7 +141,7 @@ const OUString ComputedExpression::_getExpressionForEvaluation() const return msExpression; } -bool ComputedExpression::_evaluate( +bool ComputedExpression::_evaluate( const xforms::EvaluationContext& rContext, const OUString& sExpression ) { @@ -151,7 +151,7 @@ bool ComputedExpression::_evaluate( mxResult.clear(); try { - mxResult = _getXPathAPI(rContext)->eval( rContext.mxContextNode, + mxResult = _getXPathAPI(rContext)->eval( rContext.mxContextNode, sExpression ); } catch( const Exception& ) @@ -168,14 +168,14 @@ bool ComputedExpression::evaluate( const EvaluationContext& rContext ) // an older result); neither for empty expressions if( mbIsEmpty || (mxResult.is() && mbIsSimple) ) return true; - + return _evaluate( rContext, _getExpressionForEvaluation() ); } bool ComputedExpression::hasValue() const { - return mxResult.is() && + return mxResult.is() && mxResult->getObjectType() != XPathObjectType_XPATH_UNDEFINED; } @@ -205,8 +205,8 @@ bool ComputedExpression::getBool( bool bDefault ) const Reference<XXPathAPI> ComputedExpression::_getXPathAPI(const xforms::EvaluationContext& aContext) { // create XPath API, then register namespaces - Reference<XXPathAPI> xXPath( createInstance( - OUSTRING( "com.sun.star.xml.xpath.XPathAPI" ) ), + Reference<XXPathAPI> xXPath( createInstance( + OUSTRING( "com.sun.star.xml.xpath.XPathAPI" ) ), UNO_QUERY_THROW ); OSL_ENSURE( xXPath.is(), "cannot get XPath API" ); @@ -220,8 +220,8 @@ Reference<XXPathAPI> ComputedExpression::_getXPathAPI(const xforms::EvaluationCo aValue.Value <<= aContext.mxContextNode; aSequence[1] <<= aValue; Reference<XMultiServiceFactory> aFactory = comphelper::getProcessServiceFactory(); - Reference< XXPathExtension > aExtension( aFactory->createInstanceWithArguments( - OUSTRING( "com.sun.star.comp.xml.xpath.XFormsExtension"), aSequence), UNO_QUERY_THROW); + Reference< XXPathExtension > aExtension( aFactory->createInstanceWithArguments( + OUSTRING( "com.sun.star.comp.xml.xpath.XFormsExtension"), aSequence), UNO_QUERY_THROW); xXPath->registerExtensionInstance(aExtension); // register namespaces diff --git a/forms/source/xforms/computedexpression.hxx b/forms/source/xforms/computedexpression.hxx index 316571d906ba..8d1ef01ab5a1 100644 --- a/forms/source/xforms/computedexpression.hxx +++ b/forms/source/xforms/computedexpression.hxx @@ -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 @@ -36,7 +36,7 @@ // forward declaractions namespace com { namespace sun { namespace star -{ +{ namespace xml { namespace dom { class XNode; } diff --git a/forms/source/xforms/convert.cxx b/forms/source/xforms/convert.cxx index 4e7ecbab2561..1f391631bd08 100644 --- a/forms/source/xforms/convert.cxx +++ b/forms/source/xforms/convert.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 @@ -222,18 +222,18 @@ namespace // ------------------------------------------------------------------------ Any lcl_toAny_bool( const OUString& rStr ) - { + { bool b = ( rStr == OUSTRING("true") || rStr == OUSTRING("1") ); return makeAny( b ); } // ------------------------------------------------------------------------ OUString lcl_toXSD_double( const Any& rAny ) - { + { double f = 0.0; rAny >>= f; - return rtl::math::isFinite( f ) + return rtl::math::isFinite( f ) ? rtl::math::doubleToUString( f, rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max, '.', sal_True ) @@ -242,9 +242,9 @@ namespace // ------------------------------------------------------------------------ Any lcl_toAny_double( const OUString& rString ) - { + { rtl_math_ConversionStatus eStatus; - double f = rtl::math::stringToDouble( + double f = rtl::math::stringToDouble( rString, sal_Unicode('.'), sal_Unicode(','), &eStatus, NULL ); return ( eStatus == rtl_math_ConversionStatus_Ok ) ? makeAny( f ) : Any(); } @@ -549,7 +549,7 @@ rtl::OUString Convert::toXSD( const Any_t& rAny ) return aIter != maMap.end() ? aIter->second.first( rAny ) : OUString(); } -Convert::Any_t Convert::toAny( const rtl::OUString& rValue, +Convert::Any_t Convert::toAny( const rtl::OUString& rValue, const Type_t& rType ) { Map_t::iterator aIter = maMap.find( rType ); diff --git a/forms/source/xforms/convert.hxx b/forms/source/xforms/convert.hxx index 684ba4311af8..86c624d5811c 100644 --- a/forms/source/xforms/convert.hxx +++ b/forms/source/xforms/convert.hxx @@ -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 diff --git a/forms/source/xforms/datatyperepository.cxx b/forms/source/xforms/datatyperepository.cxx index a4bce7e66db3..a5c5f8b51281 100644 --- a/forms/source/xforms/datatyperepository.cxx +++ b/forms/source/xforms/datatyperepository.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 diff --git a/forms/source/xforms/datatyperepository.hxx b/forms/source/xforms/datatyperepository.hxx index e2f61cdaaf35..07e09d3cc06e 100644 --- a/forms/source/xforms/datatyperepository.hxx +++ b/forms/source/xforms/datatyperepository.hxx @@ -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 diff --git a/forms/source/xforms/datatypes.cxx b/forms/source/xforms/datatypes.cxx index d9278a4a0860..ce88648dbc05 100644 --- a/forms/source/xforms/datatypes.cxx +++ b/forms/source/xforms/datatypes.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 @@ -213,7 +213,7 @@ namespace xforms static void lcl_initializePatternMatcher( ::std::auto_ptr< RegexMatcher >& _rpMatcher, const ::rtl::OUString& _rPattern ) { UErrorCode nMatchStatus = U_ZERO_ERROR; - UnicodeString aIcuPattern( reinterpret_cast<const UChar *>(_rPattern.getStr()), _rPattern.getLength() ); // UChar != sal_Unicode in MinGW + UnicodeString aIcuPattern( reinterpret_cast<const UChar *>(_rPattern.getStr()), _rPattern.getLength() ); // UChar != sal_Unicode in MinGW _rpMatcher.reset( new RegexMatcher( aIcuPattern, 0, nMatchStatus ) ); OSL_ENSURE( U_SUCCESS( nMatchStatus ), "lcl_initializePatternMatcher: invalid pattern property!" ); // if asserts, then something changed our pattern without going to convertFastPropertyValue/checkPropertySanity @@ -222,7 +222,7 @@ namespace xforms static bool lcl_matchString( RegexMatcher& _rMatcher, const ::rtl::OUString& _rText ) { UErrorCode nMatchStatus = U_ZERO_ERROR; - UnicodeString aInput( reinterpret_cast<const UChar *>(_rText.getStr()), _rText.getLength() ); // UChar != sal_Unicode in MinGW + UnicodeString aInput( reinterpret_cast<const UChar *>(_rText.getStr()), _rText.getLength() ); // UChar != sal_Unicode in MinGW _rMatcher.reset( aInput ); if ( _rMatcher.matches( nMatchStatus ) ) { @@ -296,7 +296,7 @@ namespace xforms ::rtl::OUString sPattern; OSL_VERIFY( _rNewValue >>= sPattern ); - UnicodeString aIcuPattern( reinterpret_cast<const UChar *>(sPattern.getStr()), sPattern.getLength() ); // UChar != sal_Unicode in MinGW + UnicodeString aIcuPattern( reinterpret_cast<const UChar *>(sPattern.getStr()), sPattern.getLength() ); // UChar != sal_Unicode in MinGW UErrorCode nMatchStatus = U_ZERO_ERROR; RegexMatcher aMatcher( aIcuPattern, 0, nMatchStatus ); if ( U_FAILURE( nMatchStatus ) ) @@ -770,7 +770,7 @@ namespace xforms } //==================================================================== - //= + //= //==================================================================== #define DEFAULT_IMPLEMNENT_SUBTYPE( classname, typeclass ) \ classname::classname( const ::rtl::OUString& _rName ) \ diff --git a/forms/source/xforms/datatypes.hxx b/forms/source/xforms/datatypes.hxx index 83ac51b551f4..f38484127240 100644 --- a/forms/source/xforms/datatypes.hxx +++ b/forms/source/xforms/datatypes.hxx @@ -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 @@ -353,7 +353,7 @@ namespace xforms }; //==================================================================== - //= + //= //==================================================================== #define DEFAULT_DECLARE_SUBTYPE( classname, valuetype ) \ class classname; \ diff --git a/forms/source/xforms/datatypes_impl.hxx b/forms/source/xforms/datatypes_impl.hxx index cc0b2c5b3b35..4ebd822a203c 100644 --- a/forms/source/xforms/datatypes_impl.hxx +++ b/forms/source/xforms/datatypes_impl.hxx @@ -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 diff --git a/forms/source/xforms/enumeration.cxx b/forms/source/xforms/enumeration.cxx index 82a9118f7e66..8187d5d0fc2e 100644 --- a/forms/source/xforms/enumeration.cxx +++ b/forms/source/xforms/enumeration.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 diff --git a/forms/source/xforms/enumeration.hxx b/forms/source/xforms/enumeration.hxx index 395f29dd4845..c2b08db42d85 100644 --- a/forms/source/xforms/enumeration.hxx +++ b/forms/source/xforms/enumeration.hxx @@ -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 @@ -43,7 +43,7 @@ namespace com { namespace sun { namespace star { } } } /** implement XEnumeration based on container::XIndexAccess */ -class Enumeration +class Enumeration : public cppu::WeakImplHelper1<com::sun::star::container::XEnumeration> { com::sun::star::uno::Reference<com::sun::star::container::XIndexAccess> mxContainer; diff --git a/forms/source/xforms/evaluationcontext.hxx b/forms/source/xforms/evaluationcontext.hxx index a5f8b32d5df3..9cbfea858ec1 100644 --- a/forms/source/xforms/evaluationcontext.hxx +++ b/forms/source/xforms/evaluationcontext.hxx @@ -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 @@ -49,7 +49,7 @@ public: mnContextSize( 0 ) { } - EvaluationContext( + EvaluationContext( const com::sun::star::uno::Reference<com::sun::star::xml::dom::XNode>& xContextNode, const com::sun::star::uno::Reference<com::sun::star::xforms::XModel>& xModel, const com::sun::star::uno::Reference<com::sun::star::container::XNameContainer>& xNamespaces, diff --git a/forms/source/xforms/mip.cxx b/forms/source/xforms/mip.cxx index a8bcda632d34..0a645d3b7f1e 100644 --- a/forms/source/xforms/mip.cxx +++ b/forms/source/xforms/mip.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 @@ -37,7 +37,7 @@ namespace xforms MIP::MIP() -{ +{ resetReadonly(); resetRequired(); resetRelevant(); diff --git a/forms/source/xforms/mip.hxx b/forms/source/xforms/mip.hxx index ad0db3e05916..3ce4d1c505e1 100644 --- a/forms/source/xforms/mip.hxx +++ b/forms/source/xforms/mip.hxx @@ -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 @@ -106,8 +106,8 @@ public: rtl::OUString getConstraintExplanation() const; // - calculate (computed XPath; default: has none (false)) - // (for calculate, we only store whether a calculate MIP is present; - // the actual calculate value is handled my changing the instance + // (for calculate, we only store whether a calculate MIP is present; + // the actual calculate value is handled my changing the instance // directly) bool hasCalculate() const; void setHasCalculate( bool ); diff --git a/forms/source/xforms/model.cxx b/forms/source/xforms/model.cxx index f7939cff3baf..5c9bf8a4bf97 100644 --- a/forms/source/xforms/model.cxx +++ b/forms/source/xforms/model.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 @@ -576,8 +576,8 @@ void Model::refresh() void SAL_CALL Model::submitWithInteraction( const rtl::OUString& sID, const XInteractionHandler_t& _rxHandler ) - throw( VetoException, - WrappedTargetException, + throw( VetoException, + WrappedTargetException, RuntimeException ) { DBG_INVARIANT(); diff --git a/forms/source/xforms/model.hxx b/forms/source/xforms/model.hxx index 03db8210f388..b6987661940f 100644 --- a/forms/source/xforms/model.hxx +++ b/forms/source/xforms/model.hxx @@ -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 diff --git a/forms/source/xforms/model_helper.hxx b/forms/source/xforms/model_helper.hxx index 064d60f3ab71..d010296c47be 100644 --- a/forms/source/xforms/model_helper.hxx +++ b/forms/source/xforms/model_helper.hxx @@ -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 @@ -148,7 +148,7 @@ sal_Int32 lcl_findInstance( const InstanceCollection*, // get values from Sequence<PropertyValue> describing an Instance -void getInstanceData( +void getInstanceData( const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>&, rtl::OUString* pID, com::sun::star::uno::Reference<com::sun::star::xml::dom::XDocument>*, @@ -156,7 +156,7 @@ void getInstanceData( bool* pURLOnce ); // set values on Sequence<PropertyValue> for an Instance -void setInstanceData( +void setInstanceData( com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>&, const rtl::OUString* pID, const com::sun::star::uno::Reference<com::sun::star::xml::dom::XDocument>*, diff --git a/forms/source/xforms/model_ui.cxx b/forms/source/xforms/model_ui.cxx index 244e1443e6cb..ddcd7cc23d1e 100644 --- a/forms/source/xforms/model_ui.cxx +++ b/forms/source/xforms/model_ui.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 @@ -186,14 +186,14 @@ void lcl_OutInstance( OUStringBuffer& rBuffer, Model* pModel ) { Reference<XDocument> xDoc = xNode->getOwnerDocument(); - + if( xDoc != pModel->getDefaultInstance() ) { rBuffer.insert( 0, OUSTRING("')") ); // iterate over instances, and find the right one OUString sInstanceName; - Reference<XEnumeration> xEnum = + Reference<XEnumeration> xEnum = pModel->getInstances()->createEnumeration(); while( ( sInstanceName.getLength() == 0 ) && xEnum->hasMoreElements() ) { @@ -370,7 +370,7 @@ OUString Model::getBindingName( const XPropertySet_t& xBinding, xBinding->getPropertyValue( OUSTRING("BindingID" ) ) >>= sID; OUString sExpression; xBinding->getPropertyValue( OUSTRING("BindingExpression" ) ) >>= sExpression; - + OUStringBuffer aBuffer; if( sID.getLength() > 0 ) { @@ -431,7 +431,7 @@ Model::XDocument_t Model::newInstance( const rtl::OUString& sName, XDocument_t xInstance = getDocumentBuilder()->newDocument(); DBG_ASSERT( xInstance.is(), "failed to create DOM instance" ); - Reference<XNode>( xInstance, UNO_QUERY_THROW )->appendChild( + Reference<XNode>( xInstance, UNO_QUERY_THROW )->appendChild( Reference<XNode>( xInstance->createElement( OUSTRING("instanceData") ), UNO_QUERY_THROW ) ); @@ -521,7 +521,7 @@ void Model::removeInstance( const rtl::OUString& sName ) mpInstances->removeItem( mpInstances->getItem( nPos ) ); } -Reference<XNameContainer> lcl_getModels( +Reference<XNameContainer> lcl_getModels( const Reference<com::sun::star::frame::XModel>& xComponent ) { Reference<XNameContainer> xRet; @@ -560,7 +560,7 @@ void Model::renameModel( const Reference<com::sun::star::frame::XModel>& xCmp, throw( RuntimeException ) { Reference<XNameContainer> xModels = lcl_getModels( xCmp ); - if( xModels.is() + if( xModels.is() && xModels->hasByName( sFrom ) && ! xModels->hasByName( sTo ) ) { @@ -576,7 +576,7 @@ void Model::removeModel( const Reference<com::sun::star::frame::XModel>& xCmp, throw( RuntimeException ) { Reference<XNameContainer> xModels = lcl_getModels( xCmp ); - if( xModels.is() + if( xModels.is() && xModels->hasByName( sName ) ) { xModels->removeByName( sName ); @@ -588,11 +588,11 @@ Model::XNode_t Model::createElement( const XNode_t& xParent, throw( RuntimeException ) { Reference<XNode> xNode; - if( xParent.is() + if( xParent.is() && isValidXMLName( sName ) ) { // TODO: implement proper namespace handling - xNode.set( xParent->getOwnerDocument()->createElement( sName ), + xNode.set( xParent->getOwnerDocument()->createElement( sName ), UNO_QUERY ); } return xNode; @@ -604,7 +604,7 @@ Model::XNode_t Model::createAttribute( const XNode_t& xParent, { Reference<XNode> xNode; Reference<XElement> xElement( xParent, UNO_QUERY ); - if( xParent.is() + if( xParent.is() && xElement.is() && isValidXMLName( sName ) ) { @@ -639,7 +639,7 @@ Model::XNode_t Model::renameNode( const XNode_t& xNode, return xNode; // note old binding expression so we can adjust bindings below - OUString sOldDefaultBindingExpression = + OUString sOldDefaultBindingExpression = getDefaultBindingExpressionForNode( xNode ); Reference<XDocument> xDoc = xNode->getOwnerDocument(); @@ -691,14 +691,14 @@ Model::XNode_t Model::renameNode( const XNode_t& xNode, if( xNew.is() ) { // iterate over bindings and replace default expressions - OUString sNewDefaultBindingExpression = + OUString sNewDefaultBindingExpression = getDefaultBindingExpressionForNode( xNew ); for( sal_Int32 n = 0; n < mpBindings->countItems(); n++ ) { Binding* pBinding = Binding::getBinding( mpBindings->Collection<XPropertySet_t>::getItem( n ) ); - if( pBinding->getBindingExpression() + if( pBinding->getBindingExpression() == sOldDefaultBindingExpression ) pBinding->setBindingExpression( sNewDefaultBindingExpression ); } @@ -757,7 +757,7 @@ Model::XPropertySet_t Model::getBindingForNode( const XNode_t& xNode, if( bCreate && pBestBinding == NULL ) { pBestBinding = new Binding(); - pBestBinding->setBindingExpression( + pBestBinding->setBindingExpression( getDefaultBindingExpressionForNode( xNode ) ); mpBindings->addItem( pBestBinding ); } @@ -812,7 +812,7 @@ OUString lcl_serializeForDisplay( const Reference<XNodeList>& xNodes ) for( sal_Int32 i = 0; i < nLength; i++ ) { Reference<XNode> xCurrent = xNodes->item( i ); - + switch ( xCurrent->getNodeType() ) { case NodeType_DOCUMENT_NODE: @@ -842,14 +842,14 @@ OUString lcl_serializeForDisplay( const Reference<XNodeList>& xNodes ) if ( nAttributeNodes ) // had only attribute nodes return sResult; - + // serialize fragment CSerializationAppXML aSerialization; aSerialization.setSource( xFragment ); aSerialization.serialize(); // copy stream into buffer - Reference<XTextInputStream> xTextInputStream( + Reference<XTextInputStream> xTextInputStream( createInstance( OUSTRING("com.sun.star.io.TextInputStream") ), UNO_QUERY ); Reference<XActiveDataSink>( xTextInputStream, UNO_QUERY_THROW ) @@ -927,7 +927,7 @@ OUString lcl_serializeForDisplay( const Reference<XXPathObject>& xResult ) return aBuffer.makeStringAndClear(); } -OUString Model::getResultForExpression( +OUString Model::getResultForExpression( const XPropertySet_t& xBinding, sal_Bool bIsBindingExpression, const OUString& sExpression ) @@ -950,7 +950,7 @@ OUString Model::getResultForExpression( else { // MIP (not binding): iterate over bindings contexts - std::vector<EvaluationContext> aContext = + std::vector<EvaluationContext> aContext = pBinding->getMIPEvaluationContexts(); for( std::vector<EvaluationContext>::iterator aIter = aContext.begin(); aIter != aContext.end(); @@ -976,7 +976,7 @@ sal_Bool Model::isValidPrefixName( const OUString& sName ) return ::isValidPrefixName( sName, NULL ); } -void Model::setNodeValue( +void Model::setNodeValue( const XNode_t& xNode, const rtl::OUString& sValue ) throw( RuntimeException ) @@ -989,7 +989,7 @@ void Model::setNodeValue( // helper functions from model_helper.hxx // -void xforms::getInstanceData( +void xforms::getInstanceData( const Sequence<PropertyValue>& aValues, OUString* pID, Reference<XDocument>* pInstance, @@ -1013,7 +1013,7 @@ void xforms::getInstanceData( } } -void xforms::setInstanceData( +void xforms::setInstanceData( Sequence<PropertyValue>& aSequence, const OUString* _pID, const Reference<XDocument>* _pInstance, diff --git a/forms/source/xforms/namedcollection.hxx b/forms/source/xforms/namedcollection.hxx index 2b06343c4a40..cba79e2f053e 100644 --- a/forms/source/xforms/namedcollection.hxx +++ b/forms/source/xforms/namedcollection.hxx @@ -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 @@ -100,7 +100,7 @@ protected: public: // XElementAccess - virtual typename Collection<T>::Type_t SAL_CALL getElementType() + virtual typename Collection<T>::Type_t SAL_CALL getElementType() throw( typename Collection<T>::RuntimeException_t ) { return Collection<T>::getElementType(); @@ -116,14 +116,14 @@ public: virtual typename Collection<T>::Any_t SAL_CALL getByName( const rtl::OUString& aName ) throw( typename Collection<T>::NoSuchElementException_t, - typename Collection<T>::WrappedTargetException_t, + typename Collection<T>::WrappedTargetException_t, typename Collection<T>::RuntimeException_t ) { if( hasItem( aName ) ) return com::sun::star::uno::makeAny( getItem( aName ) ); else throw typename Collection<T>::NoSuchElementException_t(); - + } virtual Names_t SAL_CALL getElementNames() diff --git a/forms/source/xforms/pathexpression.cxx b/forms/source/xforms/pathexpression.cxx index 6494059f56bb..8115aa1abed2 100644 --- a/forms/source/xforms/pathexpression.cxx +++ b/forms/source/xforms/pathexpression.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 @@ -73,7 +73,7 @@ using namespace std; namespace xforms { -PathExpression::PathExpression() +PathExpression::PathExpression() : ComputedExpression(), maNodes() { @@ -94,7 +94,7 @@ void PathExpression::setExpression( const OUString& rExpression ) // whether it contains only 'simple' (i.e. static) conditions. For // now, we check whether it only contains number positions. // (TODO: Only works for names containing only ASCII letters+digits.) - mbIsSimple = + mbIsSimple = _checkExpression( "( */@?[a-zA-Z0-9:]+( *\\[ *[0-9 ]+ *\\] *)?)+" ); maNodes.clear(); diff --git a/forms/source/xforms/pathexpression.hxx b/forms/source/xforms/pathexpression.hxx index a6d89186e9ff..72363edcd1e0 100644 --- a/forms/source/xforms/pathexpression.hxx +++ b/forms/source/xforms/pathexpression.hxx @@ -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 @@ -38,10 +38,10 @@ // forward declaractions namespace com { namespace sun { namespace star -{ - namespace xml { namespace dom +{ + namespace xml { namespace dom { - class XNodeList; + class XNodeList; namespace events { class XEventListener; } } } } } } diff --git a/forms/source/xforms/propertysetbase.cxx b/forms/source/xforms/propertysetbase.cxx index dd2c3f139098..aba016dac286 100644 --- a/forms/source/xforms/propertysetbase.cxx +++ b/forms/source/xforms/propertysetbase.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 diff --git a/forms/source/xforms/propertysetbase.hxx b/forms/source/xforms/propertysetbase.hxx index 27556b1381f8..62987dea20b2 100644 --- a/forms/source/xforms/propertysetbase.hxx +++ b/forms/source/xforms/propertysetbase.hxx @@ -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 @@ -251,7 +251,7 @@ protected: void notifyAndCachePropertyValue( sal_Int32 nHandle ); /** initializes the property value cache for the given property, with its current value - + Usually used to initialize the cache with values which are different from default constructed values. Say you have a boolean property whose initial state is <TRUE/>. Say you call <member>notifyAndCachePropertyValue</member> the first time: it will @@ -339,7 +339,7 @@ public: /** constructs a PropertyChangeNotifier @param rPropertySet the property set implementation whose property is going to be changed. Note - that this property set implementation must live at least as long as the + that this property set implementation must live at least as long as the PropertyChangeNotifier instance does. @param nHandle the handle of the property which is going to be changed. Must be a valid property diff --git a/forms/source/xforms/resourcehelper.cxx b/forms/source/xforms/resourcehelper.cxx index 1fec9f3502d0..412e528527b6 100644 --- a/forms/source/xforms/resourcehelper.cxx +++ b/forms/source/xforms/resourcehelper.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 diff --git a/forms/source/xforms/resourcehelper.hxx b/forms/source/xforms/resourcehelper.hxx index 0b429cd0eeb7..a392a6e3eb6c 100644 --- a/forms/source/xforms/resourcehelper.hxx +++ b/forms/source/xforms/resourcehelper.hxx @@ -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 diff --git a/forms/source/xforms/submission.cxx b/forms/source/xforms/submission.cxx index deafc88cb5e9..828846c47276 100644 --- a/forms/source/xforms/submission.cxx +++ b/forms/source/xforms/submission.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 @@ -348,7 +348,7 @@ bool Submission::doSubmit( const Reference< XInteractionHandler >& xHandler ) Reference< XDocument > aInstanceDoc = getInstanceDocument(xResult); aResult = xSubmission->replace(getReplace(), aInstanceDoc, Reference< XFrame >()); } - + return ( aResult == CSubmission::SUCCESS ); } @@ -501,10 +501,10 @@ OUString lcl_message( const OUString& rID, const OUString& rText ) return aMessage.makeStringAndClear(); } -void SAL_CALL Submission::submitWithInteraction( - const Reference<XInteractionHandler>& _rxHandler ) - throw ( VetoException, - WrappedTargetException, +void SAL_CALL Submission::submitWithInteraction( + const Reference<XInteractionHandler>& _rxHandler ) + throw ( VetoException, + WrappedTargetException, RuntimeException ) { // as long as this class is not really threadsafe, we need to copy @@ -526,14 +526,14 @@ void SAL_CALL Submission::submitWithInteraction( bool bValid = pModel->isValid(); if( ! bValid ) { - InvalidDataOnSubmitException aInvalidDataException( + InvalidDataOnSubmitException aInvalidDataException( lcl_message(sID, OUSTRING(" due to invalid data") ), *this ); if( _rxHandler.is() ) { // labouriously create interaction request - comphelper::OInteractionRequest* pRequest - = new comphelper::OInteractionRequest( + comphelper::OInteractionRequest* pRequest + = new comphelper::OInteractionRequest( makeAny( aInvalidDataException ) ); Reference<XInteractionRequest> xRequest = pRequest; @@ -577,7 +577,7 @@ void SAL_CALL Submission::submitWithInteraction( catch( const Exception& e ) { // exception caught: re-throw as wrapped target exception - throw WrappedTargetException( + throw WrappedTargetException( lcl_message( sID, OUSTRING(" due to exception being thrown") ), *this, makeAny( e ) ); } @@ -586,10 +586,10 @@ void SAL_CALL Submission::submitWithInteraction( { mxModel->rebuild(); } - else + else { // other failure: throw wrapped target exception, too. - throw WrappedTargetException( + throw WrappedTargetException( lcl_message( sID, OUString() ), *this, Any() ); } } @@ -658,7 +658,7 @@ Reference< XDocument > Submission::getInstanceDocument(const Reference< XXPathOb if (aList->getLength() > 0) aDocument = aList->item(0)->getOwnerDocument(); } - return aDocument; + return aDocument; } Reference< XDocumentFragment > Submission::createSubmissionDocument(const Reference< XXPathObject >& aObj, sal_Bool bRemoveWSNodes) diff --git a/forms/source/xforms/submission.hxx b/forms/source/xforms/submission.hxx index b0c377844cb1..3077a946a062 100644 --- a/forms/source/xforms/submission.hxx +++ b/forms/source/xforms/submission.hxx @@ -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 @@ -102,7 +102,7 @@ private: com::sun::star::uno::Reference< com::sun::star::xml::dom::XDocumentFragment > createSubmissionDocument(const com::sun::star::uno::Reference< com::sun::star::xml::xpath::XXPathObject >& aObject, sal_Bool bRemoveWSNodes = sal_False); - com::sun::star::uno::Reference< com::sun::star::xml::dom::XDocument > + com::sun::star::uno::Reference< com::sun::star::xml::dom::XDocument > getInstanceDocument(const com::sun::star::uno::Reference< com::sun::star::xml::xpath::XXPathObject >& aObject); com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory > m_aFactory; diff --git a/forms/source/xforms/submission/replace.cxx b/forms/source/xforms/submission/replace.cxx index da5968bc0123..3523059050af 100644 --- a/forms/source/xforms/submission/replace.cxx +++ b/forms/source/xforms/submission/replace.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 diff --git a/forms/source/xforms/submission/serialization.hxx b/forms/source/xforms/submission/serialization.hxx index 966a3f9e0ae8..c1daa6edaba8 100644 --- a/forms/source/xforms/submission/serialization.hxx +++ b/forms/source/xforms/submission/serialization.hxx @@ -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 @@ -70,7 +70,7 @@ public: that control aspects of the serialization eachs serialization may support individual properties */ - void setProperties(const CSS::uno::Sequence< CSS::beans::NamedValue >& props) + void setProperties(const CSS::uno::Sequence< CSS::beans::NamedValue >& props) { m_properties.clear(); rtl::OUString aValue; @@ -88,7 +88,7 @@ public: /** get the serialized bytes. - reads up to buffer->getLength() bytes and returns the number of + reads up to buffer->getLength() bytes and returns the number of bytes read. returns -1 on error */ diff --git a/forms/source/xforms/submission/serialization_app_xml.cxx b/forms/source/xforms/submission/serialization_app_xml.cxx index 76989ad7fdfb..2e90215c8642 100644 --- a/forms/source/xforms/submission/serialization_app_xml.cxx +++ b/forms/source/xforms/submission/serialization_app_xml.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 @@ -44,13 +44,13 @@ CSerializationAppXML::CSerializationAppXML() : m_aFactory(utl::getProcessServiceFactory()) - , m_aPipe(CSS::uno::Reference< CSS::io::XOutputStream > (m_aFactory->createInstance( + , m_aPipe(CSS::uno::Reference< CSS::io::XOutputStream > (m_aFactory->createInstance( rtl::OUString::createFromAscii("com.sun.star.io.Pipe")), CSS::uno::UNO_QUERY)) { OSL_ENSURE(m_aPipe.is(), "cannot create Pipe"); } -CSS::uno::Reference< CSS::io::XInputStream > +CSS::uno::Reference< CSS::io::XInputStream > CSerializationAppXML::getInputStream() { // The pipes output is provided through it's @@ -58,7 +58,7 @@ CSerializationAppXML::getInputStream() return CSS::uno::Reference< CSS::io::XInputStream >(m_aPipe, CSS::uno::UNO_QUERY); } -void +void CSerializationAppXML::serialize_node(const CSS::uno::Reference< CSS::xml::dom::XNode >& rNode) { CSS::uno::Reference< CSS::xml::dom::XNode > aNode = rNode; @@ -66,13 +66,13 @@ CSerializationAppXML::serialize_node(const CSS::uno::Reference< CSS::xml::dom::X { CSS::uno::Reference< CSS::xml::dom::XDocument > aDoc(rNode, CSS::uno::UNO_QUERY_THROW); aNode = CSS::uno::Reference< CSS::xml::dom::XNode >(aDoc->getDocumentElement(), CSS::uno::UNO_QUERY_THROW); - } + } if (aNode->getNodeType() != CSS::xml::dom::NodeType_ELEMENT_NODE) return; // clone the node to a new document and serialize that document CSS::uno::Reference< CSS::lang::XUnoTunnel > aTunnel(aNode, CSS::uno::UNO_QUERY); - if (aTunnel.is()) + if (aTunnel.is()) { xmlNodePtr aNodePtr = reinterpret_cast< xmlNodePtr >( aTunnel->getSomething(CSS::uno::Sequence< sal_Int8 >()) ); xmlDocPtr aDocPtr = xmlNewDoc((xmlChar*)"1.0"); @@ -82,9 +82,9 @@ CSerializationAppXML::serialize_node(const CSS::uno::Reference< CSS::xml::dom::X xmlChar *buffer = NULL; sal_Int32 size = 0; xmlDocDumpMemory(aDocPtr, &buffer, (int*)&size); - + // write the xml into the pipe through it's XOutputStream interface - m_aPipe->writeBytes(CSS::uno::Sequence< sal_Int8 >((sal_Int8*)buffer, size)); + m_aPipe->writeBytes(CSS::uno::Sequence< sal_Int8 >((sal_Int8*)buffer, size)); xmlFree(buffer); } @@ -109,7 +109,7 @@ CSerializationAppXML::serialize_nodeset() void CSerializationAppXML::serialize() -{ +{ if (!m_aFragment.is()) return; CSS::uno::Reference< CSS::xml::dom::XNode > cur = m_aFragment->getFirstChild(); diff --git a/forms/source/xforms/submission/serialization_app_xml.hxx b/forms/source/xforms/submission/serialization_app_xml.hxx index 9564961bbbc9..406d5aa597df 100644 --- a/forms/source/xforms/submission/serialization_app_xml.hxx +++ b/forms/source/xforms/submission/serialization_app_xml.hxx @@ -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 @@ -43,7 +43,7 @@ private: void serialize_node(const CSS::uno::Reference< CSS::xml::dom::XNode >& aNode); void serialize_nodeset(); - + public: CSerializationAppXML(); diff --git a/forms/source/xforms/submission/serialization_urlencoded.cxx b/forms/source/xforms/submission/serialization_urlencoded.cxx index cb6403c8d13e..9220e9c76a39 100644 --- a/forms/source/xforms/submission/serialization_urlencoded.cxx +++ b/forms/source/xforms/submission/serialization_urlencoded.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 diff --git a/forms/source/xforms/submission/serialization_urlencoded.hxx b/forms/source/xforms/submission/serialization_urlencoded.hxx index a5e9a4eb1060..b3501762a96d 100644 --- a/forms/source/xforms/submission/serialization_urlencoded.hxx +++ b/forms/source/xforms/submission/serialization_urlencoded.hxx @@ -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 diff --git a/forms/source/xforms/submission/submission.hxx b/forms/source/xforms/submission/submission.hxx index d01fb8fb0aba..098db603f935 100644 --- a/forms/source/xforms/submission/submission.hxx +++ b/forms/source/xforms/submission/submission.hxx @@ -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 @@ -115,7 +115,7 @@ public: } }; -class CSubmission +class CSubmission { protected: diff --git a/forms/source/xforms/submission/submission_get.cxx b/forms/source/xforms/submission/submission_get.cxx index 95d1ce3ce2be..8fb5e39a2cc6 100644 --- a/forms/source/xforms/submission/submission_get.cxx +++ b/forms/source/xforms/submission/submission_get.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 @@ -52,12 +52,12 @@ using namespace std; CSubmissionGet::CSubmissionGet(const rtl::OUString& aURL, const CSS::uno::Reference< CSS::xml::dom::XDocumentFragment >& aFragment) - : CSubmission(aURL, aFragment) + : CSubmission(aURL, aFragment) { } CSubmission::SubmissionResult CSubmissionGet::submit(const CSS::uno::Reference< CSS::task::XInteractionHandler >& aInteractionHandler) -{ +{ // GET always uses apllicatin/x-www-formurlencoded auto_ptr< CSerialization > apSerialization(new CSerializationURLEncoded()); apSerialization->setSource(m_aFragment); @@ -84,7 +84,7 @@ CSubmission::SubmissionResult CSubmissionGet::submit(const CSS::uno::Reference< OStringBuffer aUTF8QueryURL(OUStringToOString(m_aURLObj.GetMainURL(INetURLObject::NO_DECODE), RTL_TEXTENCODING_UTF8)); OStringBuffer aQueryString; - + const sal_Int32 size = 1024; sal_Int32 n = 0; Sequence< sal_Int8 > aByteBuffer(size); diff --git a/forms/source/xforms/submission/submission_get.hxx b/forms/source/xforms/submission/submission_get.hxx index a9dfbbf3e0b6..73d32e07468a 100644 --- a/forms/source/xforms/submission/submission_get.hxx +++ b/forms/source/xforms/submission/submission_get.hxx @@ -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 diff --git a/forms/source/xforms/submission/submission_post.cxx b/forms/source/xforms/submission/submission_post.cxx index fc2fde7d3668..20b00c879822 100644 --- a/forms/source/xforms/submission/submission_post.cxx +++ b/forms/source/xforms/submission/submission_post.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 @@ -52,12 +52,12 @@ using namespace std; CSubmissionPost::CSubmissionPost(const rtl::OUString& aURL, const CSS::uno::Reference< CSS::xml::dom::XDocumentFragment >& aFragment) - : CSubmission(aURL, aFragment) + : CSubmission(aURL, aFragment) { } CSubmission::SubmissionResult CSubmissionPost::submit(const CSS::uno::Reference< CSS::task::XInteractionHandler >& aInteractionHandler) -{ +{ // PUT always uses application/xml CSS::uno::Reference< XCommandEnvironment > aEnvironment; auto_ptr< CSerialization > apSerialization(createSerialization(aInteractionHandler,aEnvironment)); @@ -66,7 +66,7 @@ CSubmission::SubmissionResult CSubmissionPost::submit(const CSS::uno::Reference< ucbhelper::Content aContent(m_aURLObj.GetMainURL(INetURLObject::NO_DECODE), aEnvironment); // use post command - + OUString aCommandName = OUString::createFromAscii("post"); PostCommandArgument2 aPostArgument; aPostArgument.Source = apSerialization->getInputStream(); @@ -88,7 +88,7 @@ CSubmission::SubmissionResult CSubmissionPost::submit(const CSS::uno::Reference< // xOut->closeOutput(); try { - // m_aResultStream = CSS::uno::Reference< XInputStream >(aSink, UNO_QUERY_THROW); + // m_aResultStream = CSS::uno::Reference< XInputStream >(aSink, UNO_QUERY_THROW); m_aResultStream = aSink->getInputStream(); } catch (Exception&) { OSL_ENSURE(sal_False, "Cannot open reply stream from content"); @@ -99,7 +99,7 @@ CSubmission::SubmissionResult CSubmissionPost::submit(const CSS::uno::Reference< OSL_ENSURE(sal_False, "Exception during UCB operatration."); return UNKNOWN_ERROR; } - + return SUCCESS; } diff --git a/forms/source/xforms/submission/submission_post.hxx b/forms/source/xforms/submission/submission_post.hxx index 86f040f951de..542e1252187f 100644 --- a/forms/source/xforms/submission/submission_post.hxx +++ b/forms/source/xforms/submission/submission_post.hxx @@ -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 diff --git a/forms/source/xforms/submission/submission_put.cxx b/forms/source/xforms/submission/submission_put.cxx index a9f9681014be..573bcabd5afb 100644 --- a/forms/source/xforms/submission/submission_put.cxx +++ b/forms/source/xforms/submission/submission_put.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 @@ -50,12 +50,12 @@ using namespace std; CSubmissionPut::CSubmissionPut(const rtl::OUString& aURL, const CSS::uno::Reference< CSS::xml::dom::XDocumentFragment >& aFragment) - : CSubmission(aURL, aFragment) + : CSubmission(aURL, aFragment) { } CSubmission::SubmissionResult CSubmissionPut::submit(const CSS::uno::Reference< CSS::task::XInteractionHandler >& aInteractionHandler) -{ +{ CSS::uno::Reference< XCommandEnvironment > aEnvironment; auto_ptr< CSerialization > apSerialization(createSerialization(aInteractionHandler,aEnvironment)); @@ -66,7 +66,7 @@ CSubmission::SubmissionResult CSubmissionPut::submit(const CSS::uno::Reference< CSS::uno::Reference< XInputStream > aInStream = apSerialization->getInputStream(); aContent.writeStream(aInStream, sal_True); //aContent.closeStream(); - + // no content as a result of put... } catch (Exception&) @@ -75,7 +75,7 @@ CSubmission::SubmissionResult CSubmissionPut::submit(const CSS::uno::Reference< OSL_ENSURE(sal_False, "Exception during UCB operatration."); return UNKNOWN_ERROR; } - + return SUCCESS; } diff --git a/forms/source/xforms/submission/submission_put.hxx b/forms/source/xforms/submission/submission_put.hxx index acdb15e490c8..61d5a24369be 100644 --- a/forms/source/xforms/submission/submission_put.hxx +++ b/forms/source/xforms/submission/submission_put.hxx @@ -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 diff --git a/forms/source/xforms/unohelper.cxx b/forms/source/xforms/unohelper.cxx index 475f366401a6..b6d16a30c417 100644 --- a/forms/source/xforms/unohelper.cxx +++ b/forms/source/xforms/unohelper.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 @@ -68,14 +68,14 @@ Reference<XInterface> xforms::createInstance( const OUString& sServiceName ) return xInstance; } -void xforms::copy( const Reference<XPropertySet>& xFrom, +void xforms::copy( const Reference<XPropertySet>& xFrom, Reference<XPropertySet>& xTo ) { OSL_ENSURE( xFrom.is(), "no source" ); OSL_ENSURE( xTo.is(), "no target" ); // get property names & infos, and iterate over target properties - Sequence<Property> aProperties = + Sequence<Property> aProperties = xTo->getPropertySetInfo()->getProperties(); sal_Int32 nProperties = aProperties.getLength(); const Property* pProperties = aProperties.getConstArray(); diff --git a/forms/source/xforms/unohelper.hxx b/forms/source/xforms/unohelper.hxx index 76125cf1dcee..95a6bb613e97 100644 --- a/forms/source/xforms/unohelper.hxx +++ b/forms/source/xforms/unohelper.hxx @@ -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 diff --git a/forms/source/xforms/warnings_guard_unicode_regex.h b/forms/source/xforms/warnings_guard_unicode_regex.h index 68f0022d7966..dd82f0c6a1bc 100644 --- a/forms/source/xforms/warnings_guard_unicode_regex.h +++ b/forms/source/xforms/warnings_guard_unicode_regex.h @@ -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 diff --git a/forms/source/xforms/xforms_services.cxx b/forms/source/xforms/xforms_services.cxx index 6ef347dd0c4c..c10016afcdac 100644 --- a/forms/source/xforms/xforms_services.cxx +++ b/forms/source/xforms/xforms_services.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 @@ -53,18 +53,18 @@ using com::sun::star::container::XNameContainer; using rtl::OUString; -namespace frm +namespace frm { Reference<XInterface> Model_CreateInstance( - const Reference<XMultiServiceFactory>& ) + const Reference<XMultiServiceFactory>& ) throw( RuntimeException ) { return static_cast<XPropertySet*>( new xforms::Model ); } Reference<XInterface> XForms_CreateInstance( - const Reference<XMultiServiceFactory>& ) + const Reference<XMultiServiceFactory>& ) throw( RuntimeException ) { return static_cast<XNameContainer*>( new NameContainer<Reference<XPropertySet> >() ); diff --git a/forms/source/xforms/xforms_services.hxx b/forms/source/xforms/xforms_services.hxx index c1e4dc459dc0..32a7c43e6387 100644 --- a/forms/source/xforms/xforms_services.hxx +++ b/forms/source/xforms/xforms_services.hxx @@ -9,21 +9,21 @@ namespace com { namespace sun { namespace star { } } } -namespace frm +namespace frm { - com::sun::star::uno::Reference<com::sun::star::uno::XInterface> + com::sun::star::uno::Reference<com::sun::star::uno::XInterface> SAL_CALL Binding_CreateInstance( - const com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory>& _rxFactory) + const com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory>& _rxFactory) throw( com::sun::star::uno::RuntimeException ); - com::sun::star::uno::Reference<com::sun::star::uno::XInterface> + com::sun::star::uno::Reference<com::sun::star::uno::XInterface> SAL_CALL Model_CreateInstance( - const com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory>& _rxFactory) + const com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory>& _rxFactory) throw( com::sun::star::uno::RuntimeException ); - com::sun::star::uno::Reference<com::sun::star::uno::XInterface> + com::sun::star::uno::Reference<com::sun::star::uno::XInterface> SAL_CALL XForms_CreateInstance( - const com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory>& _rxFactory) + const com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory>& _rxFactory) throw( com::sun::star::uno::RuntimeException ); } diff --git a/forms/source/xforms/xformsevent.cxx b/forms/source/xforms/xformsevent.cxx index 236284165bd2..06801ce3bae9 100644 --- a/forms/source/xforms/xformsevent.cxx +++ b/forms/source/xforms/xformsevent.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 @@ -34,12 +34,12 @@ namespace com { namespace sun { namespace star { -namespace xforms { +namespace xforms { using rtl::OUString; using com::sun::star::uno::RuntimeException; -void SAL_CALL XFormsEventConcrete::initXFormsEvent(const OUString& typeArg, +void SAL_CALL XFormsEventConcrete::initXFormsEvent(const OUString& typeArg, sal_Bool canBubbleArg, sal_Bool cancelableArg) throw (RuntimeException) { @@ -90,7 +90,7 @@ void SAL_CALL XFormsEventConcrete::preventDefault() throw (RuntimeException) { } -void SAL_CALL XFormsEventConcrete::initEvent(const OUString& eventTypeArg, sal_Bool canBubbleArg, +void SAL_CALL XFormsEventConcrete::initEvent(const OUString& eventTypeArg, sal_Bool canBubbleArg, sal_Bool cancelableArg) throw (RuntimeException) { m_eventType = eventTypeArg; diff --git a/forms/source/xforms/xformsevent.hxx b/forms/source/xforms/xformsevent.hxx index 806abe6e3e62..7437425cb57e 100644 --- a/forms/source/xforms/xformsevent.hxx +++ b/forms/source/xforms/xformsevent.hxx @@ -11,12 +11,12 @@ namespace com { namespace sun { namespace star { -namespace xforms { +namespace xforms { class XFormsEventConcrete : public cppu::WeakImplHelper1< XFormsEvent > { public: - + typedef com::sun::star::uno::RuntimeException RuntimeException_t; typedef com::sun::star::uno::Reference< com::sun::star::xml::dom::events::XEventTarget > XEventTarget_t; typedef com::sun::star::xml::dom::events::PhaseType PhaseType_t; @@ -36,19 +36,19 @@ class XFormsEventConcrete : public cppu::WeakImplHelper1< XFormsEvent > { virtual void SAL_CALL preventDefault() throw (RuntimeException_t); virtual void SAL_CALL initXFormsEvent( - const rtl::OUString& typeArg, - sal_Bool canBubbleArg, + const rtl::OUString& typeArg, + sal_Bool canBubbleArg, sal_Bool cancelableArg ) throw (RuntimeException_t); virtual void SAL_CALL initEvent( - const rtl::OUString& eventTypeArg, - sal_Bool canBubbleArg, - sal_Bool cancelableArg) + const rtl::OUString& eventTypeArg, + sal_Bool canBubbleArg, + sal_Bool cancelableArg) throw (RuntimeException_t); private: - + sal_Bool m_canceled; protected: diff --git a/forms/source/xforms/xmlhelper.cxx b/forms/source/xforms/xmlhelper.cxx index 14c9b73163e1..02683333e7cd 100644 --- a/forms/source/xforms/xmlhelper.cxx +++ b/forms/source/xforms/xmlhelper.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 diff --git a/forms/source/xforms/xmlhelper.hxx b/forms/source/xforms/xmlhelper.hxx index 7c102cc8aeaa..e5fc6ea6abda 100644 --- a/forms/source/xforms/xmlhelper.hxx +++ b/forms/source/xforms/xmlhelper.hxx @@ -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 diff --git a/forms/source/xforms/xpathlib/extension.cxx b/forms/source/xforms/xpathlib/extension.cxx index 26bc2b7640fc..26dfb55d4b6b 100644 --- a/forms/source/xforms/xpathlib/extension.cxx +++ b/forms/source/xforms/xpathlib/extension.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 diff --git a/forms/source/xforms/xpathlib/extension.hxx b/forms/source/xforms/xpathlib/extension.hxx index c44a80f9860f..e0caea013200 100644 --- a/forms/source/xforms/xpathlib/extension.hxx +++ b/forms/source/xforms/xpathlib/extension.hxx @@ -18,7 +18,7 @@ -class CLibxml2XFormsExtension : public cppu::WeakImplHelper2< +class CLibxml2XFormsExtension : public cppu::WeakImplHelper2< com::sun::star::xml::xpath::XXPathExtension, com::sun::star::lang::XInitialization> { private: diff --git a/forms/source/xforms/xpathlib/xpathlib.cxx b/forms/source/xforms/xpathlib/xpathlib.cxx index 49918c7c8b6f..21170a6001a7 100644 --- a/forms/source/xforms/xpathlib/xpathlib.cxx +++ b/forms/source/xforms/xpathlib/xpathlib.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 |