[Libreoffice-commits] .: cui/source

[Libreoffice Gerrit user]

 cui/source/options/treeopt.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 09ee17974f31ca188df532a2fea33a79ca367ebe
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Nov 13 14:33:01 2012 +0100

    Fix Which-ID range of OfaTreeOptionsDialog item set
    
    ...by properly re-merging
    <http://svn.apache.org/viewvc?view=revision&revision=1172345> "cws
    mba34issues01: #i117716#: fix missing resources my removing unused code"
    (changing the start ID from SID_OPTIONS_START to SID_INET_EMAIL_NAME) brought in
    by 015b29b74aaf16f5bdf6a90f6e7d5c1d210fe281 "re-base on ALv2 code" (but
    erroneously dropping the start ID) with 5fcecf9b88a0879081d8239cebbc03e30150985a
    "hrc cleanup: Remove unused defines" (removing unused SID_INET_EMAIL_NAME).
    
    Change-Id: I3f10b5ec166a8bf4763ef8e44d3095bb816277d0

diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index b0ed3a3..79eabdf 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -1271,7 +1271,7 @@ SfxItemSet* OfaTreeOptionsDialog::CreateItemSet( sal_uInt16 nId )
                 pRet = new SfxItemSet( SFX_APP()->GetPool(),
                                 SID_BASIC_ENABLED, SID_BASIC_ENABLED,
                 //SID_OPTIONS_START - ..END
-                                SID_INET_PROXY_PORT,
+                                SID_INET_PROXY_TYPE, SID_INET_PROXY_PORT,
                                 SID_SAVEREL_INET, SID_SAVEREL_FSYS,
                                 SID_INET_SMTPSERVER, SID_INET_SMTPSERVER,
                                 SID_INET_NOPROXY, SID_INET_SOCKS_PROXY_PORT,