From c951b0a3b27e2dd5a650de21c11c56aa0b734960 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Mon, 7 Dec 2009 19:30:52 +0100 Subject: dtardon01: #i107506#: remove unused variable --- framework/source/uielement/rootitemcontainer.cxx | 1 - 1 file changed, 1 deletion(-) (limited to 'framework/source') diff --git a/framework/source/uielement/rootitemcontainer.cxx b/framework/source/uielement/rootitemcontainer.cxx index e560a95d7923..88a6296f3e2e 100644 --- a/framework/source/uielement/rootitemcontainer.cxx +++ b/framework/source/uielement/rootitemcontainer.cxx @@ -130,7 +130,6 @@ RootItemContainer::RootItemContainer( const Reference< XIndexAccess >& rSourceCo Reference< XPropertySet > xPropSet( rSourceContainer, UNO_QUERY ); if ( xPropSet.is() ) { - rtl::OUString aUIName; xPropSet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UIName" ))) >>= m_aUIName; } } -- cgit v1.2.3 From 5e2e0c158c73af234483bbe42bf92620c75defbf Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sun, 13 Dec 2009 12:40:51 +0100 Subject: dtardon01: #i107647#: remove empty files in framework --- framework/inc/xml/toolboxlayoutdocumenthandler.hxx | 62 ---------------------- framework/source/xml/makefile.mk | 1 - framework/source/xml/toolboxconfiguration.cxx | 1 - .../source/xml/toolboxlayoutdocumenthandler.cxx | 61 --------------------- framework/util/makefile.mk | 1 - 5 files changed, 126 deletions(-) delete mode 100644 framework/inc/xml/toolboxlayoutdocumenthandler.hxx delete mode 100644 framework/source/xml/toolboxlayoutdocumenthandler.cxx (limited to 'framework/source') diff --git a/framework/inc/xml/toolboxlayoutdocumenthandler.hxx b/framework/inc/xml/toolboxlayoutdocumenthandler.hxx deleted file mode 100644 index ced778db99eb..000000000000 --- a/framework/inc/xml/toolboxlayoutdocumenthandler.hxx +++ /dev/null @@ -1,62 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: toolboxlayoutdocumenthandler.hxx,v $ - * $Revision: 1.6 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef __FRAMEWORK_XML_TOOLBOXLAYOUTDOCUMENTHANDLER_HXX_ -#define __FRAMEWORK_XML_TOOLBOXLAYOUTDOCUMENTHANDLER_HXX_ - -#include - -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ - -#ifndef __COM_SUN_STAR_XML_SAX_XDOCUMENTHANDLER_HPP_ -#include -#endif - -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ -#include -#include -#include - -#include -#include - -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ - -namespace framework{ - -} // namespace framework - -#endif diff --git a/framework/source/xml/makefile.mk b/framework/source/xml/makefile.mk index 2d610ca0f3d9..4ff7aaa2b7a4 100644 --- a/framework/source/xml/makefile.mk +++ b/framework/source/xml/makefile.mk @@ -51,7 +51,6 @@ SLOFILES= \ $(SLO)$/statusbardocumenthandler.obj \ $(SLO)$/toolboxconfiguration.obj \ $(SLO)$/toolboxdocumenthandler.obj \ - $(SLO)$/toolboxlayoutdocumenthandler.obj \ $(SLO)$/saxnamespacefilter.obj \ $(SLO)$/xmlnamespaces.obj \ $(SLO)$/acceleratorconfigurationreader.obj \ diff --git a/framework/source/xml/toolboxconfiguration.cxx b/framework/source/xml/toolboxconfiguration.cxx index 1c6ba1e1cfab..430d209d592b 100644 --- a/framework/source/xml/toolboxconfiguration.cxx +++ b/framework/source/xml/toolboxconfiguration.cxx @@ -33,7 +33,6 @@ #include "precompiled_framework.hxx" #include #include -#include #include #include diff --git a/framework/source/xml/toolboxlayoutdocumenthandler.cxx b/framework/source/xml/toolboxlayoutdocumenthandler.cxx deleted file mode 100644 index 5fb9d7677a83..000000000000 --- a/framework/source/xml/toolboxlayoutdocumenthandler.cxx +++ /dev/null @@ -1,61 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: toolboxlayoutdocumenthandler.cxx,v $ - * $Revision: 1.7 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_framework.hxx" - -#include - -//_________________________________________________________________________________________________________________ -// my own includes -//_________________________________________________________________________________________________________________ - -#include -#include -#include -#include - -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ - -#ifndef __COM_SUN_STAR_XML_SAX_XEXTENDEDDOCUMENTHANDLER_HPP_ -#include -#endif - -//_________________________________________________________________________________________________________________ -// other includes -//_________________________________________________________________________________________________________________ -#include -#include - -//_________________________________________________________________________________________________________________ -// namespace -//_________________________________________________________________________________________________________________ diff --git a/framework/util/makefile.mk b/framework/util/makefile.mk index 0a07f3cf137d..30c052edc59f 100644 --- a/framework/util/makefile.mk +++ b/framework/util/makefile.mk @@ -83,7 +83,6 @@ LIB2OBJFILES= \ $(SLO)$/statusbardocumenthandler.obj \ $(SLO)$/toolboxconfiguration.obj \ $(SLO)$/toolboxdocumenthandler.obj \ - $(SLO)$/toolboxlayoutdocumenthandler.obj \ $(SLO)$/imagesconfiguration.obj \ $(SLO)$/imagesdocumenthandler.obj \ $(SLO)$/xmlnamespaces.obj \ -- cgit v1.2.3 From cdfc28186d3a68ab08f98d632618be8523cefb1b Mon Sep 17 00:00:00 2001 From: Ivo Hinkelmann Date: Wed, 5 May 2010 14:27:57 +0200 Subject: fwk140: #i110815# do not rely on font size to align buttons below new bitmap background --- framework/source/services/backingwindow.cxx | 6 +++++- framework/source/services/backingwindow.hxx | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'framework/source') diff --git a/framework/source/services/backingwindow.cxx b/framework/source/services/backingwindow.cxx index 21c62fd89a54..e255d586392a 100644 --- a/framework/source/services/backingwindow.cxx +++ b/framework/source/services/backingwindow.cxx @@ -133,7 +133,8 @@ BackingWindow::BackingWindow( Window* i_pParent ) : mbInitControls( false ), mnLayoutStyle( 0 ), mpAccExec( NULL ), - mnBtnPos( 120 ) + mnBtnPos( 120 ), + mnBtnTop( 150 ) { mnColumnWidth[0] = mnColumnWidth[1] = 0; mnTextColumnWidth[0] = mnTextColumnWidth[1] = 0; @@ -733,6 +734,9 @@ void BackingWindow::Resize() nYPos += nWDelta/2 - nDiff; + if( mnLayoutStyle != 1 ) + nYPos = maControlRect.Top() + mnBtnTop; + maWriterButton.SetPosSizePixel( Point( maControlRect.Left() + mnBtnPos, nYPos ), Size( mnTextColumnWidth[0], maButtonImageSize.Height() ) ); maDrawButton.SetPosSizePixel( Point( maControlRect.Left() + mnBtnPos + mnColumnWidth[0], nYPos ), Size( mnTextColumnWidth[1], maButtonImageSize.Height() ) ); nYPos += nBDelta - nDiff; diff --git a/framework/source/services/backingwindow.hxx b/framework/source/services/backingwindow.hxx index 76a12a48b816..c4d4c9b0b76b 100644 --- a/framework/source/services/backingwindow.hxx +++ b/framework/source/services/backingwindow.hxx @@ -121,6 +121,7 @@ namespace framework sal_Int32 mnLayoutStyle; svt::AcceleratorExecute* mpAccExec; long mnBtnPos; + long mnBtnTop; static const int nItemId_Extensions = 1; static const int nItemId_Reg = 2; -- cgit v1.2.3 From 7062641db71988f68a1e144375d3cda8d90d77b4 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 12 Apr 2010 15:34:14 +0100 Subject: cmcfixes74: #i110565 use radio buttons for mutually exclusive options in menus --- .../uielement/langselectionmenucontroller.cxx | 10 ++++++++-- .../uielement/langselectionstatusbarcontroller.cxx | 21 ++++++++++++++------- framework/source/uielement/menubarmanager.cxx | 11 ++++++++--- framework/source/xml/menudocumenthandler.cxx | 14 +++++++++++--- 4 files changed, 41 insertions(+), 15 deletions(-) (limited to 'framework/source') diff --git a/framework/source/uielement/langselectionmenucontroller.cxx b/framework/source/uielement/langselectionmenucontroller.cxx index 9c8e68e24734..f2c905f237e8 100644 --- a/framework/source/uielement/langselectionmenucontroller.cxx +++ b/framework/source/uielement/langselectionmenucontroller.cxx @@ -344,6 +344,9 @@ void LanguageSelectionMenuController::fillPopupMenu( Reference< css::awt::XPopup std::map< sal_Int16, ::rtl::OUString > LangTable; const ::rtl::OUString sAsterix(RTL_CONSTASCII_USTRINGPARAM("*")); + bool bMultipleLanguages = (eMode != MODE_SetLanguageSelectionMenu) || m_aCurLang.compareToAscii( "*" ) == 0; + bool bNothingSelected = true; + MenuItemBits nItemBits = !bMultipleLanguages ? MIB_RADIOCHECK : 0; for(std::map< ::rtl::OUString, ::rtl::OUString >::const_iterator it = LangItems.begin(); it != LangItems.end(); ++it) { if(it->first != ::rtl::OUString( aLangTable.GetString( LANGUAGE_NONE ) )&& @@ -351,12 +354,13 @@ void LanguageSelectionMenuController::fillPopupMenu( Reference< css::awt::XPopup it->first.getLength()) { ++nItemId; - pPopupMenu->InsertItem( nItemId,it->first); + pPopupMenu->InsertItem( nItemId,it->first,nItemBits ); LangTable[nItemId] = it->first; if(it->first == m_aCurLang && eMode == MODE_SetLanguageSelectionMenu ) { //make a sign for the current language pPopupMenu->CheckItem(nItemId,TRUE); + bNothingSelected = false; } aCmd=aCmd_Language; aCmd+=(String)it->first; @@ -366,7 +370,9 @@ void LanguageSelectionMenuController::fillPopupMenu( Reference< css::awt::XPopup //7--none nItemId++; - pPopupMenu->InsertItem( nItemId, String(FwlResId( STR_LANGSTATUS_NONE )) ); + pPopupMenu->InsertItem( nItemId, String(FwlResId( STR_LANGSTATUS_NONE )), nItemBits ); + if (bNothingSelected && !bMultipleLanguages) + pPopupMenu->CheckItem(nItemId,TRUE); aCmd=aCmd_Language; aCmd+=String::CreateFromAscii("LANGUAGE_NONE"); pPopupMenu->SetItemCommand(nItemId,aCmd); diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx b/framework/source/uielement/langselectionstatusbarcontroller.cxx index 953470314785..544597261852 100644 --- a/framework/source/uielement/langselectionstatusbarcontroller.cxx +++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx @@ -272,6 +272,9 @@ void LangSelectionStatusbarController::LangMenu()throw (::com::sun::star::uno::R } } std::map< sal_Int16, ::rtl::OUString > LangTable; + bool bMultipleLanguages = m_aCurLang.compareToAscii( "*" ) == 0; + bool bNothingSelected = true; + sal_Int16 nMenuItemStyle = !bMultipleLanguages ? css::awt::MenuItemStyle::RADIOCHECK : 0; for( std::set< ::rtl::OUString >::const_iterator it = LangItems.begin(); it != LangItems.end(); ++it ) { @@ -281,22 +284,26 @@ void LangSelectionStatusbarController::LangMenu()throw (::com::sun::star::uno::R { //nItemId = xPopupMenu->getItemCount()+1; nItemId++; - xPopupMenu->insertItem( nItemId, *it, css::awt::MenuItemStyle::RADIOCHECK, nItemId ); + xPopupMenu->insertItem( nItemId, *it, nMenuItemStyle, nItemId ); LangTable[nItemId]=*it; if( *it == m_aCurLang ) { //make a sign for the current language xPopupMenu->checkItem( nItemId, TRUE ); + bNothingSelected = false; } } } //7--none nItemId++; - xPopupMenu->insertItem( nItemId, String( FwkResId( STR_LANGSTATUS_NONE )), css::awt::MenuItemStyle::RADIOCHECK, nItemId ); + xPopupMenu->insertItem( nItemId, String( FwkResId( STR_LANGSTATUS_NONE )), nMenuItemStyle, nItemId ); + if (bNothingSelected && !bMultipleLanguages) + xPopupMenu->checkItem( nItemId, TRUE ); + //More... nItemId++; - xPopupMenu->insertItem( nItemId, String( FwkResId( STR_LANGSTATUS_MORE )), css::awt::MenuItemStyle::RADIOCHECK, nItemId ); + xPopupMenu->insertItem( nItemId, String( FwkResId( STR_LANGSTATUS_MORE )), 0, nItemId ); for( ::std::set< ::rtl::OUString >::const_iterator it = LangItems.begin(); it != LangItems.end(); ++it ) { @@ -305,22 +312,22 @@ void LangSelectionStatusbarController::LangMenu()throw (::com::sun::star::uno::R *it != ::rtl::OUString::createFromAscii( "" )) { nItemId++; - subPopupMenu->insertItem( nItemId, *it, css::awt::MenuItemStyle::RADIOCHECK, nItemId ); + subPopupMenu->insertItem( nItemId, *it, 0, nItemId ); LangTable[nItemId]=*it; } } //7--none nItemId++; - subPopupMenu->insertItem( nItemId, String( FwkResId( STR_LANGSTATUS_NONE )), css::awt::MenuItemStyle::RADIOCHECK, nItemId ); + subPopupMenu->insertItem( nItemId, String( FwkResId( STR_LANGSTATUS_NONE )), 0, nItemId ); //More nItemId++; - subPopupMenu->insertItem( nItemId, String( FwkResId( STR_LANGSTATUS_MORE )), css::awt::MenuItemStyle::RADIOCHECK, nItemId ); + subPopupMenu->insertItem( nItemId, String( FwkResId( STR_LANGSTATUS_MORE )), 0, nItemId ); nItemId++; xPopupMenu->insertSeparator(nItemId); nItemId++; - xPopupMenu->insertItem( nItemId, String( FwkResId( STR_SET_LANGUAGE_FOR_PARAGRAPH )), css::awt::MenuItemStyle::RADIOCHECK, nItemId ); + xPopupMenu->insertItem( nItemId, String( FwkResId( STR_SET_LANGUAGE_FOR_PARAGRAPH )), 0, nItemId ); xPopupMenu->setPopupMenu( nItemId, subPopupMenu ); //display the popup menu and execute every command diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index 9fbdf87336cc..9d8aa9205c90 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -548,11 +548,14 @@ throw ( RuntimeException ) if ( Event.State >>= bCheckmark ) { - // Checkmark + // Checkmark or RadioButton m_pVCLMenu->ShowItem( pMenuItemHandler->nItemId, TRUE ); m_pVCLMenu->CheckItem( pMenuItemHandler->nItemId, bCheckmark ); - m_pVCLMenu->SetItemBits( pMenuItemHandler->nItemId, - m_pVCLMenu->GetItemBits( pMenuItemHandler->nItemId ) | MIB_CHECKABLE ); + + MenuItemBits nBits = m_pVCLMenu->GetItemBits( pMenuItemHandler->nItemId ); + //If not already designated RadioButton set as CheckMark + if (!(nBits & MIB_RADIOCHECK)) + m_pVCLMenu->SetItemBits( pMenuItemHandler->nItemId, nBits | MIB_CHECKABLE ); } else if ( Event.State >>= aItemText ) { @@ -1805,6 +1808,8 @@ void MenuBarManager::FillMenu( nBits |= MIB_ICON; if ( nStyle & ::com::sun::star::ui::ItemStyle::TEXT ) nBits |= MIB_TEXT; + if ( nStyle & ::com::sun::star::ui::ItemStyle::RADIO_CHECK ) + nBits |= MIB_RADIOCHECK; pMenu->SetItemBits( nId, nBits ); } if ( xIndexContainer.is() ) diff --git a/framework/source/xml/menudocumenthandler.cxx b/framework/source/xml/menudocumenthandler.cxx index 90f5fb25dec3..3fc5d1775be4 100644 --- a/framework/source/xml/menudocumenthandler.cxx +++ b/framework/source/xml/menudocumenthandler.cxx @@ -94,6 +94,7 @@ #define ATTRIBUTE_ITEMSTYLE_TEXT "text" #define ATTRIBUTE_ITEMSTYLE_IMAGE "image" +#define ATTRIBUTE_ITEMSTYLE_RADIO "radio" // Property names of a menu/menu item ItemDescriptor static const char ITEM_DESCRIPTOR_COMMANDURL[] = "CommandURL"; @@ -134,6 +135,7 @@ struct MenuStyleItem MenuStyleItem MenuItemStyles[ ] = { { ::com::sun::star::ui::ItemStyle::ICON, ATTRIBUTE_ITEMSTYLE_IMAGE }, { ::com::sun::star::ui::ItemStyle::TEXT, ATTRIBUTE_ITEMSTYLE_TEXT }, + { ::com::sun::star::ui::ItemStyle::RADIO_CHECK, ATTRIBUTE_ITEMSTYLE_RADIO } }; @@ -437,8 +439,10 @@ throw( SAXException, RuntimeException ) { if ( aToken.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_ITEMSTYLE_TEXT ) ) ) nItemBits |= ::com::sun::star::ui::ItemStyle::TEXT; - if ( aToken.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_ITEMSTYLE_IMAGE ) ) ) + else if ( aToken.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_ITEMSTYLE_IMAGE ) ) ) nItemBits |= ::com::sun::star::ui::ItemStyle::ICON; + else if ( aToken.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_ITEMSTYLE_RADIO ) ) ) + nItemBits |= ::com::sun::star::ui::ItemStyle::RADIO_CHECK; } } while ( nIndex >= 0 ); @@ -670,8 +674,10 @@ throw( SAXException, RuntimeException ) { if ( aToken.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_ITEMSTYLE_TEXT ) ) ) nItemBits |= ::com::sun::star::ui::ItemStyle::TEXT; - if ( aToken.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_ITEMSTYLE_IMAGE ) ) ) + else if ( aToken.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_ITEMSTYLE_IMAGE ) ) ) nItemBits |= ::com::sun::star::ui::ItemStyle::ICON; + else if ( aToken.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_ITEMSTYLE_RADIO ) ) ) + nItemBits |= ::com::sun::star::ui::ItemStyle::RADIO_CHECK; } } while ( nIndex >= 0 ); @@ -725,8 +731,10 @@ throw( SAXException, RuntimeException ) { if ( aToken.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_ITEMSTYLE_TEXT ) ) ) nItemBits |= ::com::sun::star::ui::ItemStyle::TEXT; - if ( aToken.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_ITEMSTYLE_IMAGE ) ) ) + else if ( aToken.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_ITEMSTYLE_IMAGE ) ) ) nItemBits |= ::com::sun::star::ui::ItemStyle::ICON; + else if ( aToken.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_ITEMSTYLE_RADIO ) ) ) + nItemBits |= ::com::sun::star::ui::ItemStyle::RADIO_CHECK; } } while ( nIndex >= 0 ); -- cgit v1.2.3 From d764822dedfaf06e9731f0cce1a9e4469932fb34 Mon Sep 17 00:00:00 2001 From: Ivo Hinkelmann Date: Mon, 10 May 2010 11:39:38 +0200 Subject: nativeb: #i110826# add separate template button to StartCenter again, add HC images for StartCenter --- framework/inc/framework.hrc | 25 ++++---- framework/source/services/backingwindow.cxx | 32 +++++----- framework/source/services/fwk_services.src | 92 ++++++++++++++++++++--------- 3 files changed, 93 insertions(+), 56 deletions(-) (limited to 'framework/source') diff --git a/framework/inc/framework.hrc b/framework/inc/framework.hrc index e49192aa7c33..eea91edeaa07 100644 --- a/framework/inc/framework.hrc +++ b/framework/inc/framework.hrc @@ -51,19 +51,10 @@ #define STR_BACKING_CREATE 3 #define STR_BACKING_TEMPLATE 4 #define STR_BACKING_FILE 5 -#define BMP_BACKING_WRITER 6 -#define BMP_BACKING_CALC 7 -#define BMP_BACKING_IMPRESS 8 -#define BMP_BACKING_DRAW 9 -#define BMP_BACKING_DATABASE 10 -#define BMP_BACKING_FORMULA 11 -#define BMP_BACKING_OPENFILE 12 -#define BMP_BACKING_OPENTEMPLATE 13 -#define STR_BACKING_EXTHELP 15 -#define STR_BACKING_REGHELP 17 -#define STR_BACKING_INFOHELP 19 -#define STR_BACKING_TPLREP 21 -#define BMP_BACKING_FOLDER 22 +#define STR_BACKING_EXTHELP 6 +#define STR_BACKING_REGHELP 7 +#define STR_BACKING_INFOHELP 8 +#define STR_BACKING_TPLREP 9 #define RES_BACKING_IMAGES (DLG_BACKING+1) #define RES_BACKING_IMAGES_HC (DLG_BACKING+2) @@ -77,6 +68,14 @@ #define BMP_BACKING_REG 7 #define BMP_BACKING_INFO 8 #define BMP_BACKING_TPLREP 9 +#define BMP_BACKING_WRITER 10 +#define BMP_BACKING_CALC 11 +#define BMP_BACKING_IMPRESS 12 +#define BMP_BACKING_DRAW 13 +#define BMP_BACKING_DATABASE 14 +#define BMP_BACKING_FORMULA 15 +#define BMP_BACKING_OPENFILE 16 +#define BMP_BACKING_OPENTEMPLATE 17 // Ids of TabWindow #define WIN_TABWINDOW (RID_FWK_DIALOG_START+101) diff --git a/framework/source/services/backingwindow.cxx b/framework/source/services/backingwindow.cxx index e255d586392a..e4d37d1fe059 100644 --- a/framework/source/services/backingwindow.cxx +++ b/framework/source/services/backingwindow.cxx @@ -164,16 +164,6 @@ BackingWindow::BackingWindow( Window* i_pParent ) : { } - // get icon images from vcl resource and set them on the appropriate buttons - loadImage( FwkResId( BMP_BACKING_WRITER ), maWriterButton ); - loadImage( FwkResId( BMP_BACKING_CALC ), maCalcButton ); - loadImage( FwkResId( BMP_BACKING_IMPRESS ), maImpressButton ); - loadImage( FwkResId( BMP_BACKING_DRAW ), maDrawButton ); - loadImage( FwkResId( BMP_BACKING_DATABASE ), maDBButton ); - loadImage( FwkResId( BMP_BACKING_FORMULA ), maMathButton ); - loadImage( FwkResId( BMP_BACKING_FOLDER ), maOpenButton ); - loadImage( FwkResId( BMP_BACKING_FOLDER ), maTemplateButton ); - String aExtHelpText( FwkResId( STR_BACKING_EXTHELP ) ); String aRegHelpText( FwkResId( STR_BACKING_REGHELP ) ); String aInfoHelpText( FwkResId( STR_BACKING_INFOHELP ) ); @@ -188,10 +178,6 @@ BackingWindow::BackingWindow( Window* i_pParent ) : SetStyle( GetStyle() | WB_DIALOGCONTROL ); - // add some breathing space for the images - maButtonImageSize.Width() += 12; - maButtonImageSize.Height() += 12; - // force tab cycling in toolbox maToolbox.SetStyle( maToolbox.GetStyle() | WB_FORCETABCYCLE ); @@ -237,6 +223,11 @@ BackingWindow::BackingWindow( Window* i_pParent ) : // init background initBackground(); + + // add some breathing space for the images + maButtonImageSize.Width() += 12; + maButtonImageSize.Height() += 12; + } @@ -325,6 +316,17 @@ void BackingWindow::initBackground() else mnBtnPos = maBackgroundLeft.GetSizePixel().Width() + 40; } + + // get icon images from fwk resource and set them on the appropriate buttons + loadImage( FwkResId( BMP_BACKING_WRITER ), maWriterButton ); + loadImage( FwkResId( BMP_BACKING_CALC ), maCalcButton ); + loadImage( FwkResId( BMP_BACKING_IMPRESS ), maImpressButton ); + loadImage( FwkResId( BMP_BACKING_DRAW ), maDrawButton ); + loadImage( FwkResId( BMP_BACKING_DATABASE ), maDBButton ); + loadImage( FwkResId( BMP_BACKING_FORMULA ), maMathButton ); + loadImage( FwkResId( BMP_BACKING_OPENFILE ), maOpenButton ); + loadImage( FwkResId( BMP_BACKING_OPENTEMPLATE ), maTemplateButton ); + } void BackingWindow::initControls() @@ -551,7 +553,7 @@ void BackingWindow::layoutButton( long nTextWidth = i_rBtn.GetTextWidth( i_rBtn.GetText() ); - nTextWidth += maButtonImageSize.Width(); + nTextWidth += maButtonImageSize.Width() + 8; // add some fuzz to be on the safe side if( nColumn >= 0 && nColumn < static_cast(sizeof(mnColumnWidth)/sizeof(mnColumnWidth[0])) ) { if( nTextWidth > mnColumnWidth[nColumn] ) diff --git a/framework/source/services/fwk_services.src b/framework/source/services/fwk_services.src index 7e2ee3253e71..7ad8b4c3cede 100644 --- a/framework/source/services/fwk_services.src +++ b/framework/source/services/fwk_services.src @@ -53,34 +53,6 @@ Window DLG_BACKING { Text [ en-US ] = "~Open a document..."; }; - Bitmap BMP_BACKING_WRITER - { - File = "odt_32.png"; - }; - Bitmap BMP_BACKING_CALC - { - File = "ods_32.png"; - }; - Bitmap BMP_BACKING_IMPRESS - { - File = "odp_32.png"; - }; - Bitmap BMP_BACKING_DRAW - { - File = "odg_32.png"; - }; - Bitmap BMP_BACKING_DATABASE - { - File = "odb_32.png"; - }; - Bitmap BMP_BACKING_FORMULA - { - File = "odf_32.png"; - }; - Bitmap BMP_BACKING_FOLDER - { - File = "folder_32.png"; - }; String STR_BACKING_EXTHELP { Text [ en-US ] = "Add new features to %PRODUCTNAME"; @@ -137,6 +109,38 @@ Resource RES_BACKING_IMAGES { File = "addtemplate_32.png"; }; + Bitmap BMP_BACKING_WRITER + { + File = "odt_32.png"; + }; + Bitmap BMP_BACKING_CALC + { + File = "ods_32.png"; + }; + Bitmap BMP_BACKING_IMPRESS + { + File = "odp_32.png"; + }; + Bitmap BMP_BACKING_DRAW + { + File = "odg_32.png"; + }; + Bitmap BMP_BACKING_DATABASE + { + File = "odb_32.png"; + }; + Bitmap BMP_BACKING_FORMULA + { + File = "odf_32.png"; + }; + Bitmap BMP_BACKING_OPENFILE + { + File = "folder_32.png"; + }; + Bitmap BMP_BACKING_OPENTEMPLATE + { + File = "templates_32.png"; + }; }; Resource RES_BACKING_IMAGES_HC @@ -177,6 +181,38 @@ Resource RES_BACKING_IMAGES_HC { File = "template_hc.png"; }; + Bitmap BMP_BACKING_WRITER + { + File = "odt_32_hc.png"; + }; + Bitmap BMP_BACKING_CALC + { + File = "ods_32_hc.png"; + }; + Bitmap BMP_BACKING_IMPRESS + { + File = "odp_32_hc.png"; + }; + Bitmap BMP_BACKING_DRAW + { + File = "odg_32_hc.png"; + }; + Bitmap BMP_BACKING_DATABASE + { + File = "odb_32_hc.png"; + }; + Bitmap BMP_BACKING_FORMULA + { + File = "odf_32_hc.png"; + }; + Bitmap BMP_BACKING_OPENFILE + { + File = "folder_32_hc.png"; + }; + Bitmap BMP_BACKING_OPENTEMPLATE + { + File = "templates_32_hc.png"; + }; }; Window WIN_TABWINDOW -- cgit v1.2.3 From 4342408a8359e590f57b016baaf7d8dcfdebdbd4 Mon Sep 17 00:00:00 2001 From: Carsten Driesner Date: Thu, 6 May 2010 18:15:21 +0200 Subject: fwk142: #i104293 Use Commands.xcu files to mark commands which support a toggle state --- framework/inc/properties.h | 8 + framework/inc/uielement/toolbarmanager.hxx | 2 + framework/inc/uielement/uicommanddescription.hxx | 2 +- framework/source/uielement/toolbarmanager.cxx | 90 +++++--- .../source/uielement/uicommanddescription.cxx | 4 +- .../data/org/openoffice/Office/UI/CalcCommands.xcu | 2 +- .../openoffice/Office/UI/DrawImpressCommands.xcu | 249 +-------------------- .../org/openoffice/Office/UI/GenericCommands.xcu | 138 ++++++------ .../data/org/openoffice/Office/UI/MathCommands.xcu | 2 +- .../org/openoffice/Office/UI/WriterCommands.xcu | 69 ++++-- .../schema/org/openoffice/Office/UI/Commands.xcs | 1 + 11 files changed, 202 insertions(+), 365 deletions(-) (limited to 'framework/source') diff --git a/framework/inc/properties.h b/framework/inc/properties.h index f0358ef6f1a0..5a32a42a28cc 100644 --- a/framework/inc/properties.h +++ b/framework/inc/properties.h @@ -217,6 +217,14 @@ namespace framework{ #define UICOMMANDDESCRIPTION_NAMEACCESS_COMMANDROTATEIMAGELIST "private:resource/image/commandrotateimagelist" #define UICOMMANDDESCRIPTION_NAMEACCESS_COMMANDMIRRORIMAGELIST "private:resource/image/commandmirrorimagelist" +#define UICOMMANDDESCRIPTION_PROPNAME_PROPERTIES "Properties" +#define UICOMMANDDESCRIPTION_PROPNAME_POPUP "Popup" + +#define UICOMMANDDESCRIPTION_PROPERTIES_IMAGE 1 +#define UICOMMANDDESCRIPTION_PROPERTIES_IMAGE_MIRRORED 2 +#define UICOMMANDDESCRIPTION_PROPERTIES_IMAGE_ROTATED 4 +#define UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON 8 + //_______________________________________________ /** properties for "AutoRecovery" class */ diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx index 98894b623aea..1be8579a4112 100644 --- a/framework/inc/uielement/toolbarmanager.hxx +++ b/framework/inc/uielement/toolbarmanager.hxx @@ -179,6 +179,8 @@ class ToolBarManager : public ::com::sun::star::frame::XFrameActionListener void RemoveControllers(); rtl::OUString RetrieveLabelFromCommand( const rtl::OUString& aCmdURL ); + sal_Int32 RetrievePropertiesFromCommand( const rtl::OUString& aCmdURL ); + ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > GetPropsForCommand( const ::rtl::OUString& rCmdURL ); void CreateControllers(); void UpdateControllers(); void AddFrameActionListener(); diff --git a/framework/inc/uielement/uicommanddescription.hxx b/framework/inc/uielement/uicommanddescription.hxx index d9f8e461c5b5..dd95981bba90 100644 --- a/framework/inc/uielement/uicommanddescription.hxx +++ b/framework/inc/uielement/uicommanddescription.hxx @@ -109,7 +109,7 @@ public: ModuleToCommandFileMap m_aModuleToCommandFileMap; UICommandsHashMap m_aUICommandsHashMap; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xGenericUICommands; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModuleManager > m_xModuleManager; + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModuleManager > m_xModuleManager; }; } // namespace framework diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index d89b81c0f9b6..8171ff2e5419 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -112,6 +112,7 @@ using namespace ::com::sun::star::util; using namespace ::com::sun::star::container; using namespace ::com::sun::star::frame; using namespace ::com::sun::star::ui; +using namespace ::com::sun::star; namespace framework { @@ -803,17 +804,18 @@ void ToolBarManager::RemoveControllers() m_aControllerMap.clear(); } -::rtl::OUString ToolBarManager::RetrieveLabelFromCommand( const ::rtl::OUString& aCmdURL ) +uno::Sequence< beans::PropertyValue > ToolBarManager::GetPropsForCommand( const ::rtl::OUString& rCmdURL ) { - ::rtl::OUString aLabel; + Sequence< PropertyValue > aPropSeq; - // Retrieve popup menu labels - if ( !m_bModuleIdentified ) + // Retrieve properties for command + try { - Reference< XModuleManager > xModuleManager( m_xServiceManager->createInstance( SERVICENAME_MODULEMANAGER ), UNO_QUERY_THROW ); - Reference< XInterface > xIfac( m_xFrame, UNO_QUERY ); - try + if ( !m_bModuleIdentified ) { + Reference< XModuleManager > xModuleManager( m_xServiceManager->createInstance( SERVICENAME_MODULEMANAGER ), UNO_QUERY_THROW ); + Reference< XInterface > xIfac( m_xFrame, UNO_QUERY ); + m_bModuleIdentified = sal_True; m_aModuleIdentifier = xModuleManager->identify( xIfac ); @@ -821,44 +823,57 @@ void ToolBarManager::RemoveControllers() { Reference< XNameAccess > xNameAccess( m_xServiceManager->createInstance( SERVICENAME_UICOMMANDDESCRIPTION ), UNO_QUERY ); if ( xNameAccess.is() ) - { xNameAccess->getByName( m_aModuleIdentifier ) >>= m_xUICommandLabels; - } } } - catch ( Exception& ) + + if ( m_xUICommandLabels.is() ) { + if ( rCmdURL.getLength() > 0 ) + m_xUICommandLabels->getByName( rCmdURL ) >>= aPropSeq; } } + catch ( Exception& ) + { + } - if ( m_xUICommandLabels.is() ) + return aPropSeq; +} + +::rtl::OUString ToolBarManager::RetrieveLabelFromCommand( const ::rtl::OUString& aCmdURL ) +{ + ::rtl::OUString aLabel; + Sequence< PropertyValue > aPropSeq; + + // Retrieve popup menu labels + aPropSeq = GetPropsForCommand( aCmdURL ); + for ( sal_Int32 i = 0; i < aPropSeq.getLength(); i++ ) { - try + if ( aPropSeq[i].Name.equalsAscii( "Name" )) { - if ( aCmdURL.getLength() > 0 ) - { - rtl::OUString aStr; - Sequence< PropertyValue > aPropSeq; - if ( m_xUICommandLabels->getByName( aCmdURL ) >>= aPropSeq ) - { - for ( sal_Int32 i = 0; i < aPropSeq.getLength(); i++ ) - { - if ( aPropSeq[i].Name.equalsAscii( "Name" )) - { - aPropSeq[i].Value >>= aStr; - break; - } - } - } - aLabel = aStr; - } + aPropSeq[i].Value >>= aLabel; + break; } - catch ( com::sun::star::uno::Exception& ) + } + return aLabel; +} + +sal_Int32 ToolBarManager::RetrievePropertiesFromCommand( const ::rtl::OUString& aCmdURL ) +{ + sal_Int32 nProperties(0); + Sequence< PropertyValue > aPropSeq; + + // Retrieve popup menu labels + aPropSeq = GetPropsForCommand( aCmdURL ); + for ( sal_Int32 i = 0; i < aPropSeq.getLength(); i++ ) + { + if ( aPropSeq[i].Name.equalsAscii( "Properties" )) { + aPropSeq[i].Value >>= nProperties; + break; } } - - return aLabel; + return nProperties; } void ToolBarManager::CreateControllers() @@ -969,8 +984,15 @@ void ToolBarManager::CreateControllers() { MenuDescriptionMap::iterator it = m_aMenuMap.find( nId ); if ( it == m_aMenuMap.end() ) - xController = Reference< XStatusListener >( - new GenericToolbarController( m_xServiceManager, m_xFrame, m_pToolBar, nId, aCommandURL )); + { + xController = Reference< XStatusListener >( + new GenericToolbarController( m_xServiceManager, m_xFrame, m_pToolBar, nId, aCommandURL )); + + // Accessibility support: Set toggle button role for specific commands + sal_Int32 nProps = RetrievePropertiesFromCommand( aCommandURL ); + if ( nProps & UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON ) + m_pToolBar->SetItemBits( nId, m_pToolBar->GetItemBits( nId ) | TIB_CHECKABLE ); + } else xController = Reference< XStatusListener >( new MenuToolbarController( m_xServiceManager, m_xFrame, m_pToolBar, nId, aCommandURL, m_aModuleIdentifier, m_aMenuMap[ nId ] )); diff --git a/framework/source/uielement/uicommanddescription.cxx b/framework/source/uielement/uicommanddescription.cxx index fdcd08f221fd..0d50aa4c36d4 100644 --- a/framework/source/uielement/uicommanddescription.cxx +++ b/framework/source/uielement/uicommanddescription.cxx @@ -340,7 +340,7 @@ Any ConfigurationAccess_UICommand::getSequenceFromCache( const ::rtl::OUString& if ( !pIter->second.bCommandNameCreated ) fillInfoFromResult( pIter->second, pIter->second.aLabel ); - Sequence< PropertyValue > aPropSeq( 3 ); + Sequence< PropertyValue > aPropSeq( 4 ); aPropSeq[0].Name = m_aPropLabel; aPropSeq[0].Value = pIter->second.aContextLabel.getLength() ? makeAny( pIter->second.aContextLabel ): makeAny( pIter->second.aLabel ); @@ -348,6 +348,8 @@ Any ConfigurationAccess_UICommand::getSequenceFromCache( const ::rtl::OUString& aPropSeq[1].Value <<= pIter->second.aCommandName; aPropSeq[2].Name = m_aPropPopup; aPropSeq[2].Value <<= pIter->second.bPopup; + aPropSeq[3].Name = m_aPropProperties; + aPropSeq[3].Value <<= pIter->second.nProperties; return makeAny( aPropSeq ); } diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu index 8c76a2dadd9f..d3db05206a6a 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu @@ -134,7 +134,7 @@ ~Hyphenation... - 1 + 9 diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu index 2925c2a97802..b4a2fab23fcd 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu @@ -5,7 +5,6 @@ - Polygon, filled @@ -14,7 +13,6 @@ - Black & White View @@ -23,19 +21,16 @@ - Rename Slide - ~Rename - ~Slide Show @@ -44,7 +39,6 @@ - ~Rehearse Timings @@ -53,7 +47,6 @@ - SlideTransition @@ -62,7 +55,6 @@ - Sho~w Slide @@ -71,7 +63,6 @@ - ~Hide Slide @@ -80,19 +71,16 @@ - Te~xt... - Slides Per Row - Fit Text to Frame @@ -101,7 +89,6 @@ - Fit Vertical Text to Frame @@ -110,7 +97,6 @@ - 3D Objects @@ -119,7 +105,6 @@ - Cube @@ -128,7 +113,6 @@ - Sphere @@ -137,7 +121,6 @@ - Cylinder @@ -146,7 +129,6 @@ - Cone @@ -155,7 +137,6 @@ - Pyramid @@ -164,7 +145,6 @@ - ~Glue Points @@ -173,7 +153,6 @@ - Insert Glue Point @@ -182,22 +161,19 @@ - Glue Point Relative - 1 + 9 - Exit Direction - Glue Point Horizontal Center @@ -206,7 +182,6 @@ - Glue Point Horizontal Left @@ -215,7 +190,6 @@ - Glue Point Horizontal Right @@ -224,7 +198,6 @@ - Glue Point Vertical Center @@ -233,7 +206,6 @@ - Glue Point Vertical Top @@ -242,7 +214,6 @@ - Glue Point Vertical Bottom @@ -251,7 +222,6 @@ - Shell @@ -260,7 +230,6 @@ - Torus @@ -269,7 +238,6 @@ - Half-Sphere @@ -278,7 +246,6 @@ - Exit Direction Left @@ -287,7 +254,6 @@ - Exit Direction Right @@ -296,7 +262,6 @@ - Exit Direction Top @@ -305,7 +270,6 @@ - Exit Direction Bottom @@ -314,7 +278,6 @@ - Insert @@ -323,25 +286,21 @@ - Cross-fading... - Dimen~sions... - Grid to ~Front - ~Display Guides @@ -350,13 +309,11 @@ - Guides to ~Front - In Front of ~Object @@ -365,13 +322,11 @@ - Pre~view - Custom Animation... @@ -380,46 +335,39 @@ - Animation Schemes... - Slide Transition... - ~Connector... - S~lide Show Settings... - ~Hyphenation - 1 + 9 - Reset Routing - D~uplicate Slide @@ -428,7 +376,6 @@ - E~xpand Slide @@ -437,13 +384,11 @@ - Su~mmary Slide - Exit All Groups @@ -452,7 +397,6 @@ - Increase Spacing @@ -461,7 +405,6 @@ - Decrease Spacing @@ -470,85 +413,71 @@ - ~Slide Master - ~Handout Master - ~Notes Master - ~Title Slide Master - Insert Slide Direct - Dat~e (variable) - ~Date (fixed) - T~ime (variable) - ~Time (fixed) - ~Page Number - Page ~Count - F~ields... - ~File Name - ~Author @@ -557,49 +486,41 @@ - ~Custom Slide Show... - ~Color - ~Grayscale - ~Black and White - ~Color - ~Grayscale - ~Black and White - To 3~D @@ -608,7 +529,6 @@ - To 3D ~Rotation Object @@ -617,61 +537,51 @@ - To ~Bitmap - To ~Metafile - Pack - To C~ontour - H~yperlink... - ~Page... - + - Paste ~Special... - Duplicat~e... - Lin~ks... - In 3D Rotation Object @@ -680,37 +590,31 @@ - ~Drawing View - ~Outline - ~High Contrast - Sli~de Sorter - ~High Contrast - Slid~e @@ -719,7 +623,6 @@ - ~File... @@ -728,7 +631,6 @@ - Shift @@ -737,13 +639,11 @@ - Pixel Mode - Arrange @@ -752,25 +652,21 @@ - Comb~ine - Description... - Name... - Connector @@ -779,7 +675,6 @@ - Bring ~Forward @@ -788,7 +683,6 @@ - Send Back~ward @@ -797,19 +691,16 @@ - ~Vertically - ~Horizontally - To ~Curve @@ -818,7 +709,6 @@ - To ~Polygon @@ -827,25 +717,21 @@ - ~Insert Snap Point/Line... - ~Ruler - ~Layer... - Slide ~Layout... @@ -854,25 +740,21 @@ - ~Layer... - ~Normal - ~Layer - Dimension Line @@ -881,13 +763,11 @@ - ~Master - Slide Effects @@ -896,7 +776,6 @@ - Transition Speed @@ -905,7 +784,6 @@ - AutoTransition @@ -914,7 +792,6 @@ - Time @@ -923,7 +800,6 @@ - Connector @@ -932,7 +808,6 @@ - Allow Interaction @@ -941,7 +816,6 @@ - Animated Image... @@ -950,7 +824,6 @@ - ~Interaction... @@ -959,7 +832,6 @@ - Slide D~esign... @@ -968,49 +840,41 @@ - Notes ~Page - H~andout Page - D~elete Slide - Delete - ~Split - Slide/Layer - Layout - Set in Circle (perspective) @@ -1019,7 +883,6 @@ - Set to circle (slant) @@ -1028,25 +891,21 @@ - Set in Circle (distort) - C~onnect - ~Break - Effects @@ -1055,7 +914,6 @@ - Transparency @@ -1064,7 +922,6 @@ - Gradient @@ -1073,7 +930,6 @@ - Distort @@ -1082,7 +938,6 @@ - Be~hind Object @@ -1091,7 +946,6 @@ - ~Reverse @@ -1100,7 +954,6 @@ - Connector Starts with Arrow @@ -1109,7 +962,6 @@ - Connector Ends with Arrow @@ -1118,7 +970,6 @@ - Connector with Arrows @@ -1127,7 +978,6 @@ - Connector Starts with Circle @@ -1136,7 +986,6 @@ - Connector Ends with Circle @@ -1145,7 +994,6 @@ - Connector with Circles @@ -1154,7 +1002,6 @@ - Text @@ -1163,7 +1010,6 @@ - Straight Connector @@ -1172,7 +1018,6 @@ - Rectangle @@ -1181,7 +1026,6 @@ - Straight Connector starts with Arrow @@ -1190,7 +1034,6 @@ - Ellipse @@ -1199,7 +1042,6 @@ - Straight Connector ends with Arrow @@ -1208,7 +1050,6 @@ - Curve @@ -1217,7 +1058,6 @@ - Straight Connector with Arrows @@ -1226,7 +1066,6 @@ - Straight Connector starts with Circle @@ -1235,7 +1074,6 @@ - Straight Connector ends with Circle @@ -1244,7 +1082,6 @@ - Straight Connector with Circles @@ -1253,7 +1090,6 @@ - Curved Connector @@ -1262,7 +1098,6 @@ - Curved Connector Starts with Arrow @@ -1271,7 +1106,6 @@ - Curved Connector Ends with Arrow @@ -1280,7 +1114,6 @@ - Curved Connector with Arrows @@ -1289,7 +1122,6 @@ - Curved Connector Starts with Circle @@ -1298,7 +1130,6 @@ - Curved Connector Ends with Circle @@ -1307,7 +1138,6 @@ - Curved Connector with Circles @@ -1316,7 +1146,6 @@ - Line Connector @@ -1325,7 +1154,6 @@ - Line Connector Starts with Arrow @@ -1334,7 +1162,6 @@ - Line Connector Ends with Arrow @@ -1343,7 +1170,6 @@ - Line Connector with Arrows @@ -1352,7 +1178,6 @@ - Line Connector Starts with Circle @@ -1361,7 +1186,6 @@ - Line Connector Ends with Circle @@ -1370,7 +1194,6 @@ - Line Connector with Circles @@ -1379,7 +1202,6 @@ - Picture Placeholders @@ -1388,7 +1210,6 @@ - Contour Mode @@ -1397,7 +1218,6 @@ - Text Placeholders @@ -1406,7 +1226,6 @@ - Line Contour Only @@ -1415,7 +1234,6 @@ - Simple Handles @@ -1424,7 +1242,6 @@ - Modify Object with Attributes @@ -1433,7 +1250,6 @@ - ~Snap to Guides @@ -1442,7 +1258,6 @@ - Snap to Page Margins @@ -1451,7 +1266,6 @@ - Snap to Object Border @@ -1460,7 +1274,6 @@ - Snap to Object Points @@ -1469,7 +1282,6 @@ - Allow Quick Editing @@ -1478,7 +1290,6 @@ - Select Text Area Only @@ -1487,49 +1298,41 @@ - 1 Bit Threshold - 1 Bit Dithered - 4 Bit grayscales - 4 Bit color palette - 8 Bit Grayscales - 8 Bit color palette - 24 Bit True Color - Large Handles @@ -1538,7 +1341,6 @@ - Double-click to edit Text @@ -1547,7 +1349,6 @@ - Rotation Mode after Clicking Object @@ -1556,7 +1357,6 @@ - Lines and Arrows @@ -1565,7 +1365,6 @@ - Line Starts with Arrow @@ -1574,7 +1373,6 @@ - Line Ends with Arrow @@ -1583,7 +1381,6 @@ - Line with Arrows @@ -1592,7 +1389,6 @@ - Line with Arrow/Circle @@ -1601,7 +1397,6 @@ - Line with Circle/Arrow @@ -1610,7 +1405,6 @@ - Line with Arrow/Square @@ -1619,7 +1413,6 @@ - Line with Square/Arrow @@ -1628,17 +1421,14 @@ - Flip 1 - - New Master @@ -1647,7 +1437,6 @@ - Delete Master @@ -1656,7 +1445,6 @@ - Rename Master @@ -1665,19 +1453,16 @@ - Close Master View - E-mail as ~Microsoft PowerPoint Presentation... - E-mail as ~OpenDocument Presentation... @@ -1685,61 +1470,51 @@ - ~Modify - Wor~kspace - ~Flip - Pre~view Mode - La~yer - Gr~id - ~Convert - ~Arrange - ~Color/Grayscale - ~Slide Show @@ -1750,107 +1525,89 @@ - ~Group - Sen~d - Styl~es - ~Guides - ~Master - Master Lay~outs - Master ~Elements... - Notes Master Layout... - Handout Master Layout... - ~Header and Footer... - P~age Number... - Date and ~Time... - ~Normal - Sli~de Sorter - S~lide Pane - ~Page Pane - Tas~k Pane - Zellen verbinden diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu index 4f38244540c2..46cda2e2facc 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu @@ -45,7 +45,7 @@ Fontwork Gallery - 1 + 9 @@ -1287,7 +1287,7 @@ Scrollbar - 1 + 9 @@ -1303,7 +1303,7 @@ Spin Button - 1 + 9 @@ -1371,7 +1371,7 @@ Italic - 1 + 9 @@ -1379,7 +1379,7 @@ Bold - 1 + 9 @@ -1395,7 +1395,7 @@ Shadow - 1 + 9 @@ -1411,7 +1411,7 @@ Outline - 1 + 9 @@ -1419,7 +1419,7 @@ Strikethrough - 1 + 9 @@ -1432,7 +1432,7 @@ Underline - 1 + 9 @@ -1440,7 +1440,7 @@ Overline - 1 + 9 @@ -1717,7 +1717,7 @@ Invert - 1 + 9 @@ -2195,7 +2195,7 @@ Check Box - 1 + 9 @@ -2423,7 +2423,7 @@ Time Field - 1 + 9 @@ -2590,7 +2590,7 @@ Left-To-Right - 3 + 11 @@ -2606,7 +2606,7 @@ Right-To-Left - 3 + 11 @@ -2726,7 +2726,7 @@ Combo Box - 1 + 9 @@ -2891,7 +2891,7 @@ Guides When Moving - 1 + 9 @@ -2907,7 +2907,7 @@ Snap to Grid - 1 + 9 @@ -3144,7 +3144,7 @@ HT~ML Source - 1 + 9 @@ -3228,7 +3228,7 @@ Shadow - 1 + 9 @@ -3328,7 +3328,7 @@ ~Edit Contour... - 1 + 9 @@ -3434,13 +3434,16 @@ Fit to Frame - + + 8 + + ImageMap - 1 + 9 @@ -3684,14 +3687,17 @@ ~Display Grid - 1 + 9 Flash - + + 8 + + Edit Macros @@ -3980,7 +3986,7 @@ ~AutoSpellcheck - 1 + 9 @@ -3995,9 +4001,12 @@ - As~ian phonetic guide... + As~ian phonetic guide... - + + 8 + + S~pecial Character... @@ -4094,7 +4103,10 @@ Status ~Bar - + + 8 + + Macro Toolbar On/Off @@ -4220,7 +4232,7 @@ ~Gallery - 1 + 9 @@ -4260,7 +4272,7 @@ More Controls - 1 + 9 @@ -4268,7 +4280,7 @@ Form Design - 1 + 9 @@ -4276,7 +4288,7 @@ Push Button - 1 + 9 @@ -4284,7 +4296,7 @@ Option Button - 1 + 9 @@ -4300,7 +4312,7 @@ Label Field - 1 + 9 @@ -4308,7 +4320,7 @@ Group Box - 1 + 9 @@ -4316,7 +4328,7 @@ Text Box - 1 + 9 @@ -4324,7 +4336,7 @@ List Box - 1 + 9 @@ -4340,7 +4352,7 @@ Table Control - 1 + 9 @@ -4348,7 +4360,7 @@ Image Button - 1 + 9 @@ -4356,7 +4368,7 @@ File Selection - 1 + 9 @@ -4364,7 +4376,7 @@ Con~trol... - 1 + 9 @@ -4372,7 +4384,7 @@ For~m... - 1 + 9 @@ -4475,7 +4487,7 @@ Design Mode On/Off - 1 + 9 @@ -4508,7 +4520,7 @@ Modo Esboço - 1 + 9 @@ -4529,7 +4541,7 @@ Form Navigator... - 1 + 9 @@ -4537,7 +4549,7 @@ Data Navigator... - 1 + 9 @@ -4604,7 +4616,7 @@ Date Field - 1 + 9 @@ -4612,7 +4624,7 @@ Time Field - 1 + 9 @@ -4620,7 +4632,7 @@ Numerical Field - 1 + 9 @@ -4628,7 +4640,7 @@ Currency Field - 1 + 9 @@ -4636,7 +4648,7 @@ Pa~ge Preview - 1 + 9 @@ -4644,7 +4656,7 @@ Pattern Field - 1 + 9 @@ -4652,7 +4664,7 @@ Open in Design Mode - 1 + 9 @@ -4660,7 +4672,7 @@ Image Control - 1 + 9 @@ -4732,7 +4744,7 @@ Run SQL command directly - 1 + 9 @@ -4756,7 +4768,7 @@ Apply Filter - 1 + 9 @@ -4788,7 +4800,7 @@ Wizards On/Off - 1 + 9 @@ -4796,7 +4808,7 @@ Formatted Field - 1 + 9 @@ -4934,7 +4946,7 @@ Automatic Control Focus - 1 + 9 @@ -4942,7 +4954,7 @@ Explorer On/Off - 1 + 9 @@ -5292,7 +5304,7 @@ Media Pla~yer - 1 + 9 @@ -5316,7 +5328,7 @@ ~Color - 1 + 9 diff --git a/officecfg/registry/data/org/openoffice/Office/UI/MathCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/MathCommands.xcu index e69558fc4ef5..1a3db34f6e6d 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/MathCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/MathCommands.xcu @@ -164,7 +164,7 @@ Formula Cursor - 1 + 9 diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu index fa0611e07041..47e46136138a 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu @@ -38,12 +38,18 @@ ~Hidden Paragraphs - + + 8 + + Comments - + + 8 + + S~cript... @@ -115,13 +121,16 @@ ~Bibliography Entry... - + + 8 + + Direct Cursor On/Off - 1 + 9 @@ -166,12 +175,18 @@ ~Record - + + 8 + + ~Show - + + 8 + + To Page @@ -460,7 +475,7 @@ Insert Fields - 1 + 9 @@ -539,9 +554,12 @@ - ~While Typing + ~While Typing - + + 8 + + Page Number @@ -573,7 +591,7 @@ Double Underline - 1 + 9 @@ -866,7 +884,7 @@ Wrap Off - 7 + 15 @@ -1723,7 +1741,7 @@ Link Frames - 1 + 9 @@ -1754,7 +1772,7 @@ Restart Numbering - 7 + 15 @@ -1875,7 +1893,10 @@ Allow Row to Break Across Pages and Columns - + + 8 + + Select Paragraph @@ -2024,7 +2045,10 @@ Font Color Fill - + + 8 + + Te~xt Boundaries @@ -2058,7 +2082,10 @@ Highlight Fill - + + 8 + + Vertical Ruler @@ -2069,7 +2096,7 @@ ~Hyphenation... - 1 + 9 @@ -2136,7 +2163,7 @@ Book Preview - 1 + 9 @@ -2158,11 +2185,17 @@ ~Standard + + 8 + ~Block Area + + 8 + diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/Commands.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/Commands.xcs index 38ee3a2e4c4f..71efdab1b636 100644 --- a/officecfg/registry/schema/org/openoffice/Office/UI/Commands.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/UI/Commands.xcs @@ -52,6 +52,7 @@ Bit 0 = Command has an image. Bit 1 = Image must be mirrored (CTL/vertical text). Bit 2 = Image must be rotated (CTL/vertical text). + Bit 3 = Command supports a toggle state (Accessibility). 0 -- cgit v1.2.3 From 13b8697f854e1f1dc5e8ab06eab04f90bf99d219 Mon Sep 17 00:00:00 2001 From: Carsten Driesner Date: Mon, 10 May 2010 11:12:15 +0200 Subject: fwk142: #i104468# Ensure that focus is set to a floating window created by a toolbar controller --- framework/source/uielement/toolbarmanager.cxx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'framework/source') diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index 8171ff2e5419..9b0ffa9ce993 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -1552,7 +1552,11 @@ IMPL_LINK( ToolBarManager, DropdownClick, ToolBox*, EMPTYARG ) Reference< XToolbarController > xController( pIter->second, UNO_QUERY ); if ( xController.is() ) - xController->createPopupWindow(); + { + Reference< XWindow > xWin = xController->createPopupWindow(); + if ( xWin.is() ) + xWin->setFocus(); + } } return 1; } -- cgit v1.2.3