diff options
author | Sander Vesik <svesik@openoffice.org> | 2004-04-21 13:19:47 +0000 |
---|---|---|
committer | Sander Vesik <svesik@openoffice.org> | 2004-04-21 13:19:47 +0000 |
commit | 4d2e5ad20d03b79df8eead767bdb800c319a6ae1 (patch) | |
tree | 0f06efc63d88cde0651d1917047d55bf9bfe1645 /extensions/source/propctrlr/formmetadata.cxx | |
parent | ca267398eb8e703fea5b56a9c6cae637b90e9f3f (diff) |
INTEGRATION: CWS ooo20040329 (1.21.48); FILE MERGED
2004/04/08 03:07:25 svesik 1.21.48.2: RESYNC: (1.21-1.22); FILE MERGED
2004/03/17 12:57:49 waratah 1.21.48.1: #i1858# alter order of definitions to remove some warnings from -Wall
Diffstat (limited to 'extensions/source/propctrlr/formmetadata.cxx')
-rw-r--r-- | extensions/source/propctrlr/formmetadata.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/extensions/source/propctrlr/formmetadata.cxx b/extensions/source/propctrlr/formmetadata.cxx index 1176cf08e43f..6cf8ede2dfc8 100644 --- a/extensions/source/propctrlr/formmetadata.cxx +++ b/extensions/source/propctrlr/formmetadata.cxx @@ -2,9 +2,9 @@ * * $RCSfile: formmetadata.cxx,v $ * - * $Revision: 1.23 $ + * $Revision: 1.24 $ * - * last change: $Author: hr $ $Date: 2004-04-13 11:23:06 $ + * last change: $Author: svesik $ $Date: 2004-04-21 14:19:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -58,7 +58,6 @@ * * ************************************************************************/ - #ifndef _EXTENSIONS_PROPCTRLR_FORMMETADATA_HXX_ #include "formmetadata.hxx" #endif @@ -110,10 +109,10 @@ namespace pcr OPropertyInfoImpl::OPropertyInfoImpl(const ::rtl::OUString& _rName, sal_Int32 _nId, const String& aString, sal_uInt16 nP, sal_uInt32 nHid, sal_uInt32 _nUIFlags) :sName(_rName) - ,nId(_nId) ,sTranslation(aString) - ,nPos(nP) ,nHelpId(nHid) + ,nId(_nId) + ,nPos(nP) ,nUIFlags(_nUIFlags) { } |