summaryrefslogtreecommitdiff
path: root/dbaccess/source/core/inc/definitioncontainer.hxx
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:03:11 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:03:11 +0200
commit3b74383b37a9504e632a4dfeb9929941c1febd87 (patch)
tree960b32cda2755f988d0d34e568f1019ad2bce0d2 /dbaccess/source/core/inc/definitioncontainer.hxx
parentaa20084bd041208841d5ad3ca50b1e963eb5986e (diff)
recreated tag libreoffice-3.3.1.1 which had these commits:
commit a62bc9e4ff6f4ec47300a12ab30e4a6beea0ba85 (tag: refs/tags/libreoffice-3.3.1.1) Author: Petr Mladek <pmladek@suse.cz> Date: Tue Feb 8 18:07:41 2011 +0100 Version 3.3.1.1, tag libreoffice-3.3.1.1 (3.3.1-rc1) commit 8bce2b8399c917989cf9072c61947b9854c4d353 Author: Jan Holesovsky <kendy@suse.cz> Date: Mon Feb 7 21:23:20 2011 +0100 Branch libreoffice-3-3-1 This is 'libreoffice-3-3-1' - the stable branch for the 3.3.1 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.3.x release, please use the 'libreoffice-3-3' branch. If you want to build something cool, unstable, and risky, use master. commit 7351e5dc8e24e51af5af5c17798f26e00626711c Author: Lionel Elie Mamane <lionel@mamane.lu> Date: Sat Jan 15 05:39:40 2011 +0100 i#116187: report left/right page margin setting ignored on Unix 64 bit (cherry picked from commit 51a9333217687ff16df40ea3bd8983faaf5e425a) reportdesign/source/ui/report/ReportController.cxx | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit aa3b692805e5581d6f770f5a59b3563423dd3f9d Author: Kohei Yoshida <kyoshida@novell.com> Date: Fri Jan 14 11:24:43 2011 -0500 Remove the Registration... menu item which we don't want. (fdo#33112) dbaccess/uiconfig/dbtdata/menubar/menubar.xml | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) commit e97e6fd2a34584fbf1c974e6663f7e2b06a83d49 Author: Noel Power <noel.power@novell.com> Date: Wed Jan 12 11:09:51 2011 +0000 fix for fdo#32742# reportdesign/source/ui/inspection/metadata.cxx | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 9673a66350edf8bdb3a9af74df7eb3ed0cd7042f Author: Petr Mladek <pmladek@suse.cz> Date: Tue Jan 11 23:05:56 2011 +0100 Please, ignore the previous message; it was for the libreoffice-3-3-0 branch This is 'libreoffice-3-3' - the stable branch for the 3.3.x releases. Only safe changes, reviewed by anoter person are allowed. If you want to build something cool, unstable, and risky, use master. commit 8f7887da80732abf15538fe4efe8571ad32e8715 Author: Petr Mladek <pmladek@suse.cz> Date: Tue Jan 11 22:39:06 2011 +0100 Branch libreoffice-3-3-0 This is 'libreoffice-3-3-0' - the stable branch for the 3.3.0 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.3.x release, please use the 'libreoffice-3-3' branch. If you want to build something cool, unstable, and risky, use master.
Notes
split repo tag: base_libreoffice-3.3.1.1 split repo tag: base_libreoffice-3.3.1.2
Diffstat (limited to 'dbaccess/source/core/inc/definitioncontainer.hxx')
-rw-r--r--dbaccess/source/core/inc/definitioncontainer.hxx66
1 files changed, 33 insertions, 33 deletions
diff --git a/dbaccess/source/core/inc/definitioncontainer.hxx b/dbaccess/source/core/inc/definitioncontainer.hxx
index 72a5a9fbbfd7..478d2eefbc3c 100644
--- a/dbaccess/source/core/inc/definitioncontainer.hxx
+++ b/dbaccess/source/core/inc/definitioncontainer.hxx
@@ -85,8 +85,8 @@ private:
};
//==========================================================================
-//= ODefinitionContainer - base class of collections of database definition
-//= documents
+//= ODefinitionContainer - base class of collections of database definition
+//= documents
//==========================================================================
typedef ::cppu::ImplHelper7 < ::com::sun::star::container::XIndexAccess
, ::com::sun::star::container::XNameContainer
@@ -124,15 +124,15 @@ private:
protected:
// we can't just hold a vector of XContentRefs, as after initialization they're all empty
// cause we load them only on access
- DocumentsIndexAccess m_aDocuments; // for a efficient index access
- Documents m_aDocumentMap; // for a efficient name access
+ DocumentsIndexAccess m_aDocuments; // for a efficient index access
+ Documents m_aDocumentMap; // for a efficient name access
::cppu::OInterfaceContainerHelper
m_aApproveListeners;
::cppu::OInterfaceContainerHelper
m_aContainerListeners;
- sal_Bool m_bInPropertyChange;
+ sal_Bool m_bInPropertyChange;
bool m_bCheckSlash;
protected:
@@ -163,7 +163,7 @@ public:
*/
ODefinitionContainer(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xORB
- , const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xParentContainer
+ , const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xParentContainer
, const TContentPtr& _pImpl
, bool _bCheckSlash = true
);
@@ -221,42 +221,42 @@ protected:
virtual void SAL_CALL disposing();
/** create a object from it's persistent data within the configuration. To be overwritten by derived classes.
- @param _rName the name the object has within the container
- @return the newly created object or an empty reference if somthing went wrong
+ @param _rName the name the object has within the container
+ @return the newly created object or an empty reference if somthing went wrong
*/
virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent > createObject(
const ::rtl::OUString& _rName) = 0;
/** get the object specified by the given name. If desired, the object will be read if not already done so.<BR>
- @param _rName the object name
- @param _bReadIfNeccessary if sal_True, the object will be created if necessary
- @return the property set interface of the object. Usually the return value is not NULL, but
+ @param _rName the object name
+ @param _bReadIfNeccessary if sal_True, the object will be created if necessary
+ @return the property set interface of the object. Usually the return value is not NULL, but
if so, then the object could not be read from the configuration
- @throws NoSuchElementException if there is no object with the given name.
- @see createObject
+ @throws NoSuchElementException if there is no object with the given name.
+ @see createObject
*/
virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent >
implGetByName(const ::rtl::OUString& _rName, sal_Bool _bCreateIfNecessary) throw (::com::sun::star::container::NoSuchElementException);
/** quickly checks if there already is an element with a given name. No access to the configuration occures, i.e.
if there is such an object which is not already loaded, it won't be loaded now.
- @param _rName the object name to check
- @return sal_True if there already exists such an object
+ @param _rName the object name to check
+ @return sal_True if there already exists such an object
*/
- virtual sal_Bool checkExistence(const ::rtl::OUString& _rName);
+ virtual sal_Bool checkExistence(const ::rtl::OUString& _rName);
/** append a new object to the container. No plausibility checks are done, e.g. if the object is non-NULL or
if the name is already used by another object or anything like this. This method is for derived classes
which may support different methods to create and/or append objects, and don't want to deal with the
internal structures of this class.<BR>
The old component will not be disposed, this is the callers responsibility, too.
- @param _rName the name of the new object
- @param _rxNewObject the new object (not surprising, is it ?)
- @see createConfigKey
- @see implReplace
- @see implRemove
+ @param _rName the name of the new object
+ @param _rxNewObject the new object (not surprising, is it ?)
+ @see createConfigKey
+ @see implReplace
+ @see implRemove
*/
- void implAppend(
+ void implAppend(
const ::rtl::OUString& _rName,
const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent >& _rxNewObject
);
@@ -265,9 +265,9 @@ protected:
or not there exists an object with the given name. This is the responsibility of the caller.<BR>
Additionally the node for the given object will be removed from the registry (including all sub nodes).<BR>
The old component will not be disposed, this is the callers responsibility, too.
- @param _rName the objects name
- @see implReplace
- @see implAppend
+ @param _rName the objects name
+ @see implReplace
+ @see implAppend
*/
void implRemove(const ::rtl::OUString& _rName);
@@ -276,11 +276,11 @@ protected:
Additionally all object-related informations within the registry will be deleted. The new object config node,
where the caller may want to store the new objects information, is returned.<BR>
The old component will not be disposed, this is the callers responsibility, too.
- @param _rName the objects name
- @param _rxNewObject the new object
- @param _rNewObjectNode the configuration node where the new object may be stored
- @see implAppend
- @see implRemove
+ @param _rName the objects name
+ @param _rxNewObject the new object
+ @param _rNewObjectNode the configuration node where the new object may be stored
+ @see implAppend
+ @see implRemove
*/
void implReplace(
const ::rtl::OUString& _rName,
@@ -304,8 +304,8 @@ protected:
}
private:
- void addObjectListener(const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent >& _xNewObject);
- void removeObjectListener(const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent >& _xNewObject);
+ void addObjectListener(const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent >& _xNewObject);
+ void removeObjectListener(const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent >& _xNewObject);
/** approve that the object given may be inserted into the container. Should be overloaded by derived classes,
the default implementation just checks the object to be non-void.
@@ -329,7 +329,7 @@ private:
}
};
-} // namespace dbaccess
+} // namespace dbaccess
#endif // _DBA_CORE_DEFINITIONCONTAINER_HXX_