[Libreoffice-commits] .: 3 commits - dbaccess/source
Cédric Bosdonnat
cbosdo at kemper.freedesktop.org
Wed Oct 13 03:26:47 PDT 2010
dbaccess/source/core/api/BookmarkSet.cxx | 33 -
dbaccess/source/core/api/BookmarkSet.hxx | 2
dbaccess/source/core/api/CIndexColumn.hxx | 2
dbaccess/source/core/api/CIndexes.cxx | 15
dbaccess/source/core/api/CIndexes.hxx | 2
dbaccess/source/core/api/CRowSetColumn.cxx | 13
dbaccess/source/core/api/CRowSetColumn.hxx | 4
dbaccess/source/core/api/CRowSetDataColumn.cxx | 34 -
dbaccess/source/core/api/CRowSetDataColumn.hxx | 8
dbaccess/source/core/api/CacheSet.cxx | 151 ++----
dbaccess/source/core/api/CacheSet.hxx | 6
dbaccess/source/core/api/FilteredContainer.cxx | 30 -
dbaccess/source/core/api/HelperCollections.cxx | 11
dbaccess/source/core/api/HelperCollections.hxx | 4
dbaccess/source/core/api/KeySet.cxx | 156 +++---
dbaccess/source/core/api/KeySet.hxx | 27 -
dbaccess/source/core/api/OptimisticSet.cxx | 72 +--
dbaccess/source/core/api/OptimisticSet.hxx | 17
dbaccess/source/core/api/PrivateRow.cxx | 2
dbaccess/source/core/api/PrivateRow.hxx | 2
dbaccess/source/core/api/RowSet.cxx | 314 +++++---------
dbaccess/source/core/api/RowSet.hxx | 2
dbaccess/source/core/api/RowSetBase.cxx | 194 ++++----
dbaccess/source/core/api/RowSetBase.hxx | 11
dbaccess/source/core/api/RowSetCache.cxx | 115 ++---
dbaccess/source/core/api/RowSetCache.hxx | 2
dbaccess/source/core/api/RowSetCacheIterator.cxx | 32 -
dbaccess/source/core/api/RowSetCacheIterator.hxx | 10
dbaccess/source/core/api/RowSetRow.hxx | 9
dbaccess/source/core/api/SingleSelectQueryComposer.cxx | 136 ++----
dbaccess/source/core/api/StaticSet.cxx | 75 +--
dbaccess/source/core/api/StaticSet.hxx | 3
dbaccess/source/core/api/TableDeco.cxx | 185 +++-----
dbaccess/source/core/api/View.cxx | 22
dbaccess/source/core/api/WrappedResultSet.cxx | 33 -
dbaccess/source/core/api/WrappedResultSet.hxx | 2
dbaccess/source/core/api/callablestatement.cxx | 32 -
dbaccess/source/core/api/column.cxx | 48 --
dbaccess/source/core/api/columnsettings.cxx | 9
dbaccess/source/core/api/datacolumn.cxx | 57 --
dbaccess/source/core/api/datacolumn.hxx | 2
dbaccess/source/core/api/datasettings.cxx | 15
dbaccess/source/core/api/definitioncolumn.cxx | 54 --
dbaccess/source/core/api/makefile.mk | 2
dbaccess/source/core/api/preparedstatement.cxx | 43 -
dbaccess/source/core/api/query.cxx | 33 -
dbaccess/source/core/api/query.hxx | 4
dbaccess/source/core/api/querycomposer.cxx | 59 +-
dbaccess/source/core/api/querycontainer.cxx | 46 --
dbaccess/source/core/api/querydescriptor.cxx | 58 --
dbaccess/source/core/api/querydescriptor.hxx | 2
dbaccess/source/core/api/resultcolumn.cxx | 20
dbaccess/source/core/api/resultcolumn.hxx | 2
dbaccess/source/core/api/resultset.cxx | 133 +----
dbaccess/source/core/api/resultset.hxx | 2
dbaccess/source/core/api/statement.cxx | 49 --
dbaccess/source/core/api/table.cxx | 72 +--
dbaccess/source/core/api/tablecontainer.cxx | 50 --
dbaccess/source/core/api/viewcontainer.cxx | 30 -
dbaccess/source/core/dataaccess/ComponentDefinition.cxx | 57 +-
dbaccess/source/core/dataaccess/ComponentDefinition.hxx | 8
dbaccess/source/core/dataaccess/ContentHelper.cxx | 100 +---
dbaccess/source/core/dataaccess/ModelImpl.cxx | 100 ----
dbaccess/source/core/dataaccess/ModelImpl.hxx | 6
dbaccess/source/core/dataaccess/SharedConnection.cxx | 58 --
dbaccess/source/core/dataaccess/SharedConnection.hxx | 21
dbaccess/source/core/dataaccess/bookmarkcontainer.cxx | 35 -
dbaccess/source/core/dataaccess/bookmarkcontainer.hxx | 10
dbaccess/source/core/dataaccess/commandcontainer.cxx | 20
dbaccess/source/core/dataaccess/commandcontainer.hxx | 9
dbaccess/source/core/dataaccess/commanddefinition.cxx | 26 -
dbaccess/source/core/dataaccess/commanddefinition.hxx | 5
dbaccess/source/core/dataaccess/connection.cxx | 82 ---
dbaccess/source/core/dataaccess/connection.hxx | 4
dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx | 25 -
dbaccess/source/core/dataaccess/databasecontext.cxx | 70 ---
dbaccess/source/core/dataaccess/databasecontext.hxx | 3
dbaccess/source/core/dataaccess/databasedocument.cxx | 153 +-----
dbaccess/source/core/dataaccess/databasedocument.hxx | 9
dbaccess/source/core/dataaccess/databaseregistrations.cxx | 37 -
dbaccess/source/core/dataaccess/databaseregistrations.hxx | 6
dbaccess/source/core/dataaccess/datasource.cxx | 100 ----
dbaccess/source/core/dataaccess/datasource.hxx | 6
dbaccess/source/core/dataaccess/definitioncontainer.cxx | 54 --
dbaccess/source/core/dataaccess/documentcontainer.cxx | 75 +--
dbaccess/source/core/dataaccess/documentcontainer.hxx | 7
dbaccess/source/core/dataaccess/documentdefinition.cxx | 113 +----
dbaccess/source/core/dataaccess/documentdefinition.hxx | 7
dbaccess/source/core/dataaccess/documenteventexecutor.cxx | 16
dbaccess/source/core/dataaccess/documenteventexecutor.hxx | 6
dbaccess/source/core/dataaccess/documenteventnotifier.cxx | 24 -
dbaccess/source/core/dataaccess/documenteventnotifier.hxx | 6
dbaccess/source/core/dataaccess/documentevents.cxx | 30 -
dbaccess/source/core/dataaccess/documentevents.hxx | 6
dbaccess/source/core/dataaccess/intercept.cxx | 15
dbaccess/source/core/dataaccess/intercept.hxx | 86 +--
dbaccess/source/core/dataaccess/makefile.mk | 2
dbaccess/source/core/dataaccess/myucp_datasupplier.cxx | 37 -
dbaccess/source/core/dataaccess/myucp_datasupplier.hxx | 2
dbaccess/source/core/dataaccess/myucp_resultset.cxx | 7
dbaccess/source/core/dataaccess/myucp_resultset.hxx | 2
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
dbaccess/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
dbaccess/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
137 files changed, 1395 insertions(+), 2854 deletions(-)
New commits:
commit 5bf1c6b7723abeaa26260d2b56dbba6359038867
Author: Gil Forcada <gforcada at gnome.org>
Date: Wed Oct 13 00:09:16 2010 +0200
Removed comments, trailing spaces and death code (3)
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 <cppuhelper/weak.hxx>
-//........................................................................
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 <map>
-//........................................................................
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 <vector>
-//........................................................................
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 <comphelper/uno3.hxx>
#include <cppuhelper/implbase1.hxx>
-//........................................................................
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 <com/sun/star/beans/XPropertySet.hpp>
/** === 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 <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/beans/PropertyValue.hpp>
-//........................................................................
namespace dbaccess
{
-//........................................................................
//==========================================================================
//= OCommandBase - a base class (in fact just a container for some members)
@@ -44,7 +42,7 @@ class OCommandBase
{
public: // need public access
// <properties>
- ::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 <functional>
-//........................................................................
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 <boost/shared_ptr.hpp>
-//........................................................................
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 <svl/solar.hrc>
#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 <sal/macros.h>
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 <rtl/ustring.hxx>
#include <comphelper/propertystatecontainer.hxx>
-//........................................................................
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 <comphelper/uno3.hxx>
#include <rtl/ref.hxx>
#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 <unotools/componentresmodule.hxx>
-//........................................................................
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 <com/sun/star/sdbc/XConnection.hpp>
/** === 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 <NULL/>)
-
+
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.</p>
@@ -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 <cppuhelper/implbase1.hxx>
-//........................................................................
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
commit f061cefaf96f4937b58d0e2ba4fa5bf5187b2d6a
Author: Gil Forcada <gforcada at gnome.org>
Date: Tue Oct 12 23:48:07 2010 +0200
Removed comments, trailing spaces and death code (2)
diff --git a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
index f1d8b70..df7a854 100644
--- a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
+++ b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -58,10 +58,9 @@ extern "C" void SAL_CALL createRegistryInfo_OComponentDefinition()
static ::dba::OAutoRegistration< ::dbaccess::OComponentDefinition > aAutoRegistration;
}
-//........................................................................
namespace dbaccess
{
-//........................................................................
+
/// helper class for column property change events which holds the OComponentDefinition weak
typedef ::cppu::WeakImplHelper1 < XPropertyChangeListener > TColumnPropertyListener_BASE;
class OColumnPropertyListener : public TColumnPropertyListener_BASE
@@ -86,22 +85,22 @@ public:
}
void clear() { m_pComponent = NULL; }
};
-DBG_NAME(OComponentDefinition_Impl)
+DBG_NAME(OComponentDefinition_Impl)
OComponentDefinition_Impl::OComponentDefinition_Impl()
{
DBG_CTOR(OComponentDefinition_Impl,NULL);
}
-// -----------------------------------------------------------------------------
+
OComponentDefinition_Impl::~OComponentDefinition_Impl()
{
- DBG_DTOR(OComponentDefinition_Impl,NULL);
+ DBG_DTOR(OComponentDefinition_Impl,NULL);
}
//==========================================================================
//= OComponentDefinition
//==========================================================================
-//--------------------------------------------------------------------------
+
DBG_NAME(OComponentDefinition)
-//--------------------------------------------------------------------------
+
void OComponentDefinition::registerProperties()
{
m_xColumnPropertyListener = ::comphelper::ImplementationReference<OColumnPropertyListener,XPropertyChangeListener>(new OColumnPropertyListener(this));
@@ -121,7 +120,6 @@ void OComponentDefinition::registerProperties()
}
}
-//--------------------------------------------------------------------------
OComponentDefinition::OComponentDefinition(const Reference< XMultiServiceFactory >& _xORB
,const Reference< XInterface >& _xParentContainer
,const TContentPtr& _pImpl
@@ -133,13 +131,13 @@ OComponentDefinition::OComponentDefinition(const Reference< XMultiServiceFactory
DBG_CTOR(OComponentDefinition, NULL);
registerProperties();
}
-//--------------------------------------------------------------------------
+
OComponentDefinition::~OComponentDefinition()
{
DBG_DTOR(OComponentDefinition, NULL);
}
-//--------------------------------------------------------------------------
+
OComponentDefinition::OComponentDefinition( const Reference< XInterface >& _rxContainer
,const ::rtl::OUString& _rElementName
,const Reference< XMultiServiceFactory >& _xORB
@@ -156,44 +154,40 @@ OComponentDefinition::OComponentDefinition( const Reference< XInterface >& _rxCo
DBG_ASSERT(m_pImpl->m_aProps.aTitle.getLength() != 0, "OComponentDefinition::OComponentDefinition : invalid name !");
}
-//--------------------------------------------------------------------------
IMPLEMENT_IMPLEMENTATION_ID(OComponentDefinition);
IMPLEMENT_GETTYPES3(OComponentDefinition,ODataSettings,OContentHelper,OComponentDefinition_BASE);
IMPLEMENT_FORWARD_XINTERFACE3( OComponentDefinition,OContentHelper,ODataSettings,OComponentDefinition_BASE)
-//--------------------------------------------------------------------------
+
::rtl::OUString OComponentDefinition::getImplementationName_static( ) throw(RuntimeException)
{
return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.dba.OComponentDefinition"));
}
-//--------------------------------------------------------------------------
::rtl::OUString SAL_CALL OComponentDefinition::getImplementationName( ) throw(RuntimeException)
{
return getImplementationName_static();
}
-//--------------------------------------------------------------------------
Sequence< ::rtl::OUString > OComponentDefinition::getSupportedServiceNames_static( ) throw(RuntimeException)
{
Sequence< ::rtl::OUString > aServices(2);
aServices.getArray()[0] = SERVICE_SDB_TABLEDEFINITION;
aServices.getArray()[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.Content"));
-
+
return aServices;
}
-//--------------------------------------------------------------------------
Sequence< ::rtl::OUString > SAL_CALL OComponentDefinition::getSupportedServiceNames( ) throw(RuntimeException)
{
return getSupportedServiceNames_static();
}
-//------------------------------------------------------------------------------
+
Reference< XInterface > OComponentDefinition::Create( const Reference< XComponentContext >& _rxContext )
{
::comphelper::ComponentContext aContext( _rxContext );
return *(new OComponentDefinition( aContext.getLegacyServiceFactory(), NULL, TContentPtr( new OComponentDefinition_Impl ) ) );
}
-// -----------------------------------------------------------------------------
+
void SAL_CALL OComponentDefinition::disposing()
{
OContentHelper::disposing();
@@ -202,26 +196,25 @@ void SAL_CALL OComponentDefinition::disposing()
m_xColumnPropertyListener->clear();
m_xColumnPropertyListener.dispose();
}
-// -----------------------------------------------------------------------------
+
IPropertyArrayHelper& OComponentDefinition::getInfoHelper()
{
return *getArrayHelper();
}
-//--------------------------------------------------------------------------
+
IPropertyArrayHelper* OComponentDefinition::createArrayHelper( ) const
{
Sequence< Property > aProps;
describeProperties(aProps);
return new OPropertyArrayHelper(aProps);
}
-//--------------------------------------------------------------------------
+
Reference< XPropertySetInfo > SAL_CALL OComponentDefinition::getPropertySetInfo( ) throw(RuntimeException)
{
Reference<XPropertySetInfo> xInfo( createPropertySetInfo( getInfoHelper() ) );
return xInfo;
}
-// -----------------------------------------------------------------------------
::rtl::OUString OComponentDefinition::determineContentType() const
{
return m_bTable
@@ -229,7 +222,6 @@ Reference< XPropertySetInfo > SAL_CALL OComponentDefinition::getPropertySetInfo(
: ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "application/vnd.org.openoffice.DatabaseCommandDefinition" ) );
}
-// -----------------------------------------------------------------------------
Reference< XNameAccess> OComponentDefinition::getColumns() throw (RuntimeException)
{
::osl::MutexGuard aGuard(m_aMutex);
@@ -252,7 +244,7 @@ Reference< XNameAccess> OComponentDefinition::getColumns() throw (RuntimeExcepti
}
return m_pColumns.get();
}
-// -----------------------------------------------------------------------------
+
OColumn* OComponentDefinition::createColumn(const ::rtl::OUString& _rName) const
{
const OComponentDefinition_Impl& rDefinition( getDefinition() );
@@ -260,30 +252,30 @@ OColumn* OComponentDefinition::createColumn(const ::rtl::OUString& _rName) const
if ( aFind != rDefinition.end() )
{
aFind->second->addPropertyChangeListener(::rtl::OUString(),m_xColumnPropertyListener.getRef());
- return new OTableColumnWrapper( aFind->second, aFind->second, true );
+ return new OTableColumnWrapper( aFind->second, aFind->second, true );
}
OSL_ENSURE( false, "OComponentDefinition::createColumn: is this a valid case?" );
// This here is the last place creating a OTableColumn, and somehow /me thinks it is not needed ...
return new OTableColumn( _rName );
}
-// -----------------------------------------------------------------------------
+
Reference< XPropertySet > OComponentDefinition::createColumnDescriptor()
{
return new OTableColumnDescriptor( true );
}
-// -----------------------------------------------------------------------------
+
void OComponentDefinition::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) throw (Exception)
{
ODataSettings::setFastPropertyValue_NoBroadcast(nHandle,rValue);
notifyDataSourceModified();
}
-// -----------------------------------------------------------------------------
-void OComponentDefinition::columnDropped(const ::rtl::OUString& _sName)
+
+void OComponentDefinition::columnDropped(const ::rtl::OUString& _sName)
{
getDefinition().erase( _sName );
notifyDataSourceModified();
}
-// -----------------------------------------------------------------------------
+
void OComponentDefinition::columnAppended( const Reference< XPropertySet >& _rxSourceDescriptor )
{
::rtl::OUString sName;
@@ -305,8 +297,5 @@ void OComponentDefinition::columnAppended( const Reference< XPropertySet >& _rxS
notifyDataSourceModified();
}
-//........................................................................
} // namespace dbaccess
-//........................................................................
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/dataaccess/ComponentDefinition.hxx b/dbaccess/source/core/dataaccess/ComponentDefinition.hxx
index cd679a6..bcff733 100644
--- a/dbaccess/source/core/dataaccess/ComponentDefinition.hxx
+++ b/dbaccess/source/core/dataaccess/ComponentDefinition.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
@@ -99,14 +99,14 @@ class OComponentDefinition :public OContentHelper
,public ::comphelper::OPropertyArrayUsageHelper< OComponentDefinition >
{
OComponentDefinition();
-
+
protected:
::std::auto_ptr< OColumns > m_pColumns;
- ::comphelper::ImplementationReference< OColumnPropertyListener,::com::sun::star::beans::XPropertyChangeListener>
+ ::comphelper::ImplementationReference< OColumnPropertyListener,::com::sun::star::beans::XPropertyChangeListener>
m_xColumnPropertyListener;
sal_Bool m_bTable;
- virtual ~OComponentDefinition();
+ virtual ~OComponentDefinition();
virtual void SAL_CALL disposing();
diff --git a/dbaccess/source/core/dataaccess/ContentHelper.cxx b/dbaccess/source/core/dataaccess/ContentHelper.cxx
index 5350e75..824e7ca 100644
--- a/dbaccess/source/core/dataaccess/ContentHelper.cxx
+++ b/dbaccess/source/core/dataaccess/ContentHelper.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -60,18 +60,16 @@ using namespace ::com::sun::star::container;
using namespace ::comphelper;
using namespace ::cppu;
-// -----------------------------------------------------------------------------
DBG_NAME(OContentHelper_Impl)
OContentHelper_Impl::OContentHelper_Impl()
{
- DBG_CTOR(OContentHelper_Impl,NULL);
+ DBG_CTOR(OContentHelper_Impl,NULL);
}
-// -----------------------------------------------------------------------------
+
OContentHelper_Impl::~OContentHelper_Impl()
{
- DBG_DTOR(OContentHelper_Impl,NULL);
+ DBG_DTOR(OContentHelper_Impl,NULL);
}
-// -----------------------------------------------------------------------------
OContentHelper::OContentHelper(const Reference< XMultiServiceFactory >& _xORB
,const Reference< XInterface >& _xParentContainer
@@ -86,7 +84,7 @@ OContentHelper::OContentHelper(const Reference< XMultiServiceFactory >& _xORB
,m_nCommandId(0)
{
}
-//--------------------------------------------------------------------------
+
void SAL_CALL OContentHelper::disposing()
{
::osl::MutexGuard aGuard(m_aMutex);
@@ -97,10 +95,10 @@ void SAL_CALL OContentHelper::disposing()
m_xParentContainer = NULL;
}
-// -----------------------------------------------------------------------------
+
IMPLEMENT_SERVICE_INFO1(OContentHelper,"com.sun.star.comp.sdb.Content","com.sun.star.ucb.Content");
IMPLEMENT_IMPLEMENTATION_ID(OContentHelper)
-// -----------------------------------------------------------------------------
+
// XContent
Reference< XContentIdentifier > SAL_CALL OContentHelper::getIdentifier( ) throw (RuntimeException)
{
@@ -110,7 +108,7 @@ Reference< XContentIdentifier > SAL_CALL OContentHelper::getIdentifier( ) throw
aIdentifier.append( impl_getHierarchicalName( true ) );
return new ::ucbhelper::ContentIdentifier( m_aContext.getLegacyServiceFactory(), aIdentifier.makeStringAndClear() );
}
-// -----------------------------------------------------------------------------
+
::rtl::OUString OContentHelper::impl_getHierarchicalName( bool _includingRootContainer ) const
{
::rtl::OUStringBuffer aHierarchicalName( m_pImpl->m_aProps.aTitle );
@@ -137,7 +135,6 @@ Reference< XContentIdentifier > SAL_CALL OContentHelper::getIdentifier( ) throw
return sHierarchicalName;
}
-// -----------------------------------------------------------------------------
::rtl::OUString SAL_CALL OContentHelper::getContentType() throw (RuntimeException)
{
::osl::MutexGuard aGuard(m_aMutex);
@@ -149,21 +146,20 @@ Reference< XContentIdentifier > SAL_CALL OContentHelper::getIdentifier( ) throw
return *m_pImpl->m_aProps.aContentType;
}
-// -----------------------------------------------------------------------------
+
void SAL_CALL OContentHelper::addContentEventListener( const Reference< XContentEventListener >& _rxListener ) throw (RuntimeException)
{
::osl::MutexGuard aGuard(m_aMutex);
if ( _rxListener.is() )
m_aContentListeners.addInterface(_rxListener);
}
-// -----------------------------------------------------------------------------
+
void SAL_CALL OContentHelper::removeContentEventListener( const Reference< XContentEventListener >& _rxListener ) throw (RuntimeException)
{
::osl::MutexGuard aGuard(m_aMutex);
if (_rxListener.is())
m_aContentListeners.removeInterface(_rxListener);
}
-// -----------------------------------------------------------------------------
// XCommandProcessor
sal_Int32 SAL_CALL OContentHelper::createCommandIdentifier( ) throw (RuntimeException)
@@ -172,7 +168,7 @@ sal_Int32 SAL_CALL OContentHelper::createCommandIdentifier( ) throw (RuntimeExc
// Just increase counter on every call to generate an identifier.
return ++m_nCommandId;
}
-// -----------------------------------------------------------------------------
+
Any SAL_CALL OContentHelper::execute( const Command& aCommand, sal_Int32 /*CommandId*/, const Reference< XCommandEnvironment >& Environment ) throw (Exception, CommandAbortedException, RuntimeException)
{
Any aRet;
@@ -258,11 +254,10 @@ Any SAL_CALL OContentHelper::execute( const Command& aCommand, sal_Int32 /*Comma
return aRet;
}
-// -----------------------------------------------------------------------------
+
void SAL_CALL OContentHelper::abort( sal_Int32 /*CommandId*/ ) throw (RuntimeException)
{
}
-// -----------------------------------------------------------------------------
// XPropertiesChangeNotifier
void SAL_CALL OContentHelper::addPropertiesChangeListener( const Sequence< ::rtl::OUString >& PropertyNames, const Reference< XPropertiesChangeListener >& Listener ) throw (RuntimeException)
@@ -286,7 +281,7 @@ void SAL_CALL OContentHelper::addPropertiesChangeListener( const Sequence< ::rtl
}
}
}
-// -----------------------------------------------------------------------------
+
void SAL_CALL OContentHelper::removePropertiesChangeListener( const Sequence< ::rtl::OUString >& PropertyNames, const Reference< XPropertiesChangeListener >& Listener ) throw (RuntimeException)
{
::osl::MutexGuard aGuard(m_aMutex);
@@ -308,19 +303,18 @@ void SAL_CALL OContentHelper::removePropertiesChangeListener( const Sequence< ::
}
}
}
-// -----------------------------------------------------------------------------
// XPropertyContainer
-void SAL_CALL OContentHelper::addProperty( const ::rtl::OUString& /*Name*/, sal_Int16 /*Attributes*/, const Any& /*DefaultValue*/ ) throw (PropertyExistException, IllegalTypeException, IllegalArgumentException, RuntimeException)
+void SAL_CALL OContentHelper::addProperty( const ::rtl::OUString& /*Name*/, sal_Int16 /*Attributes*/, const Any& /*DefaultValue*/ ) throw (PropertyExistException, IllegalTypeException, IllegalArgumentException, RuntimeException)
{
DBG_ERROR( "OContentHelper::addProperty: not implemented!" );
}
-// -----------------------------------------------------------------------------
+
void SAL_CALL OContentHelper::removeProperty( const ::rtl::OUString& /*Name*/ ) throw (UnknownPropertyException, NotRemoveableException, RuntimeException)
{
DBG_ERROR( "OContentHelper::removeProperty: not implemented!" );
}
-// -----------------------------------------------------------------------------
+
// XInitialization
void SAL_CALL OContentHelper::initialize( const Sequence< Any >& _aArguments ) throw(Exception, RuntimeException)
{
@@ -344,7 +338,7 @@ void SAL_CALL OContentHelper::initialize( const Sequence< Any >& _aArguments ) t
}
}
}
-// -----------------------------------------------------------------------------
+
Sequence< Any > OContentHelper::setPropertyValues(const Sequence< PropertyValue >& rValues,const Reference< XCommandEnvironment >& /*xEnv*/ )
{
osl::ClearableGuard< osl::Mutex > aGuard( m_aMutex );
@@ -456,7 +450,7 @@ Sequence< Any > OContentHelper::setPropertyValues(const Sequence< PropertyValue
return aRet;
}
-// -----------------------------------------------------------------------------
+
//=========================================================================
// static
Reference< XRow > OContentHelper::getPropertyValues( const Sequence< Property >& rProperties)
@@ -539,8 +533,7 @@ Reference< XRow > OContentHelper::getPropertyValues( const Sequence< Property >&
return Reference< XRow >( xRow.get() );
}
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
+
void OContentHelper::notifyPropertiesChange( const Sequence< PropertyChangeEvent >& evt ) const
{
@@ -564,7 +557,6 @@ void OContentHelper::notifyPropertiesChange( const Sequence< PropertyChangeEvent
typedef Sequence< PropertyChangeEvent > PropertyEventSequence;
typedef ::std::map< XPropertiesChangeListener*, PropertyEventSequence* > PropertiesEventListenerMap;
PropertiesEventListenerMap aListeners;
-
const PropertyChangeEvent* propertyChangeEvent = evt.getConstArray();
@@ -618,9 +610,8 @@ void OContentHelper::notifyPropertiesChange( const Sequence< PropertyChangeEvent
}
}
}
-// -----------------------------------------------------------------------------
+
// com::sun::star::lang::XUnoTunnel
-//------------------------------------------------------------------
sal_Int64 OContentHelper::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException)
{
if (rId.getLength() == 16 && 0 == rtl_compareMemory(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) )
@@ -629,7 +620,6 @@ sal_Int64 OContentHelper::getSomething( const Sequence< sal_Int8 > & rId ) throw
return 0;
}
-// -----------------------------------------------------------------------------
OContentHelper* OContentHelper::getImplementation( const Reference< XInterface >& _rxComponent )
{
OContentHelper* pContent( NULL );
@@ -641,20 +631,18 @@ OContentHelper* OContentHelper::getImplementation( const Reference< XInterface >
return pContent;
}
-// -----------------------------------------------------------------------------
Reference< XInterface > SAL_CALL OContentHelper::getParent( ) throw (RuntimeException)
{
::osl::MutexGuard aGuard(m_aMutex);
return m_xParentContainer;
}
-// -----------------------------------------------------------------------------
+
void SAL_CALL OContentHelper::setParent( const Reference< XInterface >& _xParent ) throw (NoSupportException, RuntimeException)
{
::osl::MutexGuard aGuard(m_aMutex);
m_xParentContainer = _xParent;
}
-// -----------------------------------------------------------------------------
void OContentHelper::impl_rename_throw(const ::rtl::OUString& _sNewName,bool _bNotify )
{
osl::ClearableGuard< osl::Mutex > aGuard(m_aMutex);
@@ -670,9 +658,9 @@ void OContentHelper::impl_rename_throw(const ::rtl::OUString& _sNewName,bool _bN
aChanges[0].PropertyHandle = PROPERTY_ID_NAME;
aChanges[0].OldValue <<= m_pImpl->m_aProps.aTitle;
aChanges[0].NewValue <<= _sNewName;
-
+
aGuard.clear();
-
+
m_pImpl->m_aProps.aTitle = _sNewName;
if ( _bNotify )
notifyPropertiesChange( aChanges );
@@ -683,50 +671,18 @@ void OContentHelper::impl_rename_throw(const ::rtl::OUString& _sNewName,bool _bN
throw ElementExistException(_sNewName,*this);
}
}
-// -----------------------------------------------------------------------------
+
void SAL_CALL OContentHelper::rename( const ::rtl::OUString& newName ) throw (SQLException, ElementExistException, RuntimeException)
{
-
+
impl_rename_throw(newName);
- //Reference<XNameContainer> xNameCont(m_xParentContainer,UNO_QUERY);
- //if ( xNameCont.is() )
- //{
- // if ( xNameCont->hasByName(newName) )
- // throw ElementExistException(newName,*this);
-
- // try
- // {
- // if ( xNameCont->hasByName(m_pImpl->m_aProps.aTitle) )
- // xNameCont->removeByName(m_pImpl->m_aProps.aTitle);
-
- // m_pImpl->m_aProps.aTitle = newName;
- // xNameCont->insertByName(m_pImpl->m_aProps.aTitle,makeAny(Reference<XContent>(*this,UNO_QUERY)));
- // notifyDataSourceModified();
- // }
- // catch(IllegalArgumentException)
- // {
- // throw SQLException();
- // }
- // catch(NoSuchElementException)
- // {
- // throw SQLException();
- // }
- // catch(WrappedTargetException)
- // {
- // throw SQLException();
- // }
- //}
- //else
- // m_pImpl->m_aProps.aTitle = newName;
-
+
}
-// -----------------------------------------------------------------------------
+
void OContentHelper::notifyDataSourceModified()
{
::dbaccess::notifyDataSourceModified(m_xParentContainer,sal_True);
}
-//........................................................................
-} // namespace dbaccess
-//........................................................................
+} // namespace dbaccess
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx b/dbaccess/source/core/dataaccess/ModelImpl.cxx
index d1951c5..30f005d 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.cxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -95,33 +95,27 @@ using namespace ::dbtools;
using namespace ::comphelper;
namespace css = ::com::sun::star;
-//........................................................................
namespace dbaccess
{
-//........................................................................
//============================================================
//= VosMutexFacade
//============================================================
-//------------------------------------------------------------------------
VosMutexFacade::VosMutexFacade( ::osl::Mutex& _rMutex )
:m_rMutex( _rMutex )
{
}
-//------------------------------------------------------------------------
void SAL_CALL VosMutexFacade::acquire()
{
m_rMutex.acquire();
}
-//------------------------------------------------------------------------
sal_Bool SAL_CALL VosMutexFacade::tryToAcquire()
{
return m_rMutex.tryToAcquire();
}
-//------------------------------------------------------------------------
void SAL_CALL VosMutexFacade::release()
{
m_rMutex.release();
@@ -201,7 +195,6 @@ private:
};
-//--------------------------------------------------------------------------
void DocumentStorageAccess::dispose()
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -228,7 +221,6 @@ void DocumentStorageAccess::dispose()
m_pModelImplementation = NULL;
}
-//--------------------------------------------------------------------------
Reference< XStorage > DocumentStorageAccess::impl_openSubStorage_nothrow( const ::rtl::OUString& _rStorageName, sal_Int32 _nDesiredMode )
{
OSL_ENSURE( _rStorageName.getLength(),"ODatabaseModelImpl::impl_openSubStorage_nothrow: Invalid storage name!" );
@@ -262,7 +254,6 @@ Reference< XStorage > DocumentStorageAccess::impl_openSubStorage_nothrow( const
return xStorage;
}
-//--------------------------------------------------------------------------
void DocumentStorageAccess::disposeStorages()
{
m_bDisposingSubStorages = true;
@@ -287,7 +278,6 @@ void DocumentStorageAccess::disposeStorages()
m_bDisposingSubStorages = false;
}
-//--------------------------------------------------------------------------
void DocumentStorageAccess::commitStorages() SAL_THROW(( IOException, RuntimeException ))
{
try
@@ -307,7 +297,6 @@ void DocumentStorageAccess::commitStorages() SAL_THROW(( IOException, RuntimeExc
}
}
-//--------------------------------------------------------------------------
bool DocumentStorageAccess::commitEmbeddedStorage( bool _bPreventRootCommits )
{
if ( _bPreventRootCommits )
@@ -332,7 +321,6 @@ bool DocumentStorageAccess::commitEmbeddedStorage( bool _bPreventRootCommits )
}
-//--------------------------------------------------------------------------
Reference< XStorage > SAL_CALL DocumentStorageAccess::getDocumentSubStorage( const ::rtl::OUString& aStorageName, ::sal_Int32 _nDesiredMode ) throw (RuntimeException)
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -346,7 +334,6 @@ Reference< XStorage > SAL_CALL DocumentStorageAccess::getDocumentSubStorage( con
return pos->second;
}
-//--------------------------------------------------------------------------
Sequence< ::rtl::OUString > SAL_CALL DocumentStorageAccess::getDocumentSubStoragesNames( ) throw (IOException, RuntimeException)
{
Reference< XStorage > xRootStor( m_pModelImplementation->getRootStorage() );
@@ -367,13 +354,11 @@ Sequence< ::rtl::OUString > SAL_CALL DocumentStorageAccess::getDocumentSubStorag
: Sequence< ::rtl::OUString >( &aNames[0], aNames.size() );
}
-//--------------------------------------------------------------------------
void SAL_CALL DocumentStorageAccess::preCommit( const css::lang::EventObject& /*aEvent*/ ) throw (Exception, RuntimeException)
{
// not interested in
}
-//--------------------------------------------------------------------------
void SAL_CALL DocumentStorageAccess::commited( const css::lang::EventObject& aEvent ) throw (RuntimeException)
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -397,19 +382,16 @@ void SAL_CALL DocumentStorageAccess::commited( const css::lang::EventObject& aEv
}
}
-//--------------------------------------------------------------------------
void SAL_CALL DocumentStorageAccess::preRevert( const css::lang::EventObject& /*aEvent*/ ) throw (Exception, RuntimeException)
{
// not interested in
}
-//--------------------------------------------------------------------------
void SAL_CALL DocumentStorageAccess::reverted( const css::lang::EventObject& /*aEvent*/ ) throw (RuntimeException)
{
// not interested in
}
-//--------------------------------------------------------------------------
void SAL_CALL DocumentStorageAccess::disposing( const css::lang::EventObject& Source ) throw ( RuntimeException )
{
OSL_ENSURE( Reference< XStorage >( Source.Source, UNO_QUERY ).is(), "DocumentStorageAccess::disposing: No storage? What's this?" );
@@ -432,7 +414,7 @@ void SAL_CALL DocumentStorageAccess::disposing( const css::lang::EventObject& So
//= ODatabaseModelImpl
//============================================================
DBG_NAME(ODatabaseModelImpl)
-//--------------------------------------------------------------------------
+
ODatabaseModelImpl::ODatabaseModelImpl( const Reference< XMultiServiceFactory >& _rxFactory, ODatabaseContext& _rDBContext )
:m_xModel()
,m_xDataSource()
@@ -465,7 +447,6 @@ ODatabaseModelImpl::ODatabaseModelImpl( const Reference< XMultiServiceFactory >&
impl_construct_nothrow();
}
-//--------------------------------------------------------------------------
ODatabaseModelImpl::ODatabaseModelImpl(
const ::rtl::OUString& _rRegistrationName,
const Reference< XMultiServiceFactory >& _rxFactory,
@@ -499,13 +480,11 @@ ODatabaseModelImpl::ODatabaseModelImpl(
impl_construct_nothrow();
}
-//--------------------------------------------------------------------------
ODatabaseModelImpl::~ODatabaseModelImpl()
{
DBG_DTOR(ODatabaseModelImpl,NULL);
}
-// -----------------------------------------------------------------------------
void ODatabaseModelImpl::impl_construct_nothrow()
{
// create the property bag to hold the settings (also known as "Info" property)
@@ -566,10 +545,8 @@ void ODatabaseModelImpl::impl_construct_nothrow()
m_pDBContext->appendAtTerminateListener(*this);
}
-// -----------------------------------------------------------------------------
namespace
{
- // .........................................................................
::rtl::OUString lcl_getContainerStorageName_throw( ODatabaseModelImpl::ObjectType _eType )
{
const sal_Char* pAsciiName( NULL );
@@ -585,7 +562,6 @@ namespace
return ::rtl::OUString::createFromAscii( pAsciiName );
}
- // .........................................................................
bool lcl_hasObjectWithMacros_throw( const ODefinitionContainer_Impl& _rObjectDefinitions, const Reference< XStorage >& _rxContainerStorage )
{
bool bSomeDocHasMacros = false;
@@ -614,7 +590,6 @@ namespace
return bSomeDocHasMacros;
}
- // .........................................................................
bool lcl_hasObjectsWithMacros_nothrow( ODatabaseModelImpl& _rModel, const ODatabaseModelImpl::ObjectType _eType )
{
bool bSomeDocHasMacros = false;
@@ -648,7 +623,6 @@ namespace
}
}
-// -----------------------------------------------------------------------------
bool ODatabaseModelImpl::objectHasMacros( const Reference< XStorage >& _rxContainerStorage, const ::rtl::OUString& _rPersistentName )
{
OSL_PRECOND( _rxContainerStorage.is(), "ODatabaseModelImpl::objectHasMacros: this will crash!" );
@@ -671,7 +645,6 @@ bool ODatabaseModelImpl::objectHasMacros( const Reference< XStorage >& _rxContai
return bHasMacros;
}
-// -----------------------------------------------------------------------------
void ODatabaseModelImpl::reset()
{
m_bReadOnly = sal_False;
@@ -685,7 +658,7 @@ void ODatabaseModelImpl::reset()
m_pStorageAccess = NULL;
}
}
-// -----------------------------------------------------------------------------
+
void SAL_CALL ODatabaseModelImpl::disposing( const ::com::sun::star::lang::EventObject& Source ) throw(RuntimeException)
{
Reference<XConnection> xCon(Source.Source,UNO_QUERY);
@@ -711,7 +684,7 @@ void SAL_CALL ODatabaseModelImpl::disposing( const ::com::sun::star::lang::Event
OSL_ENSURE( false, "ODatabaseModelImpl::disposing: where does this come from?" );
}
}
-//------------------------------------------------------------------------------
+
void ODatabaseModelImpl::clearConnections()
{
OWeakConnectionArray aConnections;
@@ -738,7 +711,7 @@ void ODatabaseModelImpl::clearConnections()
m_pSharedConnectionManager = NULL;
m_xSharedConnectionManager = NULL;
}
-//------------------------------------------------------------------------------
+
void ODatabaseModelImpl::dispose()
{
// dispose the data source and the model
@@ -793,7 +766,7 @@ void ODatabaseModelImpl::dispose()
m_pStorageAccess = NULL;
}
}
-// -----------------------------------------------------------------------------
+
const Reference< XNumberFormatsSupplier > & ODatabaseModelImpl::getNumberFormatsSupplier()
{
if (!m_xNumberFormatsSupplier.is())
@@ -810,14 +783,12 @@ const Reference< XNumberFormatsSupplier > & ODatabaseModelImpl::getNumberFormats
return m_xNumberFormatsSupplier;
}
-// -----------------------------------------------------------------------------
void ODatabaseModelImpl::setDocFileLocation( const ::rtl::OUString& i_rLoadedFrom )
{
ENSURE_OR_THROW( i_rLoadedFrom.getLength(), "invalid URL" );
m_sDocFileLocation = i_rLoadedFrom;
}
-// -----------------------------------------------------------------------------
void ODatabaseModelImpl::setResource( const ::rtl::OUString& i_rDocumentURL, const Sequence< PropertyValue >& _rArgs )
{
ENSURE_OR_THROW( i_rDocumentURL.getLength(), "invalid URL" );
@@ -842,7 +813,6 @@ void ODatabaseModelImpl::setResource( const ::rtl::OUString& i_rDocumentURL, con
impl_switchToLogicalURL( i_rDocumentURL );
}
-// -----------------------------------------------------------------------------
::comphelper::NamedValueCollection ODatabaseModelImpl::stripLoadArguments( const ::comphelper::NamedValueCollection& _rArguments )
{
OSL_ENSURE( !_rArguments.has( "Model" ), "ODatabaseModelImpl::stripLoadArguments: this is suspicious (1)!" );
@@ -854,18 +824,16 @@ void ODatabaseModelImpl::setResource( const ::rtl::OUString& i_rDocumentURL, con
return aMutableArgs;
}
-// -----------------------------------------------------------------------------
void ODatabaseModelImpl::disposeStorages() SAL_THROW(())
{
getDocumentStorageAccess()->disposeStorages();
}
-// -----------------------------------------------------------------------------
Reference< XSingleServiceFactory > ODatabaseModelImpl::createStorageFactory() const
{
return Reference< XSingleServiceFactory >( m_aContext.createComponent( "com.sun.star.embed.StorageFactory" ), UNO_QUERY_THROW );
}
-// -----------------------------------------------------------------------------
+
void ODatabaseModelImpl::commitRootStorage()
{
Reference< XStorage > xStorage( getOrCreateRootStorage() );
@@ -876,7 +844,7 @@ void ODatabaseModelImpl::commitRootStorage()
OSL_ENSURE( bSuccess || !xStorage.is(),
"ODatabaseModelImpl::commitRootStorage: could commit the storage!" );
}
-// -----------------------------------------------------------------------------
+
Reference< XStorage > ODatabaseModelImpl::getOrCreateRootStorage()
{
if ( !m_xDocumentStorage.is() )
@@ -925,7 +893,7 @@ Reference< XStorage > ODatabaseModelImpl::getOrCreateRootStorage()
}
return m_xDocumentStorage.getTyped();
}
-// -----------------------------------------------------------------------------
+
DocumentStorageAccess* ODatabaseModelImpl::getDocumentStorageAccess()
{
if ( !m_pStorageAccess )
@@ -936,7 +904,6 @@ DocumentStorageAccess* ODatabaseModelImpl::getDocumentStorageAccess()
return m_pStorageAccess;
}
-// -----------------------------------------------------------------------------
void ODatabaseModelImpl::modelIsDisposing( const bool _wasInitialized, ResetModelAccess )
{
m_xModel = Reference< XModel >();
@@ -950,19 +917,16 @@ void ODatabaseModelImpl::modelIsDisposing( const bool _wasInitialized, ResetMode
m_bDocumentInitialized = _wasInitialized;
}
-// -----------------------------------------------------------------------------
Reference< XDocumentSubStorageSupplier > ODatabaseModelImpl::getDocumentSubStorageSupplier()
{
return getDocumentStorageAccess();
}
-// -----------------------------------------------------------------------------
bool ODatabaseModelImpl::commitEmbeddedStorage( bool _bPreventRootCommits )
{
return getDocumentStorageAccess()->commitEmbeddedStorage( _bPreventRootCommits );
}
-// -----------------------------------------------------------------------------
bool ODatabaseModelImpl::commitStorageIfWriteable_ignoreErrors( const Reference< XStorage >& _rxStorage ) SAL_THROW(())
{
bool bSuccess = false;
@@ -976,7 +940,7 @@ bool ODatabaseModelImpl::commitStorageIfWriteable_ignoreErrors( const Reference<
}
return bSuccess;
}
-// -----------------------------------------------------------------------------
+
void ODatabaseModelImpl::setModified( sal_Bool _bModified )
{
if ( isModifyLocked() )
@@ -996,7 +960,6 @@ void ODatabaseModelImpl::setModified( sal_Bool _bModified )
}
}
-// -----------------------------------------------------------------------------
Reference<XDataSource> ODatabaseModelImpl::getOrCreateDataSource()
{
Reference<XDataSource> xDs = m_xDataSource;
@@ -1007,12 +970,12 @@ Reference<XDataSource> ODatabaseModelImpl::getOrCreateDataSource()
}
return xDs;
}
-// -----------------------------------------------------------------------------
+
Reference< XModel> ODatabaseModelImpl::getModel_noCreate() const
{
return m_xModel;
}
-// -----------------------------------------------------------------------------
+
Reference< XModel > ODatabaseModelImpl::createNewModel_deliverOwnership( bool _bInitialize )
{
Reference< XModel > xModel( m_xModel );
@@ -1062,12 +1025,12 @@ Reference< XModel > ODatabaseModelImpl::createNewModel_deliverOwnership( bool _b
}
return xModel;
}
-// -----------------------------------------------------------------------------
+
oslInterlockedCount SAL_CALL ODatabaseModelImpl::acquire()
{
return osl_incrementInterlockedCount(&m_refCount);
}
-// -----------------------------------------------------------------------------
+
oslInterlockedCount SAL_CALL ODatabaseModelImpl::release()
{
if ( osl_decrementInterlockedCount(&m_refCount) == 0 )
@@ -1082,19 +1045,17 @@ oslInterlockedCount SAL_CALL ODatabaseModelImpl::release()
}
return m_refCount;
}
-// -----------------------------------------------------------------------------
+
void ODatabaseModelImpl::commitStorages() SAL_THROW(( IOException, RuntimeException ))
{
getDocumentStorageAccess()->commitStorages();
}
-// -----------------------------------------------------------------------------
Reference< XStorage > ODatabaseModelImpl::getStorage( const ObjectType _eType, const sal_Int32 _nDesiredMode )
{
return getDocumentStorageAccess()->getDocumentSubStorage( getObjectContainerStorageName( _eType ), _nDesiredMode );
}
-// -----------------------------------------------------------------------------
const AsciiPropertyValue* ODatabaseModelImpl::getDefaultDataSourceSettings()
{
static const AsciiPropertyValue aKnownSettings[] =
@@ -1168,13 +1129,12 @@ const AsciiPropertyValue* ODatabaseModelImpl::getDefaultDataSourceSettings()
AsciiPropertyValue( "Reports", makeAny( ::rtl::OUString() ) ),
AsciiPropertyValue( "KeyAlterationServiceName", makeAny( ::rtl::OUString() ) ),
AsciiPropertyValue( "IndexAlterationServiceName", makeAny( ::rtl::OUString() ) ),
-
+
AsciiPropertyValue()
};
return aKnownSettings;
}
-// -----------------------------------------------------------------------------
TContentPtr& ODatabaseModelImpl::getObjectContainer( ObjectType _eType )
{
OSL_PRECOND( _eType >= E_FORM && _eType <= E_TABLE, "ODatabaseModelImpl::getObjectContainer: illegal index!" );
@@ -1189,20 +1149,17 @@ TContentPtr& ODatabaseModelImpl::getObjectContainer( ObjectType _eType )
return rContentPtr;
}
-// -----------------------------------------------------------------------------
void ODatabaseModelImpl::revokeDataSource() const
{
if ( m_pDBContext && m_sDocumentURL.getLength() )
m_pDBContext->revokeDatabaseDocument( *this );
}
-// -----------------------------------------------------------------------------
bool ODatabaseModelImpl::adjustMacroMode_AutoReject()
{
return m_aMacroMode.adjustMacroMode( NULL );
}
-// -----------------------------------------------------------------------------
bool ODatabaseModelImpl::checkMacrosOnLoading()
{
Reference< XInteractionHandler > xInteraction;
@@ -1210,13 +1167,11 @@ bool ODatabaseModelImpl::checkMacrosOnLoading()
return m_aMacroMode.checkMacrosOnLoading( xInteraction );
}
-// -----------------------------------------------------------------------------
void ODatabaseModelImpl::resetMacroExecutionMode()
{
m_aMacroMode = ::sfx2::DocumentMacroMode( *this );
}
-// -----------------------------------------------------------------------------
Reference< XStorageBasedLibraryContainer > ODatabaseModelImpl::getLibraryContainer( bool _bScript )
{
Reference< XStorageBasedLibraryContainer >& rxContainer( _bScript ? m_xBasicLibraries : m_xDialogLibraries );
@@ -1252,7 +1207,6 @@ Reference< XStorageBasedLibraryContainer > ODatabaseModelImpl::getLibraryContain
return rxContainer;
}
-// -----------------------------------------------------------------------------
void ODatabaseModelImpl::storeLibraryContainersTo( const Reference< XStorage >& _rxToRootStorage )
{
if ( m_xBasicLibraries.is() )
@@ -1262,7 +1216,6 @@ void ODatabaseModelImpl::storeLibraryContainersTo( const Reference< XStorage >&
m_xDialogLibraries->storeLibrariesToStorage( _rxToRootStorage );
}
-// -----------------------------------------------------------------------------
Reference< XStorage > ODatabaseModelImpl::switchToStorage( const Reference< XStorage >& _rxNewRootStorage )
{
if ( !_rxNewRootStorage.is() )
@@ -1271,7 +1224,6 @@ Reference< XStorage > ODatabaseModelImpl::switchToStorage( const Reference< XSto
return impl_switchToStorage_throw( _rxNewRootStorage );
}
-// -----------------------------------------------------------------------------
namespace
{
void lcl_modifyListening( ::sfx2::IModifiableDocument& _rDocument,
@@ -1300,7 +1252,6 @@ namespace
}
}
-// -----------------------------------------------------------------------------
namespace
{
static void lcl_rebaseScriptStorage_throw( const Reference< XStorageBasedLibraryContainer >& _rxContainer,
@@ -1316,7 +1267,6 @@ namespace
}
}
-// -----------------------------------------------------------------------------
Reference< XStorage > ODatabaseModelImpl::impl_switchToStorage_throw( const Reference< XStorage >& _rxNewRootStorage )
{
// stop listening for modifications at the old storage
@@ -1338,7 +1288,6 @@ Reference< XStorage > ODatabaseModelImpl::impl_switchToStorage_throw( const Refe
return m_xDocumentStorage.getTyped();
}
-// -----------------------------------------------------------------------------
void ODatabaseModelImpl::impl_switchToLogicalURL( const ::rtl::OUString& i_rDocumentURL )
{
if ( i_rDocumentURL == m_sDocumentURL )
@@ -1375,13 +1324,11 @@ void ODatabaseModelImpl::impl_switchToLogicalURL( const ::rtl::OUString& i_rDocu
}
}
-// -----------------------------------------------------------------------------
::rtl::OUString ODatabaseModelImpl::getObjectContainerStorageName( const ObjectType _eType )
{
return lcl_getContainerStorageName_throw( _eType );
}
-// -----------------------------------------------------------------------------
sal_Int16 ODatabaseModelImpl::getCurrentMacroExecMode() const
{
sal_Int16 nCurrentMode = MacroExecMode::NEVER_EXECUTE;
@@ -1396,14 +1343,12 @@ sal_Int16 ODatabaseModelImpl::getCurrentMacroExecMode() const
return nCurrentMode;
}
-// -----------------------------------------------------------------------------
sal_Bool ODatabaseModelImpl::setCurrentMacroExecMode( sal_uInt16 nMacroMode )
{
m_aMediaDescriptor.put( "MacroExecutionMode", nMacroMode );
return sal_True;
}
-// -----------------------------------------------------------------------------
::rtl::OUString ODatabaseModelImpl::getDocumentLocation() const
{
return getURL();
@@ -1415,7 +1360,6 @@ sal_Bool ODatabaseModelImpl::setCurrentMacroExecMode( sal_uInt16 nMacroMode )
// this folder is considered to be secure. So, the document URL needs to be used to decide about the security.
}
-// -----------------------------------------------------------------------------
Reference< XStorage > ODatabaseModelImpl::getZipStorageToSign()
{
// we do not support signing the scripting storages, so we're allowed to
@@ -1423,7 +1367,6 @@ Reference< XStorage > ODatabaseModelImpl::getZipStorageToSign()
return Reference< XStorage >();
}
-// -----------------------------------------------------------------------------
ODatabaseModelImpl::EmbeddedMacros ODatabaseModelImpl::determineEmbeddedMacros()
{
if ( !m_aEmbeddedMacros )
@@ -1446,59 +1389,48 @@ ODatabaseModelImpl::EmbeddedMacros ODatabaseModelImpl::determineEmbeddedMacros()
return *m_aEmbeddedMacros;
}
-// -----------------------------------------------------------------------------
sal_Bool ODatabaseModelImpl::documentStorageHasMacros() const
{
const_cast< ODatabaseModelImpl* >( this )->determineEmbeddedMacros();
return ( *m_aEmbeddedMacros != eNoMacros );
}
-// -----------------------------------------------------------------------------
Reference< XEmbeddedScripts > ODatabaseModelImpl::getEmbeddedDocumentScripts() const
{
return Reference< XEmbeddedScripts >( getModel_noCreate(), UNO_QUERY );
}
-// -----------------------------------------------------------------------------
sal_Int16 ODatabaseModelImpl::getScriptingSignatureState()
{
// no support for signatures at the moment
return SIGNATURESTATE_NOSIGNATURES;
}
-// -----------------------------------------------------------------------------
sal_Bool ODatabaseModelImpl::hasTrustedScriptingSignature( sal_Bool /*bAllowUIToAddAuthor*/ )
{
// no support for signatures at the moment
return sal_False;
}
-// -----------------------------------------------------------------------------
void ODatabaseModelImpl::showBrokenSignatureWarning( const Reference< XInteractionHandler >& /*_rxInteraction*/ ) const
{
OSL_ENSURE( false, "ODatabaseModelImpl::showBrokenSignatureWarning: signatures can't be broken - we do not support them!" );
}
-// -----------------------------------------------------------------------------
void ODatabaseModelImpl::storageIsModified()
{
setModified( sal_True );
}
-// -----------------------------------------------------------------------------
ModelDependentComponent::ModelDependentComponent( const ::rtl::Reference< ODatabaseModelImpl >& _model )
:m_pImpl( _model )
,m_aMutex( _model->getSharedMutex() )
{
}
-// -----------------------------------------------------------------------------
ModelDependentComponent::~ModelDependentComponent()
{
}
-//........................................................................
} // namespace dbaccess
-//........................................................................
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.hxx b/dbaccess/source/core/dataaccess/ModelImpl.hxx
index 36fdc42..c461dbb 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.hxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.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
@@ -148,7 +148,7 @@ public:
VosMutexFacade( ::osl::Mutex& _rMutex );
// IMutex
- virtual void SAL_CALL acquire();
+ virtual void SAL_CALL acquire();
virtual sal_Bool SAL_CALL tryToAcquire();
virtual void SAL_CALL release();
@@ -479,7 +479,7 @@ public:
if any of the invoked operations does so
*/
::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >
- switchToStorage(
+ switchToStorage(
const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& _rxNewRootStorage
);
diff --git a/dbaccess/source/core/dataaccess/SharedConnection.cxx b/dbaccess/source/core/dataaccess/SharedConnection.cxx
index 88a16ff..eaa2628 100644
--- a/dbaccess/source/core/dataaccess/SharedConnection.cxx
+++ b/dbaccess/source/core/dataaccess/SharedConnection.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -45,140 +45,124 @@ DBG_NAME(OSharedConnection)
OSharedConnection::OSharedConnection(Reference< XAggregation >& _rxProxyConnection)
: OSharedConnection_BASE(m_aMutex)
{
- DBG_CTOR(OSharedConnection,NULL);
+ DBG_CTOR(OSharedConnection,NULL);
setDelegation(_rxProxyConnection,m_refCount);
}
-// -----------------------------------------------------------------------------
+
OSharedConnection::~OSharedConnection()
{
- DBG_DTOR(OSharedConnection,NULL);
+ DBG_DTOR(OSharedConnection,NULL);
}
-// -----------------------------------------------------------------------------
+
void SAL_CALL OSharedConnection::disposing(void)
{
OSharedConnection_BASE::disposing();
OConnectionWrapper::disposing();
}
-// -----------------------------------------------------------------------------
+
Reference< XStatement > SAL_CALL OSharedConnection::createStatement( ) throw(SQLException, RuntimeException)
{
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(rBHelper.bDisposed);
-
return m_xConnection->createStatement();
}
-// --------------------------------------------------------------------------------
+
Reference< XPreparedStatement > SAL_CALL OSharedConnection::prepareStatement( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException)
{
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(rBHelper.bDisposed);
-
return m_xConnection->prepareStatement(sql);
}
-// --------------------------------------------------------------------------------
+
Reference< XPreparedStatement > SAL_CALL OSharedConnection::prepareCall( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException)
{
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(rBHelper.bDisposed);
-
return m_xConnection->prepareCall(sql);
}
-// --------------------------------------------------------------------------------
+
::rtl::OUString SAL_CALL OSharedConnection::nativeSQL( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException)
{
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(rBHelper.bDisposed);
-
return m_xConnection->nativeSQL(sql);
}
-// --------------------------------------------------------------------------------
+
sal_Bool SAL_CALL OSharedConnection::getAutoCommit( ) throw(SQLException, RuntimeException)
{
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(rBHelper.bDisposed);
-
return m_xConnection->getAutoCommit();
}
-// --------------------------------------------------------------------------------
+
void SAL_CALL OSharedConnection::commit( ) throw(SQLException, RuntimeException)
{
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(rBHelper.bDisposed);
-
m_xConnection->commit();
}
-// --------------------------------------------------------------------------------
+
void SAL_CALL OSharedConnection::rollback( ) throw(SQLException, RuntimeException)
{
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(rBHelper.bDisposed);
-
m_xConnection->rollback();
}
-// --------------------------------------------------------------------------------
+
sal_Bool SAL_CALL OSharedConnection::isClosed( ) throw(SQLException, RuntimeException)
{
::osl::MutexGuard aGuard( m_aMutex );
-
+
return m_xConnection->isClosed();
}
-// --------------------------------------------------------------------------------
+
Reference< XDatabaseMetaData > SAL_CALL OSharedConnection::getMetaData( ) throw(SQLException, RuntimeException)
{
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(rBHelper.bDisposed);
-
+
return m_xConnection->getMetaData();
}
-// --------------------------------------------------------------------------------
+
sal_Bool SAL_CALL OSharedConnection::isReadOnly( ) throw(SQLException, RuntimeException)
-{
+{
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(rBHelper.bDisposed);
-
return m_xConnection->isReadOnly();
}
-// --------------------------------------------------------------------------------
+
::rtl::OUString SAL_CALL OSharedConnection::getCatalog( ) throw(SQLException, RuntimeException)
{
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(rBHelper.bDisposed);
-
return m_xConnection->getCatalog();
}
-// --------------------------------------------------------------------------------
+
sal_Int32 SAL_CALL OSharedConnection::getTransactionIsolation( ) throw(SQLException, RuntimeException)
{
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(rBHelper.bDisposed);
-
return m_xConnection->getTransactionIsolation();
}
-// --------------------------------------------------------------------------------
+
Reference< ::com::sun::star::container::XNameAccess > SAL_CALL OSharedConnection::getTypeMap( ) throw(SQLException, RuntimeException)
{
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(rBHelper.bDisposed);
-
return m_xConnection->getTypeMap();
}
-// -----------------------------------------------------------------------------
-//........................................................................
} // namespace dbaccess
-//........................................................................
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/dataaccess/SharedConnection.hxx b/dbaccess/source/core/dataaccess/SharedConnection.hxx
index 8f7ca35..fc6bbf0 100644
--- a/dbaccess/source/core/dataaccess/SharedConnection.hxx
+++ b/dbaccess/source/core/dataaccess/SharedConnection.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
@@ -71,10 +71,10 @@ namespace dbaccess
virtual void SAL_CALL release() throw() { OSharedConnection_BASE::release(); }
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list