[Libreoffice-commits] core.git: 2 commits - cui/source include/sfx2 include/svl ucb/source

Tor Lillqvist tml at iki.fi
Thu Aug 8 04:24:14 PDT 2013


 cui/source/options/optinet2.cxx |    1 
 include/sfx2/cntids.hrc         |    1 
 include/svl/cntwids.hrc         |  208 ----------------------------------------
 ucb/source/core/ucbprops.cxx    |  192 +++++++++++++++++-------------------
 4 files changed, 90 insertions(+), 312 deletions(-)

New commits:
commit 68277c3249489c4e4364275eb5c5920f44fe40b1
Author: Tor Lillqvist <tml at iki.fi>
Date:   Thu Aug 8 13:39:27 2013 +0300

    Remove the now empty <svl/cntwids.hrc> header
    
    Change-Id: I2c41b9960960ad9d290f84cc6e28d938068c0050

diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index a2d0096..1a896f7 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -31,7 +31,6 @@
 #include <sfx2/sfxsids.hrc>
 #include <sfx2/filedlghelper.hxx>
 #include <svl/urihelper.hxx>
-#include <svl/cntwids.hrc>
 #include <sfx2/app.hxx>
 #include <sfx2/objsh.hxx>
 #include <unotools/bootstrap.hxx>
diff --git a/include/sfx2/cntids.hrc b/include/sfx2/cntids.hrc
index db4c587..2facc52 100644
--- a/include/sfx2/cntids.hrc
+++ b/include/sfx2/cntids.hrc
@@ -20,7 +20,6 @@
 #ifndef _CNTIDS_HRC
 #define _CNTIDS_HRC
 
-#include <svl/cntwids.hrc>
 #include <svl/solar.hrc>
 
 // Slot-ID's -----------------------------------------------------------------
diff --git a/include/svl/cntwids.hrc b/include/svl/cntwids.hrc
deleted file mode 100644
index 78aaf4c..0000000
--- a/include/svl/cntwids.hrc
+++ /dev/null
@@ -1,25 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef _CNTWIDS_HRC
-#define _CNTWIDS_HRC
-
-#endif /* !_CNTWIDS_HRC */
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 246892818797f0b4c1747352a3e27c3025adcebb
Author: Tor Lillqvist <tml at iki.fi>
Date:   Thu Aug 8 13:30:40 2013 +0300

    Bin Chaos WIDs that are unused (only mentioned only in comments)
    
    The comments are in one place, for plaintext strings that say the same as what
    the WID name indicates, so they don't provide any useful information.
    
    Change-Id: I9be14dd46352e34bf3647349d85412a97725d238

diff --git a/include/svl/cntwids.hrc b/include/svl/cntwids.hrc
index 68a9b3a..78aaf4c 100644
--- a/include/svl/cntwids.hrc
+++ b/include/svl/cntwids.hrc
@@ -20,189 +20,6 @@
 #ifndef _CNTWIDS_HRC
 #define _CNTWIDS_HRC
 
-//=========================================================================
-// ARGS, MSG, ALL, FOLDER, BOXALL, BOXEXT
-//=========================================================================
-
-#define WID_CHAOS_START 500
-
-//PROP MSG
-#define WID_PRIORITY                        (WID_CHAOS_START + 15)
-#define WID_REPLY_TO                        (WID_CHAOS_START + 19)
-#define WID_IN_REPLY_TO                     (WID_CHAOS_START + 20)
-
-#define WID_MESSAGE_ID                      (WID_CHAOS_START + 21)
-#define WID_BCC                             (WID_CHAOS_START + 22)
-#define WID_CC                              (WID_CHAOS_START + 23)
-#define WID_TO                              (WID_CHAOS_START + 24)
-#define WID_FROM                            (WID_CHAOS_START + 25)
-#define WID_TITLE                           (WID_CHAOS_START + 26)
-#define WID_MESSAGEBODY                     (WID_CHAOS_START + 27)
-
-#define WID_REFERENCES                      (WID_CHAOS_START + 28)
-#define WID_NEWSGROUPS                      (WID_CHAOS_START + 29)
-#define WID_NEWS_XREFLIST                   (WID_CHAOS_START + 30)
-
-#define WID_OUTMSGINTERNALSTATE             (WID_CHAOS_START + 31)
-#define WID_RECIPIENTLIST                   (WID_CHAOS_START + 32)
-
-//PROP ALL
-#define WID_CONTENT_TYPE                    (WID_CHAOS_START + 44)
-
-#define WID_OWN_URL                         (WID_CHAOS_START + 45)
-#define WID_REAL_URL                        (WID_CHAOS_START + 46)
-#define WID_FLAG_READONLY                   (WID_CHAOS_START + 48)
-
-#define WID_FLAG_IS_FOLDER                  (WID_CHAOS_START + 51)
-#define WID_FLAG_HAS_FOLDER                 (WID_CHAOS_START + 52)
-#define WID_FLAG_IS_MESSAGE                 (WID_CHAOS_START + 53)
-#define WID_FLAG_HAS_MESSAGES               (WID_CHAOS_START + 54)
-
-#define WID_DATE_CREATED                    (WID_CHAOS_START + 55)
-#define WID_DATE_MODIFIED                   (WID_CHAOS_START + 56)
-#define WID_IS_READ                         (WID_CHAOS_START + 58)
-#define WID_IS_MARKED                       (WID_CHAOS_START + 59)
-
-//PROP FOLDER VIEW
-#define WID_THREADING                       (WID_CHAOS_START + 66)
-#define WID_FOLDERVIEW_MODE                 (WID_CHAOS_START + 69)
-#define WID_MESSAGEVIEW_MODE                (WID_CHAOS_START + 70)
-#define WID_SENTMESSAGEVIEW_MODE            (WID_CHAOS_START + 71)
-#define WID_THREADED                        (WID_CHAOS_START + 73)
-#define WID_RULES                           (WID_CHAOS_START + 75)
-#define WID_SUBSCRNEWSGROUPCOUNT            (WID_CHAOS_START + 76)
-#define WID_FLAG_SUBSCRIBED                 (WID_CHAOS_START + 77)
-
-//PROP FOLDER DIR
-#define WID_TOTALCONTENTCOUNT               (WID_CHAOS_START + 80)
-
-//PROP FOLDER USER
-#define WID_SEENCONTENTCOUNT                (WID_CHAOS_START + 86)
-
-//PROP BOXALL
-#define WID_USERNAME                        (WID_CHAOS_START + 91)
-#define WID_PASSWORD                        (WID_CHAOS_START + 92)
-#define WID_SERVERNAME                      (WID_CHAOS_START + 93)
-#define WID_SERVERPORT                      (WID_CHAOS_START + 94)
-#define WID_SERVERBASE                      (WID_CHAOS_START + 101)
-
-// -> ..._DEFAULT
-
-#define WID_AUTOUPDATE_INTERVAL             (WID_CHAOS_START + 105)
-#define WID_UPDATE_ENABLED                  (WID_CHAOS_START + 106)
-
-//PROP BOX RNMGR
-#define WID_CONNECTION_MODE                 (WID_CHAOS_START + 107)
-#define WID_MESSAGE_STOREMODE               (WID_CHAOS_START + 109)
-#define WID_DELETE_ON_SERVER                (WID_CHAOS_START + 110)
-
-//////////////////////////////////////////////////////////////////////////
-// MISC - Added after initial pool version
-//////////////////////////////////////////////////////////////////////////
-
-// PROP FOLDER
-#define WID_SHOW_MSGS_HAS_TIMELIMIT         (WID_CHAOS_START + 121)
-#define WID_SHOW_MSGS_TIMELIMIT             (WID_CHAOS_START + 122)
-#define WID_STORE_MSGS_HAS_TIMELIMIT        (WID_CHAOS_START + 123)
-#define WID_STORE_MSGS_TIMELIMIT            (WID_CHAOS_START + 124)
-
-//////////////////////////////////////////////////////////////////////////
-// WIDs added after SO 4.0 release
-//////////////////////////////////////////////////////////////////////////
-
-// PROP BOXALL
-#define WID_SEND_PUBLIC_PROT_ID             (WID_CHAOS_START + 127)
-#define WID_SEND_PRIVATE_PROT_ID            (WID_CHAOS_START + 128)
-#define WID_SEND_PUBLIC_OUTBOXPROPS         (WID_CHAOS_START + 129)
-#define WID_SEND_PRIVATE_OUTBOXPROPS        (WID_CHAOS_START + 130)
-#define WID_SEND_SERVERNAME                 (WID_CHAOS_START + 131)
-#define WID_SEND_USERNAME                   (WID_CHAOS_START + 132)
-#define WID_SEND_PASSWORD                   (WID_CHAOS_START + 133)
-#define WID_SEND_REPLY_TO_DEFAULT           (WID_CHAOS_START + 134)
-#define WID_SEND_FROM_DEFAULT               (WID_CHAOS_START + 135)
-#define WID_VIM_POPATH                      (WID_CHAOS_START + 136)
-#define WID_SEND_VIM_POPATH                 (WID_CHAOS_START + 137)
-#define WID_LOCALBASE                       (WID_CHAOS_START + 142)
-
-// PROP DOCUMENT
-#define WID_DOCUMENT_HEADER                 (WID_CHAOS_START + 143)
-#define WID_DOCUMENT_BODY                   (WID_CHAOS_START + 144)
-#define WID_DOCUMENT_SIZE                   (WID_CHAOS_START + 145)
-
-// PROP FSYS
-#define WID_FSYS_DISKSPACE_LEFT             (WID_CHAOS_START + 148)
-
-// PROP ALL
-#define WID_KEYWORDS                        (WID_CHAOS_START + 150)
-
-// PROP SEARCH
-#define WID_SEARCH_CRITERIA                 (WID_CHAOS_START + 152)
-#define WID_SEARCH_LOCATIONS                (WID_CHAOS_START + 153)
-#define WID_SEARCH_RECURSIVE                (WID_CHAOS_START + 154)
-
-// PROP Channel
-#define WID_TARGET_URL                      (WID_CHAOS_START + 159)
-
-// PROP HTTP
-#define WID_HTTP_CONNECTION_LIMIT           (WID_CHAOS_START + 161)
-
-// PROP BOXALL
-#define WID_ACCOUNT                         (WID_CHAOS_START + 172)
-
-// PROP FSYS
-#define WID_FSYS_FLAGS                      (WID_CHAOS_START + 174)
-
-// PROP FSYS
-#define WID_WHO_IS_MASTER                   (WID_CHAOS_START + 176)
-
-// PROP ALL
-#define WID_SIZE_LIMIT                      (WID_CHAOS_START + 179)
-
-// PROP FOLDER
-#define WID_MARKED_DOCUMENT_COUNT           (WID_CHAOS_START + 180)
-#define WID_FOLDER_COUNT                    (WID_CHAOS_START + 181)
-
-// TRASHCAN
-#define WID_TRASHCAN_FLAG_AUTODELETE        (WID_CHAOS_START + 184)
-#define WID_TRASHCAN_FLAG_CONFIRMEMPTY      (WID_CHAOS_START + 185)
-
-// TRASH
-#define WID_TRASH_ORIGIN                    (WID_CHAOS_START + 189)
-
-// PROP ALL
-#define WID_TARGET_FRAMES                   (WID_CHAOS_START + 191)
-
-// PROP ALL
-#define WID_FLAG_UPDATE_ON_OPEN             (WID_CHAOS_START + 213)
-
-// PROP HTTP
-#define WID_HTTP_KEEP_EXPIRED               (WID_CHAOS_START + 220)
-#define WID_HTTP_VERIFY_MODE                (WID_CHAOS_START + 221)
-#define WID_HTTP_NOCACHE_LIST               (WID_CHAOS_START + 222)
-#define WID_HTTP_REFERER                    (WID_CHAOS_START + 223)
-
-// PROP HTTP
-#define WID_HTTP_COOKIE                     (WID_CHAOS_START + 231)
-
-//////////////////////////////////////////////////////////////////////////
-// WIDs added after SO 5.0 release
-//////////////////////////////////////////////////////////////////////////
-
-// PROP FOLDER
-#define WID_USER_SORT_CRITERIUM             (WID_CHAOS_START + 233)
-
-// PROP FTP
-#define WID_FTP_ACCOUNT                     (WID_CHAOS_START + 243)
-
-// PROP SEARCH
-#define WID_SEARCH_INDIRECTIONS             (WID_CHAOS_START + 250)
-
-// PROP ALL
-#define WID_SEND_FORMATS                    (WID_CHAOS_START + 251)
-#define WID_SEND_COPY_TARGET                (WID_CHAOS_START + 252)
-
-// END
-
 #endif /* !_CNTWIDS_HRC */
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/core/ucbprops.cxx b/ucb/source/core/ucbprops.cxx
index 5d0c9dc..2207a05 100644
--- a/ucb/source/core/ucbprops.cxx
+++ b/ucb/source/core/ucbprops.cxx
@@ -166,129 +166,117 @@ static const com::sun::star::uno::Type& Sequence_SendMediaTypes_getCppuType()
 
 static PropertyTableEntry __aPropertyTable[] =
 {
-    { "Account",            -1 /* WID_ACCOUNT */,               ATTR_DEFAULT,   &OUString_getCppuType },
-    { "AutoUpdateInterval", -1 /* WID_AUTOUPDATE_INTERVAL */,   ATTR_DEFAULT,   &sal_uInt32_getCppuType },
-    { "ConfirmEmpty",       -1 /* WID_TRASHCAN_FLAG_CONFIRMEMPTY */,
-                                                                ATTR_DEFAULT,   &sal_Bool_getCppuType },
-    { "ConnectionLimit",    -1 /* WID_HTTP_CONNECTION_LIMIT */, ATTR_DEFAULT,   &byte_getCppuType },
-    { "ConnectionMode",     -1 /* WID_CONNECTION_MODE */,       ATTR_DEFAULT,   &enum_getCppuType },
-    { "ContentCountLimit",  -1 /* WID_SHOW_MSGS_TIMELIMIT */,   ATTR_DEFAULT,   &sal_uInt16_getCppuType },
-    { "ContentType",        -1 /* WID_CONTENT_TYPE */,          ATTR_DEFAULT,   &OUString_getCppuType },
-    { "Cookie",             -1 /* WID_HTTP_COOKIE */,           ATTR_DEFAULT,   &OUString_getCppuType },
-    { "CrossReferences",    -1 /* WID_NEWS_XREFLIST */,         ATTR_DEFAULT,   &Sequence_CrossReference_getCppuType },
-    { "DateCreated",        -1 /* WID_DATE_CREATED */,          ATTR_DEFAULT,   &DateTime_getCppuType },
-    { "DateModified",       -1 /* WID_DATE_MODIFIED */,         ATTR_DEFAULT,   &DateTime_getCppuType },
-    { "DeleteOnServer",     -1 /* WID_DELETE_ON_SERVER */,      ATTR_DEFAULT,   &sal_Bool_getCppuType },
-    { "DocumentBody",       -1 /* WID_DOCUMENT_BODY */,         ATTR_DEFAULT,   &Sequence_byte_getCppuType },
-    { "DocumentCount",      -1 /* WID_TOTALCONTENTCOUNT */,     ATTR_DEFAULT | PropertyAttribute::READONLY,
+    { "Account",            -1,                                 ATTR_DEFAULT,   &OUString_getCppuType },
+    { "AutoUpdateInterval", -1,                                 ATTR_DEFAULT,   &sal_uInt32_getCppuType },
+    { "ConfirmEmpty",       -1,                                 ATTR_DEFAULT,   &sal_Bool_getCppuType },
+    { "ConnectionLimit",    -1,                                 ATTR_DEFAULT,   &byte_getCppuType },
+    { "ConnectionMode",     -1,                                 ATTR_DEFAULT,   &enum_getCppuType },
+    { "ContentCountLimit",  -1,                                 ATTR_DEFAULT,   &sal_uInt16_getCppuType },
+    { "ContentType",        -1,                                 ATTR_DEFAULT,   &OUString_getCppuType },
+    { "Cookie",             -1,                                 ATTR_DEFAULT,   &OUString_getCppuType },
+    { "CrossReferences",    -1,                                 ATTR_DEFAULT,   &Sequence_CrossReference_getCppuType },
+    { "DateCreated",        -1,                                 ATTR_DEFAULT,   &DateTime_getCppuType },
+    { "DateModified",       -1,                                 ATTR_DEFAULT,   &DateTime_getCppuType },
+    { "DeleteOnServer",     -1,                                 ATTR_DEFAULT,   &sal_Bool_getCppuType },
+    { "DocumentBody",       -1,                                 ATTR_DEFAULT,   &Sequence_byte_getCppuType },
+    { "DocumentCount",      -1,                                 ATTR_DEFAULT | PropertyAttribute::READONLY,
                                                                                             &sal_uInt32_getCppuType },
     { "DocumentCountMarked",
-                            -1 /* WID_MARKED_DOCUMENT_COUNT */, ATTR_DEFAULT | PropertyAttribute::READONLY,
+                            -1,                                 ATTR_DEFAULT | PropertyAttribute::READONLY,
                                                                                             &sal_uInt32_getCppuType },
-    { "DocumentHeader",     -1 /* WID_DOCUMENT_HEADER */,       ATTR_DEFAULT,   &Sequence_DocumentHeaderField_getCppuType },
-    { "DocumentStoreMode",  -1 /* WID_MESSAGE_STOREMODE */,     ATTR_DEFAULT,   &enum_getCppuType },
-    { "DocumentViewMode",   -1 /* WID_MESSAGEVIEW_MODE */,      ATTR_DEFAULT,   &enum_getCppuType },
-    { "FTPAccount",         -1 /* WID_FTP_ACCOUNT */,           ATTR_DEFAULT,   &OUString_getCppuType },
-    { "Flags",              -1 /* WID_FSYS_FLAGS */,            ATTR_DEFAULT,   &sal_uInt32_getCppuType },
-    { "FolderCount",        -1 /* WID_FOLDER_COUNT */,          ATTR_DEFAULT | PropertyAttribute::READONLY,
+    { "DocumentHeader",     -1,                                 ATTR_DEFAULT,   &Sequence_DocumentHeaderField_getCppuType },
+    { "DocumentStoreMode",  -1,                                 ATTR_DEFAULT,   &enum_getCppuType },
+    { "DocumentViewMode",   -1,                                 ATTR_DEFAULT,   &enum_getCppuType },
+    { "FTPAccount",         -1,                                 ATTR_DEFAULT,   &OUString_getCppuType },
+    { "Flags",              -1,                                 ATTR_DEFAULT,   &sal_uInt32_getCppuType },
+    { "FolderCount",        -1,                                 ATTR_DEFAULT | PropertyAttribute::READONLY,
                                                                                             &sal_uInt32_getCppuType },
-    { "FolderViewMode",     -1 /* WID_FOLDERVIEW_MODE */,       ATTR_DEFAULT,   &enum_getCppuType },
-    { "FreeSpace",          -1 /* WID_FSYS_DISKSPACE_LEFT */,   ATTR_DEFAULT | PropertyAttribute::READONLY,
+    { "FolderViewMode",     -1,                                 ATTR_DEFAULT,   &enum_getCppuType },
+    { "FreeSpace",          -1,                                 ATTR_DEFAULT | PropertyAttribute::READONLY,
                                                                                             &sal_uInt64_getCppuType },
-    { "HasDocuments",       -1 /* WID_FLAG_HAS_MESSAGES */,     ATTR_DEFAULT | PropertyAttribute::READONLY,
+    { "HasDocuments",       -1,                                 ATTR_DEFAULT | PropertyAttribute::READONLY,
                                                                                             &sal_Bool_getCppuType },
-    { "HasFolders",         -1 /* WID_FLAG_HAS_FOLDER */,       ATTR_DEFAULT | PropertyAttribute::READONLY,
+    { "HasFolders",         -1,                                 ATTR_DEFAULT | PropertyAttribute::READONLY,
                                                                                             &sal_Bool_getCppuType },
-    { "IsAutoDelete",       -1 /* WID_TRASHCAN_FLAG_AUTODELETE */,
-                                                                ATTR_DEFAULT,   &sal_Bool_getCppuType },
-    { "IsAutoUpdate",       -1 /* WID_UPDATE_ENABLED */,        ATTR_DEFAULT,   &sal_Bool_getCppuType },
-    { "IsDocument",         -1 /* WID_FLAG_IS_MESSAGE */,       ATTR_DEFAULT | PropertyAttribute::READONLY,
+    { "IsAutoDelete",       -1,                                 ATTR_DEFAULT,   &sal_Bool_getCppuType },
+    { "IsAutoUpdate",       -1,                                 ATTR_DEFAULT,   &sal_Bool_getCppuType },
+    { "IsDocument",         -1,                                 ATTR_DEFAULT | PropertyAttribute::READONLY,
                                                                                             &sal_Bool_getCppuType },
-    { "IsFolder",           -1 /* WID_FLAG_IS_FOLDER */,        ATTR_DEFAULT | PropertyAttribute::READONLY,
+    { "IsFolder",           -1,                                 ATTR_DEFAULT | PropertyAttribute::READONLY,
                                                                                             &sal_Bool_getCppuType },
-    { "IsKeepExpired",      -1 /* WID_HTTP_KEEP_EXPIRED */,     ATTR_DEFAULT,   &sal_Bool_getCppuType },
+    { "IsKeepExpired",      -1,                                 ATTR_DEFAULT,   &sal_Bool_getCppuType },
     { "IsLimitedContentCount",
-                            -1 /* WID_SHOW_MSGS_HAS_TIMELIMIT */,
-                                                                ATTR_DEFAULT,   &sal_Bool_getCppuType },
-    { "IsMarked",           -1 /* WID_IS_MARKED */,             ATTR_DEFAULT,   &sal_Bool_getCppuType },
-    { "IsRead",             -1 /* WID_IS_READ */,               ATTR_DEFAULT,   &sal_Bool_getCppuType },
-    { "IsReadOnly",         -1 /* WID_FLAG_READONLY */,         ATTR_DEFAULT,   &sal_Bool_getCppuType },
-    { "IsSubscribed",       -1 /* WID_FLAG_SUBSCRIBED */,       ATTR_DEFAULT,   &sal_Bool_getCppuType },
-//  { "IsThreaded",         -1 /* WID_THREADED */,              ATTR_DEFAULT,   &sal_Bool_getCppuType },
-    { "IsTimeLimitedStore", -1 /* WID_STORE_MSGS_HAS_TIMELIMIT */,
-                                                                ATTR_DEFAULT,   &sal_Bool_getCppuType },
-    { "Keywords",           -1 /* WID_KEYWORDS */,              ATTR_DEFAULT,   &OUString_getCppuType },
-    { "LocalBase",          -1 /* WID_LOCALBASE */,             ATTR_DEFAULT,   &OUString_getCppuType },
-    { "MessageBCC",         -1 /* WID_BCC */,                   ATTR_DEFAULT,   &OUString_getCppuType },
-    { "MessageBody",        -1 /* WID_MESSAGEBODY */,           ATTR_DEFAULT,   &XDataContainer_getCppuType },
-    { "MessageCC",          -1 /* WID_CC */,                    ATTR_DEFAULT,   &OUString_getCppuType },
-    { "MessageFrom",        -1 /* WID_FROM */,                  ATTR_DEFAULT,   &OUString_getCppuType },
-    { "MessageId",          -1 /* WID_MESSAGE_ID */,            ATTR_DEFAULT,   &OUString_getCppuType },
-    { "MessageInReplyTo",   -1 /* WID_IN_REPLY_TO */,           ATTR_DEFAULT,   &OUString_getCppuType },
-    { "MessageReplyTo",     -1 /* WID_REPLY_TO */,              ATTR_DEFAULT,   &OUString_getCppuType },
-    { "MessageTo",          -1 /* WID_TO */,                    ATTR_DEFAULT,   &OUString_getCppuType },
-    { "NewsGroups",         -1 /* WID_NEWSGROUPS */,            ATTR_DEFAULT,   &OUString_getCppuType },
-    { "NoCacheList",        -1 /* WID_HTTP_NOCACHE_LIST */,     ATTR_DEFAULT,   &OUString_getCppuType },
-    { "Origin",             -1 /* WID_TRASH_ORIGIN */,          ATTR_DEFAULT | PropertyAttribute::READONLY,
+                            -1,                                 ATTR_DEFAULT,   &sal_Bool_getCppuType },
+    { "IsMarked",           -1,                                 ATTR_DEFAULT,   &sal_Bool_getCppuType },
+    { "IsRead",             -1,                                 ATTR_DEFAULT,   &sal_Bool_getCppuType },
+    { "IsReadOnly",         -1,                                 ATTR_DEFAULT,   &sal_Bool_getCppuType },
+    { "IsSubscribed",       -1,                                 ATTR_DEFAULT,   &sal_Bool_getCppuType },
+    { "IsTimeLimitedStore", -1,                                 ATTR_DEFAULT,   &sal_Bool_getCppuType },
+    { "Keywords",           -1,                                 ATTR_DEFAULT,   &OUString_getCppuType },
+    { "LocalBase",          -1,                                 ATTR_DEFAULT,   &OUString_getCppuType },
+    { "MessageBCC",         -1,                                 ATTR_DEFAULT,   &OUString_getCppuType },
+    { "MessageBody",        -1,                                 ATTR_DEFAULT,   &XDataContainer_getCppuType },
+    { "MessageCC",          -1,                                 ATTR_DEFAULT,   &OUString_getCppuType },
+    { "MessageFrom",        -1,                                 ATTR_DEFAULT,   &OUString_getCppuType },
+    { "MessageId",          -1,                                 ATTR_DEFAULT,   &OUString_getCppuType },
+    { "MessageInReplyTo",   -1,                                 ATTR_DEFAULT,   &OUString_getCppuType },
+    { "MessageReplyTo",     -1,                                 ATTR_DEFAULT,   &OUString_getCppuType },
+    { "MessageTo",          -1,                                 ATTR_DEFAULT,   &OUString_getCppuType },
+    { "NewsGroups",         -1,                                 ATTR_DEFAULT,   &OUString_getCppuType },
+    { "NoCacheList",        -1,                                 ATTR_DEFAULT,   &OUString_getCppuType },
+    { "Origin",             -1,                                 ATTR_DEFAULT | PropertyAttribute::READONLY,
                                                                                             &OUString_getCppuType },
     { "OutgoingMessageRecipients",
-                            -1 /* WID_RECIPIENTLIST */,         ATTR_DEFAULT,   &Sequence_RecipientInfo_getCppuType },
+                            -1,                                 ATTR_DEFAULT,   &Sequence_RecipientInfo_getCppuType },
     { "OutgoingMessageState",
-                            -1 /* WID_OUTMSGINTERNALSTATE */,   ATTR_DEFAULT | PropertyAttribute::READONLY,
+                            -1,                                 ATTR_DEFAULT | PropertyAttribute::READONLY,
                                                                                             &enum_getCppuType },
     { "OutgoingMessageViewMode",
-                            -1 /* WID_SENTMESSAGEVIEW_MODE */,
-                                                                ATTR_DEFAULT,   &enum_getCppuType },
-//  { "OwnURL",             -1 /* WID_OWN_URL */,               ATTR_DEFAULT,   &OUString_getCppuType },
-    { "Password",           -1 /* WID_PASSWORD */,              ATTR_DEFAULT,   &OUString_getCppuType },
-//  { "PresentationURL",    -1 /* WID_REAL_URL */,              ATTR_DEFAULT | PropertyAttribute::READONLY,
-//                                                                                          &OUString_getCppuType },
-    { "Priority",           -1 /* WID_PRIORITY */,              ATTR_DEFAULT,   &enum_getCppuType },
-    { "References",         -1 /* WID_REFERENCES */,            ATTR_DEFAULT,   &OUString_getCppuType },
-    { "Referer",            -1 /* WID_HTTP_REFERER */,          ATTR_DEFAULT,   &OUString_getCppuType },
-    { "Rules",              -1 /* WID_RULES */,                 ATTR_DEFAULT,   &RuleSet_getCppuType },
-    { "SearchCriteria",     -1 /* WID_SEARCH_CRITERIA */,       ATTR_DEFAULT,   &RuleSet_getCppuType },
-    { "SearchIndirections", -1 /* WID_SEARCH_INDIRECTIONS */,   ATTR_DEFAULT,   &sal_Bool_getCppuType },
-    { "SearchLocations",    -1 /* WID_SEARCH_LOCATIONS */,      ATTR_DEFAULT,   &OUString_getCppuType },
-    { "SearchRecursive",    -1 /* WID_SEARCH_RECURSIVE */,      ATTR_DEFAULT,   &sal_Bool_getCppuType },
-    { "SeenCount",          -1 /* WID_SEENCONTENTCOUNT */,      ATTR_DEFAULT | PropertyAttribute::READONLY,
+                            -1,                                 ATTR_DEFAULT,   &enum_getCppuType },
+    { "Password",           -1,                                 ATTR_DEFAULT,   &OUString_getCppuType },
+    { "Priority",           -1,                                 ATTR_DEFAULT,   &enum_getCppuType },
+    { "References",         -1,                                 ATTR_DEFAULT,   &OUString_getCppuType },
+    { "Referer",            -1,                                 ATTR_DEFAULT,   &OUString_getCppuType },
+    { "Rules",              -1,                                 ATTR_DEFAULT,   &RuleSet_getCppuType },
+    { "SearchCriteria",     -1,                                 ATTR_DEFAULT,   &RuleSet_getCppuType },
+    { "SearchIndirections", -1,                                 ATTR_DEFAULT,   &sal_Bool_getCppuType },
+    { "SearchLocations",    -1,                                 ATTR_DEFAULT,   &OUString_getCppuType },
+    { "SearchRecursive",    -1,                                 ATTR_DEFAULT,   &sal_Bool_getCppuType },
+    { "SeenCount",          -1,                                 ATTR_DEFAULT | PropertyAttribute::READONLY,
                                                                                             &sal_uInt32_getCppuType },
-    { "SendCopyTarget",     -1 /* WID_SEND_COPY_TARGET */,      ATTR_DEFAULT,   &Sequence_SendInfo_getCppuType },
-    { "SendFormats",        -1 /* WID_SEND_FORMATS */,          ATTR_DEFAULT,   &Sequence_SendMediaTypes_getCppuType },
-    { "SendFroms",          -1 /* WID_SEND_FROM_DEFAULT */,     ATTR_DEFAULT,   &Sequence_SendInfo_getCppuType },
-    { "SendPasswords",      -1 /* WID_SEND_PASSWORD */,         ATTR_DEFAULT,   &Sequence_SendInfo_getCppuType },
-    { "SendProtocolPrivate",-1 /* WID_SEND_PRIVATE_PROT_ID */,  ATTR_DEFAULT,   &sal_uInt16_getCppuType },
-    { "SendProtocolPublic", -1 /* WID_SEND_PUBLIC_PROT_ID */,   ATTR_DEFAULT,   &sal_uInt16_getCppuType },
-    { "SendReplyTos",       -1 /* WID_SEND_REPLY_TO_DEFAULT */, ATTR_DEFAULT,   &Sequence_SendInfo_getCppuType },
-    { "SendServerNames",    -1 /* WID_SEND_SERVERNAME */,       ATTR_DEFAULT,   &Sequence_SendInfo_getCppuType },
-    { "SendUserNames",      -1 /* WID_SEND_USERNAME */,         ATTR_DEFAULT,   &Sequence_SendInfo_getCppuType },
+    { "SendCopyTarget",     -1,                                 ATTR_DEFAULT,   &Sequence_SendInfo_getCppuType },
+    { "SendFormats",        -1,                                 ATTR_DEFAULT,   &Sequence_SendMediaTypes_getCppuType },
+    { "SendFroms",          -1,                                 ATTR_DEFAULT,   &Sequence_SendInfo_getCppuType },
+    { "SendPasswords",      -1,                                 ATTR_DEFAULT,   &Sequence_SendInfo_getCppuType },
+    { "SendProtocolPrivate",-1,                                 ATTR_DEFAULT,   &sal_uInt16_getCppuType },
+    { "SendProtocolPublic", -1,                                 ATTR_DEFAULT,   &sal_uInt16_getCppuType },
+    { "SendReplyTos",       -1,                                 ATTR_DEFAULT,   &Sequence_SendInfo_getCppuType },
+    { "SendServerNames",    -1,                                 ATTR_DEFAULT,   &Sequence_SendInfo_getCppuType },
+    { "SendUserNames",      -1,                                 ATTR_DEFAULT,   &Sequence_SendInfo_getCppuType },
     { "SendVIMPostOfficePath",
-                            -1 /* WID_SEND_VIM_POPATH */,       ATTR_DEFAULT,   &OUString_getCppuType },
-    { "ServerBase",         -1 /* WID_SERVERBASE */,            ATTR_DEFAULT,   &OUString_getCppuType },
-    { "ServerName",         -1 /* WID_SERVERNAME */,            ATTR_DEFAULT,   &OUString_getCppuType },
-    { "ServerPort",         -1 /* WID_SERVERPORT */,            ATTR_DEFAULT,   &sal_uInt16_getCppuType },
-    { "Size",               -1 /* WID_DOCUMENT_SIZE */,         ATTR_DEFAULT | PropertyAttribute::READONLY,
+                            -1,                                 ATTR_DEFAULT,   &OUString_getCppuType },
+    { "ServerBase",         -1,                                 ATTR_DEFAULT,   &OUString_getCppuType },
+    { "ServerName",         -1,                                 ATTR_DEFAULT,   &OUString_getCppuType },
+    { "ServerPort",         -1,                                 ATTR_DEFAULT,   &sal_uInt16_getCppuType },
+    { "Size",               -1,                                 ATTR_DEFAULT | PropertyAttribute::READONLY,
                                                                                             &sal_uInt64_getCppuType },
-    { "SizeLimit",          -1 /* WID_SIZE_LIMIT */,            ATTR_DEFAULT,   &sal_uInt64_getCppuType },
-    { "SubscribedCount",    -1 /* WID_SUBSCRNEWSGROUPCOUNT */,  ATTR_DEFAULT | PropertyAttribute::READONLY,
+    { "SizeLimit",          -1,                                 ATTR_DEFAULT,   &sal_uInt64_getCppuType },
+    { "SubscribedCount",    -1,                                 ATTR_DEFAULT | PropertyAttribute::READONLY,
                                                                                             &sal_uInt32_getCppuType },
-    { "SynchronizePolicy",  -1 /* WID_WHO_IS_MASTER */,         ATTR_DEFAULT,   &enum_getCppuType },
-    { "TargetFrames",       -1 /* WID_TARGET_FRAMES */,         ATTR_DEFAULT,   &OUString_getCppuType },
-    { "TargetURL",          -1 /* WID_TARGET_URL */,            ATTR_DEFAULT,   &OUString_getCppuType },
-//  { "ThreadingInfo",      -1 /* WID_THREADING */,             ATTR_DEFAULT,   &Sequence_ThreadingInfo_getCppuType },
-    { "TimeLimitStore",     -1 /* WID_STORE_MSGS_TIMELIMIT */,  ATTR_DEFAULT,   &sal_uInt16_getCppuType },
-    { "Title",              -1 /* WID_TITLE */,                 ATTR_DEFAULT,   &OUString_getCppuType },
-    { "UpdateOnOpen",       -1 /* WID_FLAG_UPDATE_ON_OPEN */,   ATTR_DEFAULT,   &sal_Bool_getCppuType },
+    { "SynchronizePolicy",  -1,                                 ATTR_DEFAULT,   &enum_getCppuType },
+    { "TargetFrames",       -1,                                 ATTR_DEFAULT,   &OUString_getCppuType },
+    { "TargetURL",          -1,                                 ATTR_DEFAULT,   &OUString_getCppuType },
+    { "TimeLimitStore",     -1,                                 ATTR_DEFAULT,   &sal_uInt16_getCppuType },
+    { "Title",              -1,                                 ATTR_DEFAULT,   &OUString_getCppuType },
+    { "UpdateOnOpen",       -1,                                 ATTR_DEFAULT,   &sal_Bool_getCppuType },
     { "UseOutBoxPrivateProtocolSettings",
-                            -1 /* WID_SEND_PRIVATE_OUTBOXPROPS */,
-                                                                ATTR_DEFAULT,   &sal_Bool_getCppuType },
+                            -1,                                 ATTR_DEFAULT,   &sal_Bool_getCppuType },
     { "UseOutBoxPublicProtocolSettings",
-                            -1 /* WID_SEND_PUBLIC_OUTBOXPROPS */,
-                                                                ATTR_DEFAULT,   &sal_Bool_getCppuType },
-    { "UserName",           -1 /* WID_USERNAME */,              ATTR_DEFAULT,   &OUString_getCppuType },
-    { "UserSortCriterium",  -1 /* WID_USER_SORT_CRITERIUM */,   ATTR_DEFAULT,   &OUString_getCppuType },
-    { "VIMPostOfficePath",  -1 /* WID_VIM_POPATH */,            ATTR_DEFAULT,   &OUString_getCppuType },
-    { "VerificationMode",   -1 /* WID_HTTP_VERIFY_MODE */,      ATTR_DEFAULT,   &enum_getCppuType },
+                            -1,                                 ATTR_DEFAULT,   &sal_Bool_getCppuType },
+    { "UserName",           -1,                                 ATTR_DEFAULT,   &OUString_getCppuType },
+    { "UserSortCriterium",  -1,                                 ATTR_DEFAULT,   &OUString_getCppuType },
+    { "VIMPostOfficePath",  -1,                                 ATTR_DEFAULT,   &OUString_getCppuType },
+    { "VerificationMode",   -1,                                 ATTR_DEFAULT,   &enum_getCppuType },
 
     //////////////////////////////////////////////////////////////////////////////////////////////////////////////
     // EOT.


More information about the Libreoffice-commits mailing list