summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2008-07-21 11:58:03 +0000
committerOliver Bolte <obo@openoffice.org>2008-07-21 11:58:03 +0000
commit39318d9a85119d765dbbb82765f5a26417494bfb (patch)
tree91f460cb5ea627e45ceb83b89c53c8a6d05bde6c
parentf8909e4f5c36363b3bed84bb9cac8298c1947fff (diff)
INTEGRATION: CWS sw30bf09 (1.80.20); FILE MERGED
2008/07/14 12:32:43 od 1.80.20.1: #i91601# Special implementation of UNO-API paragraph property <ListId>. The default implementation using the <SfxItemSet> is not appropriate.
-rw-r--r--sw/inc/cmdid.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index 6761c13c20..af59d9b24c 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: cmdid.h,v $
- * $Revision: 1.82 $
+ * $Revision: 1.83 $
*
* This file is part of OpenOffice.org.
*
@@ -897,7 +897,6 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare (//) mehr
#define FN_UNO_REPLACEMENT_GRAPHIC_URL (FN_EXTRA2 + 102)
#define FN_UNO_CELL_ROW_SPAN (FN_EXTRA2 + 103)
#define FN_UNO_TABLE_BORDER_DISTANCES (FN_EXTRA2 + 104)
-<<<<<<< cmdid.h
#define FN_SPELL_GRAMMAR_DIALOG (FN_EXTRA2 + 105)
#define FN_UNO_STREAM_NAME (FN_EXTRA2 + 106)
// --> OD 2008-07-14 #i91601#