diff options
| author | Jelle van der Waa <jelle@vdwaa.nl> | 2013-08-09 20:04:34 +0200 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2013-08-10 14:55:06 +0000 |
| commit | 4f360266cd1335861c182493bde6ade0e67b753b (patch) | |
| tree | 94fbebf42ab561d68b659fa0c0f80ab85abef2d8 /xmloff/source/forms | |
| parent | 9c8831244062202e9066b97be7082e72e1194866 (diff) | |
fdo#62475 removed pointless comments
Change-Id: I176886fbc9f3d9e2b8ad2308ac2b127d9c68d9a6
Reviewed-on: https://gerrit.libreoffice.org/5331
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
Diffstat (limited to 'xmloff/source/forms')
55 files changed, 0 insertions, 949 deletions
diff --git a/xmloff/source/forms/attriblistmerge.cxx b/xmloff/source/forms/attriblistmerge.cxx index 37a965967046..690345bedae0 100644 --- a/xmloff/source/forms/attriblistmerge.cxx +++ b/xmloff/source/forms/attriblistmerge.cxx @@ -19,18 +19,13 @@ #include "attriblistmerge.hxx" -//......................................................................... namespace xmloff { -//......................................................................... using namespace ::com::sun::star::uno; using namespace ::com::sun::star; - //===================================================================== //= OAttribListMerger - //===================================================================== - //--------------------------------------------------------------------- void OAttribListMerger::addList(const Reference< xml::sax::XAttributeList >& _rxList) { OSL_ENSURE(_rxList.is(), "OAttribListMerger::addList: invalid list!"); @@ -38,7 +33,6 @@ namespace xmloff m_aLists.push_back(_rxList); } - //--------------------------------------------------------------------- sal_Bool OAttribListMerger::seekToIndex(sal_Int16 _nGlobalIndex, Reference< xml::sax::XAttributeList >& _rSubList, sal_Int16& _rLocalIndex) { sal_Int16 nLeftOver = _nGlobalIndex; @@ -59,7 +53,6 @@ namespace xmloff return sal_True; } - //--------------------------------------------------------------------- sal_Bool OAttribListMerger::seekToName(const OUString& _rName, Reference< xml::sax::XAttributeList >& _rSubList, sal_Int16& _rLocalIndex) { for ( ConstAttributeListArrayIterator aLookupSublist = m_aLists.begin(); @@ -78,7 +71,6 @@ namespace xmloff return sal_False; } - //--------------------------------------------------------------------- sal_Int16 SAL_CALL OAttribListMerger::getLength( ) throw(RuntimeException) { sal_Int16 nCount = 0; @@ -90,7 +82,6 @@ namespace xmloff return nCount; } - //--------------------------------------------------------------------- OUString SAL_CALL OAttribListMerger::getNameByIndex( sal_Int16 i ) throw(RuntimeException) { Reference< xml::sax::XAttributeList > xSubList; @@ -102,7 +93,6 @@ namespace xmloff return xSubList->getNameByIndex(nLocalIndex); } - //--------------------------------------------------------------------- OUString SAL_CALL OAttribListMerger::getTypeByIndex( sal_Int16 i ) throw(RuntimeException) { Reference< xml::sax::XAttributeList > xSubList; @@ -114,7 +104,6 @@ namespace xmloff return xSubList->getTypeByIndex(nLocalIndex); } - //--------------------------------------------------------------------- OUString SAL_CALL OAttribListMerger::getTypeByName( const OUString& _rName ) throw(RuntimeException) { Reference< xml::sax::XAttributeList > xSubList; @@ -128,7 +117,6 @@ namespace xmloff return xSubList->getTypeByIndex(nLocalIndex); } - //--------------------------------------------------------------------- OUString SAL_CALL OAttribListMerger::getValueByIndex( sal_Int16 i ) throw(RuntimeException) { Reference< xml::sax::XAttributeList > xSubList; @@ -140,7 +128,6 @@ namespace xmloff return xSubList->getValueByIndex(nLocalIndex); } - //--------------------------------------------------------------------- OUString SAL_CALL OAttribListMerger::getValueByName( const OUString& _rName ) throw(RuntimeException) { Reference< xml::sax::XAttributeList > xSubList; @@ -154,8 +141,6 @@ namespace xmloff return xSubList->getValueByIndex(nLocalIndex); } -//......................................................................... } // namespace xmloff -//......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/forms/attriblistmerge.hxx b/xmloff/source/forms/attriblistmerge.hxx index 8cdd67642e24..344bbc6b22ec 100644 --- a/xmloff/source/forms/attriblistmerge.hxx +++ b/xmloff/source/forms/attriblistmerge.hxx @@ -25,14 +25,10 @@ #include <osl/mutex.hxx> #include <com/sun/star/xml/sax/XAttributeList.hpp> -//......................................................................... namespace xmloff { -//......................................................................... - //===================================================================== //= OAttribListMerger - //===================================================================== typedef ::cppu::WeakImplHelper1 < ::com::sun::star::xml::sax::XAttributeList > OAttribListMerger_Base; /** implements the XAttributeList list by merging different source attribute lists @@ -68,10 +64,7 @@ namespace xmloff sal_Bool seekToName(const OUString& _rName, ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rSubList, sal_Int16& _rLocalIndex); }; - -//......................................................................... } // namespace xmloff -//......................................................................... #endif // _XMLOFF_FORMS_ATTRIBLISTMERGE_HXX_ diff --git a/xmloff/source/forms/callbacks.hxx b/xmloff/source/forms/callbacks.hxx index 311846b11131..9cc6d0498fca 100644 --- a/xmloff/source/forms/callbacks.hxx +++ b/xmloff/source/forms/callbacks.hxx @@ -29,14 +29,10 @@ class SvXMLExport; class SvXMLExportPropertyMapper; -//......................................................................... namespace xmloff { -//......................................................................... - //===================================================================== //= IFormsExportContext - //===================================================================== class IFormsExportContext { public: @@ -55,9 +51,7 @@ namespace xmloff ~IFormsExportContext() {} }; - //===================================================================== //= IEventAttacherManager - //===================================================================== class IEventAttacherManager { public: @@ -70,9 +64,7 @@ namespace xmloff ~IEventAttacherManager() {} }; - //===================================================================== //= IEventAttacher - //===================================================================== class IEventAttacher { public: @@ -84,9 +76,7 @@ namespace xmloff ~IEventAttacher() {} }; -//......................................................................... } // namespace xmloff -//......................................................................... #endif // _XMLOFF_FORMS_CALLBACKS_HXX_ diff --git a/xmloff/source/forms/controlelement.cxx b/xmloff/source/forms/controlelement.cxx index eaeb6fd1baac..72a92d25c66a 100644 --- a/xmloff/source/forms/controlelement.cxx +++ b/xmloff/source/forms/controlelement.cxx @@ -19,15 +19,10 @@ #include "controlelement.hxx" -//......................................................................... namespace xmloff { -//......................................................................... - //===================================================================== //= OControlElement - //===================================================================== - //--------------------------------------------------------------------- const sal_Char* OControlElement::getElementName(ElementType _eType) { switch (_eType) @@ -56,8 +51,6 @@ namespace xmloff } } -//......................................................................... } // namespace xmloff -//......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/forms/controlelement.hxx b/xmloff/source/forms/controlelement.hxx index e9b73d316ce7..acc11534fe9f 100644 --- a/xmloff/source/forms/controlelement.hxx +++ b/xmloff/source/forms/controlelement.hxx @@ -22,14 +22,10 @@ #include <sal/types.h> -//......................................................................... namespace xmloff { -//......................................................................... - //===================================================================== //= OControlElement - //===================================================================== /** helper for translating between control types and XML tags */ class OControlElement @@ -79,9 +75,7 @@ namespace xmloff static const sal_Char* getElementName(ElementType _eType); }; -//......................................................................... } // namespace xmloff -//......................................................................... #endif // _XMLOFF_FORMS_CONTROLELEMENT_HXX_ diff --git a/xmloff/source/forms/controlpropertyhdl.cxx b/xmloff/source/forms/controlpropertyhdl.cxx index d89f2eb23bc6..cb190ef9a6f1 100644 --- a/xmloff/source/forms/controlpropertyhdl.cxx +++ b/xmloff/source/forms/controlpropertyhdl.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <xmloff/controlpropertyhdl.hxx> #include <com/sun/star/util/MeasureUnit.hpp> @@ -37,10 +36,8 @@ #include "callbacks.hxx" #include <xmloff/XMLConstantsPropertyHandler.hxx> -//......................................................................... namespace xmloff { -//......................................................................... using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -48,10 +45,7 @@ namespace xmloff using namespace ::com::sun::star::beans; using namespace ::xmloff::token; - //===================================================================== //= OControlPropertyHandlerFactory - //===================================================================== - //--------------------------------------------------------------------- OControlPropertyHandlerFactory::OControlPropertyHandlerFactory() :m_pTextAlignHandler(NULL) ,m_pControlBorderStyleHandler(NULL) @@ -63,7 +57,6 @@ namespace xmloff { } - //--------------------------------------------------------------------- OControlPropertyHandlerFactory::~OControlPropertyHandlerFactory() { delete m_pTextAlignHandler; @@ -75,7 +68,6 @@ namespace xmloff delete m_pFontReliefHandler; } - //--------------------------------------------------------------------- const XMLPropertyHandler* OControlPropertyHandlerFactory::GetPropertyHandler(sal_Int32 _nType) const { const XMLPropertyHandler* pHandler = NULL; @@ -135,14 +127,11 @@ namespace xmloff return pHandler; } - //===================================================================== //= OControlTextEmphasisHandler - //===================================================================== OControlTextEmphasisHandler::OControlTextEmphasisHandler() { } - //--------------------------------------------------------------------- sal_Bool OControlTextEmphasisHandler::exportXML( OUString& _rStrExpValue, const Any& _rValue, const SvXMLUnitConverter& ) const { OUStringBuffer aReturn; @@ -169,7 +158,6 @@ namespace xmloff return bSuccess; } - //--------------------------------------------------------------------- sal_Bool OControlTextEmphasisHandler::importXML( const OUString& _rStrImpValue, Any& _rValue, const SvXMLUnitConverter& ) const { sal_Bool bSuccess = sal_True; @@ -218,16 +206,12 @@ namespace xmloff return bSuccess; } - //===================================================================== //= OControlBorderHandlerBase - //===================================================================== - //--------------------------------------------------------------------- OControlBorderHandler::OControlBorderHandler( const OControlBorderHandler::BorderFacet _eFacet ) :m_eFacet( _eFacet ) { } - //--------------------------------------------------------------------- sal_Bool OControlBorderHandler::importXML( const OUString& _rStrImpValue, Any& _rValue, const SvXMLUnitConverter& ) const { OUString sToken; @@ -265,7 +249,6 @@ namespace xmloff return sal_False; } - //--------------------------------------------------------------------- sal_Bool OControlBorderHandler::exportXML( OUString& _rStrExpValue, const Any& _rValue, const SvXMLUnitConverter& ) const { sal_Bool bSuccess = sal_False; @@ -302,15 +285,11 @@ namespace xmloff return sal_True; } - //===================================================================== //= OFontWidthHandler - //===================================================================== - //--------------------------------------------------------------------- OFontWidthHandler::OFontWidthHandler() { } - //--------------------------------------------------------------------- sal_Bool OFontWidthHandler::importXML( const OUString& _rStrImpValue, Any& _rValue, const SvXMLUnitConverter& ) const { sal_Int32 nWidth = 0; @@ -322,7 +301,6 @@ namespace xmloff return bSuccess; } - //--------------------------------------------------------------------- sal_Bool OFontWidthHandler::exportXML( OUString& _rStrExpValue, const Any& _rValue, const SvXMLUnitConverter& ) const { sal_Int16 nWidth = 0; @@ -337,15 +315,11 @@ namespace xmloff return !_rStrExpValue.isEmpty(); } - //===================================================================== //= ORotationAngleHandler - //===================================================================== - //--------------------------------------------------------------------- ORotationAngleHandler::ORotationAngleHandler() { } - //--------------------------------------------------------------------- sal_Bool ORotationAngleHandler::importXML( const OUString& _rStrImpValue, Any& _rValue, const SvXMLUnitConverter& ) const { double fValue; @@ -360,7 +334,6 @@ namespace xmloff return bSucces; } - //--------------------------------------------------------------------- sal_Bool ORotationAngleHandler::exportXML( OUString& _rStrExpValue, const Any& _rValue, const SvXMLUnitConverter& ) const { float fAngle = 0; @@ -376,17 +349,12 @@ namespace xmloff return bSuccess; } - //===================================================================== //= ImageScaleModeHandler - //===================================================================== - //--------------------------------------------------------------------- ImageScaleModeHandler::ImageScaleModeHandler() :XMLConstantsPropertyHandler( OEnumMapper::getEnumMap( OEnumMapper::epImageScaleMode ), XML_STRETCH ) { } -//......................................................................... } // namespace xmloff -//......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/forms/controlpropertymap.cxx b/xmloff/source/forms/controlpropertymap.cxx index 2f0dc041bbb2..ffb729815717 100644 --- a/xmloff/source/forms/controlpropertymap.cxx +++ b/xmloff/source/forms/controlpropertymap.cxx @@ -30,10 +30,8 @@ using namespace ::xmloff::token; -//......................................................................... namespace xmloff { -//......................................................................... #define MAP_ASCII( name, prefix, token, type, context ) { name, sizeof(name)-1, prefix, token, type|XML_TYPE_PROP_TEXT, context, SvtSaveOptions::ODFVER_010 } #define MAP_CONST( name, prefix, token, type, context ) { name, sizeof(name)-1, prefix, token, type|XML_TYPE_PROP_TEXT, context, SvtSaveOptions::ODFVER_010 } @@ -87,8 +85,6 @@ namespace xmloff return getControlStylePropertyMap_Access(); } - //===================================================================== - //--------------------------------------------------------------------- struct XMLPropertyMapEntryLess { sal_Bool operator()(const XMLPropertyMapEntry& _rLeft, const XMLPropertyMapEntry& _rRight) @@ -97,7 +93,6 @@ namespace xmloff } }; - //--------------------------------------------------------------------- void implSortMap(XMLPropertyMapEntry* _pMap) { XMLPropertyMapEntry* pEnd; @@ -107,7 +102,6 @@ namespace xmloff ::std::sort(_pMap, pEnd, XMLPropertyMapEntryLess()); } - //--------------------------------------------------------------------- void initializePropertyMaps() { static sal_Bool bSorted = sal_False; @@ -118,16 +112,12 @@ namespace xmloff } } - //===================================================================== //= OFormComponentStyleExportMapper - //===================================================================== - //--------------------------------------------------------------------- OFormComponentStyleExportMapper::OFormComponentStyleExportMapper( const UniReference< XMLPropertySetMapper >& _rMapper ) :SvXMLExportPropertyMapper( _rMapper ) { } - //--------------------------------------------------------------------- void OFormComponentStyleExportMapper::handleSpecialItem( SvXMLAttributeList& _rAttrList, const XMLPropertyState& _rProperty, const SvXMLUnitConverter& _rUnitConverter, const SvXMLNamespaceMap& _rNamespaceMap, const ::std::vector< XMLPropertyState >* _pProperties, sal_uInt32 _nIdx ) const @@ -137,9 +127,6 @@ namespace xmloff SvXMLExportPropertyMapper::handleSpecialItem( _rAttrList, _rProperty, _rUnitConverter, _rNamespaceMap, _pProperties, _nIdx ); } -//......................................................................... } // namespace xmloff -//......................................................................... - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/forms/controlpropertymap.hxx b/xmloff/source/forms/controlpropertymap.hxx index 9a4894fe12f2..7a58d771db5f 100644 --- a/xmloff/source/forms/controlpropertymap.hxx +++ b/xmloff/source/forms/controlpropertymap.hxx @@ -24,18 +24,14 @@ #include <xmloff/xmlexppr.hxx> struct XMLPropertyMapEntry; -//......................................................................... namespace xmloff { -//......................................................................... const XMLPropertyMapEntry* getControlStylePropertyMap( ); void initializePropertyMaps(); - //===================================================================== //= OFormComponentStyleExportMapper - //===================================================================== class OFormComponentStyleExportMapper : public SvXMLExportPropertyMapper { public: @@ -51,11 +47,8 @@ namespace xmloff ) const; }; -//......................................................................... } // namespace xmloff -//......................................................................... #endif // _XMLOFF_FORMS_CONTROLPROPERTYMAP_HXX_ - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/forms/elementexport.cxx b/xmloff/source/forms/elementexport.cxx index dbcb9c0e8e22..749e64dcf846 100644 --- a/xmloff/source/forms/elementexport.cxx +++ b/xmloff/source/forms/elementexport.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "elementexport.hxx" #include "strings.hxx" #include "xmloff/xmlnmspe.hxx" @@ -63,10 +62,8 @@ #include <stdio.h> #include <algorithm> -//......................................................................... namespace xmloff { -//......................................................................... #if OSL_DEBUG_LEVEL > 0 #define RESET_BIT( bitfield, bit ) \ @@ -90,9 +87,7 @@ namespace xmloff using namespace ::com::sun::star::text; using namespace ::com::sun::star::form::binding; - //===================================================================== //= OElementExport - //===================================================================== OElementExport::OElementExport(IFormsExportContext& _rContext, const Reference< XPropertySet >& _rxProps, const Sequence< ScriptEventDescriptor >& _rEvents) :OPropertyExport(_rContext, _rxProps) @@ -101,13 +96,11 @@ namespace xmloff { } - //--------------------------------------------------------------------- OElementExport::~OElementExport() { implEndElement(); } - //--------------------------------------------------------------------- void OElementExport::doExport() { // collect some general information about the element @@ -128,19 +121,16 @@ namespace xmloff implEndElement(); } - //--------------------------------------------------------------------- void OElementExport::examine() { // nothing to do here } - //--------------------------------------------------------------------- void OElementExport::exportAttributes() { // nothing to do here } - //--------------------------------------------------------------------- void OElementExport::exportSubTags() { // the properties which where not exported 'til now @@ -150,20 +140,17 @@ namespace xmloff exportEvents(); } - //--------------------------------------------------------------------- void OElementExport::implStartElement(const sal_Char* _pName) { m_pXMLElement = new SvXMLElementExport(m_rContext.getGlobalContext(), XML_NAMESPACE_FORM, _pName, sal_True, sal_True); } - //--------------------------------------------------------------------- void OElementExport::implEndElement() { delete m_pXMLElement; m_pXMLElement = NULL; } - //--------------------------------------------------------------------- void OElementExport::exportServiceNameAttribute() { Reference< XPersistObject > xPersistence(m_xProps, UNO_QUERY); @@ -231,7 +218,6 @@ namespace xmloff sToWriteServiceName); } - //--------------------------------------------------------------------- void OElementExport::exportEvents() { if (!m_aEvents.getLength()) @@ -242,10 +228,7 @@ namespace xmloff m_rContext.getGlobalContext().GetEventExport().Export(xWrapper); } - //===================================================================== //= OControlExport - //===================================================================== - //--------------------------------------------------------------------- OControlExport::OControlExport(IFormsExportContext& _rContext, const Reference< XPropertySet >& _rxControl, const OUString& _rControlId, const OUString& _rReferringControls, const Sequence< ScriptEventDescriptor >& _rEvents) @@ -264,13 +247,11 @@ namespace xmloff OSL_ENSURE(m_xProps.is(), "OControlExport::OControlExport: invalid arguments!"); } - //--------------------------------------------------------------------- OControlExport::~OControlExport() { implEndElement(); } - //--------------------------------------------------------------------- void OControlExport::exportOuterAttributes() { // the control id @@ -298,7 +279,6 @@ namespace xmloff } } - //--------------------------------------------------------------------- void OControlExport::exportInnerAttributes() { // the control id @@ -332,13 +312,11 @@ namespace xmloff flagStyleProperties(); } - //--------------------------------------------------------------------- void OControlExport::exportAttributes() { exportOuterAttributes(); } - //--------------------------------------------------------------------- void OControlExport::exportSubTags() throw (Exception) { // for the upcoming exportRemainingProperties: @@ -468,7 +446,6 @@ namespace xmloff } } - //--------------------------------------------------------------------- void OControlExport::exportGenericHandlerAttributes() { const Sequence< Property > aProperties = m_xPropertyInfo->getProperties(); @@ -549,7 +526,6 @@ namespace xmloff } } - //--------------------------------------------------------------------- void OControlExport::exportCommonControlAttributes() { size_t i=0; @@ -562,7 +538,6 @@ namespace xmloff // the extra indents for the respective blocks are to ensure that there is no copy'n'paste error, using // map identifiers from the wrong block - // -------------------------------------------------------------------- // some string properties { // the attribute ids of all properties which are expected to be of type string @@ -594,7 +569,6 @@ namespace xmloff } } - // -------------------------------------------------------------------- // some boolean properties { static const sal_Int32 nBooleanPropertyAttributeIds[] = @@ -634,8 +608,6 @@ namespace xmloff } } - - // -------------------------------------------------------------------- // some integer properties { // now the common handling @@ -676,10 +648,8 @@ namespace xmloff #endif } - } - // -------------------------------------------------------------------- // some enum properties { if (m_nIncludeCommon & CCA_BUTTON_TYPE) @@ -726,7 +696,6 @@ namespace xmloff } } - // -------------------------------------------------------------------- // some properties which require a special handling // the target frame @@ -855,7 +824,6 @@ namespace xmloff // be 0 now ... } - //--------------------------------------------------------------------- void OControlExport::exportDatabaseAttributes() { #if OSL_DEBUG_LEVEL > 0 @@ -934,14 +902,12 @@ namespace xmloff #endif } - //--------------------------------------------------------------------- void OControlExport::exportBindingAtributes() { #if OSL_DEBUG_LEVEL > 0 sal_Int32 nIncludeBinding = m_nIncludeBindings; #endif - // .................................................... if ( m_nIncludeBindings & BA_LINKED_CELL ) { exportCellBindingAttributes( ( m_nIncludeBindings & BA_LIST_LINKING_TYPE ) != 0 ); @@ -951,7 +917,6 @@ namespace xmloff #endif } - // .................................................... if ( m_nIncludeBindings & BA_LIST_CELL_RANGE ) { exportCellListSourceRange(); @@ -1103,7 +1068,6 @@ namespace xmloff } - // ------------------- // the enum properties { if (SCA_STATE & m_nIncludeSpecial) @@ -1135,7 +1099,6 @@ namespace xmloff } } - // -------------------------------------------------------------------- // some properties which require a special handling // the repeat delay { @@ -1168,7 +1131,6 @@ namespace xmloff } } - // ---------------------------------- // the EchoChar property needs special handling, cause it's a Int16, but must be stored as one-character-string { if (SCA_ECHO_CHAR & m_nIncludeSpecial) @@ -1192,7 +1154,6 @@ namespace xmloff } } - // ---------------------------------- // the string properties { static const sal_Int32 nStringPropertyAttributeIds[] = @@ -1225,7 +1186,6 @@ namespace xmloff } } - // ---------------------------------- if ((SCA_MIN_VALUE | SCA_MAX_VALUE) & m_nIncludeSpecial) { // need to export the min value and the max value as attributes @@ -1263,7 +1223,6 @@ namespace xmloff #endif } - // ---------------------------------- if ( SCA_IMAGE_POSITION & m_nIncludeSpecial ) { exportImagePositionAttributes(); @@ -1276,7 +1235,6 @@ namespace xmloff // be 0 now ... } - //--------------------------------------------------------------------- OUString OControlExport::getScalarListSourceValue() const { OUString sListSource; @@ -1291,7 +1249,6 @@ namespace xmloff return sListSource; } - //--------------------------------------------------------------------- void OControlExport::exportListSourceAsAttribute() { // DA_LIST_SOURCE needs some special handling @@ -1309,7 +1266,6 @@ namespace xmloff exportedProperty( PROPERTY_LISTSOURCE ); } - //--------------------------------------------------------------------- void OControlExport::getSequenceInt16PropertyAsSet(const OUString& _rPropertyName, Int16Set& _rOut) { Sequence< sal_Int16 > aValueSequence; @@ -1321,7 +1277,6 @@ namespace xmloff _rOut.insert(*pValues); } - //--------------------------------------------------------------------- void OControlExport::exportListSourceAsElements() { // the string lists @@ -1445,7 +1400,6 @@ namespace xmloff } } - //--------------------------------------------------------------------- void OControlExport::implStartElement(const sal_Char* _pName) { // before we let the base class start it's outer element, we add a wrapper element @@ -1465,7 +1419,6 @@ namespace xmloff OElementExport::implStartElement(_pName); } - //--------------------------------------------------------------------- void OControlExport::implEndElement() { // end the inner element @@ -1476,19 +1429,16 @@ namespace xmloff m_pOuterElement = NULL; } - //--------------------------------------------------------------------- const sal_Char* OControlExport::getOuterXMLElementName() const { return 0; } - //--------------------------------------------------------------------- const sal_Char* OControlExport::getXMLElementName() const { return getElementName(m_eType); } - //--------------------------------------------------------------------- void OControlExport::examine() { OSL_ENSURE( ( m_nIncludeCommon == 0 ) && ( m_nIncludeSpecial == 0 ) && ( m_nIncludeDatabase == 0 ) @@ -1821,7 +1771,6 @@ namespace xmloff } } - //--------------------------------------------------------------------- void OControlExport::exportCellBindingAttributes( bool _bIncludeListLinkageType ) { try @@ -1831,14 +1780,12 @@ namespace xmloff OSL_ENSURE( xBinding.is(), "OControlExport::exportCellBindingAttributes: invalid bindable or invalid binding!" ); if ( xBinding.is() ) { - // .................................................... AddAttribute( OAttributeMetaData::getBindingAttributeNamespace( BA_LINKED_CELL ), OAttributeMetaData::getBindingAttributeName( BA_LINKED_CELL ), aHelper.getStringAddressFromCellBinding( xBinding ) ); - // .................................................... if ( _bIncludeListLinkageType ) { sal_Int16 nLinkageType = aHelper.isCellIntegerBinding( xBinding ) ? 1 : 0; @@ -1866,25 +1813,21 @@ namespace xmloff } } - //--------------------------------------------------------------------- void OControlExport::exportXFormsBindAttributes() { OUString sBindName = getXFormsBindName( m_xProps ); AddAttribute( XML_NAMESPACE_XFORMS, XML_BIND, sBindName ); } - //--------------------------------------------------------------------- void OControlExport::exportXFormsListAttributes() { OUString sBindName = getXFormsListBindName( m_xProps ); AddAttribute( XML_NAMESPACE_FORM, XML_XFORMS_LIST_SOURCE, sBindName ); } - //--------------------------------------------------------------------- void OControlExport::exportXFormsSubmissionAttributes() { OUString sSubmission = getXFormsSubmissionName( m_xProps ); AddAttribute( XML_NAMESPACE_FORM, XML_XFORMS_SUBMISSION, sSubmission ); } - //--------------------------------------------------------------------- void OControlExport::exportCellListSourceRange( ) { try @@ -1912,7 +1855,6 @@ namespace xmloff } } - //--------------------------------------------------------------------- void OControlExport::exportImagePositionAttributes() { try @@ -1960,7 +1902,6 @@ namespace xmloff } } - //--------------------------------------------------------------------- bool OControlExport::controlHasActiveDataBinding() const { try @@ -1989,7 +1930,6 @@ namespace xmloff return false; } - //--------------------------------------------------------------------- bool OControlExport::controlHasUserSuppliedListEntries() const { try @@ -2023,23 +1963,18 @@ namespace xmloff return true; } - //===================================================================== //= OColumnExport - //===================================================================== - //--------------------------------------------------------------------- OColumnExport::OColumnExport(IFormsExportContext& _rContext, const Reference< XPropertySet >& _rxControl, const OUString& _rControlId, const Sequence< ScriptEventDescriptor >& _rEvents) :OControlExport(_rContext, _rxControl, _rControlId, OUString(), _rEvents) { } - //--------------------------------------------------------------------- OColumnExport::~OColumnExport() { implEndElement(); } - //--------------------------------------------------------------------- void OColumnExport::exportServiceNameAttribute() { // the attribute "service name" (which has a slightly different meaning for columns @@ -2064,13 +1999,11 @@ namespace xmloff } - //--------------------------------------------------------------------- const sal_Char* OColumnExport::getOuterXMLElementName() const { return "column"; } - //--------------------------------------------------------------------- void OColumnExport::exportAttributes() { OControlExport::exportAttributes(); @@ -2093,7 +2026,6 @@ namespace xmloff } } - //--------------------------------------------------------------------- void OColumnExport::examine() { OControlExport::examine(); @@ -2107,10 +2039,7 @@ namespace xmloff m_nIncludeCommon &= ~CCA_DROPDOWN; } - //===================================================================== //= OFormExport - //===================================================================== - //--------------------------------------------------------------------- OFormExport::OFormExport(IFormsExportContext& _rContext, const Reference< XPropertySet >& _rxForm, const Sequence< ScriptEventDescriptor >& _rEvents) :OElementExport(_rContext, _rxForm, _rEvents) @@ -2119,13 +2048,11 @@ namespace xmloff OSL_ENSURE(m_xProps.is(), "OFormExport::OFormExport: invalid arguments!"); } - //--------------------------------------------------------------------- const sal_Char* OFormExport::getXMLElementName() const { return "form"; } - //--------------------------------------------------------------------- void OFormExport::exportSubTags() { if ( m_bCreateConnectionResourceElement && m_xProps.is() ) @@ -2156,12 +2083,10 @@ namespace xmloff m_rContext.exportCollectionElements(xCollection); } - //--------------------------------------------------------------------- void OFormExport::exportAttributes() { sal_Int32 i=0; - // --------------------- // the string properties { static const FormAttributes eStringPropertyIds[] = @@ -2301,8 +2226,6 @@ namespace xmloff OAttributeMetaData::getFormAttributeName(faDetailFiels), PROPERTY_DETAILFIELDS); } -//......................................................................... } // namespace xmloff -//......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/forms/elementexport.hxx b/xmloff/source/forms/elementexport.hxx index d4b3e0a90476..38c3beccbb7f 100644 --- a/xmloff/source/forms/elementexport.hxx +++ b/xmloff/source/forms/elementexport.hxx @@ -29,14 +29,10 @@ #include "valueproperties.hxx" class SvXMLElementExport; -//......................................................................... namespace xmloff { -//......................................................................... - //===================================================================== //= OElementExport - //===================================================================== class OElementExport : public OPropertyExport { protected: @@ -78,9 +74,7 @@ namespace xmloff virtual void implEndElement(); }; - //===================================================================== //= OControlExport - //===================================================================== /** Helper class for handling xml elements representing a form control */ class OControlExport @@ -259,9 +253,7 @@ namespace xmloff bool controlHasUserSuppliedListEntries() const; }; - //===================================================================== //= OColumnExport - //===================================================================== /** Helper class for exporting a grid column */ class OColumnExport : public OControlExport @@ -287,9 +279,7 @@ namespace xmloff virtual void examine(); }; - //===================================================================== //= OFormExport - //===================================================================== /** Helper class for handling xml elements representing a form <p>In opposite to the class <type>OControlExport</type>, OFormExport is unable to export a <em>complete</em> @@ -313,9 +303,7 @@ namespace xmloff virtual void exportSubTags(); virtual void exportAttributes(); }; -//......................................................................... } // namespace xmloff -//......................................................................... #endif // _XMLOFF_ELEMENTEXPORT_HXX_ diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx index 492abdcc4893..2981f74d6cda 100644 --- a/xmloff/source/forms/elementimport.cxx +++ b/xmloff/source/forms/elementimport.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "elementimport.hxx" #include "xmloff/xmlimp.hxx" #include "xmloff/nmspmap.hxx" @@ -52,10 +51,8 @@ #include <algorithm> #include <functional> -//......................................................................... namespace xmloff { -//......................................................................... using namespace ::xmloff::token; using namespace ::com::sun::star; @@ -77,7 +74,6 @@ namespace xmloff #define PROPID_MIN_VALUE 3 #define PROPID_MAX_VALUE 4 - //===================================================================== struct PropertyValueLess { sal_Bool operator()(const PropertyValue& _rLeft, const PropertyValue& _rRight) @@ -86,7 +82,6 @@ namespace xmloff } }; - //===================================================================== struct PropertyValueCompare : public ::std::binary_function< PropertyValue, OUString, bool> { bool operator() (const PropertyValue& lhs, const OUString& rhs) const @@ -99,7 +94,6 @@ namespace xmloff } }; - //===================================================================== template <class ELEMENT> void pushBackSequenceElement(Sequence< ELEMENT >& _rContainer, const ELEMENT& _rElement) { @@ -108,13 +102,9 @@ namespace xmloff _rContainer[nLen] = _rElement; } - //===================================================================== //= OElementNameMap - //===================================================================== - //--------------------------------------------------------------------- OElementNameMap::MapString2Element OElementNameMap::s_sElementTranslations; - //--------------------------------------------------------------------- const OControlElement::ElementType& operator ++(OControlElement::ElementType& _e) { OControlElement::ElementType e = _e; @@ -123,7 +113,6 @@ namespace xmloff return _e; } - //--------------------------------------------------------------------- OControlElement::ElementType OElementNameMap::getElementType(const OUString& _rName) { if ( s_sElementTranslations.empty() ) @@ -138,10 +127,7 @@ namespace xmloff return UNKNOWN; } - //===================================================================== //= OElementImport - //===================================================================== - //--------------------------------------------------------------------- OElementImport::OElementImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const Reference< XNameContainer >& _rxParentContainer) :OPropertyImport(_rImport, _nPrefix, _rName) @@ -154,18 +140,15 @@ namespace xmloff OSL_ENSURE(m_xParentContainer.is(), "OElementImport::OElementImport: invalid parent container!"); } - //--------------------------------------------------------------------- OElementImport::~OElementImport() { } - //--------------------------------------------------------------------- OUString OElementImport::determineDefaultServiceName() const { return OUString(); } - //--------------------------------------------------------------------- void OElementImport::StartElement(const Reference< XAttributeList >& _rxAttrList) { ENTER_LOG_CONTEXT( "xmloff::OElementImport - importing one element" ); @@ -197,7 +180,6 @@ namespace xmloff OPropertyImport::StartElement( _rxAttrList ); } - //--------------------------------------------------------------------- SvXMLImportContext* OElementImport::CreateChildContext(sal_uInt16 _nPrefix, const OUString& _rLocalName, const Reference< XAttributeList >& _rxAttrList) { @@ -207,7 +189,6 @@ namespace xmloff return OPropertyImport::CreateChildContext(_nPrefix, _rLocalName, _rxAttrList); } - //--------------------------------------------------------------------- void OElementImport::EndElement() { OSL_ENSURE(m_xElement.is(), "OElementImport::EndElement: invalid element created!"); @@ -246,7 +227,6 @@ namespace xmloff LEAVE_LOG_CONTEXT( ); } - //--------------------------------------------------------------------- void OElementImport::implApplySpecificProperties() { if ( m_aValues.empty() ) @@ -337,7 +317,6 @@ namespace xmloff } } - //--------------------------------------------------------------------- void OElementImport::implApplyGenericProperties() { if ( m_aGenericValues.empty() ) @@ -479,7 +458,6 @@ namespace xmloff } } - //--------------------------------------------------------------------- OUString OElementImport::implGetDefaultName() const { // no optimization here. If this method gets called, the XML stream did not contain a name for the @@ -515,7 +493,6 @@ namespace xmloff return sUnnamedName; } - //--------------------------------------------------------------------- PropertyGroups::const_iterator OElementImport::impl_matchPropertyGroup( const PropertyGroups& i_propertyGroups ) const { ENSURE_OR_RETURN( m_xInfo.is(), "OElementImport::impl_matchPropertyGroup: no property set info!", i_propertyGroups.end() ); @@ -548,7 +525,6 @@ namespace xmloff return i_propertyGroups.end(); } - //--------------------------------------------------------------------- bool OElementImport::tryGenericAttribute( sal_uInt16 _nNamespaceKey, const OUString& _rLocalName, const OUString& _rValue ) { // the generic approach (which I hope all props will be migrated to, on the medium term): property handlers @@ -605,7 +581,6 @@ namespace xmloff return false; } - //--------------------------------------------------------------------- bool OElementImport::handleAttribute(sal_uInt16 _nNamespaceKey, const OUString& _rLocalName, const OUString& _rValue) { if ( token::IsXMLToken( _rLocalName, token::XML_CONTROL_IMPLEMENTATION ) ) @@ -638,7 +613,6 @@ namespace xmloff return OPropertyImport::handleAttribute(_nNamespaceKey, _rLocalName, _rValue); } - //--------------------------------------------------------------------- Reference< XPropertySet > OElementImport::createElement() { Reference< XPropertySet > xReturn; @@ -656,14 +630,12 @@ namespace xmloff return xReturn; } - //--------------------------------------------------------------------- void OElementImport::registerEvents(const Sequence< ScriptEventDescriptor >& _rEvents) { OSL_ENSURE(m_xElement.is(), "OElementImport::registerEvents: no element to register events for!"); m_rEventManager.registerEvents(m_xElement, _rEvents); } - //--------------------------------------------------------------------- void OElementImport::simulateDefaultedAttribute(const sal_Char* _pAttributeName, const OUString& _rPropertyName, const sal_Char* _pAttributeDefault) { OSL_ENSURE( m_xInfo.is(), "OPropertyImport::simulateDefaultedAttribute: the component should be more gossipy about it's properties!" ); @@ -676,10 +648,7 @@ namespace xmloff } } - //===================================================================== //= OControlImport - //===================================================================== - //--------------------------------------------------------------------- OControlImport::OControlImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const Reference< XNameContainer >& _rxParentContainer) :OElementImport(_rImport, _rEventManager, _nPrefix, _rName, _rxParentContainer) @@ -688,7 +657,6 @@ namespace xmloff disableImplicitGenericAttributeHandling(); } - //--------------------------------------------------------------------- OControlImport::OControlImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const Reference< XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType) :OElementImport(_rImport, _rEventManager, _nPrefix, _rName, _rxParentContainer) @@ -697,7 +665,6 @@ namespace xmloff disableImplicitGenericAttributeHandling(); } - //--------------------------------------------------------------------- OUString OControlImport::determineDefaultServiceName() const { const sal_Char* pServiceName = NULL; @@ -728,14 +695,12 @@ namespace xmloff return OUString(); } - //--------------------------------------------------------------------- void OControlImport::addOuterAttributes(const Reference< XAttributeList >& _rxOuterAttribs) { OSL_ENSURE(!m_xOuterAttributes.is(), "OControlImport::addOuterAttributes: already have these attributes!"); m_xOuterAttributes = _rxOuterAttribs; } - //--------------------------------------------------------------------- bool OControlImport::handleAttribute(sal_uInt16 _nNamespaceKey, const OUString& _rLocalName, const OUString& _rValue) { static const sal_Char* pLinkedCellAttributeName = OAttributeMetaData::getBindingAttributeName(BA_LINKED_CELL); @@ -835,7 +800,6 @@ namespace xmloff return OElementImport::handleAttribute( _nNamespaceKey, _rLocalName, _rValue ); } - //--------------------------------------------------------------------- void OControlImport::StartElement(const Reference< XAttributeList >& _rxAttrList) { ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > xAttributes; @@ -964,7 +928,6 @@ namespace xmloff } } - //--------------------------------------------------------------------- void OControlImport::implTranslateValueProperty(const Reference< XPropertySetInfo >& _rxPropInfo, PropertyValue& _rPropValue) { @@ -1001,7 +964,6 @@ namespace xmloff _rPropValue.Value = PropertyConversion::convertString(GetImport(), aProp.Type, sValue); } - //--------------------------------------------------------------------- void OControlImport::EndElement() { OSL_ENSURE(m_xElement.is(), "OControlImport::EndElement: invalid control!"); @@ -1110,7 +1072,6 @@ namespace xmloff doRegisterXFormsSubmission( m_sSubmissionID ); } - //--------------------------------------------------------------------- void OControlImport::doRegisterCellValueBinding( const OUString& _rBoundCellAddress ) { OSL_PRECOND( m_xElement.is(), "OControlImport::doRegisterCellValueBinding: invalid element!" ); @@ -1120,7 +1081,6 @@ namespace xmloff m_rContext.registerCellValueBinding( m_xElement, _rBoundCellAddress ); } - //--------------------------------------------------------------------- void OControlImport::doRegisterXFormsValueBinding( const OUString& _rBindingID ) { OSL_PRECOND( m_xElement.is(), "need element" ); @@ -1129,7 +1089,6 @@ namespace xmloff m_rContext.registerXFormsValueBinding( m_xElement, _rBindingID ); } - //--------------------------------------------------------------------- void OControlImport::doRegisterXFormsListBinding( const OUString& _rBindingID ) { OSL_PRECOND( m_xElement.is(), "need element" ); @@ -1138,7 +1097,6 @@ namespace xmloff m_rContext.registerXFormsListBinding( m_xElement, _rBindingID ); } - //--------------------------------------------------------------------- void OControlImport::doRegisterXFormsSubmission( const OUString& _rSubmissionID ) { OSL_PRECOND( m_xElement.is(), "need element" ); @@ -1147,8 +1105,6 @@ namespace xmloff m_rContext.registerXFormsSubmission( m_xElement, _rSubmissionID ); } - //--------------------------------------------------------------------- - Reference< XPropertySet > OControlImport::createElement() { const Reference<XPropertySet> xPropSet = OElementImport::createElement(); @@ -1164,10 +1120,7 @@ namespace xmloff return xPropSet; } - //===================================================================== //= OImagePositionImport - //===================================================================== - //--------------------------------------------------------------------- OImagePositionImport::OImagePositionImport( OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const Reference< XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType ) @@ -1178,7 +1131,6 @@ namespace xmloff { } - //--------------------------------------------------------------------- bool OImagePositionImport::handleAttribute( sal_uInt16 _nNamespaceKey, const OUString& _rLocalName, const OUString& _rValue ) { @@ -1204,7 +1156,6 @@ namespace xmloff return OControlImport::handleAttribute( _nNamespaceKey, _rLocalName, _rValue ); } - //--------------------------------------------------------------------- void OImagePositionImport::StartElement(const Reference< XAttributeList >& _rxAttrList) { OControlImport::StartElement( _rxAttrList ); @@ -1226,10 +1177,7 @@ namespace xmloff } } - //===================================================================== //= OReferredControlImport - //===================================================================== - //--------------------------------------------------------------------- OReferredControlImport::OReferredControlImport( OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const Reference< XNameContainer >& _rxParentContainer, @@ -1238,7 +1186,6 @@ namespace xmloff { } - //--------------------------------------------------------------------- void OReferredControlImport::StartElement(const Reference< XAttributeList >& _rxAttrList) { OControlImport::StartElement(_rxAttrList); @@ -1248,7 +1195,6 @@ namespace xmloff m_rFormImport.registerControlReferences(m_xElement, m_sReferringControls); } - //--------------------------------------------------------------------- bool OReferredControlImport::handleAttribute(sal_uInt16 _nNamespaceKey, const OUString& _rLocalName, const OUString& _rValue) { @@ -1261,17 +1207,13 @@ namespace xmloff return OControlImport::handleAttribute(_nNamespaceKey, _rLocalName, _rValue); } - //===================================================================== //= OPasswordImport - //===================================================================== - //--------------------------------------------------------------------- OPasswordImport::OPasswordImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const Reference< XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType) :OControlImport(_rImport, _rEventManager, _nPrefix, _rName, _rxParentContainer, _eType) { } - //--------------------------------------------------------------------- bool OPasswordImport::handleAttribute(sal_uInt16 _nNamespaceKey, const OUString& _rLocalName, const OUString& _rValue) { static const OUString s_sEchoCharAttributeName = OUString::createFromAscii(OAttributeMetaData::getSpecialAttributeName(SCA_ECHO_CHAR)); @@ -1292,17 +1234,13 @@ namespace xmloff return OControlImport::handleAttribute(_nNamespaceKey, _rLocalName, _rValue); } - //===================================================================== //= ORadioImport - //===================================================================== - //--------------------------------------------------------------------- ORadioImport::ORadioImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const Reference< XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType) :OImagePositionImport( _rImport, _rEventManager, _nPrefix, _rName, _rxParentContainer, _eType ) { } - //--------------------------------------------------------------------- bool ORadioImport::handleAttribute(sal_uInt16 _nNamespaceKey, const OUString& _rLocalName, const OUString& _rValue) { // need special handling for the State & CurrentState properties: @@ -1331,9 +1269,7 @@ namespace xmloff return OImagePositionImport::handleAttribute( _nNamespaceKey, _rLocalName, _rValue ); } - //===================================================================== //= OURLReferenceImport - //===================================================================== OURLReferenceImport::OURLReferenceImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const Reference< XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType) @@ -1341,7 +1277,6 @@ namespace xmloff { } - //--------------------------------------------------------------------- bool OURLReferenceImport::handleAttribute(sal_uInt16 _nNamespaceKey, const OUString& _rLocalName, const OUString& _rValue) { static const sal_Char* s_pTargetLocationAttributeName = OAttributeMetaData::getCommonControlAttributeName( CCA_TARGET_LOCATION ); @@ -1375,10 +1310,7 @@ namespace xmloff return OImagePositionImport::handleAttribute( _nNamespaceKey, _rLocalName, _rValue ); } - //===================================================================== //= OButtonImport - //===================================================================== - //--------------------------------------------------------------------- OButtonImport::OButtonImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const Reference< XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType) @@ -1387,7 +1319,6 @@ namespace xmloff enableTrackAttributes(); } - //--------------------------------------------------------------------- void OButtonImport::StartElement(const Reference< XAttributeList >& _rxAttrList) { OURLReferenceImport::StartElement(_rxAttrList); @@ -1396,10 +1327,7 @@ namespace xmloff simulateDefaultedAttribute(OAttributeMetaData::getCommonControlAttributeName(CCA_TARGET_FRAME), PROPERTY_TARGETFRAME, "_blank"); } - //===================================================================== //= OValueRangeImport - //===================================================================== - //--------------------------------------------------------------------- OValueRangeImport::OValueRangeImport( OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const Reference< XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType ) :OControlImport( _rImport, _rEventManager, _nPrefix, _rName, _rxParentContainer, _eType ) @@ -1408,7 +1336,6 @@ namespace xmloff } - //--------------------------------------------------------------------- bool OValueRangeImport::handleAttribute( sal_uInt16 _nNamespaceKey, const OUString& _rLocalName, const OUString& _rValue ) { if ( _rLocalName.equalsAscii( OAttributeMetaData::getSpecialAttributeName( SCA_STEP_SIZE ) ) ) @@ -1419,7 +1346,6 @@ namespace xmloff return OControlImport::handleAttribute( _nNamespaceKey, _rLocalName, _rValue ); } - //--------------------------------------------------------------------- void OValueRangeImport::StartElement( const Reference< XAttributeList >& _rxAttrList ) { OControlImport::StartElement( _rxAttrList ); @@ -1433,10 +1359,7 @@ namespace xmloff } } - //===================================================================== //= OTextLikeImport - //===================================================================== - //--------------------------------------------------------------------- OTextLikeImport::OTextLikeImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const Reference< XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType) @@ -1446,7 +1369,6 @@ namespace xmloff enableTrackAttributes(); } - //--------------------------------------------------------------------- SvXMLImportContext* OTextLikeImport::CreateChildContext( sal_uInt16 _nPrefix, const OUString& _rLocalName, const Reference< XAttributeList >& _rxAttrList ) { @@ -1487,7 +1409,6 @@ namespace xmloff return OControlImport::CreateChildContext( _nPrefix, _rLocalName, _rxAttrList ); } - //--------------------------------------------------------------------- void OTextLikeImport::StartElement(const Reference< XAttributeList >& _rxAttrList) { OControlImport::StartElement(_rxAttrList); @@ -1500,7 +1421,6 @@ namespace xmloff simulateDefaultedAttribute(OAttributeMetaData::getDatabaseAttributeName(DA_CONVERT_EMPTY), PROPERTY_EMPTY_IS_NULL, "false"); } - //--------------------------------------------------------------------- struct EqualHandle : public ::std::unary_function< PropertyValue, bool > { const sal_Int32 m_nHandle; @@ -1512,7 +1432,6 @@ namespace xmloff } }; - //--------------------------------------------------------------------- void OTextLikeImport::removeRedundantCurrentValue() { if ( m_bEncounteredTextPara ) @@ -1555,7 +1474,6 @@ namespace xmloff // since this is the default of this property, anyway. } - //--------------------------------------------------------------------- struct EqualName : public ::std::unary_function< PropertyValue, bool > { const OUString m_sName; @@ -1567,7 +1485,6 @@ namespace xmloff } }; - //--------------------------------------------------------------------- void OTextLikeImport::adjustDefaultControlProperty() { // In OpenOffice.org 2.0, we changed the implementation of the css.form.component.TextField (the model of a text field control), @@ -1596,7 +1513,6 @@ namespace xmloff } } - //--------------------------------------------------------------------- void OTextLikeImport::EndElement() { removeRedundantCurrentValue(); @@ -1624,10 +1540,7 @@ namespace xmloff } - //===================================================================== //= OListAndComboImport - //===================================================================== - //--------------------------------------------------------------------- OListAndComboImport::OListAndComboImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const Reference< XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType) @@ -1641,7 +1554,6 @@ namespace xmloff enableTrackAttributes(); } - //--------------------------------------------------------------------- SvXMLImportContext* OListAndComboImport::CreateChildContext(sal_uInt16 _nPrefix, const OUString& _rLocalName, const Reference< XAttributeList >& _rxAttrList) { @@ -1659,7 +1571,6 @@ namespace xmloff return OControlImport::CreateChildContext(_nPrefix, _rLocalName, _rxAttrList); } - //--------------------------------------------------------------------- void OListAndComboImport::StartElement(const Reference< XAttributeList >& _rxAttrList) { m_bLinkWithIndexes = sal_False; @@ -1678,7 +1589,6 @@ namespace xmloff } } - //--------------------------------------------------------------------- void OListAndComboImport::EndElement() { // append the list source property the properties sequence of our importer @@ -1722,7 +1632,6 @@ namespace xmloff m_rContext.registerCellRangeListSource( m_xElement, m_sCellListSource ); } - //--------------------------------------------------------------------- void OListAndComboImport::doRegisterCellValueBinding( const OUString& _rBoundCellAddress ) { OUString sBoundCellAddress( _rBoundCellAddress ); @@ -1738,7 +1647,6 @@ namespace xmloff OControlImport::doRegisterCellValueBinding( sBoundCellAddress ); } - //--------------------------------------------------------------------- bool OListAndComboImport::handleAttribute(sal_uInt16 _nNamespaceKey, const OUString& _rLocalName, const OUString& _rValue) { static const sal_Char* pListSourceAttributeName = OAttributeMetaData::getDatabaseAttributeName(DA_LIST_SOURCE); @@ -1790,7 +1698,6 @@ namespace xmloff return OControlImport::handleAttribute(_nNamespaceKey, _rLocalName, _rValue); } - //--------------------------------------------------------------------- void OListAndComboImport::implPushBackLabel(const OUString& _rLabel) { OSL_ENSURE(!m_nEmptyListItems, "OListAndComboImport::implPushBackValue: label list is already done!"); @@ -1798,7 +1705,6 @@ namespace xmloff pushBackSequenceElement(m_aListSource, _rLabel); } - //--------------------------------------------------------------------- void OListAndComboImport::implPushBackValue(const OUString& _rValue) { OSL_ENSURE(!m_nEmptyValueItems, "OListAndComboImport::implPushBackValue: value list is already done!"); @@ -1814,19 +1720,16 @@ namespace xmloff } } - //--------------------------------------------------------------------- void OListAndComboImport::implEmptyLabelFound() { ++m_nEmptyListItems; } - //--------------------------------------------------------------------- void OListAndComboImport::implEmptyValueFound() { ++m_nEmptyValueItems; } - //--------------------------------------------------------------------- void OListAndComboImport::implSelectCurrentItem() { OSL_ENSURE((m_aListSource.getLength() + m_nEmptyListItems) == (m_aValueList.getLength() + m_nEmptyValueItems), @@ -1836,7 +1739,6 @@ namespace xmloff pushBackSequenceElement(m_aSelectedSeq, nItemNumber); } - //--------------------------------------------------------------------- void OListAndComboImport::implDefaultSelectCurrentItem() { OSL_ENSURE((m_aListSource.getLength() + m_nEmptyListItems) == (m_aValueList.getLength() + m_nEmptyValueItems), @@ -1846,10 +1748,7 @@ namespace xmloff pushBackSequenceElement(m_aDefaultSelectedSeq, nItemNumber); } - //===================================================================== //= OListOptionImport - //===================================================================== - //--------------------------------------------------------------------- OListOptionImport::OListOptionImport(SvXMLImport& _rImport, sal_uInt16 _nPrefix, const OUString& _rName, const OListAndComboImportRef& _rListBox) :SvXMLImportContext(_rImport, _nPrefix, _rName) @@ -1857,7 +1756,6 @@ namespace xmloff { } - //--------------------------------------------------------------------- void OListOptionImport::StartElement(const Reference< XAttributeList >& _rxAttrList) { // the label and the value @@ -1867,7 +1765,6 @@ namespace xmloff const OUString sValueAttribute = rMap.GetQNameByKey( GetPrefix(), OUString("value")); - // ------------------- // the label attribute OUString sValue = _rxAttrList->getValueByName(sLabelAttribute); sal_Bool bNonexistentAttribute = sal_False; @@ -1881,7 +1778,6 @@ namespace xmloff else m_xListBoxImport->implPushBackLabel( sValue ); - // ------------------- // the value attribute sValue = _rxAttrList->getValueByName(sValueAttribute); bNonexistentAttribute = sal_False; @@ -1918,10 +1814,7 @@ namespace xmloff SvXMLImportContext::StartElement(_rxAttrList); } - //===================================================================== //= OComboItemImport - //===================================================================== - //--------------------------------------------------------------------- OComboItemImport::OComboItemImport(SvXMLImport& _rImport, sal_uInt16 _nPrefix, const OUString& _rName, const OListAndComboImportRef& _rListBox) :SvXMLImportContext(_rImport, _nPrefix, _rName) @@ -1929,7 +1822,6 @@ namespace xmloff { } - //--------------------------------------------------------------------- void OComboItemImport::StartElement(const Reference< XAttributeList >& _rxAttrList) { const OUString sLabelAttributeName = GetImport().GetNamespaceMap().GetQNameByKey( @@ -1939,11 +1831,7 @@ namespace xmloff SvXMLImportContext::StartElement(_rxAttrList); } - - //===================================================================== //= OColumnWrapperImport - //===================================================================== - //--------------------------------------------------------------------- OColumnWrapperImport::OColumnWrapperImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const Reference< XNameContainer >& _rxParentContainer) :SvXMLImportContext(_rImport.getGlobalContext(), _nPrefix, _rName) @@ -1952,7 +1840,6 @@ namespace xmloff ,m_rEventManager(_rEventManager) { } - //--------------------------------------------------------------------- SvXMLImportContext* OColumnWrapperImport::CreateChildContext(sal_uInt16 _nPrefix, const OUString& _rLocalName, const Reference< XAttributeList >&) { @@ -1964,7 +1851,6 @@ namespace xmloff } return pReturn; } - //--------------------------------------------------------------------- void OColumnWrapperImport::StartElement(const Reference< XAttributeList >& _rxAttrList) { OSL_ENSURE(!m_xOwnAttributes.is(), "OColumnWrapperImport::StartElement: aready have the cloned list!"); @@ -1977,7 +1863,6 @@ namespace xmloff OSL_ENSURE(m_xOwnAttributes.is(), "OColumnWrapperImport::StartElement: no cloned list!"); } - //--------------------------------------------------------------------- OControlImport* OColumnWrapperImport::implCreateChildContext( sal_uInt16 _nPrefix, const OUString& _rLocalName, OControlElement::ElementType _eType) @@ -2011,10 +1896,7 @@ namespace xmloff } } - //===================================================================== //= OGridImport - //===================================================================== - //--------------------------------------------------------------------- OGridImport::OGridImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const Reference< XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType) @@ -2023,16 +1905,12 @@ namespace xmloff setElementType(_eType); } - //--------------------------------------------------------------------- SvXMLImportContext* OGridImport::implCreateControlWrapper(sal_uInt16 _nPrefix, const OUString& _rLocalName) { return new OColumnWrapperImport(m_rFormImport, *this, _nPrefix, _rLocalName, m_xMeAsContainer); } - //===================================================================== //= OFormImport - //===================================================================== - //--------------------------------------------------------------------- OFormImport::OFormImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const Reference< XNameContainer >& _rxParentContainer) :OFormImport_Base(_rImport, _rEventManager, _nPrefix, _rName, _rxParentContainer, "control") @@ -2040,7 +1918,6 @@ namespace xmloff enableTrackAttributes(); } - //--------------------------------------------------------------------- SvXMLImportContext* OFormImport::CreateChildContext(sal_uInt16 _nPrefix, const OUString& _rLocalName, const Reference< XAttributeList >& _rxAttrList) { @@ -2059,7 +1936,6 @@ namespace xmloff OElementNameMap::getElementType(_rLocalName) ); } - //--------------------------------------------------------------------- void OFormImport::StartElement(const Reference< XAttributeList >& _rxAttrList) { m_rFormImport.enterEventContext(); @@ -2069,21 +1945,18 @@ namespace xmloff simulateDefaultedAttribute(OAttributeMetaData::getCommonControlAttributeName(CCA_TARGET_FRAME), PROPERTY_TARGETFRAME, "_blank"); } - //--------------------------------------------------------------------- void OFormImport::EndElement() { OFormImport_Base::EndElement(); m_rFormImport.leaveEventContext(); } - //--------------------------------------------------------------------- SvXMLImportContext* OFormImport::implCreateControlWrapper(sal_uInt16 _nPrefix, const OUString& _rLocalName) { OSL_ENSURE( !this, "illegal call to OFormImport::implCreateControlWrapper" ); return new SvXMLImportContext(GetImport(), _nPrefix, _rLocalName ); } - //--------------------------------------------------------------------- bool OFormImport::handleAttribute(sal_uInt16 _nNamespaceKey, const OUString& _rLocalName, const OUString& _rValue) { // handle the master/details field attributes (they're way too special to let the OPropertyImport handle them) @@ -2105,7 +1978,6 @@ namespace xmloff return OFormImport_Base::handleAttribute(_nNamespaceKey, _rLocalName, _rValue); } - //--------------------------------------------------------------------- void OFormImport::implTranslateStringListProperty(const OUString& _rPropertyName, const OUString& _rValue) { PropertyValue aProp; @@ -2128,7 +2000,6 @@ namespace xmloff aElements.reserve(nEstimate + 1); // that's the worst case. If the string contains the separator character _quoted_, we reserved to much ... - sal_Int32 nElementStart = 0; sal_Int32 nNextSep = 0; sal_Int32 nElementLength; @@ -2170,9 +2041,7 @@ namespace xmloff // add the property to the base class' array implPushBackPropertyValue(aProp); } - //===================================================================== //= OXMLDataSourceImport - //===================================================================== OXMLDataSourceImport::OXMLDataSourceImport( SvXMLImport& _rImport ,sal_uInt16 nPrfx @@ -2206,7 +2075,6 @@ namespace xmloff } } } - //--------------------------------------------------------------------- OControlImport* OFormImport::implCreateChildContext( sal_uInt16 _nPrefix, const OUString& _rLocalName, OControlElement::ElementType _eType ) @@ -2251,8 +2119,6 @@ namespace xmloff } } -//......................................................................... } // namespace xmloff -//......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/forms/elementimport.hxx b/xmloff/source/forms/elementimport.hxx index b9792808b905..e3df69e253c0 100644 --- a/xmloff/source/forms/elementimport.hxx +++ b/xmloff/source/forms/elementimport.hxx @@ -36,16 +36,12 @@ #include <comphelper/stl_types.hxx> class XMLTextStyleContext; -//......................................................................... namespace xmloff { -//......................................................................... class OFormLayerXMLImport_Impl; - //===================================================================== //= OElementNameMap - //===================================================================== const OControlElement::ElementType& operator ++(OControlElement::ElementType& _e); /** helper class which allows fast translation of xml tag names into element types. @@ -63,9 +59,7 @@ namespace xmloff static ElementType getElementType(const OUString& _rName); }; - //===================================================================== //= OElementImport - //===================================================================== /** implements common behaviour for importing forms, controls and columns */ class OElementImport @@ -176,9 +170,7 @@ namespace xmloff virtual OUString determineDefaultServiceName() const; }; - //===================================================================== //= OControlImport - //===================================================================== /** helper class for importing the description of a single control */ class OControlImport @@ -283,9 +275,7 @@ namespace xmloff // we should have dedicated attribute handlers // The rest of xmloff implements it this way - why don't we do, too? - //===================================================================== //= OImagePositionImport - //===================================================================== class OImagePositionImport : public OControlImport { sal_Int16 m_nImagePosition; @@ -311,9 +301,7 @@ namespace xmloff ); }; - //===================================================================== //= OReferredControlImport - //===================================================================== class OReferredControlImport : public OControlImport { protected: @@ -336,9 +324,7 @@ namespace xmloff const OUString& _rValue); }; - //===================================================================== //= OPasswordImport - //===================================================================== class OPasswordImport : public OControlImport { public: @@ -354,9 +340,7 @@ namespace xmloff const OUString& _rValue); }; - //===================================================================== //= ORadioImport - //===================================================================== class ORadioImport : public OImagePositionImport { public: @@ -373,9 +357,7 @@ namespace xmloff const OUString& _rValue); }; - //===================================================================== //= OURLReferenceImport - //===================================================================== /** a specialized version of the <type>OControlImport</type> class, which is able to handle attributes which denote URLs (and stored relative) */ @@ -395,9 +377,7 @@ namespace xmloff const OUString& _rValue); }; - //===================================================================== //= OButtonImport - //===================================================================== /** A specialized version of the <type>OControlImport</type> class, which handles the target frame for image and command buttons */ @@ -416,9 +396,7 @@ namespace xmloff const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList); }; - //===================================================================== //= OValueRangeImport - //===================================================================== /** A specialized version of the <type>OControlImport</type> class, which imports the value-range elements */ @@ -445,9 +423,7 @@ namespace xmloff const OUString& _rValue ); }; - //===================================================================== //= OTextLikeImport - //===================================================================== /** A specialized version of the <type>OControlImport</type> class, which handles text like controls which have the convert-empty-to-null attribute</p> */ @@ -478,9 +454,7 @@ namespace xmloff void removeRedundantCurrentValue(); }; - //===================================================================== //= OListAndComboImport - //===================================================================== /** A specialized version of the <type>OControlImport</type> class, which handles attributes / sub elements which are special to list and combo boxes */ @@ -545,9 +519,7 @@ namespace xmloff }; SV_DECL_IMPL_REF(OListAndComboImport); - //===================================================================== //= OListOptionImport - //===================================================================== /** helper class for importing a single <form:option> element. */ class OListOptionImport @@ -563,9 +535,7 @@ namespace xmloff const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList); }; - //===================================================================== //= OComboItemImport - //===================================================================== /** helper class for importing a single <form:item> element. */ class OComboItemImport @@ -583,9 +553,7 @@ namespace xmloff const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList); }; - //===================================================================== //= OContainerImport - //===================================================================== // BASE must be a derivee of OElementImport template <class BASE> class OContainerImport @@ -622,9 +590,7 @@ namespace xmloff sal_uInt16 _nPrefix, const OUString& _rLocalName) = 0; }; - //===================================================================== //= OColumnImport - //===================================================================== /** helper class importing a single grid column (without the <form:column> element wrapping the column). @@ -648,9 +614,7 @@ namespace xmloff createElement(); }; - //===================================================================== //= OColumnWrapperImport - //===================================================================== class OColumnWrapperImport : public SvXMLImportContext { protected: @@ -677,9 +641,7 @@ namespace xmloff OControlElement::ElementType _eType); }; - //===================================================================== //= OGridImport - //===================================================================== typedef OContainerImport< OControlImport > OGridImport_Base; /** helper class importing a single <form:grid> element */ @@ -697,9 +659,7 @@ namespace xmloff sal_uInt16 _nPrefix, const OUString& _rLocalName); }; - //===================================================================== //= OFormImport - //===================================================================== typedef OContainerImport< OElementImport > OFormImport_Base; /** helper class importing a single <form:form> element */ @@ -733,13 +693,10 @@ namespace xmloff sal_uInt16 _nPrefix, const OUString& _rLocalName, OControlElement::ElementType _eType ); - void implTranslateStringListProperty(const OUString& _rPropertyName, const OUString& _rValue); }; - //===================================================================== //= OXMLDataSourceImport - //===================================================================== class OXMLDataSourceImport : public SvXMLImportContext { public: @@ -754,9 +711,7 @@ namespace xmloff #include "elementimport_impl.hxx" #undef _INCLUDING_FROM_ELEMENTIMPORT_HXX_ -//......................................................................... } // namespace xmloff -//......................................................................... #endif // _XMLOFF_FORMS_ELEMENTIMPORT_HXX_ diff --git a/xmloff/source/forms/elementimport_impl.hxx b/xmloff/source/forms/elementimport_impl.hxx index e9c245c9e5d5..2ca20f76ddec 100644 --- a/xmloff/source/forms/elementimport_impl.hxx +++ b/xmloff/source/forms/elementimport_impl.hxx @@ -26,10 +26,7 @@ // no namespace. Same as above: this file is included from elementimport.hxx only, // and this is done inside the namespace -//========================================================================= //= OContainerImport -//========================================================================= -//------------------------------------------------------------------------- template <class BASE> inline SvXMLImportContext* OContainerImport< BASE >::CreateChildContext( sal_uInt16 _nPrefix, const OUString& _rLocalName, @@ -50,7 +47,6 @@ inline SvXMLImportContext* OContainerImport< BASE >::CreateChildContext( return BASE::CreateChildContext(_nPrefix, _rLocalName, _rxAttrList); } -//------------------------------------------------------------------------- template <class BASE> inline ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > OContainerImport< BASE >::createElement() @@ -71,7 +67,6 @@ inline ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > return xReturn; } -//------------------------------------------------------------------------- template <class BASE> inline void OContainerImport< BASE >::EndElement() { @@ -83,10 +78,7 @@ inline void OContainerImport< BASE >::EndElement() ODefaultEventAttacherManager::setEvents(xIndexContainer); } -//========================================================================= //= OColumnImport -//========================================================================= -//------------------------------------------------------------------------- template <class BASE> OColumnImport< BASE >::OColumnImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer, @@ -97,7 +89,6 @@ OColumnImport< BASE >::OColumnImport(OFormLayerXMLImport_Impl& _rImport, IEventA OSL_ENSURE(m_xColumnFactory.is(), "OColumnImport::OColumnImport: invalid parent container (no factory)!"); } -//------------------------------------------------------------------------- // OElementImport overridables template <class BASE> ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > OColumnImport< BASE >::createElement() diff --git a/xmloff/source/forms/eventexport.cxx b/xmloff/source/forms/eventexport.cxx index c35d201a3321..6ec70d6009bf 100644 --- a/xmloff/source/forms/eventexport.cxx +++ b/xmloff/source/forms/eventexport.cxx @@ -22,10 +22,8 @@ #include "strings.hxx" #include <tools/debug.hxx> -//......................................................................... namespace xmloff { -//......................................................................... using namespace ::com::sun::star::uno; using namespace ::com::sun::star::script; @@ -33,10 +31,7 @@ namespace xmloff using namespace ::com::sun::star::beans; using namespace ::com::sun::star::lang; - //===================================================================== //= OEventDescriptorMapper - //===================================================================== - //--------------------------------------------------------------------- OEventDescriptorMapper::OEventDescriptorMapper(const Sequence< ScriptEventDescriptor >& _rEvents) { sal_Int32 nEvents = _rEvents.getLength(); @@ -92,14 +87,12 @@ namespace xmloff } } - //--------------------------------------------------------------------- void SAL_CALL OEventDescriptorMapper::replaceByName( const OUString&, const Any& ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException) { throw IllegalArgumentException( OUString("replacing is not implemented for this wrapper class."), static_cast< ::cppu::OWeakObject* >(this), 1); } - //--------------------------------------------------------------------- Any SAL_CALL OEventDescriptorMapper::getByName( const OUString& _rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException) { ConstMapString2PropertyValueSequenceIterator aPos = m_aMappedEvents.find(_rName); @@ -111,7 +104,6 @@ namespace xmloff return makeAny(aPos->second); } - //--------------------------------------------------------------------- Sequence< OUString > SAL_CALL OEventDescriptorMapper::getElementNames( ) throw(RuntimeException) { Sequence< OUString > aReturn(m_aMappedEvents.size()); @@ -125,27 +117,22 @@ namespace xmloff return aReturn; } - //--------------------------------------------------------------------- sal_Bool SAL_CALL OEventDescriptorMapper::hasByName( const OUString& _rName ) throw(RuntimeException) { ConstMapString2PropertyValueSequenceIterator aPos = m_aMappedEvents.find(_rName); return m_aMappedEvents.end() != aPos; } - //--------------------------------------------------------------------- Type SAL_CALL OEventDescriptorMapper::getElementType( ) throw(RuntimeException) { return ::getCppuType(static_cast< PropertyValue* >(NULL)); } - //--------------------------------------------------------------------- sal_Bool SAL_CALL OEventDescriptorMapper::hasElements( ) throw(RuntimeException) { return !m_aMappedEvents.empty(); } -//......................................................................... } // namespace xmloff -//......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/forms/eventexport.hxx b/xmloff/source/forms/eventexport.hxx index b919236275fa..91548c49a119 100644 --- a/xmloff/source/forms/eventexport.hxx +++ b/xmloff/source/forms/eventexport.hxx @@ -27,14 +27,10 @@ #include <cppuhelper/implbase1.hxx> #include <comphelper/stl_types.hxx> -//......................................................................... namespace xmloff { -//......................................................................... - //===================================================================== //= OEventDescriptorMapper - //===================================================================== typedef ::cppu::WeakImplHelper1 < ::com::sun::star::container::XNameReplace > OEventDescriptorMapper_Base; /** helper class wrapping different script event representations @@ -69,10 +65,7 @@ namespace xmloff virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException); }; - -//......................................................................... } // namespace xmloff -//......................................................................... #endif // _XMLOFF_FORMS_EVENTEXPORT_HXX_ diff --git a/xmloff/source/forms/eventimport.cxx b/xmloff/source/forms/eventimport.cxx index d61fe5f4f9b7..8a6a99e8d365 100644 --- a/xmloff/source/forms/eventimport.cxx +++ b/xmloff/source/forms/eventimport.cxx @@ -23,27 +23,21 @@ #include <comphelper/extract.hxx> #include "strings.hxx" -//......................................................................... namespace xmloff { -//......................................................................... using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::script; using namespace ::com::sun::star::container; - //===================================================================== //= OFormEventsImportContext - //===================================================================== - //--------------------------------------------------------------------- OFormEventsImportContext::OFormEventsImportContext(SvXMLImport& _rImport, sal_uInt16 _nPrefix, const OUString& _rLocalName, IEventAttacher& _rEventAttacher) :XMLEventsImportContext(_rImport, _nPrefix, _rLocalName) ,m_rEventAttacher(_rEventAttacher) { } - //--------------------------------------------------------------------- void OFormEventsImportContext::EndElement() { Sequence< ScriptEventDescriptor > aTranslated(aCollectEvents.size()); @@ -102,15 +96,12 @@ namespace xmloff XMLEventsImportContext::EndElement(); } - //===================================================================== //= ODefaultEventAttacherManager - //===================================================================== ODefaultEventAttacherManager::~ODefaultEventAttacherManager() { } - //------------------------------------------------------------------------- void ODefaultEventAttacherManager::registerEvents(const Reference< XPropertySet >& _rxElement, const Sequence< ScriptEventDescriptor >& _rEvents) { @@ -120,7 +111,6 @@ namespace xmloff m_aEvents[_rxElement] = _rEvents; } - //------------------------------------------------------------------------- void ODefaultEventAttacherManager::setEvents(const Reference< XIndexAccess >& _rxContainer) { Reference< XEventAttacherManager > xEventManager(_rxContainer, UNO_QUERY); @@ -146,9 +136,6 @@ namespace xmloff } } -//......................................................................... } // namespace xmloff -//......................................................................... - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/forms/eventimport.hxx b/xmloff/source/forms/eventimport.hxx index af7df463bade..1993828255f5 100644 --- a/xmloff/source/forms/eventimport.hxx +++ b/xmloff/source/forms/eventimport.hxx @@ -26,14 +26,10 @@ #include <com/sun/star/container/XIndexAccess.hpp> class SvXMLImport; -//......................................................................... namespace xmloff { -//......................................................................... - //===================================================================== //= OFormEventsImportContext - //===================================================================== class OFormEventsImportContext : public XMLEventsImportContext { protected: @@ -47,9 +43,7 @@ namespace xmloff virtual void EndElement(); }; - //===================================================================== //= ODefaultEventAttacherManager - //===================================================================== class ODefaultEventAttacherManager : public IEventAttacherManager { protected: @@ -79,9 +73,7 @@ namespace xmloff virtual ~ODefaultEventAttacherManager(); }; -//......................................................................... } // namespace xmloff -//......................................................................... #endif // _XMLOFF_FORMS_EVENTIMPORT_HXX_ diff --git a/xmloff/source/forms/formattributes.cxx b/xmloff/source/forms/formattributes.cxx index 31989bac7b7d..b1ebf0040d28 100644 --- a/xmloff/source/forms/formattributes.cxx +++ b/xmloff/source/forms/formattributes.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "formattributes.hxx" #include <sax/tools/converter.hxx> @@ -25,20 +24,14 @@ #include "xmloff/xmlnmspe.hxx" #include <xmloff/xmluconv.hxx> #include <rtl/ustrbuf.hxx> -//......................................................................... namespace xmloff { -//......................................................................... using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::beans; - - //===================================================================== //= OAttributeMetaData - //===================================================================== - //--------------------------------------------------------------------- const sal_Char* OAttributeMetaData::getCommonControlAttributeName(sal_Int32 _nId) { switch (_nId) @@ -74,7 +67,6 @@ namespace xmloff return ""; } - //--------------------------------------------------------------------- sal_uInt16 OAttributeMetaData::getCommonControlAttributeNamespace(sal_Int32 _nId) { if (CCA_TARGET_LOCATION == _nId) @@ -86,7 +78,6 @@ namespace xmloff return XML_NAMESPACE_FORM; } - //--------------------------------------------------------------------- const sal_Char* OAttributeMetaData::getFormAttributeName(FormAttributes _eAttrib) { switch (_eAttrib) @@ -119,7 +110,6 @@ namespace xmloff return ""; } - //--------------------------------------------------------------------- sal_uInt16 OAttributeMetaData::getFormAttributeNamespace(FormAttributes _eAttrib) { if (faAction == _eAttrib) @@ -131,7 +121,6 @@ namespace xmloff return XML_NAMESPACE_FORM; } - //--------------------------------------------------------------------- const sal_Char* OAttributeMetaData::getDatabaseAttributeName(sal_Int32 _nId) { switch (_nId) @@ -148,14 +137,12 @@ namespace xmloff return ""; } - //--------------------------------------------------------------------- sal_uInt16 OAttributeMetaData::getDatabaseAttributeNamespace(sal_Int32 /*_nId*/) { // nothing special here return XML_NAMESPACE_FORM; } - //--------------------------------------------------------------------- const sal_Char* OAttributeMetaData::getBindingAttributeName(sal_Int32 _nId) { switch (_nId) @@ -169,14 +156,12 @@ namespace xmloff return ""; } - //--------------------------------------------------------------------- sal_uInt16 OAttributeMetaData::getBindingAttributeNamespace(sal_Int32) { // nothing special here return XML_NAMESPACE_FORM; } - //--------------------------------------------------------------------- const sal_Char* OAttributeMetaData::getSpecialAttributeName(sal_Int32 _nId) { switch (_nId) @@ -205,7 +190,6 @@ namespace xmloff return ""; } - //--------------------------------------------------------------------- sal_uInt16 OAttributeMetaData::getSpecialAttributeNamespace(sal_Int32 _nId) { switch( _nId ) @@ -215,7 +199,6 @@ namespace xmloff return XML_NAMESPACE_FORM; } - //--------------------------------------------------------------------- const sal_Char* OAttributeMetaData::getOfficeFormsAttributeName(OfficeFormsAttributes _eAttrib) { switch (_eAttrib) @@ -228,27 +211,21 @@ namespace xmloff return ""; } - //--------------------------------------------------------------------- sal_uInt16 OAttributeMetaData::getOfficeFormsAttributeNamespace(OfficeFormsAttributes /* _eAttrib */) { // nothing special here return XML_NAMESPACE_FORM; } - //===================================================================== //= OAttribute2Property - //===================================================================== - //--------------------------------------------------------------------- OAttribute2Property::OAttribute2Property() { } - //--------------------------------------------------------------------- OAttribute2Property::~OAttribute2Property() { } - //--------------------------------------------------------------------- const OAttribute2Property::AttributeAssignment* OAttribute2Property::getAttributeTranslation( const OUString& _rAttribName) { @@ -258,7 +235,6 @@ namespace xmloff return NULL; } - //--------------------------------------------------------------------- void OAttribute2Property::addStringProperty( const sal_Char* _pAttributeName, const OUString& _rPropertyName, const sal_Char* _pAttributeDefault) @@ -267,7 +243,6 @@ namespace xmloff _pAttributeDefault ? OUString::createFromAscii(_pAttributeDefault) : OUString()); } - //--------------------------------------------------------------------- void OAttribute2Property::addBooleanProperty( const sal_Char* _pAttributeName, const OUString& _rPropertyName, const sal_Bool _bAttributeDefault, const sal_Bool _bInverseSemantics) @@ -278,7 +253,6 @@ namespace xmloff aAssignment.bInverseSemantics = _bInverseSemantics; } - //--------------------------------------------------------------------- void OAttribute2Property::addInt16Property( const sal_Char* _pAttributeName, const OUString& _rPropertyName, const sal_Int16 _nAttributeDefault) @@ -288,7 +262,6 @@ namespace xmloff implAdd(_pAttributeName, _rPropertyName, ::getCppuType( static_cast< sal_Int16* >(NULL) ), aDefault.makeStringAndClear()); } - //--------------------------------------------------------------------- void OAttribute2Property::addInt32Property( const sal_Char* _pAttributeName, const OUString& _rPropertyName, const sal_Int32 _nAttributeDefault) @@ -298,7 +271,6 @@ namespace xmloff implAdd( _pAttributeName, _rPropertyName, ::getCppuType( static_cast< sal_Int32* >(NULL) ), aDefault.makeStringAndClear() ); } - //--------------------------------------------------------------------- void OAttribute2Property::addEnumProperty( const sal_Char* _pAttributeName, const OUString& _rPropertyName, const sal_uInt16 _nAttributeDefault, const SvXMLEnumMapEntry* _pValueMap, @@ -313,7 +285,6 @@ namespace xmloff aAssignment.pEnumMap = _pValueMap; } - //--------------------------------------------------------------------- OAttribute2Property::AttributeAssignment& OAttribute2Property::implAdd( const sal_Char* _pAttributeName, const OUString& _rPropertyName, const ::com::sun::star::uno::Type& _rType, const OUString& /*_rDefaultString*/) @@ -332,8 +303,6 @@ namespace xmloff return m_aKnownProperties[sAttributeName] = aAssignment; } -//......................................................................... } // namespace xmloff -//......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/forms/formattributes.hxx b/xmloff/source/forms/formattributes.hxx index f535d0172ba0..9b933c42205f 100644 --- a/xmloff/source/forms/formattributes.hxx +++ b/xmloff/source/forms/formattributes.hxx @@ -27,10 +27,8 @@ struct SvXMLEnumMapEntry; -//......................................................................... namespace xmloff { -//......................................................................... // flags for common control attributes #define CCA_NAME 0x00000001 @@ -137,9 +135,7 @@ namespace xmloff ofaApplyDesignMode }; - //===================================================================== //= OAttributeMetaData - //===================================================================== /** allows the translation of attribute ids into strings. <p>This class does not allow to connect xml attributes to property names or @@ -221,9 +217,7 @@ namespace xmloff static sal_uInt16 getOfficeFormsAttributeNamespace(OfficeFormsAttributes _eAttrib); }; - //===================================================================== //= OAttribute2Property - //===================================================================== /** some kind of opposite to the OAttributeMetaData class. Able to translate attributes into property names/types @@ -347,9 +341,7 @@ namespace xmloff const sal_Char* _pAttributeName, const OUString& _rPropertyName, const ::com::sun::star::uno::Type& _rType, const OUString& _rDefaultString); }; -//......................................................................... } // namespace xmloff -//......................................................................... #endif // _XMLOFF_FORMATTRIBUTES_HXX_ diff --git a/xmloff/source/forms/formcellbinding.cxx b/xmloff/source/forms/formcellbinding.cxx index 6ff657ec30da..176aaaabddf2 100644 --- a/xmloff/source/forms/formcellbinding.cxx +++ b/xmloff/source/forms/formcellbinding.cxx @@ -37,10 +37,8 @@ #include <functional> #include <algorithm> -//............................................................................ namespace xmloff { -//............................................................................ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; @@ -61,7 +59,6 @@ namespace using ::com::sun::star::frame::XModel; using ::com::sun::star::uno::UNO_QUERY; - //.................................................................... template< class TYPE > Reference< TYPE > getTypedModelNode( const Reference< XInterface >& _rxModelNode ) { @@ -78,13 +75,11 @@ namespace } } - //.................................................................... Reference< XModel > getDocument( const Reference< XInterface >& _rxModelNode ) { return getTypedModelNode< XModel >( _rxModelNode ); } - //.................................................................... struct StringCompare : public ::std::unary_function< OUString, bool > { private: @@ -100,10 +95,7 @@ namespace }; } -//======================================================================== //= FormCellBindingHelper -//======================================================================== -//------------------------------------------------------------------------ FormCellBindingHelper::FormCellBindingHelper( const Reference< XPropertySet >& _rxControlModel, const Reference< XModel >& _rxDocument ) :m_xControlModel( _rxControlModel ) ,m_xDocument( _rxDocument, UNO_QUERY ) @@ -115,14 +107,12 @@ FormCellBindingHelper::FormCellBindingHelper( const Reference< XPropertySet >& _ OSL_ENSURE( m_xDocument.is(), "FormCellBindingHelper::FormCellBindingHelper: Did not find the spreadsheet document!" ); } -//------------------------------------------------------------------------ sal_Bool FormCellBindingHelper::livesInSpreadsheetDocument( const Reference< XPropertySet >& _rxControlModel ) { Reference< XSpreadsheetDocument > xDocument( getDocument( _rxControlModel ), UNO_QUERY ); return xDocument.is(); } -//------------------------------------------------------------------------ bool FormCellBindingHelper::convertStringAddress( const OUString& _rAddressDescription, CellAddress& /* [out] */ _rAddress, sal_Int16 /*_nAssumeSheet*/ ) const { Any aAddress; @@ -136,7 +126,6 @@ bool FormCellBindingHelper::convertStringAddress( const OUString& _rAddressDescr && ( aAddress >>= _rAddress ); } -//------------------------------------------------------------------------ bool FormCellBindingHelper::convertStringAddress( const OUString& _rAddressDescription, CellRangeAddress& /* [out] */ _rAddress ) const { @@ -151,7 +140,6 @@ bool FormCellBindingHelper::convertStringAddress( const OUString& _rAddressDescr && ( aAddress >>= _rAddress ); } -//------------------------------------------------------------------------ Reference< XValueBinding > FormCellBindingHelper::createCellBindingFromStringAddress( const OUString& _rAddress, bool _bUseIntegerBinding ) const { Reference< XValueBinding > xBinding; @@ -173,7 +161,6 @@ Reference< XValueBinding > FormCellBindingHelper::createCellBindingFromStringAdd return xBinding; } -//------------------------------------------------------------------------ Reference< XListEntrySource > FormCellBindingHelper::createCellListSourceFromStringAddress( const OUString& _rAddress ) const { Reference< XListEntrySource > xSource; @@ -192,7 +179,6 @@ Reference< XListEntrySource > FormCellBindingHelper::createCellListSourceFromStr return xSource; } -//------------------------------------------------------------------------ OUString FormCellBindingHelper::getStringAddressFromCellBinding( const Reference< XValueBinding >& _rxBinding ) const { OSL_PRECOND( !_rxBinding.is() || isCellBinding( _rxBinding ), "FormCellBindingHelper::getStringAddressFromCellBinding: this is no cell binding!" ); @@ -222,7 +208,6 @@ OUString FormCellBindingHelper::getStringAddressFromCellBinding( const Reference return sAddress; } -//------------------------------------------------------------------------ OUString FormCellBindingHelper::getStringAddressFromCellListSource( const Reference< XListEntrySource >& _rxSource ) const { OSL_PRECOND( !_rxSource.is() || isCellRangeListSource( _rxSource ), "FormCellBindingHelper::getStringAddressFromCellListSource: this is no cell list source!" ); @@ -251,7 +236,6 @@ OUString FormCellBindingHelper::getStringAddressFromCellListSource( const Refere return sAddress; } -//------------------------------------------------------------------------ bool FormCellBindingHelper::isSpreadsheetDocumentWhichSupplies( const Reference< XSpreadsheetDocument >& _rxDocument, const OUString& _rService ) SAL_THROW(()) { bool bYesItIs = false; @@ -287,13 +271,11 @@ bool FormCellBindingHelper::isSpreadsheetDocumentWhichSupplies( const Reference< return bYesItIs; } -//------------------------------------------------------------------------ bool FormCellBindingHelper::isSpreadsheetDocumentWhichSupplies( const OUString& _rService ) const SAL_THROW(()) { return isSpreadsheetDocumentWhichSupplies( m_xDocument, _rService ); } -//------------------------------------------------------------------------ bool FormCellBindingHelper::isListCellRangeAllowed( const Reference< XModel >& _rxDocument ) { return isSpreadsheetDocumentWhichSupplies( @@ -302,7 +284,6 @@ bool FormCellBindingHelper::isListCellRangeAllowed( const Reference< XModel >& _ ); } -//------------------------------------------------------------------------ bool FormCellBindingHelper::isListCellRangeAllowed( ) const { bool bAllow( false ); @@ -316,7 +297,6 @@ bool FormCellBindingHelper::isListCellRangeAllowed( ) const return bAllow; } -//------------------------------------------------------------------------ bool FormCellBindingHelper::isCellBindingAllowed( ) const { bool bAllow( false ); @@ -332,7 +312,6 @@ bool FormCellBindingHelper::isCellBindingAllowed( ) const return bAllow; } -//------------------------------------------------------------------------ bool FormCellBindingHelper::isCellBindingAllowed( const Reference< XModel >& _rxDocument ) { return isSpreadsheetDocumentWhichSupplies( @@ -341,25 +320,21 @@ bool FormCellBindingHelper::isCellBindingAllowed( const Reference< XModel >& _rx ); } -//------------------------------------------------------------------------ bool FormCellBindingHelper::isCellBinding( const Reference< XValueBinding >& _rxBinding ) const { return doesComponentSupport( _rxBinding.get(), SERVICE_CELLVALUEBINDING ); } -//------------------------------------------------------------------------ bool FormCellBindingHelper::isCellIntegerBinding( const Reference< XValueBinding >& _rxBinding ) const { return doesComponentSupport( _rxBinding.get(), SERVICE_LISTINDEXCELLBINDING ); } -//------------------------------------------------------------------------ bool FormCellBindingHelper::isCellRangeListSource( const Reference< XListEntrySource >& _rxSource ) const { return doesComponentSupport( _rxSource.get(), SERVICE_CELLRANGELISTSOURCE ); } -//------------------------------------------------------------------------ bool FormCellBindingHelper::doesComponentSupport( const Reference< XInterface >& _rxComponent, const OUString& _rService ) const { Reference< XServiceInfo > xSI( _rxComponent, UNO_QUERY ); @@ -367,7 +342,6 @@ bool FormCellBindingHelper::doesComponentSupport( const Reference< XInterface >& return bDoes; } -//------------------------------------------------------------------------ Reference< XValueBinding > FormCellBindingHelper::getCurrentBinding( ) const { Reference< XValueBinding > xBinding; @@ -377,7 +351,6 @@ Reference< XValueBinding > FormCellBindingHelper::getCurrentBinding( ) const return xBinding; } -//------------------------------------------------------------------------ Reference< XListEntrySource > FormCellBindingHelper::getCurrentListSource( ) const { Reference< XListEntrySource > xSource; @@ -387,7 +360,6 @@ Reference< XListEntrySource > FormCellBindingHelper::getCurrentListSource( ) con return xSource; } -//------------------------------------------------------------------------ void FormCellBindingHelper::setBinding( const Reference< XValueBinding >& _rxBinding ) { Reference< XBindableValue > xBindable( m_xControlModel, UNO_QUERY ); @@ -396,7 +368,6 @@ void FormCellBindingHelper::setBinding( const Reference< XValueBinding >& _rxBin xBindable->setValueBinding( _rxBinding ); } -//------------------------------------------------------------------------ void FormCellBindingHelper::setListSource( const Reference< XListEntrySource >& _rxSource ) { Reference< XListEntrySink > xSink( m_xControlModel, UNO_QUERY ); @@ -405,7 +376,6 @@ void FormCellBindingHelper::setListSource( const Reference< XListEntrySource >& xSink->setListEntrySource( _rxSource ); } -//------------------------------------------------------------------------ Reference< XInterface > FormCellBindingHelper::createDocumentDependentInstance( const OUString& _rService, const OUString& _rArgumentName, const Any& _rArgumentValue ) const { @@ -441,7 +411,6 @@ Reference< XInterface > FormCellBindingHelper::createDocumentDependentInstance( return xReturn; } -//------------------------------------------------------------------------ bool FormCellBindingHelper::doConvertAddressRepresentations( const OUString& _rInputProperty, const Any& _rInputValue, const OUString& _rOutputProperty, Any& _rOutputValue, bool _bIsRange ) const SAL_THROW(()) { @@ -473,8 +442,6 @@ bool FormCellBindingHelper::doConvertAddressRepresentations( const OUString& _rI return bSuccess; } -//............................................................................ } // namespace xmloff -//............................................................................ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/forms/formcellbinding.hxx b/xmloff/source/forms/formcellbinding.hxx index e1be12ec7da3..71d1bba796dd 100644 --- a/xmloff/source/forms/formcellbinding.hxx +++ b/xmloff/source/forms/formcellbinding.hxx @@ -29,14 +29,10 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/frame/XModel.hpp> -//............................................................................ namespace xmloff { -//............................................................................ - //======================================================================== //= FormCellBindingHelper - //======================================================================== /** encapsulates functionality related to binding a form control to a spreadsheet cell */ class FormCellBindingHelper @@ -264,9 +260,7 @@ namespace xmloff ) const SAL_THROW(()); }; -//............................................................................ } // namespace xmloff -//............................................................................ #endif // XMLOFF_FORMS_FORMCELLBINDING diff --git a/xmloff/source/forms/formenums.cxx b/xmloff/source/forms/formenums.cxx index 58c9b2842025..a6b7564b4752 100644 --- a/xmloff/source/forms/formenums.cxx +++ b/xmloff/source/forms/formenums.cxx @@ -36,10 +36,8 @@ #include <tools/wintypes.hxx> // for check states #include <xmloff/xmltoken.hxx> -//......................................................................... namespace xmloff { -//......................................................................... using namespace ::com::sun::star::form; using namespace ::com::sun::star::sdb; @@ -66,7 +64,6 @@ namespace xmloff NULL }; - //--------------------------------------------------------------------- const SvXMLEnumMapEntry* OEnumMapper::getEnumMap(EnumProperties _eProperty) { OSL_ENSURE(_eProperty < KNOWN_ENUM_PROPERTIES, "OEnumMapper::getEnumMap: invalid index (this will crash)!"); @@ -333,8 +330,6 @@ namespace xmloff return rReturn; } -//......................................................................... } // namespace xmloff -//......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/forms/formenums.hxx b/xmloff/source/forms/formenums.hxx index 0b391e2f9d0c..58786fa486ee 100644 --- a/xmloff/source/forms/formenums.hxx +++ b/xmloff/source/forms/formenums.hxx @@ -22,14 +22,10 @@ #include <xmloff/xmlement.hxx> -//......................................................................... namespace xmloff { -//......................................................................... - //===================================================================== //= OEnumMapper - //===================================================================== class OEnumMapper { public: @@ -64,9 +60,7 @@ namespace xmloff static const SvXMLEnumMapEntry* getEnumMap(EnumProperties _eProperty); }; -//......................................................................... } // namespace xmloff -//......................................................................... #endif // _XMLOFF_FORMENUMS_HXX_ diff --git a/xmloff/source/forms/formevents.cxx b/xmloff/source/forms/formevents.cxx index eae958e3197b..928a06f0984d 100644 --- a/xmloff/source/forms/formevents.cxx +++ b/xmloff/source/forms/formevents.cxx @@ -21,14 +21,10 @@ #include "xmloff/xmlnmspe.hxx" #include <xmloff/xmlevent.hxx> -//......................................................................... namespace xmloff { -//......................................................................... - //===================================================================== //= event translation table - //===================================================================== static const XMLEventNameTranslation aEventTranslations[] = { { "XApproveActionListener::approveAction", XML_NAMESPACE_FORM, "approveaction" }, // "on-approveaction" @@ -69,8 +65,6 @@ namespace xmloff const XMLEventNameTranslation* g_pFormsEventTranslation = aEventTranslations; -//......................................................................... } // namespace xmloff -//......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/forms/formevents.hxx b/xmloff/source/forms/formevents.hxx index 9bb95a106b13..df222d38660a 100644 --- a/xmloff/source/forms/formevents.hxx +++ b/xmloff/source/forms/formevents.hxx @@ -21,19 +21,13 @@ #define _XMLOFF_FORMS_FORMEVENTS_HXX_ struct XMLEventNameTranslation; -//......................................................................... namespace xmloff { -//......................................................................... - //===================================================================== //= event translation table - //===================================================================== extern const XMLEventNameTranslation* g_pFormsEventTranslation; -//......................................................................... } // namespace xmloff -//......................................................................... #endif // _XMLOFF_FORMS_FORMEVENTS_HXX_ diff --git a/xmloff/source/forms/formlayerexport.cxx b/xmloff/source/forms/formlayerexport.cxx index b200503caad7..c8c2ecf87308 100644 --- a/xmloff/source/forms/formlayerexport.cxx +++ b/xmloff/source/forms/formlayerexport.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <stdio.h> #include <xmloff/formlayerexport.hxx> #include "strings.hxx" @@ -32,11 +31,8 @@ #include <comphelper/stl_types.hxx> #include "officeforms.hxx" - -//......................................................................... namespace xmloff { -//......................................................................... using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -46,43 +42,35 @@ namespace xmloff using namespace ::com::sun::star::drawing; using namespace ::com::sun::star::frame; - //===================================================================== //= OFormLayerXMLExport - //===================================================================== - //--------------------------------------------------------------------- OFormLayerXMLExport::OFormLayerXMLExport(SvXMLExport& _rContext) :m_rContext(_rContext) ,m_pImpl(new OFormLayerXMLExport_Impl(_rContext)) { } - //--------------------------------------------------------------------- OFormLayerXMLExport::~OFormLayerXMLExport() { delete m_pImpl; m_pImpl = NULL; } - //--------------------------------------------------------------------- sal_Bool OFormLayerXMLExport::seekPage(const Reference< XDrawPage >& _rxDrawPage) { return m_pImpl->seekPage(_rxDrawPage); } - //--------------------------------------------------------------------- OUString OFormLayerXMLExport::getControlId(const Reference< XPropertySet >& _rxControl) { return m_pImpl->getControlId(_rxControl); } - //--------------------------------------------------------------------- OUString OFormLayerXMLExport::getControlNumberStyle( const Reference< XPropertySet >& _rxControl ) { return m_pImpl->getControlNumberStyle(_rxControl); } - //--------------------------------------------------------------------- void OFormLayerXMLExport::examineForms(const Reference< XDrawPage >& _rxDrawPage) { try @@ -95,66 +83,53 @@ namespace xmloff } } - //--------------------------------------------------------------------- void OFormLayerXMLExport::exportForms(const Reference< XDrawPage >& _rxDrawPage) { m_pImpl->exportForms(_rxDrawPage); } - //--------------------------------------------------------------------- void OFormLayerXMLExport::exportXForms() const { m_pImpl->exportXForms(); } - //--------------------------------------------------------------------- bool OFormLayerXMLExport::pageContainsForms( const Reference< XDrawPage >& _rxDrawPage ) const { return m_pImpl->pageContainsForms( _rxDrawPage ); } - //--------------------------------------------------------------------- bool OFormLayerXMLExport::documentContainsXForms() const { return m_pImpl->documentContainsXForms(); } - //--------------------------------------------------------------------- void OFormLayerXMLExport::exportAutoControlNumberStyles() { m_pImpl->exportAutoControlNumberStyles(); } - //--------------------------------------------------------------------- void OFormLayerXMLExport::exportAutoStyles() { m_pImpl->exportAutoStyles(); } - //--------------------------------------------------------------------- void OFormLayerXMLExport::excludeFromExport( const Reference< XControlModel > _rxControl ) { m_pImpl->excludeFromExport( _rxControl ); } - //========================================================================= //= OOfficeFormsExport - //========================================================================= - //------------------------------------------------------------------------- OOfficeFormsExport::OOfficeFormsExport( SvXMLExport& _rExp ) :m_pImpl(NULL) { m_pImpl = new OFormsRootExport(_rExp); } - //------------------------------------------------------------------------- OOfficeFormsExport::~OOfficeFormsExport() { delete m_pImpl; } -//......................................................................... } // namespace xmloff -//......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/forms/formlayerimport.cxx b/xmloff/source/forms/formlayerimport.cxx index 80245da6195b..c5e40ed606d7 100644 --- a/xmloff/source/forms/formlayerimport.cxx +++ b/xmloff/source/forms/formlayerimport.cxx @@ -20,10 +20,8 @@ #include <xmloff/formlayerimport.hxx> #include "layerimport.hxx" -//......................................................................... namespace xmloff { -//......................................................................... using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -32,48 +30,39 @@ namespace xmloff using namespace ::com::sun::star::drawing; using namespace ::com::sun::star; - //===================================================================== //= OFormLayerXMLExport - //===================================================================== - //--------------------------------------------------------------------- OFormLayerXMLImport::OFormLayerXMLImport(SvXMLImport& _rImporter) :m_pImpl(NULL) { m_pImpl = new OFormLayerXMLImport_Impl(_rImporter); } - //--------------------------------------------------------------------- OFormLayerXMLImport::~OFormLayerXMLImport() { delete m_pImpl; } - //--------------------------------------------------------------------- void OFormLayerXMLImport::setAutoStyleContext(SvXMLStylesContext* _pNewContext) { m_pImpl->setAutoStyleContext(_pNewContext); } - //--------------------------------------------------------------------- void OFormLayerXMLImport::startPage(const Reference< XDrawPage >& _rxDrawPage) { m_pImpl->startPage(_rxDrawPage); } - //--------------------------------------------------------------------- void OFormLayerXMLImport::endPage() { m_pImpl->endPage(); } - //--------------------------------------------------------------------- Reference< XPropertySet > OFormLayerXMLImport::lookupControl(const OUString& _rId) { return m_pImpl->lookupControlId(_rId); } - //--------------------------------------------------------------------- SvXMLImportContext* OFormLayerXMLImport::createOfficeFormsContext( SvXMLImport& _rImport, sal_uInt16 _nPrefix, @@ -82,27 +71,22 @@ namespace xmloff return m_pImpl->createOfficeFormsContext(_rImport, _nPrefix, _rLocalName); } - //--------------------------------------------------------------------- SvXMLImportContext* OFormLayerXMLImport::createContext(const sal_uInt16 _nPrefix, const OUString& _rLocalName, const Reference< xml::sax::XAttributeList >& _rxAttribs) { return m_pImpl->createContext(_nPrefix, _rLocalName, _rxAttribs); } - //--------------------------------------------------------------------- void OFormLayerXMLImport::applyControlNumberStyle(const Reference< XPropertySet >& _rxControlModel, const OUString& _rControlNumerStyleName) { m_pImpl->applyControlNumberStyle(_rxControlModel, _rControlNumerStyleName); } - //--------------------------------------------------------------------- void OFormLayerXMLImport::documentDone( ) { m_pImpl->documentDone( ); } -//......................................................................... } // namespace xmloff -//......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/forms/gridcolumnproptranslator.cxx b/xmloff/source/forms/gridcolumnproptranslator.cxx index c8c553629b4f..848d653ff1d8 100644 --- a/xmloff/source/forms/gridcolumnproptranslator.cxx +++ b/xmloff/source/forms/gridcolumnproptranslator.cxx @@ -27,10 +27,8 @@ #include <algorithm> -//........................................................................ namespace xmloff { -//........................................................................ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::awt; @@ -41,19 +39,16 @@ namespace xmloff namespace { - //---------------------------------------------------------------- OUString getParaAlignProperty() { return OUString( "ParaAdjust" ); } - //---------------------------------------------------------------- OUString getAlignProperty() { return OUString( "Align" ); } - //---------------------------------------------------------------- sal_Int32 findStringElement( const Sequence< OUString >& _rNames, const OUString& _rName ) { const OUString* pStart = _rNames.getConstArray(); @@ -64,7 +59,6 @@ namespace xmloff return -1; } - //---------------------------------------------------------------- struct AlignmentTranslationEntry { ParagraphAdjust nParagraphValue; @@ -84,7 +78,6 @@ namespace xmloff { ParagraphAdjust_MAKE_FIXED_SIZE, -1 } }; - //---------------------------------------------------------------- void valueAlignToParaAdjust(Any& rValue) { sal_Int16 nValue = 0; @@ -102,7 +95,6 @@ namespace xmloff OSL_FAIL( "valueAlignToParaAdjust: unreachable!" ); } - //---------------------------------------------------------------- void valueParaAdjustToAlign(Any& rValue) { sal_Int32 nValue = 0; @@ -120,9 +112,7 @@ namespace xmloff OSL_FAIL( "valueParaAdjustToAlign: unreachable!" ); } - //==================================================================== //= OMergedPropertySetInfo - //==================================================================== typedef ::cppu::WeakAggImplHelper1 < XPropertySetInfo > OMergedPropertySetInfo_Base; class OMergedPropertySetInfo : public OMergedPropertySetInfo_Base @@ -142,19 +132,16 @@ namespace xmloff virtual ::sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) throw (::com::sun::star::uno::RuntimeException); }; - //---------------------------------------------------------------- OMergedPropertySetInfo::OMergedPropertySetInfo( const Reference< XPropertySetInfo >& _rxMasterInfo ) :m_xMasterInfo( _rxMasterInfo ) { OSL_ENSURE( m_xMasterInfo.is(), "OMergedPropertySetInfo::OMergedPropertySetInfo: hmm?" ); } - //---------------------------------------------------------------- OMergedPropertySetInfo::~OMergedPropertySetInfo() { } - //---------------------------------------------------------------- Sequence< Property > SAL_CALL OMergedPropertySetInfo::getProperties( ) throw (RuntimeException) { // add a "ParaAdjust" property to the master properties @@ -169,7 +156,6 @@ namespace xmloff return aProperties; } - //---------------------------------------------------------------- Property SAL_CALL OMergedPropertySetInfo::getPropertyByName( const OUString& aName ) throw (UnknownPropertyException, RuntimeException) { if ( aName == getParaAlignProperty() ) @@ -182,7 +168,6 @@ namespace xmloff return m_xMasterInfo->getPropertyByName( aName ); } - //---------------------------------------------------------------- ::sal_Bool SAL_CALL OMergedPropertySetInfo::hasPropertyByName( const OUString& Name ) throw (RuntimeException) { if ( Name == getParaAlignProperty() ) @@ -195,23 +180,17 @@ namespace xmloff } } - - //==================================================================== //= OGridColumnPropertyTranslator - //==================================================================== - //-------------------------------------------------------------------- OGridColumnPropertyTranslator::OGridColumnPropertyTranslator( const Reference< XMultiPropertySet >& _rxGridColumn ) :m_xGridColumn( _rxGridColumn ) { OSL_ENSURE( m_xGridColumn.is(), "OGridColumnPropertyTranslator: invalid grid column!" ); } - //-------------------------------------------------------------------- OGridColumnPropertyTranslator::~OGridColumnPropertyTranslator() { } - //-------------------------------------------------------------------- Reference< XPropertySetInfo > SAL_CALL OGridColumnPropertyTranslator::getPropertySetInfo( ) throw (RuntimeException) { Reference< XPropertySetInfo > xColumnPropInfo; @@ -220,7 +199,6 @@ namespace xmloff return new OMergedPropertySetInfo( xColumnPropInfo ); } - //-------------------------------------------------------------------- void SAL_CALL OGridColumnPropertyTranslator::setPropertyValue( const OUString& _rPropertyName, const Any& aValue ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) { // we implement this by delegating it to setPropertyValues, which is to ignore unknown properties. On the other hand, our @@ -234,7 +212,6 @@ namespace xmloff setPropertyValues( aNames, aValues ); } - //-------------------------------------------------------------------- Any SAL_CALL OGridColumnPropertyTranslator::getPropertyValue( const OUString& PropertyName ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) { Sequence< OUString > aNames( &PropertyName, 1 ); @@ -245,31 +222,26 @@ namespace xmloff return Any(); } - //-------------------------------------------------------------------- void SAL_CALL OGridColumnPropertyTranslator::addPropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) { OSL_FAIL( "OGridColumnPropertyTranslator::addPropertyChangeListener: not implemented - this should not be needed!" ); } - //-------------------------------------------------------------------- void SAL_CALL OGridColumnPropertyTranslator::removePropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) { OSL_FAIL( "OGridColumnPropertyTranslator::removePropertyChangeListener: not implemented - this should not be needed!" ); } - //-------------------------------------------------------------------- void SAL_CALL OGridColumnPropertyTranslator::addVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) { OSL_FAIL( "OGridColumnPropertyTranslator::addVetoableChangeListener: not implemented - this should not be needed!" ); } - //-------------------------------------------------------------------- void SAL_CALL OGridColumnPropertyTranslator::removeVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) { OSL_FAIL( "OGridColumnPropertyTranslator::removeVetoableChangeListener: not implemented - this should not be needed!" ); } - //-------------------------------------------------------------------- void SAL_CALL OGridColumnPropertyTranslator::setPropertyValues( const Sequence< OUString >& aPropertyNames, const Sequence< Any >& aValues ) throw (PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) { if ( !m_xGridColumn.is() ) @@ -291,7 +263,6 @@ namespace xmloff m_xGridColumn->setPropertyValues( aTranslatedNames, aTranslatedValues ); } - //-------------------------------------------------------------------- Sequence< Any > SAL_CALL OGridColumnPropertyTranslator::getPropertyValues( const Sequence< OUString >& aPropertyNames ) throw (RuntimeException) { Sequence< Any > aValues( aPropertyNames.getLength() ); @@ -310,26 +281,21 @@ namespace xmloff return aValues; } - //-------------------------------------------------------------------- void SAL_CALL OGridColumnPropertyTranslator::addPropertiesChangeListener( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& ) throw (RuntimeException) { OSL_FAIL( "OGridColumnPropertyTranslator::addPropertiesChangeListener: not implemented - this should not be needed!" ); } - //-------------------------------------------------------------------- void SAL_CALL OGridColumnPropertyTranslator::removePropertiesChangeListener( const Reference< XPropertiesChangeListener >& ) throw (RuntimeException) { OSL_FAIL( "OGridColumnPropertyTranslator::removePropertiesChangeListener: not implemented - this should not be needed!" ); } - //-------------------------------------------------------------------- void SAL_CALL OGridColumnPropertyTranslator::firePropertiesChangeEvent( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& ) throw (RuntimeException) { OSL_FAIL( "OGridColumnPropertyTranslator::firePropertiesChangeEvent: not implemented - this should not be needed!" ); } -//........................................................................ } // namespace xmloff -//........................................................................ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/forms/gridcolumnproptranslator.hxx b/xmloff/source/forms/gridcolumnproptranslator.hxx index 6c9313bdc7e7..422630e8e569 100644 --- a/xmloff/source/forms/gridcolumnproptranslator.hxx +++ b/xmloff/source/forms/gridcolumnproptranslator.hxx @@ -24,14 +24,10 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <cppuhelper/implbase2.hxx> -//........................................................................ namespace xmloff { -//........................................................................ - //==================================================================== //= OGridColumnPropertyTranslator - //==================================================================== typedef ::cppu::WeakImplHelper2 < ::com::sun::star::beans::XPropertySet , ::com::sun::star::beans::XMultiPropertySet > OGridColumnPropertyTranslator_Base; @@ -66,9 +62,7 @@ namespace xmloff virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); }; -//........................................................................ } // namespace xmloff -//........................................................................ #endif // XMLOFF_SOURCE_FORMS_GRIDCOLUMNPROPTRANSLATOR_HXX diff --git a/xmloff/source/forms/handler/form_handler_factory.cxx b/xmloff/source/forms/handler/form_handler_factory.cxx index ca43f8f5f77e..7b944f7c986d 100644 --- a/xmloff/source/forms/handler/form_handler_factory.cxx +++ b/xmloff/source/forms/handler/form_handler_factory.cxx @@ -17,15 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "forms/form_handler_factory.hxx" #include "vcl_date_handler.hxx" #include "vcl_time_handler.hxx" -//...................................................................................................................... namespace xmloff { -//...................................................................................................................... namespace { @@ -33,10 +30,7 @@ namespace xmloff static PPropertyHandler s_pVCLTimeHandler = NULL; } - //================================================================================================================== //= FormHandlerFactory - //================================================================================================================== - //------------------------------------------------------------------------------------------------------------------ PPropertyHandler FormHandlerFactory::getFormPropertyHandler( const PropertyId i_propertyId ) { PPropertyHandler pHandler( NULL ); @@ -77,8 +71,6 @@ namespace xmloff return pHandler; } -//...................................................................................................................... } // namespace xmloff -//...................................................................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/forms/handler/property_handler_base.cxx b/xmloff/source/forms/handler/property_handler_base.cxx index 92aeeaca38b1..e92b16b4b530 100644 --- a/xmloff/source/forms/handler/property_handler_base.cxx +++ b/xmloff/source/forms/handler/property_handler_base.cxx @@ -17,27 +17,21 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "property_handler_base.hxx" namespace xmloff { - //================================================================================================================== //= PropertyHandlerBase - //================================================================================================================== - //------------------------------------------------------------------------------------------------------------------ PropertyHandlerBase::~PropertyHandlerBase() { } - //------------------------------------------------------------------------------------------------------------------ oslInterlockedCount SAL_CALL PropertyHandlerBase::acquire() { return osl_atomic_increment( &m_refCount ); } - //------------------------------------------------------------------------------------------------------------------ oslInterlockedCount SAL_CALL PropertyHandlerBase::release() { oslInterlockedCount decremented = osl_atomic_decrement( &m_refCount ); diff --git a/xmloff/source/forms/handler/property_handler_base.hxx b/xmloff/source/forms/handler/property_handler_base.hxx index 2d8c4d617429..72789f90b866 100644 --- a/xmloff/source/forms/handler/property_handler_base.hxx +++ b/xmloff/source/forms/handler/property_handler_base.hxx @@ -24,14 +24,10 @@ #include <osl/interlck.h> -//...................................................................................................................... namespace xmloff { -//...................................................................................................................... - //================================================================================================================== //= PropertyHandlerBase - //================================================================================================================== class PropertyHandlerBase : public IPropertyHandler { protected: @@ -50,9 +46,7 @@ namespace xmloff oslInterlockedCount m_refCount; }; -//...................................................................................................................... } // namespace xmloff -//...................................................................................................................... #endif // XMLOFF_PROPERTY_HANDLER_BASE_HXX diff --git a/xmloff/source/forms/handler/vcl_date_handler.cxx b/xmloff/source/forms/handler/vcl_date_handler.cxx index b3ff4f744e8d..a29f01815a36 100644 --- a/xmloff/source/forms/handler/vcl_date_handler.cxx +++ b/xmloff/source/forms/handler/vcl_date_handler.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "vcl_date_handler.hxx" #include <rtl/ustrbuf.hxx> @@ -30,32 +29,25 @@ #include <tools/diagnose_ex.h> #include <tools/date.hxx> -//...................................................................................................................... namespace xmloff { -//...................................................................................................................... using ::com::sun::star::uno::Any; using ::com::sun::star::uno::makeAny; using ::com::sun::star::util::DateTime; using ::com::sun::star::util::Date; - //================================================================================================================== //= VCLDateHandler - //================================================================================================================== - //------------------------------------------------------------------------------------------------------------------ VCLDateHandler::VCLDateHandler() { } - //------------------------------------------------------------------------------------------------------------------ OUString VCLDateHandler::getAttributeValue( const PropertyValues& /*i_propertyValues*/ ) const { OSL_ENSURE( false, "VCLDateHandler::getAttributeValue: unexpected call!" ); return OUString(); } - //------------------------------------------------------------------------------------------------------------------ OUString VCLDateHandler::getAttributeValue( const Any& i_propertyValue ) const { Date aDate; @@ -71,7 +63,6 @@ namespace xmloff return aBuffer.makeStringAndClear(); } - //------------------------------------------------------------------------------------------------------------------ bool VCLDateHandler::getPropertyValues( const OUString i_attributeValue, PropertyValues& o_propertyValues ) const { DateTime aDateTime; @@ -107,8 +98,6 @@ namespace xmloff return true; } -//...................................................................................................................... } // namespace xmloff -//...................................................................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/forms/handler/vcl_date_handler.hxx b/xmloff/source/forms/handler/vcl_date_handler.hxx index 720270ba04b0..5c0e3d123f57 100644 --- a/xmloff/source/forms/handler/vcl_date_handler.hxx +++ b/xmloff/source/forms/handler/vcl_date_handler.hxx @@ -22,14 +22,10 @@ #include "property_handler_base.hxx" -//...................................................................................................................... namespace xmloff { -//...................................................................................................................... - //================================================================================================================== //= VCLDateHandler - //================================================================================================================== class VCLDateHandler : public PropertyHandlerBase { public: @@ -41,9 +37,7 @@ namespace xmloff virtual bool getPropertyValues( const OUString i_attributeValue, PropertyValues& o_propertyValues ) const; }; -//...................................................................................................................... } // namespace xmloff -//...................................................................................................................... #endif // XMLOFF_VCL_DATE_HANDLER_HXX diff --git a/xmloff/source/forms/handler/vcl_time_handler.cxx b/xmloff/source/forms/handler/vcl_time_handler.cxx index bbf9698d7c49..bdbd211b2575 100644 --- a/xmloff/source/forms/handler/vcl_time_handler.cxx +++ b/xmloff/source/forms/handler/vcl_time_handler.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "vcl_time_handler.hxx" #include <rtl/ustrbuf.hxx> @@ -30,32 +29,25 @@ #include <tools/diagnose_ex.h> #include <tools/time.hxx> -//...................................................................................................................... namespace xmloff { -//...................................................................................................................... using ::com::sun::star::uno::Any; using ::com::sun::star::uno::makeAny; using ::com::sun::star::util::Duration; using ::com::sun::star::util::Time; - //================================================================================================================== //= VCLTimeHandler - //================================================================================================================== - //------------------------------------------------------------------------------------------------------------------ VCLTimeHandler::VCLTimeHandler() { } - //------------------------------------------------------------------------------------------------------------------ OUString VCLTimeHandler::getAttributeValue( const PropertyValues& /*i_propertyValues*/ ) const { OSL_ENSURE( false, "VCLTimeHandler::getAttributeValue: unexpected call!" ); return OUString(); } - //------------------------------------------------------------------------------------------------------------------ OUString VCLTimeHandler::getAttributeValue( const Any& i_propertyValue ) const { Time aTime; @@ -72,7 +64,6 @@ namespace xmloff return aBuffer.makeStringAndClear(); } - //------------------------------------------------------------------------------------------------------------------ bool VCLTimeHandler::getPropertyValues( const OUString i_attributeValue, PropertyValues& o_propertyValues ) const { Duration aDuration; @@ -110,8 +101,6 @@ namespace xmloff return true; } -//...................................................................................................................... } // namespace xmloff -//...................................................................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/forms/handler/vcl_time_handler.hxx b/xmloff/source/forms/handler/vcl_time_handler.hxx index 5785a78cbb08..895650f96b57 100644 --- a/xmloff/source/forms/handler/vcl_time_handler.hxx +++ b/xmloff/source/forms/handler/vcl_time_handler.hxx @@ -22,14 +22,10 @@ #include "property_handler_base.hxx" -//...................................................................................................................... namespace xmloff { -//...................................................................................................................... - //================================================================================================================== //= VCLTimeHandler - //================================================================================================================== class VCLTimeHandler : public PropertyHandlerBase { public: @@ -41,9 +37,7 @@ namespace xmloff virtual bool getPropertyValues( const OUString i_attributeValue, PropertyValues& o_propertyValues ) const; }; -//...................................................................................................................... } // namespace xmloff -//...................................................................................................................... #endif // XMLOFF_VCL_TIME_HANDLER_HXX diff --git a/xmloff/source/forms/ifacecompare.hxx b/xmloff/source/forms/ifacecompare.hxx index 8c090f6c9c2d..b4859d88bf02 100644 --- a/xmloff/source/forms/ifacecompare.hxx +++ b/xmloff/source/forms/ifacecompare.hxx @@ -24,14 +24,10 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/drawing/XDrawPage.hpp> -//......................................................................... namespace xmloff { -//......................................................................... - //===================================================================== //= OInterfaceCompare - //===================================================================== /** is stl-compliant structure for comparing Reference< <iface> > instances */ template < class IAFCE > @@ -54,9 +50,7 @@ namespace xmloff typedef OInterfaceCompare< ::com::sun::star::beans::XPropertySet > OPropertySetCompare; typedef OInterfaceCompare< ::com::sun::star::drawing::XDrawPage > ODrawPageCompare; -//......................................................................... } // namespace xmloff -//......................................................................... #endif // _XMLOFF_FORMS_IFACECOMPARE_HXX_ diff --git a/xmloff/source/forms/layerexport.cxx b/xmloff/source/forms/layerexport.cxx index c880662d9d3a..5bf3b982a364 100644 --- a/xmloff/source/forms/layerexport.cxx +++ b/xmloff/source/forms/layerexport.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <stdio.h> #include "layerexport.hxx" #include "strings.hxx" @@ -52,10 +51,8 @@ #include <numeric> -//......................................................................... namespace xmloff { -//......................................................................... using namespace ::com::sun::star::uno; using namespace ::com::sun::star::awt; @@ -70,17 +67,13 @@ namespace xmloff typedef ::com::sun::star::xforms::XFormsSupplier XXFormsSupplier; - //===================================================================== //= OFormLayerXMLExport_Impl - //===================================================================== - //--------------------------------------------------------------------- const OUString& OFormLayerXMLExport_Impl::getControlNumberStyleNamePrefix() { static const OUString s_sControlNumberStyleNamePrefix("C"); return s_sControlNumberStyleNamePrefix; } - //--------------------------------------------------------------------- OFormLayerXMLExport_Impl::OFormLayerXMLExport_Impl(SvXMLExport& _rContext) :m_rContext(_rContext) ,m_pControlNumberStyles(NULL) @@ -109,7 +102,6 @@ namespace xmloff { } - //--------------------------------------------------------------------- sal_Bool OFormLayerXMLExport_Impl::impl_isFormPageContainingForms(const Reference< XDrawPage >& _rxDrawPage, Reference< XIndexAccess >& _rxForms) { Reference< XFormsSupplier2 > xFormsSupp(_rxDrawPage, UNO_QUERY); @@ -136,7 +128,6 @@ namespace xmloff return sal_True; } - //--------------------------------------------------------------------- void OFormLayerXMLExport_Impl::exportGridColumn(const Reference< XPropertySet >& _rxColumn, const Sequence< ScriptEventDescriptor >& _rEvents) { @@ -145,7 +136,6 @@ namespace xmloff aExportImpl.doExport(); } - //--------------------------------------------------------------------- void OFormLayerXMLExport_Impl::exportControl(const Reference< XPropertySet >& _rxControl, const Sequence< ScriptEventDescriptor >& _rEvents) { @@ -163,7 +153,6 @@ namespace xmloff aExportImpl.doExport(); } - //--------------------------------------------------------------------- void OFormLayerXMLExport_Impl::exportForm(const Reference< XPropertySet >& _rxProps, const Sequence< ScriptEventDescriptor >& _rEvents) { @@ -172,19 +161,16 @@ namespace xmloff aAttributeHandler.doExport(); } - //--------------------------------------------------------------------- ::rtl::Reference< SvXMLExportPropertyMapper > OFormLayerXMLExport_Impl::getStylePropertyMapper() { return m_xStyleExportMapper; } - //--------------------------------------------------------------------- SvXMLExport& OFormLayerXMLExport_Impl::getGlobalContext() { return m_rContext; } - //--------------------------------------------------------------------- void OFormLayerXMLExport_Impl::exportCollectionElements(const Reference< XIndexAccess >& _rxCollection) { // step through all the elements of the collection @@ -240,7 +226,6 @@ namespace xmloff } } - //--------------------------------------------------------------------- OUString OFormLayerXMLExport_Impl::getObjectStyleName( const Reference< XPropertySet >& _rxObject ) { OUString aObjectStyle; @@ -251,7 +236,6 @@ namespace xmloff return aObjectStyle; } - //--------------------------------------------------------------------- void OFormLayerXMLExport_Impl::clear() { m_aControlIds.clear(); @@ -265,14 +249,12 @@ namespace xmloff m_aIgnoreList.clear(); } - //--------------------------------------------------------------------- void OFormLayerXMLExport_Impl::exportAutoControlNumberStyles() { if ( m_pControlNumberStyles ) m_pControlNumberStyles->Export( sal_True ); } - //--------------------------------------------------------------------- void OFormLayerXMLExport_Impl::exportAutoStyles() { m_rContext.GetAutoStylePool()->exportXML( @@ -283,7 +265,6 @@ namespace xmloff ); } - //--------------------------------------------------------------------- void OFormLayerXMLExport_Impl::exportForms(const Reference< XDrawPage >& _rxDrawPage) { // get the forms collection of the page @@ -301,14 +282,12 @@ namespace xmloff exportCollectionElements(xCollectionIndex); } - //--------------------------------------------------------------------- void OFormLayerXMLExport_Impl::exportXForms() const { // export XForms models ::exportXForms( m_rContext ); } - //--------------------------------------------------------------------- bool OFormLayerXMLExport_Impl::pageContainsForms( const Reference< XDrawPage >& _rxDrawPage ) const { Reference< XFormsSupplier2 > xFormsSupp( _rxDrawPage, UNO_QUERY ); @@ -316,7 +295,6 @@ namespace xmloff return xFormsSupp.is() && xFormsSupp->hasForms(); } - //--------------------------------------------------------------------- bool OFormLayerXMLExport_Impl::documentContainsXForms() const { Reference< XXFormsSupplier > xXFormSupp( m_rContext.GetModel(), UNO_QUERY ); @@ -326,7 +304,6 @@ namespace xmloff return xForms.is() && xForms->hasElements(); } - //--------------------------------------------------------------------- sal_Bool OFormLayerXMLExport_Impl::implMoveIterators(const Reference< XDrawPage >& _rxDrawPage, sal_Bool _bClear) { if (!_rxDrawPage.is()) @@ -364,7 +341,6 @@ namespace xmloff return bKnownPage; } - //--------------------------------------------------------------------- sal_Bool OFormLayerXMLExport_Impl::seekPage(const Reference< XDrawPage >& _rxDrawPage) { sal_Bool bKnownPage = implMoveIterators( _rxDrawPage, sal_False ); @@ -388,7 +364,6 @@ namespace xmloff return sal_False; } - //--------------------------------------------------------------------- OUString OFormLayerXMLExport_Impl::getControlId(const Reference< XPropertySet >& _rxControl) { if (m_aCurrentPageIds == m_aControlIds.end()) @@ -399,7 +374,6 @@ namespace xmloff return m_aCurrentPageIds->second[_rxControl]; } - //--------------------------------------------------------------------- OUString OFormLayerXMLExport_Impl::getImmediateNumberStyle( const Reference< XPropertySet >& _rxObject ) { OUString sNumberStyle; @@ -411,7 +385,6 @@ namespace xmloff return sNumberStyle; } - //--------------------------------------------------------------------- OUString OFormLayerXMLExport_Impl::getControlNumberStyle( const Reference< XPropertySet >& _rxControl ) { OUString sNumberStyle; @@ -428,7 +401,6 @@ namespace xmloff return sNumberStyle; } - //--------------------------------------------------------------------- void OFormLayerXMLExport_Impl::examineForms(const Reference< XDrawPage >& _rxDrawPage) { // get the forms collection of the page @@ -492,7 +464,6 @@ namespace xmloff while (xLoop.is()); } - //--------------------------------------------------------------------- namespace { struct AccumulateSize : public ::std::binary_function< size_t, MapPropertySet2Map::value_type, size_t > @@ -532,7 +503,6 @@ namespace xmloff } } - //--------------------------------------------------------------------- sal_Bool OFormLayerXMLExport_Impl::checkExamineControl(const Reference< XPropertySet >& _rxObject) { Reference< XPropertySetInfo > xCurrentInfo = _rxObject->getPropertySetInfo(); @@ -541,7 +511,6 @@ namespace xmloff sal_Bool bIsControl = xCurrentInfo->hasPropertyByName( PROPERTY_CLASSID ); if (bIsControl) { - // ---------------------------------- // generate a new control id // find a free id @@ -549,7 +518,6 @@ namespace xmloff // add it to the map m_aCurrentPageIds->second[_rxObject] = sCurrentId; - // ---------------------------------- // check if this control has a "LabelControl" property referring another control if ( xCurrentInfo->hasPropertyByName( PROPERTY_CONTROLLABEL ) ) { @@ -565,14 +533,12 @@ namespace xmloff } } - // ---------------------------------- // check if the control needs a number format style if ( xCurrentInfo->hasPropertyByName( PROPERTY_FORMATKEY ) ) { examineControlNumberFormat(_rxObject); } - // ---------------------------------- // check if it's a control providing text Reference< XText > xControlText( _rxObject, UNO_QUERY ); if ( xControlText.is() ) @@ -580,7 +546,6 @@ namespace xmloff m_rContext.GetTextParagraphExport()->collectTextAutoStyles( xControlText ); } - // ---------------------------------- // check if it is a grid control - in this case, we need special handling for the columns sal_Int16 nControlType = FormComponentType::CONTROL; _rxObject->getPropertyValue( PROPERTY_CLASSID ) >>= nControlType; @@ -593,7 +558,6 @@ namespace xmloff return bIsControl; } - //--------------------------------------------------------------------- void OFormLayerXMLExport_Impl::collectGridColumnStylesAndIds( const Reference< XPropertySet >& _rxControl ) { // loop through all columns of the grid @@ -614,7 +578,6 @@ namespace xmloff if ( !xColumnProperties.is() ) continue; - // ---------------------------------- // generate a new control id // find a free id @@ -622,7 +585,6 @@ namespace xmloff // add it to the map m_aCurrentPageIds->second[ xColumnProperties ] = sCurrentId; - // ---------------------------------- // determine a number style, if needed xColumnPropertiesMeta = xColumnProperties->getPropertySetInfo(); // get the styles of the column @@ -651,7 +613,6 @@ namespace xmloff } #endif - // ---------------------------------- // determine the column style if ( !aPropertyStates.empty() ) @@ -671,7 +632,6 @@ namespace xmloff } } - //--------------------------------------------------------------------- sal_Int32 OFormLayerXMLExport_Impl::implExamineControlNumberFormat( const Reference< XPropertySet >& _rxObject ) { // get the format key relative to our own formats supplier @@ -684,7 +644,6 @@ namespace xmloff return nOwnFormatKey; } - //--------------------------------------------------------------------- void OFormLayerXMLExport_Impl::examineControlNumberFormat( const Reference< XPropertySet >& _rxControl ) { sal_Int32 nOwnFormatKey = implExamineControlNumberFormat( _rxControl ); @@ -699,7 +658,6 @@ namespace xmloff m_aControlNumberFormats[_rxControl] = nOwnFormatKey; } - //--------------------------------------------------------------------- sal_Int32 OFormLayerXMLExport_Impl::ensureTranslateFormat(const Reference< XPropertySet >& _rxFormattedControl) { ensureControlNumberStyleExport(); @@ -747,7 +705,6 @@ namespace xmloff return nOwnFormatKey; } - //--------------------------------------------------------------------- void OFormLayerXMLExport_Impl::ensureControlNumberStyleExport() { if (!m_pControlNumberStyles) @@ -780,14 +737,12 @@ namespace xmloff } } - //--------------------------------------------------------------------- SvXMLNumFmtExport* OFormLayerXMLExport_Impl::getControlNumberStyleExport() { ensureControlNumberStyleExport(); return m_pControlNumberStyles; } - //--------------------------------------------------------------------- void OFormLayerXMLExport_Impl::excludeFromExport( const Reference< XControlModel > _rxControl ) { Reference< XPropertySet > xProps( _rxControl, UNO_QUERY ); @@ -799,9 +754,6 @@ namespace xmloff OSL_ENSURE( aPos.second, "OFormLayerXMLExport_Impl::excludeFromExport: element already exists in the ignore list!" ); } -//......................................................................... } // namespace xmloff -//......................................................................... - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/forms/layerexport.hxx b/xmloff/source/forms/layerexport.hxx index bd25986b478e..a0e0a033e5b0 100644 --- a/xmloff/source/forms/layerexport.hxx +++ b/xmloff/source/forms/layerexport.hxx @@ -33,10 +33,8 @@ class SvXMLNumFmtExport; class XMLPropertyHandlerFactory; class SvXMLExportPropertyMapper; -//......................................................................... namespace xmloff { -//......................................................................... typedef ::std::set < ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > , OPropertySetCompare @@ -54,9 +52,7 @@ namespace xmloff , ODrawPageCompare > MapPropertySet2Map; - //===================================================================== //= OFormLayerXMLExport_Impl - //===================================================================== /** the implementation class for OFormLayerXMLExport */ class OFormLayerXMLExport_Impl @@ -300,9 +296,7 @@ namespace xmloff void excludeFromExport( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > _rxControl ); }; -//......................................................................... } // namespace xmloff -//......................................................................... #endif // _XMLOFF_FORMS_LAYEREXPORT_HXX_ diff --git a/xmloff/source/forms/layerimport.cxx b/xmloff/source/forms/layerimport.cxx index 0003e27e2920..5387c2c73dd1 100644 --- a/xmloff/source/forms/layerimport.cxx +++ b/xmloff/source/forms/layerimport.cxx @@ -55,10 +55,8 @@ SV_IMPL_REF( SvXMLStylesContext ); -//......................................................................... namespace xmloff { -//......................................................................... using namespace ::com::sun::star::uno; using namespace ::com::sun::star::awt; @@ -71,10 +69,7 @@ using namespace ::com::sun::star::util; using namespace ::com::sun::star::form; using namespace ::com::sun::star::sdb; -//===================================================================== //= OFormLayerXMLImport_Impl -//===================================================================== -//--------------------------------------------------------------------- OFormLayerXMLImport_Impl::OFormLayerXMLImport_Impl(SvXMLImport& _rImporter) :m_rImporter(_rImporter) ,m_pAutoStyles(NULL) @@ -232,7 +227,6 @@ OFormLayerXMLImport_Impl::OFormLayerXMLImport_Impl(SvXMLImport& _rImporter) m_aCurrentPageIds = m_aControlIds.end(); } -//--------------------------------------------------------------------- OFormLayerXMLImport_Impl::~OFormLayerXMLImport_Impl() { // outlined to allow forward declaration of OAttribute2Property in the header @@ -241,7 +235,6 @@ OFormLayerXMLImport_Impl::~OFormLayerXMLImport_Impl() m_pAutoStyles->ReleaseRef(); } -//--------------------------------------------------------------------- void OFormLayerXMLImport_Impl::setAutoStyleContext(SvXMLStylesContext* _pNewContext) { OSL_ENSURE(!m_pAutoStyles, "OFormLayerXMLImport_Impl::setAutoStyleContext: not to be called twice!"); @@ -250,7 +243,6 @@ void OFormLayerXMLImport_Impl::setAutoStyleContext(SvXMLStylesContext* _pNewCont m_pAutoStyles->AddRef(); } -//--------------------------------------------------------------------- void OFormLayerXMLImport_Impl::applyControlNumberStyle(const Reference< XPropertySet >& _rxControlModel, const OUString& _rControlNumerStyleName) { OSL_ENSURE(_rxControlModel.is() && (!_rControlNumerStyleName.isEmpty()), @@ -302,7 +294,6 @@ void OFormLayerXMLImport_Impl::applyControlNumberStyle(const Reference< XPropert } } -//--------------------------------------------------------------------- void OFormLayerXMLImport_Impl::registerCellValueBinding( const Reference< XPropertySet >& _rxControlModel, const OUString& _rCellAddress ) { OSL_ENSURE( _rxControlModel.is() && !_rCellAddress.isEmpty(), @@ -310,7 +301,6 @@ void OFormLayerXMLImport_Impl::registerCellValueBinding( const Reference< XPrope m_aCellValueBindings.push_back( ModelStringPair( _rxControlModel, _rCellAddress ) ); } -//--------------------------------------------------------------------- void OFormLayerXMLImport_Impl::registerXFormsValueBinding( const Reference< XPropertySet >& _rxControlModel, const OUString& _rBindingID ) @@ -322,7 +312,6 @@ void OFormLayerXMLImport_Impl::registerXFormsValueBinding( ModelStringPair( _rxControlModel, _rBindingID ) ); } -//--------------------------------------------------------------------- void OFormLayerXMLImport_Impl::registerXFormsListBinding( const Reference< XPropertySet >& _rxControlModel, const OUString& _rBindingID ) @@ -334,7 +323,6 @@ void OFormLayerXMLImport_Impl::registerXFormsListBinding( ModelStringPair( _rxControlModel, _rBindingID ) ); } -//--------------------------------------------------------------------- void OFormLayerXMLImport_Impl::registerXFormsSubmission( const Reference< XPropertySet >& _rxControlModel, const OUString& _rSubmissionID ) @@ -346,14 +334,12 @@ void OFormLayerXMLImport_Impl::registerXFormsSubmission( ModelStringPair( _rxControlModel, _rSubmissionID ) ); } -//--------------------------------------------------------------------- void OFormLayerXMLImport_Impl::registerCellRangeListSource( const Reference< XPropertySet >& _rxControlModel, const OUString& _rCellRangeAddress ) { OSL_ENSURE( _rxControlModel.is() && !_rCellRangeAddress.isEmpty(), "OFormLayerXMLImport_Impl::registerCellRangeListSource: invalid arguments!" ); m_aCellRangeListSources.push_back( ModelStringPair( _rxControlModel, _rCellRangeAddress ) ); } -//--------------------------------------------------------------------- const SvXMLStyleContext* OFormLayerXMLImport_Impl::getStyleElement(const OUString& _rStyleName) const { OSL_ENSURE( m_pAutoStyles, "OFormLayerXMLImport_Impl::getStyleElement: have no auto style context!" ); @@ -366,7 +352,6 @@ const SvXMLStyleContext* OFormLayerXMLImport_Impl::getStyleElement(const OUStrin return pControlStyle; } -//--------------------------------------------------------------------- void OFormLayerXMLImport_Impl::enterEventContext() { // install our own translation table. We need to disable the other tables because of name conflicts. @@ -374,14 +359,12 @@ void OFormLayerXMLImport_Impl::enterEventContext() m_rImporter.GetEventImport().AddTranslationTable(g_pFormsEventTranslation); } -//--------------------------------------------------------------------- void OFormLayerXMLImport_Impl::leaveEventContext() { // install the original event tables. m_rImporter.GetEventImport().PopTranslationTable(); } -//--------------------------------------------------------------------- void OFormLayerXMLImport_Impl::registerControlId(const Reference< XPropertySet >& _rxControl, const OUString& _rId) { OSL_ENSURE(m_aCurrentPageIds != m_aControlIds.end(), "OFormLayerXMLImport_Impl::registerControlId: no current page!"); @@ -391,7 +374,6 @@ void OFormLayerXMLImport_Impl::registerControlId(const Reference< XPropertySet > m_aCurrentPageIds->second[_rId] = _rxControl; } -//--------------------------------------------------------------------- void OFormLayerXMLImport_Impl::registerControlReferences(const Reference< XPropertySet >& _rxControl, const OUString& _rReferringControls) { OSL_ENSURE(!_rReferringControls.isEmpty(), "OFormLayerXMLImport_Impl::registerControlReferences: invalid (empty) control id list!"); @@ -399,7 +381,6 @@ void OFormLayerXMLImport_Impl::registerControlReferences(const Reference< XPrope m_aControlReferences.push_back( ModelStringPair( _rxControl, _rReferringControls ) ); } -//--------------------------------------------------------------------- void OFormLayerXMLImport_Impl::startPage(const Reference< XDrawPage >& _rxDrawPage) { m_xCurrentPageFormsSupp.clear(); @@ -418,7 +399,6 @@ void OFormLayerXMLImport_Impl::startPage(const Reference< XDrawPage >& _rxDrawPa m_aCurrentPageIds = aPagePosition.first; } -//--------------------------------------------------------------------- void OFormLayerXMLImport_Impl::endPage() { OSL_ENSURE( m_xCurrentPageFormsSupp.is(), "OFormLayerXMLImport_Impl::endPage: sure you called startPage before?" ); @@ -477,7 +457,6 @@ void OFormLayerXMLImport_Impl::endPage() m_aCurrentPageIds = m_aControlIds.end(); } -//--------------------------------------------------------------------- Reference< XPropertySet > OFormLayerXMLImport_Impl::lookupControlId(const OUString& _rControlId) { OSL_ENSURE(m_aCurrentPageIds != m_aControlIds.end(), "OFormLayerXMLImport_Impl::lookupControlId: no current page!"); @@ -493,7 +472,6 @@ Reference< XPropertySet > OFormLayerXMLImport_Impl::lookupControlId(const OUStri return xReturn; } -//--------------------------------------------------------------------- SvXMLImportContext* OFormLayerXMLImport_Impl::createOfficeFormsContext( SvXMLImport& _rImport, sal_uInt16 _nPrefix, @@ -502,7 +480,6 @@ SvXMLImportContext* OFormLayerXMLImport_Impl::createOfficeFormsContext( return new OFormsRootImport( _rImport, _nPrefix, _rLocalName ); } -//--------------------------------------------------------------------- SvXMLImportContext* OFormLayerXMLImport_Impl::createContext(const sal_uInt16 _nPrefix, const OUString& _rLocalName, const Reference< xml::sax::XAttributeList >&) { @@ -529,7 +506,6 @@ SvXMLImportContext* OFormLayerXMLImport_Impl::createContext(const sal_uInt16 _nP return pContext; } -//--------------------------------------------------------------------- void OFormLayerXMLImport_Impl::documentDone( ) { SvXMLImport& rImport = getGlobalContext(); @@ -621,8 +597,6 @@ void OFormLayerXMLImport_Impl::documentDone( ) rImport.GetModel() ) ); } -//......................................................................... } // namespace xmloff -//......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/forms/layerimport.hxx b/xmloff/source/forms/layerimport.hxx index cb1b68d46435..9431525ca480 100644 --- a/xmloff/source/forms/layerimport.hxx +++ b/xmloff/source/forms/layerimport.hxx @@ -36,16 +36,12 @@ SV_DECL_REF( SvXMLStylesContext ) // unfortunately, we can't put this into our namespace, as the macro expands to (amongst others) a forward // declaration of the class name, which then would be in the namespace, too -//......................................................................... namespace xmloff { -//......................................................................... class OAttribute2Property; - //===================================================================== //= OFormLayerXMLImport_Impl - //===================================================================== class OFormLayerXMLImport_Impl : public ODefaultEventAttacherManager { @@ -175,9 +171,7 @@ namespace xmloff void documentDone( ); }; -//......................................................................... } // namespace xmloff -//......................................................................... #endif // _XMLOFF_FORMS_LAYERIMPORT_HXX_ diff --git a/xmloff/source/forms/logging.cxx b/xmloff/source/forms/logging.cxx index 6661d671e234..9f887ab135ff 100644 --- a/xmloff/source/forms/logging.cxx +++ b/xmloff/source/forms/logging.cxx @@ -19,22 +19,16 @@ #include "logging.hxx" -//......................................................................... namespace xmloff { -//......................................................................... #ifdef TIMELOG - //===================================================================== //= OStackedLogging - //===================================================================== - //--------------------------------------------------------------------- void OStackedLogging::enterContext( const sal_Char* _pContextName ) { m_aLogger.push( new ::rtl::Logfile( _pContextName ) ); } - //--------------------------------------------------------------------- void OStackedLogging::leaveTopContext( ) { delete m_aLogger.top(); @@ -42,9 +36,6 @@ namespace xmloff } #endif -//......................................................................... } // namespace xmloff -//......................................................................... - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/forms/logging.hxx b/xmloff/source/forms/logging.hxx index 9cb710949d03..bb292da83d20 100644 --- a/xmloff/source/forms/logging.hxx +++ b/xmloff/source/forms/logging.hxx @@ -25,16 +25,12 @@ namespace rtl { class Logfile; } -//......................................................................... namespace xmloff { -//......................................................................... #ifdef TIMELOG - //===================================================================== //= OStackedLogging - //===================================================================== class OStackedLogging { private: @@ -59,9 +55,7 @@ namespace xmloff #endif -//......................................................................... } // namespace xmloff -//......................................................................... #endif // XMLOFF_FORMS_LOGGING_HXX diff --git a/xmloff/source/forms/officeforms.cxx b/xmloff/source/forms/officeforms.cxx index e596aa43cccc..621a879502e1 100644 --- a/xmloff/source/forms/officeforms.cxx +++ b/xmloff/source/forms/officeforms.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "officeforms.hxx" #include <sax/tools/converter.hxx> @@ -30,10 +29,8 @@ #include <comphelper/extract.hxx> #include "strings.hxx" -//......................................................................... namespace xmloff { -//......................................................................... using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; @@ -42,29 +39,23 @@ namespace xmloff using ::xmloff::token::XML_FORMS; using ::com::sun::star::xml::sax::XAttributeList; - //========================================================================= //= OFormsRootImport - //========================================================================= TYPEINIT1(OFormsRootImport, SvXMLImportContext); - //------------------------------------------------------------------------- OFormsRootImport::OFormsRootImport( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName ) :SvXMLImportContext(rImport, nPrfx, rLocalName) { } - //------------------------------------------------------------------------- OFormsRootImport::~OFormsRootImport() { } - //------------------------------------------------------------------------- SvXMLImportContext* OFormsRootImport::CreateChildContext( sal_uInt16 _nPrefix, const OUString& _rLocalName, const Reference< XAttributeList>& xAttrList ) { return GetImport().GetFormImport()->createContext( _nPrefix, _rLocalName, xAttrList ); } - //------------------------------------------------------------------------- void OFormsRootImport::implImportBool(const Reference< XAttributeList >& _rxAttributes, OfficeFormsAttributes _eAttribute, const Reference< XPropertySet >& _rxProps, const Reference< XPropertySetInfo >& _rxPropInfo, const OUString& _rPropName, sal_Bool _bDefault) @@ -86,7 +77,6 @@ namespace xmloff } } - //------------------------------------------------------------------------- void OFormsRootImport::StartElement( const Reference< XAttributeList >& _rxAttrList ) { ENTER_LOG_CONTEXT( "xmloff::OFormsRootImport - importing the complete tree" ); @@ -112,17 +102,13 @@ namespace xmloff } } - //------------------------------------------------------------------------- void OFormsRootImport::EndElement() { SvXMLImportContext::EndElement(); LEAVE_LOG_CONTEXT( ); } - //===================================================================== //= OFormsRootExport - //===================================================================== - //--------------------------------------------------------------------- OFormsRootExport::OFormsRootExport( SvXMLExport& _rExp ) :m_pImplElement(NULL) { @@ -131,13 +117,11 @@ namespace xmloff m_pImplElement = new SvXMLElementExport(_rExp, XML_NAMESPACE_OFFICE, XML_FORMS, sal_True, sal_True); } - //--------------------------------------------------------------------- OFormsRootExport::~OFormsRootExport( ) { delete m_pImplElement; } - //------------------------------------------------------------------------- void OFormsRootExport::implExportBool(SvXMLExport& _rExp, OfficeFormsAttributes _eAttribute, const Reference< XPropertySet >& _rxProps, const Reference< XPropertySetInfo >& _rxPropInfo, const OUString& _rPropName, sal_Bool _bDefault) @@ -158,7 +142,6 @@ namespace xmloff aValue.makeStringAndClear()); } - //------------------------------------------------------------------------- void OFormsRootExport::addModelAttributes(SvXMLExport& _rExp) SAL_THROW(()) { try @@ -181,9 +164,6 @@ namespace xmloff } } -//......................................................................... } // namespace xmloff -//......................................................................... - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/forms/officeforms.hxx b/xmloff/source/forms/officeforms.hxx index 7225ce9280b8..9e4f3d304a8b 100644 --- a/xmloff/source/forms/officeforms.hxx +++ b/xmloff/source/forms/officeforms.hxx @@ -27,14 +27,10 @@ class SvXMLElementExport; class SvXMLExport; -//......................................................................... namespace xmloff { -//......................................................................... - //===================================================================== //= OFormsRootImport - //===================================================================== class OFormsRootImport :public SvXMLImportContext ,public OStackedLogging @@ -62,9 +58,7 @@ namespace xmloff ); }; - //===================================================================== //= OFormsRootExport - //===================================================================== class OFormsRootExport { private: @@ -87,11 +81,8 @@ namespace xmloff ); }; -//......................................................................... } // namespace xmloff -//......................................................................... #endif // _XMLOFF_FORMS_OFFICEFORMS_HXX_ - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/forms/property_description.hxx b/xmloff/source/forms/property_description.hxx index 170b23d52269..ee1c25b2ca01 100644 --- a/xmloff/source/forms/property_description.hxx +++ b/xmloff/source/forms/property_description.hxx @@ -28,14 +28,10 @@ #include <vector> #include <list> -//...................................................................................................................... namespace xmloff { -//...................................................................................................................... - //================================================================================================================== //= PropertyDescription - //================================================================================================================== struct AttributeDescription { sal_uInt16 namespacePrefix; // usually XML_NAMESPACE_FORM @@ -57,16 +53,13 @@ namespace xmloff } }; - //.................................................................................................................. inline bool operator==( const AttributeDescription& i_lhs, const AttributeDescription& i_rhs ) { return ( i_lhs.namespacePrefix == i_rhs.namespacePrefix ) && ( i_lhs.attributeToken == i_rhs.attributeToken ); } - //================================================================================================================== //= PropertyDescription - //================================================================================================================== struct PropertyDescription { /// is the name of the property @@ -116,19 +109,13 @@ namespace xmloff } }; - //================================================================================================================== //= PropertyDescriptionList - //================================================================================================================== typedef ::std::vector< const PropertyDescription* > PropertyDescriptionList; - //================================================================================================================== //= PropertyGroups - //================================================================================================================== typedef ::std::list< PropertyDescriptionList > PropertyGroups; -//...................................................................................................................... } // namespace xmloff -//...................................................................................................................... #endif // XMLOFF_PROPERTY_DESCRIPTION_HXX diff --git a/xmloff/source/forms/property_group.hxx b/xmloff/source/forms/property_group.hxx index 70563d52fe23..16e27063254f 100644 --- a/xmloff/source/forms/property_group.hxx +++ b/xmloff/source/forms/property_group.hxx @@ -20,22 +20,16 @@ #ifndef XMLOFF_PROPERTY_GROUP_HXX #define XMLOFF_PROPERTY_GROUP_HXX -//...................................................................................................................... namespace xmloff { -//...................................................................................................................... - //================================================================================================================== //= PropertyGroup - //================================================================================================================== enum PropertyGroup { NO_GROUP }; -//...................................................................................................................... } // namespace xmloff -//...................................................................................................................... #endif // XMLOFF_PROPERTY_GROUP_HXX diff --git a/xmloff/source/forms/property_meta_data.cxx b/xmloff/source/forms/property_meta_data.cxx index c9583fff4976..f739dfa1abae 100644 --- a/xmloff/source/forms/property_meta_data.cxx +++ b/xmloff/source/forms/property_meta_data.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "property_description.hxx" #include "forms/form_handler_factory.hxx" #include "strings.hxx" @@ -28,20 +27,15 @@ #include <boost/unordered_map.hpp> -//...................................................................................................................... namespace xmloff { namespace metadata { -//...................................................................................................................... using namespace ::xmloff::token; #define FORM_SINGLE_PROPERTY( id, att ) \ PropertyDescription( PROPERTY_##id, XML_NAMESPACE_FORM, att, &FormHandlerFactory::getFormPropertyHandler, PID_##id, NO_GROUP ) - //================================================================================================================== //= property meta data - //================================================================================================================== - //------------------------------------------------------------------------------------------------------------------ namespace { const PropertyDescription* lcl_getPropertyMetaData() @@ -63,7 +57,6 @@ namespace xmloff { namespace metadata } } - //------------------------------------------------------------------------------------------------------------------ namespace { // TODO: instead of having all of the below static, it should be some per-instance data. This way, the @@ -73,10 +66,8 @@ namespace xmloff { namespace metadata // one big instance, since in this case, every instance can quickly decide whether it is responsible // for some attribute or property, and otherwise delegate to the next instance. - //.............................................................................................................. typedef ::boost::unordered_map< OUString, const PropertyDescription*, OUStringHash > DescriptionsByName; - //.............................................................................................................. const DescriptionsByName& lcl_getPropertyDescriptions() { DBG_TESTSOLARMUTEX(); @@ -93,10 +84,8 @@ namespace xmloff { namespace metadata return s_propertyDescriptionsByName; } - //.............................................................................................................. typedef ::std::map< PropertyGroup, PropertyDescriptionList > IndexedPropertyGroups; - //.............................................................................................................. const IndexedPropertyGroups& lcl_getIndexedPropertyGroups() { DBG_TESTSOLARMUTEX(); @@ -114,10 +103,8 @@ namespace xmloff { namespace metadata return s_indexedPropertyGroups; } - //.............................................................................................................. typedef ::boost::unordered_map< OUString, XMLTokenEnum, OUStringHash > ReverseTokenLookup; - //.............................................................................................................. const ReverseTokenLookup& getReverseTokenLookup() { DBG_TESTSOLARMUTEX(); @@ -134,7 +121,6 @@ namespace xmloff { namespace metadata return s_reverseTokenLookup; } - //.............................................................................................................. struct AttributeHash : public ::std::unary_function< AttributeDescription, size_t > { size_t operator()( const AttributeDescription& i_attribute ) const @@ -143,10 +129,8 @@ namespace xmloff { namespace metadata } }; - //.............................................................................................................. typedef ::boost::unordered_multimap< AttributeDescription, PropertyGroup, AttributeHash > AttributeGroups; - //.............................................................................................................. const AttributeGroups& lcl_getAttributeGroups() { DBG_TESTSOLARMUTEX(); @@ -164,10 +148,8 @@ namespace xmloff { namespace metadata return s_attributeGroups; } - //.............................................................................................................. typedef ::boost::unordered_map< AttributeDescription, PropertyGroups, AttributeHash > AttributesWithoutGroup; - //.............................................................................................................. const AttributesWithoutGroup& lcl_getAttributesWithoutGroups() { DBG_TESTSOLARMUTEX(); @@ -191,7 +173,6 @@ namespace xmloff { namespace metadata } } - //------------------------------------------------------------------------------------------------------------------ const PropertyDescription* getPropertyDescription( const OUString& i_propertyName ) { const DescriptionsByName& rAllDescriptions( lcl_getPropertyDescriptions() ); @@ -201,7 +182,6 @@ namespace xmloff { namespace metadata return NULL; } - //------------------------------------------------------------------------------------------------------------------ void getPropertyGroup( const PropertyGroup i_propertyGroup, PropertyDescriptionList& o_propertyDescriptions ) { OSL_ENSURE( i_propertyGroup != NO_GROUP, "xmloff::metadata::getPropertyGroup: illegal group!" ); @@ -212,7 +192,6 @@ namespace xmloff { namespace metadata o_propertyDescriptions = pos->second; } - //------------------------------------------------------------------------------------------------------------------ void getPropertyGroupList( const AttributeDescription& i_attribute, PropertyGroups& o_propertyGroups ) { const AttributeGroups& rAttributeGroups = lcl_getAttributeGroups(); @@ -247,7 +226,6 @@ namespace xmloff { namespace metadata } } - //------------------------------------------------------------------------------------------------------------------ AttributeDescription getAttributeDescription( const sal_uInt16 i_namespacePrefix, const OUString& i_attributeName ) { AttributeDescription attribute; @@ -261,8 +239,6 @@ namespace xmloff { namespace metadata return attribute; } -//...................................................................................................................... } } // namespace xmloff::metadata -//...................................................................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/forms/property_meta_data.hxx b/xmloff/source/forms/property_meta_data.hxx index 7db6912190da..2216f50a6fb5 100644 --- a/xmloff/source/forms/property_meta_data.hxx +++ b/xmloff/source/forms/property_meta_data.hxx @@ -22,10 +22,8 @@ #include "property_description.hxx" -//...................................................................................................................... namespace xmloff { namespace metadata { -//...................................................................................................................... const PropertyDescription* getPropertyDescription( const OUString& i_propertyName ); @@ -51,9 +49,7 @@ namespace xmloff { namespace metadata AttributeDescription getAttributeDescription( const sal_uInt16 i_namespacePrefix, const OUString& i_attributeName ); -//...................................................................................................................... } } // namespace xmloff::metadata -//...................................................................................................................... #endif // XMLOFF_PROPERTY_META_DATA_HXX diff --git a/xmloff/source/forms/propertyexport.cxx b/xmloff/source/forms/propertyexport.cxx index 7e7597b723e2..fa960c9d1646 100644 --- a/xmloff/source/forms/propertyexport.cxx +++ b/xmloff/source/forms/propertyexport.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <stdio.h> #include "propertyexport.hxx" #include <xmloff/xmlexp.hxx> @@ -40,10 +39,8 @@ #include <tools/date.hxx> #include <tools/datetime.hxx> -//......................................................................... namespace xmloff { -//......................................................................... using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -54,10 +51,7 @@ namespace xmloff using namespace ::comphelper; - //===================================================================== //= OPropertyExport - //===================================================================== - //--------------------------------------------------------------------- OPropertyExport::OPropertyExport(IFormsExportContext& _rContext, const Reference< XPropertySet >& _rxProps) :m_rContext(_rContext) ,m_xProps(_rxProps) @@ -77,7 +71,6 @@ namespace xmloff examinePersistence(); } - //--------------------------------------------------------------------- bool OPropertyExport::shouldExportProperty( const OUString& i_propertyName ) const { // if the property state is DEFAULT, it does not need to be written - at least @@ -180,7 +173,6 @@ namespace xmloff AddAttribute(XML_NAMESPACE_OFFICE, eValueAttName, sValue ); } - // start the property tag SvXMLElementExport aValueTag1(m_rContext.getGlobalContext(), XML_NAMESPACE_FORM, @@ -235,7 +227,6 @@ namespace xmloff delete pPropertiesTag; } - //--------------------------------------------------------------------- void OPropertyExport::examinePersistence() { m_aRemainingProps.clear(); @@ -255,7 +246,6 @@ namespace xmloff } } - //--------------------------------------------------------------------- void OPropertyExport::exportStringPropertyAttribute( const sal_uInt16 _nNamespaceKey, const sal_Char* _pAttributeName, const OUString& _rPropertyName ) { @@ -278,7 +268,6 @@ namespace xmloff exportedProperty( _rPropertyName ); } - //--------------------------------------------------------------------- void OPropertyExport::exportBooleanPropertyAttribute(const sal_uInt16 _nNamespaceKey, const sal_Char* _pAttributeName, const OUString& _rPropertyName, const sal_Int8 _nBooleanAttributeFlags) { @@ -317,7 +306,6 @@ namespace xmloff exportedProperty( _rPropertyName ); } - //--------------------------------------------------------------------- void OPropertyExport::exportInt16PropertyAttribute(const sal_uInt16 _nNamespaceKey, const sal_Char* _pAttributeName, const OUString& _rPropertyName, const sal_Int16 _nDefault, bool force) { @@ -341,7 +329,6 @@ namespace xmloff exportedProperty( _rPropertyName ); } - //--------------------------------------------------------------------- void OPropertyExport::exportInt32PropertyAttribute( const sal_uInt16 _nNamespaceKey, const sal_Char* _pAttributeName, const OUString& _rPropertyName, const sal_Int32 _nDefault ) { @@ -365,7 +352,6 @@ namespace xmloff exportedProperty( _rPropertyName ); } - //--------------------------------------------------------------------- void OPropertyExport::exportEnumPropertyAttribute( const sal_uInt16 _nNamespaceKey, const sal_Char* _pAttributeName, const OUString &rPropertyName, const SvXMLEnumMapEntry* _pValueMap, @@ -400,7 +386,6 @@ namespace xmloff exportedProperty(rPropertyName); } - //--------------------------------------------------------------------- void OPropertyExport::exportTargetFrameAttribute() { DBG_CHECK_PROPERTY( PROPERTY_TARGETFRAME, OUString ); @@ -416,7 +401,6 @@ namespace xmloff exportedProperty(PROPERTY_TARGETFRAME); } - //--------------------------------------------------------------------- void OPropertyExport::exportRelativeTargetLocation(const OUString& _sPropertyName,sal_Int32 _nProperty,bool _bAddType) { DBG_CHECK_PROPERTY( _sPropertyName, OUString ); @@ -436,7 +420,6 @@ namespace xmloff exportedProperty(_sPropertyName); } - //--------------------------------------------------------------------- void OPropertyExport::flagStyleProperties() { // flag all the properties which are part of the style as "handled" @@ -461,7 +444,6 @@ namespace xmloff exportedProperty( "WritingMode" ); } - //--------------------------------------------------------------------- void OPropertyExport::exportGenericPropertyAttribute( const sal_uInt16 _nAttributeNamespaceKey, const sal_Char* _pAttributeName, const sal_Char* _pPropertyName) { @@ -490,7 +472,6 @@ namespace xmloff AddAttribute(_nAttributeNamespaceKey, _pAttributeName, sValue); } - //--------------------------------------------------------------------- void OPropertyExport::exportStringSequenceAttribute(const sal_uInt16 _nAttributeNamespaceKey, const sal_Char* _pAttributeName, const OUString& _rPropertyName, const sal_Unicode _aQuoteCharacter, const sal_Unicode _aListSeparator) @@ -538,7 +519,6 @@ namespace xmloff exportedProperty( _rPropertyName ); } - //--------------------------------------------------------------------- OUString OPropertyExport::implConvertAny(const Any& _rValue) { OUStringBuffer aBuffer; @@ -624,8 +604,6 @@ namespace xmloff return aBuffer.makeStringAndClear(); } - - //--------------------------------------------------------------------- token::XMLTokenEnum OPropertyExport::implGetPropertyXMLType(const ::com::sun::star::uno::Type& _rType) { // handle the type description @@ -649,7 +627,6 @@ namespace xmloff } #ifdef DBG_UTIL - //--------------------------------------------------------------------- void OPropertyExport::AddAttribute(sal_uInt16 _nPrefix, const sal_Char* _pName, const OUString& _rValue) { OSL_ENSURE(m_rContext.getGlobalContext().GetXAttrList()->getValueByName(OUString::createFromAscii(_pName)).isEmpty(), @@ -658,7 +635,6 @@ namespace xmloff m_rContext.getGlobalContext().AddAttribute(_nPrefix, _pName, _rValue); } - //--------------------------------------------------------------------- void OPropertyExport::AddAttribute( sal_uInt16 _nPrefix, const OUString& _rName, const OUString& _rValue ) { OSL_ENSURE(m_rContext.getGlobalContext().GetXAttrList()->getValueByName( _rName ).isEmpty(), @@ -667,7 +643,6 @@ namespace xmloff m_rContext.getGlobalContext().AddAttribute( _nPrefix, _rName, _rValue ); } - //--------------------------------------------------------------------- void OPropertyExport::AddAttributeASCII(sal_uInt16 _nPrefix, const sal_Char* _pName, const sal_Char *pValue) { OSL_ENSURE(m_rContext.getGlobalContext().GetXAttrList()->getValueByName(OUString::createFromAscii(_pName)).isEmpty(), @@ -676,7 +651,6 @@ namespace xmloff m_rContext.getGlobalContext().AddAttributeASCII(_nPrefix, _pName, pValue); } - //--------------------------------------------------------------------- void OPropertyExport::AddAttribute(sal_uInt16 _nPrefix, ::xmloff::token::XMLTokenEnum _eName, const OUString& _rValue) { OSL_ENSURE(m_rContext.getGlobalContext().GetXAttrList()->getValueByName(::xmloff::token::GetXMLToken(_eName)).isEmpty(), @@ -685,7 +659,6 @@ namespace xmloff m_rContext.getGlobalContext().AddAttribute(_nPrefix, _eName, _rValue); } - //--------------------------------------------------------------------- void OPropertyExport::AddAttribute(sal_uInt16 _nPrefix, ::xmloff::token::XMLTokenEnum _eName, ::xmloff::token::XMLTokenEnum _eValue ) { OSL_ENSURE(m_rContext.getGlobalContext().GetXAttrList()->getValueByName(::xmloff::token::GetXMLToken(_eName)).isEmpty(), @@ -694,7 +667,6 @@ namespace xmloff m_rContext.getGlobalContext().AddAttribute(_nPrefix, _eName, _eValue); } - //--------------------------------------------------------------------- void OPropertyExport::dbg_implCheckProperty(const OUString& _rPropertyName, const Type* _pType) { try @@ -722,9 +694,6 @@ namespace xmloff } #endif // DBG_UTIL - dbg_implCheckProperty -//......................................................................... } // namespace xmloff -//......................................................................... - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/forms/propertyexport.hxx b/xmloff/source/forms/propertyexport.hxx index ffc7f7cc5b80..69f06c3a6c81 100644 --- a/xmloff/source/forms/propertyexport.hxx +++ b/xmloff/source/forms/propertyexport.hxx @@ -29,10 +29,8 @@ #include "callbacks.hxx" #include "strings.hxx" -//......................................................................... namespace xmloff { -//......................................................................... #define BOOLATTR_DEFAULT_FALSE 0x00 #define BOOLATTR_DEFAULT_TRUE 0x01 @@ -47,9 +45,7 @@ namespace xmloff // is <TRUE/>, the current property value is inverted <em>before</em> comparing it to the default.</p> class IFormsExportContext; - //===================================================================== //= OPropertyExport - //===================================================================== /** provides export related tools for attribute handling <p>(The name is somewhat misleading. It's not only a PropertyExport, but in real a ElementExport. @@ -390,9 +386,7 @@ namespace xmloff #endif }; - //===================================================================== //= helper - //===================================================================== #ifdef DBG_UTIL #define DBG_CHECK_PROPERTY(name, type) \ dbg_implCheckProperty(name, &::getCppuType(static_cast< type* >(NULL))) @@ -408,11 +402,8 @@ namespace xmloff #define DBG_CHECK_PROPERTY_ASCII_NO_TYPE( name ) #endif -//......................................................................... } // namespace xmloff -//......................................................................... #endif // _XMLOFF_FORMS_PROPERTYEXPORT_HXX_ - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/forms/propertyimport.cxx b/xmloff/source/forms/propertyimport.cxx index 0ba21d22ba99..d305a86dc77b 100644 --- a/xmloff/source/forms/propertyimport.cxx +++ b/xmloff/source/forms/propertyimport.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "propertyimport.hxx" #include <sax/tools/converter.hxx> @@ -41,10 +40,8 @@ #include <osl/thread.h> #endif -//......................................................................... namespace xmloff { -//......................................................................... using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; @@ -58,12 +55,9 @@ namespace xmloff #define TYPE_TIME 2 #define TYPE_DATETIME 3 -//===================================================================== //= PropertyConversion -//===================================================================== namespace { - //--------------------------------------------------------------------- ::com::sun::star::util::Time lcl_getTime(double _nValue) { ::com::sun::star::util::Time aTime; @@ -80,7 +74,6 @@ namespace return aTime; } - //--------------------------------------------------------------------- static ::com::sun::star::util::Date lcl_getDate( double _nValue ) { Date aToolsDate((sal_uInt32)_nValue); @@ -90,7 +83,6 @@ namespace } } -//--------------------------------------------------------------------- Any PropertyConversion::convertString( SvXMLImport& _rImporter, const ::com::sun::star::uno::Type& _rExpectedType, const OUString& _rReadCharacters, const SvXMLEnumMapEntry* _pEnumMap, const sal_Bool _bInvertBoolean ) { @@ -241,7 +233,6 @@ Any PropertyConversion::convertString( SvXMLImport& _rImporter, const ::com::sun return aReturn; } -//--------------------------------------------------------------------- Type PropertyConversion::xmlTypeToUnoType( const OUString& _rType ) { Type aUnoType( ::getVoidCppuType() ); @@ -263,10 +254,7 @@ Type PropertyConversion::xmlTypeToUnoType( const OUString& _rType ) return aUnoType; } -//===================================================================== //= OPropertyImport -//===================================================================== -//--------------------------------------------------------------------- OPropertyImport::OPropertyImport(OFormLayerXMLImport_Impl& _rImport, sal_uInt16 _nPrefix, const OUString& _rName) :SvXMLImportContext(_rImport.getGlobalContext(), _nPrefix, _rName) ,m_rContext(_rImport) @@ -274,7 +262,6 @@ OPropertyImport::OPropertyImport(OFormLayerXMLImport_Impl& _rImport, sal_uInt16 { } -//--------------------------------------------------------------------- SvXMLImportContext* OPropertyImport::CreateChildContext(sal_uInt16 _nPrefix, const OUString& _rLocalName, const Reference< XAttributeList >& _rxAttrList) { @@ -292,7 +279,6 @@ SvXMLImportContext* OPropertyImport::CreateChildContext(sal_uInt16 _nPrefix, con } } -//--------------------------------------------------------------------- void OPropertyImport::StartElement(const Reference< XAttributeList >& _rxAttrList) { OSL_ENSURE(_rxAttrList.is(), "OPropertyImport::StartElement: invalid attribute list!"); @@ -319,14 +305,12 @@ void OPropertyImport::StartElement(const Reference< XAttributeList >& _rxAttrLis // default } -//--------------------------------------------------------------------- sal_Bool OPropertyImport::encounteredAttribute(const OUString& _rAttributeName) const { OSL_ENSURE(m_bTrackAttributes, "OPropertyImport::encounteredAttribute: attribute tracking not enabled!"); return m_aEncounteredAttributes.end() != m_aEncounteredAttributes.find(_rAttributeName); } -//--------------------------------------------------------------------- void OPropertyImport::Characters(const OUString& #if OSL_DEBUG_LEVEL > 0 _rChars @@ -337,7 +321,6 @@ _rChars OSL_ENSURE(_rChars.trim().isEmpty(), "OPropertyImport::Characters: non-whitespace characters!"); } -//--------------------------------------------------------------------- bool OPropertyImport::handleAttribute(sal_uInt16 /*_nNamespaceKey*/, const OUString& _rLocalName, const OUString& _rValue) { const OAttribute2Property::AttributeAssignment* pProperty = m_rContext.getAttributeMap().getAttributeTranslation(_rLocalName); @@ -367,10 +350,7 @@ bool OPropertyImport::handleAttribute(sal_uInt16 /*_nNamespaceKey*/, const OUStr return true; } -//===================================================================== //= OPropertyElementsContext -//===================================================================== -//--------------------------------------------------------------------- OPropertyElementsContext::OPropertyElementsContext(SvXMLImport& _rImport, sal_uInt16 _nPrefix, const OUString& _rName, const OPropertyImportRef& _rPropertyImporter) :SvXMLImportContext(_rImport, _nPrefix, _rName) @@ -378,7 +358,6 @@ OPropertyElementsContext::OPropertyElementsContext(SvXMLImport& _rImport, sal_uI { } -//--------------------------------------------------------------------- SvXMLImportContext* OPropertyElementsContext::CreateChildContext(sal_uInt16 _nPrefix, const OUString& _rLocalName, const Reference< XAttributeList >&) { @@ -400,14 +379,12 @@ SvXMLImportContext* OPropertyElementsContext::CreateChildContext(sal_uInt16 _nPr } #if OSL_DEBUG_LEVEL > 0 - //--------------------------------------------------------------------- void OPropertyElementsContext::StartElement(const Reference< XAttributeList >& _rxAttrList) { OSL_ENSURE(0 == _rxAttrList->getLength(), "OPropertyElementsContext::StartElement: the form:properties element should not have attributes!"); SvXMLImportContext::StartElement(_rxAttrList); } - //--------------------------------------------------------------------- void OPropertyElementsContext::Characters(const OUString& _rChars) { OSL_ENSURE(0 == _rChars.trim(), "OPropertyElementsContext::Characters: non-whitespace characters detected!"); @@ -416,10 +393,7 @@ SvXMLImportContext* OPropertyElementsContext::CreateChildContext(sal_uInt16 _nPr #endif -//===================================================================== //= OSinglePropertyContext -//===================================================================== -//--------------------------------------------------------------------- OSinglePropertyContext::OSinglePropertyContext(SvXMLImport& _rImport, sal_uInt16 _nPrefix, const OUString& _rName, const OPropertyImportRef& _rPropertyImporter) :SvXMLImportContext(_rImport, _nPrefix, _rName) @@ -427,7 +401,6 @@ OSinglePropertyContext::OSinglePropertyContext(SvXMLImport& _rImport, sal_uInt16 { } -//--------------------------------------------------------------------- SvXMLImportContext* OSinglePropertyContext::CreateChildContext(sal_uInt16 _nPrefix, const OUString& _rLocalName, const Reference< XAttributeList >&) { @@ -437,7 +410,6 @@ SvXMLImportContext* OSinglePropertyContext::CreateChildContext(sal_uInt16 _nPref return new SvXMLImportContext(GetImport(), _nPrefix, _rLocalName); } -//--------------------------------------------------------------------- void OSinglePropertyContext::StartElement(const Reference< XAttributeList >& _rxAttrList) { ::com::sun::star::beans::PropertyValue aPropValue; // the property the instance imports currently @@ -495,10 +467,7 @@ void OSinglePropertyContext::StartElement(const Reference< XAttributeList >& _rx m_xPropertyImporter->implPushBackGenericPropertyValue(aPropValue); } -//===================================================================== //= OListPropertyContext -//===================================================================== -//--------------------------------------------------------------------- OListPropertyContext::OListPropertyContext( SvXMLImport& _rImport, sal_uInt16 _nPrefix, const OUString& _rName, const OPropertyImportRef& _rPropertyImporter ) :SvXMLImportContext( _rImport, _nPrefix, _rName ) @@ -506,7 +475,6 @@ OListPropertyContext::OListPropertyContext( SvXMLImport& _rImport, sal_uInt16 _n { } -//--------------------------------------------------------------------- void OListPropertyContext::StartElement( const Reference< XAttributeList >& _rxAttrList ) { sal_Int32 nAttributeCount = _rxAttrList->getLength(); @@ -538,7 +506,6 @@ void OListPropertyContext::StartElement( const Reference< XAttributeList >& _rxA } } -//--------------------------------------------------------------------- void OListPropertyContext::EndElement() { OSL_ENSURE( !m_sPropertyName.isEmpty() && !m_sPropertyType.isEmpty(), @@ -565,7 +532,6 @@ void OListPropertyContext::EndElement() m_xPropertyImporter->implPushBackGenericPropertyValue( aSequenceValue ); } -//--------------------------------------------------------------------- SvXMLImportContext* OListPropertyContext::CreateChildContext( sal_uInt16 _nPrefix, const OUString& _rLocalName, const Reference< XAttributeList >& /*_rxAttrList*/ ) { if ( token::IsXMLToken( _rLocalName, token::XML_LIST_VALUE ) ) @@ -582,17 +548,13 @@ SvXMLImportContext* OListPropertyContext::CreateChildContext( sal_uInt16 _nPrefi } } -//===================================================================== //= OListValueContext -//===================================================================== -//--------------------------------------------------------------------- OListValueContext::OListValueContext( SvXMLImport& _rImport, sal_uInt16 _nPrefix, const OUString& _rName, OUString& _rListValueHolder ) :SvXMLImportContext( _rImport, _nPrefix, _rName ) ,m_rListValueHolder( _rListValueHolder ) { } -//--------------------------------------------------------------------- void OListValueContext::StartElement( const Reference< XAttributeList >& _rxAttrList ) { const sal_Int32 nAttributeCount = _rxAttrList->getLength(); @@ -621,8 +583,6 @@ void OListValueContext::StartElement( const Reference< XAttributeList >& _rxAttr } } -//......................................................................... } // namespace xmloff -//......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/forms/propertyimport.hxx b/xmloff/source/forms/propertyimport.hxx index e813d383e348..7703979c1881 100644 --- a/xmloff/source/forms/propertyimport.hxx +++ b/xmloff/source/forms/propertyimport.hxx @@ -32,14 +32,10 @@ namespace com { namespace sun { namespace star { namespace util { struct Date; } } } } -//......................................................................... namespace xmloff { -//......................................................................... - //===================================================================== //= PropertyConversion - //===================================================================== class PropertyConversion { public: @@ -55,9 +51,7 @@ namespace xmloff }; class OFormLayerXMLImport_Impl; - //===================================================================== //= OPropertyImport - //===================================================================== /** Helper class for importing property values <p>This class imports properties which are stored as attributes as well as properties which @@ -151,9 +145,7 @@ namespace xmloff }; SV_DECL_IMPL_REF( OPropertyImport ) - //===================================================================== //= OPropertyElementsContext - //===================================================================== /** helper class for importing the <form:properties> element */ class OPropertyElementsContext : public SvXMLImportContext @@ -176,9 +168,7 @@ namespace xmloff #endif }; - //===================================================================== //= OSinglePropertyContext - //===================================================================== /** helper class for importing a single <form:property> element */ class OSinglePropertyContext : public SvXMLImportContext @@ -197,9 +187,7 @@ namespace xmloff const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList); }; - //===================================================================== //= OListPropertyContext - //===================================================================== class OListPropertyContext : public SvXMLImportContext { OPropertyImportRef m_xPropertyImporter; @@ -221,9 +209,7 @@ namespace xmloff const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList); }; - //===================================================================== //= OListValueContext - //===================================================================== class OListValueContext : public SvXMLImportContext { OUString& m_rListValueHolder; @@ -236,11 +222,8 @@ namespace xmloff const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList ); }; -//......................................................................... } // namespace xmloff -//......................................................................... #endif // _XMLOFF_FORMS_PROPERTYIMPORT_HXX_ - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/forms/valueproperties.cxx b/xmloff/source/forms/valueproperties.cxx index 1f21541a2e65..28603f685f5d 100644 --- a/xmloff/source/forms/valueproperties.cxx +++ b/xmloff/source/forms/valueproperties.cxx @@ -22,17 +22,12 @@ #include <com/sun/star/form/FormComponentType.hpp> #include <sal/log.hxx> -//......................................................................... namespace xmloff { -//......................................................................... using namespace ::com::sun::star::form; - //===================================================================== //= OValuePropertiesMetaData - //===================================================================== - //--------------------------------------------------------------------- void OValuePropertiesMetaData::getValuePropertyNames( OControlElement::ElementType _eType, sal_Int16 _nFormComponentType, sal_Char const * & _rpCurrentValuePropertyName, sal_Char const * & _rpValuePropertyName) @@ -96,8 +91,6 @@ namespace xmloff } } - - //--------------------------------------------------------------------- void OValuePropertiesMetaData::getValueLimitPropertyNames(sal_Int16 _nFormComponentType, sal_Char const * & _rpMinValuePropertyName, sal_Char const * & _rpMaxValuePropertyName) { @@ -131,7 +124,6 @@ namespace xmloff } } - //--------------------------------------------------------------------- void OValuePropertiesMetaData::getRuntimeValuePropertyNames( OControlElement::ElementType _eType, sal_Int16 _nFormComponentType, sal_Char const * & _rpValuePropertyName, sal_Char const * & _rpDefaultValuePropertyName ) @@ -183,9 +175,6 @@ namespace xmloff } } -//......................................................................... } // namespace xmloff -//......................................................................... - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/forms/valueproperties.hxx b/xmloff/source/forms/valueproperties.hxx index 5dafb2b230c6..495a3b362c4a 100644 --- a/xmloff/source/forms/valueproperties.hxx +++ b/xmloff/source/forms/valueproperties.hxx @@ -22,14 +22,10 @@ #include "controlelement.hxx" -//......................................................................... namespace xmloff { -//......................................................................... - //===================================================================== //= OValuePropertiesMetaData - //===================================================================== class OValuePropertiesMetaData { protected: @@ -67,11 +63,8 @@ namespace xmloff sal_Char const * & _rpDefaultValuePropertyName); }; -//......................................................................... } // namespace xmloff -//......................................................................... #endif // _XMLOFF_FORMS_VALUEPROPERTIES_HXX_ - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |