summaryrefslogtreecommitdiff
path: root/extensions
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2004-05-10 12:45:13 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2004-05-10 12:45:13 +0000
commit0904648737f78b0697201330e0e38a5d1b8dc673 (patch)
tree3d68d3b1e8b5d8dfb3cf0d077a61b255f5d895e0 /extensions
parent6a16df3d8f4b76c442497142dbbd10942978234f (diff)
INTEGRATION: CWS dba09 (1.16.54); FILE MERGED
2004/04/29 08:35:01 fs 1.16.54.5: copying the changes which happend on the cws_src680_frmcontrols03 branch to the cws_src680_dba09 branch - this is since both CWS' have some interdependencies 2004/04/26 15:00:46 fs 1.16.54.4: RESYNC: (1.17-1.18); FILE MERGED 2004/03/29 09:12:33 fs 1.16.54.3: #i26871# unique ids for the event browse buttons 2004/03/24 09:21:21 fs 1.16.54.2: RESYNC: (1.16-1.17); FILE MERGED 2004/03/19 15:26:35 fs 1.16.54.1: #i13497# #i14649#
Diffstat (limited to 'extensions')
-rw-r--r--extensions/source/propctrlr/formmetadata.hxx26
1 files changed, 19 insertions, 7 deletions
diff --git a/extensions/source/propctrlr/formmetadata.hxx b/extensions/source/propctrlr/formmetadata.hxx
index 2f61cdfbfc3e..5ff6d5eaa05b 100644
--- a/extensions/source/propctrlr/formmetadata.hxx
+++ b/extensions/source/propctrlr/formmetadata.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: formmetadata.hxx,v $
*
- * $Revision: 1.19 $
+ * $Revision: 1.20 $
*
- * last change: $Author: rt $ $Date: 2004-05-07 16:04:14 $
+ * last change: $Author: hr $ $Date: 2004-05-10 13:45:13 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -112,13 +112,23 @@ namespace pcr
::rtl::OUString sName;
String sDisplayName;
sal_Int32 nHelpId;
+ sal_uInt32 nUniqueBrowseId;
sal_Int32 nIndex;
- EventDisplayDescription(sal_Int32 _nId, const ::rtl::OUString& _rName, const UniString& _rDisplayName, sal_Int32 _nHelpId)
- :nIndex(_nId)
- ,sName(_rName)
- ,sDisplayName(_rDisplayName)
- ,nHelpId(_nHelpId)
+ EventDisplayDescription( const ::rtl::OUString& _rName )
+ :nIndex( 0 )
+ ,sName( _rName )
+ ,nHelpId( 0 )
+ ,nUniqueBrowseId( 0 )
+ {
+ }
+ EventDisplayDescription( sal_Int32 _nId, const sal_Char* _pAsciiName, USHORT _nDisplayNameResId,
+ sal_Int32 _nHelpId, sal_uInt32 _nUniqueBrowseId )
+ :nIndex( _nId )
+ ,sName( ::rtl::OUString::createFromAscii( _pAsciiName ) )
+ ,sDisplayName( ModuleRes( _nDisplayNameResId ) )
+ ,nHelpId( _nHelpId )
+ ,nUniqueBrowseId( _nUniqueBrowseId )
{
}
};
@@ -285,6 +295,8 @@ namespace pcr
#define PROPERTY_ID_SHOW_RECORDACTIONS 138
#define PROPERTY_ID_SHOW_FILTERSORT 139
#define PROPERTY_ID_TEXTTYPE 140
+ #define PROPERTY_ID_AUTOLINEBREAK 141
+ #define PROPERTY_ID_LINEEND_FORMAT 142
//............................................................................
} // namespace pcr