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
@@ -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