From 6c771ed42423936561ec8cc0d77392d3a0d8b4e2 Mon Sep 17 00:00:00 2001 From: Gil Forcada Date: Wed, 13 Oct 2010 00:09:16 +0200 Subject: [PATCH] Removed comments, trailing spaces and death code (3) --- dbaccess/source/core/inc/ContainerListener.hxx | 11 +++------ dbaccess/source/core/inc/ContainerMediator.hxx | 9 ++----- dbaccess/source/core/inc/ContentHelper.hxx | 9 +++---- dbaccess/source/core/inc/DatabaseDataProvider.hxx | 4 +- dbaccess/source/core/inc/FilteredContainer.hxx | 4 +- dbaccess/source/core/inc/PropertyForward.hxx | 8 +----- dbaccess/source/core/inc/RefreshListener.hxx | 8 +----- .../source/core/inc/SingleSelectQueryComposer.hxx | 2 +- dbaccess/source/core/inc/TableDeco.hxx | 8 +++--- dbaccess/source/core/inc/View.hxx | 6 +---- dbaccess/source/core/inc/callablestatement.hxx | 2 +- dbaccess/source/core/inc/column.hxx | 8 ++---- dbaccess/source/core/inc/columnsettings.hxx | 22 ++++++++----------- dbaccess/source/core/inc/commandbase.hxx | 10 +------- dbaccess/source/core/inc/composertools.hxx | 7 +----- dbaccess/source/core/inc/containerapprove.hxx | 7 +----- dbaccess/source/core/inc/core_resource.hrc | 5 +--- dbaccess/source/core/inc/core_resource.hxx | 13 +++-------- dbaccess/source/core/inc/datasettings.hxx | 7 +----- dbaccess/source/core/inc/dbamiscres.hrc | 10 ++++---- dbaccess/source/core/inc/definitioncolumn.hxx | 2 +- dbaccess/source/core/inc/definitioncontainer.hxx | 8 +----- dbaccess/source/core/inc/module_dba.hxx | 7 +----- dbaccess/source/core/inc/object.hxx | 2 +- dbaccess/source/core/inc/objectnameapproval.hxx | 8 +----- dbaccess/source/core/inc/preparedstatement.hxx | 2 +- dbaccess/source/core/inc/querycomposer.hxx | 2 +- dbaccess/source/core/inc/querycontainer.hxx | 13 ++--------- .../source/core/inc/recovery/dbdocrecovery.hxx | 6 +---- dbaccess/source/core/inc/sdbcoretools.hxx | 11 +--------- dbaccess/source/core/inc/statement.hxx | 4 +- dbaccess/source/core/inc/table.hxx | 2 +- dbaccess/source/core/inc/tablecontainer.hxx | 6 ++-- dbaccess/source/core/inc/userinformation.hxx | 2 +- dbaccess/source/core/inc/veto.hxx | 7 +----- dbaccess/source/core/inc/viewcontainer.hxx | 4 +- 36 files changed, 77 insertions(+), 169 deletions(-) diff --git a/dbaccess/source/core/inc/ContainerListener.hxx b/dbaccess/source/core/inc/ContainerListener.hxx index 2c9fc69..c528ba8 100644 --- a/dbaccess/source/core/inc/ContainerListener.hxx +++ b/dbaccess/source/core/inc/ContainerListener.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,10 +33,8 @@ #include -//........................................................................ namespace dbaccess { -//........................................................................ //========================================================================== //= OContainerListener @@ -45,7 +43,7 @@ namespace dbaccess , ::com::sun::star::container::XContainerApproveListener > OContainerListener_BASE; - /** is helper class to avoid a cycle in refcount + /** is helper class to avoid a cycle in refcount */ class OContainerListener : public OContainerListener_BASE { @@ -82,8 +80,7 @@ namespace dbaccess protected: virtual ~OContainerListener(); }; -//........................................................................ + } // namespace dbaccess -//........................................................................ -#endif // DBA_CONTAINERLISTENER_HXX +#endif // DBA_CONTAINERLISTENER_HXX diff --git a/dbaccess/source/core/inc/ContainerMediator.hxx b/dbaccess/source/core/inc/ContainerMediator.hxx index a05522a..7081a9d 100644 --- a/dbaccess/source/core/inc/ContainerMediator.hxx +++ b/dbaccess/source/core/inc/ContainerMediator.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,11 +40,9 @@ #include -//........................................................................ namespace dbaccess { -//........................................................................ - + class OPropertyForward; class OContainerMediator : public ::comphelper::OBaseMutex @@ -98,8 +96,7 @@ namespace dbaccess const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxDestination ); }; -//........................................................................ + } // namespace dbaccess -//........................................................................ #endif // DBA_CONTAINERMEDIATOR_HXX diff --git a/dbaccess/source/core/inc/ContentHelper.hxx b/dbaccess/source/core/inc/ContentHelper.hxx index fd86bdd..7d09bb5 100644 --- a/dbaccess/source/core/inc/ContentHelper.hxx +++ b/dbaccess/source/core/inc/ContentHelper.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -126,7 +126,7 @@ namespace dbaccess // helper virtual void SAL_CALL disposing(); - + virtual void notifyDataSourceModified(); /** @@ -193,13 +193,12 @@ namespace dbaccess const ::comphelper::ComponentContext& getContext() const { return m_aContext; } - inline TContentPtr getImpl() const { return m_pImpl; } + inline TContentPtr getImpl() const { return m_pImpl; } protected: virtual ::rtl::OUString determineContentType() const = 0; }; -//........................................................................ } // namespace dbaccess -//........................................................................ + #endif // DBA_CONTENTHELPER_HXX diff --git a/dbaccess/source/core/inc/DatabaseDataProvider.hxx b/dbaccess/source/core/inc/DatabaseDataProvider.hxx index dae466e..1dcef16 100644 --- a/dbaccess/source/core/inc/DatabaseDataProvider.hxx +++ b/dbaccess/source/core/inc/DatabaseDataProvider.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -260,7 +260,7 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> m_xParent; ::com::sun::star::uno::Sequence< ::rtl::OUString > m_MasterFields; ::com::sun::star::uno::Sequence< ::rtl::OUString > m_DetailFields; - + ::rtl::OUString m_Command; ::rtl::OUString m_DataSourceName; ::sal_Int32 m_CommandType; diff --git a/dbaccess/source/core/inc/FilteredContainer.hxx b/dbaccess/source/core/inc/FilteredContainer.hxx index 28ba22e..67ad3d5 100644 --- a/dbaccess/source/core/inc/FilteredContainer.hxx +++ b/dbaccess/source/core/inc/FilteredContainer.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,7 +50,7 @@ namespace dbaccess ::dbtools::IWarningsContainer* m_pWarningsContainer; IRefreshListener* m_pRefreshListener; oslInterlockedCount& m_nInAppend; - + // holds the original container which where set in construct but they can be null ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xMasterContainer; ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XConnection > m_xConnection; diff --git a/dbaccess/source/core/inc/PropertyForward.hxx b/dbaccess/source/core/inc/PropertyForward.hxx index 5334e59..33aae03 100644 --- a/dbaccess/source/core/inc/PropertyForward.hxx +++ b/dbaccess/source/core/inc/PropertyForward.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,10 +36,8 @@ #include -//........................................................................ namespace dbaccess { -//........................................................................ // =================================================================== // = OPropertyForward @@ -77,8 +75,6 @@ namespace dbaccess inline ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getDefinition() const { return m_xDest; } }; -//........................................................................ } // namespace dbaccess -//........................................................................ -#endif // DBA_PROPERTYSETFORWARD_HXX +#endif // DBA_PROPERTYSETFORWARD_HXX diff --git a/dbaccess/source/core/inc/RefreshListener.hxx b/dbaccess/source/core/inc/RefreshListener.hxx index b7a7330..fe6a598 100644 --- a/dbaccess/source/core/inc/RefreshListener.hxx +++ b/dbaccess/source/core/inc/RefreshListener.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,10 +36,8 @@ namespace com { namespace sun { namespace star { namespace container } }}} -//......................................................................... namespace dbaccess { -//......................................................................... //===================================================================== //= IRefreshListener @@ -49,9 +47,7 @@ namespace dbaccess public: virtual void refresh(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rToBeRefreshed) = 0; }; -//......................................................................... + } // namespace dbaccess -//......................................................................... #endif // DBA_CORE_REFRESHLISTENER_HXX - diff --git a/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx b/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx index 21dfa7e..c42d8d1 100644 --- a/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx +++ b/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/core/inc/TableDeco.hxx b/dbaccess/source/core/inc/TableDeco.hxx index 455a071..826f14c 100644 --- a/dbaccess/source/core/inc/TableDeco.hxx +++ b/dbaccess/source/core/inc/TableDeco.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -110,7 +110,7 @@ namespace dbaccess sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) - + throw (::com::sun::star::uno::Exception); virtual ~ODBTableDecorator(); @@ -129,7 +129,7 @@ namespace dbaccess const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxColumnDefinitions ) throw(::com::sun::star::sdbc::SQLException); - + // ODescriptor virtual void construct(); @@ -156,7 +156,7 @@ namespace dbaccess virtual void SAL_CALL alterColumnByName( const ::rtl::OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxDescriptor ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL alterColumnByIndex( sal_Int32 _nIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxDescriptor ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - // XNamed + // XNamed virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException); // com::sun::star::lang::XUnoTunnel diff --git a/dbaccess/source/core/inc/View.hxx b/dbaccess/source/core/inc/View.hxx index 49d4b91..2611b6e 100644 --- a/dbaccess/source/core/inc/View.hxx +++ b/dbaccess/source/core/inc/View.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,10 +41,8 @@ #include #include -//........................................................................ namespace dbaccess { -//........................................................................ //==================================================================== //= View @@ -84,8 +82,6 @@ namespace dbaccess using View_Base::getFastPropertyValue; }; -//........................................................................ } // namespace dbaccess -//........................................................................ #endif // DBACCESS_VIEW_HXX diff --git a/dbaccess/source/core/inc/callablestatement.hxx b/dbaccess/source/core/inc/callablestatement.hxx index 3e3874d..e772732 100644 --- a/dbaccess/source/core/inc/callablestatement.hxx +++ b/dbaccess/source/core/inc/callablestatement.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/core/inc/column.hxx b/dbaccess/source/core/inc/column.hxx index 9ca29d4..c34b9a4 100644 --- a/dbaccess/source/core/inc/column.hxx +++ b/dbaccess/source/core/inc/column.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -73,7 +73,6 @@ namespace dbaccess ::com::sun::star::container::XNamed > OColumnBase; - //------------------------------------------------------------ class OColumn :public comphelper::OBaseMutex ,public OColumnBase ,public ::comphelper::OPropertyContainer @@ -163,7 +162,7 @@ namespace dbaccess class OContainerMediator; typedef ::cppu::ImplHelper1< ::com::sun::star::container::XChild > TXChild; typedef connectivity::OColumnsHelper OColumns_BASE; - //------------------------------------------------------------ + class OColumns : public OColumns_BASE ,public TXChild { @@ -218,7 +217,7 @@ namespace dbaccess OColumns( ::cppu::OWeakObject& _rParent, - ::osl::Mutex& _rMutex, + ::osl::Mutex& _rMutex, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxDrvColumns, sal_Bool _bCaseSensitive, const ::std::vector< ::rtl::OUString> &_rVector, @@ -255,4 +254,3 @@ namespace dbaccess }; } #endif // _DBA_COREAPI_COLUMN_HXX_ - diff --git a/dbaccess/source/core/inc/columnsettings.hxx b/dbaccess/source/core/inc/columnsettings.hxx index 032055d..7de06fa 100644 --- a/dbaccess/source/core/inc/columnsettings.hxx +++ b/dbaccess/source/core/inc/columnsettings.hxx @@ -1,6 +1,6 @@ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,28 +31,26 @@ #include /** === end UNO includes === **/ -//........................................................................ namespace dbaccess { -//........................................................................ // TODO: move the following to comphelper/propertycontainerhelper.hxx class IPropertyContainer { public: virtual void registerProperty( - const ::rtl::OUString& _rName, - sal_Int32 _nHandle, - sal_Int32 _nAttributes, - void* _pPointerToMember, + const ::rtl::OUString& _rName, + sal_Int32 _nHandle, + sal_Int32 _nAttributes, + void* _pPointerToMember, const ::com::sun::star::uno::Type& _rMemberType ) = 0; virtual void registerMayBeVoidProperty( - const ::rtl::OUString& _rName, - sal_Int32 _nHandle, - sal_Int32 _nAttributes, - ::com::sun::star::uno::Any* _pPointerToMember, + const ::rtl::OUString& _rName, + sal_Int32 _nHandle, + sal_Int32 _nAttributes, + ::com::sun::star::uno::Any* _pPointerToMember, const ::com::sun::star::uno::Type& _rExpectedType ) = 0; @@ -102,8 +100,6 @@ namespace dbaccess static bool hasDefaultSettings( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxColumn ); }; -//........................................................................ } // namespace dbaccess -//........................................................................ #endif // COLUMNSETTINGS_HXX diff --git a/dbaccess/source/core/inc/commandbase.hxx b/dbaccess/source/core/inc/commandbase.hxx index 3d12602..1f1a294 100644 --- a/dbaccess/source/core/inc/commandbase.hxx +++ b/dbaccess/source/core/inc/commandbase.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,10 +31,8 @@ #include #include -//........................................................................ namespace dbaccess { -//........................................................................ //========================================================================== //= OCommandBase - a base class (in fact just a container for some members) @@ -44,7 +42,7 @@ class OCommandBase { public: // need public access // - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue> + ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue> m_aLayoutInformation; ::rtl::OUString m_sCommand; sal_Bool m_bEscapeProcessing; // no BitField ! so it can be used with a OPropertyStateContainer @@ -58,10 +56,6 @@ protected: }; -//........................................................................ } // namespace dbaccess -//........................................................................ #endif // _DBA_CORE_COMMANDBASE_HXX_ - - diff --git a/dbaccess/source/core/inc/composertools.hxx b/dbaccess/source/core/inc/composertools.hxx index 2d6257d..4febd4c 100644 --- a/dbaccess/source/core/inc/composertools.hxx +++ b/dbaccess/source/core/inc/composertools.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,10 +35,8 @@ #include -//........................................................................ namespace dbaccess { -//........................................................................ //==================================================================== //= TokenComposer @@ -132,9 +130,6 @@ namespace dbaccess } }; -//........................................................................ } // namespace dbaccess -//........................................................................ #endif // DBACCESS_SOURCE_CORE_INC_COMPOSERTOOLS_HXX - diff --git a/dbaccess/source/core/inc/containerapprove.hxx b/dbaccess/source/core/inc/containerapprove.hxx index 9ecfe1c..e9bebd8 100644 --- a/dbaccess/source/core/inc/containerapprove.hxx +++ b/dbaccess/source/core/inc/containerapprove.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,10 +34,8 @@ #include -//........................................................................ namespace dbaccess { -//........................................................................ //==================================================================== //= IContainerApprove @@ -70,9 +68,6 @@ namespace dbaccess typedef ::boost::shared_ptr< IContainerApprove > PContainerApprove; -//........................................................................ } // namespace dbaccess -//........................................................................ #endif // DBACCESS_CONTAINERAPPROVE_HXX - diff --git a/dbaccess/source/core/inc/core_resource.hrc b/dbaccess/source/core/inc/core_resource.hrc index c438314..7774530 100644 --- a/dbaccess/source/core/inc/core_resource.hrc +++ b/dbaccess/source/core/inc/core_resource.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,10 +32,8 @@ #include #endif -//------------------------------------------------------------------------------ #define RID_CORE_STRINGS_START RID_DBACCESS_START -//------------------------------------------------------------------------------ //- String-IDs #define RID_STR_TRIED_OPEN_TABLE ( RID_CORE_STRINGS_START + 0 ) #define RID_STR_CONNECTION_INVALID ( RID_CORE_STRINGS_START + 1 ) @@ -110,4 +108,3 @@ #define RID_NO_SUCH_DATA_SOURCE ( RID_CORE_STRINGS_START + 67 ) #endif // _DBA_CORE_RESOURCE_HRC_ - diff --git a/dbaccess/source/core/inc/core_resource.hxx b/dbaccess/source/core/inc/core_resource.hxx index 695e61f..ad114d6 100644 --- a/dbaccess/source/core/inc/core_resource.hxx +++ b/dbaccess/source/core/inc/core_resource.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,7 +33,7 @@ #include class ResMgr; -//......................................................................... + namespace dbaccess { @@ -52,7 +52,7 @@ namespace dbaccess friend class OModuleClient; static ::osl::Mutex s_aMutex; /// access safety static sal_Int32 s_nClients; /// number of registered clients - static ResMgr* m_pImpl; + static ResMgr* m_pImpl; private: // no instantiation allowed @@ -111,7 +111,7 @@ namespace dbaccess //========================================================================= //= OModuleClient //========================================================================= - /** base class for objects which uses any global module-specific ressources + /** base class for objects which uses any global module-specific ressources */ class OModuleClient { @@ -119,11 +119,6 @@ namespace dbaccess OModuleClient() { ResourceManager::registerClient(); } ~OModuleClient() { ResourceManager::revokeClient(); } }; - - -//......................................................................... } -//......................................................................... #endif // _DBA_CORE_RESOURCE_HXX_ - diff --git a/dbaccess/source/core/inc/datasettings.hxx b/dbaccess/source/core/inc/datasettings.hxx index 795dc22..0749c92 100644 --- a/dbaccess/source/core/inc/datasettings.hxx +++ b/dbaccess/source/core/inc/datasettings.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,10 +35,8 @@ #include #include -//........................................................................ namespace dbaccess { -//........................................................................ //========================================================================== //= ODataSettings_Base - a base class which implements the property member @@ -89,9 +87,6 @@ protected: void registerPropertiesFor(ODataSettings_Base* _pItem); }; -//........................................................................ } // namespace dbaccess -//........................................................................ #endif // _DBA_CORE_DATASETTINGS_HXX_ - diff --git a/dbaccess/source/core/inc/dbamiscres.hrc b/dbaccess/source/core/inc/dbamiscres.hrc index b1eb879..dbb4713 100644 --- a/dbaccess/source/core/inc/dbamiscres.hrc +++ b/dbaccess/source/core/inc/dbamiscres.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,16 +47,16 @@ #define STR_OUTLOOK 15 #define STR_OUTLOOKEXP 16 #define STR_EVOLUTION 17 -#define STR_EVOLUTION_GROUPWISE 18 +#define STR_EVOLUTION_GROUPWISE 18 #define STR_EVOLUTION_LDAP 19 #define STR_KAB 20 #define STR_MACAB 21 #define STR_EMBEDDED_HSQLDB 22 #define STR_THUNDERBIRD 23 #define STR_MYSQL_NATIVE 24 - + #define STR_END STR_MYSQL_NATIVE + 1 - -#endif // _DBA_MISCRES_HRC_ + +#endif // _DBA_MISCRES_HRC_ diff --git a/dbaccess/source/core/inc/definitioncolumn.hxx b/dbaccess/source/core/inc/definitioncolumn.hxx index 462e273..e281236 100644 --- a/dbaccess/source/core/inc/definitioncolumn.hxx +++ b/dbaccess/source/core/inc/definitioncolumn.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/core/inc/definitioncontainer.hxx b/dbaccess/source/core/inc/definitioncontainer.hxx index 0112cfa..eb6986f 100644 --- a/dbaccess/source/core/inc/definitioncontainer.hxx +++ b/dbaccess/source/core/inc/definitioncontainer.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,10 +47,9 @@ #include #include #include "apitools.hxx" -//........................................................................ + namespace dbaccess { -//........................................................................ class ODefinitionContainer_Impl : public OContentHelper_Impl { @@ -329,9 +328,6 @@ private: } }; -//........................................................................ } // namespace dbaccess -//........................................................................ #endif // _DBA_CORE_DEFINITIONCONTAINER_HXX_ - diff --git a/dbaccess/source/core/inc/module_dba.hxx b/dbaccess/source/core/inc/module_dba.hxx index ef9a8cd..df70bf2 100644 --- a/dbaccess/source/core/inc/module_dba.hxx +++ b/dbaccess/source/core/inc/module_dba.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,16 +30,11 @@ #include -//........................................................................ namespace dba { -//........................................................................ DEFINE_MODULE( DbaModule, DbaClient, DbaRes ) -//........................................................................ } // namespace sdbtools -//........................................................................ #endif // DBACCESS_MODULE_DBA_HXX - diff --git a/dbaccess/source/core/inc/object.hxx b/dbaccess/source/core/inc/object.hxx index 9d2032d..917cc9e 100644 --- a/dbaccess/source/core/inc/object.hxx +++ b/dbaccess/source/core/inc/object.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/core/inc/objectnameapproval.hxx b/dbaccess/source/core/inc/objectnameapproval.hxx index 31cd7c3..3db920a 100644 --- a/dbaccess/source/core/inc/objectnameapproval.hxx +++ b/dbaccess/source/core/inc/objectnameapproval.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,10 +34,8 @@ #include /** === end UNO includes === **/ -//........................................................................ namespace dbaccess { -//........................................................................ //==================================================================== //= ObjectNameApproval @@ -76,7 +74,7 @@ namespace dbaccess ObjectNameApproval( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, ObjectType _eType - ); + ); virtual ~ObjectNameApproval(); // IContainerApprove @@ -84,8 +82,6 @@ namespace dbaccess }; -//........................................................................ } // namespace dbaccess -//........................................................................ #endif // DBACCESS_OBJECTNAMEAPPROVAL_HXX diff --git a/dbaccess/source/core/inc/preparedstatement.hxx b/dbaccess/source/core/inc/preparedstatement.hxx index 2823a4f..9177c6c 100644 --- a/dbaccess/source/core/inc/preparedstatement.hxx +++ b/dbaccess/source/core/inc/preparedstatement.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/core/inc/querycomposer.hxx b/dbaccess/source/core/inc/querycomposer.hxx index 9bc5915..1a56370 100644 --- a/dbaccess/source/core/inc/querycomposer.hxx +++ b/dbaccess/source/core/inc/querycomposer.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/core/inc/querycontainer.hxx b/dbaccess/source/core/inc/querycontainer.hxx index 54dd2b8..2be7cf2 100644 --- a/dbaccess/source/core/inc/querycontainer.hxx +++ b/dbaccess/source/core/inc/querycontainer.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,10 +60,8 @@ namespace dbtools class IWarningsContainer; } -//........................................................................ namespace dbaccess { -//........................................................................ typedef ::cppu::ImplHelper5 < ::com::sun::star::container::XContainerListener , ::com::sun::star::container::XContainerApproveListener @@ -93,7 +91,6 @@ namespace dbaccess OContainerListener* m_pCommandsListener; - // ------------------------------------------------------------------------ /** a class which automatically resets m_eDoingCurrently in it's destructor */ class OAutoActionReset; // just for the following friend declaration @@ -119,7 +116,7 @@ namespace dbaccess @param _pWarnings specifies a warnings container (May be ) - + Any errors which occur during the lifetime of the query container, which cannot be reported as exceptionts (for instance in methods where throwing an SQLException is not allowed) will be appended to this container.

@@ -131,7 +128,7 @@ namespace dbaccess const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB, ::dbtools::IWarningsContainer* _pWarnings ); - + DECLARE_XINTERFACE( ) DECLARE_XTYPEPROVIDER( ) DECLARE_SERVICE_INFO(); @@ -181,10 +178,6 @@ namespace dbaccess ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent > implCreateWrapper(const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent >& _rxCommandDesc); }; -//........................................................................ } // namespace dbaccess -//........................................................................ #endif // _DBA_CORE_QUERYCONTAINER_HXX_ - - diff --git a/dbaccess/source/core/inc/recovery/dbdocrecovery.hxx b/dbaccess/source/core/inc/recovery/dbdocrecovery.hxx index afc3ba8..14baf53 100644 --- a/dbaccess/source/core/inc/recovery/dbdocrecovery.hxx +++ b/dbaccess/source/core/inc/recovery/dbdocrecovery.hxx @@ -1,6 +1,6 @@ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -* +* * Copyright 2009 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,10 +41,8 @@ namespace comphelper class ComponentContext; } -//........................................................................ namespace dbaccess { -//........................................................................ //==================================================================== //= DatabaseDocumentRecovery @@ -85,8 +83,6 @@ namespace dbaccess const ::std::auto_ptr< DatabaseDocumentRecovery_Data > m_pData; }; -//........................................................................ } // namespace dbaccess -//........................................................................ #endif // DBACCESS_DBDOCRECOVERY_HXX diff --git a/dbaccess/source/core/inc/sdbcoretools.hxx b/dbaccess/source/core/inc/sdbcoretools.hxx index a5f7ad2..65ea32b 100644 --- a/dbaccess/source/core/inc/sdbcoretools.hxx +++ b/dbaccess/source/core/inc/sdbcoretools.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,21 +42,14 @@ namespace comphelper class ComponentContext; } -//......................................................................... namespace dbaccess { -//......................................................................... - // ----------------------------------------------------------------------------- void notifyDataSourceModified(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxObject,sal_Bool _bModified); - // ----------------------------------------------------------------------------- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getDataSource( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxDependentObject ); - // ----------------------------------------------------------------------------- - - // ----------------------------------------------------------------------------- /** retrieves a to-be-displayed string for a given caught exception; */ ::rtl::OUString extractExceptionMessage( const ::comphelper::ComponentContext& _rContext, const ::com::sun::star::uno::Any& _rError ); @@ -82,7 +75,5 @@ namespace dbaccess } } // namespace dbaccess -//......................................................................... #endif // DBACORE_SDBCORETOOLS_HXX - diff --git a/dbaccess/source/core/inc/statement.hxx b/dbaccess/source/core/inc/statement.hxx index f841554..5b950a9 100644 --- a/dbaccess/source/core/inc/statement.hxx +++ b/dbaccess/source/core/inc/statement.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -73,7 +73,7 @@ protected: public: OStatementBase(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > & _xConn, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & _xStatement); - + // ::com::sun::star::lang::XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException); diff --git a/dbaccess/source/core/inc/table.hxx b/dbaccess/source/core/inc/table.hxx index ec35f80..c5e8e07 100644 --- a/dbaccess/source/core/inc/table.hxx +++ b/dbaccess/source/core/inc/table.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/core/inc/tablecontainer.hxx b/dbaccess/source/core/inc/tablecontainer.hxx index 592f1e9..7b4ff37 100644 --- a/dbaccess/source/core/inc/tablecontainer.hxx +++ b/dbaccess/source/core/inc/tablecontainer.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,14 +55,14 @@ namespace dbaccess class OTable; class OTableContainer; class OContainerMediator; - + class OTableContainer : public OFilteredContainer, public OTableContainer_Base { ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > m_xTableDefinitions; ::rtl::Reference< OContainerMediator > m_pTableMediator; sal_Bool m_bInDrop; // set when we are in the drop method - + // OFilteredContainer virtual void addMasterContainerListener(); diff --git a/dbaccess/source/core/inc/userinformation.hxx b/dbaccess/source/core/inc/userinformation.hxx index 3139955..1792803 100644 --- a/dbaccess/source/core/inc/userinformation.hxx +++ b/dbaccess/source/core/inc/userinformation.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/core/inc/veto.hxx b/dbaccess/source/core/inc/veto.hxx index d87d9d0..ffdbf70 100644 --- a/dbaccess/source/core/inc/veto.hxx +++ b/dbaccess/source/core/inc/veto.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,10 +34,8 @@ #include -//........................................................................ namespace dbaccess { -//........................................................................ //==================================================================== //= Veto @@ -67,9 +65,6 @@ namespace dbaccess Veto& operator=( const Veto& ); // never implemented }; -//........................................................................ } // namespace dbaccess -//........................................................................ #endif // DBACCESS_VETO_HXX - diff --git a/dbaccess/source/core/inc/viewcontainer.hxx b/dbaccess/source/core/inc/viewcontainer.hxx index cb2c6bd..4f617ff 100644 --- a/dbaccess/source/core/inc/viewcontainer.hxx +++ b/dbaccess/source/core/inc/viewcontainer.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -78,7 +78,7 @@ namespace dbaccess oslInterlockedCount& _nInAppend ); - virtual ~OViewContainer(); + virtual ~OViewContainer(); protected: // OFilteredContainer overridables -- 1.7.1