diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-03-29 07:42:50 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-03-29 07:42:50 +0000 |
| commit | 9cdc926249ac3c399684a19d1bf527f271ab9d9c (patch) | |
| tree | ea7b588f69bdffcf74d7564072831aa544802ed8 /sfx2/source/appl/shutdowniconw32.cxx | |
| parent | 3ff65618f9d66e2477d5c17bbc87e1290d99cb29 (diff) | |
INTEGRATION: CWS pb12 (1.33.138); FILE MERGED
2006/03/16 07:29:41 pb 1.33.138.2: RESYNC: (1.33-1.35); FILE MERGED
2006/02/14 10:45:51 pb 1.33.138.1: fix: #i60085# description of database now from SvFileInformationManager
Diffstat (limited to 'sfx2/source/appl/shutdowniconw32.cxx')
| -rw-r--r-- | sfx2/source/appl/shutdowniconw32.cxx | 29 |
1 files changed, 4 insertions, 25 deletions
diff --git a/sfx2/source/appl/shutdowniconw32.cxx b/sfx2/source/appl/shutdowniconw32.cxx index fdeb5e3d922e..75de0b96f20d 100644 --- a/sfx2/source/appl/shutdowniconw32.cxx +++ b/sfx2/source/appl/shutdowniconw32.cxx @@ -4,9 +4,9 @@ * * $RCSfile: shutdowniconw32.cxx,v $ * - * $Revision: 1.35 $ + * $Revision: 1.36 $ * - * last change: $Author: rt $ $Date: 2006-02-06 13:53:34 $ + * last change: $Author: obo $ $Date: 2006-03-29 08:42:50 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -247,29 +247,8 @@ static HMENU createSystrayMenu( ) addMenuItem( hMenu, IDM_DRAW, ICON_DRAWING_DOCUMENT, pShutdownIcon->GetUrlDescription( OUString( RTL_CONSTASCII_USTRINGPARAM ( DRAW_URL ) ) ), pos, true ); if ( aModuleOptions.IsDataBase() ) - { - SvtDynamicMenuOptions aOpt; - Sequence < Sequence < PropertyValue > > aMenu = aOpt.GetMenu( E_NEWMENU ); - for ( sal_Int32 n=0; n<aMenu.getLength(); n++ ) - { - ::rtl::OUString aURL; - ::rtl::OUString aDescription; - Sequence < PropertyValue >& aEntry = aMenu[n]; - for ( sal_Int32 m=0; m<aEntry.getLength(); m++ ) - { - if ( aEntry[m].Name.equalsAsciiL( "URL", 3 ) ) - aEntry[m].Value >>= aURL; - if ( aEntry[m].Name.equalsAsciiL( "Title", 5 ) ) - aEntry[m].Value >>= aDescription; - } - - if ( aURL.equalsAscii( BASE_URL ) && aDescription.getLength() ) - { - addMenuItem( hMenu, IDM_BASE, ICON_DATABASE_DOCUMENT, aDescription, pos, true ); - break; - } - } - } + addMenuItem( hMenu, IDM_BASE, ICON_DATABASE_DOCUMENT, + pShutdownIcon->GetUrlDescription( OUString( RTL_CONSTASCII_USTRINGPARAM ( BASE_URL ) ) ), pos, true ); addMenuItem( hMenu, IDM_TEMPLATE, ICON_TEMPLATE, pShutdownIcon->GetResString( STR_QUICKSTART_FROMTEMPLATE ), pos, true); |